diff --git a/app/TaskFlow/ClassControlCreator.vb b/app/TaskFlow/ClassControlCreator.vb index 31764f6..f628898 100644 --- a/app/TaskFlow/ClassControlCreator.vb +++ b/app/TaskFlow/ClassControlCreator.vb @@ -482,6 +482,7 @@ Public Class ClassControlCreator Dim oControlId = DirectCast(oControl.Tag, ControlMetadata).Guid Dim oView As GridView + oControl.ForceInitialize() oView = oControl.MainView @@ -495,7 +496,9 @@ Public Class ClassControlCreator oView.OptionsBehavior.Editable = Not row.Item("READ_ONLY") oView.OptionsBehavior.ReadOnly = row.Item("READ_ONLY") 'oView.OptionsBehavior.EditorShowMode = EditorShowMode.Click - + If oView.OptionsBehavior.ReadOnly = True Then + oView.OptionsBehavior.Editable = False + End If oControl.UseEmbeddedNavigator = Not row.Item("READ_ONLY") oView.OptionsBehavior.EditorShowMode = EditorShowMode.MouseDown @@ -505,16 +508,17 @@ Public Class ClassControlCreator oView.OptionsSelection.MultiSelect = True oView.OptionsClipboard.CopyColumnHeaders = DefaultBoolean.False - - If row.Item("VKT_ADD_ITEM") = True Then - oView.OptionsBehavior.AllowAddRows = DefaultBoolean.True - oView.OptionsBehavior.AllowDeleteRows = DefaultBoolean.True - oView.OptionsView.NewItemRowPosition = NewItemRowPosition.Bottom - Else - oView.OptionsBehavior.AllowAddRows = DefaultBoolean.False - oView.OptionsBehavior.AllowDeleteRows = DefaultBoolean.False - oView.OptionsView.NewItemRowPosition = NewItemRowPosition.None + If oView.OptionsBehavior.ReadOnly = False Then + If row.Item("VKT_ADD_ITEM") = True Then + oView.OptionsBehavior.AllowAddRows = DefaultBoolean.True + oView.OptionsBehavior.AllowDeleteRows = DefaultBoolean.True + oView.OptionsView.NewItemRowPosition = NewItemRowPosition.Bottom + Else + oView.OptionsBehavior.Editable = False + oView.OptionsView.NewItemRowPosition = NewItemRowPosition.None + End If End If + End If oControl.Size = New Size(row.Item("WIDTH"), row.Item("HEIGHT")) diff --git a/app/TaskFlow/frmMain.vb b/app/TaskFlow/frmMain.vb index 3293928..3dd53af 100644 --- a/app/TaskFlow/frmMain.vb +++ b/app/TaskFlow/frmMain.vb @@ -742,8 +742,11 @@ Public Class frmMain GridViewWorkflows.Columns(oReducedColName).DisplayFormat.FormatString = "dd.MM.yyyy HH:MM:ss" Catch ex As Exception Try - GridViewWorkflows.Columns("Zuletzt bearbeitet").DisplayFormat.FormatType = FormatType.DateTime - GridViewWorkflows.Columns("Zuletzt bearbeitet").DisplayFormat.FormatString = "dd.MM.yyyy HH:MM:ss" + If oReducedColName <> "Zuletzt bearbeitet" Then + GridViewWorkflows.Columns("Zuletzt bearbeitet").DisplayFormat.FormatType = FormatType.DateTime + GridViewWorkflows.Columns("Zuletzt bearbeitet").DisplayFormat.FormatString = "dd.MM.yyyy HH:MM:ss" + + End If Catch ex1 As Exception LOGGER.Warn($"(ResetLayout)Column [{oReducedColName}] or [Zuletzt bearbeitet] not part of OverviewSQL") @@ -1872,6 +1875,7 @@ Public Class frmMain LOGGER.Debug($"Adding tag [{GridViewWorkflows.Columns.Item("PROFILE_ID")}] for group...") Dim sd = GridViewWorkflows.GroupedColumns(index).GetTextCaption GridViewWorkflows.GroupedColumns(index).Tag = GridViewWorkflows.Columns.Item("PROFILE_ID") + Next GridViewWorkflows.CollapseAllGroups() LOGGER.Debug("finished Grouping!") diff --git a/app/TaskFlow/frmValidator.resx b/app/TaskFlow/frmValidator.resx index b49a86e..29057b5 100644 --- a/app/TaskFlow/frmValidator.resx +++ b/app/TaskFlow/frmValidator.resx @@ -126,7 +126,7 @@ - 5, 283 + 5, 331 Fill @@ -477,7 +477,7 @@ 2, 2 - 428, 190 + 428, 238 3 @@ -498,7 +498,7 @@ 5, 85 - 432, 194 + 432, 242 44 @@ -589,7 +589,7 @@ 0, 0 - 442, 344 + 442, 392 25 @@ -628,7 +628,7 @@ 3, 4, 3, 4 - 347, 344 + 347, 392 0 @@ -658,7 +658,7 @@ 1 - 793, 344 + 793, 392 442 @@ -709,7 +709,7 @@ Bottom - 0, 524 + 0, 572 793, 0 @@ -733,7 +733,7 @@ 0, 0 - 0, 524 + 0, 572 barDockControlLeft @@ -754,7 +754,7 @@ 793, 0 - 0, 524 + 0, 572 barDockControlRight @@ -778,7 +778,7 @@ 7, 17 - 793, 524 + 793, 572 Tahoma, 8.25pt, style=Bold @@ -1315,7 +1315,7 @@ 793, 158 - 0, 502 + 0, 550 793, 22