2.1.6.3 Final - ApplServer, frmAdminsitrationBugs etc

app/DD_PM_WINDREAM/frmMain.vb

@@ -43,7 +43,7 @@ Public Class frmMain
     Private allgFunk As New ClassAllgemeineFunktionen
     Private _Init As New ClassInit
     Private CurrNavBarGroup As NavBarGroup
-
+    Private DataASorDB As ClassDataASorDB
 
     Private DT_CHECKUSER_MODULE As DataTable
     Private IsFilterMode As Boolean
@@ -167,6 +167,7 @@ Public Class frmMain
         End Try
 
         Try
+            DataASorDB = New ClassDataASorDB
             bsiLicenses.Caption = "Anzahl Lizenzen: " & LICENSE_COUNT
             LOGGER.Debug("Initializing MainForm....")
 
@@ -334,27 +335,18 @@ Public Class frmMain
             SOURCE_INIT = Init_IDB()
             If SOURCE_INIT = True Then
                 Dim oSQL = $"SELECT SQL_COMMAND FROM TBDD_SQL_COMMANDS WHERE TITLE = 'PM_IDB_DOC_DATA'"
-                If EDMIAppServerActive = True Then
-                    Dim oTableResult As TableResult = _Client.GetDatatableByName("TBDD_SQL_COMMANDS", $"TITLE = 'PM_IDB_DOC_DATA'")
-                    Dim oDT = oTableResult.Table
-                    If Not IsNothing(oDT) Then
-                        IDB_DOC_DATA_SQL = oDT.Rows(0).Item("SQL_COMMAND")
-                    End If
-
-                Else
-                    IDB_DOC_DATA_SQL = ClassDatabase.Execute_Scalar(oSQL, CONNECTION_STRING_READ, "frmMainload-PM_IDPDOCDATA")
-                End If
-
+                Dim DTIDB_DOC_DATA_SQL = DataASorDB.GetDatatable("DD_ECM", oSQL, "TBDD_SQL_COMMANDS", "TITLE = 'PM_IDB_DOC_DATA'")
+                IDB_DOC_DATA_SQL = DTIDB_DOC_DATA_SQL.Rows(0).Item("SQL_COMMAND")
                 LOGGER.Debug($"Got the IDB_DOC_DATA_SQL..{IDB_DOC_DATA_SQL}")
             End If
             bsiGeneralInfo.Caption = "IDB active"
-            If EDMIAppServerActive = True Then
-                BarStaticItemAppServer.Visibility = DevExpress.XtraBars.BarItemVisibility.Always
-            Else
-                BarStaticItemAppServer.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
-            End If
-        End If
 
+        End If
+        If EDMIAppServerActive = True Then
+            BarStaticItemAppServer.Visibility = DevExpress.XtraBars.BarItemVisibility.Always
+        Else
+            BarStaticItemAppServer.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
+        End If
         If BASIC_CONF_VISIBLE = False Then
             RibbonPageGroupBasicConf.Visible = False
         Else
@@ -552,21 +544,23 @@ Public Class frmMain
                     Try
                         GridView_Docs.Columns.Item("CONV_YN").Visible = False
                     Catch ex As Exception
-                        LOGGER.Warn("ResetLayout - Check wether Column CONV_YN is part of select/view..now checking CONVERSATION")
+                        LOGGER.Info("ResetLayout - Check wether Column CONV_YN is part of select/view..now checking CONVERSATION")
                     End Try
                     Try
                         GridView_Docs.Columns.Item("CONVERSATION").MaxWidth = 24
                         GridView_Docs.Columns.Item("CONVERSATION").MinWidth = 24
                         GridView_Docs.Columns.Item("CONVERSATION").Fixed = FixedStyle.Left
                     Catch ex As Exception
-                        LOGGER.Warn("ResetLayout - Column CONVERSATION obviously is not part of GridView_Docs")
+                        LOGGER.Info("ResetLayout - Column CONVERSATION obviously is not part of GridView_Docs")
                     End Try
                 End If
 
 
                 Try
