MS Administration

2025-04-10 15:39:42 +02:00 · 2025-04-10 15:39:42 +02:00 · e8877ffc99
commit e8877ffc99
parent 32fce5f142
9 changed files with 78 additions and 42 deletions
--- a/app/TaskFlow/FinalIndexDataSet.xss
+++ b/app/TaskFlow/FinalIndexDataSet.xss
@ -4,7 +4,7 @@
     Changes to this file may cause incorrect behavior and will be lost if
     the code is regenerated.
 </autogenerated>-->
-<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="0" ViewPortY="0" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
+<DiagramLayout xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ex:showrelationlabel="False" ViewPortX="0" ViewPortY="0" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
  <Shapes>
    <Shape ID="DesignTable:TBPM_PROFILE_FINAL_INDEXING" ZOrder="1" X="93" Y="35" Height="362" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="292" />
  </Shapes>
--- a/app/TaskFlow/ModuleFinalIndexProperties.vb
+++ b/app/TaskFlow/ModuleFinalIndexProperties.vb
@ -97,6 +97,7 @@ Module ModuleFinalIndexProperties
        Public Property VectorBehaviourType As List(Of String)

        Public Sub VectorIndexBooleanProvider(attrs As PropertyAttributes)
+            'Sd
            MaybeSetReadOnlyIfNotVectorIndex(attrs)
        End Sub

@ -182,7 +183,12 @@ Module ModuleFinalIndexProperties
            If indexType.Contains(type) Then
                attrs.IsBrowsable = True
            Else
-                attrs.IsBrowsable = False
+                If attrs.DisplayName = "Index Behaviour" Then
+                    attrs.IsBrowsable = True
+                Else
+                    attrs.IsBrowsable = False
+                End If
+
            End If
        End Sub

--- a/app/TaskFlow/frmAdministration.Designer.vb
+++ b/app/TaskFlow/frmAdministration.Designer.vb
@ -685,6 +685,7 @@ Partial Class frmAdministration
        Me.viewFinalIndex.Name = "viewFinalIndex"
        Me.viewFinalIndex.OptionsBehavior.Editable = False
        Me.viewFinalIndex.OptionsBehavior.ReadOnly = True
+        Me.viewFinalIndex.OptionsSelection.EnableAppearanceFocusedRow = False
        Me.viewFinalIndex.OptionsView.EnableAppearanceEvenRow = True
        Me.viewFinalIndex.OptionsView.ShowGroupPanel = False
        '
@ -757,7 +758,7 @@ Partial Class frmAdministration
        Me.RibbonControl1.ExpandCollapseItem.Id = 0
        Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItemRefreshProfileData, Me.BarButtonItem2, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem5, Me.BarButtonItem6, Me.BarButtonItem7, Me.BarButtonItem8, Me.BarButtonItem9, Me.BarButtonItem10, Me.BarButtonItem11, Me.BarButtonItem12, Me.BarButtonItem13, Me.BarButtonItem14, Me.BarButtonItem15, Me.BarButtonItem16, Me.BarButtonItem17, Me.BarButtonItem18, Me.BarButtonItem19, Me.tsbStaticInfo, Me.BarButtonItem20, Me.BarButtonItem21, Me.bbtnItemFinishSQL, Me.BarButtonItem22, Me.BarButtonItem23, Me.BarButtonItem24, Me.BarButtonItem25, Me.BarButtonItem26, Me.BarToggleSwitchItemEdit, Me.bbtnitmReject, Me.bbtnitmNotResponsible})
        resources.ApplyResources(Me.RibbonControl1, "RibbonControl1")
-        Me.RibbonControl1.MaxItemId = 32
+        Me.RibbonControl1.MaxItemId = 33
        Me.RibbonControl1.Name = "RibbonControl1"
        Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1, Me.RibbonPage3})
        Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False]
--- a/app/TaskFlow/frmAdministration.resx
+++ b/app/TaskFlow/frmAdministration.resx
@ -565,7 +565,7 @@
    <value>58</value>
  </data>
  <data name="gridAssignedGroups.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1002, 202</value>
+    <value>1002, 203</value>
  </data>
  <data name="gridAssignedGroups.TabIndex" type="System.Int32, mscorlib">
    <value>3</value>
