diff --git a/app/DD-Record-Organizer/ClassControlBuilder.vb b/app/DD-Record-Organizer/ClassControlBuilder.vb index 7c1a83a..5c6c8eb 100644 --- a/app/DD-Record-Organizer/ClassControlBuilder.vb +++ b/app/DD-Record-Organizer/ClassControlBuilder.vb @@ -18,6 +18,7 @@ Public Class ClassControlBuilder Public IsInsert As Boolean Public IsEdit As Boolean + Public IsCancelCheck As Boolean = False ' +++ Constructor +++ Public Sub New(MasterPanel As Panel, @@ -738,6 +739,10 @@ Public Class ClassControlBuilder Dim CONTROL_VALUE As String = ClassControlCommandsUI.GetControlValue(control) + If CURRENT_CONTROL_VALUE_COUNT > 3 Then + + End If + If CURRENT_RECORD_ID = 0 Then Exit Sub End If @@ -772,8 +777,9 @@ Public Class ClassControlBuilder End If End Try End Sub - Public Sub OnCheckedChanged(sender As Object, ByVal e As EventArgs) + Public Sub OnCheckedChanged(sender As Object, ByVal e As DevExpress.Data.SelectionChangedEventArgs) If CURRENT_RECORD_ENABLED = False Then Exit Sub + If IsCancelCheck = True Then Exit Sub Try Dim GridView As DevExpress.XtraGrid.Views.Grid.GridView = sender @@ -797,7 +803,37 @@ Public Class ClassControlBuilder Exit Sub End If - + If CURRENT_CONTROL_VALUE_COUNT > 3 Then + Dim msgtitle = "Mehr als 3 Werte gewählt:" + If USER_LANGUAGE <> "de-DE" Then + msgtitle = "More than 3 values selected:" + End If + Dim msg = String.Format("Sind Sie sicher dass Sie '{0}' Werte hinterlegen wollen?", CURRENT_CONTROL_VALUE_COUNT) + If USER_LANGUAGE <> "de-DE" Then + msg = String.Format("Do You really want to add '{0}' values?", CURRENT_CONTROL_VALUE_COUNT) + End If + Dim result As MsgBoxResult + result = MessageBox.Show(msg, msgtitle, MessageBoxButtons.YesNo, MessageBoxIcon.Question) + If result = MsgBoxResult.No Then + Dim type = control.GetType().Name + Select Case type + Case "GridControl" + Dim chk_grid As DevExpress.XtraGrid.GridControl + chk_grid = DirectCast(control, DevExpress.XtraGrid.GridControl) + Dim gridview1 As DevExpress.XtraGrid.Views.Grid.GridView = chk_grid.MainView + gridview1.ClearSelection() + IsCancelCheck = True + 'For Each index As Integer In GridView.GetSelectedRows() + ' gridview1.UnselectRow(index) + ' 'Dim fieldName As String = GridView.Columns(0).FieldName + ' 'Dim value As String = GridView.GetRowCellValue(index, fieldName) + ' 'GridView. + 'Next + End Select + IsCancelCheck = False + Exit Sub + End If + End If ' Da wir beim Klick auf Hinzfügen einen Record anlegen, ' muss UpdateMultipleValues auch aufgerufen werden, wenn wir IsInsert = True ist 'If CtrlCommandUI.IsInsert = False Then diff --git a/app/DD-Record-Organizer/ClassControlCommandsUI.vb b/app/DD-Record-Organizer/ClassControlCommandsUI.vb index f829259..6b7a393 100644 --- a/app/DD-Record-Organizer/ClassControlCommandsUI.vb +++ b/app/DD-Record-Organizer/ClassControlCommandsUI.vb @@ -507,7 +507,10 @@ Public Class ClassControlCommandsUI UpsertImage(id, RecordID, ctrl.BackgroundImage) Continue For End If + If TypeOf ctrl Is DevExpress.XtraEditors.DateEdit Then + Console.WriteLine("Updating DateEdit " + ctrl.Name) + End If If TypeOf ctrl Is GroupBox Then Dim ctrls As Control.ControlCollection = DirectCast(ctrl, GroupBox).Controls UpdateAllControls(FormID, RecordID, ctrls) @@ -603,7 +606,7 @@ Public Class ClassControlCommandsUI Dim oldValues = dt.AsEnumerable().Select(Of String)(Function(r) Return r.Item("VALUE") End Function).ToList() - If IsNothing(value) And dt.Rows.Count = 0 Then + If (IsNothing(value) Or value = String.Empty) And dt.Rows.Count = 0 Then Exit Sub End If Dim values As New List(Of String) @@ -615,6 +618,7 @@ Public Class ClassControlCommandsUI End If 'Dim values As New List(Of String)(value.Split(";")) Dim AddValues = values.Except(oldValues).ToList() + Dim RemoveValues = oldValues.Except(values).ToList() For Each _addValue As String In AddValues If Not _addValue = "" Then @@ -658,7 +662,13 @@ Public Class ClassControlCommandsUI If IsDBNull(Value) Or IsNothing(Value) Then Return "" Else - Return DirectCast(ctrl, DevExpress.XtraEditors.DateEdit).DateTime.ToString("yyyy-MM-dd") + Dim datevalue = DirectCast(ctrl, DevExpress.XtraEditors.DateEdit).DateTime.ToString("yyyy-MM-dd") + If datevalue = "0001-01-01" Then + Return "" + Else + Return datevalue + End If + End If Case "PictureBox" 'Return "PictureBox" 'Es ist egal was für ein String hier zurückgegeben wird, hauptsache nicht Nothing @@ -778,7 +788,7 @@ Public Class ClassControlCommandsUI Dim value As String = gridview.GetRowCellValue(index, fieldName) result.Add(value) Next - + CURRENT_CONTROL_VALUE_COUNT = result.Count result_string = String.Join(";", result) If Not IsNothing(result_string) Then @@ -889,7 +899,9 @@ Public Class ClassControlCommandsUI _result = 0 End If Catch ex As Exception - ClassHelper.MSGBOX_Handler("ERROR", "Error", "Error in CreateControlProcedure: ", ex.Message) + Dim name = clsDatabase.Execute_Scalar("SELECT NAME FROM TBPMO_CONTROL WHERE GUID = " & ControlID, True) + MsgBox(ex.Message, MsgBoxStyle.Critical, "Error in CreateControlProcedure für Control: " & name) + ClassLogger.Add("Error in CreateControlProcedure: " & ex.Message, True) Return 0 End Try End Function diff --git a/app/DD-Record-Organizer/ClassDOC_SEARCH.vb b/app/DD-Record-Organizer/ClassDOC_SEARCH.vb index 978d289..f8d9711 100644 --- a/app/DD-Record-Organizer/ClassDOC_SEARCH.vb +++ b/app/DD-Record-Organizer/ClassDOC_SEARCH.vb @@ -61,16 +61,16 @@ Public Class ClassDOC_SEARCH Dim SQL_DOC_SEARCH If CURRENT_SEARCH_TYPE = "ENTITY" Then SQL_DOC_SEARCH = String.Format("SELECT DISTINCT T.*," & vbNewLine & - "[dbo].[FNPMO_GET_CONTROL_VALUES_DOC_ENTITY] ({3},T.DocID,{0}) AS OPTION1," & vbNewLine & - "[dbo].[FNPMO_GET_CONTROL_VALUES_DOC_ENTITY] ({4},T.DocID,{0}) AS OPTION2," & vbNewLine & - "[dbo].[FNPMO_DOC_GET_IDX] (T.DocID,{0},'DOCIDX1') AS DOCIDX1," & vbNewLine & - "[dbo].[FNPMO_DOC_GET_IDX] (T.DocID,{0},'DOCIDX2') AS DOCIDX2," & vbNewLine & - "[dbo].[FNPMO_DOC_GET_IDX] (T.DocID,{0},'DOCIDX3') AS DOCIDX3," & vbNewLine & - "[dbo].[FNPMO_DOC_GET_IDX] (T.DocID,{0},'DOCIDX4') AS DOCIDX4," & vbNewLine & - "[dbo].[FNPMO_DOC_GET_DROPDOWN_VALUE] (T.DocID,{0},'DROPDOWN1','{1}',0) AS DROPDOWN1," & vbNewLine & - "[dbo].[FNPMO_DOC_GET_DROPDOWN_VALUE] (T.DocID,{0},'DROPDOWN2','{1}',0) AS DROPDOWN2," & vbNewLine & - "[dbo].[FNPMO_DOC_GET_DROPDOWN_VALUE] (T.DocID,{0},'DROPDOWN3','{1}',0) AS DROPDOWN3," & vbNewLine & - "[dbo].[FNPMO_DOC_GET_DROPDOWN_VALUE] (T.DocID,{0},'DROPDOWN4','{1}',0) AS DROPDOWN4" & vbNewLine & + "'NO OPTION IN ENTITY-SEARCH' AS OPTION1," & vbNewLine & + "'NO OPTION IN ENTITY-SEARCH' AS OPTION2," & vbNewLine & + "'NO INDEX IN ENTITY-SEARCH' AS DOCIDX1," & vbNewLine & + "'NO INDEX IN ENTITY-SEARCH' AS DOCIDX2," & vbNewLine & + "'NO INDEX IN ENTITY-SEARCH' AS DOCIDX3," & vbNewLine & + "'NO INDEX IN ENTITY-SEARCH' AS DOCIDX4," & vbNewLine & + "'NO DROPDOWN IN ENTITY-SEARCH' AS DROPDOWN1," & vbNewLine & + "'NO DROPDOWN IN ENTITY-SEARCH' AS DROPDOWN2," & vbNewLine & + "'NO DROPDOWN IN ENTITY-SEARCH' AS DROPDOWN3," & vbNewLine & + "'NO DROPDOWN IN ENTITY-SEARCH' AS DROPDOWN4" & vbNewLine & "FROM " & vbNewLine & "VWPMO_DOC_SEARCH T" & vbNewLine & "WHERE T.DocID IN (select DISTINCT T.DOC_ID from TBPMO_DOC_RECORD_LINK T, TBPMO_RECORD T1 WHERE T.RECORD_ID = T1.GUID AND T1.FORM_ID = {0}) " & vbNewLine & diff --git a/app/DD-Record-Organizer/ClassRecordCommands.vb b/app/DD-Record-Organizer/ClassRecordCommands.vb index d63ac73..05fae77 100644 --- a/app/DD-Record-Organizer/ClassRecordCommands.vb +++ b/app/DD-Record-Organizer/ClassRecordCommands.vb @@ -23,14 +23,16 @@ Public Class ClassRecordCommands Dim GUID As Integer = cmd.Parameters("@pRESULT").Value If GUID > 0 And clsDatabase.DB_PROXY_INITIALIZED = True Then If ClassProxy.PRPROXY_RECORD_UPD_INS(formId, GUID) = True Then - ClassProxy.PRPROXY_CONTROL_VALUE_RENEW(GUID) + ClassProxy.PRPROXY_CONTROL_VALUE_RENEW(GUID) End If End If Return GUID End Using Catch ex As Exception - ClassHelper.MSGBOX_Handler("ERROR", "Error", "Error in CreateRecordProcedure: ", ex.Message) + MsgBox(ex.Message, MsgBoxStyle.Critical, "Error in CreateRecordProcedure: ") + ClassLogger.Add("Error in CreateRecordProcedure: " & ex.Message, True) + ClassHelper.InsertEssential_Log(formId, "ENTITY-ID", "ENTITY-ID: " & formId & ": " & ex.Message) Return 0 End Try End Function @@ -50,7 +52,7 @@ Public Class ClassRecordCommands Return ClassDatabase.Execute_non_Query(SQL) End Function Public Shared Function CHECK_RECORD_FINAL(RecordId As Integer, IsInsert As Boolean) - Dim SQL = String.Format("EXEC PRPMO_RECORD_CHECK_INTEGRITY {0},{1},{2}", RecordId, Environment.UserName, IsInsert) + Dim SQL = String.Format("EXEC PRPMO_RECORD_CHECK_INTEGRITY {0},'{1}',{2}", RecordId, Environment.UserName, IsInsert) Return ClassDatabase.Execute_non_Query(SQL) End Function diff --git a/app/DD-Record-Organizer/ClassUpdate.vb b/app/DD-Record-Organizer/ClassUpdate.vb index 637edad..9877b5e 100644 --- a/app/DD-Record-Organizer/ClassUpdate.vb +++ b/app/DD-Record-Organizer/ClassUpdate.vb @@ -71,7 +71,7 @@ Public Class ClassUpdate End If Next If RecExe_found = False Then - MsgBox("Could not find the path for RecordOrganizer - Please check your installation!", MsgBoxStyle.Critical) + ClassLogger.Add("Could not find the path for RecordOrganizer", True) Return False End If End If diff --git a/app/DD-Record-Organizer/ClassUser.vb b/app/DD-Record-Organizer/ClassUser.vb index 11f0413..0130deb 100644 --- a/app/DD-Record-Organizer/ClassUser.vb +++ b/app/DD-Record-Organizer/ClassUser.vb @@ -3,11 +3,7 @@ Public Shared Sub LogoutUser() Try Dim SQL - - SQL = $"UPDATE TBDD_USER SET LOGGED_IN = {0}, LOGGED_WHERE = '' WHERE LOWER(USERNAME) = LOWER('{USER_USERNAME}')" - ClassDatabase.Execute_non_Query(sql) - - sql = $"DELETE FROM TBDD_USER_MODULE_LOG_IN WHERE USER_ID = {USER_GUID} AND MODULE = 'Record-Organizer'" + SQL = $"DELETE FROM TBDD_USER_MODULE_LOG_IN WHERE USER_ID = {USER_GUID} AND MODULE = 'Record-Organizer'" ClassDatabase.Execute_non_Query(sql) Catch ex As Exception ClassLogger.Add("Error while logging out user: " & ex.Message) diff --git a/app/DD-Record-Organizer/ModuleRuntimeVariables.vb b/app/DD-Record-Organizer/ModuleRuntimeVariables.vb index 1567ef6..2c79eca 100644 --- a/app/DD-Record-Organizer/ModuleRuntimeVariables.vb +++ b/app/DD-Record-Organizer/ModuleRuntimeVariables.vb @@ -166,4 +166,7 @@ Public MSG_LABLE2 As String Public MSG_ERROR2 As String + Public INSERT_IN_ACTION As Boolean = False + Public CURRENT_CONTROL_VALUE_COUNT As Integer = 1 + End Module diff --git a/app/DD-Record-Organizer/My Project/AssemblyInfo.vb b/app/DD-Record-Organizer/My Project/AssemblyInfo.vb index bc4713e..8b5f431 100644 --- a/app/DD-Record-Organizer/My Project/AssemblyInfo.vb +++ b/app/DD-Record-Organizer/My Project/AssemblyInfo.vb @@ -33,7 +33,7 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - + \ No newline at end of file diff --git a/app/DD-Record-Organizer/frmConstructorDesigner.Designer.vb b/app/DD-Record-Organizer/frmConstructorDesigner.Designer.vb index 1732182..490d599 100644 --- a/app/DD-Record-Organizer/frmConstructorDesigner.Designer.vb +++ b/app/DD-Record-Organizer/frmConstructorDesigner.Designer.vb @@ -47,8 +47,8 @@ Partial Class frmConstructorDesigner Dim Label19 As System.Windows.Forms.Label Dim SQL_RIGHT_READ_AND_VIEW_ONLYLabel As System.Windows.Forms.Label Dim SQL_RIGHT_WINDREAM_VIEWLabel As System.Windows.Forms.Label - Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Me.DD_ECMAdmin = New DD_Record_Organizer.DD_ECMAdmin() Me.TBPMO_FORM_CONSTRUCTORBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.TBPMO_FORM_CONSTRUCTORTableAdapter = New DD_Record_Organizer.DD_ECMAdminTableAdapters.TBPMO_FORM_CONSTRUCTORTableAdapter() @@ -1250,8 +1250,8 @@ Partial Class frmConstructorDesigner ' Me.dgvResult.AllowUserToAddRows = False Me.dgvResult.AllowUserToDeleteRows = False - DataGridViewCellStyle3.BackColor = System.Drawing.Color.Cyan - Me.dgvResult.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle3 + DataGridViewCellStyle1.BackColor = System.Drawing.Color.Cyan + Me.dgvResult.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 resources.ApplyResources(Me.dgvResult, "dgvResult") Me.dgvResult.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvResult.Name = "dgvResult" @@ -1261,8 +1261,8 @@ Partial Class frmConstructorDesigner ' Me.dgvPlaceholders.AllowUserToAddRows = False Me.dgvPlaceholders.AllowUserToDeleteRows = False - DataGridViewCellStyle4.BackColor = System.Drawing.Color.Cyan - Me.dgvPlaceholders.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle4 + DataGridViewCellStyle2.BackColor = System.Drawing.Color.Cyan + Me.dgvPlaceholders.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2 Me.dgvPlaceholders.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvPlaceholders.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.colPlaceholder, Me.colReplace}) resources.ApplyResources(Me.dgvPlaceholders, "dgvPlaceholders") diff --git a/app/DD-Record-Organizer/frmConstructorDesigner.resx b/app/DD-Record-Organizer/frmConstructorDesigner.resx index b519baf..71e4daa 100644 --- a/app/DD-Record-Organizer/frmConstructorDesigner.resx +++ b/app/DD-Record-Organizer/frmConstructorDesigner.resx @@ -1070,6 +1070,12 @@ 180, 134 + + 153, 22 + + + Form-Designer + 154, 26 @@ -1093,7 +1099,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABS - CQAAAk1TRnQBSQFMAgEBAgEAAQwBDQEMAQ0BEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CQAAAk1TRnQBSQFMAgEBAgEAARwBDQEcAQ0BEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -1142,7 +1148,7 @@ 1 - 292, 349 + 292, 352 1 @@ -1159,12 +1165,6 @@ 3 - - 153, 22 - - - Form-Designer - Segoe UI, 8.25pt, style=Italic @@ -1715,7 +1715,7 @@ 20 - 1086, 274 + 1094, 280 Allgemein und Rechte pro Datensatz @@ -1733,7 +1733,7 @@ 1 - 1092, 302 + 1096, 305 35 @@ -1741,495 +1741,6 @@ True - - Button2 - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage5 - - - 0 - - - lblQuickViewAdded - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage5 - - - 1 - - - btnSetQuickViewPicture - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage5 - - - 2 - - - txtQuickViewPicture - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage5 - - - 3 - - - Label8 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage5 - - - 4 - - - lblChangeHeadline - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage5 - - - 5 - - - btnSetHeadline - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage5 - - - 6 - - - btndeleteControl - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage5 - - - 7 - - - btnAddControl - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage5 - - - 8 - - - ListBoxConfiguredDisplay - - - System.Windows.Forms.ListBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage5 - - - 9 - - - Label6 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage5 - - - 10 - - - Label5 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage5 - - - 11 - - - listBoxControls - - - System.Windows.Forms.ListBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage5 - - - 12 - - - Label3 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage5 - - - 13 - - - 1086, 274 - - - Quick-View Konfiguration - - - XtraTabPage5 - - - DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - XtraTabControl2 - - - 0 - - - True - - - chkActivateDSOnEdit - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage4 - - - 0 - - - chkDOC_SEARCH_TAB1 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage4 - - - 1 - - - XtraTabControlSV - - - DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - XtraTabPage4 - - - 2 - - - chkWDSearch_Active - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage4 - - - 3 - - - lblSaveDocSearch - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage4 - - - 4 - - - 1086, 274 - - - Datei-Suche/Rechte (Supervisor) - - - XtraTabPage4 - - - DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - XtraTabControl2 - - - 2 - - - TabControl1 - - - System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage2 - - - 0 - - - 1086, 274 - - - Einschränkungen Datensätze User - - - XtraTabPage2 - - - DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - XtraTabControl2 - - - 3 - - - btndeleteEntityfromClient - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage6 - - - 0 - - - lblUser2Client - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage6 - - - 1 - - - chklbxEntitiesforClient - - - System.Windows.Forms.CheckedListBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage6 - - - 2 - - - btnsaddUser2Client - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage6 - - - 3 - - - Label18 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage6 - - - 4 - - - chklbxClient - - - System.Windows.Forms.CheckedListBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage6 - - - 5 - - - 1086, 274 - - - Zuordnung Entität-Client - - - XtraTabPage6 - - - DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - XtraTabControl2 - - - 4 - - - XtraTabControl2 - - - DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - XtraTabPage1 - - - 0 - - - 914, 95 - - - 292, 327 - - - 1092, 22 - - - 35 - - - StatusStrip1 - - - StatusStrip1 - - - System.Windows.Forms.StatusStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage1 - - - 1 - - - 807, 95 - - - 292, 0 - - - 1092, 25 - - - 34 - - - ToolStrip1 - - - ToolStrip1 - - - System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage1 - - - 2 - - - 1384, 349 - - - Entitäten-Übersicht - - - XtraTabPage1 - - - DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - XtraTabControl1 - - - 0 - - - 1390, 377 - - - 40 - - - XtraTabControl1 - - - DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - $this - - - 14 - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29m @@ -2672,6 +2183,27 @@ 13 + + 1090, 277 + + + Quick-View Konfiguration + + + XtraTabPage5 + + + DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + XtraTabControl2 + + + 0 + + + True + True @@ -2735,252 +2267,6 @@ 18, 31 - - Label20 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage7 - - - 0 - - - GridControl2 - - - DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - XtraTabPage7 - - - 1 - - - Label7 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage7 - - - 2 - - - Label9 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage7 - - - 3 - - - Label11 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage7 - - - 4 - - - cmbRight - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage7 - - - 5 - - - GridControlSupervisorAdd - - - DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - XtraTabPage7 - - - 6 - - - btnDeleteUserSupervisor - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage7 - - - 7 - - - btnAddUser2Supervisor - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage7 - - - 8 - - - 942, 212 - - - Supervisor - - - XtraTabPage7 - - - DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - XtraTabControlSV - - - 0 - - - 948, 240 - - - 83 - - - btndeleteSupervisorControl - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage8 - - - 0 - - - btnAddSupervisorControl - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage8 - - - 1 - - - Label13 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage8 - - - 2 - - - Label15 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage8 - - - 3 - - - cmbSupervisorControls - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage8 - - - 4 - - - CheckedListBoxSupervisorControls - - - System.Windows.Forms.CheckedListBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage8 - - - 5 - - - Label14 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage8 - - - 6 - - - 942, 212 - - - Supervisor-Controls: - - - XtraTabPage8 - - - DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - XtraTabControlSV - - - 1 - - - XtraTabControlSV - - - DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - XtraTabPage4 - - - 2 - True @@ -3069,7 +2355,7 @@ 190 - 393, 176 + 393, 179 99 @@ -3267,7 +2553,7 @@ 167 - 377, 176 + 377, 179 98 @@ -3382,6 +2668,30 @@ 8 + + 946, 215 + + + Supervisor + + + XtraTabPage7 + + + DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + XtraTabControlSV + + + 0 + + + 948, 240 + + + 83 + Tahoma, 8.25pt @@ -3560,7 +2870,7 @@ 409, 47 - 253, 36 + 253, 20 95 @@ -3610,6 +2920,36 @@ 6 + + 942, 212 + + + Supervisor-Controls: + + + XtraTabPage8 + + + DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + XtraTabControlSV + + + 1 + + + XtraTabControlSV + + + DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + XtraTabPage4 + + + 2 + True @@ -3673,264 +3013,27 @@ 4 - - TabPage1 + + 1090, 277 - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Datei-Suche/Rechte (Supervisor) - - TabControl1 + + XtraTabPage4 - - 0 + + DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - TabPage2 + + XtraTabControl2 - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabControl1 - - - 1 - - - Fill - - - 0, 0 - - - 1086, 274 - - - 0 - - - TabControl1 - - - System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage2 - - - 0 + + 2 True - - GridControlUserSQL - - - DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - TabPage1 - - - 0 - - - Label12 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage1 - - - 1 - - - Label17 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage1 - - - 2 - - - dgvResult - - - System.Windows.Forms.DataGridView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage1 - - - 3 - - - dgvPlaceholders - - - System.Windows.Forms.DataGridView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage1 - - - 4 - - - btnTestSQL - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage1 - - - 5 - - - btnAddUserSQL - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage1 - - - 6 - - - lblsaveSQLUser - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage1 - - - 7 - - - CHANGED_WHENTextBox2 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage1 - - - 9 - - - CHANGED_WHOTextBox2 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage1 - - - 11 - - - ADDED_WHENTextBox2 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage1 - - - 13 - - - ADDED_WHOTextBox2 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage1 - - - 15 - - - SQL_COMMANDTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage1 - - - 17 - - - GUIDTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage1 - - - 19 - - - Label10 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage1 - - - 20 - - - 4, 22 - - - 3, 3, 3, 3 - - - 1078, 248 - - - 0 - - - Einschränkung Datensätze - - - TabPage1 - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabControl1 - - - 0 - Top, Bottom, Left @@ -4228,6 +3331,9 @@ 344, 173 + + 299, 134 + Tahoma, 8.25pt, style=Italic @@ -4252,15 +3358,6 @@ 9 - - 344, 173 - - - 299, 134 - - - 299, 134 - Tahoma, 8.25pt, style=Italic @@ -4417,6 +3514,33 @@ 20 + + 4, 22 + + + 3, 3, 3, 3 + + + 1078, 248 + + + 0 + + + Einschränkung Datensätze + + + TabPage1 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabControl1 + + + 0 + 4, 22 @@ -4444,6 +3568,48 @@ 1 + + Fill + + + 0, 0 + + + 1090, 277 + + + 0 + + + TabControl1 + + + System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + XtraTabPage2 + + + 0 + + + 1090, 277 + + + Einschränkungen Datensätze User + + + XtraTabPage2 + + + DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + XtraTabControl2 + + + 3 + MiddleLeft @@ -4619,6 +3785,39 @@ Mandanten hinzu 5 + + 1090, 277 + + + Zuordnung Entität-Client + + + XtraTabPage6 + + + DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + XtraTabControl2 + + + 4 + + + XtraTabControl2 + + + DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + XtraTabPage1 + + + 0 + + + 914, 95 + 191, 17 @@ -4628,6 +3827,33 @@ Mandanten hinzu False + + 292, 330 + + + 1096, 22 + + + 35 + + + StatusStrip1 + + + StatusStrip1 + + + System.Windows.Forms.StatusStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + XtraTabPage1 + + + 1 + + + 807, 95 + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 @@ -4645,6 +3871,66 @@ Mandanten hinzu Speichern + + 292, 0 + + + 1096, 25 + + + 34 + + + ToolStrip1 + + + ToolStrip1 + + + System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + XtraTabPage1 + + + 2 + + + 1388, 352 + + + Entitäten-Übersicht + + + XtraTabPage1 + + + DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + XtraTabControl1 + + + 0 + + + 1390, 377 + + + 40 + + + XtraTabControl1 + + + DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + $this + + + 14 + 442, 134 diff --git a/app/DD-Record-Organizer/frmConstructor_Main.Designer.vb b/app/DD-Record-Organizer/frmConstructor_Main.Designer.vb index 56e7eea..5a35cdb 100644 --- a/app/DD-Record-Organizer/frmConstructor_Main.Designer.vb +++ b/app/DD-Record-Organizer/frmConstructor_Main.Designer.vb @@ -1,9 +1,9 @@ - _ + Partial Class frmConstructor_Main Inherits System.Windows.Forms.Form 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. - _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) Try If disposing AndAlso components IsNot Nothing Then @@ -20,7 +20,7 @@ Partial Class frmConstructor_Main 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich. 'Das Bearbeiten ist mit dem Windows Form-Designer möglich. 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. - _ + Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmConstructor_Main)) @@ -110,7 +110,6 @@ Partial Class frmConstructor_Main Me.tslblLocked = New System.Windows.Forms.ToolStripLabel() Me.tslblFileslocked = New System.Windows.Forms.ToolStripLabel() Me.TabPos = New DevExpress.XtraTab.XtraTabPage() - Me.Panel1 = New System.Windows.Forms.Panel() Me.GridControlPos = New DevExpress.XtraGrid.GridControl() Me.grvwGridPos = New DevExpress.XtraGrid.Views.Grid.GridView() Me.BindingNavigatorPOS = New System.Windows.Forms.BindingNavigator(Me.components) @@ -244,7 +243,6 @@ Partial Class frmConstructor_Main Me.statStripDoc.SuspendLayout() Me.ToolStripEdit.SuspendLayout() Me.TabPos.SuspendLayout() - Me.Panel1.SuspendLayout() CType(Me.GridControlPos, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.grvwGridPos, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.BindingNavigatorPOS, System.ComponentModel.ISupportInitialize).BeginInit() @@ -813,19 +811,13 @@ Partial Class frmConstructor_Main ' 'TabPos ' - Me.TabPos.Controls.Add(Me.Panel1) + Me.TabPos.Controls.Add(Me.GridControlPos) Me.TabPos.Controls.Add(Me.BindingNavigatorPOS) Me.TabPos.Image = CType(resources.GetObject("TabPos.Image"), System.Drawing.Image) Me.TabPos.Name = "TabPos" Me.TabPos.PageVisible = False resources.ApplyResources(Me.TabPos, "TabPos") ' - 'Panel1 - ' - Me.Panel1.Controls.Add(Me.GridControlPos) - resources.ApplyResources(Me.Panel1, "Panel1") - Me.Panel1.Name = "Panel1" - ' 'GridControlPos ' resources.ApplyResources(Me.GridControlPos, "GridControlPos") @@ -1622,7 +1614,6 @@ Partial Class frmConstructor_Main Me.ToolStripEdit.PerformLayout() Me.TabPos.ResumeLayout(False) Me.TabPos.PerformLayout() - Me.Panel1.ResumeLayout(False) CType(Me.GridControlPos, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.grvwGridPos, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.BindingNavigatorPOS, System.ComponentModel.ISupportInitialize).EndInit() @@ -1759,7 +1750,6 @@ Partial Class frmConstructor_Main Friend WithEvents tsButtonCancel As System.Windows.Forms.ToolStripButton Friend WithEvents tsbtnRedo As System.Windows.Forms.ToolStripButton Friend WithEvents SucheAnzeigenToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem - Friend WithEvents Panel1 As System.Windows.Forms.Panel Friend WithEvents MassenänderungToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem Friend WithEvents ToolStripSeparator10 As System.Windows.Forms.ToolStripSeparator Friend WithEvents docCM_linkRecord As System.Windows.Forms.ToolStripMenuItem diff --git a/app/DD-Record-Organizer/frmConstructor_Main.resx b/app/DD-Record-Organizer/frmConstructor_Main.resx index 41c8f10..bcdf970 100644 --- a/app/DD-Record-Organizer/frmConstructor_Main.resx +++ b/app/DD-Record-Organizer/frmConstructor_Main.resx @@ -1092,7 +1092,7 @@ Fill - 0, 0 + 0, 25 Cyan @@ -1113,33 +1113,9 @@ DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - Panel1 - - - 0 - - - Fill - - - 0, 25 - - - 1270, 347 - - - 2 - - - Panel1 - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - TabPos - + 0 @@ -1341,10 +1317,10 @@ - 109, 22 + 132, 22 - Ansicht gesperrt + Nur lesenden Zugriff 0, 0 @@ -2454,7 +2430,7 @@ Ansicht zurücksetzen - 252, 392 + 252, 370 ContextMenuStripResultFiles diff --git a/app/DD-Record-Organizer/frmConstructor_Main.vb b/app/DD-Record-Organizer/frmConstructor_Main.vb index a74ee25..49c278e 100644 --- a/app/DD-Record-Organizer/frmConstructor_Main.vb +++ b/app/DD-Record-Organizer/frmConstructor_Main.vb @@ -1080,7 +1080,7 @@ Public Class frmConstructor_Main tslblLocked.Visible = False tslblFileslocked.Visible = False TabFollowUp.PageEnabled = True - TabPos.PageEnabled = True + 'pnlPositions.Enabled = True TabWindream.PageEnabled = True tsbtnDoc_Refresh.Enabled = True tsmientitySearch.Enabled = True @@ -1092,7 +1092,7 @@ Public Class frmConstructor_Main tsButtonEdit.Enabled = False tslblLocked.Visible = True TabFollowUp.PageEnabled = False - TabPos.PageEnabled = False + 'pnlPositions.Enabled = False ' tsButtonShowTaskOverview.Enabled = False End If If RIGHT_READ_ONLY_DOC = True Then @@ -1703,7 +1703,7 @@ Public Class frmConstructor_Main ' IsInsert muss true sein, damit wir wissen ob wir bei ' Abbruch den Record Wieder löschen können CtrlCommandUI.IsInsert = True - + INSERT_IN_ACTION = True ' Alle Tabs außer Detailansicht deaktivierne ' DeactivateTabs() @@ -1933,6 +1933,7 @@ Public Class frmConstructor_Main End If CtrlCommandUI.IsInsert = False CtrlCommandUI.IsEdit = False + INSERT_IN_ACTION = False 'Jetzt den Record nochmal laden ' Show_Selected_Record_Data(SELECTED_RECORD_ID) Update_Status_Label(True, "Record saved - " & Now, EditState.Update) @@ -1978,6 +1979,7 @@ Public Class frmConstructor_Main DisableEditMode() CtrlCommandUI.IsInsert = False + INSERT_IN_ACTION = False EDIT_STATE = EditState.None RECORD_CHANGED = False SAVE_ROUTINE_ACTIVE = False @@ -2884,6 +2886,7 @@ Public Class frmConstructor_Main End If CtrlCommandUI.IsEdit = False CtrlCommandUI.IsInsert = False + INSERT_IN_ACTION = False RECORD_CHANGED = False End If End Sub @@ -4114,6 +4117,7 @@ Public Class frmConstructor_Main tslblPoslocked.Visible = False BindingNavigatorAddNewItem.Enabled = True BindingNavigatorDeleteItem.Enabled = True + tsbtnWork.Enabled = True grvwGridPos.OptionsBehavior.ReadOnly = False If USER_LANGUAGE = "de-DE" Then stg = "Bearbeiten beenden" @@ -4130,6 +4134,7 @@ Public Class frmConstructor_Main tslblPoslocked.Visible = True BindingNavigatorAddNewItem.Enabled = False BindingNavigatorDeleteItem.Enabled = False + tsbtnWork.Enabled = False grvwGridPos.OptionsBehavior.ReadOnly = True End If Me.tsbtnWork.Text = stg @@ -5247,6 +5252,7 @@ Public Class frmConstructor_Main tsButtonAdd.Enabled = True End If CtrlCommandUI.IsInsert = False + INSERT_IN_ACTION = False RECORD_CHANGED = False ' Den derzeitigen Record Neuladen @@ -5390,7 +5396,10 @@ Public Class frmConstructor_Main Else ' Änderungen sollen nicht gespeichert werden ' Angelegten Record löschen If CtrlCommandUI.IsInsert Then - ClassHelper.DeleteRecord(SELECTED_RECORD_ID, "TrySave - UserdecidedNotToSave - ENTITY-ID: " & CURRENT_ENTITY_ID) + If ClassHelper.DeleteRecord(SELECTED_RECORD_ID, "TrySave - UserdecidedNotToSave - ENTITY-ID: " & CURRENT_ENTITY_ID) = True Then + CtrlCommandUI.IsInsert = False + INSERT_IN_ACTION = False + End If End If ' Änderungen sollen nicht gespeichert werden @@ -5909,6 +5918,7 @@ Public Class frmConstructor_Main Private Sub TreeViewMain_DragDrop(sender As Object, e As DragEventArgs) Handles TreeViewMain.DragDrop Try + If Not IsNothing(e.Data) Then Me.Cursor = Cursors.WaitCursor Dim pt As Point @@ -5948,6 +5958,22 @@ Public Class frmConstructor_Main Save_Grid_Layout() For Each _RECORD As String In e.Data.GetData(GetType(String())) + 'hh + ClassRightManagement.Check_Set_Rights(_RECORD, ENTITY_ID) + If RIGHT_EDIT_R = False Then + msg = String.Format("USER {0} WANTED TO CHANGE ENTITY OF RECORD {1} to {2} but was rejected due to rights", USER_USERNAME, _RECORD, ENTITY_STRING) + ClassHelper.InsertEssential_Log(_RECORD, "RECORD-ID", msg) + Continue For + End If + Dim sql1 = String.Format("SELECT [dbo].[FNPMO_CUST_ALLOW_ENTITY_RELINK] ({0},{1})", _RECORD, USER_GUID) + If ClassDatabase.Execute_Scalar(sql1, True) = 0 Then + msg = String.Format("Verschieben von Datensatz {0} nicht möglich. Kriterien nicht erfüllt!", _RECORD.ToString) + If USER_LANGUAGE <> "de-DE" Then + msg = String.Format("Changing of entity-link for record {0}not possible - Criteria is invalid!", _RECORD.ToString) + End If + MsgBox(msg, MsgBoxStyle.Information) + Continue For + End If ClassLogger.Add(String.Format("Relinking entity of record '{0}' to entity '{1}'?", _RECORD, ENTITY_STRING.ToString), False) Dim upd = String.Format("UPDATE TBPMO_RECORD SET FORM_ID = {0} where GUID = {1}", node_tag, _RECORD) @@ -5977,15 +6003,26 @@ Public Class frmConstructor_Main ClassDatabase.Execute_non_Query(upd, True) End If Next + Dim execsql = String.Format("EXEC PRPMO_DELETE_RECORD_PMO_TABLE {0},{1}", ENTITY_ID, _RECORD) + If ClassDatabase.Execute_non_Query(execsql) = True Then + If DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED = True Then + ClassDatabase.Execute_non_Query(execsql, True) + End If + End If + execsql = String.Format("EXEC PRPMO_ENTITY_TABLE_RENEW_RECORD {0},{1}", node_tag, _RECORD) + If ClassDatabase.Execute_non_Query(execsql) = True Then + ClassDatabase.Execute_non_Query(execsql, True) + End If + End If Next - msg = String.Format("Der Datensatz wurde erfolgreich auf die Entität {0} verlinked!", ENTITY_STRING.ToString) + msg = String.Format("Datensatz/-sätze erfolgreich auf die Entität {0} verlinked (wenn Kriterien erfüllt)!", ENTITY_STRING.ToString) If USER_LANGUAGE <> "de-DE" Then - msg = String.Format("The record was successfully relinked with entity {0}", ENTITY_STRING.ToString) + msg = String.Format("The record/s was/were successfully relinked with entity {0} (if criteria matched)", ENTITY_STRING.ToString) End If MsgBox(msg, MsgBoxStyle.Information) If DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED = True Then - msg = "Sie benutzen einen Proxyserver. Die Daten des neu verlinkten Datensatzes werden Sie erst nach vollständiger Proxysynchronisation einsehen können!" + msg = "Sie benutzen einen Proxyserver. Die Daten des neu verlinkten Datensatzes werden Sie evtl. erst nach vollständiger Proxysynchronisation einsehen können!" If USER_LANGUAGE <> "de-DE" Then msg = String.Format("You are using a proxy-Server. The new linked record in entity '{0}' will only be displayed after a full synchronisation!", ENTITY_STRING) End If @@ -6796,5 +6833,13 @@ Public Class frmConstructor_Main End Sub - + Private Sub tslblPoslocked_VisibleChanged(sender As Object, e As EventArgs) Handles tslblPoslocked.VisibleChanged + If tslblPoslocked.Visible = True Then + Dim msg = "Nur lesenden Zugriff" + If USER_LANGUAGE <> "de-DE" Then + msg = "Positions are read only" + End If + tslblPoslocked.Text = msg + End If + End Sub End Class \ No newline at end of file diff --git a/app/DD-Record-Organizer/frmEntities.vb b/app/DD-Record-Organizer/frmEntities.vb index c54ac73..28514fa 100644 --- a/app/DD-Record-Organizer/frmEntities.vb +++ b/app/DD-Record-Organizer/frmEntities.vb @@ -309,6 +309,16 @@ Public Class frmEntities End Sub Private Sub btninsert_Click(sender As Object, e As EventArgs) Handles btninsert.Click + Dim anz_ent = ClassDatabase.Execute_Scalar("SELECT Count(GUID) FROM TBPMO_FORM where PARENT_ID = 0 and FORM_TYPE_ID = 1") + anz_ent += 1 + If anz_ent > LICENSE_DOSSIER_COUNT Then + Dim msg = String.Format("Die Anzahl an lizensierten Sichten/Akten {0} ist erreicht! Bitte kontaktieren Sie Digital Data!", LICENSE_DOSSIER_COUNT.ToString) + If USER_LANGUAGE <> "de-DE" Then + msg = String.Format("The number of licensed views {0} was reached! Please contact Digital Data", LICENSE_DOSSIER_COUNT.ToString) + End If + MsgBox(msg, MsgBoxStyle.Exclamation) + Exit Sub + End If TBPMO_FORMBindingSource.AddNew() End Sub diff --git a/app/DD-Record-Organizer/frmMain.vb b/app/DD-Record-Organizer/frmMain.vb index bdbac2f..192b391 100644 --- a/app/DD-Record-Organizer/frmMain.vb +++ b/app/DD-Record-Organizer/frmMain.vb @@ -182,6 +182,17 @@ Public Class frmMain If ERROR_INIT = "INVALID USER" Then Exit Sub End If + If frmConstructor_Main.IsHandleCreated Then + If INSERT_IN_ACTION = True Then + Dim msg = "Bitte schliessen Sie zuerst das Hinzufügen des Datensatzes ab!" + If USER_LANGUAGE <> "de-DE" Then + msg = "Please finish Your Adding-Procedure first!" + End If + MsgBox(msg, MsgBoxStyle.Information) + e.Cancel = True + End If + End If + Try ClassUser.LogoutUser() ClassWindowLocation.SaveFormLocationSize(Me, 1, CURRENT_SCREEN_ID, "frmMain") diff --git a/app/DD-Record-Organizer/frmMass_Change.vb b/app/DD-Record-Organizer/frmMass_Change.vb index bfe6f93..f7fbf2a 100644 --- a/app/DD-Record-Organizer/frmMass_Change.vb +++ b/app/DD-Record-Organizer/frmMass_Change.vb @@ -35,10 +35,11 @@ Public Class frmMass_Change If USER_LANGUAGE <> "de-DE" Then msg = "Are You sure You want to execute this mass change?" & vbNewLine & MASS_RECORD_IDs2CHANGE.Count.ToString & " records will be changed!" End If - Cursor = Cursors.WaitCursor + Dim result As MsgBoxResult result = MessageBox.Show(msg, "Confirmation:", MessageBoxButtons.YesNo, MessageBoxIcon.Question) If result = MsgBoxResult.Yes Then + Cursor = Cursors.WaitCursor ClassLogger.Add(String.Format("### Starting MassChange of column '{0}' with value '{1}'....###", cmbColumn.Text, txtNewValue.Text), False) Me.Cursor = Cursors.WaitCursor SQL = String.Format("SELECT GUID FROM TBPMO_CONTROL WHERE COL_NAME = '{0}' AND FORM_ID = {1}", cmbColumn.Text, CURRENT_ENTITY_ID) @@ -137,7 +138,7 @@ Public Class frmMass_Change _Error = True End If Else - ClassLogger.Add("No defined column found! (2)") + ClassLogger.Add("No defined column found! (2) - SQL: " & SQL) _Error = True End If diff --git a/app/DD-Record-Organizer/frmRecordView.resx b/app/DD-Record-Organizer/frmRecordView.resx index cd5459d..5a639ba 100644 --- a/app/DD-Record-Organizer/frmRecordView.resx +++ b/app/DD-Record-Organizer/frmRecordView.resx @@ -493,7 +493,7 @@ 0, 0 - 1336, 304 + 1332, 301 0 @@ -511,7 +511,7 @@ 0 - 1336, 304 + 1332, 301 Detailansicht @@ -553,7 +553,7 @@ 14, 35 - 263, 129 + 263, 126 8 @@ -783,7 +783,7 @@ 177, 20 - 594, 111 + 594, 108 4 @@ -924,7 +924,7 @@ 283, 27 - 774, 137 + 774, 134 7 @@ -972,7 +972,7 @@ 2 - 1336, 304 + 1332, 301 Wiedervorlage @@ -999,7 +999,7 @@ Cyan - 1336, 279 + 1332, 276 0 @@ -1023,7 +1023,7 @@ 0, 25 - 1336, 279 + 1332, 276 2 @@ -1198,7 +1198,7 @@ 0, 0 - 1336, 25 + 1332, 25 1 @@ -1227,7 +1227,7 @@ - 1336, 304 + 1332, 301 Positionen @@ -1314,7 +1314,7 @@ 0, 25 - 1336, 305 + 1332, 302 8 @@ -1347,7 +1347,7 @@ 0, 0 - 1336, 25 + 1332, 25 2 @@ -1368,7 +1368,7 @@ 1 - 1336, 330 + 1332, 327 Dateien @@ -1476,7 +1476,7 @@ 102 - 284, 226 + 284, 223 88 @@ -1512,7 +1512,7 @@ 16, 24 - 174, 226 + 174, 223 27 @@ -1663,7 +1663,7 @@ zuordnen 5 - 624, 270 + 620, 267 User zuordnen @@ -1759,7 +1759,7 @@ zuordnen 4 - 595, 261 + 595, 258 89 @@ -1777,7 +1777,7 @@ zuordnen 0 - 624, 270 + 620, 267 Workflow - History @@ -2122,7 +2122,7 @@ zuordnen 23 - 1336, 330 + 1332, 327 Workflows/Tasks diff --git a/app/DD-Record-Organizer/frmSAP_FuBa.Designer.vb b/app/DD-Record-Organizer/frmSAP_FuBa.Designer.vb index 34f05cd..0a6961d 100644 --- a/app/DD-Record-Organizer/frmSAP_FuBa.Designer.vb +++ b/app/DD-Record-Organizer/frmSAP_FuBa.Designer.vb @@ -51,13 +51,13 @@ Partial Class frmSAP_FuBa Dim Label13 As System.Windows.Forms.Label Dim Label14 As System.Windows.Forms.Label Dim Label15 As System.Windows.Forms.Label - Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmSAP_FuBa)) Dim Label16 As System.Windows.Forms.Label Dim Label17 As System.Windows.Forms.Label Dim Label18 As System.Windows.Forms.Label Dim Label19 As System.Windows.Forms.Label Dim Label20 As System.Windows.Forms.Label Dim Label21 As System.Windows.Forms.Label + Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmSAP_FuBa)) Me.DD_ECMAdmin = New DD_Record_Organizer.DD_ECMAdmin() Me.TBPMO_SAP_FUBABindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.TBPMO_SAP_FUBATableAdapter = New DD_Record_Organizer.DD_ECMAdminTableAdapters.TBPMO_SAP_FUBATableAdapter() @@ -115,6 +115,15 @@ Partial Class frmSAP_FuBa Me.XtraTabControl1 = New DevExpress.XtraTab.XtraTabControl() Me.XtraTabPage1 = New DevExpress.XtraTab.XtraTabPage() Me.XtraTabPage2 = New DevExpress.XtraTab.XtraTabPage() + Me.txtBARCODESendlist = New System.Windows.Forms.TextBox() + Me.lblResultBAPI = New System.Windows.Forms.Label() + Me.lblresultFunction = New System.Windows.Forms.Label() + Me.txtDOC_IDSendList = New System.Windows.Forms.TextBox() + Me.txtDoctypeSendList = New System.Windows.Forms.TextBox() + Me.txtCONTREPSendList = New System.Windows.Forms.TextBox() + Me.txtARDATESendList = New System.Windows.Forms.TextBox() + Me.txtTableSendList = New System.Windows.Forms.TextBox() + Me.Button2 = New System.Windows.Forms.Button() Me.testSAP_OBJECT = New System.Windows.Forms.TextBox() Me.testDOCTYPE = New System.Windows.Forms.TextBox() Me.testOBJECT_ID = New System.Windows.Forms.TextBox() @@ -131,15 +140,6 @@ Partial Class frmSAP_FuBa Me.Button1 = New System.Windows.Forms.Button() Me.testClient = New System.Windows.Forms.TextBox() Me.testLanguage = New System.Windows.Forms.TextBox() - Me.Button2 = New System.Windows.Forms.Button() - Me.txtDOC_IDSendList = New System.Windows.Forms.TextBox() - Me.txtDoctypeSendList = New System.Windows.Forms.TextBox() - Me.txtCONTREPSendList = New System.Windows.Forms.TextBox() - Me.txtARDATESendList = New System.Windows.Forms.TextBox() - Me.txtTableSendList = New System.Windows.Forms.TextBox() - Me.lblresultFunction = New System.Windows.Forms.Label() - Me.lblResultBAPI = New System.Windows.Forms.Label() - Me.txtBARCODESendlist = New System.Windows.Forms.TextBox() GUIDLabel = New System.Windows.Forms.Label() NAMELabel = New System.Windows.Forms.Label() COMMENTLabel = New System.Windows.Forms.Label() @@ -189,7 +189,7 @@ Partial Class frmSAP_FuBa 'GUIDLabel ' GUIDLabel.AutoSize = True - GUIDLabel.Location = New System.Drawing.Point(137, 28) + GUIDLabel.Location = New System.Drawing.Point(257, 28) GUIDLabel.Name = "GUIDLabel" GUIDLabel.Size = New System.Drawing.Size(36, 13) GUIDLabel.TabIndex = 1 @@ -198,7 +198,7 @@ Partial Class frmSAP_FuBa 'NAMELabel ' NAMELabel.AutoSize = True - NAMELabel.Location = New System.Drawing.Point(190, 28) + NAMELabel.Location = New System.Drawing.Point(310, 28) NAMELabel.Name = "NAMELabel" NAMELabel.Size = New System.Drawing.Size(69, 13) NAMELabel.TabIndex = 3 @@ -207,7 +207,7 @@ Partial Class frmSAP_FuBa 'COMMENTLabel ' COMMENTLabel.AutoSize = True - COMMENTLabel.Location = New System.Drawing.Point(381, 28) + COMMENTLabel.Location = New System.Drawing.Point(501, 28) COMMENTLabel.Name = "COMMENTLabel" COMMENTLabel.Size = New System.Drawing.Size(65, 13) COMMENTLabel.TabIndex = 5 @@ -216,7 +216,7 @@ Partial Class frmSAP_FuBa 'HostLabel ' HostLabel.AutoSize = True - HostLabel.Location = New System.Drawing.Point(190, 69) + HostLabel.Location = New System.Drawing.Point(310, 69) HostLabel.Name = "HostLabel" HostLabel.Size = New System.Drawing.Size(272, 13) HostLabel.TabIndex = 9 @@ -225,7 +225,7 @@ Partial Class frmSAP_FuBa 'SystemNumberLabel ' SystemNumberLabel.AutoSize = True - SystemNumberLabel.Location = New System.Drawing.Point(490, 69) + SystemNumberLabel.Location = New System.Drawing.Point(610, 69) SystemNumberLabel.Name = "SystemNumberLabel" SystemNumberLabel.Size = New System.Drawing.Size(147, 13) SystemNumberLabel.TabIndex = 11 @@ -234,7 +234,7 @@ Partial Class frmSAP_FuBa 'UserNameLabel ' UserNameLabel.AutoSize = True - UserNameLabel.Location = New System.Drawing.Point(190, 110) + UserNameLabel.Location = New System.Drawing.Point(310, 110) UserNameLabel.Name = "UserNameLabel" UserNameLabel.Size = New System.Drawing.Size(63, 13) UserNameLabel.TabIndex = 13 @@ -243,7 +243,7 @@ Partial Class frmSAP_FuBa 'PasswordLabel ' PasswordLabel.AutoSize = True - PasswordLabel.Location = New System.Drawing.Point(381, 110) + PasswordLabel.Location = New System.Drawing.Point(501, 110) PasswordLabel.Name = "PasswordLabel" PasswordLabel.Size = New System.Drawing.Size(57, 13) PasswordLabel.TabIndex = 15 @@ -252,7 +252,7 @@ Partial Class frmSAP_FuBa 'ClientLabel ' ClientLabel.AutoSize = True - ClientLabel.Location = New System.Drawing.Point(490, 110) + ClientLabel.Location = New System.Drawing.Point(610, 110) ClientLabel.Name = "ClientLabel" ClientLabel.Size = New System.Drawing.Size(105, 13) ClientLabel.TabIndex = 17 @@ -261,7 +261,7 @@ Partial Class frmSAP_FuBa 'LanguageLabel ' LanguageLabel.AutoSize = True - LanguageLabel.Location = New System.Drawing.Point(675, 110) + LanguageLabel.Location = New System.Drawing.Point(795, 110) LanguageLabel.Name = "LanguageLabel" LanguageLabel.Size = New System.Drawing.Size(58, 13) LanguageLabel.TabIndex = 19 @@ -270,7 +270,7 @@ Partial Class frmSAP_FuBa 'TempTableNameLabel ' TempTableNameLabel.AutoSize = True - TempTableNameLabel.Location = New System.Drawing.Point(258, 149) + TempTableNameLabel.Location = New System.Drawing.Point(378, 149) TempTableNameLabel.Name = "TempTableNameLabel" TempTableNameLabel.Size = New System.Drawing.Size(98, 13) TempTableNameLabel.TabIndex = 21 @@ -279,7 +279,7 @@ Partial Class frmSAP_FuBa 'ADDED_WHOLabel ' ADDED_WHOLabel.AutoSize = True - ADDED_WHOLabel.Location = New System.Drawing.Point(190, 280) + ADDED_WHOLabel.Location = New System.Drawing.Point(310, 280) ADDED_WHOLabel.Name = "ADDED_WHOLabel" ADDED_WHOLabel.Size = New System.Drawing.Size(65, 13) ADDED_WHOLabel.TabIndex = 25 @@ -288,7 +288,7 @@ Partial Class frmSAP_FuBa 'ADDED_WHENLabel ' ADDED_WHENLabel.AutoSize = True - ADDED_WHENLabel.Location = New System.Drawing.Point(332, 280) + ADDED_WHENLabel.Location = New System.Drawing.Point(452, 280) ADDED_WHENLabel.Name = "ADDED_WHENLabel" ADDED_WHENLabel.Size = New System.Drawing.Size(73, 13) ADDED_WHENLabel.TabIndex = 27 @@ -297,7 +297,7 @@ Partial Class frmSAP_FuBa 'CHANGED_WHOLabel ' CHANGED_WHOLabel.AutoSize = True - CHANGED_WHOLabel.Location = New System.Drawing.Point(466, 279) + CHANGED_WHOLabel.Location = New System.Drawing.Point(586, 279) CHANGED_WHOLabel.Name = "CHANGED_WHOLabel" CHANGED_WHOLabel.Size = New System.Drawing.Size(77, 13) CHANGED_WHOLabel.TabIndex = 29 @@ -306,7 +306,7 @@ Partial Class frmSAP_FuBa 'CHANGED_WHENLabel ' CHANGED_WHENLabel.AutoSize = True - CHANGED_WHENLabel.Location = New System.Drawing.Point(607, 279) + CHANGED_WHENLabel.Location = New System.Drawing.Point(727, 279) CHANGED_WHENLabel.Name = "CHANGED_WHENLabel" CHANGED_WHENLabel.Size = New System.Drawing.Size(85, 13) CHANGED_WHENLabel.TabIndex = 31 @@ -315,7 +315,7 @@ Partial Class frmSAP_FuBa 'WHERE_CLAUSELabel ' WHERE_CLAUSELabel.AutoSize = True - WHERE_CLAUSELabel.Location = New System.Drawing.Point(190, 238) + WHERE_CLAUSELabel.Location = New System.Drawing.Point(310, 238) WHERE_CLAUSELabel.Name = "WHERE_CLAUSELabel" WHERE_CLAUSELabel.Size = New System.Drawing.Size(425, 13) WHERE_CLAUSELabel.TabIndex = 83 @@ -438,6 +438,60 @@ Partial Class frmSAP_FuBa Label15.TabIndex = 126 Label15.Text = "SAP_OBJECT:" ' + 'Label16 + ' + Label16.AutoSize = True + Label16.Location = New System.Drawing.Point(735, 312) + Label16.Name = "Label16" + Label16.Size = New System.Drawing.Size(44, 13) + Label16.TabIndex = 137 + Label16.Text = "DOCID:" + ' + 'Label17 + ' + Label17.AutoSize = True + Label17.Location = New System.Drawing.Point(438, 354) + Label17.Name = "Label17" + Label17.Size = New System.Drawing.Size(57, 13) + Label17.TabIndex = 135 + Label17.Text = "DOCTYPE:" + ' + 'Label18 + ' + Label18.AutoSize = True + Label18.Location = New System.Drawing.Point(438, 312) + Label18.Name = "Label18" + Label18.Size = New System.Drawing.Size(58, 13) + Label18.TabIndex = 133 + Label18.Text = "CONTREP:" + ' + 'Label19 + ' + Label19.AutoSize = True + Label19.Location = New System.Drawing.Point(138, 353) + Label19.Name = "Label19" + Label19.Size = New System.Drawing.Size(51, 13) + Label19.TabIndex = 131 + Label19.Text = "ARDATE:" + ' + 'Label20 + ' + Label20.AutoSize = True + Label20.Location = New System.Drawing.Point(138, 312) + Label20.Name = "Label20" + Label20.Size = New System.Drawing.Size(213, 13) + Label20.TabIndex = 128 + Label20.Text = "Tablename: (TOA01 oder BARCODETABLE)" + ' + 'Label21 + ' + Label21.AutoSize = True + Label21.Location = New System.Drawing.Point(138, 394) + Label21.Name = "Label21" + Label21.Size = New System.Drawing.Size(59, 13) + Label21.TabIndex = 141 + Label21.Text = "BARCODE:" + ' 'DD_ECMAdmin ' Me.DD_ECMAdmin.DataSetName = "DD_ECMAdmin" @@ -456,9 +510,11 @@ Partial Class frmSAP_FuBa ' Me.TableAdapterManager.BackupDataSetBeforeUpdate = False Me.TableAdapterManager.TBDD_CONNECTIONTableAdapter = Nothing + Me.TableAdapterManager.TBPMO_DOCRESULT_DROPDOWN_ITEMSTableAdapter = Nothing Me.TableAdapterManager.TBPMO_DOCSEARCH_RESULTLIST_CONFIGTableAdapter = Nothing Me.TableAdapterManager.TBPMO_FORM_CONSTRUCTOR_DETAILTableAdapter = Nothing Me.TableAdapterManager.TBPMO_FORM_CONSTRUCTORTableAdapter = Nothing + Me.TableAdapterManager.TBPMO_LOG_ESSENTIALSTableAdapter = Nothing Me.TableAdapterManager.TBPMO_SAP_FUBATableAdapter = Me.TBPMO_SAP_FUBATableAdapter Me.TableAdapterManager.UpdateOrder = DD_Record_Organizer.DD_ECMAdminTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete ' @@ -467,7 +523,7 @@ Partial Class frmSAP_FuBa Me.TBPMO_SAP_FUBABindingNavigator.AddNewItem = Me.BindingNavigatorAddNewItem Me.TBPMO_SAP_FUBABindingNavigator.BindingSource = Me.TBPMO_SAP_FUBABindingSource Me.TBPMO_SAP_FUBABindingNavigator.CountItem = Me.BindingNavigatorCountItem - Me.TBPMO_SAP_FUBABindingNavigator.CountItemFormat = "von {0} Bausteinverknüpfngen" + Me.TBPMO_SAP_FUBABindingNavigator.CountItemFormat = "von {0} Bausteinverknüpfungen" Me.TBPMO_SAP_FUBABindingNavigator.DeleteItem = Me.BindingNavigatorDeleteItem Me.TBPMO_SAP_FUBABindingNavigator.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.BindingNavigatorMoveFirstItem, Me.BindingNavigatorMovePreviousItem, Me.BindingNavigatorSeparator, Me.BindingNavigatorPositionItem, Me.BindingNavigatorCountItem, Me.BindingNavigatorSeparator1, Me.BindingNavigatorMoveNextItem, Me.BindingNavigatorMoveLastItem, Me.BindingNavigatorSeparator2, Me.BindingNavigatorAddNewItem, Me.BindingNavigatorDeleteItem, Me.TBPMO_SAP_FUBABindingNavigatorSaveItem, Me.ToolStripButton1}) Me.TBPMO_SAP_FUBABindingNavigator.Location = New System.Drawing.Point(0, 0) @@ -477,7 +533,7 @@ Partial Class frmSAP_FuBa Me.TBPMO_SAP_FUBABindingNavigator.MovePreviousItem = Me.BindingNavigatorMovePreviousItem Me.TBPMO_SAP_FUBABindingNavigator.Name = "TBPMO_SAP_FUBABindingNavigator" Me.TBPMO_SAP_FUBABindingNavigator.PositionItem = Me.BindingNavigatorPositionItem - Me.TBPMO_SAP_FUBABindingNavigator.Size = New System.Drawing.Size(987, 25) + Me.TBPMO_SAP_FUBABindingNavigator.Size = New System.Drawing.Size(1188, 25) Me.TBPMO_SAP_FUBABindingNavigator.TabIndex = 0 Me.TBPMO_SAP_FUBABindingNavigator.Text = "BindingNavigator1" ' @@ -493,8 +549,8 @@ Partial Class frmSAP_FuBa 'BindingNavigatorCountItem ' Me.BindingNavigatorCountItem.Name = "BindingNavigatorCountItem" - Me.BindingNavigatorCountItem.Size = New System.Drawing.Size(166, 22) - Me.BindingNavigatorCountItem.Text = "von {0} Bausteinverknüpfngen" + Me.BindingNavigatorCountItem.Size = New System.Drawing.Size(173, 22) + Me.BindingNavigatorCountItem.Text = "von {0} Bausteinverknüpfungen" Me.BindingNavigatorCountItem.ToolTipText = "Die Gesamtanzahl der Elemente." ' 'BindingNavigatorDeleteItem @@ -589,7 +645,7 @@ Partial Class frmSAP_FuBa Me.GUIDTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_SAP_FUBABindingSource, "GUID", True)) Me.GUIDTextBox.Enabled = False Me.GUIDTextBox.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.GUIDTextBox.Location = New System.Drawing.Point(140, 44) + Me.GUIDTextBox.Location = New System.Drawing.Point(260, 44) Me.GUIDTextBox.Name = "GUIDTextBox" Me.GUIDTextBox.Size = New System.Drawing.Size(47, 22) Me.GUIDTextBox.TabIndex = 2 @@ -597,7 +653,7 @@ Partial Class frmSAP_FuBa 'NAMETextBox ' Me.NAMETextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_SAP_FUBABindingSource, "NAME", True)) - Me.NAMETextBox.Location = New System.Drawing.Point(193, 44) + Me.NAMETextBox.Location = New System.Drawing.Point(313, 44) Me.NAMETextBox.Name = "NAMETextBox" Me.NAMETextBox.Size = New System.Drawing.Size(182, 21) Me.NAMETextBox.TabIndex = 4 @@ -605,7 +661,7 @@ Partial Class frmSAP_FuBa 'COMMENTTextBox ' Me.COMMENTTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_SAP_FUBABindingSource, "COMMENT", True)) - Me.COMMENTTextBox.Location = New System.Drawing.Point(384, 44) + Me.COMMENTTextBox.Location = New System.Drawing.Point(504, 44) Me.COMMENTTextBox.Name = "COMMENTTextBox" Me.COMMENTTextBox.Size = New System.Drawing.Size(505, 21) Me.COMMENTTextBox.TabIndex = 6 @@ -613,7 +669,7 @@ Partial Class frmSAP_FuBa 'TableNameTextBox ' Me.TableNameTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_SAP_FUBABindingSource, "TableName", True)) - Me.TableNameTextBox.Location = New System.Drawing.Point(193, 205) + Me.TableNameTextBox.Location = New System.Drawing.Point(313, 205) Me.TableNameTextBox.Name = "TableNameTextBox" Me.TableNameTextBox.Size = New System.Drawing.Size(182, 21) Me.TableNameTextBox.TabIndex = 8 @@ -621,7 +677,7 @@ Partial Class frmSAP_FuBa 'HostTextBox ' Me.HostTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_SAP_FUBABindingSource, "Host", True)) - Me.HostTextBox.Location = New System.Drawing.Point(193, 85) + Me.HostTextBox.Location = New System.Drawing.Point(313, 85) Me.HostTextBox.Name = "HostTextBox" Me.HostTextBox.Size = New System.Drawing.Size(291, 21) Me.HostTextBox.TabIndex = 10 @@ -629,7 +685,7 @@ Partial Class frmSAP_FuBa 'SystemNumberTextBox ' Me.SystemNumberTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_SAP_FUBABindingSource, "SystemNumber", True)) - Me.SystemNumberTextBox.Location = New System.Drawing.Point(493, 85) + Me.SystemNumberTextBox.Location = New System.Drawing.Point(613, 85) Me.SystemNumberTextBox.Name = "SystemNumberTextBox" Me.SystemNumberTextBox.Size = New System.Drawing.Size(86, 21) Me.SystemNumberTextBox.TabIndex = 12 @@ -637,7 +693,7 @@ Partial Class frmSAP_FuBa 'UserNameTextBox ' Me.UserNameTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_SAP_FUBABindingSource, "UserName", True)) - Me.UserNameTextBox.Location = New System.Drawing.Point(193, 123) + Me.UserNameTextBox.Location = New System.Drawing.Point(313, 123) Me.UserNameTextBox.Name = "UserNameTextBox" Me.UserNameTextBox.Size = New System.Drawing.Size(182, 21) Me.UserNameTextBox.TabIndex = 14 @@ -645,7 +701,7 @@ Partial Class frmSAP_FuBa 'PasswordTextBox ' Me.PasswordTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_SAP_FUBABindingSource, "Password", True)) - Me.PasswordTextBox.Location = New System.Drawing.Point(384, 123) + Me.PasswordTextBox.Location = New System.Drawing.Point(504, 123) Me.PasswordTextBox.Name = "PasswordTextBox" Me.PasswordTextBox.Size = New System.Drawing.Size(100, 21) Me.PasswordTextBox.TabIndex = 16 @@ -654,7 +710,7 @@ Partial Class frmSAP_FuBa 'ClientTextBox ' Me.ClientTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_SAP_FUBABindingSource, "Client", True)) - Me.ClientTextBox.Location = New System.Drawing.Point(493, 123) + Me.ClientTextBox.Location = New System.Drawing.Point(613, 123) Me.ClientTextBox.Name = "ClientTextBox" Me.ClientTextBox.Size = New System.Drawing.Size(176, 21) Me.ClientTextBox.TabIndex = 18 @@ -662,7 +718,7 @@ Partial Class frmSAP_FuBa 'LanguageTextBox ' Me.LanguageTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_SAP_FUBABindingSource, "Language", True)) - Me.LanguageTextBox.Location = New System.Drawing.Point(678, 123) + Me.LanguageTextBox.Location = New System.Drawing.Point(798, 123) Me.LanguageTextBox.Name = "LanguageTextBox" Me.LanguageTextBox.Size = New System.Drawing.Size(84, 21) Me.LanguageTextBox.TabIndex = 20 @@ -670,7 +726,7 @@ Partial Class frmSAP_FuBa 'TempTableNameTextBox ' Me.TempTableNameTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_SAP_FUBABindingSource, "TempTableName", True)) - Me.TempTableNameTextBox.Location = New System.Drawing.Point(261, 164) + Me.TempTableNameTextBox.Location = New System.Drawing.Point(381, 164) Me.TempTableNameTextBox.Name = "TempTableNameTextBox" Me.TempTableNameTextBox.Size = New System.Drawing.Size(223, 21) Me.TempTableNameTextBox.TabIndex = 22 @@ -678,7 +734,7 @@ Partial Class frmSAP_FuBa 'ACTIVECheckBox ' Me.ACTIVECheckBox.DataBindings.Add(New System.Windows.Forms.Binding("CheckState", Me.TBPMO_SAP_FUBABindingSource, "ACTIVE", True)) - Me.ACTIVECheckBox.Location = New System.Drawing.Point(904, 42) + Me.ACTIVECheckBox.Location = New System.Drawing.Point(1024, 42) Me.ACTIVECheckBox.Name = "ACTIVECheckBox" Me.ACTIVECheckBox.Size = New System.Drawing.Size(65, 24) Me.ACTIVECheckBox.TabIndex = 24 @@ -691,7 +747,7 @@ Partial Class frmSAP_FuBa Me.ADDED_WHOTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_SAP_FUBABindingSource, "ADDED_WHO", True)) Me.ADDED_WHOTextBox.Enabled = False Me.ADDED_WHOTextBox.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.ADDED_WHOTextBox.Location = New System.Drawing.Point(193, 296) + Me.ADDED_WHOTextBox.Location = New System.Drawing.Point(313, 296) Me.ADDED_WHOTextBox.Name = "ADDED_WHOTextBox" Me.ADDED_WHOTextBox.Size = New System.Drawing.Size(136, 22) Me.ADDED_WHOTextBox.TabIndex = 26 @@ -702,7 +758,7 @@ Partial Class frmSAP_FuBa Me.ADDED_WHENTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_SAP_FUBABindingSource, "ADDED_WHEN", True)) Me.ADDED_WHENTextBox.Enabled = False Me.ADDED_WHENTextBox.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.ADDED_WHENTextBox.Location = New System.Drawing.Point(335, 296) + Me.ADDED_WHENTextBox.Location = New System.Drawing.Point(455, 296) Me.ADDED_WHENTextBox.Name = "ADDED_WHENTextBox" Me.ADDED_WHENTextBox.Size = New System.Drawing.Size(130, 22) Me.ADDED_WHENTextBox.TabIndex = 28 @@ -713,7 +769,7 @@ Partial Class frmSAP_FuBa Me.CHANGED_WHOTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_SAP_FUBABindingSource, "CHANGED_WHO", True)) Me.CHANGED_WHOTextBox.Enabled = False Me.CHANGED_WHOTextBox.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.CHANGED_WHOTextBox.Location = New System.Drawing.Point(469, 295) + Me.CHANGED_WHOTextBox.Location = New System.Drawing.Point(589, 295) Me.CHANGED_WHOTextBox.Name = "CHANGED_WHOTextBox" Me.CHANGED_WHOTextBox.Size = New System.Drawing.Size(132, 22) Me.CHANGED_WHOTextBox.TabIndex = 30 @@ -724,7 +780,7 @@ Partial Class frmSAP_FuBa Me.CHANGED_WHENTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_SAP_FUBABindingSource, "CHANGED_WHEN", True)) Me.CHANGED_WHENTextBox.Enabled = False Me.CHANGED_WHENTextBox.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.CHANGED_WHENTextBox.Location = New System.Drawing.Point(610, 295) + Me.CHANGED_WHENTextBox.Location = New System.Drawing.Point(730, 295) Me.CHANGED_WHENTextBox.Name = "CHANGED_WHENTextBox" Me.CHANGED_WHENTextBox.Size = New System.Drawing.Size(147, 22) Me.CHANGED_WHENTextBox.TabIndex = 32 @@ -736,7 +792,7 @@ Partial Class frmSAP_FuBa Me.ListBox1.FormattingEnabled = True Me.ListBox1.Location = New System.Drawing.Point(11, 28) Me.ListBox1.Name = "ListBox1" - Me.ListBox1.Size = New System.Drawing.Size(120, 186) + Me.ListBox1.Size = New System.Drawing.Size(240, 290) Me.ListBox1.TabIndex = 33 ' 'btnERPConnect @@ -745,7 +801,7 @@ Partial Class frmSAP_FuBa Me.btnERPConnect.Image = Global.DD_Record_Organizer.My.Resources.Resources.database_connect Me.btnERPConnect.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft Me.btnERPConnect.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.btnERPConnect.Location = New System.Drawing.Point(768, 117) + Me.btnERPConnect.Location = New System.Drawing.Point(888, 117) Me.btnERPConnect.Name = "btnERPConnect" Me.btnERPConnect.Size = New System.Drawing.Size(191, 29) Me.btnERPConnect.TabIndex = 78 @@ -761,7 +817,7 @@ Partial Class frmSAP_FuBa Me.GridControl2.Location = New System.Drawing.Point(11, 340) Me.GridControl2.MainView = Me.GridView2 Me.GridControl2.Name = "GridControl2" - Me.GridControl2.Size = New System.Drawing.Size(948, 223) + Me.GridControl2.Size = New System.Drawing.Size(1153, 223) Me.GridControl2.TabIndex = 83 Me.GridControl2.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView2}) ' @@ -784,7 +840,7 @@ Partial Class frmSAP_FuBa 'WHERE_CLAUSETextBox ' Me.WHERE_CLAUSETextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_SAP_FUBABindingSource, "WHERE_CLAUSE", True)) - Me.WHERE_CLAUSETextBox.Location = New System.Drawing.Point(193, 254) + Me.WHERE_CLAUSETextBox.Location = New System.Drawing.Point(313, 254) Me.WHERE_CLAUSETextBox.Name = "WHERE_CLAUSETextBox" Me.WHERE_CLAUSETextBox.Size = New System.Drawing.Size(766, 21) Me.WHERE_CLAUSETextBox.TabIndex = 84 @@ -795,7 +851,7 @@ Partial Class frmSAP_FuBa Me.lblSave.BackColor = System.Drawing.Color.Yellow Me.lblSave.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Bold) Me.lblSave.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblSave.Location = New System.Drawing.Point(786, 299) + Me.lblSave.Location = New System.Drawing.Point(906, 299) Me.lblSave.Name = "lblSave" Me.lblSave.Size = New System.Drawing.Size(132, 13) Me.lblSave.TabIndex = 85 @@ -808,7 +864,7 @@ Partial Class frmSAP_FuBa Me.lblConnectionopen.BackColor = System.Drawing.Color.Yellow Me.lblConnectionopen.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Bold) Me.lblConnectionopen.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblConnectionopen.Location = New System.Drawing.Point(810, 149) + Me.lblConnectionopen.Location = New System.Drawing.Point(930, 149) Me.lblConnectionopen.Name = "lblConnectionopen" Me.lblConnectionopen.Size = New System.Drawing.Size(149, 13) Me.lblConnectionopen.TabIndex = 86 @@ -833,7 +889,7 @@ Partial Class frmSAP_FuBa Me.btnInsertData.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btnInsertData.Image = Global.DD_Record_Organizer.My.Resources.Resources.InsertColumn_5626 Me.btnInsertData.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnInsertData.Location = New System.Drawing.Point(493, 161) + Me.btnInsertData.Location = New System.Drawing.Point(613, 161) Me.btnInsertData.Name = "btnInsertData" Me.btnInsertData.Size = New System.Drawing.Size(176, 24) Me.btnInsertData.TabIndex = 88 @@ -845,7 +901,7 @@ Partial Class frmSAP_FuBa ' Me.Label1.AutoSize = True Me.Label1.ForeColor = System.Drawing.Color.Brown - Me.Label1.Location = New System.Drawing.Point(816, 88) + Me.Label1.Location = New System.Drawing.Point(936, 88) Me.Label1.Name = "Label1" Me.Label1.Size = New System.Drawing.Size(85, 13) Me.Label1.TabIndex = 89 @@ -854,7 +910,7 @@ Partial Class frmSAP_FuBa 'txtLimitRows ' Me.txtLimitRows.ForeColor = System.Drawing.Color.Brown - Me.txtLimitRows.Location = New System.Drawing.Point(914, 85) + Me.txtLimitRows.Location = New System.Drawing.Point(1034, 85) Me.txtLimitRows.Name = "txtLimitRows" Me.txtLimitRows.Size = New System.Drawing.Size(45, 21) Me.txtLimitRows.TabIndex = 90 @@ -864,7 +920,7 @@ Partial Class frmSAP_FuBa 'rBFuba ' Me.rBFuba.AutoSize = True - Me.rBFuba.Location = New System.Drawing.Point(646, 86) + Me.rBFuba.Location = New System.Drawing.Point(766, 86) Me.rBFuba.Name = "rBFuba" Me.rBFuba.Size = New System.Drawing.Size(49, 17) Me.rBFuba.TabIndex = 91 @@ -875,7 +931,7 @@ Partial Class frmSAP_FuBa 'rbTable ' Me.rbTable.AutoSize = True - Me.rbTable.Location = New System.Drawing.Point(713, 86) + Me.rbTable.Location = New System.Drawing.Point(833, 86) Me.rbTable.Name = "rbTable" Me.rbTable.Size = New System.Drawing.Size(81, 17) Me.rbTable.TabIndex = 92 @@ -888,7 +944,7 @@ Partial Class frmSAP_FuBa Me.MethodTextBox.BackColor = System.Drawing.SystemColors.Control Me.MethodTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_SAP_FUBABindingSource, "Method", True)) Me.MethodTextBox.ForeColor = System.Drawing.SystemColors.Control - Me.MethodTextBox.Location = New System.Drawing.Point(866, 181) + Me.MethodTextBox.Location = New System.Drawing.Point(986, 181) Me.MethodTextBox.Name = "MethodTextBox" Me.MethodTextBox.ReadOnly = True Me.MethodTextBox.Size = New System.Drawing.Size(10, 21) @@ -898,7 +954,7 @@ Partial Class frmSAP_FuBa ' Me.lblMethodname.AutoSize = True Me.lblMethodname.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblMethodname.Location = New System.Drawing.Point(190, 189) + Me.lblMethodname.Location = New System.Drawing.Point(310, 189) Me.lblMethodname.Name = "lblMethodname" Me.lblMethodname.Size = New System.Drawing.Size(41, 13) Me.lblMethodname.TabIndex = 94 @@ -909,7 +965,7 @@ Partial Class frmSAP_FuBa Me.btnGetResult.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btnGetResult.Image = Global.DD_Record_Organizer.My.Resources.Resources.TableView_nameonly_263 Me.btnGetResult.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnGetResult.Location = New System.Drawing.Point(493, 203) + Me.btnGetResult.Location = New System.Drawing.Point(613, 203) Me.btnGetResult.Name = "btnGetResult" Me.btnGetResult.Size = New System.Drawing.Size(176, 23) Me.btnGetResult.TabIndex = 95 @@ -919,7 +975,7 @@ Partial Class frmSAP_FuBa 'FuBa_SplitCharacterTextBox ' Me.FuBa_SplitCharacterTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_SAP_FUBABindingSource, "FuBa_SplitCharacter", True)) - Me.FuBa_SplitCharacterTextBox.Location = New System.Drawing.Point(384, 205) + Me.FuBa_SplitCharacterTextBox.Location = New System.Drawing.Point(504, 205) Me.FuBa_SplitCharacterTextBox.Name = "FuBa_SplitCharacterTextBox" Me.FuBa_SplitCharacterTextBox.Size = New System.Drawing.Size(25, 21) Me.FuBa_SplitCharacterTextBox.TabIndex = 96 @@ -928,7 +984,7 @@ Partial Class frmSAP_FuBa 'lblSplitchr ' Me.lblSplitchr.AutoSize = True - Me.lblSplitchr.Location = New System.Drawing.Point(384, 189) + Me.lblSplitchr.Location = New System.Drawing.Point(504, 189) Me.lblSplitchr.Name = "lblSplitchr" Me.lblSplitchr.Size = New System.Drawing.Size(75, 13) Me.lblSplitchr.TabIndex = 97 @@ -939,7 +995,7 @@ Partial Class frmSAP_FuBa ' Me.Label2.AutoSize = True Me.Label2.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label2.Location = New System.Drawing.Point(190, 167) + Me.Label2.Location = New System.Drawing.Point(310, 167) Me.Label2.Name = "Label2" Me.Label2.Size = New System.Drawing.Size(70, 13) Me.Label2.TabIndex = 98 @@ -951,7 +1007,7 @@ Partial Class frmSAP_FuBa Me.XtraTabControl1.Location = New System.Drawing.Point(0, 0) Me.XtraTabControl1.Name = "XtraTabControl1" Me.XtraTabControl1.SelectedTabPage = Me.XtraTabPage1 - Me.XtraTabControl1.Size = New System.Drawing.Size(989, 591) + Me.XtraTabControl1.Size = New System.Drawing.Size(1194, 591) Me.XtraTabControl1.TabIndex = 99 Me.XtraTabControl1.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPage1, Me.XtraTabPage2}) ' @@ -1008,7 +1064,7 @@ Partial Class frmSAP_FuBa Me.XtraTabPage1.Controls.Add(Me.ADDED_WHENTextBox) Me.XtraTabPage1.Controls.Add(ADDED_WHOLabel) Me.XtraTabPage1.Name = "XtraTabPage1" - Me.XtraTabPage1.Size = New System.Drawing.Size(987, 566) + Me.XtraTabPage1.Size = New System.Drawing.Size(1188, 563) Me.XtraTabPage1.Text = "Fuba- und Table-Configurations" ' 'XtraTabPage2 @@ -1058,9 +1114,92 @@ Partial Class frmSAP_FuBa Me.XtraTabPage2.Controls.Add(Me.testLanguage) Me.XtraTabPage2.Controls.Add(Label9) Me.XtraTabPage2.Name = "XtraTabPage2" - Me.XtraTabPage2.Size = New System.Drawing.Size(987, 566) + Me.XtraTabPage2.Size = New System.Drawing.Size(983, 563) Me.XtraTabPage2.Text = "Test und Funktionsbereich" ' + 'txtBARCODESendlist + ' + Me.txtBARCODESendlist.Location = New System.Drawing.Point(141, 410) + Me.txtBARCODESendlist.Name = "txtBARCODESendlist" + Me.txtBARCODESendlist.Size = New System.Drawing.Size(291, 21) + Me.txtBARCODESendlist.TabIndex = 140 + ' + 'lblResultBAPI + ' + Me.lblResultBAPI.AutoSize = True + Me.lblResultBAPI.BackColor = System.Drawing.Color.Yellow + Me.lblResultBAPI.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Bold) + Me.lblResultBAPI.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblResultBAPI.Location = New System.Drawing.Point(656, 413) + Me.lblResultBAPI.Name = "lblResultBAPI" + Me.lblResultBAPI.Size = New System.Drawing.Size(47, 13) + Me.lblResultBAPI.TabIndex = 139 + Me.lblResultBAPI.Text = "Label21" + Me.lblResultBAPI.Visible = False + ' + 'lblresultFunction + ' + Me.lblresultFunction.AutoSize = True + Me.lblresultFunction.BackColor = System.Drawing.Color.Yellow + Me.lblresultFunction.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Bold) + Me.lblresultFunction.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblresultFunction.Location = New System.Drawing.Point(299, 274) + Me.lblresultFunction.Name = "lblresultFunction" + Me.lblresultFunction.Size = New System.Drawing.Size(95, 13) + Me.lblresultFunction.TabIndex = 138 + Me.lblresultFunction.Text = "lblresultFunction" + Me.lblresultFunction.Visible = False + ' + 'txtDOC_IDSendList + ' + Me.txtDOC_IDSendList.Location = New System.Drawing.Point(738, 328) + Me.txtDOC_IDSendList.Name = "txtDOC_IDSendList" + Me.txtDOC_IDSendList.Size = New System.Drawing.Size(291, 21) + Me.txtDOC_IDSendList.TabIndex = 136 + ' + 'txtDoctypeSendList + ' + Me.txtDoctypeSendList.Location = New System.Drawing.Point(441, 370) + Me.txtDoctypeSendList.Name = "txtDoctypeSendList" + Me.txtDoctypeSendList.Size = New System.Drawing.Size(291, 21) + Me.txtDoctypeSendList.TabIndex = 134 + ' + 'txtCONTREPSendList + ' + Me.txtCONTREPSendList.Location = New System.Drawing.Point(441, 328) + Me.txtCONTREPSendList.Name = "txtCONTREPSendList" + Me.txtCONTREPSendList.Size = New System.Drawing.Size(291, 21) + Me.txtCONTREPSendList.TabIndex = 132 + ' + 'txtARDATESendList + ' + Me.txtARDATESendList.Location = New System.Drawing.Point(141, 369) + Me.txtARDATESendList.Name = "txtARDATESendList" + Me.txtARDATESendList.Size = New System.Drawing.Size(291, 21) + Me.txtARDATESendList.TabIndex = 130 + ' + 'txtTableSendList + ' + Me.txtTableSendList.Location = New System.Drawing.Point(141, 328) + Me.txtTableSendList.Name = "txtTableSendList" + Me.txtTableSendList.Size = New System.Drawing.Size(291, 21) + Me.txtTableSendList.TabIndex = 129 + Me.txtTableSendList.Text = "BARCODETABLE" + ' + 'Button2 + ' + Me.Button2.Font = New System.Drawing.Font("Segoe UI Semibold", 9.75!, CType((System.Drawing.FontStyle.Bold Or System.Drawing.FontStyle.Italic), System.Drawing.FontStyle)) + Me.Button2.Image = Global.DD_Record_Organizer.My.Resources.Resources.database_connect + Me.Button2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button2.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.Button2.Location = New System.Drawing.Point(450, 404) + Me.Button2.Name = "Button2" + Me.Button2.Size = New System.Drawing.Size(194, 29) + Me.Button2.TabIndex = 127 + Me.Button2.Text = "Execute BAPI_BARCODE" + Me.Button2.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.Button2.UseVisualStyleBackColor = True + ' 'testSAP_OBJECT ' Me.testSAP_OBJECT.Location = New System.Drawing.Point(738, 159) @@ -1202,148 +1341,11 @@ Partial Class frmSAP_FuBa Me.testLanguage.Size = New System.Drawing.Size(84, 21) Me.testLanguage.TabIndex = 104 ' - 'Button2 - ' - Me.Button2.Font = New System.Drawing.Font("Segoe UI Semibold", 9.75!, CType((System.Drawing.FontStyle.Bold Or System.Drawing.FontStyle.Italic), System.Drawing.FontStyle)) - Me.Button2.Image = Global.DD_Record_Organizer.My.Resources.Resources.database_connect - Me.Button2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button2.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.Button2.Location = New System.Drawing.Point(450, 404) - Me.Button2.Name = "Button2" - Me.Button2.Size = New System.Drawing.Size(194, 29) - Me.Button2.TabIndex = 127 - Me.Button2.Text = "Execute BAPI_BARCODE" - Me.Button2.TextAlign = System.Drawing.ContentAlignment.MiddleRight - Me.Button2.UseVisualStyleBackColor = True - ' - 'Label16 - ' - Label16.AutoSize = True - Label16.Location = New System.Drawing.Point(735, 312) - Label16.Name = "Label16" - Label16.Size = New System.Drawing.Size(44, 13) - Label16.TabIndex = 137 - Label16.Text = "DOCID:" - ' - 'txtDOC_IDSendList - ' - Me.txtDOC_IDSendList.Location = New System.Drawing.Point(738, 328) - Me.txtDOC_IDSendList.Name = "txtDOC_IDSendList" - Me.txtDOC_IDSendList.Size = New System.Drawing.Size(291, 21) - Me.txtDOC_IDSendList.TabIndex = 136 - ' - 'Label17 - ' - Label17.AutoSize = True - Label17.Location = New System.Drawing.Point(438, 354) - Label17.Name = "Label17" - Label17.Size = New System.Drawing.Size(57, 13) - Label17.TabIndex = 135 - Label17.Text = "DOCTYPE:" - ' - 'txtDoctypeSendList - ' - Me.txtDoctypeSendList.Location = New System.Drawing.Point(441, 370) - Me.txtDoctypeSendList.Name = "txtDoctypeSendList" - Me.txtDoctypeSendList.Size = New System.Drawing.Size(291, 21) - Me.txtDoctypeSendList.TabIndex = 134 - ' - 'Label18 - ' - Label18.AutoSize = True - Label18.Location = New System.Drawing.Point(438, 312) - Label18.Name = "Label18" - Label18.Size = New System.Drawing.Size(58, 13) - Label18.TabIndex = 133 - Label18.Text = "CONTREP:" - ' - 'txtCONTREPSendList - ' - Me.txtCONTREPSendList.Location = New System.Drawing.Point(441, 328) - Me.txtCONTREPSendList.Name = "txtCONTREPSendList" - Me.txtCONTREPSendList.Size = New System.Drawing.Size(291, 21) - Me.txtCONTREPSendList.TabIndex = 132 - ' - 'Label19 - ' - Label19.AutoSize = True - Label19.Location = New System.Drawing.Point(138, 353) - Label19.Name = "Label19" - Label19.Size = New System.Drawing.Size(51, 13) - Label19.TabIndex = 131 - Label19.Text = "ARDATE:" - ' - 'txtARDATESendList - ' - Me.txtARDATESendList.Location = New System.Drawing.Point(141, 369) - Me.txtARDATESendList.Name = "txtARDATESendList" - Me.txtARDATESendList.Size = New System.Drawing.Size(291, 21) - Me.txtARDATESendList.TabIndex = 130 - ' - 'txtTableSendList - ' - Me.txtTableSendList.Location = New System.Drawing.Point(141, 328) - Me.txtTableSendList.Name = "txtTableSendList" - Me.txtTableSendList.Size = New System.Drawing.Size(291, 21) - Me.txtTableSendList.TabIndex = 129 - Me.txtTableSendList.Text = "BARCODETABLE" - ' - 'Label20 - ' - Label20.AutoSize = True - Label20.Location = New System.Drawing.Point(138, 312) - Label20.Name = "Label20" - Label20.Size = New System.Drawing.Size(213, 13) - Label20.TabIndex = 128 - Label20.Text = "Tablename: (TOA01 oder BARCODETABLE)" - ' - 'lblresultFunction - ' - Me.lblresultFunction.AutoSize = True - Me.lblresultFunction.BackColor = System.Drawing.Color.Yellow - Me.lblresultFunction.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Bold) - Me.lblresultFunction.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblresultFunction.Location = New System.Drawing.Point(299, 274) - Me.lblresultFunction.Name = "lblresultFunction" - Me.lblresultFunction.Size = New System.Drawing.Size(95, 13) - Me.lblresultFunction.TabIndex = 138 - Me.lblresultFunction.Text = "lblresultFunction" - Me.lblresultFunction.Visible = False - ' - 'lblResultBAPI - ' - Me.lblResultBAPI.AutoSize = True - Me.lblResultBAPI.BackColor = System.Drawing.Color.Yellow - Me.lblResultBAPI.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Bold) - Me.lblResultBAPI.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblResultBAPI.Location = New System.Drawing.Point(656, 413) - Me.lblResultBAPI.Name = "lblResultBAPI" - Me.lblResultBAPI.Size = New System.Drawing.Size(47, 13) - Me.lblResultBAPI.TabIndex = 139 - Me.lblResultBAPI.Text = "Label21" - Me.lblResultBAPI.Visible = False - ' - 'Label21 - ' - Label21.AutoSize = True - Label21.Location = New System.Drawing.Point(138, 394) - Label21.Name = "Label21" - Label21.Size = New System.Drawing.Size(59, 13) - Label21.TabIndex = 141 - Label21.Text = "BARCODE:" - ' - 'txtBARCODESendlist - ' - Me.txtBARCODESendlist.Location = New System.Drawing.Point(141, 410) - Me.txtBARCODESendlist.Name = "txtBARCODESendlist" - Me.txtBARCODESendlist.Size = New System.Drawing.Size(291, 21) - Me.txtBARCODESendlist.TabIndex = 140 - ' 'frmSAP_FuBa ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(989, 591) + Me.ClientSize = New System.Drawing.Size(1194, 591) Me.Controls.Add(Me.XtraTabControl1) Me.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) diff --git a/app/DD-Record-Organizer/frmSAP_FuBa.resx b/app/DD-Record-Organizer/frmSAP_FuBa.resx index b97306a..8cd1a72 100644 --- a/app/DD-Record-Organizer/frmSAP_FuBa.resx +++ b/app/DD-Record-Organizer/frmSAP_FuBa.resx @@ -201,6 +201,24 @@ False + + False + + + False + + + False + + + False + + + False + + + False + 17, 17 @@ -291,24 +309,6 @@ 17, 56 - - False - - - False - - - False - - - False - - - False - - - False - AAABAAoAMDAQAAEABABoBgAApgAAACAgEAABAAQA6AIAAA4HAAAQEBAAAQAEACgBAAD2CQAAMDAAAAEA diff --git a/app/DD-Record-Organizer/frmUserKonfig.resx b/app/DD-Record-Organizer/frmUserKonfig.resx index 52980a6..eee7311 100644 --- a/app/DD-Record-Organizer/frmUserKonfig.resx +++ b/app/DD-Record-Organizer/frmUserKonfig.resx @@ -1800,7 +1800,7 @@ 3, 3, 3, 3 - 1124, 293 + 1128, 296 0 @@ -2164,7 +2164,7 @@ matchen 0, 0 - 1132, 319 + 1136, 322 6 @@ -2182,7 +2182,7 @@ matchen 0 - 1132, 319 + 1136, 322 User-/Gruppenzuordnung diff --git a/app/DD-Record-Organizer/frmUserKonfig.vb b/app/DD-Record-Organizer/frmUserKonfig.vb index 3fa4276..1486f9d 100644 --- a/app/DD-Record-Organizer/frmUserKonfig.vb +++ b/app/DD-Record-Organizer/frmUserKonfig.vb @@ -601,12 +601,6 @@ Public Class frmUserKonfig End If End If End Sub - Private Sub frmUserKonfig_KeyUp(sender As Object, e As KeyEventArgs) Handles MyBase.KeyUp - If e.KeyCode = Keys.Delete Then - Delete_user() - End If - End Sub - Private Sub btnopenfolder_Click(sender As Object, e As EventArgs) Handles btnopenfolder.Click Dim fbdia As New FolderBrowserDialog If fbdia.ShowDialog() = DialogResult.OK Then diff --git a/app/DD-Record-Organizer/frmWD_Dokumentart_Konfig.Designer.vb b/app/DD-Record-Organizer/frmWD_Dokumentart_Konfig.Designer.vb index 2b13548..7d73a5d 100644 --- a/app/DD-Record-Organizer/frmWD_Dokumentart_Konfig.Designer.vb +++ b/app/DD-Record-Organizer/frmWD_Dokumentart_Konfig.Designer.vb @@ -65,6 +65,7 @@ Partial Class frmWD_Dokumentart_Konfig Me.GridView1 = New DevExpress.XtraGrid.Views.Grid.GridView() Me.colBEZEICHNUNG = New DevExpress.XtraGrid.Columns.GridColumn() Me.colOBJEKTTYP = New DevExpress.XtraGrid.Columns.GridColumn() + Me.colBESCHREIBUNG = New DevExpress.XtraGrid.Columns.GridColumn() Me.Button1 = New System.Windows.Forms.Button() Me.Label4 = New System.Windows.Forms.Label() Me.ListBox3 = New System.Windows.Forms.ListBox() @@ -188,7 +189,6 @@ Partial Class frmWD_Dokumentart_Konfig Me.TBPMO_WD_FORMVIEW_DOKTYPESTableAdapter = New DD_Record_Organizer.DD_DMSDataSetTableAdapters.TBPMO_WD_FORMVIEW_DOKTYPESTableAdapter() Me.TBWH_DOKART_MODULETableAdapter = New DD_Record_Organizer.DD_DMSDataSetTableAdapters.TBWH_DOKART_MODULETableAdapter() Me.ToolTipController1 = New DevExpress.Utils.ToolTipController(Me.components) - Me.colBESCHREIBUNG = New DevExpress.XtraGrid.Columns.GridColumn() GUIDLabel = New System.Windows.Forms.Label() BEZEICHNUNGLabel = New System.Windows.Forms.Label() KURZNAMELabel = New System.Windows.Forms.Label() @@ -509,6 +509,12 @@ Partial Class frmWD_Dokumentart_Konfig Me.colOBJEKTTYP.FieldName = "OBJEKTTYP" Me.colOBJEKTTYP.Name = "colOBJEKTTYP" ' + 'colBESCHREIBUNG + ' + resources.ApplyResources(Me.colBESCHREIBUNG, "colBESCHREIBUNG") + Me.colBESCHREIBUNG.FieldName = "BESCHREIBUNG" + Me.colBESCHREIBUNG.Name = "colBESCHREIBUNG" + ' 'Button1 ' resources.ApplyResources(Me.Button1, "Button1") @@ -1383,12 +1389,6 @@ Partial Class frmWD_Dokumentart_Konfig ' Me.TBWH_DOKART_MODULETableAdapter.ClearBeforeFill = True ' - 'colBESCHREIBUNG - ' - resources.ApplyResources(Me.colBESCHREIBUNG, "colBESCHREIBUNG") - Me.colBESCHREIBUNG.FieldName = "BESCHREIBUNG" - Me.colBESCHREIBUNG.Name = "colBESCHREIBUNG" - ' 'frmWD_Dokumentart_Konfig ' resources.ApplyResources(Me, "$this") diff --git a/app/DD-Record-Organizer/frmWD_Dokumentart_Konfig.resx b/app/DD-Record-Organizer/frmWD_Dokumentart_Konfig.resx index 8e45a7b..99a5e29 100644 --- a/app/DD-Record-Organizer/frmWD_Dokumentart_Konfig.resx +++ b/app/DD-Record-Organizer/frmWD_Dokumentart_Konfig.resx @@ -956,7 +956,7 @@ GridControl1 - DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a GroupBox1 @@ -1470,7 +1470,7 @@ 403, 56 - 121, 17 + 120, 17 ToolStripStatusLabel1 @@ -2025,7 +2025,7 @@ 0, 25 - 305, 210 + 305, 207 2 @@ -2234,7 +2234,7 @@ 22 - 1265, 252 + 1261, 249 Automatische Indexe @@ -2243,7 +2243,7 @@ XtraTabPage1 - DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a XtraTabControl1 @@ -2270,7 +2270,7 @@ 0, 25 - 305, 227 + 305, 224 3 @@ -2458,7 +2458,7 @@ 0, 0 - 1265, 25 + 1261, 25 2 @@ -2479,7 +2479,7 @@ 1 - 1265, 252 + 1261, 249 Manuelle Indexe @@ -2488,7 +2488,7 @@ XtraTabPage3 - DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a XtraTabControl1 @@ -2817,7 +2817,7 @@ 0, 0 - 1265, 25 + 1261, 25 2 @@ -2838,7 +2838,7 @@ 5 - 1265, 252 + 1261, 249 Zurodnung Dokumentart - Entität @@ -2847,7 +2847,7 @@ XtraTabPage2 - DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a XtraTabControl1 @@ -3222,7 +3222,7 @@ 4 - 1265, 252 + 1261, 249 Variabler Ordnerpfad @@ -3231,7 +3231,7 @@ XtraTabPage4 - DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a XtraTabControl1 @@ -3243,7 +3243,7 @@ XtraTabControl1 - DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a $this @@ -3325,7 +3325,7 @@ DD_DMSDataSet - DD_Record_Organizer.DD_DMSDataSet, DD_DMSDataSet.Designer.vb, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + DD_Record_Organizer.DD_DMSDataSet, DD_DMSDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null BindingNavigatorCountItem @@ -3409,19 +3409,25 @@ GridView1 - DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a colBEZEICHNUNG - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a colOBJEKTTYP - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + colBESCHREIBUNG + + + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a TBWH_DOKART_MODULEBindingSource @@ -3439,25 +3445,25 @@ TBDD_EINGANGSARTENTableAdapter - DD_Record_Organizer.DD_DMSDataSetTableAdapters.TBDD_EINGANGSARTENTableAdapter, DD_DMSDataSet.Designer.vb, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + DD_Record_Organizer.DD_DMSDataSetTableAdapters.TBDD_EINGANGSARTENTableAdapter, DD_DMSDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null TableAdapterManager - DD_Record_Organizer.DD_DMSDataSetTableAdapters.TableAdapterManager, DD_DMSDataSet.Designer.vb, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + DD_Record_Organizer.DD_DMSDataSetTableAdapters.TableAdapterManager, DD_DMSDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null TBDD_DOKUMENTARTTableAdapter - DD_Record_Organizer.DD_DMSDataSetTableAdapters.TBDD_DOKUMENTARTTableAdapter, DD_DMSDataSet.Designer.vb, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + DD_Record_Organizer.DD_DMSDataSetTableAdapters.TBDD_DOKUMENTARTTableAdapter, DD_DMSDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null TBDD_INDEX_AUTOMTableAdapter - DD_Record_Organizer.DD_DMSDataSetTableAdapters.TBDD_INDEX_AUTOMTableAdapter, DD_DMSDataSet.Designer.vb, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + DD_Record_Organizer.DD_DMSDataSetTableAdapters.TBDD_INDEX_AUTOMTableAdapter, DD_DMSDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null TBDD_INDEX_AUTOMBindingSource @@ -3751,31 +3757,25 @@ TBPMO_FORM_VIEWTableAdapter - DD_Record_Organizer.DD_DMSDataSetTableAdapters.TBPMO_FORM_VIEWTableAdapter, DD_DMSDataSet.Designer.vb, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + DD_Record_Organizer.DD_DMSDataSetTableAdapters.TBPMO_FORM_VIEWTableAdapter, DD_DMSDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null TBPMO_WD_FORMVIEW_DOKTYPESTableAdapter - DD_Record_Organizer.DD_DMSDataSetTableAdapters.TBPMO_WD_FORMVIEW_DOKTYPESTableAdapter, DD_DMSDataSet.Designer.vb, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + DD_Record_Organizer.DD_DMSDataSetTableAdapters.TBPMO_WD_FORMVIEW_DOKTYPESTableAdapter, DD_DMSDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null TBWH_DOKART_MODULETableAdapter - DD_Record_Organizer.DD_DMSDataSetTableAdapters.TBWH_DOKART_MODULETableAdapter, DD_DMSDataSet.Designer.vb, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + DD_Record_Organizer.DD_DMSDataSetTableAdapters.TBWH_DOKART_MODULETableAdapter, DD_DMSDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null ToolTipController1 - DevExpress.Utils.ToolTipController, DevExpress.Utils.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - colBESCHREIBUNG - - - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.Utils.ToolTipController, DevExpress.Utils.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a frmWD_Dokumentart_Konfig