MS0808

app/DD-Record-Organiser/frmConstructor_Main.vb

@@ -20,7 +20,6 @@ Public Class frmConstructor_Main
     Private Const SEE_MASK_FLAG_NO_UI = &H400
     Public Const SW_SHOW As Short = 5
     Private PARENT_SKIPPED As Boolean = False
-    Private DATE_FORMAT As String = "dd.MM.YYYY"
     <DllImport("Shell32", CharSet:=CharSet.Auto, SetLastError:=True)> _
     Public Shared Function ShellExecuteEx(ByRef lpExecInfo As SHELLEXECUTEINFO) As Boolean
     End Function
@@ -2043,8 +2042,9 @@ Public Class frmConstructor_Main
 
             Dim FORM_TYPE = DT_FORM.Rows(0).Item("FORM_TYPE_ID") 'ClassDatabase.Execute_Scalar("SELECT FORM_TYPE_ID FROM TBPMO_FORM WHERE GUID = " & ENTITY_ID)
             Dim IS_SINGLE_RECORD = DT_FORM.Rows(0).Item("SINGLE_RECORD") 'ClassDatabase.Execute_Scalar("SELECT SINGLE_RECORD FROM TBPMO_FORM WHERE GUID = " & ENTITY_ID)
-            DATE_FORMAT = DT_FORM.Rows(0).Item("DATE_FORMAT")
-            CURRENT_DATE_FORMAT = DATE_FORMAT
+
+            CURRENT_DATE_FORMAT = USER_DATE_FORMAT
+
             If IS_SINGLE_RECORD = False Then
                 If FORM_TYPE <> 5 Then
                     If EDIT_STATE = EditState.Insert Then
@@ -3072,16 +3072,23 @@ Public Class frmConstructor_Main
             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 dtcheck As DataTable = ClassDatabase.Return_Datatable(sqlcheck)
+                Dim dtdate As DataTable = ClassDatabase.Return_Datatable(sqldate)
                 Dim listcheck As New List(Of String)
-
+                Dim listdate As New List(Of String)
                 'Liste von allen Spaltentiteln mit Checkbox erstellen
                 If dtcheck.Rows.Count > 0 Then
                     For Each row As DataRow In dtcheck.Rows
                         listcheck.Add(row.Item(0))
                     Next
                 End If
-
+                'Liste von allen Spaltentiteln mit Date erstellen
+                If dtdate.Rows.Count > 0 Then
+                    For Each row As DataRow In dtdate.Rows
+                        listdate.Add(row.Item(0))
+                    Next
+                End If
                 'Duplikate entfernen
                 ' listcheck = listcheck.Distinct().ToList()
 
@@ -3095,15 +3102,22 @@ 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
-
+                ' 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"
+                Next
                 Try
                     grvwGrid.GridControl.RepositoryItems.Add(CheckBoxEditorForDisplay)
                     grvwGrid.Columns("files?").ColumnEdit = CheckBoxEditorForDisplay
@@ -4683,17 +4697,17 @@ Public Class frmConstructor_Main
                     If Not IsNothing(datevalue) Then
                         dtpFollowUp.Enabled = True
                         If datevalue = "00:00:00" Then
-                            dtpFollowUp.Value = ClassHelper.Convert_Date_2_Form_Format(Now, CURRENT_DATE_FORMAT)
+                            dtpFollowUp.Value = ClassHelper.Convert_Date(Now, CURRENT_DATE_FORMAT)
                         End If
                         FOLL_UP_RECORD_DEFINED = True
                         Try
-                            dtpFollowUp.Value = ClassHelper.Convert_Date_2_Form_Format(datevalue, CURRENT_DATE_FORMAT)
+                            dtpFollowUp.Value = ClassHelper.Convert_Date(datevalue, CURRENT_DATE_FORMAT)
                         Catch ex As Exception
-                            dtpFollowUp.Value = ClassHelper.Convert_Date_2_Form_Format(Now, CURRENT_DATE_FORMAT)
+                            dtpFollowUp.Value = ClassHelper.Convert_Date(Now, CURRENT_DATE_FORMAT)
                         End Try
 
                     Else
-                        dtpFollowUp.Value = ClassHelper.Convert_Date_2_Form_Format(Now, CURRENT_DATE_FORMAT)
+                        dtpFollowUp.Value = ClassHelper.Convert_Date(Now, CURRENT_DATE_FORMAT)
                         FOLL_UP_RECORD_DEFINED = False
                     End If
 
@@ -6028,4 +6042,8 @@ Public Class frmConstructor_Main
     End Sub
 
    
+    Private Sub ToolStripButton1_Click(sender As Object, e As EventArgs) Handles ToolStripButton1.Click
+        grvwGrid.Columns("Start_Date").DisplayFormat.FormatType = FormatType.DateTime
+        grvwGrid.Columns("Start_Date").DisplayFormat.FormatString = USER_DATE_FORMAT
+    End Sub
 End Class