Merge branch 'master' of http://dd-vmp07-com04:3000/AppStd/Monorepo

2021-12-07 12:04:37 +01:00
parent 8ef994f468 f95e058121
commit 6be8b1bdb5
76 changed files with 2213 additions and 524 deletions
--- a/GUIs.ZooFlow/Administration/ClassDetailForm.vb
+++ b/GUIs.ZooFlow/Administration/ClassDetailForm.vb
@@ -64,9 +64,11 @@ Public Class ClassDetailForm
            Case PAGE_IDB_BUSINESS_ENTITIES
                Load_IDBEntity(PrimaryKey, IsInsert)
                Return True
+
            Case PAGE_IDB_OBJECT_STORES
                Load_IDBObjectstore(PrimaryKey, IsInsert)
                Return True
+
            Case PAGE_CW_PROFILES
                Load_CWProfile(PrimaryKey, IsInsert)
                Return True
--- a/GUIs.ZooFlow/ClassDataASorDB.vb
+++ b/GUIs.ZooFlow/ClassDataASorDB.vb
@@ -57,7 +57,7 @@ Public Class ClassDataASorDB
                My.Application.User.ShortName = IIf(IsDBNull(DT_CHECKUSER_MODULE.Rows(0).Item("USER_SHORTNAME")), "", DT_CHECKUSER_MODULE.Rows(0).Item("USER_SHORTNAME"))
                My.Application.User.Email = IIf(IsDBNull(DT_CHECKUSER_MODULE.Rows(0).Item("USER_EMAIL")), "", DT_CHECKUSER_MODULE.Rows(0).Item("USER_EMAIL"))
                My.Application.User.Language = DT_CHECKUSER_MODULE.Rows(0).Item("USER_LANGUAGE")
-                My.Application.User.LanguageID = DT_CHECKUSER_MODULE.Rows(0).Item("USER_LANGUAGE_ID")
+                My.Application.User.LanguageId = DT_CHECKUSER_MODULE.Rows(0).Item("USER_LANGUAGE_ID")
                My.Application.User.DateFormat = DT_CHECKUSER_MODULE.Rows(0).Item("USER_DATE_FORMAT")

                My.Application.User.IsAdmin = DT_CHECKUSER_MODULE.Rows(0).Item("IS_ADMIN")
--- a/GUIs.ZooFlow/ClassIDBData.vb
+++ b/GUIs.ZooFlow/ClassIDBData.vb
@@ -18,9 +18,9 @@ Public Class ClassIDBData
        _Database = New DatabaseWithFallback(LogConfig, My.Application.Service.Client, My.DatabaseECM, My.DatabaseIDB)

        _DataASorDB = New ClassDataASorDB(LogConfig)
-        Dim oSQL = $"SELECT * FROM VWIDB_BE_ATTRIBUTE WHERE LANG_ID = {My.Application.User.LanguageID}"
+        Dim oSQL = $"SELECT * FROM VWIDB_BE_ATTRIBUTE WHERE LANG_ID = {My.Application.User.LanguageId}"

-        DTVWIDB_BE_ATTRIBUTE = _Database.GetDatatable("VWIDB_BE_ATTRIBUTE", oSQL, DatabaseType.IDB, $"LANG_ID = {My.Application.User.LanguageID}")
+        DTVWIDB_BE_ATTRIBUTE = _Database.GetDatatable("VWIDB_BE_ATTRIBUTE", oSQL, DatabaseType.IDB, $"LANG_ID = {My.Application.User.LanguageId}")
        'DTVWIDB_BE_ATTRIBUTE = _DataASorDB.GetDatatable("IDB", oSQL, "VWIDB_BE_ATTRIBUTE", $"LANG_ID = {My.Application.User.LanguageID}")
    End Sub
    Public IDBSystemIndices As List(Of String)
--- a/GUIs.ZooFlow/ClassInit.vb
+++ b/GUIs.ZooFlow/ClassInit.vb
@@ -306,7 +306,7 @@ Public Class ClassInit
            Case "USER_LANGUAGE"
                MyApplication.User.Language = NotNull(oValue.ToString, "de-DE")
            Case "USER_LANGUAGEID"
-                MyApplication.User.LanguageID = CShort(oValue)
+                MyApplication.User.LanguageId = CShort(oValue)
        End Select
    End Sub
    Private Sub HandleModuleInfo(MyApplication As My.MyApplication, ModuleName As String, Row As DataRow)
--- a/GUIs.ZooFlow/Globix/ClassFilehandle.vb
+++ b/GUIs.ZooFlow/Globix/ClassFilehandle.vb
@@ -240,29 +240,29 @@ Public Class ClassFilehandle
        End Try

    End Function
