CONFIG.UserConfigPath

This commit is contained in:
SchreiberM 2020-12-22 14:33:43 +01:00
parent e326a7b660
commit 650ebd8848
8 changed files with 341 additions and 171 deletions

View File

@ -5,6 +5,7 @@ Imports DigitalData.Modules.Logging
Imports DigitalData.Modules.Config
Imports System.Threading
Imports DigitalData.Modules.EDMI.API
Imports DigitalData.Modules.EDMI.API.EDMIServiceReference
Public Class ClassInit
Public _lizenzManager As ClassLicenseManager
@ -100,24 +101,15 @@ Public Class ClassInit
If Not IsNothing(_Client) Then
If _Client.Connect() Then
EDMIAppServerActive = True
LOGGER.Info($"EDMIAppServer [{oAppServer}] is active!")
End If
End If
Catch ex As Exception
LOGGER.Warn($"Could not initialize the AppServer: {ex.Message}")
End Try
End If
'VIEWER_UNIVERSAL = CONFIG.Config.UniversalViewerPath
'VIEWER_XCHANGE = CONFIG.Config.XChangeViewerPath
'VIEWER_SUMATRA = CONFIG.Config.SumatraViewerPath
'VIEWER_ZOOM_LEVEL = CONFIG.Config.PDFViewerZoomLevel
'VIEWER_PDF = CONFIG.Config.PDFViewer
'VIEWER_ALL = CONFIG.Config.DefaultViewer
INDEX_DMS_ERSTELLT = CONFIG.Config.IndexDmsErstellt
INDEX_DMS_ERSTELLT_ZEIT = CONFIG.Config.IndexDmsErstelltZeit
@ -216,7 +208,7 @@ Public Class ClassInit
LOGGER.Info("Unexpected error in Refresh license: " & ex.Message, True)
MsgBox(ex.Message, MsgBoxStyle.Exclamation, "Fehler bei Licensemanager:")
End Try
oStopWatch.done
oStopWatch.Done()
End Sub
<STAThread()>
Public Sub InitUserLogin(Optional pUSRNAME As String = "")
@ -231,7 +223,14 @@ 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}')"
DT_CLIENT_USER = ClassDatabase.Return_Datatable(oSQL, "InitUserLogin1")
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
oSQLSW.Done()
If DT_CLIENT_USER.Rows.Count > 1 Then
@ -255,7 +254,13 @@ 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)
Dim DT_CHECKUSER_MODULE As DataTable = ClassDatabase.Return_Datatable(sql, "InitUserLogin2")
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
oFnct.Done()
If DT_CHECKUSER_MODULE.Rows.Count = 0 Then
LOGGER.Info("DT_CHECKUSER_MODULE.Rows.Count = 0", True)
@ -349,28 +354,75 @@ Public Class ClassInit
Try
Dim oStopWatch As New RefreshHelper.SW("InitBasics")
Dim oSql = String.Format("select * from TBPM_KONFIGURATION WHERE GUID = 1")
BASEDATA_DT_CONFIG = ClassDatabase.Return_Datatable(oSql, "InitBasics1")
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
Settings_LoadBasicConfig()
oSql = "select * from TBDD_CONNECTION WHERE AKTIV = 1"
BASEDATA_DT_TBDD_CONNECTION = ClassDatabase.Return_Datatable(oSql, "InitBasics2")
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
oSql = "Select * FROM TBDD_3RD_PARTY_MODULES WHERE ACTIVE = 1"
Dim oDT As DataTable = ClassDatabase.Return_Datatable(oSql, "InitBasics3")
For Each oROW As DataRow In oDT.Rows
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
For Each oROW As DataRow In oTBDD_3RD_PARTY_MODULES.Rows
If oROW.Item("NAME") = "GDPICTURE" Then
GDPICTURE_LICENSE = oROW.Item("LICENSE")
End If
Next
oSql = "SELECT * FROM TBDD_GUI_LANGUAGE_PHRASE WHERE MODULE IN ('PM','All Modules')"
BASEDATA_DT_GUI_LANGUAGE_PHRASES = ClassDatabase.Return_Datatable(oSql, "InitBasics4")
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_PROFILES_SEARCHES_DOC = ClassDatabase.Return_Datatable("select * from TBPM_PROFILE_SEARCH where TYPE = 'DOC' AND ACTIVE = 1 ORDER BY PROFILE_ID,TAB_INDEX", "InitBasics5")
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
BASEDATA_DTGRID_GROUPS = ClassDatabase.Return_Datatable($"SELECT * FROM TBPM_MAIN_VIEW_GROUPS WHERE ACTIVE = 1", "InitBasics6")
oSql = "SELECT * FROM TBPM_CHART"
BASEDATA_DT_CHARTS = ClassDatabase.Return_Datatable(oSql, "InitBasics7")
oStopWatch.Done()
Catch ex As Exception
LOGGER.Error(ex)
@ -383,7 +435,15 @@ Public Class ClassInit
Try
Dim oStopWatch As New RefreshHelper.SW("InitBasics2")
Dim oSql = String.Format("SELECT * FROM VWPM_PROFILE_USER WHERE USER_ID = {0}", USER_ID)
BASEDATA_DT_VW_PROFILE_USER = ClassDatabase.Return_Datatable(oSql, "InitBasics2_1")
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
If BASEDATA_DT_VW_PROFILE_USER.Rows.Count = 0 Then
LOGGER.Warn($"no profiles for user: '{USER_USERNAME}' configured - Check SQL [{oSql}]!", False)
End If
@ -400,13 +460,23 @@ Public Class ClassInit
Private Shared Function Settings_LoadBasicConfig()
Try
Dim sql As String = "select * from tbdd_Modules where SHORT_NAME = 'PM'"
Dim DT As DataTable = ClassDatabase.Return_Datatable(sql, "Settings_LoadBasicConfig")
If DT.Rows.Count = 1 Then
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
If oDTtbdd_Modules.Rows.Count = 1 Then
Try
VERSION_DELIMITER = DT.Rows(0).Item("VERSION_DELIMITER")
FILE_DELIMITER = DT.Rows(0).Item("FILE_DELIMITER")
LICENSE_VALID = DT.Rows(0).Item("LICENSE_VALID")
WMSESSION_STARTSTOP_STARTUP = DT.Rows(0).Item("WMSESSION_STARTSTOP_STARTUP")
VERSION_DELIMITER = oDTtbdd_Modules.Rows(0).Item("VERSION_DELIMITER")
FILE_DELIMITER = oDTtbdd_Modules.Rows(0).Item("FILE_DELIMITER")
LICENSE_VALID = oDTtbdd_Modules.Rows(0).Item("LICENSE_VALID")
WMSESSION_STARTSTOP_STARTUP = oDTtbdd_Modules.Rows(0).Item("WMSESSION_STARTSTOP_STARTUP")
Catch ex As Exception
LOGGER.Error(ex)
LOGGER.Info("Unexpected Error in Settings_LoadBasicConfig: " & ex.Message, True)

