AppStd/TaskFlow
8
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

2.1.6.3 Final - ApplServer, frmAdminsitrationBugs etc

Browse Source
This commit is contained in:
SchreiberM
2021-01-20 14:53:37 +01:00
parent 0d519d470f
commit 16a2c21de2
22 changed files with 1818 additions and 788 deletions
Download Patch File Download Diff File Expand all files Collapse all files

116
app/DD_PM_WINDREAM/ClassInit.vb
View File

@@ -9,7 +9,7 @@ Imports DigitalData.Modules.EDMI.API.EDMIServiceReference
Public Class ClassInit
Public _lizenzManager As ClassLicenseManager
Private DataASorDB As ClassDataASorDB
Public Sub New()
End Sub
@@ -43,6 +43,7 @@ Public Class ClassInit
<STAThread()>
Public Sub InitUserConfig()
Try
DataASorDB = New ClassDataASorDB
Dim oUserAppDataPath As String = Application.UserAppDataPath
Dim oLegacyAppDataPath As String = Application.UserAppDataPath
Dim oCommonAppDataPath = Application.CommonAppDataPath
@@ -213,6 +214,7 @@ Public Class ClassInit
<STAThread()>
Public Sub InitUserLogin(Optional pUSRNAME As String = "")
Dim oStopWatch As New RefreshHelper.SW("InitUserLogin")
Dim oSQL As String
Try
If pUSRNAME <> String.Empty Then
USER_USERNAME = pUSRNAME
@@ -222,15 +224,9 @@ Public Class ClassInit
Try
Dim oSQLSW As New RefreshHelper.SW("VWDD_USER_CLIENT")
Dim oSQL = $"SELECT * FROM VWDD_USER_CLIENT WHERE UPPER(USERNAME) = UPPER('{USER_USERNAME}')"
If EDMIAppServerActive = True Then
Dim oTableResult As TableResult = _Client.GetDatatableByName("VWDD_USER_CLIENT", $"USERNAME like '{USER_USERNAME}'")
DT_CLIENT_USER = oTableResult.Table
Else
DT_CLIENT_USER = ClassDatabase.Return_Datatable(oSQL, "InitUserLogin1")
End If
oSQL = $"SELECT * FROM VWDD_USER_CLIENT WHERE UPPER(USERNAME) = UPPER('{USER_USERNAME}')"
DT_CLIENT_USER = DataASorDB.GetDatatable("DD_ECM", oSQL, "VWDD_USER_CLIENT", $"USERNAME like '{USER_USERNAME}'")
oSQLSW.Done()
If DT_CLIENT_USER.Rows.Count > 1 Then
@@ -240,8 +236,6 @@ Public Class ClassInit
Else
ERROR_STATE = "NO CLIENT"
Dim oDT As DataTable = ClassAllgemeineFunktionen.GUI_LANGUAGE_INFO("No Client relation")
'Related to a client
' Throw New Exception("You are not configured in the Useradministration." & vbNewLine & "Please contact the system administrator!")
MsgBox(oDT.Rows(0).Item("STRING1") & vbNewLine & oDT.Rows(0).Item("STRING2") & vbNewLine & vbNewLine & oSQL, MsgBoxStyle.Exclamation)
Exit Sub
End If
@@ -253,14 +247,9 @@ Public Class ClassInit
LOGGER.Debug("Username: " & USER_USERNAME)
Dim oFnct As New RefreshHelper.SW("FNDD_CHECK_USER_MODULE")
Dim sql = String.Format("SELECT * FROM [dbo].[FNDD_CHECK_USER_MODULE] ('{0}','PM',{1})", USER_USERNAME, CLIENT_SELECTED)
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(sql, "InitUserLogin2")
End If
DT_CHECKUSER_MODULE = DataASorDB.GetDatatable("DD_ECM", oSQL, "TBDD_USER_MODULE", $"USERNAME = '{USER_USERNAME.ToLower}' AND MODULE_SHORT = 'PM'")
oFnct.Done()
If DT_CHECKUSER_MODULE.Rows.Count = 0 Then
LOGGER.Info("DT_CHECKUSER_MODULE.Rows.Count = 0", True)
@@ -350,41 +339,20 @@ Public Class ClassInit
oStopWatch.Done()
End Sub
<STAThread()>
Public Shared Sub InitBasics()
Public Sub InitBasics()
Try
Dim oStopWatch As New RefreshHelper.SW("InitBasics")
Dim oSql = String.Format("select * from TBPM_KONFIGURATION WHERE GUID = 1")
If EDMIAppServerActive = True Then
Dim oTableResult As TableResult = _Client.GetDatatableByName("TBPM_KONFIGURATION", $"GUID = 1")
BASEDATA_DT_CONFIG = oTableResult.Table
Else
BASEDATA_DT_CONFIG = ClassDatabase.Return_Datatable(oSql, "InitBasics1")
End If
BASEDATA_DT_CONFIG = DataASorDB.GetDatatable("DD_ECM", oSql, "TBPM_KONFIGURATION", $"GUID = 1")
Settings_LoadBasicConfig()
oSql = "select * from TBDD_CONNECTION WHERE AKTIV = 1"
If EDMIAppServerActive = True Then
Dim oTableResult As TableResult = _Client.GetDatatableByName("TBDD_CONNECTION")
BASEDATA_DT_TBDD_CONNECTION = oTableResult.Table
Else
BASEDATA_DT_TBDD_CONNECTION = ClassDatabase.Return_Datatable(oSql, "InitBasics2")
End If
BASEDATA_DT_TBDD_CONNECTION = DataASorDB.GetDatatable("DD_ECM", oSql, "TBDD_CONNECTION", "")
oSql = "Select * FROM TBDD_3RD_PARTY_MODULES WHERE ACTIVE = 1"
Dim oTBDD_3RD_PARTY_MODULES As DataTable
If EDMIAppServerActive = True Then
Dim oTableResult As TableResult = _Client.GetDatatableByName("TBDD_3RD_PARTY_MODULES")
oTBDD_3RD_PARTY_MODULES = oTableResult.Table
Else
oTBDD_3RD_PARTY_MODULES = ClassDatabase.Return_Datatable(oSql, "InitBasics3")
End If
oTBDD_3RD_PARTY_MODULES = DataASorDB.GetDatatable("DD_ECM", oSql, "TBDD_3RD_PARTY_MODULES", "")
For Each oROW As DataRow In oTBDD_3RD_PARTY_MODULES.Rows
If oROW.Item("NAME") = "GDPICTURE" Then
@@ -392,37 +360,15 @@ Public Class ClassInit
End If
Next
oSql = "SELECT * FROM TBDD_GUI_LANGUAGE_PHRASE WHERE MODULE IN ('PM','All Modules')"
If EDMIAppServerActive = True Then
Dim oTableResult As TableResult = _Client.GetDatatableByName("TBDD_GUI_LANGUAGE_PHRASE")
BASEDATA_DT_GUI_LANGUAGE_PHRASES = oTableResult.Table
Else
BASEDATA_DT_GUI_LANGUAGE_PHRASES = ClassDatabase.Return_Datatable(oSql, "InitBasics4")
End If
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
BASEDATA_DT_GUI_LANGUAGE_PHRASES = DataASorDB.GetDatatable("DD_ECM", oSql, "TBDD_GUI_LANGUAGE_PHRASE", "")
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")
BASEDATA_DT_PROFILE_SEARCHES_DOC = BASEDATA_DT_PROFILES_SEARCHES_DOC.Clone()
If EDMIAppServerActive = True Then
Dim oTableResult As TableResult = _Client.GetDatatableByName("TBPM_MAIN_VIEW_GROUPS")
BASEDATA_DTGRID_GROUPS = oTableResult.Table
Else
BASEDATA_DTGRID_GROUPS = ClassDatabase.Return_Datatable($"SELECT * FROM TBPM_MAIN_VIEW_GROUPS WHERE ACTIVE = 1", "InitBasics6")
End If
If EDMIAppServerActive = True Then
Dim oTableResult As TableResult = _Client.GetDatatableByName("TBPM_CHART")
BASEDATA_DT_CHARTS = oTableResult.Table
Else
oSql = "SELECT * FROM TBPM_CHART"
BASEDATA_DT_CHARTS = ClassDatabase.Return_Datatable(oSql, "InitBasics7")
End If
oSql = "SELECT * FROM TBPM_MAIN_VIEW_GROUPS WHERE ACTIVE = 1"
BASEDATA_DTGRID_GROUPS = DataASorDB.GetDatatable("DD_ECM", oSql, "TBPM_MAIN_VIEW_GROUPS", "")
BASEDATA_DT_CHARTS = DataASorDB.GetDatatable("DD_ECM", oSql, "TBPM_CHART", "")
oStopWatch.Done()
Catch ex As Exception
LOGGER.Error(ex)
@@ -431,18 +377,11 @@ Public Class ClassInit
End Try
End Sub
<STAThread()>
Public Shared Sub InitBasics2()
Public Sub InitBasics2()
Try
Dim oStopWatch As New RefreshHelper.SW("InitBasics2")
Dim oSql = String.Format("SELECT * FROM VWPM_PROFILE_USER WHERE USER_ID = {0}", USER_ID)
If EDMIAppServerActive = True Then
Dim oTableResult As TableResult = _Client.GetDatatableByName("VWPM_PROFILE_USER", $"USER_ID = {USER_ID}")
BASEDATA_DT_VW_PROFILE_USER = oTableResult.Table
Else
BASEDATA_DT_VW_PROFILE_USER = ClassDatabase.Return_Datatable(oSql, "InitBasics2_1")
End If
BASEDATA_DT_VW_PROFILE_USER = DataASorDB.GetDatatable("DD_ECM", oSql, "VWPM_PROFILE_USER", $"USER_ID = {USER_ID}")
If BASEDATA_DT_VW_PROFILE_USER.Rows.Count = 0 Then
LOGGER.Warn($"no profiles for user: '{USER_USERNAME}' configured - Check SQL [{oSql}]!", False)
@@ -457,20 +396,11 @@ Public Class ClassInit
End Try
End Sub
<STAThread()>
Private Shared Function Settings_LoadBasicConfig()
Private Function Settings_LoadBasicConfig()
Try
Dim sql As String = "select * from tbdd_Modules where SHORT_NAME = 'PM'"
Dim oSql As String = "select * from tbdd_Modules where SHORT_NAME = 'PM'"
Dim oDTtbdd_Modules As DataTable
If EDMIAppServerActive = True Then
Dim oTableResult As TableResult = _Client.GetDatatableByName("tbdd_Modules", $" SHORT_NAME = 'PM'")
oDTtbdd_Modules = oTableResult.Table
If IsNothing(oDTtbdd_Modules) Then
oDTtbdd_Modules = ClassDatabase.Return_Datatable(sql, "Settings_LoadBasicConfig")
End If
Else
oDTtbdd_Modules = ClassDatabase.Return_Datatable(sql, "Settings_LoadBasicConfig")
End If
oDTtbdd_Modules = DataASorDB.GetDatatable("DD_ECM", oSql, "tbdd_Modules", $" SHORT_NAME = 'PM'")
If oDTtbdd_Modules.Rows.Count = 1 Then
Try
VERSION_DELIMITER = oDTtbdd_Modules.Rows(0).Item("VERSION_DELIMITER")