diff --git a/app/DD-Record-Organiser/ClassControlBuilder.vb b/app/DD-Record-Organiser/ClassControlBuilder.vb index cb2d96f..8c2eab6 100644 --- a/app/DD-Record-Organiser/ClassControlBuilder.vb +++ b/app/DD-Record-Organiser/ClassControlBuilder.vb @@ -465,7 +465,8 @@ Public Class ClassControlBuilder End If Next End Sub - Public Sub AddLabel(name As String, + Public Sub AddLabel(id As Integer, + name As String, text As String, x As Integer, y As Integer, @@ -482,6 +483,7 @@ Public Class ClassControlBuilder Dim control As Label = New Label Dim defaultSize As Size = New Size(200, 27) + control.Tag = id control.Name = name control.Text = text control.Font = New Font(fontfamily, fontsize, CType(fontstyle, FontStyle)) @@ -534,7 +536,8 @@ Public Class ClassControlBuilder End Sub - Public Sub AddTextBox(name As String, + Public Sub AddTextBox(id As Integer, + name As String, x As Integer, y As Integer, fontfamily As String, @@ -555,6 +558,7 @@ Public Class ClassControlBuilder Dim control As New TextBox Dim defaultSize As Size = New Size(200, 27) + control.Tag = id control.Name = name control.Font = New Font(fontfamily, fontsize, CType(fontstyle, FontStyle)) control.ForeColor = IntToColor(fontcolor) @@ -611,7 +615,8 @@ Public Class ClassControlBuilder End Sub - Public Sub AddCheckBox(name As String, + Public Sub AddCheckBox(id As Integer, + name As String, text As String, Checked As Boolean, x As Integer, @@ -631,6 +636,8 @@ Public Class ClassControlBuilder Try Dim control As New CheckBox Dim defaultSize As Size = New Size(150, 27) + + control.Tag = id control.Checked = Checked control.Name = name control.Font = New Font(fontfamily, fontsize, CType(fontstyle, FontStyle)) @@ -677,7 +684,8 @@ Public Class ClassControlBuilder End Try End Sub - Public Sub AddRadioButton(name As String, + Public Sub AddRadioButton(id As Integer, + name As String, text As String, Checked As Boolean, x As Integer, @@ -698,6 +706,7 @@ Public Class ClassControlBuilder Dim control As New RadioButton Dim defaultSize As Size = New Size(150, 27) + control.Tag = id control.Name = name control.Font = New Font(fontfamily, fontsize, CType(fontstyle, FontStyle)) control.ForeColor = IntToColor(fontcolor) @@ -742,7 +751,8 @@ Public Class ClassControlBuilder End Try End Sub - Public Sub AddComboBox(name As String, + Public Sub AddComboBox(id As Integer, + name As String, x As Integer, y As Integer, fontfamily As String, @@ -764,6 +774,7 @@ Public Class ClassControlBuilder Dim control As New ComboBox Dim defaultSize As Size = New Size(120, 24) + control.Tag = id control.Name = name control.Font = New Font(fontfamily, fontsize, CType(fontstyle, FontStyle)) control.ForeColor = IntToColor(fontcolor) @@ -897,7 +908,8 @@ Public Class ClassControlBuilder iFoundIndex = cbo.FindStringExact(cbo.Text) cbo.SelectedIndex = iFoundIndex End Sub - Public Sub AddDateTimePicker(name As String, + Public Sub AddDateTimePicker(id As Integer, + name As String, x As Integer, y As Integer, fontfamily As String, @@ -916,6 +928,7 @@ Public Class ClassControlBuilder 'Dim control As New DateTimePicker Dim defaultSize As Size = New Size(120, 24) + control.Tag = id control.Name = name 'control.Format = DateTimePickerFormat.Short 'control.Font = New Font(fontfamily, fontsize, CType(fontstyle, FontStyle)) @@ -959,7 +972,8 @@ Public Class ClassControlBuilder End Try End Sub - Public Sub AddDataGridView(name As String, + Public Sub AddDataGridView(id As Integer, + name As String, x As Integer, y As Integer, vwidth As Integer, @@ -973,6 +987,7 @@ Public Class ClassControlBuilder Dim column As New DataGridViewTextBoxColumn Dim defaultSize = New Size(130, 150) + control.Tag = id control.Name = name control.BackgroundColor = SystemColors.ControlDark control.AllowUserToAddRows = False @@ -1015,7 +1030,8 @@ Public Class ClassControlBuilder Me.AddToPanel(control) End If End Sub - Public Sub AddPictureBox(name As String, + Public Sub AddPictureBox(id As Integer, + name As String, x As Integer, y As Integer, vwidth As Integer, @@ -1047,6 +1063,7 @@ Public Class ClassControlBuilder End If ctx.Items.Add(itemSave) + control.Tag = id control.Name = name control.Parent = _master_panel control.BorderStyle = BorderStyle.FixedSingle @@ -1081,7 +1098,8 @@ Public Class ClassControlBuilder Me.AddToPanel(control) End If End Sub - Public Sub AddGroupBox(name As String, + Public Sub AddGroupBox(id As Integer, + name As String, Caption As String, x As Integer, y As Integer, @@ -1099,6 +1117,7 @@ Public Class ClassControlBuilder Dim control As New GroupBox Dim defaultSize = New Size(200, 100) + control.Tag = id control.Name = name control.Parent = _master_panel control.Text = Caption @@ -1136,7 +1155,8 @@ Public Class ClassControlBuilder Me.AddToPanel(control) End If End Sub - Public Sub FunctionAddAppointment(name As String, + Public Sub FunctionAddAppointment(id As Integer, + name As String, text As String, x As Integer, y As Integer, @@ -1149,9 +1169,10 @@ Public Class ClassControlBuilder Dim control As Button = New Button Dim defaultSize As Size = New Size(200, 27) + control.Tag = id control.Name = name control.Text = text - control.Tag = "ADDAPPOINTMENT" + 'control.Tag = "ADDAPPOINTMENT" control.TabStop = False control.Image = My.Resources.calendar_add control.ImageAlign = ContentAlignment.MiddleRight @@ -1190,7 +1211,8 @@ Public Class ClassControlBuilder End Sub - Public Sub FunctionAddFormData(name As String, + Public Sub FunctionAddFormData(id As Integer, + name As String, text As String, x As Integer, y As Integer, @@ -1203,9 +1225,10 @@ Public Class ClassControlBuilder Dim control As Button = New Button Dim defaultSize As Size = New Size(30, 21) + control.Tag = id control.Name = name control.Text = "" - control.Tag = "ADDFORMDATA" + 'control.Tag = "ADDFORMDATA" control.TabStop = False control.Image = My.Resources.add1 @@ -1242,7 +1265,8 @@ Public Class ClassControlBuilder MsgBox("Fehler: " + vbNewLine + ex.Message) End Try End Sub - Public Sub AddCheckedListBox(name As String, + Public Sub AddCheckedListBox(id As Integer, + name As String, x As Integer, y As Integer, fontfamily As String, @@ -1265,6 +1289,7 @@ Public Class ClassControlBuilder 'control.CheckOnClick = True ' control.CheckStyle = DevExpress.XtraEditors.Controls.CheckStyles.Style3 + control.Tag = id control.Name = name control.Font = New Font(fontfamily, fontsize, CType(fontstyle, FontStyle)) control.ForeColor = IntToColor(fontcolor) @@ -1342,7 +1367,8 @@ Public Class ClassControlBuilder MsgBox("Error in AddCheckedListBox: " + vbNewLine + ex.Message) End Try End Sub - Public Sub AddListBox(name As String, + Public Sub AddListBox(id As Integer, + name As String, x As Integer, y As Integer, fontfamily As String, @@ -1365,6 +1391,7 @@ Public Class ClassControlBuilder 'control.CheckOnClick = True ' control.CheckStyle = DevExpress.XtraEditors.Controls.CheckStyles.Style3 + control.Tag = id control.Name = name control.Font = New Font(fontfamily, fontsize, CType(fontstyle, FontStyle)) control.ForeColor = IntToColor(fontcolor) diff --git a/app/DD-Record-Organiser/ClassControlCommands.vb b/app/DD-Record-Organiser/ClassControlCommands.vb index 503d86e..fd09313 100644 --- a/app/DD-Record-Organiser/ClassControlCommands.vb +++ b/app/DD-Record-Organiser/ClassControlCommands.vb @@ -31,11 +31,16 @@ Case CurrentType.Contains("RadioButton".ToUpper) Return 11 Case CurrentType.Contains("Button".ToUpper) - If control.Tag = "ADDAPPOINTMENT" Then + If control.Name.Contains("f_addappointment") Then Return 8 - ElseIf control.Tag = "ADDFORMDATA" Then + ElseIf control.Name.Contains("f_addformdata") Then Return 9 End If + 'If control.Tag = "ADDAPPOINTMENT" Then + ' Return 8 + 'ElseIf control.Tag = "ADDFORMDATA" Then + ' Return 9 + 'End If Case CurrentType.Contains("CheckedListBoxControl".ToUpper) Return 12 Case CurrentType.Contains("ListBoxControl".ToUpper) @@ -343,7 +348,9 @@ If ClassDatabase.Execute_non_Query(SQL) = True Then If CurrentType.Contains("Button") Then - If control.Tag = "ADDAPPOINTMENT" Then + 'If control.Tag = "ADDAPPOINTMENT" Then + If control.Name.Contains("f_addappointment") Then + Dim ControlId = properties.ID Dim FromDateId, ToDateId As Integer Dim SubjectString, Subject2String, PlaceString, DescString As String @@ -387,8 +394,8 @@ End If ClassFunctionCommands.UpdateAddAppointmentFunction(ControlId, FromDateId, ToDateId, SubjectString, Subject2String, PlaceString, DescString) - - ElseIf control.Tag = "ADDFORMDATA" Then + ElseIf control.Name.Contains("f_addformdata") Then + 'ElseIf control.Tag = "ADDFORMDATA" Then Dim ControlId = properties.ID Dim FormID, ScreenID As Integer diff --git a/app/DD-Record-Organiser/ClassControlCommandsUI.vb b/app/DD-Record-Organiser/ClassControlCommandsUI.vb index 6fb320b..952c3ea 100644 --- a/app/DD-Record-Organiser/ClassControlCommandsUI.vb +++ b/app/DD-Record-Organiser/ClassControlCommandsUI.vb @@ -43,7 +43,8 @@ Public Class ClassControlCommandsUI Select Case dr.Item("CTRLTYPE_ID") Case 1 ' Label - _CtrlBuilder.AddLabel(dr.Item("CONTROL_NAME"), + _CtrlBuilder.AddLabel(dr.Item("CONTROL_ID"), + dr.Item("CONTROL_NAME"), dr.Item("CTRLSCR_CAPTION"), dr.Item("CTRLSCR_X_LOC"), dr.Item("CTRLSCR_Y_LOC"), @@ -55,7 +56,8 @@ Public Class ClassControlCommandsUI False, parent) Case 2 ' TextBox - _CtrlBuilder.AddTextBox(dr.Item("CONTROL_NAME"), + _CtrlBuilder.AddTextBox(dr.Item("CONTROL_ID"), + dr.Item("CONTROL_NAME"), dr.Item("CTRLSCR_X_LOC"), dr.Item("CTRLSCR_Y_LOC"), dr.Item("CTRLSCR_FONT_FAMILY"), @@ -72,7 +74,8 @@ Public Class ClassControlCommandsUI False, parent) Case 3 ' ComboBox - _CtrlBuilder.AddComboBox(dr.Item("CONTROL_NAME"), + _CtrlBuilder.AddComboBox(dr.Item("CONTROL_ID"), + dr.Item("CONTROL_NAME"), dr.Item("CTRLSCR_X_LOC"), dr.Item("CTRLSCR_Y_LOC"), dr.Item("CTRLSCR_FONT_FAMILY"), @@ -90,7 +93,8 @@ Public Class ClassControlCommandsUI dr.Item("CONTROL_SQLCOMMAND_1"), parent) Case 4 ' DateTimePicker - _CtrlBuilder.AddDateTimePicker(dr.Item("CONTROL_NAME"), + _CtrlBuilder.AddDateTimePicker(dr.Item("CONTROL_ID"), + dr.Item("CONTROL_NAME"), dr.Item("CTRLSCR_X_LOC"), dr.Item("CTRLSCR_Y_LOC"), dr.Item("CTRLSCR_FONT_FAMILY"), @@ -104,7 +108,8 @@ Public Class ClassControlCommandsUI False, parent) Case 5 ' GroupBox - _CtrlBuilder.AddGroupBox(dr.Item("CONTROL_NAME"), + _CtrlBuilder.AddGroupBox(dr.Item("CONTROL_ID"), + dr.Item("CONTROL_NAME"), dr.Item("CTRLSCR_CAPTION"), dr.Item("CTRLSCR_X_LOC"), dr.Item("CTRLSCR_Y_LOC"), @@ -118,7 +123,8 @@ Public Class ClassControlCommandsUI False, parent) Case 6 ' PictureBox - _CtrlBuilder.AddPictureBox(dr.Item("CONTROL_NAME"), + _CtrlBuilder.AddPictureBox(dr.Item("CONTROL_ID"), + dr.Item("CONTROL_NAME"), dr.Item("CTRLSCR_X_LOC"), dr.Item("CTRLSCR_Y_LOC"), dr.Item("CTRLSCR_WIDTH"), @@ -127,7 +133,8 @@ Public Class ClassControlCommandsUI dr.Item("CONTROL_READ_ONLY"), parent) Case 7 ' DataGridView - _CtrlBuilder.AddDataGridView(dr.Item("CONTROL_NAME"), + _CtrlBuilder.AddDataGridView(dr.Item("CONTROL_ID"), + dr.Item("CONTROL_NAME"), dr.Item("CTRLSCR_X_LOC"), dr.Item("CTRLSCR_Y_LOC"), dr.Item("CTRLSCR_WIDTH"), @@ -142,7 +149,8 @@ Public Class ClassControlCommandsUI 'Else ' Checked = StrToBool(dr.Item("CONTROL_DEF_VALUE")) 'End If - _CtrlBuilder.AddCheckBox(dr.Item("CONTROL_NAME"), + _CtrlBuilder.AddCheckBox(dr.Item("CONTROL_ID"), + dr.Item("CONTROL_NAME"), dr.Item("CTRLSCR_CAPTION"), Checked, dr.Item("CTRLSCR_X_LOC"), @@ -159,7 +167,8 @@ Public Class ClassControlCommandsUI dr.Item("CONTROL_READ_ONLY"), parent) Case 8 ' Function AddAppointment - _CtrlBuilder.FunctionAddAppointment(dr.Item("CONTROL_NAME"), + _CtrlBuilder.FunctionAddAppointment(dr.Item("CONTROL_ID"), + dr.Item("CONTROL_NAME"), dr.Item("CTRLSCR_CAPTION"), dr.Item("CTRLSCR_X_LOC"), dr.Item("CTRLSCR_Y_LOC"), @@ -169,7 +178,8 @@ Public Class ClassControlCommandsUI parent) AddHandler _CtrlBuilder.CurrentControl.Click, _AddAppointmentHandler Case 9 ' Function AddFormData - _CtrlBuilder.FunctionAddFormData(dr.Item("CONTROL_NAME"), + _CtrlBuilder.FunctionAddFormData(dr.Item("CONTROL_ID"), + dr.Item("CONTROL_NAME"), dr.Item("CTRLSCR_CAPTION"), dr.Item("CTRLSCR_X_LOC"), dr.Item("CTRLSCR_Y_LOC"), @@ -185,7 +195,8 @@ Public Class ClassControlCommandsUI 'Else ' Checked = StrToBool(dr.Item("CONTROL_DEF_VALUE")) 'End If - _CtrlBuilder.AddRadioButton(dr.Item("CONTROL_NAME"), + _CtrlBuilder.AddRadioButton(dr.Item("CONTROL_ID"), + dr.Item("CONTROL_NAME"), dr.Item("CTRLSCR_CAPTION"), Checked, dr.Item("CTRLSCR_X_LOC"), @@ -202,7 +213,8 @@ Public Class ClassControlCommandsUI dr.Item("CONTROL_READ_ONLY"), parent) Case 12 'CheckedListBox - CtrlBuilder.AddCheckedListBox(dr.Item("CONTROL_NAME"), + CtrlBuilder.AddCheckedListBox(dr.Item("CONTROL_ID"), + dr.Item("CONTROL_NAME"), dr.Item("CTRLSCR_X_LOC"), dr.Item("CTRLSCR_Y_LOC"), dr.Item("CTRLSCR_FONT_FAMILY"), @@ -219,7 +231,8 @@ Public Class ClassControlCommandsUI dr.Item("CONTROL_SQLCOMMAND_1"), parent) Case 13 'CheckedListBox - CtrlBuilder.AddListBox(dr.Item("CONTROL_NAME"), + CtrlBuilder.AddListBox(dr.Item("CONTROL_ID"), + dr.Item("CONTROL_NAME"), dr.Item("CTRLSCR_X_LOC"), dr.Item("CTRLSCR_Y_LOC"), dr.Item("CTRLSCR_FONT_FAMILY"), diff --git a/app/DD-Record-Organiser/ClassControlValues.vb b/app/DD-Record-Organiser/ClassControlValues.vb index c9c09b3..283deaf 100644 --- a/app/DD-Record-Organiser/ClassControlValues.vb +++ b/app/DD-Record-Organiser/ClassControlValues.vb @@ -134,6 +134,126 @@ Public Class ClassControlValues End Try End Sub +#Region "#### ClassControlValues REWRITE ####" + Public Shared Sub LoadControlValuesNeu(RecordId As Integer, FormId As Integer, controls As Control.ControlCollection) + + ClearControlValues(controls) + + Dim SQL As String = String.Format("SELECT * FROM VWPMO_VALUES WHERE RECORD_ID = {0}", RecordId) + Dim DT_ControlValues As DataTable = ClassDatabase.Return_Datatable(SQL, "LoadControlValues") + + For Each control As Control In controls + Dim ControlId As Integer = CInt(control.Tag) + + ' Wert per LINQ aus DT_ControlValues suchen der zur aktuellen controlId passt + Dim value = (From row In DT_ControlValues.AsEnumerable() + Where row.Item("CONTROL_ID") = ControlId + Select row.Item("VALUE")).SingleOrDefault() + + If IsNothing(value) Then + Continue For + End If + + If TypeOf control Is GroupBox Then + Dim groupbox As GroupBox = DirectCast(control, GroupBox) + LoadControlValuesNeu(RecordId, FormId, groupbox.Controls) + Else + LoadControlValueNeu(RecordId, ControlId, control, value) + End If + + Next + End Sub + + Private Shared Sub LoadControlValueNeu(recordId As Integer, controlId As Integer, control As Control, value As Object) + Try + Select Case control.GetType() + Case GetType(TextBox) + Dim textbox As TextBox = DirectCast(control, TextBox) + textbox.Text = value + Case GetType(Label) + Dim label As Label = DirectCast(control, Label) + Dim autoValue As String = LoadControlAutoValue(controlId, recordId, control) + + If IsNothing(autoValue) Then + label.Text = value + Else + label.Text = autoValue + End If + Case GetType(ComboBox) + Dim combobox As ComboBox = DirectCast(control, ComboBox) + combobox.Text = value + Case GetType(CheckBox) + Dim checkbox As CheckBox = DirectCast(control, CheckBox) + checkbox.Checked = Boolean.Parse(value) + Case GetType(RadioButton) + Dim radiobutton As RadioButton = DirectCast(control, RadioButton) + radiobutton.Checked = Boolean.Parse(value) + Case GetType(DevExpress.XtraEditors.DateEdit) + Dim datepicker As DevExpress.XtraEditors.DateEdit = DirectCast(control, DevExpress.XtraEditors.DateEdit) + If value = String.Empty Or value = "00:00:00" Then + datepicker.DateTime = DateTime.MinValue + Else + datepicker.DateTime = DateTime.Parse(value) + End If + Case GetType(DevExpress.XtraEditors.ListBoxControl) + Dim listbox As DevExpress.XtraEditors.ListBoxControl = DirectCast(control, DevExpress.XtraEditors.ListBoxControl) + listbox.SelectedIndex = listbox.FindStringExact(value) + Case GetType(PictureBox) + LoadImage(recordId, controlId, control) + Case Else + If LogErrorsOnly = False Then ClassLogger.Add(">> Sub LoadControlValue - Control-Type nicht berücksichtigt: " & GetType(Control).ToString(), False) + End Select + Catch ex As Exception + MsgBox("Error in LoadControlValue:" & vbNewLine & ex.Message) + End Try + End Sub + + 'Private Shared Function CheckForStaticList(controlId As Integer, recordId As Integer) + ' Try + ' Dim SQL As String = String.Format("SELECT VALUE FROM VWPMO_VALUES WHERE CONTROL_ID = {0} AND RECORD_ID = {1}", controlId, recordId) + ' Dim staticList As String = ClassDatabase.Execute_Scalar(SQL) + + ' If IsNothing(staticList) Then + ' Return Nothing + ' Else + ' Return staticList + ' End If + ' Catch ex As Exception + ' MsgBox("Error in CheckForStaticList: " & vbNewLine & ex.Message) + ' End Try + 'End Function + + 'Private Shared Function CheckForSqlCommand(controlId As Integer) As DataTable + ' Try + ' Dim SQL As String = String.Format("SELECT SQL_COMMAND_1 FROM TBPMO_CONTROL WHERE GUID = {0}", controlId) + ' Dim SqlCommand As String = ClassDatabase.Execute_Scalar(SQL) + + ' If SqlCommand Is Nothing Or SqlCommand = String.Empty Then + ' Return Nothing + ' End If + + ' If SqlCommand.Contains("@") Then + ' SqlCommand = ReplaceSqlCommandPlaceholders(SqlCommand) + ' End If + + ' Return ClassDatabase.Return_Datatable(SqlCommand) + ' Catch ex As Exception + ' MsgBox("Error in CheckForSqlCommand: " & vbNewLine & ex.Message) + ' End Try + 'End Function + + 'Private Shared Function ReplaceSqlCommandPlaceholders(sqlCommand As String) + ' sqlCommand = sqlCommand.Replace("@RECORD_ID", CURRENT_RECORD_ID) + ' sqlCommand = sqlCommand.Replace("@RECORDID", CURRENT_RECORD_ID) + ' sqlCommand = sqlCommand.Replace("PARENTRECORD_ID", CURRENT_PARENTID) + ' sqlCommand = sqlCommand.Replace("PARENTRECORDID", CURRENT_PARENTID) + + ' Return sqlCommand + 'End Function +#End Region + + + Public Shared Sub LoadControlValues(RecordID As Integer, FormID As Integer, controls As Control.ControlCollection) Try Dim CONTROL_ID As Integer @@ -275,7 +395,7 @@ Public Class ClassControlValues 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 diff --git a/app/DD-Record-Organiser/frmForm_Constructor_Main_2.vb b/app/DD-Record-Organiser/frmForm_Constructor_Main_2.vb index 70605ef..8982667 100644 --- a/app/DD-Record-Organiser/frmForm_Constructor_Main_2.vb +++ b/app/DD-Record-Organiser/frmForm_Constructor_Main_2.vb @@ -1512,7 +1512,13 @@ Public Class frmForm_Constructor_Main_2 End If Load_Templates() + 'For Each column As DevExpress.XtraGrid.Columns.GridColumn In grvwGrid.Columns + ' column.MinWidth = 100 + 'Next + Dim firstRow As System.Data.DataRowView = GridControlMain.MainView.GetRow(0) + Dim firstRecordId As Integer = firstRow.Row.Item("Record-ID") + ClassControlValues.LoadControlValuesList(firstRecordId, CURRENT_FORM_ID, CtrlBuilder.MasterPanel.Controls) 'Zurücksetzen ENTITY_LOADED = True @@ -1540,6 +1546,7 @@ Public Class frmForm_Constructor_Main_2 CURRENT_RECORD_ID = Grid_RecordID 'Daten zu Record in jedem Fall laden ClassControlValues.LoadControlValues(SELECTED_RECORD_ID, CURRENT_FORM_ID, CtrlBuilder.AllControls) + 'ClassControlValues.LoadControlValuesNeu(SELECTED_RECORD_ID, CURRENT_FORM_ID, CtrlBuilder.AllControls) ' Laden der Daten bedeutet nicht dass Daten vom Benutzer geändert wurden! RECORD_CHANGED = False Update_Record_Label(Grid_RecordID) @@ -2015,6 +2022,7 @@ Public Class frmForm_Constructor_Main_2 If TCDetails.SelectedTabPage.Text.StartsWith("Detail") Or TCDetails.SelectedTabPage.Text.StartsWith("Kopf") Then 'Daten zu Record in jedem Fall laden ClassControlValues.LoadControlValues(SELECTED_RECORD_ID, CURRENT_FORM_ID, CtrlBuilder.AllControls) + 'ClassControlValues.LoadControlValuesNeu(SELECTED_RECORD_ID, CURRENT_FORM_ID, CtrlBuilder.AllControls) End If If TCDetails.SelectedTabPage.Text.ToLower.StartsWith("wieder") Then tsButtonEditMode.Enabled = False diff --git a/app/DD-Record-Organiser/frmLevel_Designer.vb b/app/DD-Record-Organiser/frmLevel_Designer.vb index 9b79334..066c32a 100644 --- a/app/DD-Record-Organiser/frmLevel_Designer.vb +++ b/app/DD-Record-Organiser/frmLevel_Designer.vb @@ -113,61 +113,61 @@ 'Dim random As Integer = r.Next(8, 100) Select Case type Case "lbl" - CtrlBuilder.AddLabel("lbl" & random, "Bezeichnung definieren", 0, 0, def_font_family, def_font_color, def_font_size, def_font_style, "", True, Parent) + CtrlBuilder.AddLabel(0, "lbl" & random, "Bezeichnung definieren", 0, 0, def_font_family, def_font_color, def_font_size, def_font_style, "", True, Parent) ' Aktuelles Control in die Datenbank speichern ClassControlCommands.InsertControl(CtrlBuilder.CurrentControl) Case "txt" - CtrlBuilder.AddTextBox("txt" & random, 0, 0, def_font_family, def_font_color, def_font_size, def_font_style, 0, True, 0, 0, False, False, "String", True, Parent) + CtrlBuilder.AddTextBox(0, "txt" & random, 0, 0, def_font_family, def_font_color, def_font_size, def_font_style, 0, True, 0, 0, False, False, "String", True, Parent) ' Aktuelles Control in die Datenbank speichern ClassControlCommands.InsertControl(CtrlBuilder.CurrentControl) Case "cmb" - CtrlBuilder.AddComboBox("cmb" & random, 0, 0, def_font_family, def_font_color, def_font_size, def_font_style, 0, True, 0, 0, "String", True, False, "", "", Parent) + CtrlBuilder.AddComboBox(0, "cmb" & random, 0, 0, def_font_family, def_font_color, def_font_size, def_font_style, 0, True, 0, 0, "String", True, False, "", "", Parent) ' Aktuelles Control in die Datenbank speichern ClassControlCommands.InsertControl(CtrlBuilder.CurrentControl) Case "dtp" - CtrlBuilder.AddDateTimePicker("dtp" & random, 0, 0, def_font_family, def_font_size, def_font_style, 0, False, 0, 0, False, True, Parent) + CtrlBuilder.AddDateTimePicker(0, "dtp" & random, 0, 0, def_font_family, def_font_size, def_font_style, 0, False, 0, 0, False, True, Parent) ' Aktuelles Control in die Datenbank speichern ClassControlCommands.InsertControl(CtrlBuilder.CurrentControl) Case "dgv" - CtrlBuilder.AddDataGridView("dgv" & random, 0, 0, 0, 0, True, False, Parent) + CtrlBuilder.AddDataGridView(0, "dgv" & random, 0, 0, 0, 0, True, False, Parent) ' Aktuelles Control in die Datenbank speichern ClassControlCommands.InsertControl(CtrlBuilder.CurrentControl) Case "chk" - CtrlBuilder.AddCheckBox("chk" & random, "Bezeichn. defnieren", False, 0, 0, def_font_family, def_font_color, def_font_size, def_font_style, 0, False, 0, 0, True, False, Parent) + CtrlBuilder.AddCheckBox(0, "chk" & random, "Bezeichn. defnieren", False, 0, 0, def_font_family, def_font_color, def_font_size, def_font_style, 0, False, 0, 0, True, False, Parent) ' Aktuelles Control in die Datenbank speichern ClassControlCommands.InsertControl(CtrlBuilder.CurrentControl) Case "rb" - CtrlBuilder.AddRadioButton("rb" & random, "Bezeichn. defnieren", False, 0, 0, def_font_family, def_font_color, def_font_size, def_font_style, 0, False, 0, 0, True, False, Parent) + CtrlBuilder.AddRadioButton(0, "rb" & random, "Bezeichn. defnieren", False, 0, 0, def_font_family, def_font_color, def_font_size, def_font_style, 0, False, 0, 0, True, False, Parent) ' Aktuelles Control in die Datenbank speichern ClassControlCommands.InsertControl(CtrlBuilder.CurrentControl) Case "pb" - CtrlBuilder.AddPictureBox("pb" & random, 0, 0, 0, 0, True, False, Parent) + CtrlBuilder.AddPictureBox(0, "pb" & random, 0, 0, 0, 0, True, False, Parent) ' Aktuelles Control in die Datenbank speichern ClassControlCommands.InsertControl(CtrlBuilder.CurrentControl) Case "gb" - CtrlBuilder.AddGroupBox("gb" & random, "Bezeichn. defnieren", 0, 0, 0, 0, ColorToInt(SystemColors.Control), def_font_color, def_font_family, def_font_size, def_font_style, True, Parent) + CtrlBuilder.AddGroupBox(0, "gb" & random, "Bezeichn. defnieren", 0, 0, 0, 0, ColorToInt(SystemColors.Control), def_font_color, def_font_family, def_font_size, def_font_style, True, Parent) ' Aktuelles Control in die Datenbank speichern ClassControlCommands.InsertControl(CtrlBuilder.CurrentControl) Case "f_addappointment" - CtrlBuilder.FunctionAddAppointment("f_addappointment" & random, "Zu Kalender hinzufügen", 0, 0, 0, 0, True, Parent) + CtrlBuilder.FunctionAddAppointment(0, "f_addappointment" & random, "Zu Kalender hinzufügen", 0, 0, 0, 0, True, Parent) If ClassControlCommands.InsertControl(CtrlBuilder.CurrentControl) = True Then Dim ControlId = GetControlID_for_Name(CtrlBuilder.CurrentControl.Name, CURRENT_FORM_ID) ClassFunctionCommands.InsertFunction(ControlId, "ADDAPPOINTMENT") End If Case "f_addformdata" - CtrlBuilder.FunctionAddFormData("f_addformdata" & random, "Add form Data", 0, 0, 0, 0, True, Parent) + CtrlBuilder.FunctionAddFormData(0, "f_addformdata" & random, "Add form Data", 0, 0, 0, 0, True, Parent) If ClassControlCommands.InsertControl(CtrlBuilder.CurrentControl) = True Then Dim ControlId = GetControlID_for_Name(CtrlBuilder.CurrentControl.Name, CURRENT_FORM_ID) ClassFunctionCommands.InsertFunction(ControlId, "ADDFORMDATA") End If Case "lstbxcheck" - CtrlBuilder.AddCheckedListBox("chlb" & random, 0, 0, def_font_family, def_font_color, def_font_size, def_font_style, 0, True, 0, 0, True, False, "", "", Parent) + CtrlBuilder.AddCheckedListBox(0, "chlb" & random, 0, 0, def_font_family, def_font_color, def_font_size, def_font_style, 0, True, 0, 0, True, False, "", "", Parent) ' Aktuelles Control in die Datenbank speichern ClassControlCommands.InsertControl(CtrlBuilder.CurrentControl) Case "lstbx" - CtrlBuilder.AddListBox("lbx" & random, 0, 0, def_font_family, def_font_color, def_font_size, def_font_style, 0, True, 0, 0, True, False, "", "", Parent) + CtrlBuilder.AddListBox(0, "lbx" & random, 0, 0, def_font_family, def_font_color, def_font_size, def_font_style, 0, True, 0, 0, True, False, "", "", Parent) ' Aktuelles Control in die Datenbank speichern ClassControlCommands.InsertControl(CtrlBuilder.CurrentControl) Case Else @@ -278,7 +278,8 @@ Select Case dr.Item("CTRLTYPE_ID") Case 1 ' Label - CtrlBuilder.AddLabel(dr.Item("CONTROL_NAME"), + CtrlBuilder.AddLabel(dr.Item("CONTROL_ID"), + dr.Item("CONTROL_NAME"), dr.Item("CTRLSCR_CAPTION"), dr.Item("CTRLSCR_X_LOC"), dr.Item("CTRLSCR_Y_LOC"), @@ -291,7 +292,8 @@ parent, True) Case 2 ' TextBox - CtrlBuilder.AddTextBox(dr.Item("CONTROL_NAME"), + CtrlBuilder.AddTextBox(dr.Item("CONTROL_ID"), + dr.Item("CONTROL_NAME"), dr.Item("CTRLSCR_X_LOC"), dr.Item("CTRLSCR_Y_LOC"), dr.Item("CTRLSCR_FONT_FAMILY"), @@ -309,7 +311,8 @@ parent, True) Case 3 ' ComboBox - CtrlBuilder.AddComboBox(dr.Item("CONTROL_NAME"), + CtrlBuilder.AddComboBox(dr.Item("CONTROL_ID"), + dr.Item("CONTROL_NAME"), dr.Item("CTRLSCR_X_LOC"), dr.Item("CTRLSCR_Y_LOC"), dr.Item("CTRLSCR_FONT_FAMILY"), @@ -328,7 +331,8 @@ parent, True) Case 4 ' DateTimePicker - CtrlBuilder.AddDateTimePicker(dr.Item("CONTROL_NAME"), + CtrlBuilder.AddDateTimePicker(dr.Item("CONTROL_ID"), + dr.Item("CONTROL_NAME"), dr.Item("CTRLSCR_X_LOC"), dr.Item("CTRLSCR_Y_LOC"), dr.Item("CTRLSCR_FONT_FAMILY"), @@ -343,7 +347,8 @@ parent, True) Case 5 ' GroupBox - CtrlBuilder.AddGroupBox(dr.Item("CONTROL_NAME"), + CtrlBuilder.AddGroupBox(dr.Item("CONTROL_ID"), + dr.Item("CONTROL_NAME"), dr.Item("CTRLSCR_CAPTION"), dr.Item("CTRLSCR_X_LOC"), dr.Item("CTRLSCR_Y_LOC"), @@ -358,7 +363,8 @@ parent, True) Case 6 ' PictureBox - CtrlBuilder.AddPictureBox(dr.Item("CONTROL_NAME"), + CtrlBuilder.AddPictureBox(dr.Item("CONTROL_ID"), + dr.Item("CONTROL_NAME"), dr.Item("CTRLSCR_X_LOC"), dr.Item("CTRLSCR_Y_LOC"), dr.Item("CTRLSCR_WIDTH"), @@ -368,7 +374,8 @@ parent, True) Case 7 ' DataGridView - CtrlBuilder.AddDataGridView(dr.Item("CONTROL_NAME"), + CtrlBuilder.AddDataGridView(dr.Item("CONTROL_ID"), + dr.Item("CONTROL_NAME"), dr.Item("CTRLSCR_X_LOC"), dr.Item("CTRLSCR_Y_LOC"), dr.Item("CTRLSCR_WIDTH"), @@ -384,7 +391,8 @@ Else Checked = StrToBool(dr.Item("CONTROL_DEF_VALUE")) End If - CtrlBuilder.AddCheckBox(dr.Item("CONTROL_NAME"), + CtrlBuilder.AddCheckBox(dr.Item("CONTROL_ID"), + dr.Item("CONTROL_NAME"), dr.Item("CTRLSCR_CAPTION"), Checked, dr.Item("CTRLSCR_X_LOC"), @@ -402,7 +410,8 @@ parent, True) Case 8 'AddAppointment Button - CtrlBuilder.FunctionAddAppointment(dr.Item("CONTROL_NAME"), + CtrlBuilder.FunctionAddAppointment(dr.Item("CONTROL_ID"), + dr.Item("CONTROL_NAME"), dr.Item("CTRLSCR_CAPTION"), dr.Item("CTRLSCR_X_LOC"), dr.Item("CTRLSCR_Y_LOC"), @@ -412,7 +421,8 @@ parent, True) Case 9 'AddFormData - CtrlBuilder.FunctionAddFormData(dr.Item("CONTROL_NAME"), + CtrlBuilder.FunctionAddFormData(dr.Item("CONTROL_ID"), + dr.Item("CONTROL_NAME"), dr.Item("CTRLSCR_CAPTION"), dr.Item("CTRLSCR_X_LOC"), dr.Item("CTRLSCR_Y_LOC"), @@ -429,7 +439,8 @@ Else Checked = StrToBool(dr.Item("CONTROL_DEF_VALUE")) End If - CtrlBuilder.AddRadioButton(dr.Item("CONTROL_NAME"), + CtrlBuilder.AddRadioButton(dr.Item("CONTROL_ID"), + dr.Item("CONTROL_NAME"), dr.Item("CTRLSCR_CAPTION"), Checked, dr.Item("CTRLSCR_X_LOC"), @@ -447,7 +458,8 @@ parent, True) Case 12 'CheckedListBox - CtrlBuilder.AddCheckedListBox(dr.Item("CONTROL_NAME"), + CtrlBuilder.AddCheckedListBox(dr.Item("CONTROL_ID"), + dr.Item("CONTROL_NAME"), dr.Item("CTRLSCR_X_LOC"), dr.Item("CTRLSCR_Y_LOC"), dr.Item("CTRLSCR_FONT_FAMILY"), @@ -465,7 +477,8 @@ parent, True) Case 13 'ListBox - CtrlBuilder.AddListBox(dr.Item("CONTROL_NAME"), + CtrlBuilder.AddListBox(dr.Item("CONTROL_ID"), + dr.Item("CONTROL_NAME"), dr.Item("CTRLSCR_X_LOC"), dr.Item("CTRLSCR_Y_LOC"), dr.Item("CTRLSCR_FONT_FAMILY"),