@ -688,7 +688,7 @@
    <value>58</value>
  </data>
  <data name="gridAvailableGroups.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1002, 237</value>
+    <value>1002, 236</value>
  </data>
  <data name="gridAvailableGroups.TabIndex" type="System.Int32, mscorlib">
    <value>0</value>
@ -778,7 +778,7 @@
    <value>1002, 493</value>
  </data>
  <data name="SplitContainer1.SplitterDistance" type="System.Int32, mscorlib">
-    <value>227</value>
+    <value>228</value>
  </data>
  <data name="SplitContainer1.TabIndex" type="System.Int32, mscorlib">
    <value>1</value>
@ -3355,7 +3355,7 @@
    <value>3, 3, 3, 3</value>
  </data>
  <data name="TabPage12.Size" type="System.Drawing.Size, System.Drawing">
-    <value>986, 391</value>
+    <value>986, 394</value>
  </data>
  <data name="TabPage12.TabIndex" type="System.Int32, mscorlib">
    <value>1</value>
@ -4630,7 +4630,7 @@
    <value>6, 89</value>
  </data>
  <data name="GroupBox2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1, 0</value>
+    <value>0, 0</value>
  </data>
  <data name="GroupBox2.TabIndex" type="System.Int32, mscorlib">
    <value>1</value>
--- a/app/TaskFlow/frmAdministration.vb
+++ b/app/TaskFlow/frmAdministration.vb
@ -430,7 +430,7 @@ Public Class frmAdministration
                pgFinalIndexes.SelectedObject = Nothing
            End If

-
+            tsbStaticInfo.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
        Catch ex As Exception
            MsgBox(ex.Message, MsgBoxStyle.Critical, "Fehler bei Refresh_Final_indexe:")
        Finally
@ -659,7 +659,7 @@ Public Class frmAdministration
        Try
            Dim view As GridView = sender
            Dim focusedRow As DataRow = view.GetFocusedDataRow()
-            pgFinalIndexes.SelectedObject = Nothing
+

            If IsNothing(focusedRow) Then
                Exit Sub
@ -671,7 +671,7 @@ Public Class frmAdministration
            If UNSAVED_CHANGES_FI = True Then
                oShouldRefreshGrid = CHECK_QUESTION_CHANGES()
            End If
-
+            pgFinalIndexes.SelectedObject = Nothing

            Dim guid As Integer = focusedRow.Item("GUID")
            Dim index As String = NotNull(focusedRow.Item("INDEXNAME"), Nothing)
@ -714,7 +714,8 @@ Public Class frmAdministration
            obj.IndexName = index
            obj.VectorBehaviourType = New List(Of String) From {
                "Add",
-                "Overwrite"
+                "Overwrite",
+                "Delete"
            }

            If index IsNot Nothing Then
@ -728,9 +729,9 @@ Public Class frmAdministration
            pgFinalIndexes.SelectedObject = obj
            pgFinalIndexes.Refresh()

-            If oShouldRefreshGrid Then
-                Refresh_Final_Indexes()
-            End If
+            'If oShouldRefreshGrid Then
+            '    Refresh_Final_Indexes()
+            'End If
        Catch ex As Exception
            _Logger.Error(ex)
            MsgBox($"Error while loading Final Index properties: {ex.Message}", MsgBoxStyle.Critical)
@ -774,6 +775,12 @@ Public Class frmAdministration
                    obj.Sequence = oValue
                ElseIf oName = "ContinueOnIndifferentState" Then
                    obj.ContinueOnIndifferentState = oValue
+                ElseIf oName = "VectorBehaviour" Then
+                    If oValue = "Delete" Then
+                        obj.StringValue = ""
+                    ElseIf oValue = "Add" And obj.StringValue = "" Then
+                        obj.StringValue = "Your value to set"
+                    End If
                End If
                pgFinalIndexes.Refresh()
            End If
@ -1042,9 +1049,9 @@ Public Class frmAdministration

    Private Sub BarButtonItem18_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem18.ItemClick
        Save_Final_Indexes()
-        'Refresh_Final_Indexes()
+        Refresh_Final_Indexes()
        If focusedRowHandle <> 199 Then
-            viewFinalIndex.SelectRow(focusedRowHandle)
+            viewFinalIndex.FocusedRowHandle = focusedRowHandle
        End If
    End Sub
    Private Sub Save_Final_Indexes()