-                    GridView_Docs.Columns("Last edited").DisplayFormat.FormatType = FormatType.DateTime
-                    GridView_Docs.Columns("Last edited").DisplayFormat.FormatString = "dd.MM.yyyy HH:MM:ss"
+                    Dim oReducedColName = LAST_EDITED_COLUMN.Replace("[", "")
+                    oReducedColName = oReducedColName.Replace("]", "")
+                    GridView_Docs.Columns(oReducedColName).DisplayFormat.FormatType = FormatType.DateTime
+                    GridView_Docs.Columns(oReducedColName).DisplayFormat.FormatString = "dd.MM.yyyy HH:MM:ss"
                 Catch ex As Exception
                     Try
                         GridView_Docs.Columns("Zuletzt bearbeitet").DisplayFormat.FormatType = FormatType.DateTime
@@ -623,7 +617,9 @@ Public Class frmMain
                 NavBarControl1.Visible = True
                 Dim oCountItems As Integer = 0
                 For Each oProfileRow As DataRow In CURR_DT_VWPM_PROFILE_ACTIVE.Rows
-                    If CInt(oProfileRow.Item("FILE_COUNT")) > 0 And (oProfileRow.Item("DISPLAY_MODE") = "Overview and Detail" Or oProfileRow.Item("DISPLAY_MODE") = "Detail") Then
+                    Dim oFileCount = CInt(oProfileRow.Item("FILE_COUNT"))
+                    Dim ODisplayMode = oProfileRow.Item("DISPLAY_MODE")
+                    If oFileCount > 0 And (ODisplayMode = "Overview and Detail" Or ODisplayMode = "Detail") Then
 
                         oCountItems += 1
                         Dim item1 As NavBarItem = NavBarControl1.Items.Add()
@@ -745,7 +741,7 @@ Public Class frmMain
                 Dim oSQL = foundRows(0)("SQL_VIEW")
 
                 oSQL = clsPatterns.ReplaceInternalValues(oSQL)
-                oSQL = clsPatterns.ReplaceUserValues(oSQL, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_LANGUAGE, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID, CURRENT_CLICKED_PROFILE_TITLE)
+                oSQL = clsPatterns.ReplaceUserValues(oSQL)
 
                 oSQL = oSQL.Replace("@USER_ID", USER_ID)
                 oSQL = oSQL.Replace("@USERNAME", USER_USERNAME)
@@ -897,7 +893,7 @@ Public Class frmMain
             Try
                 GridView_Docs.Columns.Item("CONV_YN").Visible = False
             Catch ex As Exception
-                LOGGER.Warn("Create_Basic_View - Check wether Column CONV_YN is part of select/view")
+                LOGGER.Info("Create_Basic_View - Check wether Column CONV_YN is part of select/view")
             End Try
             If IDB_ACTIVE = True Then
                 Try
@@ -905,7 +901,7 @@ Public Class frmMain
                     GridView_Docs.Columns.Item("CONVERSATION").MinWidth = 24
                     GridView_Docs.Columns.Item("CONVERSATION").Fixed = FixedStyle.Left
                 Catch ex As Exception
-                    LOGGER.Warn("Create_Basic_View2 - Column CONVERSATION obviously is not part of GridView_Docs - Trying to Rest Layout")
+                    LOGGER.Info("Create_Basic_View2 - Column CONVERSATION obviously is not part of GridView_Docs - Trying to Rest Layout")
                     ResetLayout()
                     Exit Sub
                 End Try
@@ -914,8 +910,10 @@ Public Class frmMain
 
             ' GridView_Docs.OptionsView.ShowIndicator = False
             Try
-                GridView_Docs.Columns("Last edited").DisplayFormat.FormatType = FormatType.DateTime
-                GridView_Docs.Columns("Last edited").DisplayFormat.FormatString = "dd.MM.yyyy HH:MM:ss"
+                Dim oReducedColName = LAST_EDITED_COLUMN.Replace("[", "")
+                oReducedColName = oReducedColName.Replace("]", "")
+                GridView_Docs.Columns(oReducedColName).DisplayFormat.FormatType = FormatType.DateTime
+                GridView_Docs.Columns(oReducedColName).DisplayFormat.FormatString = "dd.MM.yyyy HH:MM:ss"
             Catch ex As Exception
                 Try
                     GridView_Docs.Columns("Zuletzt bearbeitet").DisplayFormat.FormatType = FormatType.DateTime
@@ -1547,14 +1545,9 @@ Public Class frmMain
 
 
             If SOURCE_INIT = True Then
