MS Development Zooflow 1.0

2022-02-17 12:03:46 +01:00
parent 5f69002668
commit fddd79ae17
21 changed files with 1616 additions and 278 deletions
--- a/GUIs.ZooFlow/Administration/frmAdmin_Globix.Designer.vb
+++ b/GUIs.ZooFlow/Administration/frmAdmin_Globix.Designer.vb
@@ -517,6 +517,7 @@ Partial Class frmAdmin_Globix
        Me.TableAdapterManager.TBIDB_ATTRIBUTE_TYPETableAdapter = Nothing
        Me.TableAdapterManager.TBIDB_ATTRIBUTETableAdapter = Nothing
        Me.TableAdapterManager.TBIDB_BUSINESS_ENTITYTableAdapter = Nothing
+        Me.TableAdapterManager.TBIDB_CATALOG_USERTableAdapter = Nothing
        Me.TableAdapterManager.TBIDB_CATALOGTableAdapter = Nothing
        Me.TableAdapterManager.TBIDB_DOCTYPE_HANDLINGTableAdapter = Nothing
        Me.TableAdapterManager.TBIDB_OBJECT_STORETableAdapter = Nothing
@@ -1382,7 +1383,7 @@ Partial Class frmAdmin_Globix
        Me.XtraTabPageRework.ImageOptions.SvgImage = CType(resources.GetObject("XtraTabPageRework.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
        Me.XtraTabPageRework.ImageOptions.SvgImageSize = New System.Drawing.Size(16, 16)
        Me.XtraTabPageRework.Name = "XtraTabPageRework"
-        Me.XtraTabPageRework.Size = New System.Drawing.Size(1111, 272)
+        Me.XtraTabPageRework.Size = New System.Drawing.Size(1111, 271)
        Me.XtraTabPageRework.Text = "Nachbearbeitungsfunktionen manueller Index"
        '
        'LayoutControlRework
@@ -2228,7 +2229,7 @@ Partial Class frmAdmin_Globix
        Me.XtraTabPage1.ImageOptions.SvgImage = CType(resources.GetObject("XtraTabPage1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
        Me.XtraTabPage1.ImageOptions.SvgImageSize = New System.Drawing.Size(16, 16)
        Me.XtraTabPage1.Name = "XtraTabPage1"
-        Me.XtraTabPage1.Size = New System.Drawing.Size(1138, 597)
+        Me.XtraTabPage1.Size = New System.Drawing.Size(1138, 596)
        Me.XtraTabPage1.Text = "Profil-Zuordnung"
        '
        'XtraTabControl3
@@ -2238,7 +2239,7 @@ Partial Class frmAdmin_Globix
        Me.XtraTabControl3.Location = New System.Drawing.Point(0, 0)
        Me.XtraTabControl3.Name = "XtraTabControl3"
        Me.XtraTabControl3.SelectedTabPage = Me.XtraTabPage2
-        Me.XtraTabControl3.Size = New System.Drawing.Size(1138, 597)
+        Me.XtraTabControl3.Size = New System.Drawing.Size(1138, 596)
        Me.XtraTabControl3.TabIndex = 0
        Me.XtraTabControl3.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPage2, Me.XtraTabPage3})
        '
@@ -2248,7 +2249,7 @@ Partial Class frmAdmin_Globix
        Me.XtraTabPage2.ImageOptions.SvgImage = CType(resources.GetObject("XtraTabPage2.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
        Me.XtraTabPage2.ImageOptions.SvgImageSize = New System.Drawing.Size(16, 16)
        Me.XtraTabPage2.Name = "XtraTabPage2"
-        Me.XtraTabPage2.Size = New System.Drawing.Size(1136, 571)
+        Me.XtraTabPage2.Size = New System.Drawing.Size(1136, 570)
        Me.XtraTabPage2.Text = "User"
        '
        'SplitContainerControl1
@@ -2269,7 +2270,7 @@ Partial Class frmAdmin_Globix
        Me.SplitContainerControl1.Panel2.Controls.Add(Me.gridAvailableUsers)
        Me.SplitContainerControl1.Panel2.Controls.Add(Me.Label35)
        Me.SplitContainerControl1.Panel2.Text = "Panel2"
-        Me.SplitContainerControl1.Size = New System.Drawing.Size(1136, 571)
+        Me.SplitContainerControl1.Size = New System.Drawing.Size(1136, 570)
        Me.SplitContainerControl1.SplitterPosition = 308
        Me.SplitContainerControl1.TabIndex = 0
        '
@@ -2357,7 +2358,7 @@ Partial Class frmAdmin_Globix
        Me.gridAvailableUsers.MainView = Me.viewAvailableUsers
        Me.gridAvailableUsers.MenuManager = Me.RibbonControl1
        Me.gridAvailableUsers.Name = "gridAvailableUsers"
-        Me.gridAvailableUsers.Size = New System.Drawing.Size(1136, 223)
+        Me.gridAvailableUsers.Size = New System.Drawing.Size(1136, 222)
        Me.gridAvailableUsers.TabIndex = 2
        Me.gridAvailableUsers.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.viewAvailableUsers})
        '
@@ -2433,7 +2434,7 @@ Partial Class frmAdmin_Globix
        Me.XtraTabPage3.ImageOptions.SvgImage = CType(resources.GetObject("XtraTabPage3.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
        Me.XtraTabPage3.ImageOptions.SvgImageSize = New System.Drawing.Size(16, 16)
        Me.XtraTabPage3.Name = "XtraTabPage3"
-        Me.XtraTabPage3.Size = New System.Drawing.Size(1136, 571)
+        Me.XtraTabPage3.Size = New System.Drawing.Size(1136, 570)
        Me.XtraTabPage3.Text = "Gruppen"
        '
        'SplitContainerControlGroup
@@ -2454,7 +2455,7 @@ Partial Class frmAdmin_Globix
        Me.SplitContainerControlGroup.Panel2.Controls.Add(Me.gridAvailableGroups)
        Me.SplitContainerControlGroup.Panel2.Controls.Add(Me.Label14)
        Me.SplitContainerControlGroup.Panel2.Text = "Panel2"
-        Me.SplitContainerControlGroup.Size = New System.Drawing.Size(1136, 571)
+        Me.SplitContainerControlGroup.Size = New System.Drawing.Size(1136, 570)
        Me.SplitContainerControlGroup.SplitterPosition = 315
        Me.SplitContainerControlGroup.TabIndex = 0
        '
@@ -2537,7 +2538,7 @@ Partial Class frmAdmin_Globix
        Me.gridAvailableGroups.MainView = Me.viewAvailableGroups
        Me.gridAvailableGroups.Name = "gridAvailableGroups"
        Me.gridAvailableGroups.ShowOnlyPredefinedDetails = True
-        Me.gridAvailableGroups.Size = New System.Drawing.Size(1136, 216)
+        Me.gridAvailableGroups.Size = New System.Drawing.Size(1136, 215)
        Me.gridAvailableGroups.TabIndex = 89
        Me.gridAvailableGroups.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.viewAvailableGroups})
        '
--- a/GUIs.ZooFlow/Administration/frmAdmin_Globix.vb
+++ b/GUIs.ZooFlow/Administration/frmAdmin_Globix.vb
@@ -29,7 +29,12 @@ Public Class frmAdmin_Globix
            Me.VWIDB_OBJECT_STORETableAdapter.Connection.ConnectionString = My.DatabaseIDB.CurrentSQLConnectionString
            Me.VWIDB_OBJECT_STORETableAdapter.Fill(Me.DSIDB_Stammdaten.VWIDB_OBJECT_STORE)
            Me.VWIDB_BE_ATTRIBUTETableAdapter.Connection.ConnectionString = My.DatabaseIDB.CurrentSQLConnectionString
-            Me.VWIDB_BE_ATTRIBUTETableAdapter.Fill(Me.DSIDB_Stammdaten.VWIDB_BE_ATTRIBUTE, My.Application.User.Language)
+            Try
+                Me.VWIDB_BE_ATTRIBUTETableAdapter.Fill(Me.DSIDB_Stammdaten.VWIDB_BE_ATTRIBUTE, My.Application.User.Language)
+            Catch ex As Exception
+                MsgBox(ex.Message, MsgBoxStyle.Critical, "Error loading VWIDB_BE_ATTRIBUTE")
+            End Try
+
            Load_TabData()

            ' Add Focus Handler to all controls in all LayoutControls
--- a/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.vb
+++ b/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.vb
@@ -62,8 +62,8 @@
        Try
            VWIDB_BE_ATTRIBUTEBindingSource.EndEdit()

-            'If DSIDB_Stammdaten.VWIDB_BE_ATTRIBUTE.GetChanges() IsNot Nothing Or IsInsert Then
-            HasChanges = True
+            If DSIDB_Stammdaten.VWIDB_BE_ATTRIBUTE.GetChanges() IsNot Nothing Or IsInsert Then
+                HasChanges = True

                If IsInsert Then
                    txtAddedWho.EditValue = My.Application.User.UserName
@@ -73,29 +73,29 @@

                VWIDB_BE_ATTRIBUTEBindingSource.EndEdit()

-            ' TODO: Update Database
-            If Not IsInsert Then
-                Dim oUpdate As String = $"UPDATE TBIDB_ATTRIBUTE " &
-                $"SET TITLE = '{TextEdit2.Text}', TYP_ID = {ComboBoxEdit1.EditValue}, VIEW_SEQUENCE = {SpinEdit1.Value}, VIEW_VISIBLE = '{CheckEdit2.Checked}'" &
+                ' TODO: Update Database
+                If Not IsInsert Then
+                    Dim oUpdate As String = $"UPDATE TBIDB_ATTRIBUTE " &
+                 $"SET TITLE = '{TextEdit2.Text}', TYP_ID = {ComboBoxEdit1.EditValue}, VIEW_SEQUENCE = {SpinEdit1.Value}, VIEW_VISIBLE = '{CheckEdit2.Checked}'" &
                $",MULTI_CONTEXT = '{CheckEditMulticontext.Checked}', COMMENT = '{TextEdit3.Text}', CHANGED_WHO = '{My.Application.User.UserName}' " &
                $"WHERE        (GUID = {TextEdit1.Text})"

-                If My.DatabaseIDB.ExecuteNonQuery(oUpdate) = False Then
-                    Return False
-                End If
-            Else
-                Dim oInsert As String = $"INSERT INTO TBIDB_ATTRIBUTE " &
-                         "(TITLE, TYP_ID, VIEW_SEQUENCE, VIEW_VISIBLE, ADDED_WHO,COMMENT) " &
-                         $"VALUES ('{TextEdit2.Text}',{ComboBoxEdit1.EditValue},{SpinEdit1.Value},'{CheckEdit2.Checked}','{My.Application.User.UserName}', '{TextEdit3.Text}')"
-
-                If My.DatabaseIDB.ExecuteNonQuery(oInsert) = True Then
-                    IsInsert = False
+                    If My.DatabaseIDB.ExecuteNonQuery(oUpdate) = False Then
+                        Return False
+                    End If
                Else
-                    Return False
+                    Dim oInsert As String = $"INSERT INTO TBIDB_ATTRIBUTE " &
+                         "(TITLE, TYP_ID, VIEW_SEQUENCE, VIEW_VISIBLE, ADDED_WHO,COMMENT,MULTI_CONTEXT) " &
+                         $"VALUES ('{TextEdit2.Text}',{ComboBoxEdit1.EditValue},{SpinEdit1.Value},'{CheckEdit2.Checked}','{My.Application.User.UserName}', '{TextEdit3.Text}','{CheckEditMulticontext.Checked}')"
+
+                    If My.DatabaseIDB.ExecuteNonQuery(oInsert) = True Then
+                        IsInsert = False
+                    Else
+                        Return False
+                    End If
                End If
+                '  VWIDB_BE_ATTRIBUTETableAdapter.Update(DSIDB_Stammdaten.VWIDB_BE_ATTRIBUTE)
            End If
-            '  VWIDB_BE_ATTRIBUTETableAdapter.Update(DSIDB_Stammdaten.VWIDB_BE_ATTRIBUTE)
-            'End If

            Return True
        Catch ex As Exception