@ -1124,7 +1131,8 @@ Public Class frmAdministration
                                      WHERE GUID = {guid}"

                    If DatabaseFallback.ExecuteNonQueryECM(sql) Then
-                        tsbStaticInfo.Caption = $"Final index saved - {Now.ToLongTimeString} - RESTART NECESSARY"
+                        tsbStaticInfo.Caption = $"Final index saved - {Now.ToLongTimeString} - RESTART/REFRESH NECESSARY"
+                        tsbStaticInfo.Visibility = DevExpress.XtraBars.BarItemVisibility.Always
                    Else

                    End If
@ -1261,6 +1269,7 @@ Public Class frmAdministration

                If UNSAVED_CHANGES_FI Then
                    Save_Final_Indexes()
+                    'Refresh_Final_Indexes()
                End If

                Return True
@ -1595,4 +1604,8 @@ Public Class frmAdministration
        Dim ofrm As New frmAdmin_notResponsibleConfig(PROFILGUIDTextBox.Text)
        ofrm.ShowDialog()
    End Sub
+
+    Private Sub BarButtonItem1_ItemClick_2(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs)
+        viewFinalIndex.FocusedRowHandle() = 2
+    End Sub
 End Class
--- a/app/TaskFlow/frmFormDesigner.Designer.vb
+++ b/app/TaskFlow/frmFormDesigner.Designer.vb
@ -55,6 +55,7 @@ Partial Class frmFormDesigner
        Me.RibbonGroupControlFunctions = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
        Me.RibbonGroupControls = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
        Me.RibPGCtrlWidth = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
+        Me.RibPGCtrlHeightreal = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
        Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar()
        Me.TBPM_PROFILE_CONTROLSBindingSource = New System.Windows.Forms.BindingSource(Me.components)
        Me.DD_DMSLiteDataSet = New DD_ProcessManager.DD_DMSLiteDataSet()
@ -74,7 +75,6 @@ Partial Class frmFormDesigner
        Me.RibbonPage3 = New DevExpress.XtraBars.Ribbon.RibbonPage()
        Me.RibbonPageGroup4 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
        Me.RibPGCtrlheight = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
-        Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
        CType(Me.SplitContainerDesigner, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SplitContainerDesigner.Panel1.SuspendLayout()
        Me.SplitContainerDesigner.Panel2.SuspendLayout()
@ -293,7 +293,7 @@ Partial Class frmFormDesigner
        '
        'RibbonPage1
        '
-        Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonGroupControlFunctions, Me.RibbonGroupControls, Me.RibPGCtrlWidth, Me.RibbonPageGroup2})
+        Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonGroupControlFunctions, Me.RibbonGroupControls, Me.RibPGCtrlWidth, Me.RibPGCtrlHeightreal})
        Me.RibbonPage1.Name = "RibbonPage1"
        resources.ApplyResources(Me.RibbonPage1, "RibbonPage1")
        '
@ -332,6 +332,14 @@ Partial Class frmFormDesigner
        Me.RibPGCtrlWidth.Name = "RibPGCtrlWidth"
        resources.ApplyResources(Me.RibPGCtrlWidth, "RibPGCtrlWidth")
        '
+        'RibPGCtrlHeightreal
+        '
+        Me.RibPGCtrlHeightreal.AllowTextClipping = False
+        Me.RibPGCtrlHeightreal.ItemLinks.Add(Me.bbtniheight_plus)
+        Me.RibPGCtrlHeightreal.ItemLinks.Add(Me.bbtniheight_min)
+        Me.RibPGCtrlHeightreal.Name = "RibPGCtrlHeightreal"
+        resources.ApplyResources(Me.RibPGCtrlHeightreal, "RibPGCtrlHeightreal")
+        '
        'RibbonStatusBar1
        '
        Me.RibbonStatusBar1.ItemLinks.Add(Me.bstitmProfilID)
@ -437,14 +445,6 @@ Partial Class frmFormDesigner
        Me.RibPGCtrlheight.Name = "RibPGCtrlheight"
        resources.ApplyResources(Me.RibPGCtrlheight, "RibPGCtrlheight")
        '