View File

@ -23,12 +23,12 @@ Public Class frmAdmin2
oSave = True
Try
Dim oFilename As String = String.Format("DevExLayoutAdmin2_Email.xml")
Dim oXml As String = System.IO.Path.Combine(Application.UserAppDataPath(), oFilename)
Dim oXml As String = System.IO.Path.Combine(CONFIG.UserConfigPath, oFilename)
If File.Exists(oXml) Then
DataLayoutControl1.RestoreLayoutFromXml(oXml)
End If
oFilename = String.Format("DevExLayoutAdmin2_GUIPhrases.xml")
oXml = System.IO.Path.Combine(Application.UserAppDataPath(), oFilename)
oXml = System.IO.Path.Combine(CONFIG.UserConfigPath, oFilename)
If File.Exists(oXml) Then
DataLayoutControl2.RestoreLayoutFromXml(oXml)
End If
@ -263,12 +263,12 @@ Public Class frmAdmin2
End If
Try
Dim Filename As String = String.Format("DevExLayoutAdmin2_Email.xml")
Dim xml As String = System.IO.Path.Combine(Application.UserAppDataPath(), Filename)
Dim xml As String = System.IO.Path.Combine(CONFIG.UserConfigPath, Filename)
'If File.Exists(xml) Then
DataLayoutControl1.SaveLayoutToXml(xml)
'End If
Filename = String.Format("DevExLayoutAdmin2_GUIPhrases.xml")
xml = System.IO.Path.Combine(Application.UserAppDataPath(), Filename)
xml = System.IO.Path.Combine(CONFIG.UserConfigPath, Filename)
DataLayoutControl2.SaveLayoutToXml(xml)
Catch ex As Exception
LOGGER.Error(ex)
@ -283,7 +283,7 @@ Public Class frmAdmin2
Private Sub BarButtonItem8_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem8.ItemClick
Try
Dim oFilename = String.Format("DevExLayoutAdmin2_GUIPhrases.xml")
Dim oXml = System.IO.Path.Combine(Application.UserAppDataPath(), oFilename)
Dim oXml = System.IO.Path.Combine(CONFIG.UserConfigPath, oFilename)
File.Delete(oXml)
MsgBox("Form will now close to reload all controls!", MsgBoxStyle.Information)
Me.Close()
@ -298,7 +298,7 @@ Public Class frmAdmin2
Private Sub BarButtonItem9_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem9.ItemClick
Try
Dim oFilename = String.Format("DevExLayoutAdmin2_Email.xml")
Dim oXml = System.IO.Path.Combine(Application.UserAppDataPath(), oFilename)
Dim oXml = System.IO.Path.Combine(CONFIG.UserConfigPath, oFilename)
File.Delete(oXml)
MsgBox("Form will now close to reload all controls!", MsgBoxStyle.Information)
Me.Close()

View File

@ -176,7 +176,7 @@ Public Class frmKonfig
End Sub
Private Sub Button3_Click(sender As Object, e As EventArgs) Handles Button3.Click
Process.Start(Application.UserAppDataPath())
Process.Start(CONFIG.UserConfigPath)
End Sub
Private Sub btnopenlog_Click(sender As Object, e As EventArgs) Handles btnopenlog.Click
@ -213,7 +213,7 @@ Public Class frmKonfig
End Sub
Private Sub Button4_Click(sender As Object, e As EventArgs) Handles Button4.Click
Dim di As New IO.DirectoryInfo(Application.UserAppDataPath())
Dim di As New IO.DirectoryInfo(CONFIG.UserConfigPath)
Dim diar1 As IO.FileInfo() = di.GetFiles()
Dim dra As IO.FileInfo

