MS Rework

This commit is contained in:
Digital Data - Marlon Schreiber
2018-07-20 13:03:41 +02:00
parent 2bdb7d1512
commit b081925128
39 changed files with 2747 additions and 1200 deletions

View File

@@ -59,10 +59,10 @@ Public Class frmConstructor_Main
Private DT_TREEVIEW_CONFIGURATION As DataTable
Private DT_CONTROLS_ENTITY As DataTable
Private DT_ADDING_USERS As DataTable
Private DT_CONTROL_SCREEN_SHOW_COL_0 As DataTable
Private DT_VWPMO_CONTROL_SCREEN As DataTable
Private TREEVIEW_IMAGELIST As ImageList
Private NODE_NAVIGATION As Boolean = False
Private NODE_NAVIGATION_LOADED As Boolean = False
@@ -398,8 +398,10 @@ Public Class frmConstructor_Main
DT_CONSTRUCT_VIEW = ClassDatabase.Return_Datatable("SELECT * FROM TBPMO_FORM_CONSTRUCTOR WHERE GUID = " & CONSTRUCTORID)
Dim SEL1 = String.Format("SELECT * FROM TBPMO_FORM WHERE GUID IN (SELECT FORM_ID FROM VWPMO_CONSTRUCTOR_FORMS WHERE SCREEN_ID = {0} AND CONSTRUCT_ID = {1})", CURRENT_SCREEN_ID, CONSTRUCTORID)
DT_ENTITY_DATA = ClassDatabase.Return_Datatable(SEL1, True)
DT_CONTROL_SCREEN_SHOW_COL_0 = ClassDatabase.Return_Datatable("SELECT FORM_ID, CONTROL_ID, CONTROL_COL_NAME, CONTROL_SHOW_COLUMN FROM VWPMO_CONTROL_SCREEN WHERE CONTROL_SHOW_COLUMN = 0", True)
DT_VWPMO_CONTROL_SCREEN = ClassDatabase.Return_Datatable("SELECT * FROM VWPMO_CONTROL_SCREEN", True)
SEL1 = String.Format("SELECT *, dbo.FNPMO_GET_CONTROL_CAPTION ('{0}', 1, CONTROL_ID) AS 'CAPTION' FROM VWPMO_CONTROL_SCREEN", USER_LANGUAGE)
DT_VWPMO_CONTROL_SCREEN = ClassDatabase.Return_Datatable(SEL1, True)
DT_CONTROL_SCREEN_SHOW_COL_0 = ClassHelper.FILTER_DATATABLE(DT_VWPMO_CONTROL_SCREEN, "CONTROL_SHOW_COLUMN = 0", "") 'ClassDatabase.Return_Datatable("SELECT FORM_ID, CONTROL_ID, CONTROL_COL_NAME, CONTROL_SHOW_COLUMN FROM VWPMO_CONTROL_SCREEN WHERE CONTROL_SHOW_COLUMN = 0", True)
If DT_CONSTRUCT_VIEW.Rows.Count = 1 Then
'Load Input Grid
Me.Text = DT_CONSTRUCT_VIEW.Rows(0).Item("FORM_TITLE")
@@ -1113,6 +1115,7 @@ Public Class frmConstructor_Main
tsButtonEdit.Enabled = False
tslblLocked.Visible = True
TabFollowUp.PageEnabled = False
tsmiMassChanges.Enabled = False
'pnlPositions.Enabled = False
' tsButtonShowTaskOverview.Enabled = False
End If
@@ -1126,10 +1129,12 @@ Public Class frmConstructor_Main
'DATENSATZ-RECHTE
If RIGHT_ADD_R = False Then
tsButtonAdd.Enabled = False
End If
If RIGHT_EDIT_R = False Then
tslblLocked.Visible = True
tsButtonEdit.Enabled = False
tsmiMassChanges.Enabled = False
If RIGHT_ADD_R = False Then
tsButtonSave.Enabled = False
End If
@@ -1673,6 +1678,7 @@ Public Class frmConstructor_Main
Public Sub Update_Record_Label(RecordId As Integer)
Try
Dim SQL As String = "SELECT ADDED_WHO, CONVERT(VARCHAR(16),ADDED_WHEN,20) AS ADDED_WHEN, COALESCE(CHANGED_WHO,'') AS CHANGED_WHO, COALESCE(CONVERT(VARCHAR(16),CHANGED_WHEN,20),'') AS CHANGED_WHEN FROM TBPMO_RECORD WHERE GUID = " & RecordId
Dim expression = "[Record-ID] = " & RecordId
Dim resultDT As DataTable
If CtrlCommandUI.IsInsert = True Then
resultDT = ClassDatabase.Return_Datatable(SQL)
@@ -1716,6 +1722,7 @@ Public Class frmConstructor_Main
Dim sw As New SW("Load_Controls")
FORMVIEW_ID = frmview_id
ENTITY_ID = DT_TBPMO_FORM_VIEW.Rows(0).Item("FORM_ID")
CURRENT_ENTITY_ID = ENTITY_ID
CtrlBuilder = New ClassControlBuilder(pnlDetails)
CtrlCommandUI = New ClassControlCommandsUI(CtrlBuilder,
ContextMenuDetails,
@@ -1949,14 +1956,14 @@ Public Class frmConstructor_Main
Select Case ACT_EBENE
Case 1
EBENE1_RECID = recid
For Each row As DataRow In CURRENT_ENTITY_DT.Rows
For Each row As DataRow In CURRENT_DT_ENTITY_RECORDS.Rows
If row.Item("Record-ID") = SELECTED_RECORD_ID Then
EBENE1_GRID_RESULT = row.Item(EBENE1_COLUMNNAME)
End If
Next
Case 2
EBENE2_RECID = recid
For Each row As DataRow In CURRENT_ENTITY_DT.Rows
For Each row As DataRow In CURRENT_DT_ENTITY_RECORDS.Rows
If row.Item("Record-ID") = SELECTED_RECORD_ID Then
EBENE2_GRID_RESULT = row.Item(EBENE2_COLUMNNAME)
End If
@@ -1974,7 +1981,7 @@ Public Class frmConstructor_Main
Select Case ACT_EBENE
Case 1
EBENE1_RECID = recid
For Each row As DataRow In CURRENT_ENTITY_DT.Rows
For Each row As DataRow In CURRENT_DT_ENTITY_RECORDS.Rows
If row.Item("Record-ID") = SELECTED_RECORD_ID Then
If EBENE1_COLUMNNAME = "" Then
EBENE1_GRID_RESULT = "No Column configured"
@@ -1986,7 +1993,7 @@ Public Class frmConstructor_Main
Next
Case 2
EBENE2_RECID = recid
For Each row As DataRow In CURRENT_ENTITY_DT.Rows
For Each row As DataRow In CURRENT_DT_ENTITY_RECORDS.Rows
If row.Item("Record-ID") = SELECTED_RECORD_ID Then
If EBENE2_COLUMNNAME = "" Then
EBENE2_GRID_RESULT = "No Column configured"
@@ -2298,9 +2305,10 @@ Public Class frmConstructor_Main
RECORD_CHANGED = False
RECORD_ID = 0
Dim expression As String
Dim sql = "SELECT CONTROL_ID, CONTROL_READ_ONLY FROM VWPMO_CONTROL_SCREEN WHERE CTRLTYPE_ID NOT IN (1) AND CONTROL_ENTITY_ID = " & ENTITY_ID
DT_CONTROLS_ENTITY = ClassDatabase.Return_Datatable(sql, True)
Dim sql
'Dim sql = "SELECT CONTROL_ID, CONTROL_READ_ONLY FROM VWPMO_CONTROL_SCREEN WHERE CTRLTYPE_ID NOT IN (1) AND CONTROL_ENTITY_ID = " & ENTITY_ID
DT_CONTROLS_ENTITY = ClassHelper.FILTER_DATATABLE(DT_VWPMO_CONTROL_SCREEN, "CTRLTYPE_ID NOT IN (1) AND CONTROL_ENTITY_ID = " & ENTITY_ID, "")
'ClassDatabase.Return_Datatable(sql, True)
COUNT_RO_CONTROLS = 0
@@ -2360,15 +2368,19 @@ Public Class frmConstructor_Main
ClassLogger.Add("ADDING RECORDS IS PROHIBITED FOR ENTITY: " & ENTITY_ID, False)
End If
sql = String.Format("select * from TBPMO_DOCSEARCH_RESULTLIST_CONFIG WHERE VISIBLE = 1 AND ENTITY_ID = {0} AND LANGUAGE = '{1}' ORDER BY SEQUENCE", ENTITY_ID, USER_LANGUAGE) 'TBPMO_WINDREAM_RESULTLIST_CONFIG"
DT_WINDREAM_COLUMNS_GRID = ClassDatabase.Return_Datatable(sql, True)
sql = String.Format("select T.*, T1.HEADER_CAPTION from TBPMO_DOCRESULT_DROPDOWN_ITEMS T, TBPMO_DOCSEARCH_RESULTLIST_CONFIG T1 WHERE T.CONFIG_ID = T1.GUID AND T.CONFIG_ID IN (SELECT GUID FROM TBPMO_DOCSEARCH_RESULTLIST_CONFIG WHERE ENTITY_ID = {0} AND TYPE_ID = 3 AND LANGUAGE = '{1}') ORDER BY T.SEQUENCE ", ENTITY_ID, USER_LANGUAGE)
DT_DOCRESULT_DROPDOWN_ITEMS = ClassDatabase.Return_Datatable(sql, True)
'sql = String.Format("select * from TBPMO_DOCSEARCH_RESULTLIST_CONFIG WHERE VISIBLE = 1 AND ENTITY_ID = {0} AND LANGUAGE = '{1}' ORDER BY SEQUENCE", ENTITY_ID, USER_LANGUAGE) 'TBPMO_WINDREAM_RESULTLIST_CONFIG"
sql = String.Format("select * from TBPMO_DOCSEARCH_VARIABLE_CONTROLS WHERE ENTITY_ID = {0}", ENTITY_ID) 'TBPMO_WINDREAM_RESULTLIST_CONFIG"
DT_RESULTLIST_OPTIONS = ClassDatabase.Return_Datatable(sql, True)
sql = String.Format("select * from TBPMO_DOCSEARCH_RESULTLIST_CONFIG WHERE VISIBLE = 1 AND ENTITY_ID = {0} AND LANGUAGE = '{1}' AND COLUMN_VIEW LIKE 'VALUE%' ORDER BY SEQUENCE", ENTITY_ID, USER_LANGUAGE)
DT_RESULTLIST_VARIABLE_VALUE = ClassDatabase.Return_Datatable(sql, True)
expression = String.Format("VISIBLE = 1 AND ENTITY_ID = {0} AND LANGUAGE = '{1}'", ENTITY_ID, USER_LANGUAGE)
DT_WINDREAM_COLUMNS_GRID = ClassHelper.FILTER_DATATABLE(CURRENT_RESULTLIST_CONFIG, expression, "SEQUENCE") 'ClassDatabase.Return_Datatable(sql, True)
expression = String.Format("ENTITY_ID = {0} AND TYPE_ID = 3 AND LANGUAGE = '{1}'", ENTITY_ID, USER_LANGUAGE)
'sql = String.Format("select T.*, T1.HEADER_CAPTION from TBPMO_DOCRESULT_DROPDOWN_ITEMS T, TBPMO_DOCSEARCH_RESULTLIST_CONFIG T1 WHERE T.CONFIG_ID = T1.GUID AND T.CONFIG_ID IN (SELECT GUID FROM TBPMO_DOCSEARCH_RESULTLIST_CONFIG WHERE ENTITY_ID = {0} AND TYPE_ID = 3 AND LANGUAGE = '{1}') ORDER BY T.SEQUENCE ", ENTITY_ID, USER_LANGUAGE)
DT_DOCRESULT_DROPDOWN_ITEMS = ClassHelper.FILTER_DATATABLE(CURRENT_TBPMO_DOCRESULT_DROPDOWN_ITEMS, expression, "SEQUENCE") 'ClassDatabase.Return_Datatable(sql, True)
'sql = String.Format("select * from TBPMO_DOCSEARCH_VARIABLE_CONTROLS WHERE ENTITY_ID = {0}", ENTITY_ID)
DT_RESULTLIST_OPTIONS = ClassHelper.FILTER_DATATABLE(CURRENT_VARIABLE_CONTROLS, "ENTITY_ID = " & ENTITY_ID, "") ' ClassDatabase.Return_Datatable(sql, True)
' sql = String.Format("select * from TBPMO_DOCSEARCH_RESULTLIST_CONFIG WHERE VISIBLE = 1 AND ENTITY_ID = {0} AND LANGUAGE = '{1}' AND COLUMN_VIEW LIKE 'VALUE%' ORDER BY SEQUENCE", ENTITY_ID, USER_LANGUAGE)
expression = String.Format("VISIBLE = 1 AND ENTITY_ID = {0} AND LANGUAGE = '{1}' AND COLUMN_VIEW LIKE 'VALUE%'", ENTITY_ID, USER_LANGUAGE)
DT_RESULTLIST_VARIABLE_VALUE = ClassHelper.FILTER_DATATABLE(CURRENT_RESULTLIST_CONFIG, expression, "SEQUENCE") 'ClassDatabase.Return_Datatable(sql, True)
Dim ENTITY_ROW = (From form In DT_ENTITY_DATA.AsEnumerable()
Select form
Where form.Item("GUID") = ENTITY_ID).Single()
@@ -2383,8 +2395,9 @@ Public Class frmConstructor_Main
Else
CURRENT_ENTITY_REDUNDANT_ID = 0
End If
sql = String.Format("select * from TBPMO_RIGHT_USER WHERE USER_ID = {0} AND ENTITY_ID = {1}", USER_GUID, ENTITY_ID)
DT_RIGHTS_USER = ClassDatabase.Return_Datatable(sql, True)
'sql = String.Format("select * from TBPMO_RIGHT_USER WHERE USER_ID = {0} AND ENTITY_ID = {1}", USER_GUID, ENTITY_ID)
DT_RIGHTS_USER = ClassHelper.FILTER_DATATABLE(CURRENT_TBPMO_RIGHT_USER, "ENTITY_ID = " & ENTITY_ID, "") ' ClassDatabase.Return_Datatable(sql, True)
expression = String.Format("")
sql = String.Format("SELECT DISTINCT EDIT_REC,ADD_REC,DELETE_REC,ADD_DOC,VIEW_DOC,DELETE_DOC FROM TBPMO_RIGHT_GROUP WHERE ENTITY_ID = {0} AND GROUP_ID IN (SELECT GROUP_ID FROM TBDD_GROUPS_USER WHERE USER_ID = {1})", ENTITY_ID, USER_GUID)
DT_RIGHTS_GROUP = ClassDatabase.Return_Datatable(sql, True)
@@ -2546,7 +2559,8 @@ Public Class frmConstructor_Main
_ENTITYSTRING = ACT_EBENE_STRING
CURRENT_PARENT_RECORD_ID = PARENT_RECORDID
DT_TBPMO_FORM_VIEW = ClassDatabase.Return_Datatable("SELECT * FROM TBPMO_FORM_VIEW WHERE FORM_ID = " & ENTITY_ID & " AND SCREEN_ID = " & CURRENT_SCREEN_ID, True)
DT_TBPMO_FORM_VIEW = ClassHelper.FILTER_DATATABLE(CURRENT_TBPMO_FORM_VIEW, "FORM_ID = " & ENTITY_ID & " AND SCREEN_ID = " & CURRENT_SCREEN_ID, "")
'ClassDatabase.Return_Datatable("SELECT * FROM TBPMO_FORM_VIEW WHERE FORM_ID = " & ENTITY_ID & " AND SCREEN_ID = " & CURRENT_SCREEN_ID, True)
act_FormViewID = DT_TBPMO_FORM_VIEW.Rows(0).Item("GUID")
@@ -2607,7 +2621,7 @@ Public Class frmConstructor_Main
While async.bw.IsBusy
Application.DoEvents()
End While
CURRENT_ENTITY_DT = async.dt
CURRENT_DT_ENTITY_RECORDS = async.dt
Catch ex As Exception
ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error Async EntitySQL", ex.Message, ex.StackTrace)
End Try
@@ -2619,12 +2633,15 @@ Public Class frmConstructor_Main
progressLoadEntity.Visible = False
labelLoadEntity.Visible = False
If IsNothing(CURRENT_ENTITY_DT) Then
If IsNothing(CURRENT_DT_ENTITY_RECORDS) Then
ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in getting Entity-Data - Check logfile")
Else
CURRENT_ENTITY_DT.TableName = "VWPMO_ENTITY_TABLE" & ENTITY_ID
Dim SQL_AutoValues = "SELECT GUID AS CONTROL_ID, CONNECTION_ID_1 AS CONNECTION_ID, SQL_COMMAND_1 AS SQL_COMMAND FROM TBPMO_CONTROL WHERE CONNECTION_ID_1 <> '' AND SQL_COMMAND_1 <> '' AND FORM_ID = " & ENTITY_ID
Dim DT_AUTOVALUES As DataTable = ClassDatabase.Return_Datatable(SQL_AutoValues, True)
CURRENT_DT_ENTITY_RECORDS.TableName = "VWPMO_ENTITY_TABLE" & ENTITY_ID
' Dim SQL_AutoValues = "SELECT GUID AS CONTROL_ID, CONNECTION_ID_1 AS CONNECTION_ID, SQL_COMMAND_1 AS SQL_COMMAND FROM TBPMO_CONTROL WHERE CONNECTION_ID_1 <> '' AND SQL_COMMAND_1 <> '' AND FORM_ID = " & ENTITY_ID
Dim DT_AUTOVALUES = ClassHelper.FILTER_DATATABLE(CURRENT_TBPMO_CONTROL, "CONNECTION_ID_1 <> '' AND SQL_COMMAND_1 <> '' AND FORM_ID = " & ENTITY_ID, "")
'Dim DT_AUTOVALUES As DataTable = ClassDatabase.Return_Datatable(SQL_AutoValues, True)
CURRENT_SQL_AUTO_VALUES_DT = DT_AUTOVALUES
If USER_WAN = True Then
@@ -2632,8 +2649,8 @@ Public Class frmConstructor_Main
End If
Try
Dim primaryKey(1) As DataColumn
primaryKey(0) = CURRENT_ENTITY_DT.Columns("Record-ID")
CURRENT_ENTITY_DT.PrimaryKey = primaryKey
primaryKey(0) = CURRENT_DT_ENTITY_RECORDS.Columns("Record-ID")
CURRENT_DT_ENTITY_RECORDS.PrimaryKey = primaryKey
Catch ex As Exception
ClassLogger.Add("Could not set the primary Key(Record-ID): " & ex.Message, True)
End Try
@@ -2775,7 +2792,7 @@ Public Class frmConstructor_Main
Dim primaryKey(1) As DataColumn
primaryKey(0) = DTEntity.Columns("Record-ID")
DTEntity.PrimaryKey = primaryKey
CURRENT_ENTITY_DT = DTEntity
CURRENT_DT_ENTITY_RECORDS = DTEntity
LoadGrid_Records()
Load_Grid_Layout()
Catch ex As Exception
@@ -2789,7 +2806,7 @@ Public Class frmConstructor_Main
Dim ImageIndex As Integer = -1
Dim i As Integer = 0
Dim j As Integer = 0
Dim DT As DataTable = DirectCast(CURRENT_ENTITY_DT, DataTable)
Dim DT As DataTable = DirectCast(CURRENT_DT_ENTITY_RECORDS, DataTable)
If DT Is Nothing Then
MsgBox("Daten können nicht geladen werden - Datatable SELECTION is empty", MsgBoxStyle.Critical)
Exit Sub
@@ -3063,7 +3080,7 @@ Public Class frmConstructor_Main
'Grid leeren
Clear_Grid_View()
Dim gridFormatter As New ClassGridFormatter.ConstructorView(CURRENT_ENTITY_DT, ENTITY_ID)
Dim gridFormatter As New ClassGridFormatter.ConstructorView(CURRENT_DT_ENTITY_RECORDS, ENTITY_ID)
Dim DT_RESULT As DataTable = gridFormatter.FormatDatatable()
GridControlMain.DataSource = DT_RESULT
gridFormatter.FormatGridView(grvwGrid)
@@ -3157,8 +3174,8 @@ Public Class frmConstructor_Main
End Sub
Sub HideColumns_Pos(EntityID As Integer)
Try
Dim SQL As String = "SELECT CONTROL_ID, CONTROL_COL_NAME, CONTROL_SHOW_COLUMN FROM VWPMO_CONTROL_SCREEN WHERE CONTROL_SHOW_COLUMN = 0 AND FORM_ID = " & EntityID
Dim DT As DataTable = ClassDatabase.Return_Datatable(SQL, True)
'Dim SQL As String = "SELECT CONTROL_ID, CONTROL_COL_NAME, CONTROL_SHOW_COLUMN FROM VWPMO_CONTROL_SCREEN WHERE CONTROL_SHOW_COLUMN = 0 AND FORM_ID = " & EntityID
Dim DT As DataTable = ClassHelper.FILTER_DATATABLE(DT_VWPMO_CONTROL_SCREEN, "CONTROL_SHOW_COLUMN = 0 AND FORM_ID = " & EntityID, "") 'ClassDatabase.Return_Datatable(SQL, True)
Dim cols As DevExpress.XtraGrid.Columns.GridColumnCollection = grvwGridPos.Columns
If DT.Rows.Count <> 0 Then
@@ -4323,6 +4340,8 @@ Public Class frmConstructor_Main
'End If
If RIGHT_READ_ONLY_DOC = True Then
ClassLogger.Add(">> RIGHT_WD_FORBIDDEN is set! No DragDrop allowed", False)
Else
ClassLogger.Add(">> No DragDrop allowed - ELSE", False)
End If
End If
@@ -5503,7 +5522,7 @@ Public Class frmConstructor_Main
grvwGrid.FindFilterText = ""
End Sub
Private Sub MassenänderungToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles MassenänderungToolStripMenuItem.Click
Private Sub MassenänderungToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles tsmiMassChanges.Click
Try
Dim list As New ArrayList
Dim collist As New ArrayList