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

MS07062016

Browse Source
This commit is contained in:
SchreiberM
2016-06-08 11:17:46 +02:00
parent 65788f29f8
commit 9920ffe9e6
7 changed files with 68 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2135,16 +2135,9 @@ Public Class frmConstructor_Main
grvwTiles.FocusedRowHandle = -1
grvwTiles.OptionsTiles.HighlightFocusedTileOnGridLoad = False
End If
Dim RecLoaded As Boolean = False
If LOAD_DIRECT = True Then
Load_Record_Direct()
RecLoaded = True
End If
If ENTITY_RECORD_COUNT = 1 Then
If RecLoaded = False Then
Load_Record_Direct()
End If
End If
Load_Grid_Layout()
Load_Splitter_Layout()
' Dim sql1 = _ENTITYSQL
' sql1.Replace("T.*", "TOP 1 [Record-ID]")
' Dim id = ClassDatabase.Execute_Scalar(sql1, True)
@@ -2155,8 +2148,7 @@ Public Class frmConstructor_Main
'End If
'Überprüfen ob es für diese Entität Wiedervorlagen gibt?
Check_FOLLOWUP_IsConfigured(ENTITY_ID)
Load_Grid_Layout()
Load_Splitter_Layout()
SET_ROWCOUNT_STRING()
End If
If POS_ENTITY > 0 Then
@@ -2185,6 +2177,16 @@ Public Class frmConstructor_Main
'Zurücksetzen
ENTITY_LOADED = True
Dim RecLoaded As Boolean = False
If LOAD_DIRECT = True Then
Load_Record_Direct()
RecLoaded = True
End If
If ENTITY_RECORD_COUNT = 1 Then
If RecLoaded = False Then
Load_Record_Direct()
End If
End If
End If
sw.Done()
@@ -2203,26 +2205,27 @@ Public Class frmConstructor_Main
End Sub
Sub Load_Record_Direct()
Try
grvwGrid.FocusedRowHandle = 0
Dim Grid_RecordID = Get_Focused_Row_Cell_Value("Record-ID")
If Not IsNothing(Grid_RecordID) Then
Select Case ACT_EBENE
Case 1
PARENT_RECORDID = Grid_RecordID
CURRENT_RECORD_ID = PARENT_RECORDID
SELECTED_RECORD_ID = Grid_RecordID
RECORD_ID = Grid_RecordID
ENTITY_RELOAD_AFT_CONTROL_LOAD = False
'Daten zu Record in jedem Fall laden
'ClassControlValues.LoadControlValues(SELECTED_RECORD_ID, ENTITY_ID, CtrlBuilder.AllControls)
CtrlBuilder.WatchRecordChanges = False
ClassControlValues.LoadControlValuesListWithPlaceholders(ENTITY_ID, Grid_RecordID, PARENT_RECORDID, CtrlBuilder.AllControls, ENTITY_ID)
ClassControlValues.LoadControlValues(SELECTED_RECORD_ID, PARENT_RECORDID, ENTITY_ID, CtrlBuilder.AllControls, ENTITY_ID)
CtrlBuilder.WatchRecordChanges = True
' Laden der Daten bedeutet nicht dass Daten vom Benutzer geändert wurden!
RECORD_CHANGED = False
Update_Record_Label(Grid_RecordID)
Check_Rights()
Column_Row_Handler()
'PARENT_RECORDID = Grid_RecordID
'CURRENT_RECORD_ID = PARENT_RECORDID
'SELECTED_RECORD_ID = Grid_RecordID
'RECORD_ID = Grid_RecordID
'ENTITY_RELOAD_AFT_CONTROL_LOAD = False
''Daten zu Record in jedem Fall laden
''ClassControlValues.LoadControlValues(SELECTED_RECORD_ID, ENTITY_ID, CtrlBuilder.AllControls)
'CtrlBuilder.WatchRecordChanges = False
'ClassControlValues.LoadControlValuesListWithPlaceholders(ENTITY_ID, Grid_RecordID, PARENT_RECORDID, CtrlBuilder.AllControls, ENTITY_ID)
'ClassControlValues.LoadControlValues(SELECTED_RECORD_ID, PARENT_RECORDID, ENTITY_ID, CtrlBuilder.AllControls, ENTITY_ID)
'CtrlBuilder.WatchRecordChanges = True
'' Laden der Daten bedeutet nicht dass Daten vom Benutzer geändert wurden!
'RECORD_CHANGED = False
'Update_Record_Label(Grid_RecordID)
'Check_Rights()
End Select
End If
Catch ex As Exception