AppStd/RecordOrganizer
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of http://jennej@172.24.11.74:90/scm/git/RecordOrganizer

Browse Source
This commit is contained in:
JenneJ
2016-09-12 16:35:35 +02:00
parent 7fdee3b381 db283a5a58
commit 4738907db4
1 changed files with 58 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
app/DD-Record-Organiser/frmConstructor_Main.vb
View File

@@ -57,6 +57,7 @@ Public Class frmConstructor_Main
Private NODE_NAVIGATION As Boolean = False Private NODE_NAVIGATION As Boolean = False
Private NODE_NAVIGATION_LOADED As Boolean = False Private NODE_NAVIGATION_LOADED As Boolean = False
Private LOAD_AT_FIRST As Boolean = False
Private EBENE2_PARENT_ID As Integer Private EBENE2_PARENT_ID As Integer
Private EBENE3_PARENT_ID As Integer Private EBENE3_PARENT_ID As Integer
@@ -98,6 +99,7 @@ Public Class frmConstructor_Main
Private GRID_TYPE As GridType = GridType.Tiles Private GRID_TYPE As GridType = GridType.Tiles
Private GRID_TYPE_ID As Integer = 1 Private GRID_TYPE_ID As Integer = 1
Private FORM_LOADED As Boolean = False Private FORM_LOADED As Boolean = False
Private FORM_SHOWN As Boolean = False
Private SAVE_ROUTINE_ACTIVE As Boolean = False Private SAVE_ROUTINE_ACTIVE As Boolean = False
Private SP1 As String Private SP1 As String
Private SP2 As String Private SP2 As String
@@ -586,7 +588,7 @@ Public Class frmConstructor_Main
If CtrlCommandUI.IsInsert Then If CtrlCommandUI.IsInsert Then
ActivateAllTabs() ActivateAllTabs()
End If End If
Load_Datafor_Entity() Load_Datafor_Entity(False)
End If End If
End If End If
@@ -596,7 +598,7 @@ Public Class frmConstructor_Main
If Node IsNot Nothing Then If Node IsNot Nothing Then
TreeViewMain.SelectedNode = Node TreeViewMain.SelectedNode = Node
Load_Datafor_Entity() Load_Datafor_Entity(False)
End If End If
End If End If
@@ -1175,8 +1177,15 @@ Public Class frmConstructor_Main
SelectedNode.Text = SelectedNode.Text SelectedNode.Text = SelectedNode.Text
End If End If
End If End If
Dim fl = FORM_LOADED
Dim firstORFOLLWOWIN
If FORM_SHOWN = False Then
firstORFOLLWOWIN = True
Else
firstORFOLLWOWIN = False
Load_Datafor_Entity() End If
Load_Datafor_Entity(firstORFOLLWOWIN)
If NODE_NAVIGATION = True Then If NODE_NAVIGATION = True Then
Dim SelectedNode As TreeNode = TryCast(TreeViewMain.SelectedNode, TreeNode) Dim SelectedNode As TreeNode = TryCast(TreeViewMain.SelectedNode, TreeNode)
If SelectedNode IsNot Nothing Then If SelectedNode IsNot Nothing Then
@@ -1673,7 +1682,7 @@ Public Class frmConstructor_Main
End If End If
End Function End Function
Sub Load_Datafor_Entity() Sub Load_Datafor_Entity(Optional _first As Boolean = False)
Try Try
If NODE_NAVIGATION = True Then If NODE_NAVIGATION = True Then
If NODE_NAVIGATION_LOADED = True Then If NODE_NAVIGATION_LOADED = True Then
@@ -1701,7 +1710,7 @@ Public Class frmConstructor_Main
Else Else
CURRENT_DATE_FORMAT = USER_DATE_FORMAT CURRENT_DATE_FORMAT = USER_DATE_FORMAT
End If End If
LOAD_AT_FIRST = result.Item("LOAD_AT_FIRST")
If NODE_NAVIGATION = True Then If NODE_NAVIGATION = True Then
If SelectedNode.Tag.ToString.Contains("RECORD_ID") Then If SelectedNode.Tag.ToString.Contains("RECORD_ID") Then
Console.WriteLine("Record beinhaltet") Console.WriteLine("Record beinhaltet")
@@ -1772,7 +1781,7 @@ Public Class frmConstructor_Main
Else Else
Get_RecordCounts_Nodes() Get_RecordCounts_Nodes()
End If End If
Load_Entity_Data(ACT_EBENE) Load_Entity_Data(ACT_EBENE, _first)
sw.Stop() sw.Stop()
sw.Reset() sw.Reset()
@@ -2264,7 +2273,7 @@ Public Class frmConstructor_Main
RECORD_CHANGED = False RECORD_CHANGED = False
'Den derzeitigen Record Neuladen 'Den derzeitigen Record Neuladen
DisableEditMode() DisableEditMode()
Load_Entity_Data(ACT_EBENE) Load_Entity_Data(ACT_EBENE, False)
RECORD_CHANGED = False RECORD_CHANGED = False
End If End If
End If End If
@@ -2500,7 +2509,7 @@ Public Class frmConstructor_Main
MsgBox("Error in GetSet_Rights:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) MsgBox("Error in GetSet_Rights:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
End Try End Try
End Sub End Sub
Sub Load_Entity_Data(ClickedLevel As Integer) Sub Load_Entity_Data(ClickedLevel As Integer, Optional first As Boolean = False)
Try Try
Dim sw As New SW("Load_Entity_Data") Dim sw As New SW("Load_Entity_Data")
PARENT_SKIPPED = False PARENT_SKIPPED = False
@@ -2751,15 +2760,18 @@ Public Class frmConstructor_Main
progressLoadEntity.Visible = True progressLoadEntity.Visible = True
labelLoadEntity.Visible = True labelLoadEntity.Visible = True
SplitContainerMain.Panel2.Enabled = False SplitContainerMain.Panel2.Enabled = False
Dim async As New ClassAsyncSQL(_ENTITYSQL) Dim DTEntity As DataTable
async.bw.RunWorkerAsync() If LOAD_AT_FIRST = False Then
While async.bw.IsBusy If first = False Then
Application.DoEvents() DTEntity = Load_ViewData_Async()
End While End If
Else
DTEntity = Load_ViewData_Async()
End If
SplitContainerMain.Panel2.Enabled = True SplitContainerMain.Panel2.Enabled = True
progressLoadEntity.Visible = False progressLoadEntity.Visible = False
labelLoadEntity.Visible = False labelLoadEntity.Visible = False
Dim DTEntity As DataTable = async.dt
DTEntity.TableName = "VWTEMP_PMO_FORM" & ENTITY_ID DTEntity.TableName = "VWTEMP_PMO_FORM" & ENTITY_ID
@@ -2876,6 +2888,19 @@ Public Class frmConstructor_Main
End Sub 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() Sub Load_Record_Direct()
Try Try
grvwGrid.FocusedRowHandle = 0 grvwGrid.FocusedRowHandle = 0
@@ -3252,9 +3277,15 @@ Public Class frmConstructor_Main
' Alle Date Spalten durchgehen ' Alle Date Spalten durchgehen
For Each col As String In listdate For Each col As String In listdate
Dim colDate = grvwGrid.Columns(col) Dim date_edit As New DevExpress.XtraEditors.Repository.RepositoryItemTimeEdit
colDate.DisplayFormat.FormatType = FormatType.DateTime date_edit.Mask.MaskType = Mask.MaskType.DateTime
colDate.DisplayFormat.FormatString = CURRENT_DATE_FORMAT date_edit.Mask.EditMask = CURRENT_DATE_FORMAT
date_edit.Mask.UseMaskAsDisplayFormat = True
grvwGrid.Columns(col).ColumnEdit = date_edit
'dateedit.DisplayFormat.FormatType = FormatType.DateTime
'dateedit.DisplayFormat.FormatString = CURRENT_DATE_FORMAT
'grvwGrid.Columns(col).DisplayFormat.FormatType = FormatType.DateTime
'grvwGrid.Columns(col).DisplayFormat.FormatString = CURRENT_DATE_FORMAT
Next Next
Try Try
@@ -3516,7 +3547,7 @@ Public Class frmConstructor_Main
End If End If
result = MessageBox.Show(stg, "Confirmation needed:", MessageBoxButtons.YesNo, MessageBoxIcon.Question) result = MessageBox.Show(stg, "Confirmation needed:", MessageBoxButtons.YesNo, MessageBoxIcon.Question)
If result = MsgBoxResult.Yes Then If result = MsgBoxResult.Yes Then
Load_Datafor_Entity() Load_Datafor_Entity(False)
Else Else
Me.Close() Me.Close()
End If End If
@@ -4774,7 +4805,7 @@ Public Class frmConstructor_Main
grvwCarousel.OptionsView.ViewMode = DevExpress.XtraGrid.Views.Layout.LayoutViewMode.Carousel grvwCarousel.OptionsView.ViewMode = DevExpress.XtraGrid.Views.Layout.LayoutViewMode.Carousel
GridControlMain.MainView = grvwCarousel GridControlMain.MainView = grvwCarousel
Load_Datafor_Entity() Load_Datafor_Entity(False)
End Sub End Sub
Private Sub ButtonQuickViewTiles_Click(sender As Object, e As EventArgs) Handles ButtonQuickViewTiles.Click Private Sub ButtonQuickViewTiles_Click(sender As Object, e As EventArgs) Handles ButtonQuickViewTiles.Click
@@ -4783,7 +4814,7 @@ Public Class frmConstructor_Main
GRID_TYPE_ID = 1 GRID_TYPE_ID = 1
GridControlMain.MainView = grvwTiles GridControlMain.MainView = grvwTiles
Load_Datafor_Entity() Load_Datafor_Entity(False)
End Sub End Sub
Private Sub ButtonDetailView_Click(sender As Object, e As EventArgs) Handles ButtonDetailView.Click Private Sub ButtonDetailView_Click(sender As Object, e As EventArgs) Handles ButtonDetailView.Click
@@ -4792,7 +4823,7 @@ Public Class frmConstructor_Main
GRID_TYPE_ID = 3 GRID_TYPE_ID = 3
GridControlMain.MainView = grvwGrid GridControlMain.MainView = grvwGrid
Load_Datafor_Entity() Load_Datafor_Entity(False)
End Sub End Sub
Private Sub ButtonSetViewAsDefault_Click(sender As Object, e As EventArgs) Handles ButtonSetViewAsDefault.Click Private Sub ButtonSetViewAsDefault_Click(sender As Object, e As EventArgs) Handles ButtonSetViewAsDefault.Click
@@ -4821,7 +4852,7 @@ Public Class frmConstructor_Main
If File.Exists(XMLPath) Then If File.Exists(XMLPath) Then
File.Delete(XMLPath) File.Delete(XMLPath)
Load_Entity_Data(ACT_EBENE) Load_Entity_Data(ACT_EBENE, False)
End If End If
Catch ex As Exception Catch ex As Exception
MsgBox("Error in Reset Layout Grid: " & vbNewLine & ex.Message) MsgBox("Error in Reset Layout Grid: " & vbNewLine & ex.Message)
@@ -5399,6 +5430,7 @@ Public Class frmConstructor_Main
sw.Stop() sw.Stop()
elapsed = sw.Elapsed.TotalSeconds elapsed = sw.Elapsed.TotalSeconds
If LogErrorsOnly = False Then ClassLogger.Add(String.Format(" >> Form Shown took {0} to load", Format(elapsed, "0.000000000") & " seconds"), False) If LogErrorsOnly = False Then ClassLogger.Add(String.Format(" >> Form Shown took {0} to load", Format(elapsed, "0.000000000") & " seconds"), False)
FORM_SHOWN = True
End Sub End Sub
Sub Jump_Record() Sub Jump_Record()
Try Try
@@ -5759,13 +5791,13 @@ Public Class frmConstructor_Main
If result = MsgBoxResult.Yes Then If result = MsgBoxResult.Yes Then
Dim SQL = String.Format("EXEC PRDD_COPY_RECORD {0}, '{1}'", RECORD_ID, Environment.UserName) Dim SQL = String.Format("EXEC PRDD_COPY_RECORD {0}, '{1}'", RECORD_ID, Environment.UserName)
If ClassDatabase.Execute_non_Query_withConn(SQL, 1) = True Then If ClassDatabase.Execute_non_Query_withConn(SQL, 1) = True Then
Load_Entity_Data(ACT_EBENE) Load_Entity_Data(ACT_EBENE, False)
End If End If
End If End If
End Sub End Sub
Private Sub DatenNeuLadenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles DatenNeuLadenToolStripMenuItem.Click Private Sub DatenNeuLadenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles DatenNeuLadenToolStripMenuItem.Click
Load_Datafor_Entity() Load_Datafor_Entity(False)
End Sub End Sub
Private Sub AnwendungscacheFreigebenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles AnwendungscacheFreigebenToolStripMenuItem.Click Private Sub AnwendungscacheFreigebenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles AnwendungscacheFreigebenToolStripMenuItem.Click
@@ -5781,7 +5813,7 @@ Public Class frmConstructor_Main
CURRENT_FORM_ID = ENTITY_ID CURRENT_FORM_ID = ENTITY_ID
ClassControlValueCache.ClearCache() ClassControlValueCache.ClearCache()
DisableEditMode() DisableEditMode()
Load_Entity_Data(ACT_EBENE) Load_Entity_Data(ACT_EBENE, False)
RECORD_CHANGED = False RECORD_CHANGED = False
Catch ex As Exception Catch ex As Exception
MsgBox("Unexpected Error in Clear Cache:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) MsgBox("Unexpected Error in Clear Cache:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
@@ -6173,7 +6205,7 @@ Public Class frmConstructor_Main
Save_Grid_Layout() Save_Grid_Layout()
frmMass_Change.ShowDialog() frmMass_Change.ShowDialog()
If SUCCESSFULL = True Then If SUCCESSFULL = True Then
Load_Datafor_Entity() Load_Datafor_Entity(False)
End If End If
Catch ex As Exception Catch ex As Exception
MsgBox("Unexpected Error in MassChange Collector:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) MsgBox("Unexpected Error in MassChange Collector:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)