This commit is contained in:
2020-03-23 16:14:39 +01:00
parent 0f7749c810
commit 42eef08dc5
4 changed files with 211 additions and 212 deletions

View File

@@ -214,7 +214,7 @@ Public Class frmMain
IDB_DOC_DATA_SQL = ClassDatabase.Execute_Scalar(oSQL, CONNECTION_STRING)
LOGGER.Debug($"Got the IDB_DOC_DATA_SQL..{IDB_DOC_DATA_SQL}")
End If
bsiGeneralInfo.Caption = "IDB active"
End If
@@ -837,9 +837,8 @@ Public Class frmMain
End If
If CHANGES_IN_ADMINISTRATION = True Then
CURRENT_DT_PROFILES = ClassDatabase.Return_Datatable("select * from TBPM_PROFILE where ACTIVE = 1")
Dim oSQL = $"SELECT * FROM VWPM_CONTROL_INDEX ORDER BY PROFIL_ID,Y_LOC, X_LOC"
DTVWCONTROLS_INDEX = ClassDatabase.Return_Datatable(oSQL)
LoadCURRENT_DT_PROFILES()
LoadVWPM_CONTROL_INDEX()
CHANGES_IN_ADMINISTRATION = False
End If
@@ -1552,6 +1551,13 @@ Public Class frmMain
' Save expanded GroupRows
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")
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)
End Sub
Sub GetBaseData(pMode As String)
Dim oStopWatch As New RefreshHelper.SW("GetBaseData")
Try
@@ -1563,7 +1569,8 @@ Public Class frmMain
oSQL = String.Format("SELECT T.* FROM VWPM_PROFILE_ACTIVE T WHERE T.FILE_COUNT > 0 AND T.GUID IN (SELECT PROFILE_ID FROM [dbo].[FNPM_GET_ACTIVE_PROFILES_USER] ({0}))", USER_ID)
CURR_DT_VWPM_PROFILE_ACTIVE = ClassDatabase.Return_Datatable(oSQL)
If pMode = "bwBasicData" Then bwBasicData.ReportProgress(30)
CURRENT_DT_PROFILES = ClassDatabase.Return_Datatable("select * from TBPM_PROFILE where ACTIVE = 1")
LoadCURRENT_DT_PROFILES()
If pMode = "Load" Then
CURRENT_DT_PROFILE = CURRENT_DT_PROFILES.Clone()
End If
@@ -1578,14 +1585,7 @@ Public Class frmMain
BASEDATA_DT_PROFILE_SEARCHES_SQL = BASEDATA_DT_PROFILES_SEARCHES_SQL.Clone()
End If
If pMode = "bwBasicData" Then bwBasicData.ReportProgress(60)
'oSQL = String.Format("SELECT * FROM VWPM_PROFILE_USER WHERE USER_ID = {0}", USER_ID)
'CURRENT_DT_VW_PROFILE_USER = ClassDatabase.Return_Datatable(oSQL)
'If pMode = "bwBasicData" Then bwBasicData.ReportProgress(70)
'DTGRID_GROUPS = ClassDatabase.Return_Datatable($"SELECT * FROM TBPM_MAIN_VIEW_GROUPS WHERE ACTIVE = 1")
'oSQL = "SELECT * FROM TBPM_CHART"
'DT_CHARTS = ClassDatabase.Return_Datatable(oSQL)
oSQL = $"SELECT * FROM VWPM_CONTROL_INDEX ORDER BY PROFIL_ID,Y_LOC, X_LOC"
DTVWCONTROLS_INDEX = ClassDatabase.Return_Datatable(oSQL)
LoadVWPM_CONTROL_INDEX()
If pMode = "bwBasicData" Then bwBasicData.ReportProgress(80)
If pMode = "Load" Then
DTVWCONTROL_INDEX = DTVWCONTROLS_INDEX.Clone()