MS

2022-05-17 17:08:14 +02:00
parent 11c7b4e5e9
commit 07b9bccd72
27 changed files with 2209 additions and 1241 deletions
--- a/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.vb
+++ b/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.vb
@@ -140,7 +140,7 @@ Public Class frmAdmin_Globix
            TBDD_INDEX_AUTOMTableAdapter.Fill(GlobixDataset.TBDD_INDEX_AUTOM, PrimaryKey)

            AttributesAutomatic = GlobixDataset.TBDD_INDEX_AUTOM.Cast(Of DataRow).
-                ToDictionary(Of String, String)(Function(row) row.Item("NAME"), Function(row) row.Item("WD_INDEX"))
+                ToDictionary(Of String, String)(Function(row) row.Item("INDEXNAME"), Function(row) row.Item("INDEXNAME"))

        Catch ex As Exception
            MessageBox.Show(ex.Message)
@@ -162,11 +162,14 @@ Public Class frmAdmin_Globix
    End Sub
    Private Sub ResetMessages()
        labelStatus.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
+        bsiStatus.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
    End Sub

-    Private Sub ShowStatus(Message As String)
+    Private Sub ShowStatus(Message As String, ocolor As Color)
        labelStatus.Caption = Message
-        labelStatus.Visibility = DevExpress.XtraBars.BarItemVisibility.Always
+        bsiStatus.Caption = $"{Message} - {Now.ToString}"
+        bsiStatus.ItemAppearance.Normal.BackColor = ocolor
+        bsiStatus.Visibility = DevExpress.XtraBars.BarItemVisibility.Always
    End Sub

    Public Function DeleteData() As Boolean Implements IAdminForm.DeleteData
@@ -207,9 +210,10 @@ Public Class frmAdmin_Globix

            oPage.IsInsert = False

-            ShowStatus($"{oPage.Name} saved!")
+            ShowStatus($"{oPage.Name} saved - {Now.ToString}", Color.DodgerBlue)
        Catch ex As Exception
            ShowErrorMessage(ex)
+            ShowStatus($"{ex.Message} saved - {Now.ToString}", Color.Red)
        End Try
        'Else
        '    ShowStatus("Keine Änderungen!")
@@ -227,9 +231,11 @@ Public Class frmAdmin_Globix
                TBDD_INDEX_MANBindingSource.EndEdit()
                TBDD_INDEX_MANTableAdapter.Update(Pages.Current.DataTable)
            End If
+
+            ShowStatus("Manual Attribut-Step saved", Color.DodgerBlue)
            Return True
        Catch ex As Exception
-            ShowBalloonTip(15000, "Error saving ManIndex", ex.Message, ToolTipIcon.Warning)
+            ShowStatus($"Error saving ManIndex {ex.Message} - {Now.ToString}", Color.Red)
            Return False
        End Try
    End Function
@@ -244,16 +250,16 @@ Public Class frmAdmin_Globix
                End If
                TBDD_INDEX_AUTOMBindingSource.EndEdit()
                TBDD_INDEX_AUTOMTableAdapter.Update(Pages.Current.DataTable)
+                ShowStatus($"Auto Attribut-Step saved", Color.DodgerBlue)
+
            End If
            Return True
        Catch ex As Exception
            Return False
-            ShowBalloonTip(15000, "Error saving AutoIndex", ex.Message, ToolTipIcon.Warning)
+            ShowStatus($"Error saving AutoIndex - {ex.Message}", Color.Red)
+
        End Try
    End Function
-    Sub ShowBalloonTip(pTime As Integer, tipTitle As String, tipText As String, tipIcon As ToolTipIcon)
-        NotifyIcon1.ShowBalloonTip(pTime, tipTitle, tipText, tipIcon)
-    End Sub
    Private Function Save_AutoSelect(oPage As ClassDetailPageManager.DetailPage) As Boolean
        Try
            TBGI_REGEX_DOCTYPEBindingSource.EndEdit()
