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

MS 2.5.0.3 VKT ADD Items und GDPicture

Browse Source
This commit is contained in:
Developer01
2025-01-27 16:56:51 +01:00
parent 911c7f04ce
commit d3ef49ed83
26 changed files with 1046 additions and 728 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
app/TaskFlow/ClassInit.vb
View File

@@ -347,11 +347,7 @@ Public Class ClassInit
If DT_CHECKUSER_MODULE.Rows.Count = 1 Then
LOGGER.Info($"Got a CheckUserDefintion for User [{USER_USERNAME}]")
If DT_CHECKUSER_MODULE.Rows(0).Item("USER_ID") <> 0 Then
USER_EXISTS = True
Else
USER_EXISTS = False
End If
USER_ID = DT_CHECKUSER_MODULE.Rows(0).Item("USER_ID")
USER_SURNAME = IIf(IsDBNull(DT_CHECKUSER_MODULE.Rows(0).Item("USER_SURNAME")), "", DT_CHECKUSER_MODULE.Rows(0).Item("USER_SURNAME"))
@@ -363,6 +359,13 @@ Public Class ClassInit
USER_IN_MODULE = DT_CHECKUSER_MODULE.Rows(0).Item("MODULE_ACCESS")
If USER_IN_MODULE = True Then
USER_EXISTS = True
Else
USER_EXISTS = False
End If
USER_IS_ADMIN = DT_CHECKUSER_MODULE.Rows(0).Item("IS_ADMIN")
User.IsAdmin = USER_IS_ADMIN
@@ -480,15 +483,13 @@ Public Class ClassInit
oTBDD_3RD_PARTY_MODULES = DatabaseFallback.GetDatatable("TBDD_3RD_PARTY_MODULES", New GetDatatableOptions(oSql, DatabaseType.ECM))
For Each oROW As DataRow In oTBDD_3RD_PARTY_MODULES.Rows
If oROW.Item("NAME") = "GDPICTURE" Then
If oROW.Item("NAME") = "GDPICTURE" And oROW.Item("VERSION") = My.Settings.GDPICTURE_VERSION Then
GDPICTURE_LICENSE = oROW.Item("LICENSE")
End If
If oROW.Item("NAME") = "GDPICTURE_TASKFLOW" Then
GDPICTURE_LICENSE = oROW.Item("LICENSE")
LOGGER.Debug("GDPICTURE_TASKFLOW License used!")
End If
Next
If GDPICTURE_LICENSE = String.Empty Then
LOGGER.Warn($"Keine GDPICTURE-Lizenz gefunden. Version Konfiguration: {My.Settings.GDPICTURE_VERSION} - Prüfe TBDD_3RD_PARTY_MODULES")
End If
oStep = "TBDD_SQL_COMMANDS"
oSql = "Select * FROM TBDD_SQL_COMMANDS"