diff --git a/app/DD-Record-Organizer/ClassRecordCommands.vb b/app/DD-Record-Organizer/ClassRecordCommands.vb index 4796ff3..13d09f7 100644 --- a/app/DD-Record-Organizer/ClassRecordCommands.vb +++ b/app/DD-Record-Organizer/ClassRecordCommands.vb @@ -4,7 +4,7 @@ Return ClassDatabase.Execute_non_Query(SQL) = True End Function Public Shared Function GetLastRecord() - Dim SQL = "SELECT (MAX(GUID)) FROM TBPMO_RECORD where PARENT_RECORD = 0 AND FORM_ID = " & CURRENT_ENTITY_ID & " AND UPPER(ADDED_WHO) = '" & USER_USERNAME & "'" + Dim SQL = String.Format("SELECT MAX(GUID) FROM TBPMO_RECORD where PARENT_RECORD = 0 AND FORM_ID = {0} AND UPPER(ADDED_WHO) = UPPER('{1}') AND DELETED = 0", CURRENT_ENTITY_ID, USER_USERNAME) Return ClassDatabase.Execute_Scalar(SQL) End Function diff --git a/app/DD-Record-Organizer/ClassRecordState.vb b/app/DD-Record-Organizer/ClassRecordState.vb index c7f9566..f0b1a60 100644 --- a/app/DD-Record-Organizer/ClassRecordState.vb +++ b/app/DD-Record-Organizer/ClassRecordState.vb @@ -56,10 +56,11 @@ ElseIf dt.Rows.Count = 0 Then Return Nothing Else - Throw New Exception("Record" & RecordId & " is not unique") + MsgBox("Unexpected behaviour in IsRecordLocked: ", MsgBoxStyle.Information) + Return Nothing End If Catch ex As Exception - MsgBox("Error in IsRecordInWork: " + vbNewLine + ex.Message, MsgBoxStyle.Critical) + MsgBox("Error in IsRecordLocked: " + vbNewLine + ex.Message, MsgBoxStyle.Critical) Return Nothing End Try End Function diff --git a/app/DD-Record-Organizer/ModuleMySettings.vb b/app/DD-Record-Organizer/ModuleMySettings.vb index 9dde089..9c309af 100644 --- a/app/DD-Record-Organizer/ModuleMySettings.vb +++ b/app/DD-Record-Organizer/ModuleMySettings.vb @@ -27,6 +27,7 @@ Module ModuleMySettings Public vWLaufwerk As String = "W" Public vVERSION_DELIMITER As String = "~" Public vFILE_DELIMITER As String = "_" + Public AUTO_LOGOUT_USER As Integer Public USER_IS_ADMIN = False Public USERS_LOGGED_IN = 0 @@ -394,6 +395,7 @@ Module ModuleMySettings vWLaufwerk = DT.Rows(0).Item("STRING1") vVERSION_DELIMITER = DT.Rows(0).Item("VERSION_DELIMITER") vFILE_DELIMITER = DT.Rows(0).Item("FILE_DELIMITER") + AUTO_LOGOUT_USER = DT.Rows(0).Item("AUTO_LOGOUT_USER") Else Return False End If diff --git a/app/DD-Record-Organizer/My Project/licenses.licx b/app/DD-Record-Organizer/My Project/licenses.licx index e12c800..d249eb8 100644 --- a/app/DD-Record-Organizer/My Project/licenses.licx +++ b/app/DD-Record-Organizer/My Project/licenses.licx @@ -1,2 +1,3 @@ +DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraBars.Navigation.TileNavPane, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/app/DD-Record-Organizer/frmConstructor_Main.vb b/app/DD-Record-Organizer/frmConstructor_Main.vb index 65251b1..2d1853c 100644 --- a/app/DD-Record-Organizer/frmConstructor_Main.vb +++ b/app/DD-Record-Organizer/frmConstructor_Main.vb @@ -1743,8 +1743,8 @@ Public Class frmConstructor_Main End If End If Me.Cursor = Cursors.WaitCursor - Try - If TCDetails.SelectedTabPage.Text.StartsWith("Pos") = False Then + ' Try + If TCDetails.SelectedTabPage.Text.StartsWith("Pos") = False Then SELECTED_RECORD_ID = 0 Lock_RecordControls(False) tsButtonCancel.Visible = True @@ -1752,9 +1752,9 @@ Public Class frmConstructor_Main CURRENT_PARENT_ENTITY_ID = PARENT_ENTITYID ' Den Record anlegen, damit wir eine RECORD_ID bekommen If ClassRecordCommands.CreateRecord(ENTITY_ID) = True Then - ' Die RECORD_ID auslesen und setzen - NEW_RECORD_ID = ClassRecordCommands.GetLastRecord(ENTITY_ID) - CURRENT_RECORD_ID = NEW_RECORD_ID + ' Die RECORD_ID auslesen und setzen + NEW_RECORD_ID = ClassRecordCommands.GetLastRecord() + CURRENT_RECORD_ID = NEW_RECORD_ID RECORD_ID = NEW_RECORD_ID SELECTED_RECORD_ID = NEW_RECORD_ID ClassProxy.PRPROXY_RECORD_UPD_INS(ENTITY_ID, SELECTED_RECORD_ID) @@ -1787,11 +1787,11 @@ Public Class frmConstructor_Main End If End If - Catch ex As Exception - ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error tsButtonAdd", ex.Message, ex.StackTrace) - Finally - Me.Cursor = Cursors.Default - End Try + ' Catch ex As Exception + 'ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error tsButtonAdd", ex.Message, ex.StackTrace) + ' Finally + 'Me.Cursor = Cursors.Default + ' End Try End Sub Private Sub tsButtonSave_Click(sender As Object, e As EventArgs) Handles tsButtonSave.Click @@ -2837,8 +2837,6 @@ Public Class frmConstructor_Main If CtrlCommandUI.IsInsert = True Then EDIT_STATE = EditState.None Lock_RecordControls(True) - 'Me.pnlDetails.Enabled = False - 'CtrlCommandUI.IsInsert = False End If Try Dim ResultMessage = Update_Record_OnChange() @@ -6400,7 +6398,7 @@ Public Class frmConstructor_Main If RECORD_CREATE = True Then ClassRecordCommands.CreateRecord(ENTITY_ID) Try - NEWRECORD = ClassRecordCommands.GetLastRecord(ENTITY_ID) + NEWRECORD = ClassRecordCommands.GetLastRecord() Catch ex As Exception Dim SQL = "SELECT (MAX(GUID)) FROM TBPMO_RECORD where PARENT_RECORD = 0 AND ADDED_WHO = '" & USER_USERNAME & "'" NEWRECORD = ClassDatabase.Execute_Scalar(SQL) diff --git a/app/DD-Record-Organizer/frmMain.vb b/app/DD-Record-Organizer/frmMain.vb index 2137604..c84e5fc 100644 --- a/app/DD-Record-Organizer/frmMain.vb +++ b/app/DD-Record-Organizer/frmMain.vb @@ -14,7 +14,7 @@ Public Class frmMain Dim strIPAddress As String Public Shared TIMER_SCAN As New System.Windows.Forms.Timer - + Public Shared TIMER_INACTIVITY As New System.Windows.Forms.Timer Private Shared Sub Scan_TickHandler(sender As Object, e As EventArgs) Try If ClassFolderWatcher.NEW_FILES = False Then Exit Sub @@ -600,6 +600,16 @@ Public Class frmMain MsgBox(String.Format("Your version '{0}' does not match the minimum required version and needs to be updated! Please contact Your systemadministrator!" & vbNewLine & "Application will close now.", My.Application.Info.Version.ToString), MsgBoxStyle.Exclamation) Me.Close() End If + Try + If USER_IS_ADMIN = False Or AUTO_LOGOUT_USER > 0 Then + TIMER_INACTIVITY.Interval = AUTO_LOGOUT_USER + 'TIMER_INACTIVITY.Enabled = True + 'AddHandler TIMER_INACTIVITY.Tick, AddressOf Scan_TickHandler + End If + Catch ex As Exception + ClassHelper.InsertEssential_Log(USER_GUID, "USER_ID", "Unexpected Error in AUOTP_LOGOUT_USER: " & ex.Message) + End Try + Catch ex As Exception MsgBox("Unexpected Error in FormShown: " & ex.Message, MsgBoxStyle.Critical) End Try diff --git a/app/DD-Record-Organizer/frmRecOrgConfig_Basic.Designer.vb b/app/DD-Record-Organizer/frmRecOrgConfig_Basic.Designer.vb index 63f9e6c..4720a67 100644 --- a/app/DD-Record-Organizer/frmRecOrgConfig_Basic.Designer.vb +++ b/app/DD-Record-Organizer/frmRecOrgConfig_Basic.Designer.vb @@ -62,6 +62,8 @@ Partial Class frmRecOrgConfig_Basic Me.btnSaveUpdatePath = New System.Windows.Forms.Button() Me.Label11 = New System.Windows.Forms.Label() Me.txtBoxUpdatePath = New System.Windows.Forms.TextBox() + Me.txtAutoLogoutUser = New System.Windows.Forms.TextBox() + Me.Label12 = New System.Windows.Forms.Label() Me.GroupBox1.SuspendLayout() Me.GroupBox2.SuspendLayout() Me.GroupBox3.SuspendLayout() @@ -282,6 +284,8 @@ Partial Class frmRecOrgConfig_Basic ' 'TabPage1 ' + Me.TabPage1.Controls.Add(Me.txtAutoLogoutUser) + Me.TabPage1.Controls.Add(Me.Label12) Me.TabPage1.Controls.Add(Me.GroupBox2) Me.TabPage1.Controls.Add(Me.txtWiki) Me.TabPage1.Controls.Add(Me.GroupBox1) @@ -329,6 +333,16 @@ Partial Class frmRecOrgConfig_Basic resources.ApplyResources(Me.txtBoxUpdatePath, "txtBoxUpdatePath") Me.txtBoxUpdatePath.Name = "txtBoxUpdatePath" ' + 'txtAutoLogoutUser + ' + resources.ApplyResources(Me.txtAutoLogoutUser, "txtAutoLogoutUser") + Me.txtAutoLogoutUser.Name = "txtAutoLogoutUser" + ' + 'Label12 + ' + resources.ApplyResources(Me.Label12, "Label12") + Me.Label12.Name = "Label12" + ' 'frmRecOrgConfig_Basic ' resources.ApplyResources(Me, "$this") @@ -394,4 +408,6 @@ Partial Class frmRecOrgConfig_Basic Friend WithEvents btnSaveUpdatePath As Button Friend WithEvents Label11 As Label Friend WithEvents lblSave As Label + Friend WithEvents txtAutoLogoutUser As TextBox + Friend WithEvents Label12 As Label End Class diff --git a/app/DD-Record-Organizer/frmRecOrgConfig_Basic.resx b/app/DD-Record-Organizer/frmRecOrgConfig_Basic.resx index 12cb240..6413714 100644 --- a/app/DD-Record-Organizer/frmRecOrgConfig_Basic.resx +++ b/app/DD-Record-Organizer/frmRecOrgConfig_Basic.resx @@ -285,7 +285,7 @@ TabPage1 - 2 + 4 6, 9 @@ -309,7 +309,7 @@ TabPage1 - 0 + 2 6, 93 @@ -330,7 +330,7 @@ TabPage1 - 1 + 3 True @@ -361,7 +361,7 @@ TabPage1 - 3 + 5 Top, Right @@ -397,7 +397,67 @@ TabPage1 - 6 + 8 + + + btnResetBackground + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox3 + + + 0 + + + btnSelectBackground + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox3 + + + 1 + + + pbBackground + + + System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox3 + + + 2 + + + 558, 9 + + + 368, 315 + + + 81 + + + Anwendungshintergrund + + + GroupBox3 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage1 + + + 11 211, 274 @@ -471,42 +531,9 @@ 2 - - 558, 9 - - - 368, 315 - - - 81 - - - Anwendungshintergrund - - - GroupBox3 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage1 - - - 9 - 17, 17 - - 6, 21 - - - 238, 22 - - - 0 - txtProductName @@ -541,7 +568,28 @@ TabPage1 - 7 + 9 + + + 6, 21 + + + 238, 22 + + + 0 + + + txtProductName + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox4 + + + 0 False @@ -574,7 +622,7 @@ TabPage1 - 4 + 6 True @@ -583,7 +631,7 @@ NoControl - 6, 146 + 0, 175 194, 30 @@ -605,8 +653,164 @@ TabPage1 + 10 + + + Label10 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox5 + + + 0 + + + btnTest_Anmeldung + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox5 + + + 1 + + + txtServername + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox5 + + + 2 + + + Label5 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox5 + + + 3 + + + txtPW + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox5 + + + 4 + + + Label4 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox5 + + + 5 + + + txtUser + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox5 + + + 6 + + + Label6 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox5 + + + 7 + + + txtDomäne + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox5 + + 8 + + Label7 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox5 + + + 9 + + + Label8 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox5 + + + 10 + + + 6, 211 + + + 541, 170 + + + 83 + + + Userauthentifizierung windream Rechte: + + + GroupBox5 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage1 + + + 7 + True @@ -893,29 +1097,56 @@ Anmeldeservers in den Grundeinstellungen des Users. 10 - - 6, 182 + + 6, 134 - - 541, 170 + + 58, 22 - - 83 + + 85 - - Userauthentifizierung windream Rechte: + + txtAutoLogoutUser - - GroupBox5 + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - + TabPage1 - - 5 + + 0 + + + True + + + NoControl + + + 3, 118 + + + 197, 13 + + + 84 + + + Auto Abmelden Inaktivität: (Minuten) + + + Label12 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage1 + + + 1 4, 22 @@ -924,7 +1155,7 @@ Anmeldeservers in den Grundeinstellungen des Users. 3, 3, 3, 3 - 938, 358 + 938, 399 0 @@ -944,6 +1175,105 @@ Anmeldeservers in den Grundeinstellungen des Users. 0 + + lblSave + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage2 + + + 0 + + + btnSaveUpdatePath + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage2 + + + 1 + + + Label11 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage2 + + + 2 + + + txtBoxUpdatePath + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage2 + + + 3 + + + 4, 22 + + + 3, 3, 3, 3 + + + 938, 358 + + + 1 + + + Update-Einstellungen + + + TabPage2 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabControl1 + + + 1 + + + Fill + + + 0, 0 + + + 946, 425 + + + 84 + + + TabControl1 + + + System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 + True @@ -1058,57 +1388,6 @@ Anmeldeservers in den Grundeinstellungen des Users. 3 - - 4, 22 - - - 3, 3, 3, 3 - - - 938, 358 - - - 1 - - - Update-Einstellungen - - - TabPage2 - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabControl1 - - - 1 - - - Fill - - - 0, 0 - - - 946, 384 - - - 84 - - - TabControl1 - - - System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 0 - True @@ -1116,7 +1395,7 @@ Anmeldeservers in den Grundeinstellungen des Users. 6, 13 - 946, 384 + 946, 425 Segoe UI, 8.25pt diff --git a/app/DD-Record-Organizer/frmRecOrgConfig_Basic.vb b/app/DD-Record-Organizer/frmRecOrgConfig_Basic.vb index f775460..e2cf948 100644 --- a/app/DD-Record-Organizer/frmRecOrgConfig_Basic.vb +++ b/app/DD-Record-Organizer/frmRecOrgConfig_Basic.vb @@ -15,6 +15,7 @@ Public Class frmRecOrgConfig_Basic Me.txtDelimiterFile.Text = dt.Rows(0).Item("FILE_DELIMITER") Me.txtwddriveletter.Text = dt.Rows(0).Item("STRING1") Me.txtProductName.Text = dt.Rows(0).Item("PRODUCT_NAME1") + Me.txtAutoLogoutUser.Text = dt.Rows(0).Item("AUTO_LOGOUT_USER") ' Hintergrundbild unwandeln und anzeigen If Not IsDBNull(dt.Rows(0).Item("BACKGROUND_IMAGE")) Then @@ -78,7 +79,7 @@ Public Class frmRecOrgConfig_Basic Dim image As Bitmap = Nothing Dim bimage() As Byte = Nothing - Dim sql As String = "UPDATE TBDD_MODULES SET VERSION_DELIMITER = @VERSION_DELIMITER, FILE_DELIMITER = @FILE_DELIMITER, STRING1 = @STRING1, BACKGROUND_IMAGE = @BACKGROUND_IMAGE, PRODUCT_NAME1 = @PRODUCT_NAME1, CHANGED_WHO = @CHANGED_WHO WHERE NAME = 'Record-Organizer'" + Dim sql As String = "UPDATE TBDD_MODULES SET AUTO_LOGOUT_USER = @AUTO_LOGOUT_USER, VERSION_DELIMITER = @VERSION_DELIMITER, FILE_DELIMITER = @FILE_DELIMITER, STRING1 = @STRING1, BACKGROUND_IMAGE = @BACKGROUND_IMAGE, PRODUCT_NAME1 = @PRODUCT_NAME1, CHANGED_WHO = @CHANGED_WHO WHERE NAME = 'Record-Organizer'" Dim conn As New SqlClient.SqlConnection(MyConnectionString) Dim cmd As New SqlClient.SqlCommand(sql, conn) @@ -91,6 +92,7 @@ Public Class frmRecOrgConfig_Basic End If cmd.Parameters.Add("@VERSION_DELIMITER", SqlDbType.Text).Value = txtDelimiterVersion.Text + cmd.Parameters.Add("@AUTO_LOGOUT_USER", SqlDbType.Int).Value = txtAutoLogoutUser.Text cmd.Parameters.Add("@FILE_DELIMITER", SqlDbType.Text).Value = txtDelimiterFile.Text cmd.Parameters.Add("@STRING1", SqlDbType.Text).Value = txtwddriveletter.Text cmd.Parameters.Add("@CHANGED_WHO", SqlDbType.Text).Value = USER_USERNAME @@ -240,4 +242,11 @@ Public Class frmRecOrgConfig_Basic Private Sub txtWiki_VisibleChanged(sender As Object, e As EventArgs) Handles txtWiki.VisibleChanged End Sub + + Private Sub txtAutoLogoutUser_TextChanged(sender As Object, e As EventArgs) Handles txtAutoLogoutUser.TextChanged + If loaded = True Then + changes_ModuleKonfig = True + btnsave.Enabled = True + End If + End Sub End Class \ No newline at end of file diff --git a/app/DD-Record-Organizer/frmUserKonfig.Designer.vb b/app/DD-Record-Organizer/frmUserKonfig.Designer.vb index c94156c..64006c7 100644 --- a/app/DD-Record-Organizer/frmUserKonfig.Designer.vb +++ b/app/DD-Record-Organizer/frmUserKonfig.Designer.vb @@ -74,6 +74,8 @@ Partial Class frmUserKonfig Me.TBDD_USERBindingNavigatorSaveItem = New System.Windows.Forms.ToolStripButton() Me.tbRefreshUsers = New System.Windows.Forms.ToolStripButton() Me.tsAddUser = New System.Windows.Forms.ToolStripButton() + Me.ToolStripSeparator4 = New System.Windows.Forms.ToolStripSeparator() + Me.tsbtnExoirtExcel = New System.Windows.Forms.ToolStripButton() Me.USER_GUIDTextBox = New System.Windows.Forms.TextBox() Me.PRENAMETextBox = New System.Windows.Forms.TextBox() Me.NAMETextBox = New System.Windows.Forms.TextBox() @@ -227,8 +229,6 @@ Partial Class frmUserKonfig Me.WAN_ENVIRONMENTCheckBox = New System.Windows.Forms.CheckBox() Me.DATE_FORMATComboBox = New System.Windows.Forms.ComboBox() Me.LOG_OUT_WHENTextBox = New System.Windows.Forms.TextBox() - Me.tsbtnExoirtExcel = New System.Windows.Forms.ToolStripButton() - Me.ToolStripSeparator4 = New System.Windows.Forms.ToolStripSeparator() GUIDLabel = New System.Windows.Forms.Label() PRENAMELabel = New System.Windows.Forms.Label() NAMELabel = New System.Windows.Forms.Label() @@ -612,6 +612,20 @@ Partial Class frmUserKonfig resources.ApplyResources(Me.tsAddUser, "tsAddUser") Me.tsAddUser.Name = "tsAddUser" ' + 'ToolStripSeparator4 + ' + Me.ToolStripSeparator4.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right + Me.ToolStripSeparator4.Name = "ToolStripSeparator4" + resources.ApplyResources(Me.ToolStripSeparator4, "ToolStripSeparator4") + ' + 'tsbtnExoirtExcel + ' + Me.tsbtnExoirtExcel.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right + Me.tsbtnExoirtExcel.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image + Me.tsbtnExoirtExcel.Image = Global.DD_Record_Organizer.My.Resources.Resources.Excel_25ixel + resources.ApplyResources(Me.tsbtnExoirtExcel, "tsbtnExoirtExcel") + Me.tsbtnExoirtExcel.Name = "tsbtnExoirtExcel" + ' 'USER_GUIDTextBox ' Me.USER_GUIDTextBox.BackColor = System.Drawing.Color.WhiteSmoke @@ -1673,9 +1687,9 @@ Partial Class frmUserKonfig ' 'GridViewUser ' - Me.GridViewUser.Appearance.EvenRow.BackColor = CType(resources.GetObject("GridView1.Appearance.EvenRow.BackColor"), System.Drawing.Color) + Me.GridViewUser.Appearance.EvenRow.BackColor = CType(resources.GetObject("GridViewUser.Appearance.EvenRow.BackColor"), System.Drawing.Color) Me.GridViewUser.Appearance.EvenRow.Options.UseBackColor = True - Me.GridViewUser.Appearance.FocusedRow.BackColor = CType(resources.GetObject("GridView1.Appearance.FocusedRow.BackColor"), System.Drawing.Color) + Me.GridViewUser.Appearance.FocusedRow.BackColor = CType(resources.GetObject("GridViewUser.Appearance.FocusedRow.BackColor"), System.Drawing.Color) Me.GridViewUser.Appearance.FocusedRow.Options.UseBackColor = True Me.GridViewUser.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colUSERNAME, Me.colNAME, Me.colEMAIL}) Me.GridViewUser.GridControl = Me.GridControlUser @@ -1743,20 +1757,6 @@ Partial Class frmUserKonfig Me.LOG_OUT_WHENTextBox.Name = "LOG_OUT_WHENTextBox" Me.LOG_OUT_WHENTextBox.ReadOnly = True ' - 'tsbtnExoirtExcel - ' - Me.tsbtnExoirtExcel.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right - Me.tsbtnExoirtExcel.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.tsbtnExoirtExcel.Image = Global.DD_Record_Organizer.My.Resources.Resources.Excel_25ixel - resources.ApplyResources(Me.tsbtnExoirtExcel, "tsbtnExoirtExcel") - Me.tsbtnExoirtExcel.Name = "tsbtnExoirtExcel" - ' - 'ToolStripSeparator4 - ' - Me.ToolStripSeparator4.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right - Me.ToolStripSeparator4.Name = "ToolStripSeparator4" - resources.ApplyResources(Me.ToolStripSeparator4, "ToolStripSeparator4") - ' 'frmUserKonfig ' resources.ApplyResources(Me, "$this") diff --git a/app/DD-Record-Organizer/frmUserKonfig.resx b/app/DD-Record-Organizer/frmUserKonfig.resx index a59ec31..52980a6 100644 --- a/app/DD-Record-Organizer/frmUserKonfig.resx +++ b/app/DD-Record-Organizer/frmUserKonfig.resx @@ -1637,6 +1637,538 @@ True + + True + + + 6, 13 + + + 109, 13 + + + 2 + + + Verfügbare Gruppen: + + + Label1 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage1 + + + 0 + + + MiddleLeft + + + 382, 37 + + + 321, 23 + + + 5 + + + Benutzer aus Gruppe entfernen + + + btnRemoveUserFromGroup + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage1 + + + 1 + + + 929, 17 + + + 140, 10 + + + 236, 21 + + + 0 + + + cmbGroup + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage1 + + + 2 + + + True + + + 6, 40 + + + 118, 13 + + + 4 + + + Zugewiesene Gruppen: + + + Label2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage1 + + + 3 + + + MiddleLeft + + + 382, 8 + + + 321, 23 + + + 1 + + + Ausgewählten Benutzer zu Gruppe hinzufügen + + + btnAddUserToGroup + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage1 + + + 4 + + + Top, Bottom, Left + + + 140, 40 + + + 236, 186 + + + 3 + + + lbGroups + + + System.Windows.Forms.ListBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage1 + + + 5 + + + 4, 22 + + + 3, 3, 3, 3 + + + 1124, 293 + + + 0 + + + User zu Gruppe + + + TabPage1 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabControl1 + + + 0 + + + True + + + Top, Bottom, Left + + + 17, 134 + + + 822, 95 + + + 667, 19 + + + Cyan + + + Fuchsia + + + Selection + + + True + + + 0 + + + 54 + + + True + + + 1 + + + 95 + + + True + + + 2 + + + 84 + + + 263, 227 + + + 88 + + + GridControlWH_Users1 + + + DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + TabPage2 + + + 0 + + + Top, Bottom, Left + + + 957, 95 + + + 229, 19 + + + Cyan + + + Fuchsia + + + Selection + + + True + + + 0 + + + 54 + + + True + + + 1 + + + 107 + + + True + + + 2 + + + 102 + + + 284, 227 + + + 87 + + + GridControlUsers2Group + + + DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + TabPage2 + + + 1 + + + MiddleLeft + + + NoControl + + + 936, 19 + + + 135, 53 + + + 12 + + + Benutzer aus Gruppe entfernen + + + MiddleRight + + + btndeleteUserfromGroup + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage2 + + + 2 + + + True + + + NoControl + + + 664, 3 + + + 85, 13 + + + 11 + + + User zu Gruppe: + + + lblUserforGroup + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage2 + + + 3 + + + MiddleLeft + + + NoControl + + + 519, 19 + + + 142, 46 + + + 9 + + + Gruppe und User +matchen + + + MiddleRight + + + btnaddSelectedUser2Group + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage2 + + + 4 + + + True + + + NoControl + + + 226, 3 + + + 94, 13 + + + 8 + + + User zur Auswahl: + + + Label4 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage2 + + + 5 + + + True + + + NoControl + + + 7, 3 + + + 109, 13 + + + 4 + + + Verfügbare Gruppen: + + + Label3 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage2 + + + 6 + + + 10, 19 + + + 213, 21 + + + 3 + + + cmbGroups_Group2User + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage2 + + + 7 + + + 4, 22 + + + 3, 3, 3, 3 + + + 1128, 296 + + + 1 + + + Gruppe zu Usern + + + TabPage2 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabControl1 + + + 1 + + + Fill + + + 0, 0 + + + 1132, 319 + + + 6 + TabControl1 @@ -1650,7 +2182,7 @@ 0 - 1136, 322 + 1132, 319 User-/Gruppenzuordnung @@ -1659,7 +2191,7 @@ XtraTabPage1 - DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a XtraTabControl1 @@ -1676,9 +2208,6 @@ Top, Bottom, Left - - 929, 17 - 4, 41 @@ -1710,7 +2239,7 @@ GridControl2 - DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a TabGruppendefinition @@ -2048,7 +2577,7 @@ 0, 0 - 1136, 25 + 1132, 25 1 @@ -2069,7 +2598,7 @@ 15 - 1136, 322 + 1132, 319 Gruppendefinition @@ -2078,7 +2607,7 @@ TabGruppendefinition - DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a XtraTabControl1 @@ -2095,12 +2624,6 @@ Top, Bottom, Left - - 17, 134 - - - 822, 95 - 631, 17 @@ -2150,7 +2673,7 @@ GridControlUsersinClient - DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a TabPage6 @@ -2213,7 +2736,7 @@ GridControlUser2Mandanten - DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a TabPage6 @@ -2710,9 +3233,6 @@ Mandant hinzufügen Top, Left, Right - - 264, 95 - 826, 37 @@ -2906,7 +3426,7 @@ Mandant hinzufügen 0, 0 - 1136, 322 + 1132, 319 38 @@ -2924,7 +3444,7 @@ Mandant hinzufügen 0 - 1136, 322 + 1132, 319 Mandantendefinition @@ -2933,7 +3453,7 @@ Mandant hinzufügen XtraTabPage2 - DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a XtraTabControl1 @@ -3085,6 +3605,27 @@ Mandant hinzufügen 429, 134 + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + xAAADsQBlSsOGwAAAKBJREFUOE+1kMsNwyAMhjMSM3BnCwbpiSnYgkF6YY+kF19pf4SRxaMkUYv0ycaP + TySbPET0/KBKnrTWGeSlpjCDfHgwWHggSgHXQBnvD5rW2hRjzINSgBp6SwEvee+H+VLgnKvDLeh1AhRa + QgjJGFMXkaM2mq3Pbhv8zfKfSHhnKlgxFCBK2bc7x98KrtAJ7jAVHPsrM7sz/xOcpQruQ+kNkdaQ553c + 5g4AAAAASUVORK5CYII= + + + + 172, 22 + + + Alle auswählen + + + 172, 22 + + + Auswahl aufheben + 173, 48 @@ -3094,9 +3635,6 @@ Mandant hinzufügen System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 957, 95 - 11, 29 @@ -3146,7 +3684,7 @@ Mandant hinzufügen GridControl3 - DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a XtraTabPage3 @@ -3155,7 +3693,7 @@ Mandant hinzufügen 5 - 1136, 322 + 1132, 319 Update Konfiguration User @@ -3164,7 +3702,7 @@ Mandant hinzufügen XtraTabPage3 - DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a XtraTabControl1 @@ -3176,7 +3714,7 @@ Mandant hinzufügen XtraTabControl1 - DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a $this @@ -3184,757 +3722,6 @@ Mandant hinzufügen 14 - - TabPage1 - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabControl1 - - - 0 - - - TabPage2 - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabControl1 - - - 1 - - - Fill - - - 0, 0 - - - 1136, 322 - - - 6 - - - TabControl1 - - - System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage1 - - - 0 - - - Label1 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage1 - - - 0 - - - btnRemoveUserFromGroup - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage1 - - - 1 - - - cmbGroup - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage1 - - - 2 - - - Label2 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage1 - - - 3 - - - btnAddUserToGroup - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage1 - - - 4 - - - lbGroups - - - System.Windows.Forms.ListBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage1 - - - 5 - - - 4, 22 - - - 3, 3, 3, 3 - - - 1128, 296 - - - 0 - - - User zu Gruppe - - - TabPage1 - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabControl1 - - - 0 - - - True - - - 6, 13 - - - 109, 13 - - - 2 - - - Verfügbare Gruppen: - - - Label1 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage1 - - - 0 - - - MiddleLeft - - - 382, 37 - - - 321, 23 - - - 5 - - - Benutzer aus Gruppe entfernen - - - btnRemoveUserFromGroup - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage1 - - - 1 - - - 929, 17 - - - 140, 10 - - - 236, 21 - - - 0 - - - cmbGroup - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage1 - - - 2 - - - True - - - 6, 40 - - - 118, 13 - - - 4 - - - Zugewiesene Gruppen: - - - Label2 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage1 - - - 3 - - - MiddleLeft - - - 382, 8 - - - 321, 23 - - - 1 - - - Ausgewählten Benutzer zu Gruppe hinzufügen - - - btnAddUserToGroup - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage1 - - - 4 - - - Top, Bottom, Left - - - 140, 40 - - - 236, 199 - - - 3 - - - lbGroups - - - System.Windows.Forms.ListBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage1 - - - 5 - - - True - - - GridControlWH_Users1 - - - DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - TabPage2 - - - 0 - - - GridControlUsers2Group - - - DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - TabPage2 - - - 1 - - - btndeleteUserfromGroup - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage2 - - - 2 - - - lblUserforGroup - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage2 - - - 3 - - - btnaddSelectedUser2Group - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage2 - - - 4 - - - Label4 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage2 - - - 5 - - - Label3 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage2 - - - 6 - - - cmbGroups_Group2User - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage2 - - - 7 - - - 4, 22 - - - 3, 3, 3, 3 - - - 1101, 296 - - - 1 - - - Gruppe zu Usern - - - TabPage2 - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabControl1 - - - 1 - - - Top, Bottom, Left - - - 667, 19 - - - Cyan - - - Fuchsia - - - Selection - - - True - - - 0 - - - 54 - - - True - - - 1 - - - 95 - - - True - - - 2 - - - 84 - - - 263, 227 - - - 88 - - - GridControlWH_Users1 - - - DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - TabPage2 - - - 0 - - - 822, 95 - - - Top, Bottom, Left - - - 229, 19 - - - Cyan - - - Fuchsia - - - Selection - - - True - - - 0 - - - 54 - - - True - - - 1 - - - 107 - - - True - - - 2 - - - 102 - - - 284, 227 - - - 87 - - - GridControlUsers2Group - - - DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - TabPage2 - - - 1 - - - MiddleLeft - - - NoControl - - - 936, 19 - - - 135, 53 - - - 12 - - - Benutzer aus Gruppe entfernen - - - MiddleRight - - - btndeleteUserfromGroup - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage2 - - - 2 - - - True - - - NoControl - - - 664, 3 - - - 85, 13 - - - 11 - - - User zu Gruppe: - - - lblUserforGroup - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage2 - - - 3 - - - MiddleLeft - - - NoControl - - - 519, 19 - - - 142, 46 - - - 9 - - - Gruppe und User -matchen - - - MiddleRight - - - btnaddSelectedUser2Group - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage2 - - - 4 - - - True - - - NoControl - - - 226, 3 - - - 94, 13 - - - 8 - - - User zur Auswahl: - - - Label4 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage2 - - - 5 - - - True - - - NoControl - - - 7, 3 - - - 109, 13 - - - 4 - - - Verfügbare Gruppen: - - - Label3 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage2 - - - 6 - - - 10, 19 - - - 213, 21 - - - 3 - - - cmbGroups_Group2User - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage2 - - - 7 - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - xAAADsQBlSsOGwAAAKBJREFUOE+1kMsNwyAMhjMSM3BnCwbpiSnYgkF6YY+kF19pf4SRxaMkUYv0ycaP - TySbPET0/KBKnrTWGeSlpjCDfHgwWHggSgHXQBnvD5rW2hRjzINSgBp6SwEvee+H+VLgnKvDLeh1AhRa - QgjJGFMXkaM2mq3Pbhv8zfKfSHhnKlgxFCBK2bc7x98KrtAJ7jAVHPsrM7sz/xOcpQruQ+kNkdaQ553c - 5g4AAAAASUVORK5CYII= - - - - 172, 22 - - - Alle auswählen - - - 172, 22 - - - Auswahl aufheben - 259, 56 @@ -4067,10 +3854,10 @@ matchen 765, 39 - + Cyan - + Fuchsia @@ -4119,7 +3906,7 @@ matchen GridControlUser - DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a $this @@ -4804,6 +4591,18 @@ matchen System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ToolStripSeparator4 + + + System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tsbtnExoirtExcel + + + System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + TBDD_USER_GROUPSBindingSource @@ -4826,31 +4625,31 @@ matchen GridViewWH_Users1 - DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a GridColumn3 - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a GridColumn4 - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a GridColumn5 - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a GridColumn6 - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a TBAD_UsersBindingSource @@ -4862,43 +4661,43 @@ matchen GridViewlUsers2Group - DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a colSelect - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a GridColumn1 - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a GridColumn2 - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a colID - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a GridView2 - DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a colNAME1 - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ToolStripButton1 @@ -4982,31 +4781,31 @@ matchen GridViewUsersinClient - DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a GridColumn11 - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a GridColumn12 - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a GridColumn13 - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a GridColumn14 - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a TBWH_Users2BindingSource @@ -5018,31 +4817,31 @@ matchen GridViewUser2Mandanten - DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a GridColumn7 - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a GridColumn8 - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a GridColumn9 - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a GridColumn10 - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a TBDD_CLIENTBindingSource @@ -5144,31 +4943,31 @@ matchen GridView3 - DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a GridColumn15 - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a GridColumn16 - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a GridColumn17 - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a GridColumn18 - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a VWPMO_USERS_GROUPSBindingSource @@ -5204,37 +5003,25 @@ matchen GridViewUser - DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a colUSERNAME - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a colNAME - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a colEMAIL - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - tsbtnExoirtExcel - - - System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ToolStripSeparator4 - - - System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a frmUserKonfig diff --git a/app/DD-Record-Organizer/frmUserKonfig.vb b/app/DD-Record-Organizer/frmUserKonfig.vb index 59ffd10..3fa4276 100644 --- a/app/DD-Record-Organizer/frmUserKonfig.vb +++ b/app/DD-Record-Organizer/frmUserKonfig.vb @@ -594,7 +594,7 @@ Public Class frmUserKonfig result = MessageBox.Show(msg, "Confirmation:", MessageBoxButtons.YesNo, MessageBoxIcon.Question) If result = MsgBoxResult.Yes Then Dim del = "EXEC [dbo].[PRPMO_DELETE_USER] " & USER_GUIDTextBox.Text - If ClassDatabase.Execute_non_Query(del, True) = True Then + If ClassDatabase.Execute_non_Query(del) = True Then Load_User() Else MsgBox("Unexpected Error while deleting User.", MsgBoxStyle.Exclamation)