@@ -265,9 +271,12 @@ Public Class frmAdmin_Globix
                End If
                TBGI_REGEX_DOCTYPEBindingSource.EndEdit()
                TBGI_REGEX_DOCTYPETableAdapter.Update(Pages.Current.DataTable)
+
+                ShowStatus($"Autoselect saved", Color.DodgerBlue)
            End If
            Return True
        Catch ex As Exception
+            ShowStatus($"Error saving autoselect - {ex.Message}", Color.Red)
            Return False
        End Try
    End Function
@@ -286,12 +295,15 @@ Public Class frmAdmin_Globix
                My.DatabaseECM.ExecuteNonQuery(oSQL)
                IsInsert = False
                TBDD_DOKUMENTARTTableAdapter.Fill(Me.GlobixDataset.TBDD_DOKUMENTART, PrimaryKey)
+                ShowStatus($"New FileFlow Profile {TextEditBezeichnung.Text} saved", Color.DodgerBlue)
                Return True
            Else
+                ShowStatus("Error Saving Fileflow Profile - Check the Log for further info", Color.Red)
                Return False
            End If
        Catch ex As Exception
            ShowErrorMessage(ex)
+            ShowStatus($"Error Saving Fileflow Profile {ex.Message}", Color.Red)
            Return False
        End Try

@@ -305,7 +317,12 @@ Public Class frmAdmin_Globix
                        ,[GEANDERTWER] = '{My.Application.User.UserName}',IDB_OBJECT_STORE_ID = {IDB_OBJECT_STORE_IDComboBox.SelectedValue} 
                        WHERE GUID = {TextEditDoctypeID.Text}"

-            Return My.DatabaseECM.ExecuteNonQuery(oUpd)
+            If My.DatabaseECM.ExecuteNonQuery(oUpd) = True Then
+                ShowStatus($"FileFlow Profile {TextEditBezeichnung.Text} saved", Color.DodgerBlue)
+                Return True
+            Else
+                Return False
+            End If

        Catch ex As Exception
            ShowErrorMessage(ex)
@@ -357,28 +374,26 @@ Public Class frmAdmin_Globix

    Private Sub btneditSQLmanIndex_Click(sender As Object, e As EventArgs) Handles btneditSQLmanIndex.Click
        If Save_manIndexe(Pages.Current) = True Then
-            Dim oSQLbefore = SQL_RESULTTextBox.Text
-            Dim oForm2 As New frmSQLEditor(My.LogConfig, My.DatabaseECM) With {
-                .SQLCommand = SQL_RESULTTextBox.Text,
-                .SQLConnection = CONNECTION_IDTextBox.Text,
-                .PlaceholdersManual = AttributesManual
-            }
-            oForm2.ShowDialog()
+            Try
+                Dim oSQLbefore = SQL_RESULTTextBox.Text
+                Dim oForm2 As New frmSQLEditor(My.LogConfig, My.DatabaseECM) With {
+                    .SQLCommand = SQL_RESULTTextBox.Text,
+                    .SQLConnection = IIf(CONNECTION_IDTextBox.Text = "", 1, CONNECTION_IDTextBox.Text),
+                    .PlaceholdersManual = AttributesManual
+                }
+                oForm2.ShowDialog()

-            'Dim oForm As New frmSQLDesigner() With {
-            '    .SQLCommand = SQL_RESULTTextBox.Text,
-            '    .DesignType = "GI_ATTRIBUTE_MAN",
-            '    .ConnectionID = CONNECTION_IDTextBox.Text
-            '}
-            'Dim oResult = oForm.ShowDialog()
+                If oForm2.DialogResult = DialogResult.OK And oSQLbefore <> oForm2.SQLCommand Then
+                    CONNECTION_IDTextBox.Text = oForm2.SQLConnection
+                    SQL_RESULTTextBox.Text = oForm2.SQLCommand
+                    'TBDD_INDEX_MANTableAdapter.Adapter.UpdateCommand.Parameters("@SQL_RESULT").Value = oForm.SQLCommand
+                    'TBDD_INDEX_MANTableAdapter.Adapter.UpdateCommand.Parameters("@CONNECTION_ID").Value = oForm.ConnectionID
+                    TextEditChangedWho_ManIndex.Text = My.Application.User.UserName
+                End If
+            Catch ex As Exception
+                System.Windows.Forms.MessageBox.Show(ex.Message)
+            End Try

