From dd70c9e8dedf148bdc0f31346fbe0e60fe33cb89 Mon Sep 17 00:00:00 2001 From: JenneJ Date: Tue, 30 Aug 2016 15:26:55 +0200 Subject: [PATCH] jj 30.08 --- app/DD-Record-Organiser/ClassAsyncSQL.vb | 19 ++++++++++++ .../DD-Record-Organiser.vbproj | 1 + .../frmConstructor_Main.Designer.vb | 17 +++++++++- .../frmConstructor_Main.resx | 31 ++++++++++++++++--- .../frmConstructor_Main.vb | 25 ++++++++++++--- app/DD-Record-Organiser/frmLevel_Designer.vb | 3 ++ 6 files changed, 86 insertions(+), 10 deletions(-) create mode 100644 app/DD-Record-Organiser/ClassAsyncSQL.vb diff --git a/app/DD-Record-Organiser/ClassAsyncSQL.vb b/app/DD-Record-Organiser/ClassAsyncSQL.vb new file mode 100644 index 0000000..c53f7d2 --- /dev/null +++ b/app/DD-Record-Organiser/ClassAsyncSQL.vb @@ -0,0 +1,19 @@ +Imports System.ComponentModel + +Public Class ClassAsyncSQL + Private sql As String + Public WithEvents bw As BackgroundWorker + Public dt As DataTable + + Public Sub New(sqlCommand As String) + Me.bw = New BackgroundWorker() + bw.WorkerReportsProgress = False + bw.WorkerSupportsCancellation = False + + Me.sql = sqlCommand + End Sub + + Private Sub bw_DoWork(ByVal sender As Object, ByVal e As DoWorkEventArgs) Handles bw.DoWork + Me.dt = ClassDatabase.Return_Datatable(Me.sql, "LoadEntityData - Get DTEntity") + End Sub +End Class \ No newline at end of file diff --git a/app/DD-Record-Organiser/DD-Record-Organiser.vbproj b/app/DD-Record-Organiser/DD-Record-Organiser.vbproj index 7a764cc..c417ac5 100644 --- a/app/DD-Record-Organiser/DD-Record-Organiser.vbproj +++ b/app/DD-Record-Organiser/DD-Record-Organiser.vbproj @@ -254,6 +254,7 @@ + diff --git a/app/DD-Record-Organiser/frmConstructor_Main.Designer.vb b/app/DD-Record-Organiser/frmConstructor_Main.Designer.vb index 45a44c6..d541721 100644 --- a/app/DD-Record-Organiser/frmConstructor_Main.Designer.vb +++ b/app/DD-Record-Organiser/frmConstructor_Main.Designer.vb @@ -148,6 +148,8 @@ Partial Class frmConstructor_Main Me.tsslblStatus = New System.Windows.Forms.ToolStripStatusLabel() Me.tsslblRecord = New System.Windows.Forms.ToolStripStatusLabel() Me.tsslblWorkflowstate = New System.Windows.Forms.ToolStripStatusLabel() + Me.labelLoadEntity = New System.Windows.Forms.ToolStripStatusLabel() + Me.progressLoadEntity = New System.Windows.Forms.ToolStripProgressBar() Me.DD_ECMAdmin = New DD_Record_Organiser.DD_ECMAdmin() Me.ImageCollection1 = New DevExpress.Utils.ImageCollection(Me.components) Me.ttToolTip = New System.Windows.Forms.ToolTip(Me.components) @@ -1003,7 +1005,7 @@ Partial Class frmConstructor_Main ' 'StatusStrip_Main ' - Me.StatusStrip_Main.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsslblStatus, Me.tsslblRecord, Me.tsslblWorkflowstate}) + Me.StatusStrip_Main.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsslblStatus, Me.tsslblRecord, Me.tsslblWorkflowstate, Me.labelLoadEntity, Me.progressLoadEntity}) resources.ApplyResources(Me.StatusStrip_Main, "StatusStrip_Main") Me.StatusStrip_Main.Name = "StatusStrip_Main" ' @@ -1030,6 +1032,17 @@ Partial Class frmConstructor_Main Me.tsslblWorkflowstate.Name = "tsslblWorkflowstate" resources.ApplyResources(Me.tsslblWorkflowstate, "tsslblWorkflowstate") ' + 'labelLoadEntity + ' + Me.labelLoadEntity.Name = "labelLoadEntity" + resources.ApplyResources(Me.labelLoadEntity, "labelLoadEntity") + ' + 'progressLoadEntity + ' + Me.progressLoadEntity.Name = "progressLoadEntity" + resources.ApplyResources(Me.progressLoadEntity, "progressLoadEntity") + Me.progressLoadEntity.Style = System.Windows.Forms.ProgressBarStyle.Marquee + ' 'DD_ECMAdmin ' Me.DD_ECMAdmin.DataSetName = "DD_ECMAdmin" @@ -1304,4 +1317,6 @@ Partial Class frmConstructor_Main Friend WithEvents TSMIDisplayname As System.Windows.Forms.ToolStripMenuItem Friend WithEvents tstbDisplayname As System.Windows.Forms.ToolStripTextBox Friend WithEvents tsmiRights As System.Windows.Forms.ToolStripMenuItem + Friend WithEvents progressLoadEntity As System.Windows.Forms.ToolStripProgressBar + Friend WithEvents labelLoadEntity As System.Windows.Forms.ToolStripStatusLabel End Class diff --git a/app/DD-Record-Organiser/frmConstructor_Main.resx b/app/DD-Record-Organiser/frmConstructor_Main.resx index 4bad5b0..0dce33e 100644 --- a/app/DD-Record-Organiser/frmConstructor_Main.resx +++ b/app/DD-Record-Organiser/frmConstructor_Main.resx @@ -325,7 +325,7 @@ 0, 0 - 1067, 237 + 1074, 237 0 @@ -394,7 +394,7 @@ 0, 0 - 1360, 343 + 1356, 347 0 @@ -412,7 +412,7 @@ 0 - 1360, 343 + 1356, 347 Detailansicht @@ -430,7 +430,7 @@ 0 - 1362, 371 + 1362, 378 1 @@ -1682,6 +1682,15 @@ False + + 83, 19 + + + Loading Data.. + + + 100, 18 + 0, 685 @@ -1766,7 +1775,7 @@ True - 194 + 88 6, 13 @@ -2745,6 +2754,18 @@ System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + labelLoadEntity + + + System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + progressLoadEntity + + + System.Windows.Forms.ToolStripProgressBar, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + DD_ECMAdmin diff --git a/app/DD-Record-Organiser/frmConstructor_Main.vb b/app/DD-Record-Organiser/frmConstructor_Main.vb index e7e1d93..5fbd7db 100644 --- a/app/DD-Record-Organiser/frmConstructor_Main.vb +++ b/app/DD-Record-Organiser/frmConstructor_Main.vb @@ -1222,6 +1222,8 @@ Public Class frmConstructor_Main foundRowsLevel0 = DT_TREEVIEW_PER_CONTROLS.Select(expression) Dim i As Integer Dim NODE_CONFIG_ID + Dim LEVEL0_NODE As TreeNode + ' For each row create a Node For i = 0 To foundRowsLevel0.GetUpperBound(0) Dim ID = foundRowsLevel0(i)("GUID") @@ -1231,7 +1233,7 @@ Public Class frmConstructor_Main Dim Type_node = foundRowsLevel0(i)("TYPE_NODE") Dim RECORD_ID = foundRowsLevel0(i)("RECORD_ID") NODE_CONFIG_ID = foundRowsLevel0(i)("NODE_CONFIG_ID") - Dim LEVEL0_NODE As TreeNode + LEVEL0_NODE = New TreeNode(nodetext) If Not IsDBNull(RECORD_ID) Then LEVEL0_NODE.Tag = LevelEntity & " - CONTROL-ID" & controlID.ToString & "#" & ID & "#RECORD-ID" & RECORD_ID.ToString @@ -1248,7 +1250,7 @@ Public Class frmConstructor_Main Next LEVEL0_NODE.ImageIndex = index LEVEL0_NODE.SelectedImageIndex = index - TreeViewMain.Nodes.Add(LEVEL0_NODE) + '### LEVEL 1 laden ####### Dim expressionLevel1 As String expressionLevel1 = "PARENT_GUID = " & ID 'TYPE_NODE = 1 AND Einschränkung auf Type 2 und Parent_Guid @@ -1532,6 +1534,8 @@ Public Class frmConstructor_Main Next 'Level 1 Ende Next + TreeViewMain.Nodes.Add(LEVEL0_NODE) + Else MsgBox("Check the Control Navigation Option or inform Digital Data!", MsgBoxStyle.Critical) @@ -1741,7 +1745,7 @@ Public Class frmConstructor_Main FAU_AD_USER_PW = PWplainText Next End If - + Dim elapsed As Double elapsed = sw.Elapsed.TotalSeconds @@ -2726,7 +2730,20 @@ Public Class frmConstructor_Main TabDetails.PageVisible = True GridControlMain.Visible = True - Dim DTEntity As DataTable = ClassDatabase.Return_Datatable(_ENTITYSQL, "LoadEntityData - Get DTEntity") + progressLoadEntity.Visible = True + labelLoadEntity.Visible = True + Dim async As New ClassAsyncSQL(_ENTITYSQL) + async.bw.RunWorkerAsync() + While async.bw.IsBusy + Application.DoEvents() + End While + progressLoadEntity.Visible = False + labelLoadEntity.Visible = False + Dim DTEntity As DataTable = async.dt + + 'Dim DTEntity As DataTable = ClassDatabase.Return_Datatable(_ENTITYSQL, "LoadEntityData - Get DTEntity") + + DTEntity.TableName = "VWTEMP_PMO_FORM" & ENTITY_ID If IsNothing(DTEntity) Then MsgBox("Unexpected Error in getting Entity-Data - Check Logfile", MsgBoxStyle.Critical) diff --git a/app/DD-Record-Organiser/frmLevel_Designer.vb b/app/DD-Record-Organiser/frmLevel_Designer.vb index 4bb3906..2d4c3a3 100644 --- a/app/DD-Record-Organiser/frmLevel_Designer.vb +++ b/app/DD-Record-Organiser/frmLevel_Designer.vb @@ -640,6 +640,9 @@ noerror = ClassDatabase.Execute_non_Query_withConn(sql, 1) sql = "EXECUTE PRPMO_CREATE_TEMP_VIEWS" noerror = ClassDatabase.Execute_non_Query_withConn(sql, 1) + If noerror = False Then + MsgBox("Error while Rebuilding Views! See Log for more information", MsgBoxStyle.Critical) + End If Return noerror Catch ex As Exception MsgBox("Error in btnexecute_CreateViewSql:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)