diff --git a/app/DD-Record-Organiser/frmConstructor_Main.vb b/app/DD-Record-Organiser/frmConstructor_Main.vb index f57e1bc..7a5e74b 100644 --- a/app/DD-Record-Organiser/frmConstructor_Main.vb +++ b/app/DD-Record-Organiser/frmConstructor_Main.vb @@ -3038,7 +3038,6 @@ Public Class frmConstructor_Main Return PARENT_RECORD1 End If Case 3 - Dim Parent_EntityID = ENTITY_ROW.Item("PARENT_ID") 'ClassDatabase.Execute_Scalar(sqlp, True) Dim sql As String = String.Format("SELECT T.RECORD2_ID FROM TBPMO_RECORD_CONNECT T, TBPMO_RECORD T1 WHERE T.RECORD2_ID = T1.GUID AND T.RECORD1_ID = (SELECT T.RECORD2_ID FROM TBPMO_RECORD_CONNECT T, TBPMO_RECORD T1 WHERE " & _ "T.RECORD2_ID = T1.GUID AND T.RECORD1_ID = {0} and T1.FORM_ID = {1}) and T1.FORM_ID = {2}", RECORDID, Parent_EntityID, ENTITY_ID) @@ -3057,14 +3056,11 @@ Public Class frmConstructor_Main Return PARENT_RECORD2 End If End Select - Catch ex As Exception MsgBox("Error in GET_LINKED_RECORD: " & vbNewLine & ex.Message, MsgBoxStyle.Critical) Return 0 End Try End Function - - Private Function LoadGrid_Selection() Try If GRID_TYPE = GridType.Tiles Then @@ -3095,9 +3091,29 @@ Public Class frmConstructor_Main 'Grid leeren Clear_Grid_View() 'Databinding Neu + + Dim tblReady1 As DataTable = DT_SELECTION.Clone() + For Each col As String In listdate + Dim colDate As DataColumn = tblReady1.Columns(col) + colDate.DataType = GetType(Date) + Next + Try + tblReady1.Load(DT_SELECTION.CreateDataReader) + DT_SELECTION = tblReady1 + Catch ex As Exception + ClassLogger.Add(">> Attention: Could not load converted datatable: " & ex.Message, False) + 'Tabelle wird ohne Datekonvertierung geladen + Dim DTEntity As DataTable = ClassDatabase.Return_Datatable(_ENTITYSQL, "Load_Entity_Data_Only") + Dim primaryKey(1) As DataColumn + primaryKey(0) = DTEntity.Columns("Record-ID") + DTEntity.PrimaryKey = primaryKey + DT_SELECTION = DTEntity + End Try + BindingSource_Entity.DataSource = DT_SELECTION GridControlMain.DataSource = BindingSource_Entity + ' Den Editor Initialisieren und Optionen setzen Dim CheckBoxEditorForDisplay = New RepositoryItemCheckEdit() CheckBoxEditorForDisplay.ValueChecked = 1 @@ -3113,10 +3129,9 @@ Public Class frmConstructor_Main Next ' Alle Date Spalten durchgehen For Each col As String In listdate - Dim colDate = grvwGrid.Columns(col) colDate.DisplayFormat.FormatType = FormatType.DateTime - colDate.DisplayFormat.FormatString = "D" + colDate.DisplayFormat.FormatString = USER_DATE_FORMAT Next Try grvwGrid.GridControl.RepositoryItems.Add(CheckBoxEditorForDisplay) @@ -4268,7 +4283,7 @@ Public Class frmConstructor_Main Dim CheckBoxEditorForDisplay = New RepositoryItemCheckEdit() CheckBoxEditorForDisplay.ValueChecked = "True" CheckBoxEditorForDisplay.ValueUnchecked = "False" - ' Alle Checkbox Spalten durchgehen und CheckBoxEditor zuweisen + 'Alle Checkbox Spalten durchgehen und CheckBoxEditor zuweisen For Each col As String In listcheck GridViewDoc_Search.GridControl.RepositoryItems.Add(CheckBoxEditorForDisplay) If Not IsNothing(GridViewDoc_Search.Columns(col)) Then