-            If oSQLbefore <> oForm2.SQLCommand Then
-                CONNECTION_IDTextBox.Text = oForm2.SQLConnection
-                SQL_RESULTTextBox.Text = oForm2.SQLCommand
-                'TBDD_INDEX_MANTableAdapter.Adapter.UpdateCommand.Parameters("@SQL_RESULT").Value = oForm.SQLCommand
-                'TBDD_INDEX_MANTableAdapter.Adapter.UpdateCommand.Parameters("@CONNECTION_ID").Value = oForm.ConnectionID
-                TextEditChangedWho_ManIndex.Text = My.Application.User.UserName
-            End If

        End If
    End Sub
@@ -431,29 +446,21 @@ Public Class frmAdmin_Globix

    Private Sub SimpleButton2_Click_1(sender As Object, e As EventArgs) Handles SimpleButton2.Click
        If Save_AutoIndexe(Pages.Current) = True Then
-            Dim oSQLbefore = SQL_RESULTTextBox.Text
+            Dim oSQLbefore = SQL_RESULTTextBox1.Text
            Dim oForm2 As New frmSQLEditor(My.LogConfig, My.DatabaseECM) With {
-                .SQLCommand = SQL_RESULTTextBox.Text,
-                .SQLConnection = CONNECTION_IDTextBox.Text,
-                .PlaceholdersAutomatic = AttributesAutomatic
+                .SQLCommand = SQL_RESULTTextBox1.Text,
+                .SQLConnection = IIf(CONNECTION_IDTextBox1.Text = "", 1, CONNECTION_IDTextBox1.Text),
+                .PlaceholdersAutomatic = AttributesAutomatic,
+                .PlaceholdersManual = AttributesManual
            }
            oForm2.ShowDialog()

-            'Dim oForm As New frmSQLDesigner() With {
-            '        .SQLCommand = oSQLbefore, .DesignType = "GI_ATTRIBUTE_AUTO",
-            '        .ConnectionID = CONNECTION_IDTextBox1.Text,
-            '        .AutoAttributID = GUIDTextBoxAutoAttribute.Text
-            '    }
-            'Dim oResult = oForm.ShowDialog()
-            If oSQLbefore <> oForm2.SQLCommand Then
+            If oForm2.DialogResult = DialogResult.OK And oSQLbefore <> oForm2.SQLCommand Then
                CONNECTION_IDTextBox1.Text = oForm2.SQLConnection
                SQL_RESULTTextBox1.Text = oForm2.SQLCommand
-                'TBDD_INDEX_MANTableAdapter.Adapter.UpdateCommand.Parameters("@SQL_RESULT").Value = oForm.SQLCommand
-                'TBDD_INDEX_MANTableAdapter.Adapter.UpdateCommand.Parameters("@CONNECTION_ID").Value = oForm.ConnectionID
+                SQL_ACTIVECheckBox.Checked = 1
                CHANGED_WHOTextEditAutoAttribut.Text = My.Application.User.UserName
            End If
-        Else
-
        End If
    End Sub

@@ -655,7 +662,7 @@ Public Class frmAdmin_Globix

            oPage.IsInsert = False

-            ShowStatus($"{oPage.Name} deleted!")
+            ' ShowStatus($"{oPage.Name} deleted!")
        Catch ex As Exception
            ShowErrorMessage(ex)
        End Try