diff --git a/app/DD-Record-Organiser/ClassControlLoader.vb b/app/DD-Record-Organiser/ClassControlLoader.vb index e7cc5d9..f94d208 100644 --- a/app/DD-Record-Organiser/ClassControlLoader.vb +++ b/app/DD-Record-Organiser/ClassControlLoader.vb @@ -11,7 +11,7 @@ Return sqlCommand End Function - Public Shared Function LoadAutoValue(control As Windows.Forms.Label, RecordId As Integer, ParentRecordId As Integer) + Public Shared Function LoadAutoValue(control As Windows.Forms.Control, RecordId As Integer, ParentRecordId As Integer) Dim AutoValue As String = String.Empty Dim ControlId As Integer = control.Tag Dim SQL As String = ClassDatabase.Execute_Scalar(String.Format("SELECT SQL_COMMAND_1 FROM TBPMO_CONTROL WHERE GUID = {0}", ControlId)) diff --git a/app/DD-Record-Organiser/frmForm_Constructor_Main.vb b/app/DD-Record-Organiser/frmForm_Constructor_Main.vb index 6ddc4a3..2ab8f20 100644 --- a/app/DD-Record-Organiser/frmForm_Constructor_Main.vb +++ b/app/DD-Record-Organiser/frmForm_Constructor_Main.vb @@ -869,7 +869,7 @@ Public Class frmForm_Constructor_Main Me.tsButtonEditMode.Text = "Bearbeiten" 'Funktion nur zum load der Inhalte - ClassControlValues.UnloadControlValuesList(SELECTED_RECORD_ID, CURRENT_RECORD_ID, CtrlBuilder.AllControls) + 'ClassControlValues.UnloadControlValuesList(SELECTED_RECORD_ID, CURRENT_RECORD_ID, CtrlBuilder.AllControls) End If End Sub 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 8e4f7b9..e13c070 100644 --- a/app/DD-Record-Organiser/frmForm_Constructor_Main_2.Designer.vb +++ b/app/DD-Record-Organiser/frmForm_Constructor_Main_2.Designer.vb @@ -209,7 +209,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(795, 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}) ' @@ -464,7 +464,7 @@ Partial Class frmForm_Constructor_Main_2 Me.SplitContainerBottom.Panel1.Text = "Panel1" Me.SplitContainerBottom.Panel2.Controls.Add(Me.Panel2) Me.SplitContainerBottom.Panel2.Text = "Panel2" - Me.SplitContainerBottom.Size = New System.Drawing.Size(1083, 372) + Me.SplitContainerBottom.Size = New System.Drawing.Size(1083, 365) Me.SplitContainerBottom.SplitterPosition = 576 Me.SplitContainerBottom.TabIndex = 0 Me.SplitContainerBottom.Text = "SplitContainerControl1" @@ -480,7 +480,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(1078, 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}) ' @@ -489,7 +489,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(1072, 316) + Me.TabDetails.Size = New System.Drawing.Size(1069, 312) Me.TabDetails.Text = "Detailansicht" ' 'pnlDetails @@ -498,7 +498,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(1072, 316) + Me.pnlDetails.Size = New System.Drawing.Size(1069, 312) Me.pnlDetails.TabIndex = 0 ' 'TabWindream @@ -507,7 +507,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(1072, 316) + Me.TabWindream.Size = New System.Drawing.Size(1069, 312) Me.TabWindream.Text = "windream-Dateien" ' 'AxObjectListControl @@ -518,7 +518,7 @@ 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(1072, 291) + Me.AxObjectListControl.Size = New System.Drawing.Size(1069, 287) Me.AxObjectListControl.TabIndex = 6 Me.AxObjectListControl.TabStop = False ' @@ -528,7 +528,7 @@ Partial Class frmForm_Constructor_Main_2 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(1072, 25) + Me.ToolStripDokumente.Size = New System.Drawing.Size(1069, 25) Me.ToolStripDokumente.TabIndex = 2 Me.ToolStripDokumente.Text = "ToolStrip2" ' @@ -562,7 +562,7 @@ 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(1072, 316) + Me.TabFollowUp.Size = New System.Drawing.Size(1069, 312) Me.TabFollowUp.Text = "Wiedervorlage" ' 'ListViewFollowUps @@ -741,7 +741,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(1072, 316) + Me.TabPos.Size = New System.Drawing.Size(1069, 312) Me.TabPos.Text = "Positionen" ' 'Panel1 @@ -750,7 +750,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(1072, 291) + Me.Panel1.Size = New System.Drawing.Size(1069, 287) Me.Panel1.TabIndex = 2 ' 'GridControlPos @@ -759,7 +759,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(1072, 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}) ' @@ -786,7 +786,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(1072, 25) + Me.BindingNavigatorPOS.Size = New System.Drawing.Size(1069, 25) Me.BindingNavigatorPOS.TabIndex = 1 Me.BindingNavigatorPOS.Text = "BindingNavigator1" ' @@ -881,7 +881,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(1078, 25) + Me.ToolStripEdit.Size = New System.Drawing.Size(1071, 25) Me.ToolStripEdit.TabIndex = 0 Me.ToolStripEdit.Text = "ToolStrip1" ' diff --git a/app/DD-Record-Organiser/frmForm_Constructor_Main_2.vb b/app/DD-Record-Organiser/frmForm_Constructor_Main_2.vb index cae2164..8c9ecdf 100644 --- a/app/DD-Record-Organiser/frmForm_Constructor_Main_2.vb +++ b/app/DD-Record-Organiser/frmForm_Constructor_Main_2.vb @@ -999,7 +999,7 @@ Public Class frmForm_Constructor_Main_2 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) + ClassControlValues.LoadControlValuesList(SELECTED_RECORD_ID, CURRENT_PARENTID, CURRENT_FORM_ID, CtrlBuilder.AllControls) ' Im gegensatz zu EnableEditMode muss hier nur der save button enabled werden tsButtonSave.Enabled = True