-        'RibbonPageGroup2
-        '
-        Me.RibbonPageGroup2.AllowTextClipping = False
-        Me.RibbonPageGroup2.ItemLinks.Add(Me.bbtniheight_plus)
-        Me.RibbonPageGroup2.ItemLinks.Add(Me.bbtniheight_min)
-        Me.RibbonPageGroup2.Name = "RibbonPageGroup2"
-        resources.ApplyResources(Me.RibbonPageGroup2, "RibbonPageGroup2")
-        '
        'frmFormDesigner
        '
        Me.Appearance.Options.UseFont = True
@ -527,6 +527,6 @@ Partial Class frmFormDesigner
    Friend WithEvents tslblAenderungen As DevExpress.XtraBars.BarStaticItem
    Friend WithEvents pgControlsNew As DevExpress.XtraVerticalGrid.PropertyGridControl
    Friend WithEvents bstitmProfilID As DevExpress.XtraBars.BarStaticItem
-    Friend WithEvents RibbonPageGroup2 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
+    Friend WithEvents RibPGCtrlHeightreal As DevExpress.XtraBars.Ribbon.RibbonPageGroup
    Friend WithEvents RibPGCtrlheight As DevExpress.XtraBars.Ribbon.RibbonPageGroup
 End Class
--- a/app/TaskFlow/frmFormDesigner.resx
+++ b/app/TaskFlow/frmFormDesigner.resx
@ -439,7 +439,7 @@
  <data name="RibPGCtrlWidth.Text" xml:space="preserve">
    <value>Control - Breite (+/-)</value>
  </data>
-  <data name="RibbonPageGroup2.Text" xml:space="preserve">
+  <data name="RibPGCtrlHeightreal.Text" xml:space="preserve">
    <value>Control-Höhe (Strg + +/-)</value>
  </data>
  <data name="RibbonPage1.Text" xml:space="preserve">
@ -1221,6 +1221,12 @@
  <data name="&gt;&gt;RibPGCtrlWidth.Type" xml:space="preserve">
    <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
+  <data name="&gt;&gt;RibPGCtrlHeightreal.Name" xml:space="preserve">
+    <value>RibPGCtrlHeightreal</value>
+  </data>
+  <data name="&gt;&gt;RibPGCtrlHeightreal.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
  <data name="&gt;&gt;TBPM_PROFILE_CONTROLSBindingSource.Name" xml:space="preserve">
    <value>TBPM_PROFILE_CONTROLSBindingSource</value>
  </data>
@ -1323,12 +1329,6 @@
  <data name="&gt;&gt;RibPGCtrlheight.Type" xml:space="preserve">
    <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
-  <data name="&gt;&gt;RibbonPageGroup2.Name" xml:space="preserve">
-    <value>RibbonPageGroup2</value>
-  </data>
-  <data name="&gt;&gt;RibbonPageGroup2.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
  <data name="&gt;&gt;$this.Name" xml:space="preserve">
    <value>frmFormDesigner</value>
  </data>
--- a/app/TaskFlow/frmFormDesigner.vb
+++ b/app/TaskFlow/frmFormDesigner.vb
@ -64,7 +64,7 @@ Public Class frmFormDesigner
            BarButtonItem3.ItemAppearance.Normal.BackColor = Color.Red
            Designer_Locked = True
            Mouse_IsPressed = False
-            RibPGCtrlheight.Enabled = False
+            RibPGCtrlHeightreal.Enabled = False
            RibPGCtrlWidth.Enabled = False
            RibbonGroupControls.Enabled = False
            RibbonGroupControlFunctions.Enabled = False
@ -446,7 +446,7 @@ Public Class frmFormDesigner
            sender.BringToFront()
            RibbonGroupControlFunctions.Enabled = True
            Mouse_IsPressed = True
-            RibPGCtrlheight.Enabled = True
+            RibPGCtrlHeightreal.Enabled = True
            RibPGCtrlWidth.Enabled = True
            Console.WriteLine("CURRENT_CONTROL:" & CurrentControl.Name)
        End If
@ -1028,7 +1028,7 @@ Public Class frmFormDesigner
                pgControlsNew.Enabled = False
                tslblAenderungen.Caption = $"Control {CurrentControl.Name} deleted - " + Now.ToString
                CurrentControl = Nothing