-    '' <summary>
-    ''' Ersetzt alle nicht zulässigen Zeichen im angegebenen Dateinamen
-    ''' </summary>
-    ''' <param name="sFilename">Dateiname ohne Pfadangabe</param>
-    ''' <param name="sChar">Ersatzzeichen für alle unzulässigen Zeichen 
-    ''' im Dateinamen</param>
-    Public Function CleanFilename(ByVal sFilename As String, Optional ByVal REPLACEChar As String = "") As String
-        _LOGGER.Info(" Filename before CleanFilename: '" & sFilename & "'")
-        If sFilename.Contains(".\") Then
-            sFilename = sFilename.Replace(".\", "\")
-        End If
-        'If sFilename.Contains("'") Then
-        '    sFilename = sFilename.Replace("'", "")
-        'End If
-        'If sFilename.Contains("..") Then
-        '    sFilename = sFilename.Replace("..", ".")
-        'End If
-        ' alle nicht zulässigen Zeichen ersetzen
-        sFilename = System.Text.RegularExpressions.Regex.Replace(sFilename, My.Application.Globix.REGEX_CLEAN_FILENAME, REPLACEChar)
-        sFilename = System.Text.RegularExpressions.Regex.Replace(sFilename, "[\\/:*?""<>|\r\n]", "", System.Text.RegularExpressions.RegexOptions.Singleline)
-        'Dim oCleanFileName As String = String.Join(REPLACEChar, sFilename.Split(Path.GetInvalidFileNameChars()))
-        Dim oCleanFileName As New System.IO.FileInfo(System.Text.RegularExpressions.Regex.Replace(sFilename, String.Format("[{0}]", String.Join(String.Empty, Path.GetInvalidFileNameChars)), REPLACEChar))
-        _LOGGER.Info("Filename after CleanFilename: '" & sFilename & "'")
-        Return sFilename
-    End Function
+    ''' <summary>
+    '''' Ersetzt alle nicht zulässigen Zeichen im angegebenen Dateinamen
+    '''' </summary>
+    '''' <param name="sFilename">Dateiname ohne Pfadangabe</param>
+    '''' <param name="sChar">Ersatzzeichen für alle unzulässigen Zeichen 
+    '''' im Dateinamen</param>
+    'Public Function CleanFilename(ByVal sFilename As String, Optional ByVal REPLACEChar As String = "") As String
+    '    _LOGGER.Info(" Filename before CleanFilename: '" & sFilename & "'")
+    '    If sFilename.Contains(".\") Then
+    '        sFilename = sFilename.Replace(".\", "\")
+    '    End If
+    '    'If sFilename.Contains("'") Then
+    '    '    sFilename = sFilename.Replace("'", "")
+    '    'End If
+    '    'If sFilename.Contains("..") Then
+    '    '    sFilename = sFilename.Replace("..", ".")
+    '    'End If
+    '    ' alle nicht zulässigen Zeichen ersetzen
+    '    sFilename = System.Text.RegularExpressions.Regex.Replace(sFilename, My.Application.Globix.REGEX_CLEAN_FILENAME, REPLACEChar)
+    '    sFilename = System.Text.RegularExpressions.Regex.Replace(sFilename, "[\\/:*?""<>|\r\n]", "", System.Text.RegularExpressions.RegexOptions.Singleline)
+    '    'Dim oCleanFileName As String = String.Join(REPLACEChar, sFilename.Split(Path.GetInvalidFileNameChars()))
+    '    Dim oCleanFileName As New System.IO.FileInfo(System.Text.RegularExpressions.Regex.Replace(sFilename, String.Format("[{0}]", String.Join(String.Empty, Path.GetInvalidFileNameChars)), REPLACEChar))
+    '    _LOGGER.Info("Filename after CleanFilename: '" & sFilename & "'")
+    '    Return sFilename
+    'End Function
 End Class
--- a/GUIs.ZooFlow/Globix/frmGlobix_Index.Designer.vb
+++ b/GUIs.ZooFlow/Globix/frmGlobix_Index.Designer.vb
@@ -247,7 +247,7 @@ Partial Class frmGlobix_Index
        Me.SplitContainerControl1.Panel2.Controls.Add(Me.DocumentViewer1)
        Me.SplitContainerControl1.Panel2.Text = "Panel2"
        Me.SplitContainerControl1.Size = New System.Drawing.Size(1005, 508)
-        Me.SplitContainerControl1.SplitterPosition = 591
+        Me.SplitContainerControl1.SplitterPosition = 522
        Me.SplitContainerControl1.TabIndex = 2
        '
        'pnlIndex
@@ -258,7 +258,7 @@ Partial Class frmGlobix_Index
        Me.pnlIndex.ForeColor = System.Drawing.SystemColors.ControlText
        Me.pnlIndex.Location = New System.Drawing.Point(0, 33)
        Me.pnlIndex.Name = "pnlIndex"
-        Me.pnlIndex.Size = New System.Drawing.Size(591, 400)
+        Me.pnlIndex.Size = New System.Drawing.Size(522, 400)
        Me.pnlIndex.TabIndex = 3
        '
        'Panel3
@@ -267,7 +267,7 @@ Partial Class frmGlobix_Index
        Me.Panel3.Dock = System.Windows.Forms.DockStyle.Bottom
        Me.Panel3.Location = New System.Drawing.Point(0, 433)
        Me.Panel3.Name = "Panel3"
-        Me.Panel3.Size = New System.Drawing.Size(591, 75)
+        Me.Panel3.Size = New System.Drawing.Size(522, 75)
        Me.Panel3.TabIndex = 2
        '
        'btnAblageFlow
@@ -278,7 +278,7 @@ Partial Class frmGlobix_Index
        Me.btnAblageFlow.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
        Me.btnAblageFlow.Location = New System.Drawing.Point(0, 0)
        Me.btnAblageFlow.Name = "btnAblageFlow"
-        Me.btnAblageFlow.Size = New System.Drawing.Size(591, 75)
+        Me.btnAblageFlow.Size = New System.Drawing.Size(522, 75)
        Me.btnAblageFlow.TabIndex = 1
        Me.btnAblageFlow.Text = "Starte Ablage"
        Me.btnAblageFlow.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
@@ -291,7 +291,7 @@ Partial Class frmGlobix_Index
        Me.Panel1.Dock = System.Windows.Forms.DockStyle.Top
        Me.Panel1.Location = New System.Drawing.Point(0, 0)
        Me.Panel1.Name = "Panel1"
-        Me.Panel1.Size = New System.Drawing.Size(591, 33)
+        Me.Panel1.Size = New System.Drawing.Size(522, 33)
        Me.Panel1.TabIndex = 0
        '
        'ComboBoxEdit1
@@ -306,7 +306,7 @@ Partial Class frmGlobix_Index
        Me.ComboBoxEdit1.Properties.ButtonsStyle = DevExpress.XtraEditors.Controls.BorderStyles.UltraFlat
        Me.ComboBoxEdit1.Properties.NullText = "Bitte wählen Sie ein Profil"
        Me.ComboBoxEdit1.Properties.Padding = New System.Windows.Forms.Padding(5)
-        Me.ComboBoxEdit1.Size = New System.Drawing.Size(591, 30)
+        Me.ComboBoxEdit1.Size = New System.Drawing.Size(522, 30)
        Me.ComboBoxEdit1.TabIndex = 4
        '
        'DocumentViewer1
@@ -315,7 +315,7 @@ Partial Class frmGlobix_Index
        Me.DocumentViewer1.FileLoaded = False
        Me.DocumentViewer1.Location = New System.Drawing.Point(0, 0)
        Me.DocumentViewer1.Name = "DocumentViewer1"
-        Me.DocumentViewer1.Size = New System.Drawing.Size(404, 508)
+        Me.DocumentViewer1.Size = New System.Drawing.Size(473, 508)
        Me.DocumentViewer1.TabIndex = 0
        '
        'GlobixDataset
--- a/GUIs.ZooFlow/Search/frmFlowSearch.vb
+++ b/GUIs.ZooFlow/Search/frmFlowSearch.vb
@@ -60,7 +60,7 @@ Public Class frmFlowSearch
                cmbAttributeDate.Items.Add(IDB_ADDED_WHEN_String_Englisch)
            End If
            'Dim oDT As DataTable = ASorDB.GetDatatable("IDB", $"SELECT * FROM VWIDB_BE_ATTRIBUTE WHERE TYPE_ID = 5 AND LANG_ID = {My.Application.User.LanguageID}", "VWIDB_BE_ATTRIBUTE", $"TYPE_ID = 5 AND LANG_ID = {My.Application.User.LanguageID}")
-            Dim oDT As DataTable = Database.GetDatatable("VWIDB_BE_ATTRIBUTE", $"SELECT * FROM VWIDB_BE_ATTRIBUTE WHERE TYPE_ID = 5 AND LANG_ID = {My.Application.User.LanguageID}", DatabaseType.IDB, $"TYPE_ID = 5 AND LANG_ID = {My.Application.User.LanguageID}")
+            Dim oDT As DataTable = Database.GetDatatable("VWIDB_BE_ATTRIBUTE", $"SELECT * FROM VWIDB_BE_ATTRIBUTE WHERE TYPE_ID = 5 AND LANG_ID = {My.Application.User.LanguageId}", DatabaseType.IDB, $"TYPE_ID = 5 AND LANG_ID = {My.Application.User.LanguageId}")

            For Each oRow As DataRow In oDT.Rows
                cmbAttributeDate.Items.Add(oRow.Item("ATTR_TITLE"))
@@ -191,7 +191,7 @@ Public Class frmFlowSearch
        Try
            oHandle = SplashScreenManager.ShowOverlayForm(Me)

-            Dim oEXECSQL = $"EXEC PRFLOW_SEARCH_GET_RESULT '{pSearchValue}','{SEARCH_FACT_DATE}', {My.Application.User.UserId},'{oSearchData.SelectInStringAttributeIds}','{oSearchData.SelectInIntegerAttributeIds}',{My.Application.User.LanguageID},'{pOptAttribute}'"
+            Dim oEXECSQL = $"EXEC PRFLOW_SEARCH_GET_RESULT '{pSearchValue}','{SEARCH_FACT_DATE}', {My.Application.User.UserId},'{oSearchData.SelectInStringAttributeIds}','{oSearchData.SelectInIntegerAttributeIds}',{My.Application.User.LanguageId},'{pOptAttribute}'"
            Dim oDTOBJECT_RESULT As DataTable = My.DatabaseIDB.GetDatatable(oEXECSQL)
            If Not IsNothing(oDTOBJECT_RESULT) Then
                If oDTOBJECT_RESULT.Rows.Count = 0 Then
@@ -375,7 +375,7 @@ Public Class frmFlowSearch
                oHandle = SplashScreenManager.ShowOverlayForm(Me)

                'Dim oDT As DataTable = ASorDB.GetDatatable("IDB", $"SELECT * FROM VWIDB_BE_ATTRIBUTE WHERE ATTR_ID = {oSplit(1)} AND LANG_ID = {My.Application.User.LanguageID}", "VWIDB_BE_ATTRIBUTE", $"ATTR_ID = {oSplit(1)} AND LANG_ID = {My.Application.User.LanguageID}")
-                Dim oDT As DataTable = Database.GetDatatable("VWIDB_BE_ATTRIBUTE", $"SELECT * FROM VWIDB_BE_ATTRIBUTE WHERE ATTR_ID = {oSplit(1)} AND LANG_ID = {My.Application.User.LanguageID}", DatabaseType.IDB, $"ATTR_ID = {oSplit(1)} AND LANG_ID = {My.Application.User.LanguageID}")
+                Dim oDT As DataTable = Database.GetDatatable("VWIDB_BE_ATTRIBUTE", $"SELECT * FROM VWIDB_BE_ATTRIBUTE WHERE ATTR_ID = {oSplit(1)} AND LANG_ID = {My.Application.User.LanguageId}", DatabaseType.IDB, $"ATTR_ID = {oSplit(1)} AND LANG_ID = {My.Application.User.LanguageId}")

                Dim oType = oDT.Rows(0).Item("TYPE_NAME")
                Dim oEXECSQL = $"EXEC PRFLOW_SEARCH_GET_RESULT_PER_TILE {oSplit(0)},{My.Application.User.UserId},'{oType}',{oSplit(1)},'{My.Application.User.Language}'"
--- a/GUIs.ZooFlow/frmFlowForm.vb
+++ b/GUIs.ZooFlow/frmFlowForm.vb
@@ -419,7 +419,7 @@ Public Class frmFlowForm
        Next
        If oSQLFlowSearch <> String.Empty Then
            oSQLFlowSearch = oSQLFlowSearch.Replace("@USER_ID", My.Application.User.UserId)
-            oSQLFlowSearch = oSQLFlowSearch.Replace("@LANGUAGE_ID", My.Application.User.LanguageID)
+            oSQLFlowSearch = oSQLFlowSearch.Replace("@LANGUAGE_ID", My.Application.User.LanguageId)
            oSQLFlowSearch = oSQLFlowSearch.Replace("@LANGUAGE", My.Application.User.Language)
            Dim oForm As New frmFlowSearch(oSQLFlowSearch)
            oForm.Show()
--- a/GUIs.ZooFlow/frmtest.vb
+++ b/GUIs.ZooFlow/frmtest.vb
@@ -100,11 +100,7 @@ Public Class frmtest
            txtFile2Import.Text,
            "WORK",
            "DOC",
-            "DEFAULT",
-            New NewFileOptions With {
-                .Username = Environment.UserName,
-                .DateImported = DateTimePicker1.Value
-            }
+            "DEFAULT"
        )

        If oObjectId <> INVALID_OBEJCT_ID Then