From 161f8c9c2e014ce11407c14c0ee42d96cd3bd77b Mon Sep 17 00:00:00 2001 From: JenneJ Date: Wed, 2 Dec 2015 13:00:30 +0100 Subject: [PATCH] jj_02_12 --- .../ClassControlCommandsUI.vb | 4 ++-- .../frmForm_Constructor_Main_2.vb | 24 +++++++++++-------- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/app/DD-Record-Organiser/ClassControlCommandsUI.vb b/app/DD-Record-Organiser/ClassControlCommandsUI.vb index 9d18db1..e98240b 100644 --- a/app/DD-Record-Organiser/ClassControlCommandsUI.vb +++ b/app/DD-Record-Organiser/ClassControlCommandsUI.vb @@ -330,7 +330,7 @@ Public Class ClassControlCommandsUI InsertAllControls(FormID, RecordID, DirectCast(ctrl, GroupBox).Controls) End If Else - InsertControlValue(ctrl.Name, RecordID, CONTROL_VALUE) + InsertControlValue(CONTROL_ID, RecordID, CONTROL_VALUE) End If Next End Sub @@ -574,7 +574,7 @@ Public Class ClassControlCommandsUI End Select End Function - Public Shared Function InsertControlValue(ControlID As String, RecordID As Integer, Value As String) + Public Shared Function InsertControlValue(ControlID As Integer, RecordID As Integer, Value As String) Try Dim AddedWho = Environment.UserName Dim FORMAT_TYPE As String = ClassDatabase.Execute_Scalar("SELECT FORMAT_TYPE FROM TBPMO_CONTROL WHERE GUID = " & ControlID) diff --git a/app/DD-Record-Organiser/frmForm_Constructor_Main_2.vb b/app/DD-Record-Organiser/frmForm_Constructor_Main_2.vb index 7c1397e..5f278fb 100644 --- a/app/DD-Record-Organiser/frmForm_Constructor_Main_2.vb +++ b/app/DD-Record-Organiser/frmForm_Constructor_Main_2.vb @@ -425,7 +425,7 @@ Public Class frmForm_Constructor_Main_2 Return grvwGridPos.GetFocusedRowCellValue(grvwGrid.Columns(columnName)) End Function Private Sub grvwGrid_FocusedColumnChanged(sender As Object, e As FocusedColumnChangedEventArgs) Handles grvwGrid.FocusedColumnChanged - Column_Row_Handler + Column_Row_Handler() End Sub Private Sub GridView_FocusedRowChanged(sender As Object, e As DevExpress.XtraGrid.Views.Base.FocusedRowChangedEventArgs) Handles grvwGrid.FocusedRowChanged, grvwTiles.FocusedRowChanged, grvwCarousel.FocusedRowChanged Column_Row_Handler() @@ -858,7 +858,11 @@ Public Class frmForm_Constructor_Main_2 EBENE1_RECID = recid For Each row As DataRow In DT_SELECTION.Rows If row.Item("Record-ID") = SELECTED_RECORD_ID Then - EBENE1_GRID_RESULT = row.Item(EBENE1_COLUMNNAME) + If EBENE1_COLUMNNAME = "" Then + EBENE1_GRID_RESULT = "No Column configured" + Else + EBENE1_GRID_RESULT = row.Item(EBENE1_COLUMNNAME) + End If End If Next Case 2 @@ -901,7 +905,7 @@ Public Class frmForm_Constructor_Main_2 End If End If End If - + Catch ex As Exception MsgBox("Error in Save Data:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) End Try @@ -1033,7 +1037,7 @@ Public Class frmForm_Constructor_Main_2 LOAD_DIRECT = ClassDatabase.Execute_Scalar("SELECT LOAD_DIRECT FROM VWPMO_CONSTRUCTOR_FORMS WHERE CONSTRUCT_ID = " & CONSTRUCTORID & " AND FORM_ID = " & CURRENT_FORM_ID) CURRENT_CONSTRUCTOR_DETAIL_ID = ClassDatabase.Execute_Scalar("SELECT GUID FROM VWPMO_CONSTRUCTOR_FORMS WHERE CONSTRUCT_ID = " & CONSTRUCTORID & " AND FORM_ID = " & CURRENT_FORM_ID) POS_ENTITY = ClassDatabase.Execute_Scalar("SELECT POS_ENTITY FROM TBPMO_FORM WHERE GUID = " & CURRENT_FORM_ID) - + If VIEW_ID_RUNTIME <> -1 Then GRID_TYPE_ID = VIEW_ID_RUNTIME @@ -1254,7 +1258,7 @@ Public Class frmForm_Constructor_Main_2 Dim Grid_RecordID = Get_Focused_Row_Cell_Value("Record-ID") If Not IsNothing(Grid_RecordID) Then - Select ACT_EBENE + Select Case ACT_EBENE Case 1 PARENT_RECORDID = Grid_RecordID CURRENT_PARENTID = PARENT_RECORDID @@ -1383,7 +1387,7 @@ Public Class frmForm_Constructor_Main_2 Catch ex As Exception MsgBox("Error in LoadGrid_Selection:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) End Try - + End Sub Private Sub Check_Record_Changed() @@ -1603,7 +1607,7 @@ Public Class frmForm_Constructor_Main_2 If CURRENT_FORM_TYPE = 5 Or IS_SINGLE_RECORD = True Then '#### Es sind untergeordnete Entitäten geöffnet#### - + If LogErrorsOnly = False Then ClassLogger.Add(">> Grid_RecordID: " & Grid_RecordID.ToString, False) Dim pID As Integer Select Case ACT_EBENE '#### Hier muss nun der Parent-Record gewählt werden #### @@ -1803,7 +1807,7 @@ Public Class frmForm_Constructor_Main_2 Catch ex As Exception MsgBox("Error in Load_Pos_Data:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) End Try - + End Sub Function Get_GridResult(Columnname As String) Dim result = Get_Focused_Row_Cell_Value(Columnname) @@ -2358,7 +2362,7 @@ Public Class frmForm_Constructor_Main_2 If TCDetails.SelectedTabPage.Text.StartsWith("Wieder") Then Refresh_FollowUps() End If - + Select Case TCDetails.SelectedTabPageIndex Case 0 'If RECORD_NEEDS_REFRESH = True Then @@ -2369,7 +2373,7 @@ Public Class frmForm_Constructor_Main_2 'Refresh_CreatedChangedRecordByID(CURRENT_RECORD_ID) ' RECORD_CHANGED = False Case 1 'windream-Dokumente - + Case 2 'Refresh_FollowUps()