From 01d404dab9e6aa79774ebc62d9845ea488737dc7 Mon Sep 17 00:00:00 2001 From: SchreiberM Date: Tue, 9 Aug 2016 10:50:34 +0200 Subject: [PATCH] MS3 --- .../frmConstructor_Main.vb | 30 ++++++++++++------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/app/DD-Record-Organiser/frmConstructor_Main.vb b/app/DD-Record-Organiser/frmConstructor_Main.vb index 904400e..9b0c088 100644 --- a/app/DD-Record-Organiser/frmConstructor_Main.vb +++ b/app/DD-Record-Organiser/frmConstructor_Main.vb @@ -3067,8 +3067,8 @@ Public Class frmConstructor_Main CreateTile() Else ' Alle Checkboxen für aktuelle Ansicht heraussuchen - Dim sqlcheck As String = "SELECT CONTROL_COLUMN FROM VWPMO_VALUES WHERE CONTROL_TYPE_ID in (10,11) AND FORM_ID = " & ENTITY_ID - Dim sqldate As String = "SELECT CONTROL_COLUMN FROM VWPMO_VALUES WHERE CONTROL_TYPE_ID = 4 AND FORM_ID = " & ENTITY_ID & " GROUP BY CONTROL_COLUMN" + Dim sqlcheck As String = "SELECT COL_NAME FROM TBPMO_CONTROL WHERE CONTROL_TYPE_ID in (10,11) AND FORM_ID = " & ENTITY_ID + Dim sqldate As String = "SELECT COL_NAME FROM TBPMO_CONTROL WHERE CONTROL_TYPE_ID = 4 AND FORM_ID = " & ENTITY_ID Dim dtcheck As DataTable = ClassDatabase.Return_Datatable(sqlcheck) Dim dtdate As DataTable = ClassDatabase.Return_Datatable(sqldate) Dim listcheck As New List(Of String) @@ -3095,7 +3095,16 @@ Public Class frmConstructor_Main Dim tbltemp As DataTable = DT_SELECTION.Clone() For Each col As String In listdate Dim colDate As DataColumn = tbltemp.Columns(col) - colDate.DataType = GetType(Date) + If Not IsNothing(colDate) Then + colDate.DataType = GetType(Date) + End If + + Next + For Each col1 As String In listcheck + Dim collist As DataColumn = tbltemp.Columns(col1) + If Not IsNothing(collist) Then + collist.DataType = GetType(Boolean) + End If Next Try tbltemp.Load(DT_SELECTION.CreateDataReader) @@ -3118,15 +3127,14 @@ Public Class frmConstructor_Main Dim CheckBoxEditorForDisplay = New RepositoryItemCheckEdit() CheckBoxEditorForDisplay.ValueChecked = 1 CheckBoxEditorForDisplay.ValueUnchecked = 0 - 'Dim DateEditorForDisplay = New RepositoryItemDateEdit() - 'DateEditorForDisplay.DisplayFormat = USER_DATE_FORMAT + ' Alle Checkbox Spalten durchgehen und CheckBoxEditor zuweisen - For Each col As String In listcheck - grvwGrid.GridControl.RepositoryItems.Add(CheckBoxEditorForDisplay) - If Not IsNothing(grvwGrid.Columns(col)) Then - grvwGrid.Columns(col).ColumnEdit = CheckBoxEditorForDisplay - End If - Next + 'For Each col As String In listcheck + ' grvwGrid.GridControl.RepositoryItems.Add(CheckBoxEditorForDisplay) + ' If Not IsNothing(grvwGrid.Columns(col)) Then + ' grvwGrid.Columns(col).ColumnEdit = CheckBoxEditorForDisplay + ' End If + 'Next ' Alle Date Spalten durchgehen For Each col As String In listdate Dim colDate = grvwGrid.Columns(col)