-
+                Dim oSQL = $"select * from TBPM_PROFILE_FINAL_INDEXING where PROFIL_ID = CURRENT_ProfilGUID"
                 CURRENT_ProfilGUID = oProfileId
-                If EDMIAppServerActive = True Then
-                    Dim oTableResult As TableResult = _Client.GetDatatableByName("TBPM_PROFILE_FINAL_INDEXING", $"PROFIL_ID = {CURRENT_ProfilGUID}")
-                    CURRENT_DT_FINAL_INDEXING = oTableResult.Table
-                Else
-                    CURRENT_DT_FINAL_INDEXING = ClassDatabase.Return_Datatable(String.Format("select * from TBPM_PROFILE_FINAL_INDEXING where PROFIL_ID = {0}", CURRENT_ProfilGUID), "tsmiMarkedFilesFinish_Click")
-                End If
+                CURRENT_DT_FINAL_INDEXING = DataASorDB.GetDatatable("DD_ECM", oSQL, "TBPM_PROFILE_FINAL_INDEXING", $"PROFIL_ID = {CURRENT_ProfilGUID}")
                 CURRENT_DT_PROFILE.Clear()
                 Dim oExpression = $"GUID = {CURRENT_ProfilGUID}"
                 CURRENT_DT_PROFILES.Select(oExpression).CopyToDataTable(CURRENT_DT_PROFILE, LoadOption.PreserveChanges)
@@ -1662,7 +1655,7 @@ Public Class frmMain
             End If
 
             oSQLOverview = clsPatterns.ReplaceInternalValues(oSQLOverview)
-            oSQLOverview = clsPatterns.ReplaceUserValues(oSQLOverview, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_LANGUAGE, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID, CURRENT_CLICKED_PROFILE_TITLE)
+            oSQLOverview = clsPatterns.ReplaceUserValues(oSQLOverview)
 
             oSQLOverview = oSQLOverview.Replace("@USER_ID", USER_ID)
             oSQLOverview = oSQLOverview.Replace("@USERNAME", USER_USERNAME)
@@ -1681,7 +1674,7 @@ Public Class frmMain
                 If oADDED = OVERVIEW_ADDED_WHEN And oChanged = OVERVIEW_CHANGED_WHEN And oCOUNT = OVERVIEW_COUNT Then
 
                     If ForceReload = False Then
-                        LOGGER.Info("No changes on OverviewHash - so exit Load_Grid_overview")
+                        LOGGER.Debug("No changes on OverviewHash - so exit Load_Grid_overview")
                         Exit Function
                     End If
 
@@ -1868,7 +1861,7 @@ Public Class frmMain
                     Try
                         GridView_Docs.Columns.Item("CONV_YN").Visible = False
                     Catch ex As Exception
-                        LOGGER.Warn("LoadGridOverview - Check wether Column CONV_YN is part of select/view")
+                        LOGGER.Info("LoadGridOverview - Check wether Column CONV_YN is part of select/view")
                     End Try
                     If IDB_ACTIVE = True Then
                         Try
@@ -1876,7 +1869,7 @@ Public Class frmMain
                             GridView_Docs.Columns.Item("CONVERSATION").MinWidth = 24
                             GridView_Docs.Columns.Item("CONVERSATION").Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Left
                         Catch ex As Exception
-                            LOGGER.Warn("LoadGridOverview - Column CONVERSATION obviously not part of GridView_Docs")
+                            LOGGER.Info("LoadGridOverview - Column CONVERSATION obviously not part of GridView_Docs")
                         End Try
                     End If
 
@@ -1884,8 +1877,10 @@ Public Class frmMain
                     'GridView_Docs.OptionsView.ShowIndicator = False
                     LOGGER.Debug(" GridView_Docs.Columns loaded...")
                     Try
-                        GridView_Docs.Columns("Last edited").DisplayFormat.FormatType = FormatType.DateTime
-                        GridView_Docs.Columns("Last edited").DisplayFormat.FormatString = "dd.MM.yyyy HH:MM:ss"
+                        Dim oReducedColName = LAST_EDITED_COLUMN.Replace("[", "")
+                        oReducedColName = oReducedColName.Replace("]", "")
+                        GridView_Docs.Columns(oReducedColName).DisplayFormat.FormatType = FormatType.DateTime
+                        GridView_Docs.Columns(oReducedColName).DisplayFormat.FormatString = "dd.MM.yyyy HH:MM:ss"
                     Catch ex As Exception
                         Try
                             GridView_Docs.Columns("Zuletzt bearbeitet").DisplayFormat.FormatType = FormatType.DateTime