View File

@ -16,6 +16,7 @@ Imports System.Drawing.Imaging
Imports DevExpress.XtraPrinting
Imports System.Runtime.Serialization
Imports System.Security.Cryptography
Imports DigitalData.Modules.EDMI.API.EDMIServiceReference
Public Class frmMain
Private UserLoggedin As Integer = 0
@ -170,50 +171,50 @@ Public Class frmMain
LOGGER.Debug("Initializing MainForm....")
If ERROR_STATE = "NO USER" Then
Dim oDT As DataTable = ClassAllgemeineFunktionen.GUI_LANGUAGE_INFO("No Userconfig")
Dim oDT As DataTable = ClassAllgemeineFunktionen.GUI_LANGUAGE_INFO("No Userconfig")
MsgBox(oDT.Rows(0).Item("STRING1") & vbNewLine & oDT.Rows(0).Item("STRING2"), MsgBoxStyle.Critical, "Exception")
Me.Close()
ElseIf USER_IN_MODULE = False Then
If USER_IS_ADMIN = False Then
Dim oDT As DataTable = ClassAllgemeineFunktionen.GUI_LANGUAGE_INFO("No Module Configuration")
MsgBox(oDT.Rows(0).Item("STRING1") & vbNewLine & oDT.Rows(0).Item("STRING2"), MsgBoxStyle.Critical, "Exception")
Me.Close()
ElseIf USER_IN_MODULE = False Then
End If
Else
LOGGER.Info("Username: " & USER_USERNAME, False)
'Wenn license abgelaufen und der User nicht admin ist!
If LICENSE_EXPIRED = True Then
If USER_IS_ADMIN = False Then
Dim oDT As DataTable = ClassAllgemeineFunktionen.GUI_LANGUAGE_INFO("No Module Configuration")
MsgBox(oDT.Rows(0).Item("STRING1") & vbNewLine & oDT.Rows(0).Item("STRING2"), MsgBoxStyle.Critical, "Exception")
MsgBox("License expired or invalid!" & vbNewLine & "Please contact the AdminTeam!", MsgBoxStyle.Critical, "Attention:")
Me.Close()
End If
Else
LOGGER.Info("Username: " & USER_USERNAME, False)
'Wenn license abgelaufen und der User nicht admin ist!
If LICENSE_EXPIRED = True Then
If USER_IS_ADMIN = False Then
MsgBox("License expired or invalid!" & vbNewLine & "Please contact the AdminTeam!", MsgBoxStyle.Critical, "Attention:")
Me.Close()
End If
End If
If USER_IS_ADMIN = True Then
RibbonPageGroup3.Visible = True
'Anzahl der eingeloggten User
bsiUserLoggedIn.Visibility = DevExpress.XtraBars.BarItemVisibility.Always
If USER_LANGUAGE <> "de-DE" Then
bsiUserLoggedIn.Caption = "License Count: " & USERCOUNT_LOGGED_IN
Else
bsiUserLoggedIn.Caption = "Lizenz-Zähler: " & USERCOUNT_LOGGED_IN
End If
If GHOSTMODE_ACTIVE = True Then
bbtnitmGhostMode.Visibility = DevExpress.XtraBars.BarItemVisibility.Always
Else
bbtnitmGhostMode.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
End If
End If
If USER_IS_ADMIN = True Then
RibbonPageGroup3.Visible = True
'Anzahl der eingeloggten User
bsiUserLoggedIn.Visibility = DevExpress.XtraBars.BarItemVisibility.Always
If USER_LANGUAGE <> "de-DE" Then
bsiUserLoggedIn.Caption = "License Count: " & USERCOUNT_LOGGED_IN
Else
bsiUserLoggedIn.Caption = "Lizenz-Zähler: " & USERCOUNT_LOGGED_IN
End If
If GHOSTMODE_ACTIVE = True Then
bbtnitmGhostMode.Visibility = DevExpress.XtraBars.BarItemVisibility.Always
Else
RibbonPageGroup3.Visible = False
bsiUserLoggedIn.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
bbtnitmGhostMode.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
End If
If MONITORING_ACTIVE = False Then
RibbonPageGroup2.Visible = False
Else
RibbonPageGroup2.Visible = True
End If
Else
RibbonPageGroup3.Visible = False
bsiUserLoggedIn.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
bbtnitmGhostMode.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
End If
If MONITORING_ACTIVE = False Then
RibbonPageGroup2.Visible = False
Else
RibbonPageGroup2.Visible = True
End If
Try
If SEARCH1 <> String.Empty Then
Dim oindex = SEARCH1.IndexOf("~")
@ -244,76 +245,86 @@ Public Class frmMain
End Try
End If
Catch ex As Exception
LOGGER.Error(ex)
MsgBox(ex.Message, MsgBoxStyle.Exclamation, "Error in User Check:")
End Try
bsiUser.Caption = USER_USERNAME
GetBaseData("Load")
Catch ex As Exception
LOGGER.Error(ex)
MsgBox(ex.Message, MsgBoxStyle.Exclamation, "Error in User Check:")
End Try
bsiUser.Caption = USER_USERNAME
GetBaseData("Load")
Try
If TimerRefresh.Enabled = False Then
TimerRefresh.Start()
End If
Timer5Mins.Start()
Catch ex As Exception
LOGGER.Error(ex)
MsgBox("Unexpected Error in LoadForm - Step 4: " & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Attention:")
End Try
LoadNavBar()
Try
If SHOW_CHARTS = True Then
If BASEDATA_DT_CHARTS.Rows.Count = 0 Then
bbtnitDashboardInv.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
Else
bbtnitDashboardInv.Visibility = DevExpress.XtraBars.BarItemVisibility.Always
End If
Else
bbtnitDashboardInv.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
End If
Catch ex As Exception
LOGGER.Warn($"Could not load Charts: {ex.Message}")
End Try
If MONITORING_ACTIVE = False Then
bbtniMonitor.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
Else
bbtniMonitor.Visibility = DevExpress.XtraBars.BarItemVisibility.Always
Try
If TimerRefresh.Enabled = False Then
TimerRefresh.Start()
End If
Check_Timer_Notification()
Check_Timer_Inactivity()
FormShown = True
Restore_Form_Position()
Timer5Mins.Start()
Catch ex As Exception
LOGGER.Error(ex)
MsgBox("Unexpected Error in LoadForm - Step 4: " & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Attention:")
End Try
LoadNavBar()
Try
If SHOW_CHARTS = True Then
If BASEDATA_DT_CHARTS.Rows.Count = 0 Then
bbtnitDashboardInv.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
Else
bbtnitDashboardInv.Visibility = DevExpress.XtraBars.BarItemVisibility.Always
End If
Else
bbtnitDashboardInv.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
End If
Catch ex As Exception
LOGGER.Warn($"Could not load Charts: {ex.Message}")
End Try
If MONITORING_ACTIVE = False Then
bbtniMonitor.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
Else
bbtniMonitor.Visibility = DevExpress.XtraBars.BarItemVisibility.Always
End If
Check_Timer_Notification()
Check_Timer_Inactivity()
FormShown = True
Restore_Form_Position()
If IDB_ACTIVE = False And ERROR_STATE = "" Then
Try
If Init_windream() = True Then
WINDREAM.Start_WMCC_andCo()
If Not IsNothing(WINDREAM.oSession) Then
If WINDREAM.oSession.aLoggedin = False Then
MsgBox("You could not be logged in to windream. Please check the log.", MsgBoxStyle.Critical)
End If
Else
MsgBox("Login on windream was not possible. Please check the log.", MsgBoxStyle.Critical)
If IDB_ACTIVE = False And ERROR_STATE = "" Then
Try
If Init_windream() = True Then
WINDREAM.Start_WMCC_andCo()
If Not IsNothing(WINDREAM.oSession) Then
If WINDREAM.oSession.aLoggedin = False Then
MsgBox("You could not be logged in to windream. Please check the log.", MsgBoxStyle.Critical)
End If
Else
MsgBox("Login on windream was not possible. Please check the log.", MsgBoxStyle.Critical)
End If
End If
Catch ex As Exception
LOGGER.Error(ex)
MsgBox("Unexpected Error in windream-login - Step 5: " & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Attention:")
End Try
Else
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
Catch ex As Exception
LOGGER.Error(ex)
MsgBox("Unexpected Error in windream-login - Step 5: " & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Attention:")
End Try
Else
SOURCE_INIT = Init_IDB()
If SOURCE_INIT = True Then
Dim oSQL = $"SELECT SQL_COMMAND FROM TBDD_SQL_COMMANDS WHERE TITLE = 'PM_IDB_DOC_DATA'"
Else
IDB_DOC_DATA_SQL = ClassDatabase.Execute_Scalar(oSQL, CONNECTION_STRING_READ, "frmMainload-PM_IDPDOCDATA")
LOGGER.Debug($"Got the IDB_DOC_DATA_SQL..{IDB_DOC_DATA_SQL}")
End If
bsiGeneralInfo.Caption = "IDB active"
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
@ -321,14 +332,14 @@ Public Class frmMain
End If
End If
If BASIC_CONF_VISIBLE = False Then
RibbonPageGroupBasicConf.Visible = False
Else
RibbonPageGroupBasicConf.Visible = True
End If
LOGGER.Debug("MainForm initialized!")
If BASIC_CONF_VISIBLE = False Then
RibbonPageGroupBasicConf.Visible = False
Else
RibbonPageGroupBasicConf.Visible = True
End If
LOGGER.Debug("MainForm initialized!")
FormOpenClose = False
FormOpenClose = False
End Sub
Sub Check_Timer_Notification()
Try
@ -442,7 +453,7 @@ Public Class frmMain
Private Function GetXML_OverviewLayoutName()
Dim Filename As String = String.Format("DevExpressGridViewOverview_UserLayout_{0}.xml", GRID_LOAD_TYPE)
Return System.IO.Path.Combine(Application.UserAppDataPath(), Filename)
Return System.IO.Path.Combine(CONFIG.UserConfigPath, Filename)
End Function
Private Sub SaveGridLayout()
@ -1508,7 +1519,12 @@ Public Class frmMain
If SOURCE_INIT = True Then
CURRENT_ProfilGUID = oProfileId
CURRENT_DT_FINAL_INDEXING = ClassDatabase.Return_Datatable(String.Format("select * from TBPM_PROFILE_FINAL_INDEXING where PROFIL_ID = {0}", CURRENT_ProfilGUID), "tsmiMarkedFilesFinish_Click")
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_PROFILE.Clear()
Dim oExpression = $"GUID = {CURRENT_ProfilGUID}"
CURRENT_DT_PROFILES.Select(oExpression).CopyToDataTable(CURRENT_DT_PROFILE, LoadOption.PreserveChanges)
@ -2024,17 +2040,38 @@ Public Class frmMain
If GridControl_Docs.Visible = True And FormOpenClose = False Then RefreshHelper.SaveViewInfo()
End Sub
Sub LoadCURRENT_DT_PROFILES()
CURRENT_DT_PROFILES = ClassDatabase.Return_Datatable("select * from TBPM_PROFILE where ACTIVE = 1", "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
End Sub
Sub LoadVWPM_CONTROL_INDEX()
Dim oSQL = $"SELECT * FROM VWPM_CONTROL_INDEX ORDER BY PROFIL_ID,Y_LOC, X_LOC"
DTVWCONTROLS_INDEX = ClassDatabase.Return_Datatable(oSQL, "LoadVWPM_CONTROL_INDEX")
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
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)
DT_CHECKUSER_MODULE = ClassDatabase.Return_Datatable(oSQL, "GetBaseData1")
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
If pMode = "bwBasicData" Then bwBasicData.ReportProgress(10)
ClassParamRefresh.Refresh_Params(DT_CHECKUSER_MODULE)
If pMode = "bwBasicData" Then bwBasicData.ReportProgress(20)
@ -2047,12 +2084,24 @@ Public Class frmMain
CURRENT_DT_PROFILE = CURRENT_DT_PROFILES.Clone()
End If
If pMode = "bwBasicData" Then bwBasicData.ReportProgress(40)
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", "GetBaseData3")
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
If pMode = "Load" Then
BASEDATA_DT_PROFILE_SEARCHES_DOC = BASEDATA_DT_PROFILES_SEARCHES_DOC.Clone()
End If
If pMode = "bwBasicData" Then bwBasicData.ReportProgress(50)
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", "GetBaseData4")
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
If pMode = "Load" Then
BASEDATA_DT_PROFILE_SEARCHES_SQL = BASEDATA_DT_PROFILES_SEARCHES_SQL.Clone()
End If
@ -2063,7 +2112,15 @@ 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'"
DTCONTROLS_WITH_SQL = ClassDatabase.Return_Datatable(oSQL, "GetBaseData5")
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
If pMode = "bwBasicData" Then bwBasicData.ReportProgress(85)
If pMode = "bwBasicData" Then bwBasicData.ReportProgress(100)
Catch ex As Exception

View File

@ -22,6 +22,7 @@ Public Class frmMonitor
End Sub
Sub Load_Detail()
If FormShown = False Then Exit Sub
Try
Dim oDocID
Try
@ -223,7 +224,7 @@ Public Class frmMonitor
Sub LoadGrid1Layout()
Try
Dim Filename As String = String.Format("DevExpressGridViewMonitor_UserLayout_Grid1.xml")
Dim xml As String = System.IO.Path.Combine(Application.UserAppDataPath(), Filename)
Dim xml As String = System.IO.Path.Combine(CONFIG.UserConfigPath, Filename)
If File.Exists(xml) Then
GridView1.RestoreLayoutFromXml(xml, OptionsLayoutBase.FullLayout)
End If
@ -236,7 +237,7 @@ Public Class frmMonitor
Sub LoadGrid2Layout()
Try
Dim Filename As String = String.Format("DevExpressGridViewMonitor_UserLayout_Grid2.xml")
Dim xml As String = System.IO.Path.Combine(Application.UserAppDataPath(), Filename)
Dim xml As String = System.IO.Path.Combine(CONFIG.UserConfigPath, Filename)
If File.Exists(xml) Then
GridView2.RestoreLayoutFromXml(xml, OptionsLayoutBase.FullLayout)
End If
@ -249,7 +250,7 @@ Public Class frmMonitor
Sub LoadGrid3Layout()
Try
Dim Filename As String = String.Format("DevExpressGridViewMonitor_UserLayout_Grid3.xml")
Dim xml As String = System.IO.Path.Combine(Application.UserAppDataPath(), Filename)
Dim xml As String = System.IO.Path.Combine(CONFIG.UserConfigPath, Filename)
If File.Exists(xml) Then
GridView3.RestoreLayoutFromXml(xml, OptionsLayoutBase.FullLayout)
End If
@ -262,7 +263,7 @@ Public Class frmMonitor
Sub LoadGrid4Layout()
Try
Dim Filename As String = String.Format("DevExpressGridViewMonitor_UserLayout_Grid4.xml")
Dim xml As String = System.IO.Path.Combine(Application.UserAppDataPath(), Filename)
Dim xml As String = System.IO.Path.Combine(CONFIG.UserConfigPath, Filename)
If File.Exists(xml) Then
GridView4.RestoreLayoutFromXml(xml, OptionsLayoutBase.FullLayout)
End If
@ -275,8 +276,9 @@ Public Class frmMonitor
Sub SaveGrid1layout()
Try
Dim o = CONFIG.UserConfigPath
Dim Filename As String = String.Format("DevExpressGridViewMonitor_UserLayout_Grid1.xml")
Dim xml As String = System.IO.Path.Combine(Application.UserAppDataPath(), Filename)
Dim xml As String = System.IO.Path.Combine(CONFIG.UserConfigPath, Filename)
GridView1.SaveLayoutToXml(xml, OptionsLayoutBase.FullLayout)
Catch ex As Exception
LOGGER.Error(ex)
@ -286,7 +288,7 @@ Public Class frmMonitor
Sub RemoveLayout()
Try
Dim Filename As String = String.Format("DevExpressGridViewMonitor_UserLayout_Grid1.xml")
Dim xml As String = System.IO.Path.Combine(Application.UserAppDataPath(), Filename)
Dim xml As String = System.IO.Path.Combine(CONFIG.UserConfigPath, Filename)
IO.File.Delete(xml)
Catch ex As Exception
LOGGER.Error(ex)
@ -296,7 +298,7 @@ Public Class frmMonitor
Sub SaveGrid2layout()
Try
Dim Filename As String = String.Format("DevExpressGridViewMonitor_UserLayout_Grid2.xml")
Dim xml As String = System.IO.Path.Combine(Application.UserAppDataPath(), Filename)
Dim xml As String = System.IO.Path.Combine(CONFIG.UserConfigPath, Filename)
GridView2.SaveLayoutToXml(xml, OptionsLayoutBase.FullLayout)
Catch ex As Exception
LOGGER.Error(ex)
@ -306,7 +308,7 @@ Public Class frmMonitor
Sub RemoveLayout2()
Try
Dim Filename As String = String.Format("DevExpressGridViewMonitor_UserLayout_Grid2.xml")
Dim xml As String = System.IO.Path.Combine(Application.UserAppDataPath(), Filename)
Dim xml As String = System.IO.Path.Combine(CONFIG.UserConfigPath, Filename)
IO.File.Delete(xml)
Catch ex As Exception
LOGGER.Error(ex)
@ -316,7 +318,7 @@ Public Class frmMonitor
Sub SaveGrid3layout()
Try
Dim Filename As String = String.Format("DevExpressGridViewMonitor_UserLayout_Grid3.xml")
Dim xml As String = System.IO.Path.Combine(Application.UserAppDataPath(), Filename)
Dim xml As String = System.IO.Path.Combine(CONFIG.UserConfigPath, Filename)
GridView3.SaveLayoutToXml(xml, OptionsLayoutBase.FullLayout)
Catch ex As Exception
LOGGER.Error(ex)
@ -326,7 +328,7 @@ Public Class frmMonitor
Sub RemoveLayout3()
Try
Dim Filename As String = String.Format("DevExpressGridViewMonitor_UserLayout_Grid3.xml")
Dim xml As String = System.IO.Path.Combine(Application.UserAppDataPath(), Filename)
Dim xml As String = System.IO.Path.Combine(CONFIG.UserConfigPath, Filename)
IO.File.Delete(xml)
Catch ex As Exception
LOGGER.Error(ex)
@ -336,7 +338,7 @@ Public Class frmMonitor
Sub SaveGrid4layout()
Try
Dim Filename As String = String.Format("DevExpressGridViewMonitor_UserLayout_Grid4.xml")
Dim xml As String = System.IO.Path.Combine(Application.UserAppDataPath(), Filename)
Dim xml As String = System.IO.Path.Combine(CONFIG.UserConfigPath, Filename)
GridView4.SaveLayoutToXml(xml, OptionsLayoutBase.FullLayout)
Catch ex As Exception
LOGGER.Error(ex)
@ -346,7 +348,7 @@ Public Class frmMonitor
Sub RemoveLayout4()
Try
Dim Filename As String = String.Format("DevExpressGridViewMonitor_UserLayout_Grid4.xml")
Dim xml As String = System.IO.Path.Combine(Application.UserAppDataPath(), Filename)
Dim xml As String = System.IO.Path.Combine(CONFIG.UserConfigPath, Filename)
IO.File.Delete(xml)
Catch ex As Exception
LOGGER.Error(ex)

View File

@ -10,7 +10,7 @@ Public Class frmUserKonfig_AddUsers
Private Sub frmUserKonfig_AddUsers_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing
Try
Dim Filename As String = String.Format("{0}-UserLayout.xml", GridViewUsers.Name)
Dim XMLPath = System.IO.Path.Combine(Application.UserAppDataPath(), Filename)
Dim XMLPath = System.IO.Path.Combine(CONFIG.UserConfigPath, Filename)
GridViewUsers.SaveLayoutToXml(XMLPath)
Catch ex As Exception
LOGGER.Error(ex)
@ -46,7 +46,7 @@ Public Class frmUserKonfig_AddUsers
End Try
Try
Dim Filename As String = String.Format("{0}-UserLayout.xml", GridViewUsers.Name)
Dim XMLPath = System.IO.Path.Combine(Application.UserAppDataPath(), Filename)
Dim XMLPath = System.IO.Path.Combine(CONFIG.UserConfigPath, Filename)
If File.Exists(XMLPath) Then
GridViewUsers.RestoreLayoutFromXml(XMLPath)
'grvwGrid.ClearGrouping()

View File

@ -11,6 +11,8 @@ Imports DevExpress.XtraGrid
Imports System.Reflection
Imports DigitalData.Controls.ChatControl
Imports DevExpress.XtraEditors.Repository
Imports DigitalData.Modules.EDMI.API
Imports DigitalData.Modules.EDMI.API.EDMIServiceReference
Public Class frmValidator
Dim strFileList()
@ -788,14 +790,38 @@ Public Class frmValidator
Try
pnldesigner.Controls.Clear()
Dim oSQL = $"SELECT [dbo].[FNPM_LANGUAGE_CONTROL_TEXT] (NAME,'{USER_LANGUAGE}',CTRL_TYPE,CTRL_TEXT) CTRL_CAPTION_LANG, * FROM TBPM_PROFILE_CONTROLS WHERE CONTROL_ACTIVE = 1 AND PROFIL_ID = {CURRENT_ProfilGUID} ORDER BY Y_LOC, X_LOC"
DTCONTROLS = ClassDatabase.Return_Datatable(oSQL, "Create_Controls1")
If EDMIAppServerActive = True Then
Dim oTableResult As TableResult = _Client.GetDatatableByName("TBPM_PROFILE_CONTROLS_LANGUAGE", $"LANGUAGE = '{USER_LANGUAGE}' AND PROFIL_ID = {CURRENT_ProfilGUID}", "Y_LOC, X_LOC")
DTCONTROLS = oTableResult.Table
Else
DTCONTROLS = ClassDatabase.Return_Datatable(oSQL, "Create_Controls1")
End If
oSQL = $"SELECT T1.GUID As CONTROL_ID, T1.PROFIL_ID, T.CONNECTION_ID, T.SQL_COMMAND, T.SPALTENNAME,T.FORMATTYPE,T.FORMATSTRING from TBPM_CONTROL_TABLE T, TBPM_PROFILE_CONTROLS T1 WHERE CONTROL_ACTIVE = 1 AND T.CONTROL_ID = T1.GUID AND T1.PROFIL_ID = {CURRENT_ProfilGUID} AND LEN(T.SQL_COMMAND) > 0 AND T.LOAD_AFT_LOAD_CONTROL = 0 ORDER BY T.SEQUENCE"
DTGRID_COLUMNS_WITH_SQL = ClassDatabase.Return_Datatable(oSQL, "Create_Controls2")
If EDMIAppServerActive = True Then
Dim oTableResult As TableResult = _Client.GetDatatableByName("DTGRID_COLUMNS_WITH_SQL", $"PROFIL_ID = {CURRENT_ProfilGUID}", "SEQUENCE")
DTGRID_COLUMNS_WITH_SQL = oTableResult.Table
Else
DTGRID_COLUMNS_WITH_SQL = ClassDatabase.Return_Datatable(oSQL, "Create_Controls2")
End If
oSQL = $"SELECT T.* from TBPM_CONTROL_TABLE T, TBPM_PROFILE_CONTROLS T1 WHERE T1.CONTROL_ACTIVE = 1 AND T.CONTROL_ID = T1.GUID AND T1.PROFIL_ID = {CURRENT_ProfilGUID} ORDER BY T.SEQUENCE"
DTGRID_COLUMNS = ClassDatabase.Return_Datatable(oSQL, "Create_Controls3")
If EDMIAppServerActive = True Then
Dim oTableResult As TableResult = _Client.GetDatatableByName("TBPM_CONTROL_TABLE", $"PROFIL_ID = {CURRENT_ProfilGUID}", "SEQUENCE")
DTGRID_COLUMNS = oTableResult.Table
Else
DTGRID_COLUMNS = ClassDatabase.Return_Datatable(oSQL, "Create_Controls3")
End If
oSQL = $"SELECT T1.GUID As CONTROL_ID, T1.PROFIL_ID, T.CONNECTION_ID, T.SQL_COMMAND, T.SPALTENNAME,T.FORMATTYPE,T.FORMATSTRING from TBPM_CONTROL_TABLE T, TBPM_PROFILE_CONTROLS T1 WHERE T1.CONTROL_ACTIVE = 1 AND T.CONTROL_ID = T1.GUID AND T1.PROFIL_ID = {CURRENT_ProfilGUID} AND LEN(T.SQL_COMMAND) > 0 AND T.LOAD_AFT_LOAD_CONTROL = 1 ORDER BY T.SEQUENCE"
DTGRID_SQL_DEFINITION = ClassDatabase.Return_Datatable(oSQL, "Create_Controls4")
If EDMIAppServerActive = True Then
Dim oTableResult As TableResult = _Client.GetDatatableByName("DTGRID_SQL_DEFINITION", $"PROFIL_ID = {CURRENT_ProfilGUID}", "SEQUENCE")
DTGRID_SQL_DEFINITION = oTableResult.Table
Else
DTGRID_SQL_DEFINITION = ClassDatabase.Return_Datatable(oSQL, "Create_Controls4")
End If
Dim oCount As Integer = 0
@ -1213,7 +1239,16 @@ Public Class frmValidator
Try
Dim CONTROL_ID = DirectCast(box.Tag, ClassControlCreator.ControlMetadata).Guid
Dim sql = String.Format("select NAME,CONNECTION_ID,SQL_UEBERPRUEFUNG FROM TBPM_PROFILE_CONTROLS WHERE CONTROL_ACTIVE = 1 AND PROFIL_ID = {0} AND SQL_UEBERPRUEFUNG LIKE '%{1}%'", CURRENT_ProfilGUID, box.Name)
Dim DT As DataTable = ClassDatabase.Return_Datatable(sql, "OnTextBoxKeyUp")
Dim DT As DataTable
If EDMIAppServerActive = True Then
Dim oTableResult As TableResult = _Client.GetDatatableByName("TBPM_PROFILE_CONTROLS_SQL_UEP", $"AND PROFIL_ID = {CURRENT_ProfilGUID} AND SQL_UEBERPRUEFUNG LIKE '%{box.Name}%'")
DTCONTROLS = oTableResult.Table
Else
DT = ClassDatabase.Return_Datatable(sql, "OnTextBoxKeyUp")
End If
If Not IsNothing(DT) And DT.Rows.Count > 0 Then
For Each ROW As DataRow In DT.Rows
Try
@ -3840,7 +3875,13 @@ Public Class frmValidator
If includeFI = True Then
Try
Dim oSQL = $"SELECT * FROM TBPM_PROFILE_FINAL_INDEXING WHERE PROFIL_ID = {CURRENT_ProfilGUID}"
Dim oDTFinalIndexing = ClassDatabase.Return_Datatable(oSQL, "Finish_WFStep")
Dim oDTFinalIndexing As DataTable
If EDMIAppServerActive = True Then
Dim oTableResult As TableResult = _Client.GetDatatableByName("TBPM_PROFILE_FINAL_INDEXING", $"PROFIL_ID = {CURRENT_ProfilGUID}")
oDTFinalIndexing = oTableResult.Table
Else
oDTFinalIndexing = ClassDatabase.Return_Datatable(oSQL, "Finish_WFStep")
End If
If oDTFinalIndexing?.Rows.Count > 0 Then
'Jetzt finale Indexe setzen
@ -4077,8 +4118,8 @@ Public Class frmValidator
End If
End If
End If
Dim value = CURRENT_DT_PROFILE.Rows(0).Item("ANNOTATE_ALL_WORK_HISTORY_ENTRIES")
If CBool(value) = True Then
Dim oAnnotateAllWHEs = CURRENT_DT_PROFILE.Rows(0).Item("ANNOTATE_ALL_WORK_HISTORY_ENTRIES")
If CBool(oAnnotateAllWHEs) = True Then
oFIsql = String.Format("SELECT * FROM TBPM_FILES_WORK_HISTORY WHERE DOC_ID = {1} ORDER BY GUID", CURRENT_ProfilGUID, CURRENT_DOC_ID)
Dim DT_ENTRIES As DataTable = ClassDatabase.Return_Datatable(oFIsql, "Finish_WFStep3")
If Not IsNothing(DT_ENTRIES) Then
@ -5459,7 +5500,7 @@ Public Class frmValidator
End Sub
Private Function GetXML_OverviewLayoutName(pProfilID As Integer, pControlID As Integer)
Dim Filename As String = String.Format($"DevExpressValidatorGridControl_{pProfilID}-{pControlID}.xml")
Return System.IO.Path.Combine(Application.UserAppDataPath(), Filename)
Return System.IO.Path.Combine(CONFIG.UserConfigPath, Filename)
End Function
Private Function Conversation_init()
Try

View File

@ -593,7 +593,7 @@ Public Class frmValidatorSearch
End Sub
Private Function Get_DocGrid_Layout_Filename(oIndex As Integer)
Dim oFilename As String = String.Format("GridViewDoc_Search-{0}-{1}-UserLayout.xml", oIndex, CURRENT_ProfilGUID)
Dim oPath = System.IO.Path.Combine(Application.UserAppDataPath(), oFilename)
Dim oPath = System.IO.Path.Combine(CONFIG.UserConfigPath, oFilename)
Return oPath
End Function
Private Sub GridControlDocSearch_Leave(sender As Object, e As EventArgs) Handles GridControlDocSearch1.Leave, GridControlDocSearch2.Leave, GridControlDocSearch3.Leave, GridControlDocSearch4.Leave, GridControlDocSearch5.Leave