From 16ae3d142fbc1fa35a922863227f3e1973cb5609 Mon Sep 17 00:00:00 2001 From: SchreiberM Date: Fri, 11 Dec 2015 11:16:57 +0100 Subject: [PATCH] MS_11.12.2015 --- app/DD-Record-Organiser/ClassControlValues.vb | 417 +++++++++++------- .../ModuleHelperMethods.vb | 8 +- .../My Project/AssemblyInfo.vb | 2 +- app/DD-Record-Organiser/frmConfig_Basic.vb | 15 + .../frmConstructorDesigner.Designer.vb | 32 +- .../frmConstructorDesigner.resx | 5 +- .../frmConstructorDesigner.vb | 16 +- .../frmForm_Constructor.designer.vb | 22 +- .../frmForm_Constructor.resx | 2 +- .../frmForm_Constructor.vb | 1 + .../frmForm_Constructor_Main_2.Designer.vb | 119 +++-- .../frmForm_Constructor_Main_2.resx | 2 +- .../frmForm_Constructor_Main_2.vb | 304 +++++++++---- app/DD-Record-Organiser/frmMain.vb | 3 + app/DD-Record-Organiser/frmWD_Index_Dokart.vb | 18 +- app/SetupWiX/Product.wxs | 2 +- 16 files changed, 648 insertions(+), 320 deletions(-) diff --git a/app/DD-Record-Organiser/ClassControlValues.vb b/app/DD-Record-Organiser/ClassControlValues.vb index b67833b..57cab58 100644 --- a/app/DD-Record-Organiser/ClassControlValues.vb +++ b/app/DD-Record-Organiser/ClassControlValues.vb @@ -141,7 +141,6 @@ Public Class ClassControlValues ClearControlValues(controls) For Each control As Control In controls - 'Überhaupt Columns in Grid? CONTROL_ID = GetControlID_for_RecordID(control.Name, RecordID) If CONTROL_ID = -1 Then @@ -150,183 +149,303 @@ Public Class ClassControlValues If LogErrorsOnly = False Then ClassLogger.Add(">> CONTROL_ID:" & CONTROL_ID, False) ClearControlValue(control) If TypeOf control Is ComboBox Then - LoadControlValues(RecordID, FormID, DirectCast(control, ComboBox).Controls) - End If - If TypeOf control Is GroupBox Then - LoadControlValues(RecordID, FormID, DirectCast(control, GroupBox).Controls) - End If - - If TypeOf control Is PictureBox Then + LoadControlValue_forControl(RecordID, FormID, DirectCast(control, ComboBox), CONTROL_ID) + 'LoadControlValues(RecordID, FormID, DirectCast(control, ComboBox).Controls) + ElseIf TypeOf control Is GroupBox Then + LoadControlValue_forControl(RecordID, FormID, DirectCast(control, GroupBox), CONTROL_ID) + ' LoadControlValues(RecordID, FormID, DirectCast(control, GroupBox).Controls) + ElseIf TypeOf control Is PictureBox Then LoadImage(RecordID, CONTROL_ID, control) + Else + LoadControlValue(RecordID, CONTROL_ID, control) End If - 'EINE CheckedListBoxControl - If TypeOf control Is DevExpress.XtraEditors.CheckedListBoxControl Then - If LogErrorsOnly = False Then ClassLogger.Add(">> control DevExpress.XtraEditors.CheckedListBoxControl", False) - Dim chklbx As DevExpress.XtraEditors.CheckedListBoxControl - chklbx = DirectCast(control, DevExpress.XtraEditors.CheckedListBoxControl) - - Dim chklbSql As String = "SELECT SQL_COMMAND_1 FROM TBPMO_CONTROL WHERE GUID = " & CONTROL_ID - chklbSql = ClassDatabase.Execute_Scalar(chklbSql) - If Not (chklbSql Is Nothing Or chklbSql = String.Empty) Then - If chklbSql.ToString.Contains("@") Then - chklbSql = chklbSql.ToString.Replace("@RECORDID", CURRENT_RECORD_ID) - chklbSql = chklbSql.ToString.Replace("@RECORD_ID", CURRENT_RECORD_ID) - chklbSql = chklbSql.ToString.Replace("@PARENTRECORD_ID", CURRENT_PARENTID) - If LogErrorsOnly = False Then ClassLogger.Add(">> SQL CheckedListBox: " & chklbSql, False) - 'SQL-Command vorhanden also Ausführen des SQL - Dim DT_ListBox As DataTable = ClassDatabase.Return_Datatable(chklbSql, "LoadControlValues: CheckedListBox") - If DT_ListBox Is Nothing = False Then - chklbx.DataSource = DT_ListBox - Select Case DT_ListBox.Columns.Count - Case 2 - chklbx.DisplayMember = DT_ListBox.Columns(1).ColumnName - chklbx.ValueMember = DT_ListBox.Columns(0).ColumnName - Case 1 - chklbx.DisplayMember = DT_ListBox.Columns(0).ColumnName - chklbx.ValueMember = DT_ListBox.Columns(0).ColumnName - End Select + ''EINE CheckedListBoxControl + 'If TypeOf control Is DevExpress.XtraEditors.CheckedListBoxControl Then + ' If LogErrorsOnly = False Then ClassLogger.Add(">> control DevExpress.XtraEditors.CheckedListBoxControl", False) + ' Dim chklbx As DevExpress.XtraEditors.CheckedListBoxControl + ' chklbx = DirectCast(control, DevExpress.XtraEditors.CheckedListBoxControl) + + ' Dim chklbSql As String = "SELECT SQL_COMMAND_1 FROM TBPMO_CONTROL WHERE GUID = " & CONTROL_ID + ' chklbSql = ClassDatabase.Execute_Scalar(chklbSql) + ' If Not (chklbSql Is Nothing Or chklbSql = String.Empty) Then + ' If chklbSql.ToString.Contains("@") Then + ' chklbSql = chklbSql.ToString.Replace("@RECORDID", CURRENT_RECORD_ID) + ' chklbSql = chklbSql.ToString.Replace("@RECORD_ID", CURRENT_RECORD_ID) + ' chklbSql = chklbSql.ToString.Replace("@PARENTRECORD_ID", CURRENT_PARENTID) + ' If LogErrorsOnly = False Then ClassLogger.Add(">> SQL CheckedListBox: " & chklbSql, False) + ' 'SQL-Command vorhanden also Ausführen des SQL + ' Dim DT_ListBox As DataTable = ClassDatabase.Return_Datatable(chklbSql, "LoadControlValues: CheckedListBox") + ' If DT_ListBox Is Nothing = False Then + ' chklbx.DataSource = DT_ListBox + ' Select Case DT_ListBox.Columns.Count + ' Case 2 + ' chklbx.DisplayMember = DT_ListBox.Columns(1).ColumnName + ' chklbx.ValueMember = DT_ListBox.Columns(0).ColumnName + ' Case 1 + ' chklbx.DisplayMember = DT_ListBox.Columns(0).ColumnName + ' chklbx.ValueMember = DT_ListBox.Columns(0).ColumnName + ' End Select + + ' End If + ' End If + + ' ElseIf (chklbSql = String.Empty) Then + ' ' Wenn keine SQL Command ein leerer String ist, + ' ' lade das Control ohne Datenbank, da es wahrscheinlich eine Static List ist + ' chklbSql = "SELECT VALUE FROM VWPMO_VALUES WHERE CONTROL_ID = " & CONTROL_ID & " AND RECORD_ID = " & RecordID + ' Dim result As String = ClassDatabase.Execute_Scalar(chklbSql) + + ' If Not IsNothing(result) Then + ' If result.ToString <> String.Empty Then + ' Dim entries() As String = result.Split(";") + ' For Each entry As String In entries + ' Dim position = chklbx.FindStringExact(entry) + ' chklbx.SetItemCheckState(position, CheckState.Checked) + ' Next + ' End If + ' End If + + ' Continue For + ' Else + ' If LogErrorsOnly = False Then ClassLogger.Add(">> chklbSql is nothing", False) + ' End If + + ' chklbx.UnCheckAll() + ' 'Recorddatensätze durchlaufen und überprüfen ob angehakt?? + ' Dim index As Integer = 0 + ' For i As Integer = 0 To chklbx.ItemCount - 1 + ' Dim item = chklbx.GetItem(i) + ' Dim row As DataRowView = CType(item, DataRowView) + ' If CInt(row(0)) > 0 Then + ' 'Überprüfen ob es den Record gibt + ' Dim SQL = "SELECT COUNT(*) FROM TBPMO_RECORD_CONNECT WHERE RECORD1_ID = " & CURRENT_RECORD_ID & " AND RECORD2_ID = " & CInt(row(0)) + ' If ClassDatabase.Execute_Scalar(SQL) = 1 Then + ' chklbx.SetItemChecked(i, True) + ' End If + ' End If + + ' Next + 'ElseIf TypeOf control Is DevExpress.XtraEditors.ListBoxControl Then + ' If LogErrorsOnly = False Then ClassLogger.Add(">> control DevExpress.XtraEditors.ListBoxControl", False) + ' Dim lbx As DevExpress.XtraEditors.ListBoxControl + ' lbx = DirectCast(control, DevExpress.XtraEditors.ListBoxControl) + ' Dim lbSql As String = "SELECT SQL_COMMAND_1 FROM TBPMO_CONTROL WHERE GUID = " & CONTROL_ID + ' lbSql = ClassDatabase.Execute_Scalar(lbSql) + ' If Not (lbSql Is Nothing Or lbSql = String.Empty) Then + ' If lbSql.ToString.Contains("@") Then + ' lbSql = lbSql.ToString.Replace("@RECORDID".ToUpper, CURRENT_RECORD_ID) + ' lbSql = lbSql.ToString.Replace("@RECORD_ID".ToUpper, CURRENT_RECORD_ID) + ' lbSql = lbSql.ToString.Replace("@PARENTRECORD_ID".ToUpper, CURRENT_PARENTID) + ' If LogErrorsOnly = False Then ClassLogger.Add(">> SQL ListBox: " & lbSql, False) + ' 'SQL-Command vorhanden also Ausführen des SQL + ' Dim DT_ListBox As DataTable = ClassDatabase.Return_Datatable(lbSql, "LoadControlValues: ListBoxControl") + ' If DT_ListBox Is Nothing = False Then + ' lbx.DataSource = DT_ListBox + ' Select Case DT_ListBox.Columns.Count + ' Case 2 + ' lbx.DisplayMember = DT_ListBox.Columns(1).ColumnName + ' lbx.ValueMember = DT_ListBox.Columns(0).ColumnName + ' Case 1 + ' lbx.DisplayMember = DT_ListBox.Columns(0).ColumnName + ' lbx.ValueMember = DT_ListBox.Columns(0).ColumnName + ' End Select + ' If DT_ListBox.Columns.Count > 1 Then + + ' End If + + ' Else + ' If LogErrorsOnly = False Then ClassLogger.Add(">> DT_ListBox is nothing", False) + ' End If + ' Else + ' If LogErrorsOnly = False Then ClassLogger.Add(">> lbSql.ToString NOT Contains(@)", False) + ' End If + ' ElseIf (lbSql = String.Empty) Then + ' ' Wenn keine SQL Command ein leerer String ist, + ' ' lade das Control ohne Datenbank, da es wahrscheinlich eine Static List ist + ' LoadControlValue(RecordID, CONTROL_ID, control) + ' Continue For + ' Else + ' If LogErrorsOnly = False Then ClassLogger.Add(">> lbSql is nothing", False) + ' End If + 'ElseIf CONTROL_ID <> -1 Then + ' 'If LogErrorsOnly = False Then ClassLogger.Add(">> LoadControlValues CONTROL_ID: " & CONTROL_ID, False) + ' LoadControlValue(RecordID, CONTROL_ID, control) + 'End If + Next + Catch ex As Exception + MsgBox("Unexpected Error in LoadControlValues:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) + End Try + + End Sub + Public Shared Sub LoadControlValue_forControl(RecordID As Integer, FormID As Integer, control As System.Windows.Forms.Control, CONTROL_ID As Integer) + Try + 'EINE CheckedListBoxControl + If TypeOf control Is DevExpress.XtraEditors.CheckedListBoxControl Then + If LogErrorsOnly = False Then ClassLogger.Add(">> control DevExpress.XtraEditors.CheckedListBoxControl", False) + Dim chklbx As DevExpress.XtraEditors.CheckedListBoxControl + chklbx = DirectCast(control, DevExpress.XtraEditors.CheckedListBoxControl) + + Dim chklbSql As String = "SELECT SQL_COMMAND_1 FROM TBPMO_CONTROL WHERE GUID = " & CONTROL_ID + chklbSql = ClassDatabase.Execute_Scalar(chklbSql) + If Not (chklbSql Is Nothing Or chklbSql = String.Empty) Then + If chklbSql.ToString.Contains("@") Then + chklbSql = chklbSql.ToString.Replace("@RECORDID", CURRENT_RECORD_ID) + chklbSql = chklbSql.ToString.Replace("@RECORD_ID", CURRENT_RECORD_ID) + chklbSql = chklbSql.ToString.Replace("@PARENTRECORD_ID", CURRENT_PARENTID) + If LogErrorsOnly = False Then ClassLogger.Add(">> SQL CheckedListBox: " & chklbSql, False) + 'SQL-Command vorhanden also Ausführen des SQL + Dim DT_ListBox As DataTable = ClassDatabase.Return_Datatable(chklbSql, "LoadControlValue_forControl: CheckedListBox") + If DT_ListBox Is Nothing = False Then + chklbx.DataSource = DT_ListBox + Select Case DT_ListBox.Columns.Count + Case 2 + chklbx.DisplayMember = DT_ListBox.Columns(1).ColumnName + chklbx.ValueMember = DT_ListBox.Columns(0).ColumnName + Case 1 + chklbx.DisplayMember = DT_ListBox.Columns(0).ColumnName + chklbx.ValueMember = DT_ListBox.Columns(0).ColumnName + End Select - End If End If - - ElseIf (chklbSql = String.Empty) Then - ' Wenn keine SQL Command ein leerer String ist, - ' lade das Control ohne Datenbank, da es wahrscheinlich eine Static List ist - chklbSql = "SELECT VALUE FROM VWPMO_VALUES WHERE CONTROL_ID = " & CONTROL_ID & " AND RECORD_ID = " & RecordID - Dim result As String = ClassDatabase.Execute_Scalar(chklbSql) - - If Not IsNothing(result) Then - If result.ToString <> String.Empty Then - Dim entries() As String = result.Split(";") - For Each entry As String In entries - Dim position = chklbx.FindStringExact(entry) - chklbx.SetItemCheckState(position, CheckState.Checked) - Next - End If + End If + ElseIf (chklbSql = String.Empty) Then + ' Wenn keine SQL Command ein leerer String ist, + ' lade das Control ohne Datenbank, da es wahrscheinlich eine Static List ist + chklbSql = "SELECT VALUE FROM VWPMO_VALUES WHERE CONTROL_ID = " & CONTROL_ID & " AND RECORD_ID = " & RecordID + Dim result As String = ClassDatabase.Execute_Scalar(chklbSql) + + If Not IsNothing(result) Then + If result.ToString <> String.Empty Then + Dim entries() As String = result.Split(";") + For Each entry As String In entries + Dim position = chklbx.FindStringExact(entry) + chklbx.SetItemCheckState(position, CheckState.Checked) + Next End If - - Continue For - Else - If LogErrorsOnly = False Then ClassLogger.Add(">> chklbSql is nothing", False) End If + Else + If LogErrorsOnly = False Then ClassLogger.Add(">> chklbSql is nothing", False) + End If - chklbx.UnCheckAll() - 'Recorddatensätze durchlaufen und überprüfen ob angehakt?? - Dim index As Integer = 0 - For i As Integer = 0 To chklbx.ItemCount - 1 - Dim item = chklbx.GetItem(i) - Dim row As DataRowView = CType(item, DataRowView) - If CInt(row(0)) > 0 Then - 'Überprüfen ob es den Record gibt - Dim SQL = "SELECT COUNT(*) FROM TBPMO_RECORD_CONNECT WHERE RECORD1_ID = " & CURRENT_RECORD_ID & " AND RECORD2_ID = " & CInt(row(0)) - If ClassDatabase.Execute_Scalar(SQL) = 1 Then - chklbx.SetItemChecked(i, True) - End If + chklbx.UnCheckAll() + 'Recorddatensätze durchlaufen und überprüfen ob angehakt?? + Dim index As Integer = 0 + For i As Integer = 0 To chklbx.ItemCount - 1 + Dim item = chklbx.GetItem(i) + Dim row As DataRowView = CType(item, DataRowView) + If CInt(row(0)) > 0 Then + 'Überprüfen ob es den Record gibt + Dim SQL = "SELECT COUNT(*) FROM TBPMO_RECORD_CONNECT WHERE RECORD1_ID = " & CURRENT_RECORD_ID & " AND RECORD2_ID = " & CInt(row(0)) + If ClassDatabase.Execute_Scalar(SQL) = 1 Then + chklbx.SetItemChecked(i, True) End If + End If - Next - ElseIf TypeOf control Is DevExpress.XtraEditors.ListBoxControl Then - If LogErrorsOnly = False Then ClassLogger.Add(">> control DevExpress.XtraEditors.ListBoxControl", False) - Dim lbx As DevExpress.XtraEditors.ListBoxControl - lbx = DirectCast(control, DevExpress.XtraEditors.ListBoxControl) - Dim lbSql As String = "SELECT SQL_COMMAND_1 FROM TBPMO_CONTROL WHERE GUID = " & CONTROL_ID - lbSql = ClassDatabase.Execute_Scalar(lbSql) - If Not (lbSql Is Nothing Or lbSql = String.Empty) Then - If lbSql.ToString.Contains("@") Then - lbSql = lbSql.ToString.Replace("@RECORDID".ToUpper, CURRENT_RECORD_ID) - lbSql = lbSql.ToString.Replace("@RECORD_ID".ToUpper, CURRENT_RECORD_ID) - lbSql = lbSql.ToString.Replace("@PARENTRECORD_ID".ToUpper, CURRENT_PARENTID) - If LogErrorsOnly = False Then ClassLogger.Add(">> SQL ListBox: " & lbSql, False) - 'SQL-Command vorhanden also Ausführen des SQL - Dim DT_ListBox As DataTable = ClassDatabase.Return_Datatable(lbSql, "LoadControlValues: ListBoxControl") - If DT_ListBox Is Nothing = False Then - lbx.DataSource = DT_ListBox - Select Case DT_ListBox.Columns.Count - Case 2 - lbx.DisplayMember = DT_ListBox.Columns(1).ColumnName - lbx.ValueMember = DT_ListBox.Columns(0).ColumnName - Case 1 - lbx.DisplayMember = DT_ListBox.Columns(0).ColumnName - lbx.ValueMember = DT_ListBox.Columns(0).ColumnName - End Select - If DT_ListBox.Columns.Count > 1 Then + Next + ElseIf TypeOf control Is DevExpress.XtraEditors.ListBoxControl Then + If LogErrorsOnly = False Then ClassLogger.Add(">> control DevExpress.XtraEditors.ListBoxControl", False) + Dim lbx As DevExpress.XtraEditors.ListBoxControl + lbx = DirectCast(control, DevExpress.XtraEditors.ListBoxControl) + Dim lbSql As String = "SELECT SQL_COMMAND_1 FROM TBPMO_CONTROL WHERE GUID = " & CONTROL_ID + lbSql = ClassDatabase.Execute_Scalar(lbSql) + If Not (lbSql Is Nothing Or lbSql = String.Empty) Then + If lbSql.ToString.Contains("@") Then + lbSql = lbSql.ToString.Replace("@RECORDID".ToUpper, CURRENT_RECORD_ID) + lbSql = lbSql.ToString.Replace("@RECORD_ID".ToUpper, CURRENT_RECORD_ID) + lbSql = lbSql.ToString.Replace("@PARENTRECORD_ID".ToUpper, CURRENT_PARENTID) + If LogErrorsOnly = False Then ClassLogger.Add(">> SQL ListBox: " & lbSql, False) + 'SQL-Command vorhanden also Ausführen des SQL + Dim DT_ListBox As DataTable = ClassDatabase.Return_Datatable(lbSql, "LoadControlValue_forControl: ListBoxControl") + If DT_ListBox Is Nothing = False Then + lbx.DataSource = DT_ListBox + Select Case DT_ListBox.Columns.Count + Case 2 + lbx.DisplayMember = DT_ListBox.Columns(1).ColumnName + lbx.ValueMember = DT_ListBox.Columns(0).ColumnName + Case 1 + lbx.DisplayMember = DT_ListBox.Columns(0).ColumnName + lbx.ValueMember = DT_ListBox.Columns(0).ColumnName + End Select + If DT_ListBox.Columns.Count > 1 Then - End If - - Else - If LogErrorsOnly = False Then ClassLogger.Add(">> DT_ListBox is nothing", False) End If + Else - If LogErrorsOnly = False Then ClassLogger.Add(">> lbSql.ToString NOT Contains(@)", False) + If LogErrorsOnly = False Then ClassLogger.Add(">> DT_ListBox is nothing", False) End If - ElseIf (lbSql = String.Empty) Then - ' Wenn keine SQL Command ein leerer String ist, - ' lade das Control ohne Datenbank, da es wahrscheinlich eine Static List ist - LoadControlValue(RecordID, CONTROL_ID, control) - Continue For Else - If LogErrorsOnly = False Then ClassLogger.Add(">> lbSql is nothing", False) + If LogErrorsOnly = False Then ClassLogger.Add(">> lbSql.ToString NOT Contains(@)", False) End If - ElseIf CONTROL_ID <> -1 Then - 'If LogErrorsOnly = False Then ClassLogger.Add(">> LoadControlValues CONTROL_ID: " & CONTROL_ID, False) + ElseIf (lbSql = String.Empty) Then + ' Wenn keine SQL Command ein leerer String ist, + ' lade das Control ohne Datenbank, da es wahrscheinlich eine Static List ist LoadControlValue(RecordID, CONTROL_ID, control) + Else + If LogErrorsOnly = False Then ClassLogger.Add(">> lbSql is nothing", False) End If - Next + ElseIf CONTROL_ID <> -1 Then + 'If LogErrorsOnly = False Then ClassLogger.Add(">> LoadControlValue_forControl CONTROL_ID: " & CONTROL_ID, False) + LoadControlValue(RecordID, CONTROL_ID, control) + End If + Catch ex As Exception - MsgBox("Unexpected Error in LoadControlValues:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) + MsgBox("Unexpected Error in LoadControlValue_forControl:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) End Try - - End Sub + End Sub Public Shared Sub LoadControlValuesList(RecordID As Integer, FormID As Integer, controls As Control.ControlCollection) + Try + For Each Ctrl As Control In controls - For Each C As Control In controls + If TypeOf Ctrl Is ComboBox Then + Dim Combobox = DirectCast(Ctrl, ComboBox) - If TypeOf C Is ComboBox Then - Dim Combobox = DirectCast(C, ComboBox) + Dim SQL As String = String.Format("SELECT SQL_COMMAND_1 FROM TBPMO_CONTROL WHERE FORM_ID = {0} AND NAME = '{1}'", CURRENT_FORM_ID, Ctrl.Name) + Dim SQL2 As String = ClassDatabase.Execute_Scalar(SQL) - Dim SQL As String = String.Format("SELECT SQL_COMMAND_1 FROM TBPMO_CONTROL WHERE FORM_ID = {0} AND NAME = '{1}'", CURRENT_FORM_ID, C.Name) - Dim SQL2 As String = ClassDatabase.Execute_Scalar(SQL) - - If SQL2 = "" Then - Exit Sub - End If - If SQL2.ToString.ToUpper.Contains("@") Then - SQL2 = SQL2.ToString.Replace("@RECORDID", CURRENT_RECORD_ID) - SQL2 = SQL2.ToString.Replace("@RECORD_ID", CURRENT_RECORD_ID) - SQL2 = SQL2.ToString.Replace("@PARENTRECORD_ID", CURRENT_PARENTID) - ' If LogErrorsOnly = False Then ClassLogger.Add(">> SQL Combobox: " & cmbSql, False) - End If - Dim DT_Combobox As DataTable = ClassDatabase.Return_Datatable(SQL2) - If DT_Combobox Is Nothing = False Then - If DT_Combobox.Rows.Count > 0 Then - Combobox.DataSource = DT_Combobox - Combobox.DisplayMember = DT_Combobox.Columns(1).ColumnName - Combobox.ValueMember = DT_Combobox.Columns(0).ColumnName - Combobox.AutoCompleteMode = AutoCompleteMode.Append - Combobox.AutoCompleteSource = AutoCompleteSource.ListItems + If SQL2 = "" Then + Exit Sub End If - Dim iWidestWidth As Integer = 300 - For Each row As DataRow In DT_Combobox.Rows - 'Die BReite der DropDown-Lsit anpassen - Using g As Graphics = Combobox.CreateGraphics - If g.MeasureString(row.Item(1).ToString, Combobox.Font).Width + 30 > iWidestWidth Then - iWidestWidth = g.MeasureString(row.Item(1).ToString, Combobox.Font).Width + 30 - End If - g.Dispose() - End Using - ' control.Items.Add(row.Item(0).ToString) - Next - If iWidestWidth > 300 Then - Combobox.DropDownWidth = Math.Max(iWidestWidth, Combobox.Width) + If SQL2.ToString.ToUpper.Contains("@") Then + SQL2 = SQL2.ToString.Replace("@RECORDID", CURRENT_RECORD_ID) + SQL2 = SQL2.ToString.Replace("@RECORD_ID", CURRENT_RECORD_ID) + SQL2 = SQL2.ToString.Replace("@PARENTRECORD_ID", CURRENT_PARENTID) + ' If LogErrorsOnly = False Then ClassLogger.Add(">> SQL Combobox: " & cmbSql, False) End If - LoadControlValue(RecordID, GetControlID_for_Name(Combobox.Name, FormID), C) + Dim DT_Combobox As DataTable = ClassDatabase.Return_Datatable(SQL2) + If DT_Combobox Is Nothing = False Then + If DT_Combobox.Rows.Count > 0 Then + Combobox.DataSource = DT_Combobox + Combobox.DisplayMember = DT_Combobox.Columns(1).ColumnName + Combobox.ValueMember = DT_Combobox.Columns(0).ColumnName + Combobox.AutoCompleteMode = AutoCompleteMode.Append + Combobox.AutoCompleteSource = AutoCompleteSource.ListItems + End If + Dim iWidestWidth As Integer = 300 + For Each row As DataRow In DT_Combobox.Rows + 'Die BReite der DropDown-Lsit anpassen + Using g As Graphics = Combobox.CreateGraphics + If g.MeasureString(row.Item(1).ToString, Combobox.Font).Width + 30 > iWidestWidth Then + iWidestWidth = g.MeasureString(row.Item(1).ToString, Combobox.Font).Width + 30 + End If + g.Dispose() + End Using + ' control.Items.Add(row.Item(0).ToString) + Next + If iWidestWidth > 300 Then + Combobox.DropDownWidth = Math.Max(iWidestWidth, Combobox.Width) + End If + LoadControlValue(RecordID, GetControlID_for_Name(Combobox.Name, FormID), Ctrl) - End If + End If - End If + End If - Next + Next + Catch ex As Exception + MsgBox("Unexpected Error in LoadControlValuesList:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) + End Try + End Sub diff --git a/app/DD-Record-Organiser/ModuleHelperMethods.vb b/app/DD-Record-Organiser/ModuleHelperMethods.vb index df0c23e..39f3acf 100644 --- a/app/DD-Record-Organiser/ModuleHelperMethods.vb +++ b/app/DD-Record-Organiser/ModuleHelperMethods.vb @@ -117,7 +117,6 @@ Public Function GetControlID_for_RecordID(name As String, recID As Integer) As Integer Try Dim SQL = "SELECT CONTROL_ID FROM VWPMO_VALUES WHERE RECORD_ID = " & recID & " and CONTROL_NAME = '" & name & "'" - If LogErrorsOnly = False Then ClassLogger.Add(">> " & SQL, False) Dim ID As Integer = ClassDatabase.Execute_Scalar(SQL) If ID > 0 Then Return ID @@ -169,13 +168,14 @@ frm.Show() End Sub - - Public Sub OpenFormOverview() + Public Sub Close_Maximized_Forms() For i = System.Windows.Forms.Application.OpenForms.Count - 1 To 1 Step -1 Dim form As Form = System.Windows.Forms.Application.OpenForms(i) form.WindowState = FormWindowState.Normal Next i - + End Sub + Public Sub OpenFormOverview() + Close_Maximized_Forms() Dim frm As New frmForm_Overview frm = frmForm_Overview.Instance() frm.MdiParent = MAIN_FORM diff --git a/app/DD-Record-Organiser/My Project/AssemblyInfo.vb b/app/DD-Record-Organiser/My Project/AssemblyInfo.vb index b53968d..bd133c1 100644 --- a/app/DD-Record-Organiser/My Project/AssemblyInfo.vb +++ b/app/DD-Record-Organiser/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - + diff --git a/app/DD-Record-Organiser/frmConfig_Basic.vb b/app/DD-Record-Organiser/frmConfig_Basic.vb index 32ed5db..437e0ca 100644 --- a/app/DD-Record-Organiser/frmConfig_Basic.vb +++ b/app/DD-Record-Organiser/frmConfig_Basic.vb @@ -89,6 +89,14 @@ Dim constr = MyConnectionString constr = constr.Replace(csb.Password, "XXXXX") + Try + txtServer.Text = csb.DataSource + txtUser.Text = csb.UserID + cmbDatenbank.Text = csb.InitialCatalog + Catch ex As Exception + + End Try + Me.txtActualConnection.Text = constr chkbxloadWDDocs.Checked = Sett_LoadWD_Docs chkLogErrorsOnly.Checked = LogErrorsOnly @@ -170,4 +178,11 @@ Private Sub frmConfig_Basic_Shown(sender As Object, e As EventArgs) Handles Me.Shown formloaded = True End Sub + + Private Sub TabControl1_SelectedIndexChanged(sender As Object, e As EventArgs) Handles TabControl1.SelectedIndexChanged + Select Case TabControl1.SelectedIndex + Case 1 + + End Select + End Sub End Class \ No newline at end of file diff --git a/app/DD-Record-Organiser/frmConstructorDesigner.Designer.vb b/app/DD-Record-Organiser/frmConstructorDesigner.Designer.vb index be3a748..adace47 100644 --- a/app/DD-Record-Organiser/frmConstructorDesigner.Designer.vb +++ b/app/DD-Record-Organiser/frmConstructorDesigner.Designer.vb @@ -64,7 +64,7 @@ Partial Class frmConstructorDesigner Me.BindingNavigatorSeparator2 = New System.Windows.Forms.ToolStripSeparator() Me.TBPMO_FORM_CONSTRUCTORBindingNavigatorSaveItem = New System.Windows.Forms.ToolStripButton() Me.TBPMO_FORM_CONSTRUCTOR_DETAILBindingSource = New System.Windows.Forms.BindingSource(Me.components) - Me.TreeView1 = New System.Windows.Forms.TreeView() + Me.TreeViewDetails = New System.Windows.Forms.TreeView() Me.ImageList1 = New System.Windows.Forms.ImageList(Me.components) Me.CONSTRUCTOR_IDTextBox = New System.Windows.Forms.TextBox() Me.FORM_TITLETextBox = New System.Windows.Forms.TextBox() @@ -521,17 +521,17 @@ Partial Class frmConstructorDesigner Me.TBPMO_FORM_CONSTRUCTOR_DETAILBindingSource.DataMember = "TBPMO_FORM_CONSTRUCTOR_DETAIL" Me.TBPMO_FORM_CONSTRUCTOR_DETAILBindingSource.DataSource = Me.DD_ECMAdmin ' - 'TreeView1 + 'TreeViewDetails ' - Me.TreeView1.AllowDrop = True - Me.TreeView1.Dock = System.Windows.Forms.DockStyle.Left - Me.TreeView1.ImageIndex = 0 - Me.TreeView1.ImageList = Me.ImageList1 - Me.TreeView1.Location = New System.Drawing.Point(0, 0) - Me.TreeView1.Name = "TreeView1" - Me.TreeView1.SelectedImageIndex = 1 - Me.TreeView1.Size = New System.Drawing.Size(292, 417) - Me.TreeView1.TabIndex = 1 + Me.TreeViewDetails.AllowDrop = True + Me.TreeViewDetails.Dock = System.Windows.Forms.DockStyle.Left + Me.TreeViewDetails.ImageIndex = 0 + Me.TreeViewDetails.ImageList = Me.ImageList1 + Me.TreeViewDetails.Location = New System.Drawing.Point(0, 0) + Me.TreeViewDetails.Name = "TreeViewDetails" + Me.TreeViewDetails.SelectedImageIndex = 1 + Me.TreeViewDetails.Size = New System.Drawing.Size(292, 417) + Me.TreeViewDetails.TabIndex = 1 ' 'ImageList1 ' @@ -660,7 +660,7 @@ Partial Class frmConstructorDesigner Me.XtraTabPage1.Controls.Add(Me.XtraTabControl2) Me.XtraTabPage1.Controls.Add(Me.StatusStrip1) Me.XtraTabPage1.Controls.Add(Me.ToolStrip1) - Me.XtraTabPage1.Controls.Add(Me.TreeView1) + Me.XtraTabPage1.Controls.Add(Me.TreeViewDetails) Me.XtraTabPage1.Name = "XtraTabPage1" Me.XtraTabPage1.Size = New System.Drawing.Size(1304, 417) Me.XtraTabPage1.Text = "Entitäten-Übersicht" @@ -699,7 +699,7 @@ Partial Class frmConstructorDesigner Me.XtraTabPage3.Controls.Add(Me.GUIDTextBox1) Me.XtraTabPage3.Controls.Add(Me.LEVEL1_SELECTCheckBox) Me.XtraTabPage3.Name = "XtraTabPage3" - Me.XtraTabPage3.Size = New System.Drawing.Size(1010, 295) + Me.XtraTabPage3.Size = New System.Drawing.Size(1010, 345) Me.XtraTabPage3.Text = "Allgemein" ' 'LOAD_DIRECTCheckBox @@ -817,7 +817,7 @@ Partial Class frmConstructorDesigner Me.XtraTabPage5.Controls.Add(Me.listBoxControls) Me.XtraTabPage5.Controls.Add(Me.Label3) Me.XtraTabPage5.Name = "XtraTabPage5" - Me.XtraTabPage5.Size = New System.Drawing.Size(1010, 295) + Me.XtraTabPage5.Size = New System.Drawing.Size(1006, 342) Me.XtraTabPage5.Text = "Quick View Konfiguration" ' 'Button2 @@ -972,7 +972,7 @@ Partial Class frmConstructorDesigner Me.XtraTabPage4.Controls.Add(Me.grpbxWD_RecordSearch) Me.XtraTabPage4.Controls.Add(Me.GroupBox1) Me.XtraTabPage4.Name = "XtraTabPage4" - Me.XtraTabPage4.Size = New System.Drawing.Size(1010, 345) + Me.XtraTabPage4.Size = New System.Drawing.Size(1006, 342) Me.XtraTabPage4.Text = "windream-Suche Konfiguration" ' 'chkWDSearch_Active @@ -1448,7 +1448,7 @@ Partial Class frmConstructorDesigner Friend WithEvents TBPMO_FORM_CONSTRUCTORBindingNavigatorSaveItem As System.Windows.Forms.ToolStripButton Friend WithEvents TBPMO_FORM_CONSTRUCTOR_DETAILTableAdapter As DD_Record_Organiser.DD_ECMAdminTableAdapters.TBPMO_FORM_CONSTRUCTOR_DETAILTableAdapter Friend WithEvents TBPMO_FORM_CONSTRUCTOR_DETAILBindingSource As System.Windows.Forms.BindingSource - Friend WithEvents TreeView1 As System.Windows.Forms.TreeView + Friend WithEvents TreeViewDetails As System.Windows.Forms.TreeView Friend WithEvents ImageList1 As System.Windows.Forms.ImageList Friend WithEvents CONSTRUCTOR_IDTextBox As System.Windows.Forms.TextBox Friend WithEvents FORM_TITLETextBox As System.Windows.Forms.TextBox diff --git a/app/DD-Record-Organiser/frmConstructorDesigner.resx b/app/DD-Record-Organiser/frmConstructorDesigner.resx index 5448c05..e285df0 100644 --- a/app/DD-Record-Organiser/frmConstructorDesigner.resx +++ b/app/DD-Record-Organiser/frmConstructorDesigner.resx @@ -281,7 +281,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABS - CQAAAk1TRnQBSQFMAgEBAgEAAcgBCQHIAQkBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CQAAAk1TRnQBSQFMAgEBAgEAAeABCQHgAQkBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -335,9 +335,6 @@ 584, 95 - - 584, 95 - 969, 56 diff --git a/app/DD-Record-Organiser/frmConstructorDesigner.vb b/app/DD-Record-Organiser/frmConstructorDesigner.vb index b6d589e..b45f4d7 100644 --- a/app/DD-Record-Organiser/frmConstructorDesigner.vb +++ b/app/DD-Record-Organiser/frmConstructorDesigner.vb @@ -189,11 +189,11 @@ Public Class frmConstructorDesigner Try Dim CONSTR_ID As Integer = CONSTRUCTOR_IDTextBox.Text Dim DT As DataTable = ClassDatabase.Return_Datatable("SELECT * from VWPMO_CONSTRUCTOR_FORMS WHERE FORM_TYPE_ID = 1 AND PARENT_ID = 0 AND FORM_TYPE_ID = 1 AND CONSTRUCT_ID = " & CONSTR_ID) - If DT.Rows.Count = 1 Then - TreeView1.Nodes.Clear() + If DT.Rows.Count >= 1 Then + TreeViewDetails.Nodes.Clear() For Each rowEbene0 As DataRow In DT.Rows Dim Node As TreeNode - Node = TreeView1.Nodes.Add("E1: " & rowEbene0.Item("FORM_TITLE").ToString) + Node = TreeViewDetails.Nodes.Add("E1: " & rowEbene0.Item("FORM_TITLE").ToString) Node.Tag = rowEbene0.Item("GUID") 'Jetzt die Ebene1Knoten einhängen Dim dtEbene1 As DataTable = ClassDatabase.Return_Datatable("SELECT GUID, CONSTRUCT_ID, FORM_ID, FORM_TITLE FROM VWPMO_CONSTRUCTOR_FORMS WHERE PARENT_ID = " & rowEbene0.Item("FORM_ID") & _ @@ -218,8 +218,8 @@ Public Class frmConstructorDesigner End If Next - TreeView1.ExpandAll() - TreeView1.Nodes(0).EnsureVisible() + TreeViewDetails.ExpandAll() + TreeViewDetails.Nodes(0).EnsureVisible() Else MsgBox("Achtung Konfigurationsfehler: Mehrere oder keine Level 0 Entität gefunden!" & "Korrigieren Sie bitte Ihre Eingaben", MsgBoxStyle.Exclamation) End If @@ -241,10 +241,10 @@ Public Class frmConstructorDesigner End If End Sub - Private Sub TreeView1_AfterSelect(sender As Object, e As TreeViewEventArgs) Handles TreeView1.AfterSelect + Private Sub TreeView1_AfterSelect(sender As Object, e As TreeViewEventArgs) Handles TreeViewDetails.AfterSelect Try - If Not TreeView1.SelectedNode Is Nothing Then - Dim construct_id As Integer = Integer.Parse(TreeView1.SelectedNode.Tag) + If Not TreeViewDetails.SelectedNode Is Nothing Then + Dim construct_id As Integer = Integer.Parse(TreeViewDetails.SelectedNode.Tag) SELECTED_CONSTRUCTOR_DETAIL_ID = construct_id Me.tslblSaveDetail.Visible = False Load_Detail(construct_id) diff --git a/app/DD-Record-Organiser/frmForm_Constructor.designer.vb b/app/DD-Record-Organiser/frmForm_Constructor.designer.vb index d719a41..52d4cbe 100644 --- a/app/DD-Record-Organiser/frmForm_Constructor.designer.vb +++ b/app/DD-Record-Organiser/frmForm_Constructor.designer.vb @@ -237,7 +237,7 @@ Partial Class frmForm_Constructor Me.GridControlParentEntity.Location = New System.Drawing.Point(3, 3) Me.GridControlParentEntity.MainView = Me.GridViewParentEntity Me.GridControlParentEntity.Name = "GridControlParentEntity" - Me.GridControlParentEntity.Size = New System.Drawing.Size(0, 300) + Me.GridControlParentEntity.Size = New System.Drawing.Size(471, 184) Me.GridControlParentEntity.TabIndex = 14 Me.GridControlParentEntity.TabStop = False Me.GridControlParentEntity.UseEmbeddedNavigator = True @@ -406,7 +406,7 @@ Partial Class frmForm_Constructor Me.TCDetails.Name = "TCDetails" Me.TCDetails.SelectedTabPage = Me.TabPageDetails Me.TCDetails.ShowHeaderFocus = DevExpress.Utils.DefaultBoolean.[False] - Me.TCDetails.Size = New System.Drawing.Size(940, 340) + Me.TCDetails.Size = New System.Drawing.Size(764, 340) Me.TCDetails.TabIndex = 19 Me.TCDetails.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.TabPageDetails, Me.TabPageWD_Files, Me.TabPageFollowUp}) ' @@ -415,7 +415,7 @@ Partial Class frmForm_Constructor Me.TabPageDetails.Controls.Add(Me.pnlDetails) Me.TabPageDetails.Image = Global.DD_Record_Organiser.My.Resources.Resources.grid_Data_16xMD Me.TabPageDetails.Name = "TabPageDetails" - Me.TabPageDetails.Size = New System.Drawing.Size(758, 309) + Me.TabPageDetails.Size = New System.Drawing.Size(762, 312) Me.TabPageDetails.Text = "Detailansicht:" ' 'pnlDetails @@ -424,7 +424,7 @@ Partial Class frmForm_Constructor Me.pnlDetails.Dock = System.Windows.Forms.DockStyle.Fill Me.pnlDetails.Location = New System.Drawing.Point(0, 0) Me.pnlDetails.Name = "pnlDetails" - Me.pnlDetails.Size = New System.Drawing.Size(758, 309) + Me.pnlDetails.Size = New System.Drawing.Size(762, 312) Me.pnlDetails.TabIndex = 0 ' 'TabPageWD_Files @@ -488,7 +488,7 @@ Partial Class frmForm_Constructor Me.TabPageFollowUp.Controls.Add(Me.ListViewFollowUp) Me.TabPageFollowUp.Image = Global.DD_Record_Organiser.My.Resources.Resources.Task_16xMD Me.TabPageFollowUp.Name = "TabPageFollowUp" - Me.TabPageFollowUp.Size = New System.Drawing.Size(934, 309) + Me.TabPageFollowUp.Size = New System.Drawing.Size(758, 309) Me.TabPageFollowUp.Text = "Wiedervorlage" ' 'grpbxFU_Profile @@ -701,7 +701,7 @@ Partial Class frmForm_Constructor Me.XtraTabControl1.Location = New System.Drawing.Point(0, 0) Me.XtraTabControl1.Name = "XtraTabControl1" Me.XtraTabControl1.SelectedTabPage = Me.TabPageParentEntity - Me.XtraTabControl1.Size = New System.Drawing.Size(356, 340) + Me.XtraTabControl1.Size = New System.Drawing.Size(525, 340) Me.XtraTabControl1.TabIndex = 0 Me.XtraTabControl1.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.TabPageParentEntity}) ' @@ -715,7 +715,7 @@ Partial Class frmForm_Constructor Me.TabPageParentEntity.Controls.Add(Me.Label4) Me.TabPageParentEntity.Controls.Add(Me.GridControlParentEntity) Me.TabPageParentEntity.Name = "TabPageParentEntity" - Me.TabPageParentEntity.Size = New System.Drawing.Size(350, 312) + Me.TabPageParentEntity.Size = New System.Drawing.Size(523, 315) Me.TabPageParentEntity.Text = "Parent-Entity" ' 'Button1 @@ -723,7 +723,7 @@ Partial Class frmForm_Constructor Me.Button1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.Button1.Image = Global.DD_Record_Organiser.My.Resources.Resources.delete Me.Button1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button1.Location = New System.Drawing.Point(-659, 276) + Me.Button1.Location = New System.Drawing.Point(-665, 282) Me.Button1.Name = "Button1" Me.Button1.Size = New System.Drawing.Size(98, 27) Me.Button1.TabIndex = 18 @@ -739,7 +739,7 @@ Partial Class frmForm_Constructor Me.btnRefreshPEntity.FlatAppearance.BorderColor = System.Drawing.Color.DarkOrange Me.btnRefreshPEntity.Font = New System.Drawing.Font("Tahoma", 9.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btnRefreshPEntity.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnRefreshPEntity.Location = New System.Drawing.Point(3, 308) + Me.btnRefreshPEntity.Location = New System.Drawing.Point(3, 314) Me.btnRefreshPEntity.Name = "btnRefreshPEntity" Me.btnRefreshPEntity.Size = New System.Drawing.Size(0, 31) Me.btnRefreshPEntity.TabIndex = 17 @@ -753,7 +753,7 @@ Partial Class frmForm_Constructor Me.lblParentID.AutoSize = True Me.lblParentID.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblParentID.ForeColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(0, Byte), Integer)) - Me.lblParentID.Location = New System.Drawing.Point(-748, 38) + Me.lblParentID.Location = New System.Drawing.Point(-754, 38) Me.lblParentID.Name = "lblParentID" Me.lblParentID.Size = New System.Drawing.Size(168, 16) Me.lblParentID.TabIndex = 16 @@ -764,7 +764,7 @@ Partial Class frmForm_Constructor Me.Label4.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.Label4.AutoSize = True Me.Label4.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label4.Location = New System.Drawing.Point(-748, 12) + Me.Label4.Location = New System.Drawing.Point(-754, 12) Me.Label4.Name = "Label4" Me.Label4.Size = New System.Drawing.Size(160, 16) Me.Label4.TabIndex = 15 diff --git a/app/DD-Record-Organiser/frmForm_Constructor.resx b/app/DD-Record-Organiser/frmForm_Constructor.resx index 5a9ee0e..0c00c08 100644 --- a/app/DD-Record-Organiser/frmForm_Constructor.resx +++ b/app/DD-Record-Organiser/frmForm_Constructor.resx @@ -157,7 +157,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABS - CQAAAk1TRnQBSQFMAgEBAgEAAdgBCQHYAQkBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CQAAAk1TRnQBSQFMAgEBAgEAAfgBCQH4AQkBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA diff --git a/app/DD-Record-Organiser/frmForm_Constructor.vb b/app/DD-Record-Organiser/frmForm_Constructor.vb index 7fffc96..322aba6 100644 --- a/app/DD-Record-Organiser/frmForm_Constructor.vb +++ b/app/DD-Record-Organiser/frmForm_Constructor.vb @@ -1789,6 +1789,7 @@ Public Class frmForm_Constructor Sub Load_Entity_Data(FORM_ID As Integer) Try Me.Cursor = Cursors.WaitCursor + VerknüpfungenToolStripMenuItem.Enabled = False CURRENT_RECORD_ID = 0 Dim IS_SINGLE_RECORD As Boolean Dim LOAD_DIRECT As Boolean diff --git a/app/DD-Record-Organiser/frmForm_Constructor_Main_2.Designer.vb b/app/DD-Record-Organiser/frmForm_Constructor_Main_2.Designer.vb index f6ba1b1..242095e 100644 --- a/app/DD-Record-Organiser/frmForm_Constructor_Main_2.Designer.vb +++ b/app/DD-Record-Organiser/frmForm_Constructor_Main_2.Designer.vb @@ -113,6 +113,10 @@ Partial Class frmForm_Constructor_Main_2 Me.VerknüpfungenAnzeigenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.tsButtonShowTaskOverview = New System.Windows.Forms.ToolStripButton() Me.tsButtonShowWorkflowTasks = New System.Windows.Forms.ToolStripButton() + Me.Panel2 = New System.Windows.Forms.Panel() + Me.GridControlParent = New DevExpress.XtraGrid.GridControl() + Me.GridViewParent = New DevExpress.XtraGrid.Views.Grid.GridView() + Me.btnRelinkParentID = New System.Windows.Forms.Button() Me.BindingSource_Entity = New System.Windows.Forms.BindingSource(Me.components) Me.DD_ECMAdmin = New DD_Record_Organiser.DD_ECMAdmin() Me.ImageCollection1 = New DevExpress.Utils.ImageCollection(Me.components) @@ -155,6 +159,9 @@ Partial Class frmForm_Constructor_Main_2 CType(Me.BindingNavigatorPOS, System.ComponentModel.ISupportInitialize).BeginInit() Me.BindingNavigatorPOS.SuspendLayout() Me.ToolStripEdit.SuspendLayout() + Me.Panel2.SuspendLayout() + CType(Me.GridControlParent, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.GridViewParent, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.BindingSource_Entity, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.DD_ECMAdmin, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.ImageCollection1, System.ComponentModel.ISupportInitialize).BeginInit() @@ -197,7 +204,7 @@ Partial Class frmForm_Constructor_Main_2 Me.GridControlMain.Location = New System.Drawing.Point(0, 0) Me.GridControlMain.MainView = Me.grvwTiles Me.GridControlMain.Name = "GridControlMain" - Me.GridControlMain.Size = New System.Drawing.Size(786, 270) + Me.GridControlMain.Size = New System.Drawing.Size(788, 270) Me.GridControlMain.TabIndex = 0 Me.GridControlMain.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.grvwCarousel, Me.grvwTiles, Me.grvwGrid}) ' @@ -322,7 +329,7 @@ Partial Class frmForm_Constructor_Main_2 Me.NavPane.Name = "NavPane" Me.NavPane.OptionsPrimaryDropDown.BackColor = System.Drawing.Color.Empty Me.NavPane.OptionsSecondaryDropDown.BackColor = System.Drawing.Color.Empty - Me.NavPane.Size = New System.Drawing.Size(1074, 40) + Me.NavPane.Size = New System.Drawing.Size(1083, 40) Me.NavPane.TabIndex = 0 Me.NavPane.Text = "TileNavPane1" ' @@ -347,7 +354,7 @@ Partial Class frmForm_Constructor_Main_2 Me.StatusStrip_Main.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsslblStatus, Me.tsslblRecord, Me.tsslblWorkflowstate}) Me.StatusStrip_Main.Location = New System.Drawing.Point(0, 687) Me.StatusStrip_Main.Name = "StatusStrip_Main" - Me.StatusStrip_Main.Size = New System.Drawing.Size(1074, 22) + Me.StatusStrip_Main.Size = New System.Drawing.Size(1083, 22) Me.StatusStrip_Main.TabIndex = 1 Me.StatusStrip_Main.Text = "StatusStrip1" ' @@ -381,7 +388,7 @@ Partial Class frmForm_Constructor_Main_2 Me.SplitContainerMain.Panel1.Text = "Panel1" Me.SplitContainerMain.Panel2.Controls.Add(Me.SplitContainerBottom) Me.SplitContainerMain.Panel2.Text = "Panel2" - Me.SplitContainerMain.Size = New System.Drawing.Size(1074, 647) + Me.SplitContainerMain.Size = New System.Drawing.Size(1083, 647) Me.SplitContainerMain.SplitterPosition = 270 Me.SplitContainerMain.TabIndex = 2 Me.SplitContainerMain.Text = "SplitContainerControl1" @@ -396,7 +403,7 @@ Partial Class frmForm_Constructor_Main_2 Me.SplitContainerTop.Panel1.Text = "Panel1" Me.SplitContainerTop.Panel2.Controls.Add(Me.GridControlMain) Me.SplitContainerTop.Panel2.Text = "Panel2" - Me.SplitContainerTop.Size = New System.Drawing.Size(1074, 270) + Me.SplitContainerTop.Size = New System.Drawing.Size(1083, 270) Me.SplitContainerTop.SplitterPosition = 283 Me.SplitContainerTop.TabIndex = 0 Me.SplitContainerTop.Text = "SplitContainerControl1" @@ -450,9 +457,10 @@ Partial Class frmForm_Constructor_Main_2 Me.SplitContainerBottom.Panel1.Controls.Add(Me.TCDetails) Me.SplitContainerBottom.Panel1.Controls.Add(Me.ToolStripEdit) Me.SplitContainerBottom.Panel1.Text = "Panel1" + Me.SplitContainerBottom.Panel2.Controls.Add(Me.Panel2) Me.SplitContainerBottom.Panel2.Text = "Panel2" - Me.SplitContainerBottom.Size = New System.Drawing.Size(1074, 372) - Me.SplitContainerBottom.SplitterPosition = 448 + Me.SplitContainerBottom.Size = New System.Drawing.Size(1083, 365) + Me.SplitContainerBottom.SplitterPosition = 576 Me.SplitContainerBottom.TabIndex = 0 Me.SplitContainerBottom.Text = "SplitContainerControl1" ' @@ -467,7 +475,7 @@ Partial Class frmForm_Constructor_Main_2 Me.TCDetails.Location = New System.Drawing.Point(0, 25) Me.TCDetails.Name = "TCDetails" Me.TCDetails.SelectedTabPage = Me.TabDetails - Me.TCDetails.Size = New System.Drawing.Size(1069, 347) + Me.TCDetails.Size = New System.Drawing.Size(1071, 340) Me.TCDetails.TabIndex = 1 Me.TCDetails.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.TabDetails, Me.TabWindream, Me.TabFollowUp, Me.TabPos}) ' @@ -476,7 +484,7 @@ Partial Class frmForm_Constructor_Main_2 Me.TabDetails.Controls.Add(Me.pnlDetails) Me.TabDetails.Image = Global.DD_Record_Organiser.My.Resources.Resources.grid_Data_16xMD Me.TabDetails.Name = "TabDetails" - Me.TabDetails.Size = New System.Drawing.Size(1063, 316) + Me.TabDetails.Size = New System.Drawing.Size(1069, 312) Me.TabDetails.Text = "Detailansicht" ' 'pnlDetails @@ -485,7 +493,7 @@ Partial Class frmForm_Constructor_Main_2 Me.pnlDetails.Dock = System.Windows.Forms.DockStyle.Fill Me.pnlDetails.Location = New System.Drawing.Point(0, 0) Me.pnlDetails.Name = "pnlDetails" - Me.pnlDetails.Size = New System.Drawing.Size(1063, 316) + Me.pnlDetails.Size = New System.Drawing.Size(1069, 312) Me.pnlDetails.TabIndex = 0 ' 'TabWindream @@ -494,7 +502,7 @@ Partial Class frmForm_Constructor_Main_2 Me.TabWindream.Controls.Add(Me.ToolStripDokumente) Me.TabWindream.Image = Global.DD_Record_Organiser.My.Resources.Resources.Files_7954 Me.TabWindream.Name = "TabWindream" - Me.TabWindream.Size = New System.Drawing.Size(1063, 316) + Me.TabWindream.Size = New System.Drawing.Size(1069, 312) Me.TabWindream.Text = "windream-Dateien" ' 'AxObjectListControl @@ -505,16 +513,17 @@ Partial Class frmForm_Constructor_Main_2 Me.AxObjectListControl.Location = New System.Drawing.Point(0, 25) Me.AxObjectListControl.Name = "AxObjectListControl" Me.AxObjectListControl.OcxState = CType(resources.GetObject("AxObjectListControl.OcxState"), System.Windows.Forms.AxHost.State) - Me.AxObjectListControl.Size = New System.Drawing.Size(1063, 291) + Me.AxObjectListControl.Size = New System.Drawing.Size(1069, 287) Me.AxObjectListControl.TabIndex = 6 Me.AxObjectListControl.TabStop = False ' 'ToolStripDokumente ' + Me.ToolStripDokumente.AllowDrop = True Me.ToolStripDokumente.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tslblWindreamView, Me.ToolStripDropDownButton2}) Me.ToolStripDokumente.Location = New System.Drawing.Point(0, 0) Me.ToolStripDokumente.Name = "ToolStripDokumente" - Me.ToolStripDokumente.Size = New System.Drawing.Size(1063, 25) + Me.ToolStripDokumente.Size = New System.Drawing.Size(1069, 25) Me.ToolStripDokumente.TabIndex = 2 Me.ToolStripDokumente.Text = "ToolStrip2" ' @@ -548,20 +557,19 @@ Partial Class frmForm_Constructor_Main_2 Me.TabFollowUp.Controls.Add(Me.Label5) Me.TabFollowUp.Image = Global.DD_Record_Organiser.My.Resources.Resources.Task_16xMD Me.TabFollowUp.Name = "TabFollowUp" - Me.TabFollowUp.Size = New System.Drawing.Size(1063, 316) + Me.TabFollowUp.Size = New System.Drawing.Size(1069, 312) Me.TabFollowUp.Text = "Wiedervorlage" ' 'ListViewFollowUps ' - Me.ListViewFollowUps.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ - Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.ListViewFollowUps.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ + Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) Me.ListViewFollowUps.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader1, Me.ColumnHeader2}) Me.ListViewFollowUps.FullRowSelect = True Me.ListViewFollowUps.HideSelection = False Me.ListViewFollowUps.Location = New System.Drawing.Point(14, 36) Me.ListViewFollowUps.Name = "ListViewFollowUps" - Me.ListViewFollowUps.Size = New System.Drawing.Size(263, 261) + Me.ListViewFollowUps.Size = New System.Drawing.Size(263, 257) Me.ListViewFollowUps.TabIndex = 5 Me.ListViewFollowUps.UseCompatibleStateImageBehavior = False Me.ListViewFollowUps.View = System.Windows.Forms.View.Details @@ -587,7 +595,7 @@ Partial Class frmForm_Constructor_Main_2 Me.grpbxFU_Profile.Controls.Add(Me.lblWiedervorlage_Control) Me.grpbxFU_Profile.Location = New System.Drawing.Point(283, 28) Me.grpbxFU_Profile.Name = "grpbxFU_Profile" - Me.grpbxFU_Profile.Size = New System.Drawing.Size(774, 269) + Me.grpbxFU_Profile.Size = New System.Drawing.Size(774, 265) Me.grpbxFU_Profile.TabIndex = 4 Me.grpbxFU_Profile.TabStop = False ' @@ -604,7 +612,7 @@ Partial Class frmForm_Constructor_Main_2 Me.GroupBox4.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.GroupBox4.Location = New System.Drawing.Point(177, 20) Me.GroupBox4.Name = "GroupBox4" - Me.GroupBox4.Size = New System.Drawing.Size(594, 243) + Me.GroupBox4.Size = New System.Drawing.Size(594, 239) Me.GroupBox4.TabIndex = 4 Me.GroupBox4.TabStop = False Me.GroupBox4.Text = "Individuelle Empfänger für diesen Datensatz:" @@ -660,7 +668,7 @@ Partial Class frmForm_Constructor_Main_2 Me.ListBoxUser2Profile.FormattingEnabled = True Me.ListBoxUser2Profile.Location = New System.Drawing.Point(9, 50) Me.ListBoxUser2Profile.Name = "ListBoxUser2Profile" - Me.ListBoxUser2Profile.Size = New System.Drawing.Size(230, 186) + Me.ListBoxUser2Profile.Size = New System.Drawing.Size(230, 173) Me.ListBoxUser2Profile.TabIndex = 1 ' 'Label7 @@ -708,10 +716,9 @@ Partial Class frmForm_Constructor_Main_2 Me.lblWiedervorlage_Control.AutoSize = True Me.lblWiedervorlage_Control.Location = New System.Drawing.Point(6, 17) Me.lblWiedervorlage_Control.Name = "lblWiedervorlage_Control" - Me.lblWiedervorlage_Control.Size = New System.Drawing.Size(38, 13) + Me.lblWiedervorlage_Control.Size = New System.Drawing.Size(129, 13) Me.lblWiedervorlage_Control.TabIndex = 0 - Me.lblWiedervorlage_Control.Text = "Label9" - Me.lblWiedervorlage_Control.Visible = False + Me.lblWiedervorlage_Control.Text = "<< Waiting for Selection:" ' 'Label5 ' @@ -729,7 +736,7 @@ Partial Class frmForm_Constructor_Main_2 Me.TabPos.Image = CType(resources.GetObject("TabPos.Image"), System.Drawing.Image) Me.TabPos.Name = "TabPos" Me.TabPos.PageVisible = False - Me.TabPos.Size = New System.Drawing.Size(1063, 316) + Me.TabPos.Size = New System.Drawing.Size(1069, 312) Me.TabPos.Text = "Positionen" ' 'Panel1 @@ -738,7 +745,7 @@ Partial Class frmForm_Constructor_Main_2 Me.Panel1.Dock = System.Windows.Forms.DockStyle.Fill Me.Panel1.Location = New System.Drawing.Point(0, 25) Me.Panel1.Name = "Panel1" - Me.Panel1.Size = New System.Drawing.Size(1063, 291) + Me.Panel1.Size = New System.Drawing.Size(1069, 287) Me.Panel1.TabIndex = 2 ' 'GridControlPos @@ -747,7 +754,7 @@ Partial Class frmForm_Constructor_Main_2 Me.GridControlPos.Location = New System.Drawing.Point(0, 0) Me.GridControlPos.MainView = Me.grvwGridPos Me.GridControlPos.Name = "GridControlPos" - Me.GridControlPos.Size = New System.Drawing.Size(1063, 291) + Me.GridControlPos.Size = New System.Drawing.Size(1069, 287) Me.GridControlPos.TabIndex = 0 Me.GridControlPos.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.grvwGridPos}) ' @@ -774,7 +781,7 @@ Partial Class frmForm_Constructor_Main_2 Me.BindingNavigatorPOS.MovePreviousItem = Me.BindingNavigatorMovePreviousItem Me.BindingNavigatorPOS.Name = "BindingNavigatorPOS" Me.BindingNavigatorPOS.PositionItem = Me.BindingNavigatorPositionItem - Me.BindingNavigatorPOS.Size = New System.Drawing.Size(1063, 25) + Me.BindingNavigatorPOS.Size = New System.Drawing.Size(1069, 25) Me.BindingNavigatorPOS.TabIndex = 1 Me.BindingNavigatorPOS.Text = "BindingNavigator1" ' @@ -869,7 +876,7 @@ Partial Class frmForm_Constructor_Main_2 Me.ToolStripEdit.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsButtonAdd, Me.tsButtonSave, Me.tsButtonDelete, Me.tsButtonEditMode, Me.ToolStripDropDownButton1, Me.tsButtonShowTaskOverview, Me.tsButtonShowWorkflowTasks}) Me.ToolStripEdit.Location = New System.Drawing.Point(0, 0) Me.ToolStripEdit.Name = "ToolStripEdit" - Me.ToolStripEdit.Size = New System.Drawing.Size(1069, 25) + Me.ToolStripEdit.Size = New System.Drawing.Size(1071, 25) Me.ToolStripEdit.TabIndex = 0 Me.ToolStripEdit.Text = "ToolStrip1" ' @@ -949,6 +956,7 @@ Partial Class frmForm_Constructor_Main_2 ' 'VerknüpfungenAnzeigenToolStripMenuItem ' + Me.VerknüpfungenAnzeigenToolStripMenuItem.Enabled = False Me.VerknüpfungenAnzeigenToolStripMenuItem.Name = "VerknüpfungenAnzeigenToolStripMenuItem" Me.VerknüpfungenAnzeigenToolStripMenuItem.Size = New System.Drawing.Size(231, 22) Me.VerknüpfungenAnzeigenToolStripMenuItem.Text = "Verknüpfungen anzeigen" @@ -973,6 +981,50 @@ Partial Class frmForm_Constructor_Main_2 Me.tsButtonShowWorkflowTasks.Size = New System.Drawing.Size(122, 22) Me.tsButtonShowWorkflowTasks.Text = "Taskmanagement" ' + 'Panel2 + ' + Me.Panel2.Controls.Add(Me.GridControlParent) + Me.Panel2.Controls.Add(Me.btnRelinkParentID) + Me.Panel2.Dock = System.Windows.Forms.DockStyle.Fill + Me.Panel2.Location = New System.Drawing.Point(0, 0) + Me.Panel2.Name = "Panel2" + Me.Panel2.Size = New System.Drawing.Size(0, 0) + Me.Panel2.TabIndex = 0 + ' + 'GridControlParent + ' + Me.GridControlParent.Dock = System.Windows.Forms.DockStyle.Fill + Me.GridControlParent.Location = New System.Drawing.Point(0, 0) + Me.GridControlParent.MainView = Me.GridViewParent + Me.GridControlParent.Name = "GridControlParent" + Me.GridControlParent.Size = New System.Drawing.Size(0, 0) + Me.GridControlParent.TabIndex = 1 + Me.GridControlParent.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewParent}) + ' + 'GridViewParent + ' + Me.GridViewParent.Appearance.EvenRow.BackColor = System.Drawing.Color.Aqua + Me.GridViewParent.Appearance.EvenRow.Options.UseBackColor = True + Me.GridViewParent.GridControl = Me.GridControlParent + Me.GridViewParent.Name = "GridViewParent" + Me.GridViewParent.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.[False] + Me.GridViewParent.OptionsBehavior.AllowDeleteRows = DevExpress.Utils.DefaultBoolean.[False] + Me.GridViewParent.OptionsBehavior.Editable = False + Me.GridViewParent.OptionsBehavior.ReadOnly = True + Me.GridViewParent.OptionsView.EnableAppearanceEvenRow = True + Me.GridViewParent.OptionsView.ShowAutoFilterRow = True + ' + 'btnRelinkParentID + ' + Me.btnRelinkParentID.BackColor = System.Drawing.Color.WhiteSmoke + Me.btnRelinkParentID.Dock = System.Windows.Forms.DockStyle.Bottom + Me.btnRelinkParentID.Location = New System.Drawing.Point(0, -50) + Me.btnRelinkParentID.Name = "btnRelinkParentID" + Me.btnRelinkParentID.Size = New System.Drawing.Size(0, 50) + Me.btnRelinkParentID.TabIndex = 0 + Me.btnRelinkParentID.Text = "Datensatz auf gewählten Parentsatz ""umhängen""" + Me.btnRelinkParentID.UseVisualStyleBackColor = False + ' 'DD_ECMAdmin ' Me.DD_ECMAdmin.DataSetName = "DD_ECMAdmin" @@ -1055,7 +1107,7 @@ Partial Class frmForm_Constructor_Main_2 ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(1074, 709) + Me.ClientSize = New System.Drawing.Size(1083, 709) Me.Controls.Add(Me.SplitContainerMain) Me.Controls.Add(Me.StatusStrip_Main) Me.Controls.Add(Me.NavPane) @@ -1099,6 +1151,9 @@ Partial Class frmForm_Constructor_Main_2 Me.BindingNavigatorPOS.PerformLayout() Me.ToolStripEdit.ResumeLayout(False) Me.ToolStripEdit.PerformLayout() + Me.Panel2.ResumeLayout(False) + CType(Me.GridControlParent, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.GridViewParent, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.BindingSource_Entity, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.DD_ECMAdmin, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.ImageCollection1, System.ComponentModel.ISupportInitialize).EndInit() @@ -1209,4 +1264,8 @@ Partial Class frmForm_Constructor_Main_2 Friend WithEvents ListViewFollowUps As System.Windows.Forms.ListView Friend WithEvents ColumnHeader1 As System.Windows.Forms.ColumnHeader Friend WithEvents ColumnHeader2 As System.Windows.Forms.ColumnHeader + Friend WithEvents Panel2 As System.Windows.Forms.Panel + Friend WithEvents GridControlParent As DevExpress.XtraGrid.GridControl + Friend WithEvents GridViewParent As DevExpress.XtraGrid.Views.Grid.GridView + Friend WithEvents btnRelinkParentID As System.Windows.Forms.Button End Class diff --git a/app/DD-Record-Organiser/frmForm_Constructor_Main_2.resx b/app/DD-Record-Organiser/frmForm_Constructor_Main_2.resx index c011831..340772b 100644 --- a/app/DD-Record-Organiser/frmForm_Constructor_Main_2.resx +++ b/app/DD-Record-Organiser/frmForm_Constructor_Main_2.resx @@ -159,7 +159,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACFTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5BeEhvc3QrU3RhdGUBAAAABERhdGEHAgIAAAAJAwAAAA8DAAAAJQAAAAIB - AAAAAQAAAAAAAAAAAAAAABAAAAAAAAEAjm0AAKodAAAAAAAACw== + AAAAAQAAAAAAAAAAAAAAABAAAAAAAAEAfG4AAKodAAAAAAAACw== diff --git a/app/DD-Record-Organiser/frmForm_Constructor_Main_2.vb b/app/DD-Record-Organiser/frmForm_Constructor_Main_2.vb index 2bbc2d3..5ea390d 100644 --- a/app/DD-Record-Organiser/frmForm_Constructor_Main_2.vb +++ b/app/DD-Record-Organiser/frmForm_Constructor_Main_2.vb @@ -74,6 +74,9 @@ Public Class frmForm_Constructor_Main_2 Private ENTITY_LOADED As Boolean = False + Private LinkParentID As Integer + + Private FOLLOW_UPisActive As Boolean = False Private DT_FU_Record As DataTable Private DT_FU_ENTITY As DataTable @@ -168,7 +171,6 @@ Public Class frmForm_Constructor_Main_2 Dim XMLPath = System.IO.Path.Combine(Application.UserAppDataPath(), Filename) If File.Exists(XMLPath) Then grvwGridPos.RestoreLayoutFromXml(XMLPath) - grvwGridPos.ClearColumnsFilter() 'grvwGrid.ClearGrouping() grvwGridPos.ClearSelection() grvwGridPos.OptionsView.ShowPreview = False @@ -196,10 +198,10 @@ Public Class frmForm_Constructor_Main_2 Dim XMLPath = Get_Grid_Layout_Filename() If File.Exists(XMLPath) And GRID_TYPE = GridType.Grid Then grvwGrid.RestoreLayoutFromXml(XMLPath) - grvwGrid.ClearColumnsFilter() + 'grvwGrid.ClearGrouping() - grvwGrid.ClearSelection() - grvwGrid.OptionsView.ShowPreview = False + ' grvwGrid.ClearSelection() + 'grvwGrid.OptionsView.ShowPreview = False 'Update_Status_Label(True, "Grid Layout Loaded") End If @@ -390,7 +392,7 @@ Public Class frmForm_Constructor_Main_2 End Function Private Sub ResetNav() - ' Grid zurücksetzen + 'Grid zurücksetzen Clear_Grid_View() ACT_EBENE = 0 ACT_EBENE_STRING = "" @@ -400,9 +402,9 @@ Public Class frmForm_Constructor_Main_2 EBENE2_RECID = 0 EBENE3_ENTITY = "" EBENE3_RECID = 0 - ' Navigation zurücksetzen + 'Navigation zurücksetzen NavPane.Categories.Clear() - ' TreeView zurücksetzen + 'TreeView zurücksetzen 'Load_Tree_View(CONSTRUCTORID) TreeViewMain.SelectedNode = Nothing SetSelectedNodeStyle(TreeViewMain.Nodes) @@ -495,9 +497,9 @@ Public Class frmForm_Constructor_Main_2 If GRID_TYPE = GridType.Grid Then If grvwGrid.Columns.Count > 0 Then - + grvwGrid.Columns.Clear() End If - grvwGrid.Columns.Clear() + ElseIf GRID_TYPE = GridType.Tiles Then grvwTiles.Columns.Clear() Else @@ -524,7 +526,6 @@ Public Class frmForm_Constructor_Main_2 Try Dim rowHandle As Integer = DT_SELECTION.Rows.IndexOf(DT_SELECTION.Rows.Find(value)) If rowHandle > 0 Then - If GRID_TYPE = GridType.Grid Then grvwGrid.FocusedRowHandle = rowHandle ElseIf GRID_TYPE = GridType.Tiles Then @@ -532,13 +533,11 @@ Public Class frmForm_Constructor_Main_2 Else grvwCarousel.FocusedRowHandle = rowHandle End If - End If Catch ex As Exception ClassLogger.Add("Error in Search_RowHandle: " & ex.Message, False) End Try End Function - Public Function Get_Grid_Column_Count() As Integer If GRID_TYPE = GridType.Grid Then Return grvwGrid.Columns.Count @@ -563,11 +562,14 @@ Public Class frmForm_Constructor_Main_2 End Function Private Sub grvwGrid_FocusedColumnChanged(sender As Object, e As FocusedColumnChangedEventArgs) Handles grvwGrid.FocusedColumnChanged + Me.Cursor = Cursors.WaitCursor Column_Row_Handler() + Me.Cursor = Cursors.Default End Sub Private Sub GridView_FocusedRowChanged(sender As Object, e As DevExpress.XtraGrid.Views.Base.FocusedRowChangedEventArgs) Handles grvwGrid.FocusedRowChanged, grvwTiles.FocusedRowChanged, grvwCarousel.FocusedRowChanged + Me.Cursor = Cursors.WaitCursor Column_Row_Handler() - + Me.Cursor = Cursors.Default 'If dataloaded = True Then ' If LogErrorsOnly = False Then ClassLogger.Add(">> grvwSelection_FocusedRowChanged - EditState: " & EDIT_STATE, False) ' Dim selRecID = GetSelected_RecordID() @@ -584,6 +586,7 @@ Public Class frmForm_Constructor_Main_2 End If End Sub Sub Column_Row_Handler() + If _FormClosing = True Then 'Or SaveRoutine_Active = True Exit Sub End If @@ -601,9 +604,10 @@ Public Class frmForm_Constructor_Main_2 If Grid_RecordID = 0 Then Console.WriteLine("Grid_RecordID = 0") Else - If Grid_RecordID = CURRENT_RECORD_ID Then + If Grid_RecordID = CURRENT_RECORD_ID And ENTITY_RECORD_COUNT > 1 Then Exit Sub End If + If LogErrorsOnly = False Then ClassLogger.Add(">> RowHandler: RID: " & Grid_RecordID.ToString & " - " & Now, False) 'Hier jetzt erst das Anzeigen für einen selektierten Datensatz If GRID_TYPE = GridType.Grid Then If IsTopFirstRow Then @@ -629,10 +633,11 @@ Public Class frmForm_Constructor_Main_2 Check_Record_Changed() DisableEditMode() - + VerknüpfungenAnzeigenToolStripMenuItem.Enabled = True Show_Selected_Record_Data(Grid_RecordID) - Clear_GridPos_View() + If LogErrorsOnly = False Then ClassLogger.Add(">> After Show_Selected_Record_Data - " & Now, False) If TabPos.PageVisible = True And TCDetails.SelectedTabPage.Text.StartsWith("Posi") Then + Clear_GridPos_View() Dim POS_GRID_RECORD = Get_Focused_Row_Cell_Value_pos("Record-ID") 'If Not IsNothing(POS_GRID_RECORD) Then ' If POS_GRID_RECORD <> POS_RECORD_ID Then @@ -694,9 +699,7 @@ Public Class frmForm_Constructor_Main_2 Sub Load_Tree_View(ConstructorId As Integer) - Dim LEVEL1_NODE As TreeNode - Dim LEVEL2_NODE As TreeNode - Dim LEVEL3_NODE As TreeNode + TreeViewMain.Nodes.Clear() Dim SQL As String Dim DT, DT2, DT3 As DataTable @@ -708,57 +711,65 @@ Public Class frmForm_Constructor_Main_2 Exit Sub End If - If DT.Rows.Count = 1 Then - Dim LEVEL1_TITLE = DT.Rows(0).Item("FORM_TITLE").ToString - Dim LEVEL1_ID = DT.Rows(0).Item("FORM_ID").ToString + If DT.Rows.Count >= 1 Then + For Each Row1 As DataRow In DT.Rows + Dim LEVEL1_NODE As TreeNode + Dim LEVEL2_NODE As TreeNode + Dim LEVEL3_NODE As TreeNode + Dim LEVEL1_TITLE = Row1.Item("FORM_TITLE").ToString + Dim LEVEL1_ID = Row1.Item("FORM_ID").ToString - ' Rootnode erstellen und taggen - LEVEL1_NODE = New TreeNode(LEVEL1_TITLE) - LEVEL1_NODE.Tag = LEVEL1_ID + ' Rootnode erstellen und taggen + LEVEL1_NODE = New TreeNode(LEVEL1_TITLE) + LEVEL1_NODE.Tag = LEVEL1_ID - ' TreeView leeren und Rootnode einfügen - TreeViewMain.Nodes.Clear() - TreeViewMain.Nodes.Add(LEVEL1_NODE) + ' TreeView Rootnode einfügen - ' Daten für Level2 Nodes Laden - SQL = String.Format("SELECT * from VWPMO_CONSTRUCTOR_FORMS WHERE CONSTRUCT_ID = {0} AND PARENT_ID = {1} ORDER BY SEQUENCE", ConstructorId, LEVEL1_ID) - DT2 = ClassDatabase.Return_Datatable(SQL) + TreeViewMain.Nodes.Add(LEVEL1_NODE) - If DT2 Is Nothing Or DT2.Rows.Count = 0 Then - Exit Sub - End If + ' Daten für Level2 Nodes Laden + SQL = String.Format("SELECT * from VWPMO_CONSTRUCTOR_FORMS WHERE CONSTRUCT_ID = {0} AND PARENT_ID = {1} ORDER BY SEQUENCE", ConstructorId, LEVEL1_ID) + DT2 = ClassDatabase.Return_Datatable(SQL) - For Each row As DataRow In DT2.Rows - Dim LEVEL2_TITLE As String = row.Item("FORM_TITLE").ToString - Dim LEVEL2_ID As Integer = row.Item("FORM_ID") - Dim LEVEL2_PARENT_ID As Integer = row.Item("PARENT_ID") + If DT2 Is Nothing Or DT2.Rows.Count = 0 Then - ' Node erstellen.. - LEVEL2_NODE = New TreeNode(LEVEL2_TITLE) - LEVEL2_NODE.Tag = LEVEL2_ID - ' ..und einfügen - LEVEL1_NODE.Nodes.Add(LEVEL2_NODE) + Else + For Each row As DataRow In DT2.Rows + Dim LEVEL2_TITLE As String = row.Item("FORM_TITLE").ToString + Dim LEVEL2_ID As Integer = row.Item("FORM_ID") + Dim LEVEL2_PARENT_ID As Integer = row.Item("PARENT_ID") + + ' Node erstellen.. + LEVEL2_NODE = New TreeNode(LEVEL2_TITLE) + LEVEL2_NODE.Tag = LEVEL2_ID + ' ..und einfügen + LEVEL1_NODE.Nodes.Add(LEVEL2_NODE) + + ' Daten für Level3 Nodes laden + SQL = String.Format("SELECT * from VWPMO_CONSTRUCTOR_FORMS WHERE CONSTRUCT_ID = {0} AND PARENT_ID = {1} ORDER BY SEQUENCE", ConstructorId, LEVEL2_ID) + DT3 = ClassDatabase.Return_Datatable(SQL) + + If DT3 Is Nothing Or DT3.Rows.Count = 0 Then + Exit Sub + End If - ' Daten für Level3 Nodes laden - SQL = String.Format("SELECT * from VWPMO_CONSTRUCTOR_FORMS WHERE CONSTRUCT_ID = {0} AND PARENT_ID = {1} ORDER BY SEQUENCE", ConstructorId, LEVEL2_ID) - DT3 = ClassDatabase.Return_Datatable(SQL) + For Each subrow As DataRow In DT3.Rows + Dim LEVEL3_TITLE As String = subrow.Item("FORM_TITLE") + Dim LEVEL3_ID As Integer = subrow.Item("FORM_ID") - If DT3 Is Nothing Or DT3.Rows.Count = 0 Then - Exit Sub - End If + ' Node erstellen.. + LEVEL3_NODE = New TreeNode(LEVEL3_TITLE) + LEVEL3_NODE.Tag = LEVEL3_ID + ' ..und einfügen + LEVEL2_NODE.Nodes.Add(LEVEL3_NODE) + Next - For Each subrow As DataRow In DT3.Rows - Dim LEVEL3_TITLE As String = subrow.Item("FORM_TITLE") - Dim LEVEL3_ID As Integer = subrow.Item("FORM_ID") + Next + End If - ' Node erstellen.. - LEVEL3_NODE = New TreeNode(LEVEL3_TITLE) - LEVEL3_NODE.Tag = LEVEL3_ID - ' ..und einfügen - LEVEL2_NODE.Nodes.Add(LEVEL3_NODE) - Next Next + TreeViewMain.ExpandAll() TreeViewMain.Nodes(0).EnsureVisible() @@ -845,9 +856,10 @@ Public Class frmForm_Constructor_Main_2 End Try End Sub Function ReturnAmountofRecords(EntityID As Integer, PARENT_ID As Integer) - Dim _sql As String + Dim _sql As String = "SELECT T.* FROM VWTEMP_PMO_FORM" & EntityID & " AS T,TBPMO_RECORD_CONNECT T1 WHERE T.[Record-ID] = T1.RECORD2_ID AND T1.RECORD1_ID = @RecordID" 'Abhängig von der Entität dieAnzahl der Datensätze laden - _sql = ClassDatabase.Execute_Scalar("SELECT SQL_SELECT_EBENE2 FROM VWPMO_CONSTRUCTOR_FORMS WHERE CONSTRUCT_ID = " & CONSTRUCTORID & " AND FORM_ID = " & EntityID) + + ' _sql = ClassDatabase.Execute_Scalar("SELECT SQL_SELECT_EBENE2 FROM VWPMO_CONSTRUCTOR_FORMS WHERE CONSTRUCT_ID = " & CONSTRUCTORID & " AND FORM_ID = " & EntityID) Select Case ACT_EBENE Case 1 If EBENE1_RECID = 0 Then @@ -977,27 +989,32 @@ Public Class frmForm_Constructor_Main_2 If CtrlCommandUI.IsInsert Then Exit Sub End If + Me.Cursor = Cursors.WaitCursor + Try + If TCDetails.SelectedTabPage.Text.StartsWith("Pos") = False Then + Lock_RecordControls(False) + tsButtonShowWorkflowTasks.Enabled = True + ClassControlValues.LoadDefaultValues(CURRENT_FORM_ID, SELECTED_RECORD_ID, pnlDetails.Controls) + ClassControlValues.LoadControlValuesList(SELECTED_RECORD_ID, CURRENT_FORM_ID, CtrlBuilder.AllControls) - If TCDetails.SelectedTabPage.Text.StartsWith("Pos") = False Then - Lock_RecordControls(False) - tsButtonShowWorkflowTasks.Enabled = True - ClassControlValues.LoadDefaultValues(CURRENT_FORM_ID, SELECTED_RECORD_ID, pnlDetails.Controls) - ClassControlValues.LoadControlValuesList(SELECTED_RECORD_ID, CURRENT_FORM_ID, CtrlBuilder.AllControls) - - ' Im gegensatz zu EnableEditMode muss hier nur der save button enabled werden - tsButtonSave.Enabled = True - EDIT_STATE = EditState.Insert - RECORD_CHANGED = True - End If - - CtrlCommandUI.IsInsert = True + ' Im gegensatz zu EnableEditMode muss hier nur der save button enabled werden + tsButtonSave.Enabled = True + EDIT_STATE = EditState.Insert + RECORD_CHANGED = True + End If + Catch ex As Exception + MsgBox("Unexpected Error in Insert: " & ex.Message) + Finally + Me.Cursor = Cursors.Default + CtrlCommandUI.IsInsert = True + End Try End Sub Private Sub tsButtonSave_Click(sender As Object, e As EventArgs) Handles tsButtonSave.Click Try - + Me.Cursor = Cursors.WaitCursor SAVE_ROUTINE_ACTIVE = True - + Save_Grid_Layout() If CtrlCommandUI.IsInsert Then EDIT_STATE = EditState.Insert Else @@ -1090,9 +1107,10 @@ Public Class frmForm_Constructor_Main_2 Else 'Die Daten neu laden Load_Entity_Data_Only() - Get_Grid_Row_Handle(CURRENT_RECORD_ID) + 'Get_Grid_Row_Handle(CURRENT_RECORD_ID) + LocateRecordById(CURRENT_RECORD_ID) 'Die Daten auf dem Panel laden - ClassControlValues.LoadControlValues(CURRENT_RECORD_ID, CURRENT_FORM_ID, CtrlBuilder.AllControls) + 'ClassControlValues.LoadControlValues(CURRENT_RECORD_ID, CURRENT_FORM_ID, CtrlBuilder.AllControls) ' Laden der Daten bedeutet nicht dass Daten vom Benutzer geändert wurden! RECORD_CHANGED = False End If @@ -1106,13 +1124,14 @@ Public Class frmForm_Constructor_Main_2 If CtrlCommandUI.IsInsert Then tsButtonSave.Enabled = False Else - DisableEditMode() + ' DisableEditMode() End If CtrlCommandUI.IsInsert = False EDIT_STATE = EditState.None RECORD_CHANGED = False SAVE_ROUTINE_ACTIVE = False + Me.Cursor = Cursors.Default End Sub Private Sub tsButtonDelete_Click(sender As Object, e As EventArgs) Handles tsButtonDelete.Click @@ -1175,6 +1194,7 @@ Public Class frmForm_Constructor_Main_2 'Funktion zum Vollständigen load der Inhalte ClassControlValues.LoadControlValuesList(SELECTED_RECORD_ID, CURRENT_FORM_ID, CtrlBuilder.AllControls) RECORD_ENABLED = True + pnlDetails.Focus() 'If RECORD_ENABLED = False Then ' ClassControlValues.LoadControlValuesList(SELECTED_RECORD_ID, CURRENT_FORM_ID, CtrlBuilder.AllControls) 'End If @@ -1231,12 +1251,9 @@ Public Class frmForm_Constructor_Main_2 Sub Load_Entity_Data(ClickedLevel As Integer) Try - - - Me.Cursor = Cursors.WaitCursor CURRENT_RECORD_ID = 0 - + VerknüpfungenAnzeigenToolStripMenuItem.Enabled = True 'VerknüpfungenToolStripMenuItem.Enabled = False CURRENT_FORM_TYPE = ClassDatabase.Execute_Scalar("SELECT FORM_TYPE_ID FROM TBPMO_FORM WHERE GUID = " & CURRENT_FORM_ID) IS_SINGLE_RECORD = ClassDatabase.Execute_Scalar("SELECT SINGLE_RECORD FROM TBPMO_FORM WHERE GUID = " & CURRENT_FORM_ID) @@ -1485,13 +1502,20 @@ Public Class frmForm_Constructor_Main_2 End If Load_Templates() - Me.Cursor = Cursors.Default + 'Zurücksetzen ENTITY_LOADED = True + + Catch ex As Exception MsgBox("Error in Load_Entity_Data:" & vbNewLine & ex.Message, MsgBoxStyle.Exclamation) + Me.Cursor = Cursors.Default + Finally + Me.Cursor = Cursors.Default End Try + + End Sub Sub Load_Record_Direct() Try @@ -1525,6 +1549,7 @@ Public Class frmForm_Constructor_Main_2 DTEntity.PrimaryKey = primaryKey DT_SELECTION = DTEntity LoadGrid_Selection() + Load_Grid_Layout() Catch ex As Exception MsgBox("Error in Load_Entity_Data_Only:" & vbNewLine & ex.Message, MsgBoxStyle.Exclamation) End Try @@ -1768,7 +1793,6 @@ Public Class frmForm_Constructor_Main_2 'Grid leeren Clear_Grid_View() - 'Databinding Neu BindingSource_Entity.DataSource = DT_SELECTION GridControlMain.DataSource = BindingSource_Entity @@ -1819,7 +1843,6 @@ Public Class frmForm_Constructor_Main_2 For Each row As DataRow In DT.Rows Dim colname As String = row.Item("CONTROL_COL_NAME") Dim col As DevExpress.XtraGrid.Columns.GridColumn = grvwGrid.Columns.Item(colname) - If Not IsNothing(col) Then col.Visible = False End If @@ -1936,7 +1959,7 @@ Public Class frmForm_Constructor_Main_2 tsButtonEditMode.Enabled = False Refresh_FollowUps() dtpFollowUp.Enabled = False - lblWiedervorlage_Control.Visible = False + lblWiedervorlage_Control.Text = "<< Waiting for Selection:" ListBoxUser2Profile.Items.Clear() grpbxFU_Profile.Enabled = False End If @@ -2628,7 +2651,7 @@ Public Class frmForm_Constructor_Main_2 tsButtonEditMode.Enabled = False Refresh_FollowUps() dtpFollowUp.Enabled = False - lblWiedervorlage_Control.Visible = False + lblWiedervorlage_Control.Text = "<< Waiting for Selection:" 'Check_FOLLOWUP_IsConfigured(CURRENT_FORM_ID) End If @@ -2673,6 +2696,10 @@ Public Class frmForm_Constructor_Main_2 End Sub Sub Check_Dropped_Files(FORMVIEW_ID As Integer) Try + If CURRENT_RECORD_ID = 0 Then + MsgBox("Bitte wählen Sie einen Datensatz aus!", MsgBoxStyle.Information) + Exit Sub + End If CURRENT_FORMVIEW_ID = FORMVIEW_ID For Each Str As Object In ClassDragDrop.files_dropped If Not IsNothing(Str) Then @@ -2721,7 +2748,6 @@ Public Class frmForm_Constructor_Main_2 Private Sub ListViewFollowUps_SelectedIndexChanged(sender As Object, e As EventArgs) Handles ListViewFollowUps.SelectedIndexChanged If Me.ListViewFollowUps.SelectedItems.Count > 0 Then dtpFollowUp.Enabled = False - lblWiedervorlage_Control.Visible = False FOLL_UP_ID = ListViewFollowUps.SelectedItems(0).Text lblFollowUp_save.Visible = False For Each DR As DataRow In DT_FU_ENTITY.Rows @@ -2740,7 +2766,7 @@ Public Class frmForm_Constructor_Main_2 dtpFollowUp.Value = CDate(Now) FOLL_UP_RECORD_DEFINED = False End If - lblWiedervorlage_Control.Visible = True + Dim caption = ClassDatabase.Execute_Scalar("SELECT COL_NAME FROM TBPMO_CONTROL WHERE GUID = " & DR.Item("DEPENDENT_DATE_CTRL_ID"), True) If Not IsNothing(caption) Then lblWiedervorlage_Control.Text = CStr(caption) @@ -3024,13 +3050,13 @@ Public Class frmForm_Constructor_Main_2 Public Sub LocateRecordById(RecordId As Integer) If GRID_TYPE = GridType.Grid Then - Dim FilterString As String = String.Format("[Record-ID] = {0}", JUMP_RECORD_ID) - grvwGrid.ActiveFilterString = FilterString + Dim rowHandle = grvwGrid.LocateByValue(0, grvwGrid.Columns("Record-ID"), RecordId) + grvwGrid.FocusedRowHandle = rowHandle ElseIf GRID_TYPE = GridType.Carousel Then - Dim rowHandle = grvwCarousel.LocateByValue(0, grvwCarousel.Columns("Record-ID"), JUMP_RECORD_ID) + Dim rowHandle = grvwCarousel.LocateByValue(0, grvwCarousel.Columns("Record-ID"), RecordId) grvwCarousel.FocusedRowHandle = rowHandle ElseIf GRID_TYPE = GridType.Tiles Then - Dim rowHandle = grvwTiles.LocateByValue(0, grvwTiles.Columns("Record-ID"), JUMP_RECORD_ID) + Dim rowHandle = grvwTiles.LocateByValue(0, grvwTiles.Columns("Record-ID"), RecordId) grvwTiles.FocusedRowHandle = rowHandle End If End Sub @@ -3225,4 +3251,96 @@ Public Class frmForm_Constructor_Main_2 End Try End If End Sub + + Private Sub VerknüpfungenAnzeigenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles VerknüpfungenAnzeigenToolStripMenuItem.Click + Show_Verknuepfungen() + End Sub + Sub Show_Verknuepfungen() + If SplitContainerBottom.Collapsed = True Then + VerknüpfungenAnzeigenToolStripMenuItem.Text = "Verknüfungen ausblenden" + Load_ParentConnections() + TCDetails.SelectedTabPageIndex = 0 + SplitContainerBottom.Collapsed = False + Else + VerknüpfungenAnzeigenToolStripMenuItem.Text = "Verknüfungen einblenden" + SplitContainerBottom.Collapsed = True + 'Save_GridViewParentEntityLayout() + My.Settings.Save() + End If + End Sub + Sub Load_ParentConnections() + Try + ' SELECT COLUMN_NAME1 FROM VWTEMP_cPMO_FORM + Dim DT As DataTable = ClassDatabase.Return_Datatable("SELECT TOP 1 PARENT_ID,FORM_TITLE from VWPMO_CONSTRUCTOR_FORMS WHERE CONSTRUCT_ID = " & CONSTRUCTORID & " AND FORM_ID = " & CURRENT_FORM_ID, "Parent-Data") + Dim Parent_ID = DT.Rows(0).Item(0) + Dim Title = DT.Rows(0).Item(1) + Dim Colname = "[" & ClassDatabase.Execute_Scalar("SELECT TOP 1 COLUMN_NAME1 from VWPMO_CONSTRUCTOR_FORMS WHERE CONSTRUCT_ID = " & CONSTRUCTORID & " AND FORM_ID = " & Parent_ID, True) & "]" + 'Load_GridViewParentEntity_Layout() + If Not IsNothing(Parent_ID) And Not IsNothing(Colname) Then + Dim sql = "select [Record-ID], " & Colname & " from VWTEMP_PMO_FORM" & Parent_ID.ToString + Dim DTGrid As DataTable = ClassDatabase.Return_Datatable(sql, "VariableSelect ParentEntity") + GridControlParent.DataSource = Nothing + GridViewParent.Columns.Clear() + 'Databinding Neu + GridControlParent.DataSource = DTGrid + 'TabPageParentEntity.Text = "Aktuelle Parent-Entity: " & Title + GridViewParent.Columns.Item("Record-ID").Visible = False + End If + Catch ex As Exception + MsgBox("Fehler bei Load_ParentConnections:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) + End Try + End Sub + + Private Sub GridViewParent_FocusedRowChanged(sender As Object, e As FocusedRowChangedEventArgs) Handles GridViewParent.FocusedRowChanged + Try + If GridViewParent.RowCount > 0 Then + Dim Grid_RecordID = GridViewParent.GetFocusedRowCellValue(GridViewParent.Columns("Record-ID")) + If Grid_RecordID Is Nothing = False Then + LinkParentID = Grid_RecordID + 'lblParentID.Text = Grid_RecordID.ToString & " - " & GridViewParentEntity.GetFocusedRowCellValue(GridViewParent.Columns(1)) + btnRelinkParentID.BackColor = Color.DarkOrange + btnRelinkParentID.FlatAppearance.BorderColor = Color.DarkOrange + btnRelinkParentID.Enabled = True + Else + btnRelinkParentID.Enabled = False + btnRelinkParentID.BackColor = Color.WhiteSmoke + btnRelinkParentID.FlatAppearance.BorderColor = Color.WhiteSmoke + ClassLogger.Add(">> Grid_RecordID konnte nicht gewählt werden - GetFocusedParentID", True) + ' lblParentID.Text = "keine Auswahl möglich" + End If + Else + btnRelinkParentID.Enabled = False + btnRelinkParentID.BackColor = Color.WhiteSmoke + btnRelinkParentID.FlatAppearance.BorderColor = Color.WhiteSmoke + 'lblParentID.Text = "keine Rows gefunden" + End If + Catch ex As Exception + MsgBox("Fehler bei GetFocusedParentID:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) + End Try + End Sub + + Private Sub btnRelinkParentID_Click(sender As Object, e As EventArgs) Handles btnRelinkParentID.Click + If CURRENT_PARENTID > 0 Then + Dim result As MsgBoxResult + result = MessageBox.Show("Möchten Sie den Parent-Datensatz für den aktuellen Datensatz wirklich aktualisieren?", "Bestätigung erforderlich:", MessageBoxButtons.YesNo, MessageBoxIcon.Question) + If result <> MsgBoxResult.Yes Then + Exit Sub + Else + If ClassDatabase.Execute_non_Query("DELETE FROM TBPMO_RECORD_CONNECT WHERE RECORD2_ID = " & CURRENT_RECORD_ID & " AND RECORD1_ID = (SELECT PARENT_ID FROM TBPMO_FORM WHERE GUID = " & CURRENT_FORM_ID & ")", True) = False Then + Exit Sub + End If + End If + + End If + If ClassControlCommandsUI.ConnectRecord(LinkParentID, CURRENT_RECORD_ID, "ReLInk ENTITY " & CURRENT_FORM_ID.ToString) = True Then + 'Save_GridViewParentEntityLayout() + MsgBox("Die Parent-Entität wurde erfolgreich aktualisiert!", MsgBoxStyle.Information) + Check_Record_Changed() + 'Load_Data_for_TreeView() + btnRelinkParentID.BackColor = Color.Lime + btnRelinkParentID.FlatAppearance.BorderColor = Color.Lime + Load_Entity_Data_Only() + 'Show_Verknuepfungen() + End If + End Sub End Class \ No newline at end of file diff --git a/app/DD-Record-Organiser/frmMain.vb b/app/DD-Record-Organiser/frmMain.vb index 27c96cc..f07f306 100644 --- a/app/DD-Record-Organiser/frmMain.vb +++ b/app/DD-Record-Organiser/frmMain.vb @@ -463,10 +463,12 @@ Public Class frmMain End Sub Private Sub BarButtonItem8_ItemClick(sender As Object, e As ItemClickEventArgs) Handles BarButtonItem8.ItemClick + Close_Maximized_Forms() OpenDokumentartt() End Sub Private Sub BarButtonItem9_ItemClick(sender As Object, e As ItemClickEventArgs) Handles BarButtonItem9.ItemClick + Close_Maximized_Forms() OpenObjecttypeConfig() End Sub @@ -493,6 +495,7 @@ Public Class frmMain End Sub Private Sub BarButtonItem16_ItemClick(sender As Object, e As ItemClickEventArgs) Handles BarButtonItem16.ItemClick + Close_Maximized_Forms() Dim frm As New frmConstructorDesigner frm.MdiParent = Me frm.Show() diff --git a/app/DD-Record-Organiser/frmWD_Index_Dokart.vb b/app/DD-Record-Organiser/frmWD_Index_Dokart.vb index 88590ad..d93bcc2 100644 --- a/app/DD-Record-Organiser/frmWD_Index_Dokart.vb +++ b/app/DD-Record-Organiser/frmWD_Index_Dokart.vb @@ -210,6 +210,14 @@ Public Class frmWD_Index_Dokart 'End Function Private Sub btnindex_Click(sender As Object, e As EventArgs) Handles btnindex.Click + If CURRENT_RECORD_ID = 0 Then + MsgBox("Kein Datensatz ausgewählt oder die Dokumentart wurde noch nicht gewählt!", MsgBoxStyle.Information) + Exit Sub + End If + If lvwIndices.Items.Count = 0 Then + MsgBox("Bitte eine Dokumentart wählen!", MsgBoxStyle.Information) + Exit Sub + End If Indexing_File() End Sub Sub Indexing_File() @@ -310,8 +318,16 @@ Public Class frmWD_Index_Dokart lvwIndices.Items.Add(dt.Rows(0).Item("IDXNAME_ENTITYID").ToString) lvwIndices.Items(Count).SubItems.Add(CURRENT_FORM_ID) lvwIndices.Items.Add(dt.Rows(0).Item("IDXNAME_PARENTID").ToString) - lvwIndices.Items(Count + 1).SubItems.Add(CURRENT_PARENTID) + Dim ParentID = ClassDatabase.Execute_Scalar("SELECT TOP 1 PARENT_ID FROM TBPMO_FORM WHERE GUID = " & CURRENT_FORM_ID, True) + Try + If IsNumeric(ParentID) And ParentID > 0 Then + lvwIndices.Items(Count + 1).SubItems.Add(ParentID) + End If + Catch ex As Exception + MsgBox("Unexpected Error in Setting Parent-ID" & vbNewLine & ex.Message, MsgBoxStyle.Critical) + End Try End If + End If End If Catch ex As Exception diff --git a/app/SetupWiX/Product.wxs b/app/SetupWiX/Product.wxs index 9f0a27a..1faa834 100644 --- a/app/SetupWiX/Product.wxs +++ b/app/SetupWiX/Product.wxs @@ -1,7 +1,7 @@ - +