@@ -1940,20 +1935,20 @@ Public Class frmMain
 
     Private Async Sub TabellenlayoutZurücksetzenToolStripMenuItem_Click_1(sender As Object, e As EventArgs) Handles TabellenlayoutZurücksetzenToolStripMenuItem.Click
         Await Reset_GridLayout(False)
-
+        Await Decide_Load(False, True)
+        If GridControl_Docs.Visible = True And FormOpenClose = False Then RefreshHelper.LoadViewInfo()
     End Sub
     Async Function Reset_GridLayout(FormLoad As Boolean) As Tasks.Task
         If GridControl_Docs.Visible = True And FormOpenClose = False Then RefreshHelper.SaveViewInfo()
         InResetlayout = True
         ' Layout zurücksetzen
         ResetLayout()
-        SaveGridLayout()
+        'SaveGridLayout()
 
         ' Ansicht neu laden
         LoadNavBar()
         Await Decide_Load(FormLoad)
         InResetlayout = False
-        RefreshHelper.LoadViewInfo()
     End Function
 
     Private Sub GridView_Docs_DoubleClick(sender As Object, e As EventArgs) Handles GridView_Docs.DoubleClick
@@ -2070,36 +2065,20 @@ Public Class frmMain
         If GridControl_Docs.Visible = True And FormOpenClose = False Then RefreshHelper.SaveViewInfo()
     End Sub
     Sub LoadCURRENT_DT_PROFILES()
-        If EDMIAppServerActive = True Then
-            Dim oTableResult As TableResult = _Client.GetDatatableByName("TBPM_PROFILE")
-            CURRENT_DT_PROFILES = oTableResult.Table
-        Else
-            CURRENT_DT_PROFILES = ClassDatabase.Return_Datatable("select * from TBPM_PROFILE where ACTIVE = 1", "LoadCURRENT_DT_PROFILES")
-        End If
+        Dim oSQL = "select * from TBPM_PROFILE where ACTIVE = 1"
+        CURRENT_DT_PROFILES = DataASorDB.GetDatatable("DD_ECM", oSQL, "TBPM_PROFILE", "")
 
     End Sub
     Sub LoadVWPM_CONTROL_INDEX()
         Dim oSQL = $"SELECT * FROM VWPM_CONTROL_INDEX ORDER BY PROFIL_ID,Y_LOC, X_LOC"
-        If EDMIAppServerActive = True Then
-            Dim oTableResult As TableResult = _Client.GetDatatableByName("VWPM_CONTROL_INDEX")
-            DTVWCONTROLS_INDEX = oTableResult.Table
-        Else
-            DTVWCONTROLS_INDEX = ClassDatabase.Return_Datatable(oSQL, "LoadVWPM_CONTROL_INDEX")
-        End If
-
+        DTVWCONTROLS_INDEX = DataASorDB.GetDatatable("DD_ECM", oSQL, "VWPM_CONTROL_INDEX", "")
     End Sub
     Sub GetBaseData(pMode As String)
         Dim oStopWatch As New RefreshHelper.SW("GetBaseData")
         Try
             Dim oSQL = String.Format("SELECT * FROM [dbo].[FNDD_CHECK_USER_MODULE] ('{0}','PM',{1})", USER_USERNAME, CLIENT_SELECTED)
             Dim DT_CHECKUSER_MODULE As DataTable
-            If EDMIAppServerActive = True Then
-                Dim oTableResult As TableResult = _Client.GetDatatableByName("TBDD_USER_MODULE", $"USERNAME = '{USER_USERNAME.ToLower}' AND MODULE_SHORT = 'PM'")
-                DT_CHECKUSER_MODULE = oTableResult.Table
-            Else
-                DT_CHECKUSER_MODULE = ClassDatabase.Return_Datatable(oSQL, "GetBaseData1")
-            End If
-
+            DT_CHECKUSER_MODULE = DataASorDB.GetDatatable("DD_ECM", oSQL, "TBDD_USER_MODULE", $"USERNAME = '{USER_USERNAME.ToLower}' AND MODULE_SHORT = 'PM'")
 
 
             If pMode = "bwBasicData" Then bwBasicData.ReportProgress(10)