-                RibPGCtrlheight.Enabled = False
+                RibPGCtrlHeightreal.Enabled = False
                RibPGCtrlWidth.Enabled = False

                Reload_ControlNameList()
@ -1100,9 +1100,9 @@ Public Class frmFormDesigner
    End Sub

    Private Sub frmFormDesigner_down(sender As Object, e As KeyEventArgs) Handles MyBase.KeyDown
-        If e.Control AndAlso e.KeyCode = e.KeyCode.Add Then
+        If e.Control AndAlso (e.KeyCode = e.KeyCode.Add Or e.KeyCode = e.KeyCode.Oemplus) Then
            Height_plus()
-        ElseIf e.Control AndAlso e.KeyCode = e.KeyCode.Subtract Then
+        ElseIf e.Control AndAlso (e.KeyCode = e.KeyCode.Subtract Or e.KeyCode = e.KeyCode.OemMinus) Then
            Height_minus()
        Else

@ -1122,6 +1122,10 @@ Public Class frmFormDesigner
                Width_min()
            End If
        End If
+        If e.Control Then
+            LOGGER.Debug($"KeyDown-Event: e.Control is pressed!")
+        End If
+        LOGGER.Debug($"KeyDown-Event: e.KeyCode: {e.KeyCode.ToString}")


    End Sub
@ -1279,7 +1283,7 @@ Public Class frmFormDesigner
                End If

                If Not IsNothing(CurrentControl) Then
-                    RibPGCtrlheight.Enabled = True
+                    RibPGCtrlHeightreal.Enabled = True
                    RibPGCtrlWidth.Enabled = True
                End If
            Catch ex As Exception
@ -1302,6 +1306,8 @@ Public Class frmFormDesigner
            pgControlsNew.UpdateData()

            UpdateSingleValue("WIDTH", CurrentControl.Size.Width)
+        Else
+            MsgBox("Please choose a control!", MsgBoxStyle.Information)
        End If
    End Sub
    Private Sub bbtniwidth_min_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles bbtniwidth_min.ItemClick
@ -1319,6 +1325,8 @@ Public Class frmFormDesigner
            pgControlsNew.UpdateData()

            UpdateSingleValue("WIDTH", CurrentControl.Size.Width)
+        Else
+            MsgBox("Please choose a control!", MsgBoxStyle.Information)
        End If
    End Sub

@ -1344,6 +1352,8 @@ Public Class frmFormDesigner
            pgControlsNew.UpdateData()

            UpdateSingleValue("HEIGHT", newHeight)
+        Else
+            MsgBox("Please choose a control!", MsgBoxStyle.Information)
        End If
    End Sub
    Private Sub bbtniheight_plus_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles bbtniheight_plus.ItemClick
@ -1364,6 +1374,8 @@ Public Class frmFormDesigner
            pgControlsNew.UpdateData()

            UpdateSingleValue("HEIGHT", newHeight)
+        Else
+            MsgBox("Please choose a control!", MsgBoxStyle.Information)
        End If
    End Sub
 End Class
--- a/app/TaskFlow/frmValidator.vb
+++ b/app/TaskFlow/frmValidator.vb
@ -4233,12 +4233,16 @@ Public Class frmValidator
                                oDT_FIResult = Nothing
                                Dim oValue As String = oFinalIndexRow.Item("VALUE").ToString
                                Dim oFinalIndex = oFinalIndexRow.Item("INDEXNAME")
+                                Dim oIndexBehaviour = oFinalIndexRow.Item("IF_VEKTOR_BEHAVIOUR")
                                Logger.Debug($"Working on final index [{oFinalIndex}]...")
                                Dim oContinueOnIndifferentState As Boolean = CBool(oFinalIndexRow.Item("CONTINUE_INDETERMINED"))
                                Dim oIndexType = 0
                                If IDB_ACTIVE = False Then
                                    oIndexType = WINDREAM_MOD.GetIndexType(oFinalIndexRow.Item("INDEXNAME"))
                                End If
+                                If oIndexBehaviour = "Delete" Then
+                                    sd
+                                End If
                                If oValue.ToUpper = "SQL-Command".ToUpper Then '###### Indexierung mit variablen SQL ###
                                    Logger.Debug("Indexing wih dynamic sql...")
                                    Dim oGUID = oFinalIndexRow.Item("GUID")