diff --git a/app/DD-Record-Organiser/ClassControlBuilder.vb b/app/DD-Record-Organiser/ClassControlBuilder.vb index 10cc35a..5339a55 100644 --- a/app/DD-Record-Organiser/ClassControlBuilder.vb +++ b/app/DD-Record-Organiser/ClassControlBuilder.vb @@ -241,12 +241,12 @@ Public Class ClassControlBuilder Dim ctrlvalID = ClassDatabase.Execute_Scalar(sqlguid) If Not IsNothing(ctrlvalID) Then Dim upd1 = String.Format("UPDATE TBPMO_CONTROL_VALUE SET VALUE = '{0}' WHERE CONTROL_ID = {1} AND RECORD_ID = {2}", value.ToString, CONTROL_ID, CURRENT_RECORD_ID) - ClassDatabase.Execute_non_Query(upd1) + ' ClassDatabase.Execute_non_Query(upd1) Else Dim ins = String.Format("INSERT INTO TBPMO_CONTROL_VALUE (CONTROL_ID,RECORD_ID,VALUE,ADDED_WHO) VALUES ({0},{1},'{2}','{3}')", CONTROL_ID, CURRENT_RECORD_ID, value, Environment.UserName) - If ClassDatabase.Execute_non_Query(ins) = True Then - If LogErrorsOnly = False Then ClassLogger.Add(" >> Value was nothing - Inserted the ControlValue '" & ins & "'") - End If + 'If ClassDatabase.Execute_non_Query(ins) = True Then + ' If LogErrorsOnly = False Then ClassLogger.Add(" >> Value was nothing - Inserted the ControlValue '" & ins & "'") + 'End If End If @@ -264,6 +264,7 @@ Public Class ClassControlBuilder Dim dt As DataTable = ClassDatabase.Return_Datatable(sqlcommand) Dim type = dependingControl.GetType().Name + Select Case type Case "DateEdit" If dt.Rows.Count = 1 Then @@ -301,6 +302,8 @@ Public Class ClassControlBuilder End If Case "CustomComboBox" ControlLoader.Combobox.SetDataSource(DirectCast(dependingControl, CustomComboBox), dt) + Case "CheckedListBoxControl" + ControlLoader.CheckedListBox.SetDataSource(DirectCast(dependingControl, DevExpress.XtraEditors.CheckedListBoxControl), dt) Case "Label" If dt.Rows.Count = 1 Then Try @@ -392,6 +395,49 @@ Public Class ClassControlBuilder Depending_Controls(control, datatable, value) Enable_Controls(control, datatable1, value) + Console.WriteLine("value changed") + Catch ex As Exception + If ex.Message.Contains("Objektverweis") Or ex.Message.Contains("reference not set") Then + + Else + MsgBox("Error in OnComboBoxValueChanged - " & CONTROL_ID.ToString & ": " & ex.Message, MsgBoxStyle.Critical) + End If + End Try + End Sub + Public Sub OnCheckedItemChanged(sender As Object, ByVal e As EventArgs) + If CURRENT_RECORD_ENABLED = False Then Exit Sub + + Try + Dim control As Control = DirectCast(sender, Control) + Dim controlId As Integer = DirectCast(control.Tag, ClassControlMetadata).Id + CONTROL_ID = controlId + control.Update() + If CONTROL_ID = 993 Then + Console.WriteLine("Obacht") + End If + 'SQL für abhängige Auswahllisten + Dim SQL As String = String.Format("SELECT GUID, SQL_COMMAND_1 FROM TBPMO_CONTROL WHERE SQL_COMMAND_1 LIKE '%@{0}@%'", controlId) + 'SQL für enable control + Dim SQLenable As String = String.Format("SELECT GUID, SQL_COMMAND_2 FROM TBPMO_CONTROL WHERE SQL_COMMAND_2 LIKE '%@{0}@%'", controlId) + + + Dim CONTROL_VALUE As String = ClassControlCommandsUI.GetControlValue(control) + + If CURRENT_RECORD_ID = 0 Then + Exit Sub + End If + If CtrlCommandUI.IsInsert = False Then + ClassControlCommandsUI.UpdateMultipleValues(controlId, CURRENT_RECORD_ID, CONTROL_VALUE) + End If + + + Dim datatable As DataTable = ClassDatabase.Return_Datatable(SQL) + Dim datatable1 As DataTable = ClassDatabase.Return_Datatable(SQLenable) + Depending_Controls(control, datatable, CONTROL_VALUE) + Enable_Controls(control, datatable1, CONTROL_VALUE) + Dim values = New List(Of Object)(CONTROL_VALUE.Split(";").ToArray()) + 'Jetzt noch die checked Items setzen + ClassControlValues.LoadControlValue(CURRENT_RECORD_ID, CURRENT_PARENT_ID, controlId, control, values, 99) 'Dim sqlcommand As String = datatable.Rows(0).Item("SQL_COMMAND_1") @@ -428,7 +474,7 @@ Public Class ClassControlBuilder If ex.Message.Contains("Objektverweis") Or ex.Message.Contains("reference not set") Then Else - MsgBox("Error in OnComboBoxValueChanged - " & CONTROL_ID.ToString & ": " & ex.Message, MsgBoxStyle.Critical) + MsgBox("Error in OnCheckedItemChanged - " & CONTROL_ID.ToString & ": " & ex.Message, MsgBoxStyle.Critical) End If End Try End Sub @@ -567,6 +613,7 @@ Public Class ClassControlBuilder Case "CheckedListBoxControl" Dim chklistbox As DevExpress.XtraEditors.CheckedListBoxControl = CType(control, DevExpress.XtraEditors.CheckedListBoxControl) AddHandler chklistbox.ItemCheck, AddressOf RecordChanged + AddHandler chklistbox.ItemCheck, AddressOf OnCheckedItemChanged ' AddHandler chklistbox.EnabledChanged, AddressOf OnEnabledChanged Case "DataGridView" diff --git a/app/DD-Record-Organiser/ClassControlCommandsUI.vb b/app/DD-Record-Organiser/ClassControlCommandsUI.vb index a374fc9..d90ae9b 100644 --- a/app/DD-Record-Organiser/ClassControlCommandsUI.vb +++ b/app/DD-Record-Organiser/ClassControlCommandsUI.vb @@ -545,7 +545,7 @@ Public Class ClassControlCommandsUI End Sub - Public Sub UpdateMultipleValues(ControlId As Integer, RecordId As Integer, value As String) + Public Shared Sub UpdateMultipleValues(ControlId As Integer, RecordId As Integer, value As String) Try If IsNothing(value) Then Exit Sub @@ -576,7 +576,7 @@ Public Class ClassControlCommandsUI End Try End Sub - Function GetControlValue(ctrl As Control) As String + Public Shared Function GetControlValue(ctrl As Control) As String Dim type = ctrl.GetType().Name Dim CONTROL_ID As Integer = DirectCast(ctrl.Tag, ClassControlMetadata).Id ' GetControlID_for_RecordID(ctrl.Name, CURRENT_RECORD_ID) @@ -678,7 +678,7 @@ Public Class ClassControlCommandsUI Next Else - + For Each item As Object In DirectCast(ctrl, DevExpress.XtraEditors.CheckedListBoxControl).CheckedItems Dim row As DataRowView = CType(item, DataRowView) If row.DataView.Table.Columns.Count = 1 Then @@ -690,12 +690,12 @@ Public Class ClassControlCommandsUI End If checked_result_string = String.Join(";", checked_result) Next - + End If - + ' Hier wird ein String zurückgegeben, der als VALUE gespeichert werden soll ' Überspringt den Rest der funktion If Not IsNothing(checked_result_string) Then diff --git a/app/DD-Record-Organiser/ClassControlLoader.vb b/app/DD-Record-Organiser/ClassControlLoader.vb index 7a9c728..1639b2c 100644 --- a/app/DD-Record-Organiser/ClassControlLoader.vb +++ b/app/DD-Record-Organiser/ClassControlLoader.vb @@ -370,6 +370,7 @@ Public Class CheckedListBox : Inherits _ListControl Public Shared Sub LoadValue(control As DevExpress.XtraEditors.CheckedListBoxControl, values As List(Of Object)) + If IsNothing(values) Then Exit Sub End If diff --git a/app/DD-Record-Organiser/ClassControlValues.vb b/app/DD-Record-Organiser/ClassControlValues.vb index cb7bb06..b48920d 100644 --- a/app/DD-Record-Organiser/ClassControlValues.vb +++ b/app/DD-Record-Organiser/ClassControlValues.vb @@ -219,7 +219,7 @@ Public Class ClassControlValues End Sub - Private Shared Sub LoadControlValue(recordId As Integer, parentRecordId As Integer, controlId As Integer, control As Control, values As List(Of Object), entity_ID As Integer) + Public Shared Sub LoadControlValue(recordId As Integer, parentRecordId As Integer, controlId As Integer, control As Control, values As List(Of Object), entity_ID As Integer) Try ' Für die meisten Controls wird nur das erste Element der Liste benötigt Dim value As String = Nothing @@ -240,7 +240,7 @@ Public Class ClassControlValues ControlLoader.Label.LoadValue(label, recordId, parentRecordId, value, entity_ID) Case GetType(CustomComboBox) - + Dim combobox As CustomComboBox = DirectCast(control, CustomComboBox) ControlLoader.Combobox.LoadValue(combobox, recordId, parentRecordId, value) diff --git a/app/DD-Record-Organiser/DD-Record-Organiser.vbproj b/app/DD-Record-Organiser/DD-Record-Organiser.vbproj index 4cd728d..9fe0483 100644 --- a/app/DD-Record-Organiser/DD-Record-Organiser.vbproj +++ b/app/DD-Record-Organiser/DD-Record-Organiser.vbproj @@ -1166,6 +1166,8 @@ + + @@ -1242,6 +1244,7 @@ + diff --git a/app/DD-Record-Organiser/DD_ECMAdmin.Designer.vb b/app/DD-Record-Organiser/DD_ECMAdmin.Designer.vb index a0d9d32..1032728 100644 --- a/app/DD-Record-Organiser/DD_ECMAdmin.Designer.vb +++ b/app/DD-Record-Organiser/DD_ECMAdmin.Designer.vb @@ -1038,6 +1038,8 @@ Partial Public Class DD_ECMAdmin Private columnSQL_RIGHT_READ_AND_VIEW_ONLY As Global.System.Data.DataColumn + Private columnSQL_RIGHT_WINDREAM_VIEW As Global.System.Data.DataColumn + _ Public Sub New() @@ -1265,6 +1267,14 @@ Partial Public Class DD_ECMAdmin End Get End Property + _ + Public ReadOnly Property SQL_RIGHT_WINDREAM_VIEWColumn() As Global.System.Data.DataColumn + Get + Return Me.columnSQL_RIGHT_WINDREAM_VIEW + End Get + End Property + _ @@ -1325,9 +1335,10 @@ Partial Public Class DD_ECMAdmin ByVal LOAD_DIRECT As Boolean, _ ByVal SQL_QUICK_VIEW As String, _ ByVal CONTROL_DOCTYPE_MATCH As Integer, _ - ByVal SQL_RIGHT_READ_AND_VIEW_ONLY As String) As TBPMO_FORM_CONSTRUCTOR_DETAILRow + ByVal SQL_RIGHT_READ_AND_VIEW_ONLY As String, _ + ByVal SQL_RIGHT_WINDREAM_VIEW As String) As TBPMO_FORM_CONSTRUCTOR_DETAILRow Dim rowTBPMO_FORM_CONSTRUCTOR_DETAILRow As TBPMO_FORM_CONSTRUCTOR_DETAILRow = CType(Me.NewRow, TBPMO_FORM_CONSTRUCTOR_DETAILRow) - Dim columnValuesArray() As Object = New Object() {Nothing, Nothing, FORM_ID, PARENT_ID, LEVEL1_SELECT, SEQUENCE, SQL_SELECT_EBENE1, SQL_SELECT_EBENE2, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, COLUMN_NAME1, COLUMN_NAME2, WINDREAM_SEARCH, SEARCH_PATTERN1, SEARCH_PATTERN2, SEARCH_PATTERN3, SEARCH_PATTERN4, SEARCH_PATTERN5, LOAD_DIRECT, SQL_QUICK_VIEW, CONTROL_DOCTYPE_MATCH, SQL_RIGHT_READ_AND_VIEW_ONLY} + Dim columnValuesArray() As Object = New Object() {Nothing, Nothing, FORM_ID, PARENT_ID, LEVEL1_SELECT, SEQUENCE, SQL_SELECT_EBENE1, SQL_SELECT_EBENE2, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, COLUMN_NAME1, COLUMN_NAME2, WINDREAM_SEARCH, SEARCH_PATTERN1, SEARCH_PATTERN2, SEARCH_PATTERN3, SEARCH_PATTERN4, SEARCH_PATTERN5, LOAD_DIRECT, SQL_QUICK_VIEW, CONTROL_DOCTYPE_MATCH, SQL_RIGHT_READ_AND_VIEW_ONLY, SQL_RIGHT_WINDREAM_VIEW} If (Not (parentTBPMO_FORM_CONSTRUCTORRowByFK_TBPMO_FORM_CONSTRUCTOR_DETAIL_CONSTRUCT_ID) Is Nothing) Then columnValuesArray(1) = parentTBPMO_FORM_CONSTRUCTORRowByFK_TBPMO_FORM_CONSTRUCTOR_DETAIL_CONSTRUCT_ID(0) End If @@ -1383,6 +1394,7 @@ Partial Public Class DD_ECMAdmin Me.columnSQL_QUICK_VIEW = MyBase.Columns("SQL_QUICK_VIEW") Me.columnCONTROL_DOCTYPE_MATCH = MyBase.Columns("CONTROL_DOCTYPE_MATCH") Me.columnSQL_RIGHT_READ_AND_VIEW_ONLY = MyBase.Columns("SQL_RIGHT_READ_AND_VIEW_ONLY") + Me.columnSQL_RIGHT_WINDREAM_VIEW = MyBase.Columns("SQL_RIGHT_WINDREAM_VIEW") End Sub _ + Public Property SQL_RIGHT_WINDREAM_VIEW() As String + Get + Return CType(Me(Me.tableTBPMO_FORM_CONSTRUCTOR_DETAIL.SQL_RIGHT_WINDREAM_VIEWColumn), String) + End Get + Set(value As String) + Me(Me.tableTBPMO_FORM_CONSTRUCTOR_DETAIL.SQL_RIGHT_WINDREAM_VIEWColumn) = value + End Set + End Property + _ Public Property TBPMO_FORM_CONSTRUCTORRow() As TBPMO_FORM_CONSTRUCTORRow @@ -6911,6 +6938,7 @@ Namespace DD_ECMAdminTableAdapters tableMapping.ColumnMappings.Add("SQL_QUICK_VIEW", "SQL_QUICK_VIEW") tableMapping.ColumnMappings.Add("CONTROL_DOCTYPE_MATCH", "CONTROL_DOCTYPE_MATCH") tableMapping.ColumnMappings.Add("SQL_RIGHT_READ_AND_VIEW_ONLY", "SQL_RIGHT_READ_AND_VIEW_ONLY") + tableMapping.ColumnMappings.Add("SQL_RIGHT_WINDREAM_VIEW", "SQL_RIGHT_WINDREAM_VIEW") Me._adapter.TableMappings.Add(tableMapping) Me._adapter.DeleteCommand = New Global.System.Data.SqlClient.SqlCommand() Me._adapter.DeleteCommand.Connection = Me.Connection @@ -6923,16 +6951,16 @@ Namespace DD_ECMAdminTableAdapters ", FORM_ID, PARENT_ID, LEVEL1_SELECT, SEQUENCE, SQL_SELECT_EBENE1, SQL_SELECT_EBE" & _ "NE2, ADDED_WHO, COLUMN_NAME1, COLUMN_NAME2, WINDREAM_SEARCH, " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & " " & _ " SEARCH_PATTERN1, SEARCH_PATTERN2, SEARCH_PATTERN3, SEARCH_PATTERN4, SEAR" & _ - "CH_PATTERN5, CONTROL_DOCTYPE_MATCH, SQL_RIGHT_READ_AND_VIEW_ONLY)" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "VALUES " & _ - " (@CONSTRUCT_ID,@FORM_ID,@PARENT_ID,@LEVEL1_SELECT,@SEQUENCE,@SQL_SELECT_EBENE1," & _ - "@SQL_SELECT_EBENE2,@ADDED_WHO,@COLUMN_NAME1,@COLUMN_NAME2,@WINDREAM_SEARCH,@SEAR" & _ - "CH_PATTERN1,@SEARCH_PATTERN2,@SEARCH_PATTERN3,@SEARCH_PATTERN4,@SEARCH_PATTERN5," & _ - "@CONTROL_DOCTYPE_MATCH,@SQL_RIGHT_READ_AND_VIEW_ONLY); " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "SELECT GUID, CONSTRUC" & _ - "T_ID, FORM_ID, PARENT_ID, LEVEL1_SELECT, SEQUENCE, SQL_SELECT_EBENE1, SQL_SELECT" & _ - "_EBENE2, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, COLUMN_NAME1, COLUMN_" & _ - "NAME2, WINDREAM_SEARCH, SEARCH_PATTERN1, SEARCH_PATTERN2, SEARCH_PATTERN3, SEARC" & _ - "H_PATTERN4, SEARCH_PATTERN5 FROM TBPMO_FORM_CONSTRUCTOR_DETAIL WHERE (GUID = SCO" & _ - "PE_IDENTITY())" + "CH_PATTERN5, CONTROL_DOCTYPE_MATCH, SQL_RIGHT_READ_AND_VIEW_ONLY, SQL_RIGHT_WIND" & _ + "REAM_VIEW)" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "VALUES (@CONSTRUCT_ID,@FORM_ID,@PARENT_ID,@LEVEL1_SELECT,@SEQ" & _ + "UENCE,@SQL_SELECT_EBENE1,@SQL_SELECT_EBENE2,@ADDED_WHO,@COLUMN_NAME1,@COLUMN_NAM" & _ + "E2,@WINDREAM_SEARCH,@SEARCH_PATTERN1,@SEARCH_PATTERN2,@SEARCH_PATTERN3,@SEARCH_P" & _ + "ATTERN4,@SEARCH_PATTERN5,@CONTROL_DOCTYPE_MATCH,@SQL_RIGHT_READ_AND_VIEW_ONLY,@S" & _ + "QL_RIGHT_WINDREAM_VIEW); " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "SELECT GUID, CONSTRUCT_ID, FORM_ID, PARENT_ID, LEV" & _ + "EL1_SELECT, SEQUENCE, SQL_SELECT_EBENE1, SQL_SELECT_EBENE2, ADDED_WHO, ADDED_WHE" & _ + "N, CHANGED_WHO, CHANGED_WHEN, COLUMN_NAME1, COLUMN_NAME2, WINDREAM_SEARCH, SEARC" & _ + "H_PATTERN1, SEARCH_PATTERN2, SEARCH_PATTERN3, SEARCH_PATTERN4, SEARCH_PATTERN5 F" & _ + "ROM TBPMO_FORM_CONSTRUCTOR_DETAIL WHERE (GUID = SCOPE_IDENTITY())" Me._adapter.InsertCommand.CommandType = Global.System.Data.CommandType.Text Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CONSTRUCT_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "CONSTRUCT_ID", Global.System.Data.DataRowVersion.Current, False, Nothing, "", "", "")) Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@FORM_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "FORM_ID", Global.System.Data.DataRowVersion.Current, False, Nothing, "", "", "")) @@ -6952,6 +6980,7 @@ Namespace DD_ECMAdminTableAdapters Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SEARCH_PATTERN5", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "SEARCH_PATTERN5", Global.System.Data.DataRowVersion.Current, False, Nothing, "", "", "")) Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CONTROL_DOCTYPE_MATCH", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "CONTROL_DOCTYPE_MATCH", Global.System.Data.DataRowVersion.Current, False, Nothing, "", "", "")) Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SQL_RIGHT_READ_AND_VIEW_ONLY", Global.System.Data.SqlDbType.VarChar, 5000, Global.System.Data.ParameterDirection.Input, 0, 0, "SQL_RIGHT_READ_AND_VIEW_ONLY", Global.System.Data.DataRowVersion.Current, False, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SQL_RIGHT_WINDREAM_VIEW", Global.System.Data.SqlDbType.VarChar, 5000, Global.System.Data.ParameterDirection.Input, 0, 0, "SQL_RIGHT_WINDREAM_VIEW", Global.System.Data.DataRowVersion.Current, False, Nothing, "", "", "")) Me._adapter.UpdateCommand = New Global.System.Data.SqlClient.SqlCommand() Me._adapter.UpdateCommand.Connection = Me.Connection Me._adapter.UpdateCommand.CommandText = "UPDATE TBPMO_FORM_CONSTRUCTOR_DETAIL" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "SET CONSTRUCT_ID = @CO" & _ @@ -6964,7 +6993,8 @@ Namespace DD_ECMAdminTableAdapters "N3 = @SEARCH_PATTERN3, SEARCH_PATTERN4 = @SEARCH_PATTERN4, SEARCH_PATTERN5 = @SE" & _ "ARCH_PATTERN5, LOAD_DIRECT = @LOAD_DIRECT, " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & " CONTROL_DO" & _ "CTYPE_MATCH = @CONTROL_DOCTYPE_MATCH, SQL_RIGHT_READ_AND_VIEW_ONLY = @SQL_RIGHT_" & _ - "READ_AND_VIEW_ONLY" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "WHERE (GUID = @Original_GUID); " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "SELECT GUID, CONS" & _ + "READ_AND_VIEW_ONLY, " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & " SQL_RIGHT_WINDREAM_VIEW = @SQL_RI" & _ + "GHT_WINDREAM_VIEW" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "WHERE (GUID = @Original_GUID); " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "SELECT GUID, CONS" & _ "TRUCT_ID, FORM_ID, PARENT_ID, LEVEL1_SELECT, SEQUENCE, SQL_SELECT_EBENE1, SQL_SE" & _ "LECT_EBENE2, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, COLUMN_NAME1, COL" & _ "UMN_NAME2, WINDREAM_SEARCH, SEARCH_PATTERN1, SEARCH_PATTERN2, SEARCH_PATTERN3, S" & _ @@ -6990,6 +7020,7 @@ Namespace DD_ECMAdminTableAdapters Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@LOAD_DIRECT", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "LOAD_DIRECT", Global.System.Data.DataRowVersion.Current, False, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CONTROL_DOCTYPE_MATCH", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "CONTROL_DOCTYPE_MATCH", Global.System.Data.DataRowVersion.Current, False, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SQL_RIGHT_READ_AND_VIEW_ONLY", Global.System.Data.SqlDbType.VarChar, 5000, Global.System.Data.ParameterDirection.Input, 0, 0, "SQL_RIGHT_READ_AND_VIEW_ONLY", Global.System.Data.DataRowVersion.Current, False, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SQL_RIGHT_WINDREAM_VIEW", Global.System.Data.SqlDbType.VarChar, 5000, Global.System.Data.ParameterDirection.Input, 0, 0, "SQL_RIGHT_WINDREAM_VIEW", Global.System.Data.DataRowVersion.Current, False, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, False, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, False, Nothing, "", "", "")) End Sub @@ -7012,8 +7043,8 @@ Namespace DD_ECMAdminTableAdapters "WHEN, " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & " COLUMN_NAME1, COLUMN_NAME2, WINDREAM_SEARCH, SE" & _ "ARCH_PATTERN1, SEARCH_PATTERN2, SEARCH_PATTERN3, SEARCH_PATTERN4, SEARCH_PATTERN" & _ "5, LOAD_DIRECT, SQL_QUICK_VIEW, " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & " CONTROL_DOCTYPE_MATCH" & _ - ", SQL_RIGHT_READ_AND_VIEW_ONLY" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "FROM TBPMO_FORM_CONSTRUCTOR_DETAIL" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "W" & _ - "HERE (GUID = @ID)" + ", SQL_RIGHT_READ_AND_VIEW_ONLY, SQL_RIGHT_WINDREAM_VIEW" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "FROM TBPMO_F" & _ + "ORM_CONSTRUCTOR_DETAIL" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "WHERE (GUID = @ID)" Me._commandCollection(0).CommandType = Global.System.Data.CommandType.Text Me._commandCollection(0).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Current, False, Nothing, "", "", "")) End Sub @@ -7115,7 +7146,8 @@ Namespace DD_ECMAdminTableAdapters ByVal SEARCH_PATTERN4 As String, _ ByVal SEARCH_PATTERN5 As String, _ ByVal CONTROL_DOCTYPE_MATCH As Integer, _ - ByVal SQL_RIGHT_READ_AND_VIEW_ONLY As String) As Integer + ByVal SQL_RIGHT_READ_AND_VIEW_ONLY As String, _ + ByVal SQL_RIGHT_WINDREAM_VIEW As String) As Integer Me.Adapter.InsertCommand.Parameters(0).Value = CType(CONSTRUCT_ID, Integer) Me.Adapter.InsertCommand.Parameters(1).Value = CType(FORM_ID, Integer) Me.Adapter.InsertCommand.Parameters(2).Value = CType(PARENT_ID, Integer) @@ -7182,6 +7214,11 @@ Namespace DD_ECMAdminTableAdapters Else Me.Adapter.InsertCommand.Parameters(17).Value = CType(SQL_RIGHT_READ_AND_VIEW_ONLY, String) End If + If (SQL_RIGHT_WINDREAM_VIEW Is Nothing) Then + Throw New Global.System.ArgumentNullException("SQL_RIGHT_WINDREAM_VIEW") + Else + Me.Adapter.InsertCommand.Parameters(18).Value = CType(SQL_RIGHT_WINDREAM_VIEW, String) + End If Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.InsertCommand.Connection.State If ((Me.Adapter.InsertCommand.Connection.State And Global.System.Data.ConnectionState.Open) _ <> Global.System.Data.ConnectionState.Open) Then @@ -7221,6 +7258,7 @@ Namespace DD_ECMAdminTableAdapters ByVal LOAD_DIRECT As Boolean, _ ByVal CONTROL_DOCTYPE_MATCH As Integer, _ ByVal SQL_RIGHT_READ_AND_VIEW_ONLY As String, _ + ByVal SQL_RIGHT_WINDREAM_VIEW As String, _ ByVal Original_GUID As Integer, _ ByVal GUID As Integer) As Integer Me.Adapter.UpdateCommand.Parameters(0).Value = CType(CONSTRUCT_ID, Integer) @@ -7290,8 +7328,13 @@ Namespace DD_ECMAdminTableAdapters Else Me.Adapter.UpdateCommand.Parameters(18).Value = CType(SQL_RIGHT_READ_AND_VIEW_ONLY, String) End If - Me.Adapter.UpdateCommand.Parameters(19).Value = CType(Original_GUID, Integer) - Me.Adapter.UpdateCommand.Parameters(20).Value = CType(GUID, Integer) + If (SQL_RIGHT_WINDREAM_VIEW Is Nothing) Then + Throw New Global.System.ArgumentNullException("SQL_RIGHT_WINDREAM_VIEW") + Else + Me.Adapter.UpdateCommand.Parameters(19).Value = CType(SQL_RIGHT_WINDREAM_VIEW, String) + End If + Me.Adapter.UpdateCommand.Parameters(20).Value = CType(Original_GUID, Integer) + Me.Adapter.UpdateCommand.Parameters(21).Value = CType(GUID, Integer) Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.UpdateCommand.Connection.State If ((Me.Adapter.UpdateCommand.Connection.State And Global.System.Data.ConnectionState.Open) _ <> Global.System.Data.ConnectionState.Open) Then diff --git a/app/DD-Record-Organiser/DD_ECMAdmin.xsd b/app/DD-Record-Organiser/DD_ECMAdmin.xsd index 7676dae..b1b447b 100644 --- a/app/DD-Record-Organiser/DD_ECMAdmin.xsd +++ b/app/DD-Record-Organiser/DD_ECMAdmin.xsd @@ -97,8 +97,8 @@ WHERE (GUID = @Original_GUID) INSERT INTO TBPMO_FORM_CONSTRUCTOR_DETAIL (CONSTRUCT_ID, FORM_ID, PARENT_ID, LEVEL1_SELECT, SEQUENCE, SQL_SELECT_EBENE1, SQL_SELECT_EBENE2, ADDED_WHO, COLUMN_NAME1, COLUMN_NAME2, WINDREAM_SEARCH, - SEARCH_PATTERN1, SEARCH_PATTERN2, SEARCH_PATTERN3, SEARCH_PATTERN4, SEARCH_PATTERN5, CONTROL_DOCTYPE_MATCH, SQL_RIGHT_READ_AND_VIEW_ONLY) -VALUES (@CONSTRUCT_ID,@FORM_ID,@PARENT_ID,@LEVEL1_SELECT,@SEQUENCE,@SQL_SELECT_EBENE1,@SQL_SELECT_EBENE2,@ADDED_WHO,@COLUMN_NAME1,@COLUMN_NAME2,@WINDREAM_SEARCH,@SEARCH_PATTERN1,@SEARCH_PATTERN2,@SEARCH_PATTERN3,@SEARCH_PATTERN4,@SEARCH_PATTERN5,@CONTROL_DOCTYPE_MATCH,@SQL_RIGHT_READ_AND_VIEW_ONLY); + SEARCH_PATTERN1, SEARCH_PATTERN2, SEARCH_PATTERN3, SEARCH_PATTERN4, SEARCH_PATTERN5, CONTROL_DOCTYPE_MATCH, SQL_RIGHT_READ_AND_VIEW_ONLY, SQL_RIGHT_WINDREAM_VIEW) +VALUES (@CONSTRUCT_ID,@FORM_ID,@PARENT_ID,@LEVEL1_SELECT,@SEQUENCE,@SQL_SELECT_EBENE1,@SQL_SELECT_EBENE2,@ADDED_WHO,@COLUMN_NAME1,@COLUMN_NAME2,@WINDREAM_SEARCH,@SEARCH_PATTERN1,@SEARCH_PATTERN2,@SEARCH_PATTERN3,@SEARCH_PATTERN4,@SEARCH_PATTERN5,@CONTROL_DOCTYPE_MATCH,@SQL_RIGHT_READ_AND_VIEW_ONLY,@SQL_RIGHT_WINDREAM_VIEW); SELECT GUID, CONSTRUCT_ID, FORM_ID, PARENT_ID, LEVEL1_SELECT, SEQUENCE, SQL_SELECT_EBENE1, SQL_SELECT_EBENE2, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, COLUMN_NAME1, COLUMN_NAME2, WINDREAM_SEARCH, SEARCH_PATTERN1, SEARCH_PATTERN2, SEARCH_PATTERN3, SEARCH_PATTERN4, SEARCH_PATTERN5 FROM TBPMO_FORM_CONSTRUCTOR_DETAIL WHERE (GUID = SCOPE_IDENTITY()) @@ -119,6 +119,7 @@ SELECT GUID, CONSTRUCT_ID, FORM_ID, PARENT_ID, LEVEL1_SELECT, SEQUENCE, SQL_SELE + @@ -126,7 +127,7 @@ SELECT GUID, CONSTRUCT_ID, FORM_ID, PARENT_ID, LEVEL1_SELECT, SEQUENCE, SQL_SELE SELECT GUID, CONSTRUCT_ID, FORM_ID, PARENT_ID, LEVEL1_SELECT, SEQUENCE, SQL_SELECT_EBENE1, SQL_SELECT_EBENE2, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, COLUMN_NAME1, COLUMN_NAME2, WINDREAM_SEARCH, SEARCH_PATTERN1, SEARCH_PATTERN2, SEARCH_PATTERN3, SEARCH_PATTERN4, SEARCH_PATTERN5, LOAD_DIRECT, SQL_QUICK_VIEW, - CONTROL_DOCTYPE_MATCH, SQL_RIGHT_READ_AND_VIEW_ONLY + CONTROL_DOCTYPE_MATCH, SQL_RIGHT_READ_AND_VIEW_ONLY, SQL_RIGHT_WINDREAM_VIEW FROM TBPMO_FORM_CONSTRUCTOR_DETAIL WHERE (GUID = @ID) @@ -141,8 +142,9 @@ SET CONSTRUCT_ID = @CONSTRUCT_ID, FORM_ID = @FORM_ID, PARENT_ID = SQL_SELECT_EBENE1 = @SQL_SELECT_EBENE1, SQL_SELECT_EBENE2 = @SQL_SELECT_EBENE2, CHANGED_WHO = @CHANGED_WHO, COLUMN_NAME1 = @COLUMN_NAME1, COLUMN_NAME2 = @COLUMN_NAME2, WINDREAM_SEARCH = @WINDREAM_SEARCH, SEARCH_PATTERN1 = @SEARCH_PATTERN1, SEARCH_PATTERN2 = @SEARCH_PATTERN2, SEARCH_PATTERN3 = @SEARCH_PATTERN3, SEARCH_PATTERN4 = @SEARCH_PATTERN4, SEARCH_PATTERN5 = @SEARCH_PATTERN5, LOAD_DIRECT = @LOAD_DIRECT, - CONTROL_DOCTYPE_MATCH = @CONTROL_DOCTYPE_MATCH, SQL_RIGHT_READ_AND_VIEW_ONLY = @SQL_RIGHT_READ_AND_VIEW_ONLY -WHERE (GUID = @Original_GUID); + CONTROL_DOCTYPE_MATCH = @CONTROL_DOCTYPE_MATCH, SQL_RIGHT_READ_AND_VIEW_ONLY = @SQL_RIGHT_READ_AND_VIEW_ONLY, + SQL_RIGHT_WINDREAM_VIEW = @SQL_RIGHT_WINDREAM_VIEW +WHERE (GUID = @Original_GUID); SELECT GUID, CONSTRUCT_ID, FORM_ID, PARENT_ID, LEVEL1_SELECT, SEQUENCE, SQL_SELECT_EBENE1, SQL_SELECT_EBENE2, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, COLUMN_NAME1, COLUMN_NAME2, WINDREAM_SEARCH, SEARCH_PATTERN1, SEARCH_PATTERN2, SEARCH_PATTERN3, SEARCH_PATTERN4, SEARCH_PATTERN5 FROM TBPMO_FORM_CONSTRUCTOR_DETAIL WHERE (GUID = @GUID) @@ -164,6 +166,7 @@ SELECT GUID, CONSTRUCT_ID, FORM_ID, PARENT_ID, LEVEL1_SELECT, SEQUENCE, SQL_SELE + @@ -196,6 +199,7 @@ SELECT GUID, CONSTRUCT_ID, FORM_ID, PARENT_ID, LEVEL1_SELECT, SEQUENCE, SQL_SELE + @@ -358,7 +362,7 @@ ORDER BY NAME - + @@ -404,7 +408,7 @@ ORDER BY NAME - + @@ -515,10 +519,17 @@ ORDER BY NAME + + + + + + + - + @@ -591,14 +602,14 @@ ORDER BY NAME - + - + @@ -627,7 +638,7 @@ ORDER BY NAME - + @@ -639,7 +650,7 @@ ORDER BY NAME - + @@ -660,7 +671,7 @@ ORDER BY NAME - + @@ -674,7 +685,7 @@ ORDER BY NAME - + @@ -686,7 +697,7 @@ ORDER BY NAME - + @@ -727,7 +738,7 @@ ORDER BY NAME - + \ No newline at end of file diff --git a/app/DD-Record-Organiser/My Project/Resources.Designer.vb b/app/DD-Record-Organiser/My Project/Resources.Designer.vb index da95f5e..c62f518 100644 --- a/app/DD-Record-Organiser/My Project/Resources.Designer.vb +++ b/app/DD-Record-Organiser/My Project/Resources.Designer.vb @@ -760,6 +760,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + Friend ReadOnly Property doc_excel_csv() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("doc_excel_csv", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' @@ -780,6 +790,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + Friend ReadOnly Property dwg() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("dwg", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' diff --git a/app/DD-Record-Organiser/My Project/Resources.resx b/app/DD-Record-Organiser/My Project/Resources.resx index 8378996..ed2658d 100644 --- a/app/DD-Record-Organiser/My Project/Resources.resx +++ b/app/DD-Record-Organiser/My Project/Resources.resx @@ -616,4 +616,10 @@ ..\Resources\windream-Logo-transparent_klein.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\doc_excel_csv.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\dwg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/app/DD-Record-Organiser/Resources/csv.png b/app/DD-Record-Organiser/Resources/csv.png new file mode 100644 index 0000000..3e9d6ed Binary files /dev/null and b/app/DD-Record-Organiser/Resources/csv.png differ diff --git a/app/DD-Record-Organiser/Resources/doc_excel_csv.png b/app/DD-Record-Organiser/Resources/doc_excel_csv.png new file mode 100644 index 0000000..6bb6cef Binary files /dev/null and b/app/DD-Record-Organiser/Resources/doc_excel_csv.png differ diff --git a/app/DD-Record-Organiser/Resources/dwg.png b/app/DD-Record-Organiser/Resources/dwg.png new file mode 100644 index 0000000..698eb4c Binary files /dev/null and b/app/DD-Record-Organiser/Resources/dwg.png differ diff --git a/app/DD-Record-Organiser/frmConstructorDesigner.Designer.vb b/app/DD-Record-Organiser/frmConstructorDesigner.Designer.vb index b939376..5fe9237 100644 --- a/app/DD-Record-Organiser/frmConstructorDesigner.Designer.vb +++ b/app/DD-Record-Organiser/frmConstructorDesigner.Designer.vb @@ -22,6 +22,7 @@ Partial Class frmConstructorDesigner 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. _ Private Sub InitializeComponent() + Me.components = New System.ComponentModel.Container() Dim GUIDLabel As System.Windows.Forms.Label Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmConstructorDesigner)) Dim FORM_TITLELabel As System.Windows.Forms.Label @@ -53,12 +54,13 @@ Partial Class frmConstructorDesigner Dim SQL_RIGHT_READ_AND_VIEW_ONLYLabel 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 SQL_RIGHT_WINDREAM_VIEWLabel As System.Windows.Forms.Label Me.DD_ECMAdmin = New DD_Record_Organiser.DD_ECMAdmin() - Me.TBPMO_FORM_CONSTRUCTORBindingSource = New System.Windows.Forms.BindingSource() + Me.TBPMO_FORM_CONSTRUCTORBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.TBPMO_FORM_CONSTRUCTORTableAdapter = New DD_Record_Organiser.DD_ECMAdminTableAdapters.TBPMO_FORM_CONSTRUCTORTableAdapter() Me.TableAdapterManager = New DD_Record_Organiser.DD_ECMAdminTableAdapters.TableAdapterManager() Me.TBPMO_FORM_CONSTRUCTOR_DETAILTableAdapter = New DD_Record_Organiser.DD_ECMAdminTableAdapters.TBPMO_FORM_CONSTRUCTOR_DETAILTableAdapter() - Me.TBPMO_FORM_CONSTRUCTORBindingNavigator = New System.Windows.Forms.BindingNavigator() + Me.TBPMO_FORM_CONSTRUCTORBindingNavigator = New System.Windows.Forms.BindingNavigator(Me.components) Me.BindingNavigatorAddNewItem = New System.Windows.Forms.ToolStripButton() Me.BindingNavigatorCountItem = New System.Windows.Forms.ToolStripLabel() Me.BindingNavigatorDeleteItem = New System.Windows.Forms.ToolStripButton() @@ -71,11 +73,11 @@ Partial Class frmConstructorDesigner Me.BindingNavigatorMoveLastItem = New System.Windows.Forms.ToolStripButton() Me.BindingNavigatorSeparator2 = New System.Windows.Forms.ToolStripSeparator() Me.TBPMO_FORM_CONSTRUCTORBindingNavigatorSaveItem = New System.Windows.Forms.ToolStripButton() - Me.TBPMO_FORM_CONSTRUCTOR_DETAILBindingSource = New System.Windows.Forms.BindingSource() + Me.TBPMO_FORM_CONSTRUCTOR_DETAILBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.TreeViewDetails = New System.Windows.Forms.TreeView() - Me.cmstrpEntity = New System.Windows.Forms.ContextMenuStrip() + Me.cmstrpEntity = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.FormDesignerToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.ImageList1 = New System.Windows.Forms.ImageList() + Me.ImageList1 = New System.Windows.Forms.ImageList(Me.components) Me.CONSTRUCTOR_IDTextBox = New System.Windows.Forms.TextBox() Me.FORM_TITLETextBox = New System.Windows.Forms.TextBox() Me.SEQUENCE_MENUNumericUpDown = New System.Windows.Forms.NumericUpDown() @@ -144,7 +146,7 @@ Partial Class frmConstructorDesigner Me.TabControl1 = New System.Windows.Forms.TabControl() Me.TabPage1 = New System.Windows.Forms.TabPage() Me.GridControlUserSQL = New DevExpress.XtraGrid.GridControl() - Me.TBWH_Users1BindingSource = New System.Windows.Forms.BindingSource() + Me.TBWH_Users1BindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.GridViewUserSQL = New DevExpress.XtraGrid.Views.Grid.GridView() Me.GridColumn4 = New DevExpress.XtraGrid.Columns.GridColumn() Me.GridColumn5 = New DevExpress.XtraGrid.Columns.GridColumn() @@ -160,7 +162,7 @@ Partial Class frmConstructorDesigner Me.btnAddUserSQL = New System.Windows.Forms.Button() Me.lblsaveSQLUser = New System.Windows.Forms.Label() Me.CHANGED_WHENTextBox2 = New System.Windows.Forms.TextBox() - Me.TBPMO_CONSTRUCTOR_USER_SQLBindingSource = New System.Windows.Forms.BindingSource() + Me.TBPMO_CONSTRUCTOR_USER_SQLBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.DD_DMSDataSet = New DD_Record_Organiser.DD_DMSDataSet() Me.CHANGED_WHOTextBox2 = New System.Windows.Forms.TextBox() Me.ADDED_WHENTextBox2 = New System.Windows.Forms.TextBox() @@ -180,17 +182,17 @@ Partial Class frmConstructorDesigner Me.tslblSaveDetail = New System.Windows.Forms.ToolStripStatusLabel() Me.ToolStrip1 = New System.Windows.Forms.ToolStrip() Me.tsbtnSave = New System.Windows.Forms.ToolStripButton() - Me.TBTEMP_QUICKDISPLAYBindingSource = New System.Windows.Forms.BindingSource() + Me.TBTEMP_QUICKDISPLAYBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.ListBox1 = New System.Windows.Forms.ListBox() Me.Label1 = New System.Windows.Forms.Label() - Me.TBPMO_FORM_CONSTRUCTORBindingSource1 = New System.Windows.Forms.BindingSource() + Me.TBPMO_FORM_CONSTRUCTORBindingSource1 = New System.Windows.Forms.BindingSource(Me.components) Me.TBPMO_FORM_CONSTRUCTORTableAdapter1 = New DD_Record_Organiser.DD_ECMAdminTableAdapters.TBPMO_FORM_CONSTRUCTORTableAdapter() Me.TableAdapterManager1 = New DD_Record_Organiser.DD_ECMAdminTableAdapters.TableAdapterManager() Me.lblSave = New System.Windows.Forms.Label() Me.OFDWindreamsuche = New System.Windows.Forms.OpenFileDialog() Me.TBTEMP_QUICKDISPLAYTableAdapter = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.TBTEMP_QUICKDISPLAYTableAdapter() Me.TableAdapterManager2 = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.TableAdapterManager() - Me.ImageCollection1 = New DevExpress.Utils.ImageCollection() + Me.ImageCollection1 = New DevExpress.Utils.ImageCollection(Me.components) Me.btndeleteUserConstructorRel = New System.Windows.Forms.Button() Me.btnAddUser2ConstructorREL = New System.Windows.Forms.Button() Me.ListBoxUsersFORConstructor = New System.Windows.Forms.ListBox() @@ -203,12 +205,13 @@ Partial Class frmConstructorDesigner Me.TableAdapterManager3 = New DD_Record_Organiser.DD_DMSDataSetCalendarTableAdapters.TableAdapterManager() Me.TBPMO_CONSTRUCTOR_USER_SQLTableAdapter = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.TBPMO_CONSTRUCTOR_USER_SQLTableAdapter() Me.GridControlUsers2Menue = New DevExpress.XtraGrid.GridControl() - Me.TBAD_UsersBindingSource = New System.Windows.Forms.BindingSource() + Me.TBAD_UsersBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.GridViewlUsers2Menue = New DevExpress.XtraGrid.Views.Grid.GridView() Me.colSelect = New DevExpress.XtraGrid.Columns.GridColumn() Me.GridColumn1 = New DevExpress.XtraGrid.Columns.GridColumn() Me.GridColumn2 = New DevExpress.XtraGrid.Columns.GridColumn() Me.colID = New DevExpress.XtraGrid.Columns.GridColumn() + Me.SQL_RIGHT_WINDREAM_VIEWTextBox = New System.Windows.Forms.TextBox() GUIDLabel = New System.Windows.Forms.Label() FORM_TITLELabel = New System.Windows.Forms.Label() SEQUENCE_MENULabel = New System.Windows.Forms.Label() @@ -237,6 +240,7 @@ Partial Class frmConstructorDesigner CHANGED_WHENLabel2 = New System.Windows.Forms.Label() Label19 = New System.Windows.Forms.Label() SQL_RIGHT_READ_AND_VIEW_ONLYLabel = New System.Windows.Forms.Label() + SQL_RIGHT_WINDREAM_VIEWLabel = New System.Windows.Forms.Label() CType(Me.DD_ECMAdmin, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBPMO_FORM_CONSTRUCTORBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBPMO_FORM_CONSTRUCTORBindingNavigator, System.ComponentModel.ISupportInitialize).BeginInit() @@ -661,6 +665,8 @@ Partial Class frmConstructorDesigner 'XtraTabPage3 ' resources.ApplyResources(Me.XtraTabPage3, "XtraTabPage3") + Me.XtraTabPage3.Controls.Add(SQL_RIGHT_WINDREAM_VIEWLabel) + Me.XtraTabPage3.Controls.Add(Me.SQL_RIGHT_WINDREAM_VIEWTextBox) Me.XtraTabPage3.Controls.Add(SQL_RIGHT_READ_AND_VIEW_ONLYLabel) Me.XtraTabPage3.Controls.Add(Me.SQL_RIGHT_READ_AND_VIEW_ONLYTextBox) Me.XtraTabPage3.Controls.Add(Me.CONTROL_DOCTYPE_MATCHTextBox) @@ -1539,6 +1545,17 @@ Partial Class frmConstructorDesigner Me.colID.FieldName = "ID" Me.colID.Name = "colID" ' + 'SQL_RIGHT_WINDREAM_VIEWLabel + ' + resources.ApplyResources(SQL_RIGHT_WINDREAM_VIEWLabel, "SQL_RIGHT_WINDREAM_VIEWLabel") + SQL_RIGHT_WINDREAM_VIEWLabel.Name = "SQL_RIGHT_WINDREAM_VIEWLabel" + ' + 'SQL_RIGHT_WINDREAM_VIEWTextBox + ' + Me.SQL_RIGHT_WINDREAM_VIEWTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_FORM_CONSTRUCTOR_DETAILBindingSource, "SQL_RIGHT_WINDREAM_VIEW", True)) + resources.ApplyResources(Me.SQL_RIGHT_WINDREAM_VIEWTextBox, "SQL_RIGHT_WINDREAM_VIEWTextBox") + Me.SQL_RIGHT_WINDREAM_VIEWTextBox.Name = "SQL_RIGHT_WINDREAM_VIEWTextBox" + ' 'frmConstructorDesigner ' resources.ApplyResources(Me, "$this") @@ -1782,4 +1799,5 @@ Partial Class frmConstructorDesigner Friend WithEvents colID1 As DevExpress.XtraGrid.Columns.GridColumn Friend WithEvents CONTROL_DOCTYPE_MATCHTextBox As System.Windows.Forms.TextBox Friend WithEvents SQL_RIGHT_READ_AND_VIEW_ONLYTextBox As System.Windows.Forms.TextBox + Friend WithEvents SQL_RIGHT_WINDREAM_VIEWTextBox As System.Windows.Forms.TextBox End Class diff --git a/app/DD-Record-Organiser/frmConstructorDesigner.resx b/app/DD-Record-Organiser/frmConstructorDesigner.resx index 0641fc2..2941c6c 100644 --- a/app/DD-Record-Organiser/frmConstructorDesigner.resx +++ b/app/DD-Record-Organiser/frmConstructorDesigner.resx @@ -380,6 +380,9 @@ True + + Tahoma, 8.25pt, style=Italic + 12, 11 @@ -402,7 +405,7 @@ XtraTabPage3 - 18 + 20 False @@ -440,8 +443,11 @@ True + + Tahoma, 8.25pt, style=Italic + - 68, 242 + 73, 293 65, 13 @@ -462,7 +468,7 @@ XtraTabPage3 - 17 + 19 False @@ -470,8 +476,11 @@ True + + Tahoma, 8.25pt, style=Italic + - 234, 242 + 239, 293 73, 13 @@ -492,7 +501,7 @@ XtraTabPage3 - 15 + 17 False @@ -500,8 +509,11 @@ True + + Tahoma, 8.25pt, style=Italic + - 400, 242 + 405, 293 77, 13 @@ -522,7 +534,7 @@ XtraTabPage3 - 13 + 15 False @@ -530,8 +542,11 @@ True + + Tahoma, 8.25pt, style=Italic + - 566, 242 + 571, 293 85, 13 @@ -552,7 +567,7 @@ XtraTabPage3 - 10 + 12 False @@ -582,7 +597,7 @@ XtraTabPage3 - 12 + 14 False @@ -612,7 +627,7 @@ XtraTabPage3 - 6 + 8 False @@ -961,7 +976,7 @@ XtraTabPage3 - 3 + 5 False @@ -973,13 +988,13 @@ 69, 127 - 243, 13 + 330, 13 55 - SQL-Command - Record and windream view only: + SQL-Command - Record and windream view only? (Result: Boolean) SQL_RIGHT_READ_AND_VIEW_ONLYLabel @@ -991,7 +1006,7 @@ XtraTabPage3 - 0 + 2 17, 17 @@ -1228,7 +1243,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABS - CQAAAk1TRnQBSQFMAgEBAgEAAawBCwGsAQsBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CQAAAk1TRnQBSQFMAgEBAgEAAbQBCwG0AQsBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -1483,6 +1498,9 @@ 16 + + Tahoma, 8.25pt, style=Italic + 15, 27 @@ -1502,7 +1520,7 @@ XtraTabPage3 - 20 + 22 72, 25 @@ -1526,7 +1544,7 @@ XtraTabPage3 - 21 + 23 9, 34 @@ -1555,84 +1573,6 @@ 15, 277 - - 914, 95 - - - 807, 95 - - - XtraTabControl2 - - - DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - XtraTabPage1 - - - 0 - - - StatusStrip1 - - - System.Windows.Forms.StatusStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage1 - - - 1 - - - ToolStrip1 - - - System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage1 - - - 2 - - - 1300, 408 - - - Entitäten-Übersicht - - - XtraTabPage1 - - - DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - XtraTabControl1 - - - 0 - - - 1306, 436 - - - 40 - - - XtraTabControl1 - - - DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - $this - - - 14 - Fill @@ -1642,6 +1582,78 @@ True + + False + + + True + + + 69, 205 + + + 272, 13 + + + 56 + + + SQL-Command windream-files visible? (Result: Boolean) + + + SQL_RIGHT_WINDREAM_VIEWLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + XtraTabPage3 + + + 0 + + + Consolas, 8.25pt + + + 72, 221 + + + True + + + 757, 69 + + + 57 + + + SQL_RIGHT_WINDREAM_VIEWTextBox + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + XtraTabPage3 + + + 1 + + + Consolas, 8.25pt + + + 72, 143 + + + True + + + 757, 59 + + + 56 + SQL_RIGHT_READ_AND_VIEW_ONLYTextBox @@ -1652,7 +1664,16 @@ XtraTabPage3 - 1 + 3 + + + 475, 103 + + + 57, 21 + + + 55 CONTROL_DOCTYPE_MATCHTextBox @@ -1664,7 +1685,19 @@ XtraTabPage3 - 2 + 4 + + + 701, 25 + + + 128, 24 + + + 52 + + + Ersten Record laden LOAD_DIRECTCheckBox @@ -1676,7 +1709,25 @@ XtraTabPage3 - 4 + 6 + + + True + + + Segoe UI, 8.25pt, style=Italic + + + 189, 87 + + + 236, 13 + + + 51 + + + Dient zur Anzeige der Selektion von Datensätzen Label4 @@ -1688,7 +1739,16 @@ XtraTabPage3 - 5 + 7 + + + 72, 103 + + + 247, 21 + + + 49 COLUMN_NAME1ComboBox @@ -1700,7 +1760,25 @@ XtraTabPage3 - 7 + 9 + + + True + + + Segoe UI, 8.25pt, style=Italic + + + 189, 30 + + + 319, 13 + + + 48 + + + Kann man für diese Entität auf der ersten Ebene Daten selektieren? Label2 @@ -1712,7 +1790,19 @@ XtraTabPage3 - 8 + 10 + + + Consolas, 8.25pt + + + 72, 64 + + + 757, 20 + + + 35 SQL_SELECT_EBENE1TextBox @@ -1724,7 +1814,19 @@ XtraTabPage3 - 9 + 11 + + + Tahoma, 8.25pt, style=Italic + + + 574, 309 + + + 160, 21 + + + 47 CHANGED_WHENTextBox1 @@ -1736,7 +1838,19 @@ XtraTabPage3 - 11 + 13 + + + Tahoma, 8.25pt, style=Italic + + + 408, 309 + + + 160, 21 + + + 46 CHANGED_WHOTextBox1 @@ -1748,7 +1862,19 @@ XtraTabPage3 - 14 + 16 + + + Tahoma, 8.25pt, style=Italic + + + 242, 309 + + + 160, 21 + + + 45 ADDED_WHENTextBox1 @@ -1760,7 +1886,19 @@ XtraTabPage3 - 16 + 18 + + + Tahoma, 8.25pt, style=Italic + + + 76, 309 + + + 160, 21 + + + 44 ADDED_WHOTextBox1 @@ -1772,7 +1910,7 @@ XtraTabPage3 - 19 + 21 1002, 333 @@ -2173,267 +2311,96 @@ 0 - - Consolas, 8.25pt + + 914, 95 + + + 292, 386 - - 72, 143 + + 1008, 22 - - True - - - 757, 96 - - - 56 - - - SQL_RIGHT_READ_AND_VIEW_ONLYTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage3 - - - 1 - - - 475, 103 - - - 57, 21 - - - 55 - - - CONTROL_DOCTYPE_MATCHTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage3 - - - 2 - - - 701, 25 - - - 128, 24 - - - 52 - - - Ersten Record laden - - - LOAD_DIRECTCheckBox - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage3 - - - 4 - - - True - - - Segoe UI, 8.25pt, style=Italic - - - 189, 87 - - - 236, 13 - - - 51 - - - Dient zur Anzeige der Selektion von Datensätzen - - - Label4 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage3 - - - 5 - - - 72, 103 - - - 247, 21 - - - 49 - - - COLUMN_NAME1ComboBox - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage3 - - - 7 - - - True - - - Segoe UI, 8.25pt, style=Italic - - - 189, 30 - - - 319, 13 - - - 48 - - - Kann man für diese Entität auf der ersten Ebene Daten selektieren? - - - Label2 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage3 - - - 8 - - - Consolas, 8.25pt - - - 72, 64 - - - 757, 20 - - + 35 - - SQL_SELECT_EBENE1TextBox + + StatusStrip1 - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + StatusStrip1 - - XtraTabPage3 + + System.Windows.Forms.StatusStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 9 + + XtraTabPage1 - - 569, 258 + + 1 - - 160, 21 + + 807, 95 + + + 292, 0 - - 47 + + 1008, 25 - - CHANGED_WHENTextBox1 + + 34 - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ToolStrip1 - - XtraTabPage3 + + ToolStrip1 - - 11 + + System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 403, 258 + + XtraTabPage1 - - 160, 21 + + 2 - - 46 + + 1300, 408 - - CHANGED_WHOTextBox1 + + Entitäten-Übersicht - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + XtraTabPage1 - - XtraTabPage3 + + DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - + + XtraTabControl1 + + + 0 + + + 1306, 436 + + + 40 + + + XtraTabControl1 + + + DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + $this + + 14 - - 237, 258 - - - 160, 21 - - - 45 - - - ADDED_WHENTextBox1 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage3 - - - 16 - - - 71, 258 - - - 160, 21 - - - 44 - - - ADDED_WHOTextBox1 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage3 - - - 19 - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29m @@ -4695,33 +4662,6 @@ Mandanten hinzu 5 - - 914, 95 - - - 292, 386 - - - 1008, 22 - - - 35 - - - StatusStrip1 - - - StatusStrip1 - - - System.Windows.Forms.StatusStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage1 - - - 1 - 191, 17 @@ -4731,33 +4671,6 @@ Mandanten hinzu False - - 807, 95 - - - 292, 0 - - - 1008, 25 - - - 34 - - - ToolStrip1 - - - ToolStrip1 - - - System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage1 - - - 2 - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 diff --git a/app/DD-Record-Organiser/frmConstructor_Main.Designer.vb b/app/DD-Record-Organiser/frmConstructor_Main.Designer.vb index f688ce4..1de5927 100644 --- a/app/DD-Record-Organiser/frmConstructor_Main.Designer.vb +++ b/app/DD-Record-Organiser/frmConstructor_Main.Designer.vb @@ -129,6 +129,7 @@ Partial Class frmConstructor_Main Me.GridControlParent = New DevExpress.XtraGrid.GridControl() Me.GridViewParent = New DevExpress.XtraGrid.Views.Grid.GridView() Me.btnRelinkParentID = New System.Windows.Forms.Button() + Me.BindingSource_Entity = New System.Windows.Forms.BindingSource(Me.components) Me.NavPane = New DevExpress.XtraBars.Navigation.TileNavPane() Me.NavButtonHome = New DevExpress.XtraBars.Navigation.NavButton() Me.NavButtonRefresh = New DevExpress.XtraBars.Navigation.NavButton() @@ -136,7 +137,6 @@ Partial Class frmConstructor_Main Me.tsslblStatus = New System.Windows.Forms.ToolStripStatusLabel() Me.tsslblRecord = New System.Windows.Forms.ToolStripStatusLabel() Me.tsslblWorkflowstate = New System.Windows.Forms.ToolStripStatusLabel() - Me.BindingSource_Entity = New System.Windows.Forms.BindingSource(Me.components) Me.DD_ECMAdmin = New DD_Record_Organiser.DD_ECMAdmin() Me.ImageCollection1 = New DevExpress.Utils.ImageCollection(Me.components) Me.ttToolTip = New System.Windows.Forms.ToolTip(Me.components) @@ -184,8 +184,8 @@ Partial Class frmConstructor_Main Me.Panel2.SuspendLayout() CType(Me.GridControlParent, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridViewParent, System.ComponentModel.ISupportInitialize).BeginInit() - Me.StatusStrip_Main.SuspendLayout() CType(Me.BindingSource_Entity, System.ComponentModel.ISupportInitialize).BeginInit() + Me.StatusStrip_Main.SuspendLayout() CType(Me.DD_ECMAdmin, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.ImageCollection1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.DD_DMSDataSet, System.ComponentModel.ISupportInitialize).BeginInit() @@ -1094,9 +1094,9 @@ Partial Class frmConstructor_Main Me.Panel2.ResumeLayout(False) CType(Me.GridControlParent, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.GridViewParent, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.BindingSource_Entity, System.ComponentModel.ISupportInitialize).EndInit() Me.StatusStrip_Main.ResumeLayout(False) Me.StatusStrip_Main.PerformLayout() - CType(Me.BindingSource_Entity, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.DD_ECMAdmin, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.ImageCollection1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.DD_DMSDataSet, System.ComponentModel.ISupportInitialize).EndInit() diff --git a/app/DD-Record-Organiser/frmConstructor_Main.en-US.resx b/app/DD-Record-Organiser/frmConstructor_Main.en-US.resx index 58f13bc..ffed1d1 100644 --- a/app/DD-Record-Organiser/frmConstructor_Main.en-US.resx +++ b/app/DD-Record-Organiser/frmConstructor_Main.en-US.resx @@ -219,8 +219,17 @@ Refresh Data + + 179, 6 + + + 182, 22 + + + Delete record + - 183, 170 + 183, 198 @@ -336,6 +345,108 @@ + + Default + + + 127, 22 + + + Open file + + + 124, 6 + + + 127, 22 + + + Copy file + + + 124, 6 + + + 127, 22 + + + Delete file + + + 124, 6 + + + 127, 22 + + + Properties + + + 128, 110 + + + + + + + + + + + + None + + + + + + + + + Default + + + Top, Left + + + + + + Tile + + + Inherit + + + 0, 0 + + + Center + + + + + + None + + + + + + 0 + + + Regular + + + Horizontal + + + + + + + Default diff --git a/app/DD-Record-Organiser/frmConstructor_Main.resx b/app/DD-Record-Organiser/frmConstructor_Main.resx index 5a013c1..0374d6b 100644 --- a/app/DD-Record-Organiser/frmConstructor_Main.resx +++ b/app/DD-Record-Organiser/frmConstructor_Main.resx @@ -132,7 +132,7 @@ 0, 0 - 1693, 54 + 17, 134 194, 22 @@ -193,7 +193,7 @@ Panel1 - 477, 15 + 615, 17 Segoe UI, 9pt, style=Bold @@ -415,7 +415,7 @@ 1 - 187, 65 + 124, 134 148, 22 @@ -522,7 +522,7 @@ 1 - 1157, 15 + 179, 56 Segoe UI, 8.25pt, style=Bold, Italic @@ -1086,7 +1086,7 @@ 0 - 17, 93 + 332, 134 @@ -1302,7 +1302,7 @@ 0 - 773, 15 + 911, 17 False @@ -1612,6 +1612,9 @@ 4 + + 314, 17 + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m @@ -1667,7 +1670,7 @@ 6 - 17, 17 + 171, 17 53, 17 @@ -1714,14 +1717,11 @@ 5 - - 162, 11 - - 342, 15 + 480, 17 - 626, 15 + 764, 17 @@ -1732,10 +1732,10 @@ - 894, 15 + 1032, 17 - 995, 15 + 17, 56 61, 4 @@ -1747,31 +1747,31 @@ System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 1322, 15 + 344, 56 - 17, 54 + 634, 56 - 295, 54 + 912, 56 - 567, 54 + 17, 95 - 1460, 54 + 910, 95 - 740, 54 + 190, 95 - 984, 54 + 434, 95 - 1222, 54 + 672, 95 - 1465, 15 + 487, 56 True @@ -2624,6 +2624,12 @@ DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + BindingSource_Entity + + + System.Windows.Forms.BindingSource, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + TileNavCategory1 @@ -2660,12 +2666,6 @@ System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - BindingSource_Entity - - - System.Windows.Forms.BindingSource, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - DD_ECMAdmin diff --git a/app/DD-Record-Organiser/frmConstructor_Main.vb b/app/DD-Record-Organiser/frmConstructor_Main.vb index bc4c952..c54c14a 100644 --- a/app/DD-Record-Organiser/frmConstructor_Main.vb +++ b/app/DD-Record-Organiser/frmConstructor_Main.vb @@ -263,18 +263,45 @@ Public Class frmConstructor_Main MsgBox("Error in Save_Grid_Layout:" & vbNewLine & ex.Message) End Try End Sub - + Sub Save_DocGrid_Layout() + Try + If ACT_EBENE_STRING Is Nothing Then + Exit Sub + End If + Dim EntityRegex As New RegularExpressions.Regex("\s+\(\d+\)") + Dim EntityName As String = EntityRegex.Replace(ACT_EBENE_STRING, "") + Dim Filename As String = String.Format("{0}-{1}-{2}-UserLayout.xml", GridViewDoc_Search.Name, GetSafeFilename(EntityName), CONSTRUCTORID) + Dim XMLPath = System.IO.Path.Combine(Application.UserAppDataPath(), Filename) + GridViewDoc_Search.SaveLayoutToXml(XMLPath) + ' Update_Status_Label(True, "Grid Layout Loaded") + Catch ex As Exception + MsgBox("Error in Save_DocGrid_Layout:" & vbNewLine & ex.Message) + End Try + End Sub + Sub Load_DocGrid_Layout() + Try + If ACT_EBENE_STRING Is Nothing Then + Exit Sub + End If + Dim EntityRegex As New RegularExpressions.Regex("\s+\(\d+\)") + Dim EntityName As String = EntityRegex.Replace(ACT_EBENE_STRING, "") + Dim Filename As String = String.Format("{0}-{1}-{2}-UserLayout.xml", GridViewDoc_Search.Name, GetSafeFilename(EntityName), CONSTRUCTORID) + Dim XMLPath = System.IO.Path.Combine(Application.UserAppDataPath(), Filename) + If File.Exists(XMLPath) Then + GridViewDoc_Search.RestoreLayoutFromXml(XMLPath) + GridViewDoc_Search.GuessAutoFilterRowValuesFromFilter() + End If + + Catch ex As Exception + MsgBox("Error in Load_DocGrid_Layout:" & vbNewLine & ex.Message) + End Try + End Sub Sub Load_Grid_Layout() Try Dim XMLPath = Get_Grid_Layout_Filename() If File.Exists(XMLPath) And GRID_TYPE = GridType.Grid Then grvwGrid.RestoreLayoutFromXml(XMLPath) - - 'grvwGrid.ClearGrouping() - ' grvwGrid.ClearSelection() - 'grvwGrid.OptionsView.ShowPreview = False - grvwGridPos.GuessAutoFilterRowValuesFromFilter() - 'Update_Status_Label(True, "Grid Layout Loaded") + grvwGrid.GuessAutoFilterRowValuesFromFilter() End If Catch ex As Exception MsgBox("Error in Load_Grid_Layout: " & vbNewLine & ex.Message) @@ -1985,7 +2012,7 @@ Public Class frmConstructor_Main ' Datatable laden GridControlMain.DataSource = DT - + BindingSource_Entity.DataSource = DT grvwTiles.TileTemplate.Clear() @@ -2291,8 +2318,7 @@ Public Class frmConstructor_Main 'Databinding Neu BindingSource_Entity.DataSource = DT_SELECTION GridControlMain.DataSource = BindingSource_Entity - - + ' Den Editor Initialisieren und Optionen setzen Dim CheckBoxEditorForDisplay = New RepositoryItemCheckEdit() CheckBoxEditorForDisplay.ValueChecked = 1 @@ -3545,6 +3571,7 @@ Public Class frmConstructor_Main 'Icon zuweisen Select Case extension Case ".csv" + NewRow.Item(0) = My.Resources.doc_excel_csv Case ".txt" NewRow.Item(0) = My.Resources.text Case ".pdf" @@ -3561,6 +3588,8 @@ Public Class frmConstructor_Main NewRow.Item(0) = My.Resources.ppt Case ".pptx" NewRow.Item(0) = My.Resources.ppt + Case ".dwg" + NewRow.Item(0) = My.Resources.dwg Case Else NewRow.Item(0) = My.Resources._blank End Select @@ -3783,6 +3812,7 @@ Public Class frmConstructor_Main Load_POSGrid_Layout() End If If TCDetails.SelectedTabPage.Text.ToLower.StartsWith("windr") Then + Load_DocGrid_Layout() tsButtonEdit.Enabled = False If RECORD_ID = 0 Then RUN_WD_SEARCH(WD_Suche, "ENTITY") @@ -4838,4 +4868,12 @@ Public Class frmConstructor_Main End Try File_open() End Sub + + Private Sub TabWindream_Leave(sender As Object, e As EventArgs) Handles TabWindream.Leave + Save_DocGrid_Layout() + End Sub + + Private Sub GridControlDocSearch_DragDrop(sender As Object, e As DragEventArgs) Handles GridControlDocSearch.DragDrop + Drag_Drop(e) + End Sub End Class \ No newline at end of file