@@ -2114,24 +2093,14 @@ Public Class frmMain
                 CURRENT_DT_PROFILE = CURRENT_DT_PROFILES.Clone()
             End If
             If pMode = "bwBasicData" Then bwBasicData.ReportProgress(40)
-
-            If EDMIAppServerActive = True Then
-                Dim oTableResult As TableResult = _Client.GetDatatableByName("TBPM_PROFILE_SEARCH", "TYPE = 'DOC'", "PROFILE_ID,TAB_INDEX")
-                BASEDATA_DT_PROFILES_SEARCHES_DOC = oTableResult.Table
-            Else
-                BASEDATA_DT_PROFILES_SEARCHES_DOC = ClassDatabase.Return_Datatable("select * from TBPM_PROFILE_SEARCH where TYPE = 'DOC' AND ACTIVE = 1 ORDER BY PROFILE_ID,TAB_INDEX", "InitBasics5")
-            End If
-
+            oSQL = "select * from TBPM_PROFILE_SEARCH where TYPE = 'DOC' AND ACTIVE = 1 ORDER BY PROFILE_ID,TAB_INDEX"
+            BASEDATA_DT_PROFILES_SEARCHES_DOC = DataASorDB.GetDatatable("DD_ECM", oSQL, "TBPM_PROFILE_SEARCH", "TYPE = 'DOC'", "PROFILE_ID,TAB_INDEX")
             If pMode = "Load" Then
                 BASEDATA_DT_PROFILE_SEARCHES_DOC = BASEDATA_DT_PROFILES_SEARCHES_DOC.Clone()
             End If
             If pMode = "bwBasicData" Then bwBasicData.ReportProgress(50)
-            If EDMIAppServerActive = True Then
-                Dim oTableResult As TableResult = _Client.GetDatatableByName("TBPM_PROFILE_SEARCH", "TYPE = 'SQL'", "PROFILE_ID,TAB_INDEX")
-                BASEDATA_DT_PROFILES_SEARCHES_SQL = oTableResult.Table
-            Else
-                BASEDATA_DT_PROFILES_SEARCHES_SQL = ClassDatabase.Return_Datatable("select * from TBPM_PROFILE_SEARCH where TYPE = 'SQL' AND ACTIVE = 1 ORDER BY PROFILE_ID,TAB_INDEX", "InitBasics5")
-            End If
+            oSQL = "select * from TBPM_PROFILE_SEARCH where TYPE = 'DOC' AND ACTIVE = 1 ORDER BY PROFILE_ID,TAB_INDEX"
+            BASEDATA_DT_PROFILES_SEARCHES_SQL = DataASorDB.GetDatatable("DD_ECM", oSQL, "TBPM_PROFILE_SEARCH", "TYPE = 'SQL'", "PROFILE_ID,TAB_INDEX")
             If pMode = "Load" Then
                 BASEDATA_DT_PROFILE_SEARCHES_SQL = BASEDATA_DT_PROFILES_SEARCHES_SQL.Clone()
             End If
@@ -2142,13 +2111,7 @@ Public Class frmMain
                 DTVWCONTROL_INDEX = DTVWCONTROLS_INDEX.Clone()
             End If
             oSQL = $"SELECT * FROM TBPM_PROFILE_CONTROLS WHERE LEN(ISNULL(SQL_UEBERPRUEFUNG,'')) > 0 AND CTRL_TYPE <> 'BUTTON'"
-            If EDMIAppServerActive = True Then
-                Dim oTableResult As TableResult = _Client.GetDatatableByName("DTCONTROLS_WITH_SQL")
-                DTCONTROLS_WITH_SQL = oTableResult.Table
-            Else
-                DTCONTROLS_WITH_SQL = ClassDatabase.Return_Datatable(oSQL, "GetBaseData5")
-            End If
-
+            DTCONTROLS_WITH_SQL = DataASorDB.GetDatatable("DD_ECM", oSQL, "DTCONTROLS_WITH_SQL", "", "")
 
 
             If pMode = "bwBasicData" Then bwBasicData.ReportProgress(85)