This commit is contained in:
SchreiberM 2016-09-13 13:04:57 +02:00
parent ff7b3a80e8
commit 1fa90c6746
2 changed files with 41 additions and 46 deletions

View File

@ -1686,10 +1686,10 @@
<value>False</value>
</data>
<data name="labelLoadEntity.Size" type="System.Drawing.Size, System.Drawing">
<value>83, 19</value>
<value>123, 19</value>
</data>
<data name="labelLoadEntity.Text" xml:space="preserve">
<value>Loading Data..</value>
<value>Loading Record Data..</value>
</data>
<data name="progressLoadEntity.Size" type="System.Drawing.Size, System.Drawing">
<value>100, 18</value>

View File

@ -57,7 +57,7 @@ Public Class frmConstructor_Main
Private NODE_NAVIGATION As Boolean = False
Private NODE_NAVIGATION_LOADED As Boolean = False
Private LOAD_AT_FIRST As Boolean = False
Private LOCK_CONTROLS_BG_LOAD As Boolean = False
Private EBENE2_PARENT_ID As Integer
Private EBENE3_PARENT_ID As Integer
@ -588,7 +588,7 @@ Public Class frmConstructor_Main
If CtrlCommandUI.IsInsert Then
ActivateAllTabs()
End If
Load_Datafor_Entity(False)
Load_Datafor_Entity()
End If
End If
@ -598,7 +598,7 @@ Public Class frmConstructor_Main
If Node IsNot Nothing Then
TreeViewMain.SelectedNode = Node
Load_Datafor_Entity(False)
Load_Datafor_Entity()
End If
End If
@ -1185,7 +1185,7 @@ Public Class frmConstructor_Main
firstORFOLLWOWIN = False
End If
Load_Datafor_Entity(firstORFOLLWOWIN)
Load_Datafor_Entity()
If NODE_NAVIGATION = True Then
Dim SelectedNode As TreeNode = TryCast(TreeViewMain.SelectedNode, TreeNode)
If SelectedNode IsNot Nothing Then
@ -1682,7 +1682,7 @@ Public Class frmConstructor_Main
End If
End Function
Sub Load_Datafor_Entity(Optional _first As Boolean = False)
Sub Load_Datafor_Entity()
Try
If NODE_NAVIGATION = True Then
If NODE_NAVIGATION_LOADED = True Then
@ -1710,7 +1710,7 @@ Public Class frmConstructor_Main
Else
CURRENT_DATE_FORMAT = USER_DATE_FORMAT
End If
LOAD_AT_FIRST = result.Item("LOAD_AT_FIRST")
LOCK_CONTROLS_BG_LOAD = result.Item("LOCK_CONTROLS_BG_LOAD")
If NODE_NAVIGATION = True Then
If SelectedNode.Tag.ToString.Contains("RECORD_ID") Then
Console.WriteLine("Record beinhaltet")
@ -1781,7 +1781,7 @@ Public Class frmConstructor_Main
Else
Get_RecordCounts_Nodes()
End If
Load_Entity_Data(ACT_EBENE, _first)
Load_Entity_Data(ACT_EBENE)
sw.Stop()
sw.Reset()
@ -2273,7 +2273,7 @@ Public Class frmConstructor_Main
RECORD_CHANGED = False
'Den derzeitigen Record Neuladen
DisableEditMode()
Load_Entity_Data(ACT_EBENE, False)
Load_Entity_Data(ACT_EBENE)
RECORD_CHANGED = False
End If
End If
@ -2509,7 +2509,7 @@ Public Class frmConstructor_Main
MsgBox("Error in GetSet_Rights:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
End Try
End Sub
Sub Load_Entity_Data(ClickedLevel As Integer, Optional first As Boolean = False)
Sub Load_Entity_Data(ClickedLevel As Integer)
Try
Dim sw As New SW("Load_Entity_Data")
PARENT_SKIPPED = False
@ -2759,25 +2759,33 @@ Public Class frmConstructor_Main
progressLoadEntity.Visible = True
labelLoadEntity.Visible = True
SplitContainerMain.Panel2.Enabled = False
Dim DTEntity As DataTable
If LOAD_AT_FIRST = False Then
If first = False Then
DTEntity = Load_ViewData_Async()
End If
Else
DTEntity = Load_ViewData_Async()
If LOCK_CONTROLS_BG_LOAD = True Then
SplitContainerMain.Panel2.Enabled = False
End If
SplitContainerMain.Panel2.Enabled = True
Dim DTEntity As DataTable
Try
Dim async As New ClassAsyncSQL(_ENTITYSQL)
async.bw.RunWorkerAsync()
While async.bw.IsBusy
Application.DoEvents()
End While
DTEntity = async.dt
Catch ex As Exception
MsgBox("Error in Load_ViewData:" & vbNewLine & ex.Message, MsgBoxStyle.Exclamation)
End Try
Load_Splitter_Layout()
If LOCK_CONTROLS_BG_LOAD = True Then
SplitContainerMain.Panel2.Enabled = True
End If
progressLoadEntity.Visible = False
labelLoadEntity.Visible = False
DTEntity.TableName = "VWTEMP_PMO_FORM" & ENTITY_ID
If IsNothing(DTEntity) Then
MsgBox("Unexpected Error in getting Entity-Data - Check Logfile", MsgBoxStyle.Critical)
Else
DTEntity.TableName = "VWTEMP_PMO_FORM" & 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, "LoadAutoValues")
CURRENT_SQL_AUTO_VALUES_DT = DT_AUTOVALUES
@ -2822,7 +2830,7 @@ Public Class frmConstructor_Main
End If
Load_Grid_Layout()
HideColumns()
Load_Splitter_Layout()
' Dim sql1 = _ENTITYSQL
' sql1.Replace("T.*", "TOP 1 [Record-ID]")
' Dim id = ClassDatabase.Execute_Scalar(sql1, True)
@ -2888,19 +2896,6 @@ Public Class frmConstructor_Main
End Sub
Function Load_ViewData_Async()
Try
Dim async As New ClassAsyncSQL(_ENTITYSQL)
async.bw.RunWorkerAsync()
While async.bw.IsBusy
Application.DoEvents()
End While
Return async.dt
Catch ex As Exception
MsgBox("Error in Load_ViewData:" & vbNewLine & ex.Message, MsgBoxStyle.Exclamation)
Return Nothing
End Try
End Function
Sub Load_Record_Direct()
Try
grvwGrid.FocusedRowHandle = 0
@ -3547,7 +3542,7 @@ Public Class frmConstructor_Main
End If
result = MessageBox.Show(stg, "Confirmation needed:", MessageBoxButtons.YesNo, MessageBoxIcon.Question)
If result = MsgBoxResult.Yes Then
Load_Datafor_Entity(False)
Load_Datafor_Entity()
Else
Me.Close()
End If
@ -4805,7 +4800,7 @@ Public Class frmConstructor_Main
grvwCarousel.OptionsView.ViewMode = DevExpress.XtraGrid.Views.Layout.LayoutViewMode.Carousel
GridControlMain.MainView = grvwCarousel
Load_Datafor_Entity(False)
Load_Datafor_Entity()
End Sub
Private Sub ButtonQuickViewTiles_Click(sender As Object, e As EventArgs) Handles ButtonQuickViewTiles.Click
@ -4814,7 +4809,7 @@ Public Class frmConstructor_Main
GRID_TYPE_ID = 1
GridControlMain.MainView = grvwTiles
Load_Datafor_Entity(False)
Load_Datafor_Entity()
End Sub
Private Sub ButtonDetailView_Click(sender As Object, e As EventArgs) Handles ButtonDetailView.Click
@ -4823,7 +4818,7 @@ Public Class frmConstructor_Main
GRID_TYPE_ID = 3
GridControlMain.MainView = grvwGrid
Load_Datafor_Entity(False)
Load_Datafor_Entity()
End Sub
Private Sub ButtonSetViewAsDefault_Click(sender As Object, e As EventArgs) Handles ButtonSetViewAsDefault.Click
@ -4852,7 +4847,7 @@ Public Class frmConstructor_Main
If File.Exists(XMLPath) Then
File.Delete(XMLPath)
Load_Entity_Data(ACT_EBENE, False)
Load_Entity_Data(ACT_EBENE)
End If
Catch ex As Exception
MsgBox("Error in Reset Layout Grid: " & vbNewLine & ex.Message)
@ -5791,13 +5786,13 @@ Public Class frmConstructor_Main
If result = MsgBoxResult.Yes Then
Dim SQL = String.Format("EXEC PRDD_COPY_RECORD {0}, '{1}'", RECORD_ID, Environment.UserName)
If ClassDatabase.Execute_non_Query_withConn(SQL, 1) = True Then
Load_Entity_Data(ACT_EBENE, False)
Load_Entity_Data(ACT_EBENE)
End If
End If
End Sub
Private Sub DatenNeuLadenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles DatenNeuLadenToolStripMenuItem.Click
Load_Datafor_Entity(False)
Load_Datafor_Entity()
End Sub
Private Sub AnwendungscacheFreigebenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles AnwendungscacheFreigebenToolStripMenuItem.Click
@ -5813,7 +5808,7 @@ Public Class frmConstructor_Main
CURRENT_FORM_ID = ENTITY_ID
ClassControlValueCache.ClearCache()
DisableEditMode()
Load_Entity_Data(ACT_EBENE, False)
Load_Entity_Data(ACT_EBENE)
RECORD_CHANGED = False
Catch ex As Exception
MsgBox("Unexpected Error in Clear Cache:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
@ -6205,7 +6200,7 @@ Public Class frmConstructor_Main
Save_Grid_Layout()
frmMass_Change.ShowDialog()
If SUCCESSFULL = True Then
Load_Datafor_Entity(False)
Load_Datafor_Entity()
End If
Catch ex As Exception
MsgBox("Unexpected Error in MassChange Collector:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)