diff --git a/app/DD-Record-Organiser/ClassControlCommands.vb b/app/DD-Record-Organiser/ClassControlCommands.vb index 3a1698c..503d86e 100644 --- a/app/DD-Record-Organiser/ClassControlCommands.vb +++ b/app/DD-Record-Organiser/ClassControlCommands.vb @@ -105,30 +105,30 @@ HEIGHT = control.Height CONTROL_TEXT = control.Text - Dim TAB_INDEX - SQL = "SELECT MAX(TAB_INDEX) FROM TBPMO_CONTROL_SCREEN WHERE CONTROL_ID IN (SELECT GUID FROM TBPMO_CONTROL WHERE FORM_ID = " & CURRENT_FORM_ID & ")" - TAB_INDEX = ClassDatabase.Execute_Scalar(SQL) - If Not TAB_INDEX Is Nothing Then - If IsDBNull(TAB_INDEX) Then - TAB_INDEX = 1 - Else - TAB_INDEX = CInt(TAB_INDEX) + 1 - End If + 'Dim TAB_INDEX + 'SQL = "SELECT MAX(TAB_INDEX) FROM TBPMO_CONTROL_SCREEN WHERE CONTROL_ID IN (SELECT GUID FROM TBPMO_CONTROL WHERE FORM_ID = " & CURRENT_FORM_ID & ")" + 'TAB_INDEX = ClassDatabase.Execute_Scalar(SQL) + 'If Not TAB_INDEX Is Nothing Then + ' If IsDBNull(TAB_INDEX) Then + ' TAB_INDEX = 1 + ' Else + ' TAB_INDEX = CInt(TAB_INDEX) + 1 + ' End If - Else - TAB_INDEX = 1 - End If + 'Else + ' TAB_INDEX = 1 + 'End If - SQL = "INSERT TBPMO_CONTROL_SCREEN (CONTROL_ID, SCREEN_ID, CONTROL_TEXT, X_LOC, Y_LOC, HEIGHT, WIDTH, TAB_INDEX) VALUES (" & guid & ", 1, '" & CONTROL_TEXT & "', " & X_LOC & ", " & Y_LOC & ", " & HEIGHT & ", " & WIDTH & ", " & TAB_INDEX & ")" + SQL = "INSERT TBPMO_CONTROL_SCREEN (CONTROL_ID, SCREEN_ID, CONTROL_TEXT, X_LOC, Y_LOC, HEIGHT, WIDTH) VALUES (" & guid & ", 1, '" & CONTROL_TEXT & "', " & X_LOC & ", " & Y_LOC & ", " & HEIGHT & ", " & WIDTH & ")" - If ClassDatabase.Execute_non_Query(SQL) Then + If ClassDatabase.Execute_non_Query(SQL, True) Then Return True Else Throw New Exception() End If Catch ex As Exception - MsgBox("Fehler beim Einfügen der Ansichtseigenschaften des Elements:" + vbNewLine + ex.Message, MsgBoxStyle.Critical) + MsgBox("Unexpected Error in InsertControlScreen (Adding ViewProperties:" + vbNewLine + ex.Message, MsgBoxStyle.Critical) Return False End Try End Function diff --git a/app/DD-Record-Organiser/ClassControlCommandsUI.vb b/app/DD-Record-Organiser/ClassControlCommandsUI.vb index e98240b..6fb320b 100644 --- a/app/DD-Record-Organiser/ClassControlCommandsUI.vb +++ b/app/DD-Record-Organiser/ClassControlCommandsUI.vb @@ -265,42 +265,47 @@ Public Class ClassControlCommandsUI Function SaveRecord(RecordID As Integer, FormID As Integer, Optional foreignRecordID As Integer = 0) As String - Dim ADDED_WHO As String = Environment.UserName - Dim RECORD_ID As Integer + Try + Dim ADDED_WHO As String = Environment.UserName + Dim RECORD_ID As Integer - If IsInsert Then - If LogErrorsOnly = False Then ClassLogger.Add(">> (SaveRecord) Insert", False) + If IsInsert Then + If LogErrorsOnly = False Then ClassLogger.Add(">> (SaveRecord) Insert", False) - ' Den Record erstellen - If CreateRecord(FormID) = False Then + ' Den Record erstellen + If CreateRecord(FormID) = False Then + IsInsert = False + Return "ERROR - INSERT RECORD NOT SUCCESSFUL" + End If + + ' Die eben erstellte RecordID holen + RECORD_ID = GetLastRecord() + + ' Wenn gegeben, foreignrecordID mit Record verknüpfen + If foreignRecordID > 0 Then + If LogErrorsOnly = False Then ClassLogger.Add(">> foreignRecordID: " & foreignRecordID & "; Record-ID: " & RECORD_ID, False) + ConnectRecord(foreignRecordID, RECORD_ID) + End If + + ' Für angegebene Control Typen den Wert speichern + InsertAllControls(FormID, RECORD_ID, _CtrlBuilder.AllControls) + + ' Status zurücksetzen IsInsert = False - Return "ERROR - INSERT RECORD NOT SUCCESSFUL" + + NEW_RECORD_ID = RECORD_ID + CURRENT_RECORD_ID = RECORD_ID + Return "Neuer Datensatz eingefügt - " & Now + ElseIf IsInsert = False Then + If LogErrorsOnly = False Then ClassLogger.Add(">> (SaveRecord) Update RecordID: " & RECORD_ID, False) + UpdateAllControls(FormID, RecordID, _CtrlBuilder.AllControls) + + Return "Datensatz aktualisiert - " & Now End If - - ' Die eben erstellte RecordID holen - RECORD_ID = GetLastRecord() - - ' Wenn gegeben, foreignrecordID mit Record verknüpfen - If foreignRecordID > 0 Then - If LogErrorsOnly = False Then ClassLogger.Add(">> foreignRecordID: " & foreignRecordID & "; Record-ID: " & RECORD_ID, False) - ConnectRecord(foreignRecordID, RECORD_ID) - End If - - ' Für angegebene Control Typen den Wert speichern - InsertAllControls(FormID, RECORD_ID, _CtrlBuilder.AllControls) - - ' Status zurücksetzen - IsInsert = False - - NEW_RECORD_ID = RECORD_ID - CURRENT_RECORD_ID = RECORD_ID - Return "Neuer Datensatz eingefügt - " & Now - ElseIf IsInsert = False Then - If LogErrorsOnly = False Then ClassLogger.Add(">> (SaveRecord) Update RecordID: " & RECORD_ID, False) - UpdateAllControls(FormID, RecordID, _CtrlBuilder.AllControls) - - Return "Datensatz aktualisiert - " & Now - End If + Catch ex As Exception + MsgBox("Unexpected Error in SaveRecord: " & ex.Message, MsgBoxStyle.Critical) + End Try + End Function Private Sub InsertAllControls(FormID As Integer, RecordID As Integer, controls As Control.ControlCollection) @@ -444,54 +449,64 @@ Public Class ClassControlCommandsUI End Sub Private Sub UpdateAllControls(FormID As Integer, RecordID As Integer, controls As Control.ControlCollection) - For Each ctrl As Control In controls - Dim CONTROL_ID As Integer = GetControlID_for_RecordID(ctrl.Name, RecordID) - Dim CONTROL_VALUE As String = Nothing + Try + For Each ctrl As Control In controls + Dim CONTROL_ID As Integer = GetControlID_for_RecordID(ctrl.Name, RecordID) + If LogErrorsOnly = False Then ClassLogger.Add(">> CONTROL_ID: " & CONTROL_ID, False) + Dim CONTROL_VALUE As String = Nothing - If TypeOf ctrl Is PictureBox Then - Dim id As Integer = GetControlID_for_Name(ctrl.Name, FormID) - UpsertImage(id, RecordID, ctrl.BackgroundImage) - Continue For - End If - - ' Neues Control - If CONTROL_ID = -1 Then - CONTROL_VALUE = GetControlValue(ctrl) - - ' Kein Bekanntes Control oder Groupbox - If IsNothing(CONTROL_VALUE) Then - If TypeOf ctrl Is GroupBox Then - Dim ctrls As Control.ControlCollection = DirectCast(ctrl, GroupBox).Controls - - UpdateAllControls(FormID, RecordID, ctrls) - End If - Else - InsertControlValue(ctrl.Name, RecordID, CONTROL_VALUE) + If TypeOf ctrl Is PictureBox Then + Dim id As Integer = GetControlID_for_Name(ctrl.Name, FormID) + UpsertImage(id, RecordID, ctrl.BackgroundImage) + Continue For End If - Else ' Control Updaten - CONTROL_VALUE = GetControlValue(ctrl) - ' Kein Bekanntes Control oder Groupbox - If IsNothing(CONTROL_VALUE) Then - If TypeOf ctrl Is GroupBox Then - Dim ctrls As Control.ControlCollection = DirectCast(ctrl, GroupBox).Controls - UpdateAllControls(FormID, RecordID, ctrls) + ' Neues Control + If CONTROL_ID = -1 Then + CONTROL_VALUE = GetControlValue(ctrl) + + ' Kein Bekanntes Control oder Groupbox + If IsNothing(CONTROL_VALUE) Then + If TypeOf ctrl Is GroupBox Then + Dim ctrls As Control.ControlCollection = DirectCast(ctrl, GroupBox).Controls + + UpdateAllControls(FormID, RecordID, ctrls) + End If + Else + Dim ctrlid As Integer = GetControlID_for_Name(ctrl.Name, FormID) + If LogErrorsOnly = False Then ClassLogger.Add(">> InsertControlValue: " & CONTROL_ID & "|" & RecordID & "|" & CONTROL_VALUE, False) + InsertControlValue(ctrlid, RecordID, CONTROL_VALUE) + End If + Else ' Control Updaten + CONTROL_VALUE = GetControlValue(ctrl) + ' Kein Bekanntes Control oder Groupbox + If IsNothing(CONTROL_VALUE) Then + If TypeOf ctrl Is GroupBox Then + Dim ctrls As Control.ControlCollection = DirectCast(ctrl, GroupBox).Controls + UpdateAllControls(FormID, RecordID, ctrls) + End If + Else + UpdateControlValue(CONTROL_ID, RecordID, CONTROL_VALUE) End If - Else - UpdateControlValue(CONTROL_ID, RecordID, CONTROL_VALUE) End If - End If - Next + Next + Catch ex As Exception + MsgBox("Unexpected Error in UpdateAllControls: " & vbNewLine & ex.Message, MsgBoxStyle.Critical) + End Try + End Sub Function GetControlValue(ctrl As Control) As String Dim type = ctrl.GetType().Name Dim CONTROL_ID As Integer = GetControlID_for_RecordID(ctrl.Name, CURRENT_RECORD_ID) - + If LogErrorsOnly = False Then ClassLogger.Add(">> GetControlValue CONTROL_ID: " & CONTROL_ID, False) + Dim CONTROL_VALUE As String = Nothing + If LogErrorsOnly = False Then ClassLogger.Add(">> type = " & type.ToString, False) Select Case type Case "TextBox" Return DirectCast(ctrl, TextBox).Text Case "ComboBox" + If LogErrorsOnly = False Then ClassLogger.Add(">> Return Value: " & DirectCast(ctrl, ComboBox).Text, False) Return DirectCast(ctrl, ComboBox).Text Case "CheckBox" Return DirectCast(ctrl, CheckBox).Checked.ToString() diff --git a/app/DD-Record-Organiser/ClassControlValues.vb b/app/DD-Record-Organiser/ClassControlValues.vb index 0556b1b..b67833b 100644 --- a/app/DD-Record-Organiser/ClassControlValues.vb +++ b/app/DD-Record-Organiser/ClassControlValues.vb @@ -73,15 +73,42 @@ Public Class ClassControlValues Dim radio As RadioButton = DirectCast(control, RadioButton) radio.Checked = CBool(result) Case 3 ' ComboBox - Dim combobox As ComboBox = DirectCast(control, ComboBox) - 'combobox.DataSource = Nothing - 'combobox.Text = result - If combobox.SelectedIndex = -1 Then - combobox.DataSource = Nothing - combobox.Text = result - Else - combobox.SelectedIndex = combobox.FindStringExact(result) - End If + Dim cmbbox As ComboBox = DirectCast(control, System.Windows.Forms.ComboBox) + cmbbox.Text = result + 'If LogErrorsOnly = False Then ClassLogger.Add(">> control ComboBox", False) + 'Dim cmbSql As String = "SELECT SQL_COMMAND_1 FROM TBPMO_CONTROL WHERE GUID = " & ControlID + 'cmbSql = ClassDatabase.Execute_Scalar(cmbSql) + 'If Not (cmbSql Is Nothing Or cmbSql = String.Empty) Then + ' If cmbSql.ToString.Contains("@") Then + ' cmbSql = cmbSql.ToString.Replace("@RECORDID", CURRENT_RECORD_ID) + ' cmbSql = cmbSql.ToString.Replace("@RECORD_ID", CURRENT_RECORD_ID) + ' cmbSql = cmbSql.ToString.Replace("@PARENTRECORD_ID", CURRENT_PARENTID) + ' If LogErrorsOnly = False Then ClassLogger.Add(">> SQL Combobox: " & cmbSql, False) + ' End If + ' If LogErrorsOnly = False Then ClassLogger.Add(">> SQL Combobox: " & cmbSql, False) + + ' 'SQL-Command vorhanden also Ausführen des SQL + ' Dim DT_ComboBox As DataTable = ClassDatabase.Return_Datatable(cmbSql, "LoadControlValues: Combobox") + ' If DT_ComboBox Is Nothing = False Then + ' cmbbox.DataSource = DT_ComboBox + ' Select Case DT_ComboBox.Columns.Count + ' Case 2 + ' cmbbox.DisplayMember = DT_ComboBox.Columns(1).ColumnName + ' cmbbox.ValueMember = DT_ComboBox.Columns(0).ColumnName + ' Case 1 + ' cmbbox.DisplayMember = DT_ComboBox.Columns(0).ColumnName + ' cmbbox.ValueMember = DT_ComboBox.Columns(0).ColumnName + ' End Select + + ' End If + 'End If + ''combobox.DataSource = Nothing + 'If cmbbox.SelectedIndex = -1 Then + ' cmbbox.DataSource = Nothing + ' cmbbox.Text = result + 'Else + ' cmbbox.SelectedIndex = cmbbox.FindStringExact(result) + 'End If Case 4 'DateTimePicker Dim datepicker As DevExpress.XtraEditors.DateEdit = DirectCast(control, DevExpress.XtraEditors.DateEdit) @@ -122,7 +149,9 @@ Public Class ClassControlValues End If 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 @@ -130,7 +159,6 @@ Public Class ClassControlValues If TypeOf control Is PictureBox Then LoadImage(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) @@ -160,7 +188,7 @@ Public Class ClassControlValues 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 @@ -259,16 +287,23 @@ Public Class ClassControlValues 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.Suggest + Combobox.AutoCompleteMode = AutoCompleteMode.Append Combobox.AutoCompleteSource = AutoCompleteSource.ListItems End If Dim iWidestWidth As Integer = 300 diff --git a/app/DD-Record-Organiser/ModuleHelperMethods.vb b/app/DD-Record-Organiser/ModuleHelperMethods.vb index cf20587..a936910 100644 --- a/app/DD-Record-Organiser/ModuleHelperMethods.vb +++ b/app/DD-Record-Organiser/ModuleHelperMethods.vb @@ -117,10 +117,12 @@ 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 Else + If LogErrorsOnly = False Then ClassLogger.Add(">> es konnte keine ID für name geholt werden: " & SQL, False) Return -1 End If Catch ex As Exception @@ -169,14 +171,23 @@ End Sub Public Sub OpenFormOverview() + 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 + Dim frm As New frmForm_Overview frm = frmForm_Overview.Instance() frm.MdiParent = MAIN_FORM frm.Show() End Sub - Public Sub OpenFormLevelDesigner() + 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 + Dim frm As New frmLevel_Designer frm = frmLevel_Designer.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 ee082da..b53968d 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/frmForm_Constructor.designer.vb b/app/DD-Record-Organiser/frmForm_Constructor.designer.vb index ecdf1b7..d719a41 100644 --- a/app/DD-Record-Organiser/frmForm_Constructor.designer.vb +++ b/app/DD-Record-Organiser/frmForm_Constructor.designer.vb @@ -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(764, 340) + Me.TCDetails.Size = New System.Drawing.Size(940, 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(762, 312) + Me.TabPageDetails.Size = New System.Drawing.Size(758, 309) 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(762, 312) + Me.pnlDetails.Size = New System.Drawing.Size(758, 309) Me.pnlDetails.TabIndex = 0 ' 'TabPageWD_Files @@ -433,7 +433,7 @@ Partial Class frmForm_Constructor Me.TabPageWD_Files.Controls.Add(Me.ToolStripDokumente) Me.TabPageWD_Files.Image = Global.DD_Record_Organiser.My.Resources.Resources.Files_7954 Me.TabPageWD_Files.Name = "TabPageWD_Files" - Me.TabPageWD_Files.Size = New System.Drawing.Size(762, 312) + Me.TabPageWD_Files.Size = New System.Drawing.Size(758, 309) Me.TabPageWD_Files.Text = "windream-Dateien" Me.ttToolTip.SetToolTip(Me.TabPageWD_Files, "Zeigt die Dateien in windream zum ausgewählten Datensatz an") ' @@ -445,7 +445,7 @@ Partial Class frmForm_Constructor 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(762, 287) + Me.AxObjectListControl.Size = New System.Drawing.Size(758, 284) Me.AxObjectListControl.TabIndex = 5 Me.AxObjectListControl.TabStop = False ' @@ -454,7 +454,7 @@ Partial Class frmForm_Constructor 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(762, 25) + Me.ToolStripDokumente.Size = New System.Drawing.Size(758, 25) Me.ToolStripDokumente.TabIndex = 1 Me.ToolStripDokumente.Text = "ToolStrip2" ' @@ -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(762, 312) + Me.TabPageFollowUp.Size = New System.Drawing.Size(934, 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(525, 340) + Me.XtraTabControl1.Size = New System.Drawing.Size(356, 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(523, 315) + Me.TabPageParentEntity.Size = New System.Drawing.Size(350, 312) 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(-324, 276) + Me.Button1.Location = New System.Drawing.Point(-659, 276) Me.Button1.Name = "Button1" Me.Button1.Size = New System.Drawing.Size(98, 27) Me.Button1.TabIndex = 18 @@ -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(-413, 38) + Me.lblParentID.Location = New System.Drawing.Point(-748, 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(-413, 12) + Me.Label4.Location = New System.Drawing.Point(-748, 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 f664397..5a9ee0e 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 - CQAAAk1TRnQBSQFMAgEBAgEAAcgBCQHIAQkBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CQAAAk1TRnQBSQFMAgEBAgEAAdgBCQHYAQkBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA diff --git a/app/DD-Record-Organiser/frmForm_Constructor_Main.Designer.vb b/app/DD-Record-Organiser/frmForm_Constructor_Main.Designer.vb index d357f00..de2736a 100644 --- a/app/DD-Record-Organiser/frmForm_Constructor_Main.Designer.vb +++ b/app/DD-Record-Organiser/frmForm_Constructor_Main.Designer.vb @@ -22,12 +22,13 @@ Partial Class frmForm_Constructor_Main 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. _ Private Sub InitializeComponent() + Me.components = New System.ComponentModel.Container() Dim GridLevelNode1 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode() Dim GridLevelNode2 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmForm_Constructor_Main)) Me.grvwGrid = New DevExpress.XtraGrid.Views.Grid.GridView() Me.GridControlMain = New DevExpress.XtraGrid.GridControl() - Me.ContextMenuGrid = New System.Windows.Forms.ContextMenuStrip() + Me.ContextMenuGrid = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.FunktionenDataGridToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator() Me.AnsichtUmschaltenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -51,7 +52,7 @@ Partial Class frmForm_Constructor_Main Me.SplitContainerMain = New DevExpress.XtraEditors.SplitContainerControl() Me.SplitContainerTop = New DevExpress.XtraEditors.SplitContainerControl() Me.TreeViewMain = New System.Windows.Forms.TreeView() - Me.CMSEntity = New System.Windows.Forms.ContextMenuStrip() + Me.CMSEntity = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ResetEbenenAuswahlToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.DateiimportEntitätToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.FormDesignerToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -95,19 +96,19 @@ Partial Class frmForm_Constructor_Main Me.VerknüpfungenAnzeigenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.tsButtonShowTaskOverview = New System.Windows.Forms.ToolStripButton() Me.tsButtonShowWorkflowTasks = New System.Windows.Forms.ToolStripButton() - Me.BindingSource_Entity = New System.Windows.Forms.BindingSource() + 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.ttToolTip = New System.Windows.Forms.ToolTip() - Me.ContextMenuDetails = New System.Windows.Forms.ContextMenuStrip() + Me.ImageCollection1 = New DevExpress.Utils.ImageCollection(Me.components) + Me.ttToolTip = New System.Windows.Forms.ToolTip(Me.components) + Me.ContextMenuDetails = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.DD_DMSDataSet = New DD_Record_Organiser.DD_DMSDataSet() - Me.VWPMO_WF_USER_ACTIVEBindingSource = New System.Windows.Forms.BindingSource() + Me.VWPMO_WF_USER_ACTIVEBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.VWPMO_WF_USER_ACTIVETableAdapter = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.VWPMO_WF_USER_ACTIVETableAdapter() Me.TableAdapterManager = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.TableAdapterManager() Me.TBPMO_FILES_USERTableAdapter = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.TBPMO_FILES_USERTableAdapter() - Me.VWPMO_WF_ACTIVEBindingSource = New System.Windows.Forms.BindingSource() + Me.VWPMO_WF_ACTIVEBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.VWPMO_WF_ACTIVETableAdapter = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.VWPMO_WF_ACTIVETableAdapter() - Me.TBPMO_FILES_USERBindingSource = New System.Windows.Forms.BindingSource() + Me.TBPMO_FILES_USERBindingSource = New System.Windows.Forms.BindingSource(Me.components) CType(Me.grvwGrid, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridControlMain, System.ComponentModel.ISupportInitialize).BeginInit() Me.ContextMenuGrid.SuspendLayout() @@ -172,7 +173,7 @@ Partial Class frmForm_Constructor_Main 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(779, 270) + Me.GridControlMain.Size = New System.Drawing.Size(786, 270) Me.GridControlMain.TabIndex = 0 Me.GridControlMain.UseEmbeddedNavigator = True Me.GridControlMain.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.grvwCarousel, Me.grvwTiles, Me.grvwGrid}) @@ -426,7 +427,7 @@ Partial Class frmForm_Constructor_Main Me.SplitContainerBottom.Panel1.Controls.Add(Me.ToolStripEdit) Me.SplitContainerBottom.Panel1.Text = "Panel1" Me.SplitContainerBottom.Panel2.Text = "Panel2" - Me.SplitContainerBottom.Size = New System.Drawing.Size(1074, 365) + Me.SplitContainerBottom.Size = New System.Drawing.Size(1074, 372) Me.SplitContainerBottom.SplitterPosition = 448 Me.SplitContainerBottom.TabIndex = 0 Me.SplitContainerBottom.Text = "SplitContainerControl1" @@ -442,7 +443,7 @@ Partial Class frmForm_Constructor_Main 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(1062, 340) + Me.TCDetails.Size = New System.Drawing.Size(1069, 347) Me.TCDetails.TabIndex = 1 Me.TCDetails.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.TabDetails, Me.TabWindream, Me.TabFollowUp}) ' @@ -451,7 +452,7 @@ Partial Class frmForm_Constructor_Main 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(1060, 312) + Me.TabDetails.Size = New System.Drawing.Size(1063, 316) Me.TabDetails.Text = "Detailansicht" ' 'pnlDetails @@ -460,7 +461,7 @@ Partial Class frmForm_Constructor_Main 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(1060, 312) + Me.pnlDetails.Size = New System.Drawing.Size(1063, 316) Me.pnlDetails.TabIndex = 0 ' 'TabWindream @@ -469,7 +470,7 @@ Partial Class frmForm_Constructor_Main 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(1060, 312) + Me.TabWindream.Size = New System.Drawing.Size(1063, 316) Me.TabWindream.Text = "windream-Dateien" ' 'AxObjectListControl @@ -480,7 +481,7 @@ Partial Class frmForm_Constructor_Main 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(1060, 287) + Me.AxObjectListControl.Size = New System.Drawing.Size(1063, 291) Me.AxObjectListControl.TabIndex = 6 Me.AxObjectListControl.TabStop = False ' @@ -489,7 +490,7 @@ Partial Class frmForm_Constructor_Main 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(1060, 25) + Me.ToolStripDokumente.Size = New System.Drawing.Size(1063, 25) Me.ToolStripDokumente.TabIndex = 2 Me.ToolStripDokumente.Text = "ToolStrip2" ' @@ -523,7 +524,7 @@ Partial Class frmForm_Constructor_Main Me.TabFollowUp.Controls.Add(Me.ListViewFollowUp) Me.TabFollowUp.Image = Global.DD_Record_Organiser.My.Resources.Resources.Task_16xMD Me.TabFollowUp.Name = "TabFollowUp" - Me.TabFollowUp.Size = New System.Drawing.Size(1060, 312) + Me.TabFollowUp.Size = New System.Drawing.Size(1063, 316) Me.TabFollowUp.Text = "Wiedervorlage" ' 'grpbxFU_Profile @@ -693,7 +694,7 @@ Partial Class frmForm_Constructor_Main 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(1062, 25) + Me.ToolStripEdit.Size = New System.Drawing.Size(1069, 25) Me.ToolStripEdit.TabIndex = 0 Me.ToolStripEdit.Text = "ToolStrip1" ' diff --git a/app/DD-Record-Organiser/frmForm_Constructor_Main.vb b/app/DD-Record-Organiser/frmForm_Constructor_Main.vb index 9615570..196bb32 100644 --- a/app/DD-Record-Organiser/frmForm_Constructor_Main.vb +++ b/app/DD-Record-Organiser/frmForm_Constructor_Main.vb @@ -2499,4 +2499,8 @@ Public Class frmForm_Constructor_Main Private Sub CallRecursive(ByVal aTreeView As TreeView) End Sub + + Private Sub btnAddUser_FollowUp_Click(sender As Object, e As EventArgs) Handles btnAddUser_FollowUp.Click + + End Sub End Class \ No newline at end of file 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 e9cc8b8..f6ba1b1 100644 --- a/app/DD-Record-Organiser/frmForm_Constructor_Main_2.Designer.vb +++ b/app/DD-Record-Organiser/frmForm_Constructor_Main_2.Designer.vb @@ -25,6 +25,7 @@ Partial Class frmForm_Constructor_Main_2 Me.components = New System.ComponentModel.Container() Dim GridLevelNode1 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode() Dim GridLevelNode2 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode() + Dim GridLevelNode3 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmForm_Constructor_Main_2)) Me.grvwGrid = New DevExpress.XtraGrid.Views.Grid.GridView() Me.GridControlMain = New DevExpress.XtraGrid.GridControl() @@ -67,6 +68,9 @@ Partial Class frmForm_Constructor_Main_2 Me.ToolStripDropDownButton2 = New System.Windows.Forms.ToolStripDropDownButton() Me.KonfigurationToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.TabFollowUp = New DevExpress.XtraTab.XtraTabPage() + Me.ListViewFollowUps = New System.Windows.Forms.ListView() + Me.ColumnHeader1 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader) + Me.ColumnHeader2 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader) Me.grpbxFU_Profile = New System.Windows.Forms.GroupBox() Me.GroupBox4 = New System.Windows.Forms.GroupBox() Me.btnRemoveUser_FollowUp = New System.Windows.Forms.Button() @@ -78,11 +82,8 @@ Partial Class frmForm_Constructor_Main_2 Me.lblFollowUp_save = New System.Windows.Forms.Label() Me.chkFollowUp = New System.Windows.Forms.CheckBox() Me.dtpFollowUp = New System.Windows.Forms.DateTimePicker() - Me.Label9 = New System.Windows.Forms.Label() + Me.lblWiedervorlage_Control = New System.Windows.Forms.Label() Me.Label5 = New System.Windows.Forms.Label() - Me.ListViewFollowUp = New System.Windows.Forms.ListView() - Me.ColumnHeader1 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader) - Me.ColumnHeader2 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader) Me.TabPos = New DevExpress.XtraTab.XtraTabPage() Me.Panel1 = New System.Windows.Forms.Panel() Me.GridControlPos = New DevExpress.XtraGrid.GridControl() @@ -191,11 +192,12 @@ Partial Class frmForm_Constructor_Main_2 GridLevelNode1.RelationName = "Level1" GridLevelNode2.LevelTemplate = Me.grvwCarousel GridLevelNode2.RelationName = "Level2" - Me.GridControlMain.LevelTree.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode1, GridLevelNode2}) + GridLevelNode3.RelationName = "Level3" + Me.GridControlMain.LevelTree.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode1, GridLevelNode2, GridLevelNode3}) 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(779, 270) + Me.GridControlMain.Size = New System.Drawing.Size(786, 270) Me.GridControlMain.TabIndex = 0 Me.GridControlMain.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.grvwCarousel, Me.grvwTiles, Me.grvwGrid}) ' @@ -449,7 +451,7 @@ Partial Class frmForm_Constructor_Main_2 Me.SplitContainerBottom.Panel1.Controls.Add(Me.ToolStripEdit) Me.SplitContainerBottom.Panel1.Text = "Panel1" Me.SplitContainerBottom.Panel2.Text = "Panel2" - Me.SplitContainerBottom.Size = New System.Drawing.Size(1074, 365) + Me.SplitContainerBottom.Size = New System.Drawing.Size(1074, 372) Me.SplitContainerBottom.SplitterPosition = 448 Me.SplitContainerBottom.TabIndex = 0 Me.SplitContainerBottom.Text = "SplitContainerControl1" @@ -465,7 +467,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(1062, 340) + Me.TCDetails.Size = New System.Drawing.Size(1069, 347) Me.TCDetails.TabIndex = 1 Me.TCDetails.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.TabDetails, Me.TabWindream, Me.TabFollowUp, Me.TabPos}) ' @@ -474,7 +476,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(1060, 312) + Me.TabDetails.Size = New System.Drawing.Size(1063, 316) Me.TabDetails.Text = "Detailansicht" ' 'pnlDetails @@ -483,7 +485,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(1060, 312) + Me.pnlDetails.Size = New System.Drawing.Size(1063, 316) Me.pnlDetails.TabIndex = 0 ' 'TabWindream @@ -492,7 +494,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(1060, 312) + Me.TabWindream.Size = New System.Drawing.Size(1063, 316) Me.TabWindream.Text = "windream-Dateien" ' 'AxObjectListControl @@ -503,7 +505,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(1060, 287) + Me.AxObjectListControl.Size = New System.Drawing.Size(1063, 291) Me.AxObjectListControl.TabIndex = 6 Me.AxObjectListControl.TabStop = False ' @@ -512,7 +514,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(1060, 25) + Me.ToolStripDokumente.Size = New System.Drawing.Size(1063, 25) Me.ToolStripDokumente.TabIndex = 2 Me.ToolStripDokumente.Text = "ToolStrip2" ' @@ -541,14 +543,39 @@ Partial Class frmForm_Constructor_Main_2 ' 'TabFollowUp ' + Me.TabFollowUp.Controls.Add(Me.ListViewFollowUps) Me.TabFollowUp.Controls.Add(Me.grpbxFU_Profile) Me.TabFollowUp.Controls.Add(Me.Label5) - Me.TabFollowUp.Controls.Add(Me.ListViewFollowUp) Me.TabFollowUp.Image = Global.DD_Record_Organiser.My.Resources.Resources.Task_16xMD Me.TabFollowUp.Name = "TabFollowUp" - Me.TabFollowUp.Size = New System.Drawing.Size(1060, 312) + Me.TabFollowUp.Size = New System.Drawing.Size(1063, 316) 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.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.TabIndex = 5 + Me.ListViewFollowUps.UseCompatibleStateImageBehavior = False + Me.ListViewFollowUps.View = System.Windows.Forms.View.Details + ' + 'ColumnHeader1 + ' + Me.ColumnHeader1.Text = "ID" + Me.ColumnHeader1.Width = 40 + ' + 'ColumnHeader2 + ' + Me.ColumnHeader2.Text = "Title" + Me.ColumnHeader2.Width = 200 + ' 'grpbxFU_Profile ' Me.grpbxFU_Profile.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ @@ -557,7 +584,7 @@ Partial Class frmForm_Constructor_Main_2 Me.grpbxFU_Profile.Controls.Add(Me.lblFollowUp_save) Me.grpbxFU_Profile.Controls.Add(Me.chkFollowUp) Me.grpbxFU_Profile.Controls.Add(Me.dtpFollowUp) - Me.grpbxFU_Profile.Controls.Add(Me.Label9) + 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) @@ -574,6 +601,7 @@ Partial Class frmForm_Constructor_Main_2 Me.GroupBox4.Controls.Add(Me.Label6) Me.GroupBox4.Controls.Add(Me.ListBoxUser2Profile) Me.GroupBox4.Controls.Add(Me.Label7) + 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) @@ -583,6 +611,7 @@ Partial Class frmForm_Constructor_Main_2 ' 'btnRemoveUser_FollowUp ' + Me.btnRemoveUser_FollowUp.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btnRemoveUser_FollowUp.Image = Global.DD_Record_Organiser.My.Resources.Resources.delete Me.btnRemoveUser_FollowUp.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft Me.btnRemoveUser_FollowUp.Location = New System.Drawing.Point(248, 124) @@ -594,6 +623,7 @@ Partial Class frmForm_Constructor_Main_2 ' 'btnAddUser_FollowUp ' + Me.btnAddUser_FollowUp.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btnAddUser_FollowUp.Image = Global.DD_Record_Organiser.My.Resources.Resources.AddMark_10580 Me.btnAddUser_FollowUp.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft Me.btnAddUser_FollowUp.Location = New System.Drawing.Point(248, 95) @@ -605,6 +635,7 @@ Partial Class frmForm_Constructor_Main_2 ' 'cmbFollowUpUser ' + Me.cmbFollowUpUser.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.cmbFollowUpUser.FormattingEnabled = True Me.cmbFollowUpUser.Location = New System.Drawing.Point(248, 68) Me.cmbFollowUpUser.Name = "cmbFollowUpUser" @@ -614,9 +645,10 @@ Partial Class frmForm_Constructor_Main_2 'Label6 ' Me.Label6.AutoSize = True + Me.Label6.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label6.Location = New System.Drawing.Point(245, 50) Me.Label6.Name = "Label6" - Me.Label6.Size = New System.Drawing.Size(61, 13) + Me.Label6.Size = New System.Drawing.Size(64, 13) Me.Label6.TabIndex = 2 Me.Label6.Text = "Email-User:" ' @@ -624,6 +656,7 @@ Partial Class frmForm_Constructor_Main_2 ' Me.ListBoxUser2Profile.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) + Me.ListBoxUser2Profile.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.ListBoxUser2Profile.FormattingEnabled = True Me.ListBoxUser2Profile.Location = New System.Drawing.Point(9, 50) Me.ListBoxUser2Profile.Name = "ListBoxUser2Profile" @@ -663,20 +696,22 @@ Partial Class frmForm_Constructor_Main_2 ' 'dtpFollowUp ' + Me.dtpFollowUp.Enabled = False Me.dtpFollowUp.Format = System.Windows.Forms.DateTimePickerFormat.[Short] Me.dtpFollowUp.Location = New System.Drawing.Point(9, 33) Me.dtpFollowUp.Name = "dtpFollowUp" Me.dtpFollowUp.Size = New System.Drawing.Size(102, 21) Me.dtpFollowUp.TabIndex = 1 ' - 'Label9 + 'lblWiedervorlage_Control ' - Me.Label9.AutoSize = True - Me.Label9.Location = New System.Drawing.Point(6, 17) - Me.Label9.Name = "Label9" - Me.Label9.Size = New System.Drawing.Size(38, 13) - Me.Label9.TabIndex = 0 - Me.Label9.Text = "Label9" + 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.TabIndex = 0 + Me.lblWiedervorlage_Control.Text = "Label9" + Me.lblWiedervorlage_Control.Visible = False ' 'Label5 ' @@ -687,29 +722,6 @@ Partial Class frmForm_Constructor_Main_2 Me.Label5.TabIndex = 3 Me.Label5.Text = "Hinterlegte Wiedervorlagen" ' - 'ListViewFollowUp - ' - Me.ListViewFollowUp.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ - Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) - Me.ListViewFollowUp.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader1, Me.ColumnHeader2}) - Me.ListViewFollowUp.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.ListViewFollowUp.FullRowSelect = True - Me.ListViewFollowUp.Location = New System.Drawing.Point(14, 28) - Me.ListViewFollowUp.Name = "ListViewFollowUp" - Me.ListViewFollowUp.Size = New System.Drawing.Size(244, 269) - Me.ListViewFollowUp.TabIndex = 2 - Me.ListViewFollowUp.UseCompatibleStateImageBehavior = False - ' - 'ColumnHeader1 - ' - Me.ColumnHeader1.Text = "ID" - Me.ColumnHeader1.Width = 40 - ' - 'ColumnHeader2 - ' - Me.ColumnHeader2.Text = "Wiedervorlagentitel" - Me.ColumnHeader2.Width = 280 - ' 'TabPos ' Me.TabPos.Controls.Add(Me.Panel1) @@ -717,7 +729,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(1060, 312) + Me.TabPos.Size = New System.Drawing.Size(1063, 316) Me.TabPos.Text = "Positionen" ' 'Panel1 @@ -726,7 +738,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(1060, 287) + Me.Panel1.Size = New System.Drawing.Size(1063, 291) Me.Panel1.TabIndex = 2 ' 'GridControlPos @@ -735,7 +747,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(1060, 287) + Me.GridControlPos.Size = New System.Drawing.Size(1063, 291) Me.GridControlPos.TabIndex = 0 Me.GridControlPos.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.grvwGridPos}) ' @@ -762,7 +774,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(1060, 25) + Me.BindingNavigatorPOS.Size = New System.Drawing.Size(1063, 25) Me.BindingNavigatorPOS.TabIndex = 1 Me.BindingNavigatorPOS.Text = "BindingNavigator1" ' @@ -857,7 +869,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(1062, 25) + Me.ToolStripEdit.Size = New System.Drawing.Size(1069, 25) Me.ToolStripEdit.TabIndex = 0 Me.ToolStripEdit.Text = "ToolStrip1" ' @@ -890,6 +902,7 @@ Partial Class frmForm_Constructor_Main_2 ' 'tsButtonEditMode ' + Me.tsButtonEditMode.Enabled = False Me.tsButtonEditMode.Image = Global.DD_Record_Organiser.My.Resources.Resources.EditLabel_13239 Me.tsButtonEditMode.ImageTransparentColor = System.Drawing.Color.Magenta Me.tsButtonEditMode.Name = "tsButtonEditMode" @@ -1155,11 +1168,8 @@ Partial Class frmForm_Constructor_Main_2 Friend WithEvents lblFollowUp_save As System.Windows.Forms.Label Friend WithEvents chkFollowUp As System.Windows.Forms.CheckBox Friend WithEvents dtpFollowUp As System.Windows.Forms.DateTimePicker - Friend WithEvents Label9 As System.Windows.Forms.Label + Friend WithEvents lblWiedervorlage_Control As System.Windows.Forms.Label Friend WithEvents Label5 As System.Windows.Forms.Label - Friend WithEvents ListViewFollowUp As System.Windows.Forms.ListView - Friend WithEvents ColumnHeader1 As System.Windows.Forms.ColumnHeader - Friend WithEvents ColumnHeader2 As System.Windows.Forms.ColumnHeader Friend WithEvents ttToolTip As System.Windows.Forms.ToolTip Friend WithEvents ContextMenuDetails As System.Windows.Forms.ContextMenuStrip Friend WithEvents ToolStripDokumente As System.Windows.Forms.ToolStrip @@ -1196,4 +1206,7 @@ Partial Class frmForm_Constructor_Main_2 Friend WithEvents BindingNavigatorMoveNextItem As System.Windows.Forms.ToolStripButton Friend WithEvents BindingNavigatorMoveLastItem As System.Windows.Forms.ToolStripButton Friend WithEvents BindingNavigatorSeparator2 As System.Windows.Forms.ToolStripSeparator + Friend WithEvents ListViewFollowUps As System.Windows.Forms.ListView + Friend WithEvents ColumnHeader1 As System.Windows.Forms.ColumnHeader + Friend WithEvents ColumnHeader2 As System.Windows.Forms.ColumnHeader End Class diff --git a/app/DD-Record-Organiser/frmForm_Constructor_Main_2.vb b/app/DD-Record-Organiser/frmForm_Constructor_Main_2.vb index 5f278fb..1d51764 100644 --- a/app/DD-Record-Organiser/frmForm_Constructor_Main_2.vb +++ b/app/DD-Record-Organiser/frmForm_Constructor_Main_2.vb @@ -9,6 +9,7 @@ Imports DevExpress.XtraScheduler Imports System.Text Imports WINDREAMLib Imports System.IO +Imports DevExpress.XtraGrid Public Class frmForm_Constructor_Main_2 @@ -27,11 +28,15 @@ Public Class frmForm_Constructor_Main_2 Public POS_SQL As String = "" Public POS_RECORD_ID + Dim IsTopFirstRow As Boolean = True + Private RightMouse_Clicked = False + Private VIEW_ID Private VIEW_ID_RUNTIME As Integer = -1 Public RECORD_ENABLED As Boolean = False + Public ENTITY_RECORD_COUNT As Integer = 0 Public EBENE1_ENTITY Public EBENE2_ENTITY Public EBENE3_ENTITY @@ -170,7 +175,7 @@ Public Class frmForm_Constructor_Main_2 Dim XMLPath = Get_Grid_Layout_Filename() grvwGrid.SaveLayoutToXml(XMLPath) - Update_Status_Label(True, "Grid Layout Loaded") + ' Update_Status_Label(True, "Grid Layout Loaded") End Sub Sub Load_Grid_Layout() @@ -182,7 +187,7 @@ Public Class frmForm_Constructor_Main_2 grvwGrid.ClearSelection() grvwGrid.OptionsView.ShowPreview = False - Update_Status_Label(True, "Grid Layout Loaded") + 'Update_Status_Label(True, "Grid Layout Loaded") End If End Sub Private Function Get_POSGrid_Layout_Filename() @@ -200,7 +205,43 @@ Public Class frmForm_Constructor_Main_2 #End Region #Region "NavPane" + Sub Refresh_Navpane() + 'Die aktuelle Ebene überprüfen und das NAvpane aktualisieren + Select Case ACT_EBENE + Case 1 + If Not EBENE1_COLUMNNAME Is Nothing Then + EBENE1_GRID_RESULT = Get_GridResult(EBENE1_COLUMNNAME) + Dim cat As TileNavCategory = LoadLevel1Nav() + NavPane.Categories.Clear() + NavPane.Categories.Add(cat) + End If + Case 2 + If Not EBENE2_COLUMNNAME Is Nothing Then + EBENE2_GRID_RESULT = Get_GridResult(EBENE2_COLUMNNAME) + Dim cat As TileNavCategory = LoadLevel1Nav() + NavPane.Categories.Clear() + NavPane.Categories.Add(cat) + Dim item As TileNavItem = LoadLevel2Nav() + cat.Items.Add(item) + End If + Case 3 + EBENE3_RECID = SELECTED_RECORD_ID + If Not EBENE3_COLUMNNAME Is Nothing Then + EBENE3_GRID_RESULT = Get_GridResult(EBENE3_COLUMNNAME) + Dim cat As TileNavCategory = LoadLevel1Nav() + NavPane.Categories.Clear() + NavPane.Categories.Add(cat) + + Dim item As TileNavItem = LoadLevel2Nav() + cat.Items.Add(item) + + Dim subitem As TileNavSubItem = LoadLevel3Nav() + item.SubItems.Add(subitem) + + End If + End Select + End Sub Private Function FindNode(tncoll As TreeNodeCollection, strText As [String]) As TreeNode Dim tnFound As TreeNode For Each tnCurr As TreeNode In tncoll @@ -424,6 +465,7 @@ Public Class frmForm_Constructor_Main_2 Public Function Get_Focused_Row_Cell_Value_pos(columnName As String) Return grvwGridPos.GetFocusedRowCellValue(grvwGrid.Columns(columnName)) End Function + Private Sub grvwGrid_FocusedColumnChanged(sender As Object, e As FocusedColumnChangedEventArgs) Handles grvwGrid.FocusedColumnChanged Column_Row_Handler() End Sub @@ -440,6 +482,11 @@ Public Class frmForm_Constructor_Main_2 ' End If 'End If End Sub + Private Sub gridView1_CustomDrawRowIndicator(sender As Object, e As DevExpress.XtraGrid.Views.Grid.RowIndicatorCustomDrawEventArgs) + If IsTopFirstRow Then + e.Info.ImageIndex = -1 + End If + End Sub Sub Column_Row_Handler() If _FormClosing = True Then 'Or SaveRoutine_Active = True Exit Sub @@ -448,29 +495,71 @@ Public Class frmForm_Constructor_Main_2 If ENTITY_LOADED = False Then Exit Sub End If - Check_Record_Changed() - DisableEditMode() - + If RightMouse_Clicked Then + Exit Sub + End If Dim Grid_RecordID = Get_Focused_Row_Cell_Value("Record-ID") - If Grid_RecordID <> CURRENT_RECORD_ID Then - Show_Selected_Record_Data() - Clear_GridPos_View() - If TabPos.PageVisible = True And TCDetails.SelectedTabPage.Text.StartsWith("Posi") Then - 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 - Load_Pos_Data() - Load_POSGrid_Layout() + If IsNothing(Grid_RecordID) Then + Console.WriteLine("No Record ID selectable") + Else + If Grid_RecordID = 0 Then + Console.WriteLine("Grid_RecordID = 0") + Else + If Grid_RecordID = CURRENT_RECORD_ID Then + Exit Sub + End If + 'Hier jetzt erst das Anzeigen für einen selektierten Datensatz + If GRID_TYPE = GridType.Grid Then + If IsTopFirstRow Then + IsTopFirstRow = False + grvwGrid.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus + grvwGrid.OptionsBehavior.Editable = Not IsTopFirstRow + grvwGrid.OptionsSelection.EnableAppearanceFocusedCell = Not IsTopFirstRow + grvwGrid.OptionsSelection.EnableAppearanceFocusedRow = Not IsTopFirstRow + grvwGrid.OptionsSelection.EnableAppearanceHideSelection = Not IsTopFirstRow + End If + ElseIf GRID_TYPE = GridType.Carousel Then + If IsTopFirstRow Then + IsTopFirstRow = False + grvwCarousel.OptionsBehavior.Editable = Not IsTopFirstRow + End If + ElseIf GRID_TYPE = GridType.Tiles Then + If IsTopFirstRow Then + IsTopFirstRow = False + grvwTiles.OptionsBehavior.Editable = Not IsTopFirstRow End If End If - Else + Check_Record_Changed() + DisableEditMode() + + Show_Selected_Record_Data(Grid_RecordID) + Clear_GridPos_View() + If TabPos.PageVisible = True And TCDetails.SelectedTabPage.Text.StartsWith("Posi") Then + 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 + + ' End If + 'Else + ' Load_Pos_Data() + ' Load_POSGrid_Layout() + 'End If + Load_Pos_Data() + Load_POSGrid_Layout() + End If + + If CURRENT_RECORD_ID > 0 Then + tsButtonEditMode.Enabled = True + Get_RecordCounts_Nodes() + End If End If - Hide_Grid_Columns() - Get_RecordCounts_Nodes() End If + + + End Sub #End Region @@ -743,7 +832,8 @@ Public Class frmForm_Constructor_Main_2 AddressOf NewEditAppointment, AddressOf OpenFormData) CtrlCommandUI.LoadControls(CURRENT_FORM_ID) - pnlDetails.Enabled = False + Lock_RecordControls(True) + ' pnlDetails.Enabled = False AddHandler CtrlBuilder.OnRecordChanged, AddressOf OnRecordChanged End Sub @@ -792,11 +882,14 @@ Public Class frmForm_Constructor_Main_2 Exit Sub End If - RECORD_CHANGED = True - pnlDetails.Enabled = True - tsButtonShowWorkflowTasks.Enabled = True + 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) + RECORD_CHANGED = True + End If - ClassControlValues.LoadDefaultValues(CURRENT_FORM_ID, SELECTED_RECORD_ID, pnlDetails.Controls) CtrlCommandUI.IsInsert = True End Sub @@ -881,8 +974,8 @@ Public Class frmForm_Constructor_Main_2 End If 'Jetzt den Record nochmal laden - Show_Selected_Record_Data(SELECTED_RECORD_ID) - Update_Status_Label(True, "Record gespeichert - " & Now) + ' Show_Selected_Record_Data(SELECTED_RECORD_ID) + Update_Status_Label(True, "Record gespeichert - " & Now, EditState.Update) Update_Record_Label(SELECTED_RECORD_ID) Dim CURRENT_FORM_TYPE = ClassDatabase.Execute_Scalar("SELECT FORM_TYPE_ID FROM TBPMO_FORM WHERE GUID = " & CURRENT_FORM_ID) @@ -921,7 +1014,7 @@ Public Class frmForm_Constructor_Main_2 If result = MsgBoxResult.Yes Then EDIT_STATE = EditState.Delete If CtrlCommandUI.DeleteRecord(SELECTED_RECORD_ID) = True Then - Update_Status_Label(True, "Der Datensatz '" & SELECTED_RECORD_ID & "' wurde erfolgreich gelöscht - " & Now) + Update_Status_Label(True, "Der Datensatz '" & SELECTED_RECORD_ID & "' wurde erfolgreich gelöscht - " & Now, EditState.Update) Update_Record_Label(SELECTED_RECORD_ID) Load_Tree_View_Data() End If @@ -965,24 +1058,26 @@ Public Class frmForm_Constructor_Main_2 End Sub Sub EnableEditMode() - RECORD_ENABLED = True - Me.pnlDetails.Enabled = True + + Lock_RecordControls(False) Me.tsButtonDelete.Enabled = True Me.tsButtonAdd.Enabled = True Me.tsButtonSave.Enabled = True Me.tsButtonEditMode.Text = "Bearbeiten beenden" 'Funktion zum Vollständigen load der Inhalte - - If RECORD_ENABLED = False Then - ClassControlValues.LoadControlValuesList(SELECTED_RECORD_ID, CURRENT_FORM_ID, CtrlBuilder.AllControls) - End If + ClassControlValues.LoadControlValuesList(SELECTED_RECORD_ID, CURRENT_FORM_ID, CtrlBuilder.AllControls) + RECORD_ENABLED = True + 'If RECORD_ENABLED = False Then + ' ClassControlValues.LoadControlValuesList(SELECTED_RECORD_ID, CURRENT_FORM_ID, CtrlBuilder.AllControls) + 'End If End Sub Sub DisableEditMode() + Lock_RecordControls(True) RECORD_ENABLED = False - Me.pnlDetails.Enabled = False + ' Me.pnlDetails.Enabled = False Me.tsButtonDelete.Enabled = False - Me.tsButtonAdd.Enabled = False + 'Me.tsButtonAdd.Enabled = False Me.tsButtonSave.Enabled = False Me.tsButtonEditMode.Text = "Bearbeiten" 'Funktion nur zum load der Inhalte @@ -1028,6 +1123,9 @@ Public Class frmForm_Constructor_Main_2 Sub Load_Entity_Data(ClickedLevel As Integer) Try + + + Me.Cursor = Cursors.WaitCursor CURRENT_RECORD_ID = 0 @@ -1073,7 +1171,8 @@ Public Class frmForm_Constructor_Main_2 'Abhängig von der Entität die Selektierungs-Daten laden Get_Grid_Sql(CONSTRUCTORID, CURRENT_FORM_ID) - + 'Anzahl der Datensätze + ENTITY_RECORD_COUNT = ClassDatabase.Execute_Scalar("SELECT COUNT(*) FROM TBPMO_RECORD where FORM_ID = " & CURRENT_FORM_ID, True) Select Case ClickedLevel Case 1 EBENE1_ENTITY = "" @@ -1115,7 +1214,6 @@ Public Class frmForm_Constructor_Main_2 If EBENE1_RECID > 0 Then PARENT_RECORDID = EBENE1_RECID CURRENT_PARENTID = EBENE1_RECID - Console.WriteLine("PARENT_RECORDID: " & PARENT_RECORDID) If GRID_TYPE = GridType.Grid Then CURRENT_ENTITYSQL = "SELECT T.* FROM VWTEMP_PMO_FORM" & CURRENT_FORM_ID.ToString & " T, TBPMO_RECORD_CONNECT t1 where T.[Record-ID] = T1.RECORD2_ID AND T1.RECORD1_ID = " & CURRENT_PARENTID Else @@ -1124,6 +1222,14 @@ Public Class frmForm_Constructor_Main_2 CURRENT_ENTITYSQL = CURRENT_ENTITYSQL & " AND T.GUID = T2.RECORD2_ID AND T2.RECORD1_ID = @T2.RECORD1_ID" CURRENT_ENTITYSQL = CURRENT_ENTITYSQL.ToString.Replace("@T2.RECORD1_ID", PARENT_RECORDID) End If + Else + Console.WriteLine("Ebene 1 wurde nicht ausgewählt") + SELECTED_RECORD_ID = 0 + PARENT_ID = 0 + PARENT_RECORDID = 0 + NavPane.Categories.Clear() + tsslblRecord.Text = "" + Update_Status_Label(True, "Entität 1 übersprungen - Alle Datensätze geladen", EditState.Update) End If 'tslblEntity3.Visible = False Select Case CURRENT_FORM_TYPE @@ -1165,7 +1271,13 @@ Public Class frmForm_Constructor_Main_2 End Try Else - + Console.WriteLine("Ebene 2 wurde nicht ausgewählt") + SELECTED_RECORD_ID = 0 + PARENT_ID = 0 + PARENT_RECORDID = 0 + NavPane.Categories.Clear() + Update_Status_Label(True, "Entität 2 übersprungen - Alle Datensätze geladen", EditState.Update) + tsslblRecord.Text = "" End If Select Case CURRENT_FORM_TYPE Case 5 @@ -1184,6 +1296,7 @@ Public Class frmForm_Constructor_Main_2 If EDIT_STATE = EditState.None Then 'Die Controls der Entität laden Load_Controls(act_FormViewID) + tsButtonAdd.Enabled = True 'set_pnlsize() End If @@ -1220,10 +1333,28 @@ Public Class frmForm_Constructor_Main_2 DT_SELECTION = DTEntity LoadGrid_Selection() + If GRID_TYPE = GridType.Grid Then + grvwGrid.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.None + grvwGrid.OptionsBehavior.Editable = False + grvwGrid.OptionsSelection.EnableAppearanceFocusedCell = False + grvwGrid.OptionsSelection.EnableAppearanceFocusedRow = False + grvwGrid.OptionsSelection.EnableAppearanceHideSelection = False + ElseIf GRID_TYPE = GridType.Carousel Then + grvwCarousel.OptionsBehavior.Editable = False + ElseIf GRID_TYPE = GridType.Tiles Then + grvwTiles.FocusedRowHandle = -1 + grvwTiles.OptionsBehavior.Editable = False + grvwTiles.FocusedRowHandle = -1 + grvwTiles.OptionsTiles.HighlightFocusedTileOnGridLoad = False + End If + If LOAD_DIRECT = True Then Load_Record_Direct() End If + If ENTITY_RECORD_COUNT = 1 Then + Load_Record_Direct() + End If ' Dim sql1 = CURRENT_ENTITYSQL ' sql1.Replace("T.*", "TOP 1 [Record-ID]") ' Dim id = ClassDatabase.Execute_Scalar(sql1, True) @@ -1390,6 +1521,32 @@ Public Class frmForm_Constructor_Main_2 End Sub + Sub Lock_RecordControls(state As Boolean) + For Each Control As System.Windows.Forms.Control In pnlDetails.Controls + If (Control.GetType() Is GetType(TextBox)) Then + Dim txt As TextBox = CType(Control, TextBox) + txt.ReadOnly = state + End If + If (Control.GetType() Is GetType(System.Windows.Forms.ComboBox)) Then + Dim cbobx As System.Windows.Forms.ComboBox = CType(Control, System.Windows.Forms.ComboBox) + If state = True Then + cbobx.Enabled = False + Else + cbobx.Enabled = True + End If + End If + If (Control.GetType() Is GetType(DateTimePicker)) Then + Dim dtp As DateTimePicker = CType(Control, DateTimePicker) + If state = True Then + dtp.Enabled = False + Else + dtp.Enabled = True + End If + + End If + Next + End Sub + Private Sub Check_Record_Changed() If EDIT_STATE <> EditState.None Then Update_Status_Label(False, "") @@ -1401,7 +1558,8 @@ Public Class frmForm_Constructor_Main_2 If result = Windows.Forms.DialogResult.Yes Then If CtrlCommandUI.IsInsert = True Then EDIT_STATE = EditState.None - Me.pnlDetails.Enabled = False + Lock_RecordControls(True) + 'Me.pnlDetails.Enabled = False CtrlCommandUI.IsInsert = False End If Update_Record_OnChange() @@ -1484,16 +1642,16 @@ Public Class frmForm_Constructor_Main_2 CreateTile() Else ' Alle Checkboxen für aktuelle Ansicht heraussuchen - ' Dim sqlcheck As String = "SELECT CONTROL_COLUMN FROM VWPMO_VALUES WHERE CONTROL_TYPE_ID in (10,11) AND FORM_ID = " & CURRENT_FORM_ID - ' Dim dtcheck As DataTable = ClassDatabase.Return_Datatable(sqlcheck) - 'Dim listcheck As New List(Of String) + Dim sqlcheck As String = "SELECT CONTROL_COLUMN FROM VWPMO_VALUES WHERE CONTROL_TYPE_ID in (10,11) AND FORM_ID = " & CURRENT_FORM_ID + Dim dtcheck As DataTable = ClassDatabase.Return_Datatable(sqlcheck) + Dim listcheck As New List(Of String) 'Liste von allen Spaltentiteln mit Checkbox erstellen - 'If dtcheck.Rows.Count > 0 Then - ' For Each row As DataRow In dtcheck.Rows - ' listcheck.Add(row.Item(0)) - ' Next - 'End If + If dtcheck.Rows.Count > 0 Then + For Each row As DataRow In dtcheck.Rows + listcheck.Add(row.Item(0)) + Next + End If 'Duplikate entfernen ' listcheck = listcheck.Distinct().ToList() @@ -1511,27 +1669,27 @@ Public Class frmForm_Constructor_Main_2 CheckBoxEditorForDisplay.ValueChecked = 1 CheckBoxEditorForDisplay.ValueUnchecked = 0 ' Alle Checkbox Spalten durchgehen und CheckBoxEditor zuweisen - 'For Each col As String In listcheck - ' grvwSelection.GridControl.RepositoryItems.Add(CheckBoxEditorForDisplay) + For Each col As String In listcheck + grvwGrid.GridControl.RepositoryItems.Add(CheckBoxEditorForDisplay) - ' If Not IsNothing(grvwSelection.Columns(col)) Then - ' grvwSelection.Columns(col).ColumnEdit = CheckBoxEditorForDisplay - ' End If - 'Next + If Not IsNothing(grvwGrid.Columns(col)) Then + grvwGrid.Columns(col).ColumnEdit = CheckBoxEditorForDisplay + End If + Next 'grvwGrid.Columns("Record-ID").OptionsColumn.AllowShowHide = False - End If + End If - HideColumns() - Dim selnode As TreeNode = TreeViewMain.SelectedNode - Dim origtext As String = selnode.Text - If origtext.Contains(" (") Then - Dim existingstring = origtext.Substring(0, origtext.IndexOf("(") - 1) - selnode.Text = String.Format("{0} ({1})", existingstring, Get_Grid_Row_Count()) - Else - selnode.Text = String.Format("{0} ({1})", selnode.Text, Get_Grid_Row_Count()) - End If + HideColumns() + Dim selnode As TreeNode = TreeViewMain.SelectedNode + Dim origtext As String = selnode.Text + If origtext.Contains(" (") Then + Dim existingstring = origtext.Substring(0, origtext.IndexOf("(") - 1) + selnode.Text = String.Format("{0} ({1})", existingstring, Get_Grid_Row_Count()) + Else + selnode.Text = String.Format("{0} ({1})", selnode.Text, Get_Grid_Row_Count()) + End If Catch ex As Exception MsgBox("Error in LoadGrid_Selection:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) Return False @@ -1591,84 +1749,69 @@ Public Class frmForm_Constructor_Main_2 MsgBox("Error in HideColumns_Pos:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) End Try End Sub - Sub Show_Selected_Record_Data(Optional DirectRecID As Integer = 0) + Sub Show_Selected_Record_Data(GRID_RECORD As Integer) Try - + Update_Status_Label(False, "") + If LogErrorsOnly = False Then ClassLogger.Add(">> GRID_RECORD ID: " & GRID_RECORD.ToString, False) 'Me.pnlDetails.Visible = True ZeigeRecordLogsToolStripMenuItem.Enabled = False - If DirectRecID = 0 Then 'Wenn der Record nicht direkt geladen wird - If LogErrorsOnly = False Then ClassLogger.Add(">> Record wird über Datagrid focusedRow geladen", False) - Dim Grid_RecordID = Get_Focused_Row_Cell_Value("Record-ID") - If IsNothing(Grid_RecordID) Then - 'MsgBox("Unexpected error - RecordID konnte nicht gewählt werden - Check Configuration of Datagrid", MsgBoxStyle.Exclamation) - 'ClassLogger.Add(">> Grid_RecordID konnte nicht gewählt werden - Show_Selected_Record_Data", True) - Exit Sub - End If - - - If CURRENT_FORM_TYPE = 5 Or IS_SINGLE_RECORD = True Then '#### Es sind untergeordnete Entitäten geöffnet#### - - If LogErrorsOnly = False Then ClassLogger.Add(">> Grid_RecordID: " & Grid_RecordID.ToString, False) - Dim pID As Integer - Select Case ACT_EBENE '#### Hier muss nun der Parent-Record gewählt werden #### - Case 3 - Dim parent_ID = GET_PARENT_RECORD(Grid_RecordID) - If parent_ID > 0 Then - EBENE2_RECID = parent_ID - PARENT_RECORDID = parent_ID - CURRENT_PARENTID = parent_ID - pID = parent_ID - End If - Case Else - PARENT_RECORDID = Grid_RecordID - EBENE1_RECID = PARENT_RECORDID - CURRENT_PARENTID = PARENT_RECORDID - pID = PARENT_RECORDID - End Select - '#### Den Group or Single_Record holen/anlegen - GET_GROUP_OR_SINGLE_RECORD(pID) - Else '#### Datensatz wird normal geladen #### - SELECTED_RECORD_ID = Grid_RecordID - 'Die aktuelle Ebene überprüfen und den Datensatz übergeben, ebenso den PARENT-Record setzen - Select Case ACT_EBENE - Case 1 - CURRENT_RECORD_ID = SELECTED_RECORD_ID - PARENT_RECORDID = CURRENT_RECORD_ID - EBENE1_RECID = SELECTED_RECORD_ID + If CURRENT_FORM_TYPE = 5 Or IS_SINGLE_RECORD = True Then '#### Es sind untergeordnete Entitäten geöffnet#### + Dim pID As Integer + Select Case ACT_EBENE '#### Hier muss nun der Parent-Record gewählt werden #### + Case 3 + Dim parent_ID = GET_PARENT_RECORD(GRID_RECORD) + If parent_ID > 0 Then + EBENE2_RECID = parent_ID + PARENT_RECORDID = parent_ID + CURRENT_PARENTID = parent_ID + pID = parent_ID + End If + Case Else + PARENT_RECORDID = GRID_RECORD + EBENE1_RECID = PARENT_RECORDID + CURRENT_PARENTID = PARENT_RECORDID + pID = PARENT_RECORDID + End Select + '#### Den Group or Single_Record holen/anlegen + GET_GROUP_OR_SINGLE_RECORD(pID) + Else '#### Datensatz wird normal geladen #### + SELECTED_RECORD_ID = GRID_RECORD + CURRENT_RECORD_ID = SELECTED_RECORD_ID + 'Die aktuelle Ebene überprüfen und den Datensatz übergeben, ebenso den PARENT-Record setzen + Select Case ACT_EBENE + Case 1 + CURRENT_RECORD_ID = SELECTED_RECORD_ID + PARENT_RECORDID = CURRENT_RECORD_ID + EBENE1_RECID = SELECTED_RECORD_ID + CURRENT_PARENTID = EBENE1_RECID + If Not EBENE1_COLUMNNAME Is Nothing Then + EBENE1_GRID_RESULT = Get_GridResult(EBENE1_COLUMNNAME) + End If + Case 2 + EBENE2_RECID = SELECTED_RECORD_ID + If Not EBENE2_COLUMNNAME Is Nothing Then + EBENE2_GRID_RESULT = Get_GridResult(EBENE2_COLUMNNAME) + End If + If EBENE1_RECID > 0 Then + PARENT_RECORDID = EBENE1_RECID CURRENT_PARENTID = EBENE1_RECID - If Not EBENE1_COLUMNNAME Is Nothing Then - EBENE1_GRID_RESULT = Get_GridResult(EBENE1_COLUMNNAME) - End If - Case 2 - EBENE2_RECID = SELECTED_RECORD_ID - If Not EBENE2_COLUMNNAME Is Nothing Then - EBENE2_GRID_RESULT = Get_GridResult(EBENE2_COLUMNNAME) - End If - If EBENE1_RECID > 0 Then - PARENT_RECORDID = EBENE1_RECID - CURRENT_PARENTID = EBENE1_RECID - Else - CURRENT_PARENTID = EBENE2_RECID - End If - Case 3 - EBENE3_RECID = SELECTED_RECORD_ID - If Not EBENE3_COLUMNNAME Is Nothing Then - EBENE3_GRID_RESULT = Get_GridResult(EBENE3_COLUMNNAME) - End If - If EBENE2_RECID > 0 Then - PARENT_RECORDID = EBENE2_RECID - CURRENT_PARENTID = EBENE2_RECID - End If - End Select - End If - - Else '#### Record wird direkt geladen #### - If LogErrorsOnly = False Then ClassLogger.Add(">> Record wird DIREKT geladen", False) - SELECTED_RECORD_ID = DirectRecID - CURRENT_RECORD_ID = DirectRecID - + Else + CURRENT_PARENTID = EBENE2_RECID + End If + Case 3 + EBENE3_RECID = SELECTED_RECORD_ID + If Not EBENE3_COLUMNNAME Is Nothing Then + EBENE3_GRID_RESULT = Get_GridResult(EBENE3_COLUMNNAME) + End If + If EBENE2_RECID > 0 Then + PARENT_RECORDID = EBENE2_RECID + CURRENT_PARENTID = EBENE2_RECID + End If + End Select End If - If TCDetails.SelectedTabPage.Text.StartsWith("Windr") Then + + + If TCDetails.SelectedTabPage.Text.ToLower.StartsWith("windr") Then If CURRENT_RECORD_ID = 0 Then RUN_WD_SEARCH(WD_Suche, "ENTITY") Else @@ -1679,6 +1822,14 @@ Public Class frmForm_Constructor_Main_2 'Daten zu Record in jedem Fall laden ClassControlValues.LoadControlValues(SELECTED_RECORD_ID, CURRENT_FORM_ID, CtrlBuilder.AllControls) End If + If TCDetails.SelectedTabPage.Text.ToLower.StartsWith("wieder") Then + tsButtonEditMode.Enabled = False + Refresh_FollowUps() + dtpFollowUp.Enabled = False + lblWiedervorlage_Control.Visible = False + ListBoxUser2Profile.Items.Clear() + grpbxFU_Profile.Enabled = False + End If ' Laden der Daten bedeutet nicht dass Daten vom Benutzer geändert wurden! RECORD_CHANGED = False @@ -1690,41 +1841,7 @@ Public Class frmForm_Constructor_Main_2 End If End If - 'Die aktuelle Ebene überprüfen und das NAvpane aktualisieren - Select Case ACT_EBENE - Case 1 - If Not EBENE1_COLUMNNAME Is Nothing Then - EBENE1_GRID_RESULT = Get_GridResult(EBENE1_COLUMNNAME) - Dim cat As TileNavCategory = LoadLevel1Nav() - NavPane.Categories.Clear() - NavPane.Categories.Add(cat) - End If - Case 2 - If Not EBENE2_COLUMNNAME Is Nothing Then - EBENE2_GRID_RESULT = Get_GridResult(EBENE2_COLUMNNAME) - Dim cat As TileNavCategory = LoadLevel1Nav() - NavPane.Categories.Clear() - NavPane.Categories.Add(cat) - - Dim item As TileNavItem = LoadLevel2Nav() - cat.Items.Add(item) - End If - Case 3 - EBENE3_RECID = SELECTED_RECORD_ID - If Not EBENE3_COLUMNNAME Is Nothing Then - EBENE3_GRID_RESULT = Get_GridResult(EBENE3_COLUMNNAME) - Dim cat As TileNavCategory = LoadLevel1Nav() - NavPane.Categories.Clear() - NavPane.Categories.Add(cat) - - Dim item As TileNavItem = LoadLevel2Nav() - cat.Items.Add(item) - - Dim subitem As TileNavSubItem = LoadLevel3Nav() - item.SubItems.Add(subitem) - - End If - End Select + Refresh_Navpane() Update_Record_Label(SELECTED_RECORD_ID) Me.tsButtonShowWorkflowTasks.Enabled = True @@ -1737,50 +1854,82 @@ Public Class frmForm_Constructor_Main_2 End Sub Sub Create_Grid_Editor(formId As Integer) - Dim SQL As String = "SELECT CONTROL_COL_NAME,CONTROL_SQLCOMMAND_1,CONTROL_STATIC_LIST FROM [VWPMO_CONTROL_SCREEN] WHERE CTRLTYPE_ID = 3 AND FORM_ID = " & formId - Dim ComboColumns As DataTable = ClassDatabase.Return_Datatable(SQL) - Dim comboEdit As New RepositoryItemComboBox() - Dim comboItems As ComboBoxItemCollection = comboEdit.Items + Try + Dim SQL As String = "SELECT CONTROL_COL_NAME,CONTROL_SQLCOMMAND_1,CONTROL_STATIC_LIST FROM [VWPMO_CONTROL_SCREEN] WHERE CTRLTYPE_ID = 3 AND FORM_ID = " & formId + Dim ComboColumns As DataTable = ClassDatabase.Return_Datatable(SQL) - For Each col As DataRow In ComboColumns.Rows + ' Alle Checkboxen für aktuelle Ansicht heraussuchen + Dim sqlcheck As String = "SELECT CONTROL_COLUMN FROM VWPMO_VALUES WHERE CONTROL_TYPE_ID in (10,11) AND FORM_ID = " & formId + Dim dtcheck As DataTable = ClassDatabase.Return_Datatable(sqlcheck) + Dim listcheck As New List(Of String) - Dim colName As String = col.Item(0) - - Dim hasSqlCommand = col.Item(1).ToString() <> "" - Dim hasStaticList = col.Item(2).ToString() <> "" - - If hasStaticList = True Then - Dim staticListItems = col.Item(2).ToString.Split(";") - comboItems.BeginUpdate() - Try - For Each item In staticListItems - comboItems.Add(item) - Next - Finally - comboItems.EndUpdate() - End Try - - ElseIf hasSqlCommand = True Then - SQL = col.Item(1).ToString() - Dim dt As DataTable = ClassDatabase.Return_Datatable(SQL, "Load_Pos_Data") - - For Each row As DataRow In dt.Rows - Dim value = row.Item(0) - comboItems.BeginUpdate() - Try - comboItems.Add(value) - Finally - comboItems.EndUpdate() - End Try + 'Liste von allen Spaltentiteln mit Checkbox erstellen + If dtcheck.Rows.Count > 0 Then + For Each row As DataRow In dtcheck.Rows + listcheck.Add(row.Item(0)) Next - End If + ' Den Editor Initialisieren und Optionen setzen + Dim CheckBoxEditorForDisplay = New RepositoryItemCheckEdit() + CheckBoxEditorForDisplay.ValueChecked = 1 + CheckBoxEditorForDisplay.ValueUnchecked = 0 + ' Alle Checkbox Spalten durchgehen und CheckBoxEditor zuweisen + For Each col As String In listcheck + grvwGridPos.GridControl.RepositoryItems.Add(CheckBoxEditorForDisplay) - GridControlPos.RepositoryItems.Add(comboEdit) - If Not IsNothing(grvwGridPos.Columns(colName)) Then - grvwGridPos.Columns(colName).ColumnEdit = comboEdit - End If - Next + If Not IsNothing(grvwGridPos.Columns(col)) Then + grvwGridPos.Columns(col).ColumnEdit = CheckBoxEditorForDisplay + End If + Next + + + For Each col As DataRow In ComboColumns.Rows + + Dim colName As String = col.Item(0) + + Dim hasSqlCommand = col.Item(1).ToString() <> "" + Dim hasStaticList = col.Item(2).ToString() <> "" + + If hasStaticList = True Then + Dim comboEdit1 As New RepositoryItemComboBox() + Dim comboItems1 As ComboBoxItemCollection = comboEdit1.Items + Dim staticListItems = col.Item(2).ToString.Split(";") + comboItems1.BeginUpdate() + Try + For Each item In staticListItems + comboItems1.Add(item) + Next + Finally + comboItems1.EndUpdate() + End Try + GridControlPos.RepositoryItems.Add(comboEdit1) + If Not IsNothing(grvwGridPos.Columns(colName)) Then + grvwGridPos.Columns(colName).ColumnEdit = comboEdit1 + End If + ElseIf hasSqlCommand = True Then + SQL = col.Item(1).ToString() + Dim dt As DataTable = ClassDatabase.Return_Datatable(SQL, "Load_Pos_Data") + Dim comboEdit2 As New RepositoryItemComboBox() + Dim comboItems2 As ComboBoxItemCollection = comboEdit2.Items + For Each row As DataRow In dt.Rows + Dim value = row.Item(0) + comboItems2.BeginUpdate() + Try + comboItems2.Add(value) + Finally + comboItems2.EndUpdate() + End Try + Next + GridControlPos.RepositoryItems.Add(comboEdit2) + If Not IsNothing(grvwGridPos.Columns(colName)) Then + grvwGridPos.Columns(colName).ColumnEdit = comboEdit2 + End If + End If + Next + Catch ex As Exception + MsgBox("Error in Create_Grid_Editor:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) + End Try + End Sub Sub Load_Pos_Data() @@ -1797,10 +1946,6 @@ Public Class frmForm_Constructor_Main_2 BindingNavigatorPOS.BindingSource = bs ' --- Editoren laden für Combobox --- Create_Grid_Editor(POS_ENTITY) - - - - HideColumns_Pos(PARENT_RECORDID) End If End If @@ -1821,7 +1966,8 @@ Public Class frmForm_Constructor_Main_2 Function GetSelected_RecordID() Try If Get_Grid_Column_Count() = 0 Then - Me.pnlDetails.Enabled = False + Lock_RecordControls(True) + ' Me.pnlDetails.Enabled = False 'Me.tsbtnshowWorkflowtasks.Enabled = False 'tsstatus_Detail_show(True, "Keine Columns in Grid") Return Nothing @@ -2219,6 +2365,7 @@ Public Class frmForm_Constructor_Main_2 Loop AxObjectListControl.SetStatusIcon(3) Else + tslblWindreamView.Text = "Windream-Dokumente für Record: " & CURRENT_RECORD_ID & " - Keine Dateien gefunden" Clear_Windream_ResultList() End If @@ -2347,20 +2494,32 @@ Public Class frmForm_Constructor_Main_2 End Sub #End Region + Private Sub TCDetails_DragDrop(sender As Object, e As DragEventArgs) Handles TCDetails.DragDrop + Drag_Drop(e) + End Sub + Private Sub TCDetails_SelectedPageChanged(sender As Object, e As DevExpress.XtraTab.TabPageChangedEventArgs) Handles TCDetails.SelectedPageChanged - If TCDetails.SelectedTabPage.Text.StartsWith("Pos") Then + Update_Status_Label(False, "") + tsButtonEditMode.Enabled = True + If TCDetails.SelectedTabPage.Text.ToLower.StartsWith("pos") Then + tsButtonEditMode.Enabled = False Load_Pos_Data() Load_POSGrid_Layout() End If - If TCDetails.SelectedTabPage.Text.StartsWith("Windr") Then + If TCDetails.SelectedTabPage.Text.ToLower.StartsWith("windr") Then + tsButtonEditMode.Enabled = False If CURRENT_RECORD_ID = 0 Then RUN_WD_SEARCH(WD_Suche, "ENTITY") Else RUN_WD_SEARCH(WD_Suche, "RECORD") End If End If - If TCDetails.SelectedTabPage.Text.StartsWith("Wieder") Then + If TCDetails.SelectedTabPage.Text.ToLower.StartsWith("wieder") Then + tsButtonEditMode.Enabled = False Refresh_FollowUps() + dtpFollowUp.Enabled = False + lblWiedervorlage_Control.Visible = False + 'Check_FOLLOWUP_IsConfigured(CURRENT_FORM_ID) End If Select Case TCDetails.SelectedTabPageIndex @@ -2380,6 +2539,7 @@ Public Class frmForm_Constructor_Main_2 End Select End Sub Private Sub Refresh_FollowUps() + Try If DT_FU_ENTITY.Rows.Count > 0 Then grpbxFU_Profile.Enabled = True @@ -2442,12 +2602,17 @@ Public Class frmForm_Constructor_Main_2 Private Sub pnlDetails_DragDrop(sender As Object, e As DragEventArgs) Handles pnlDetails.DragDrop Drag_Drop(e) End Sub + Private Sub TCDetails_DragEnter(sender As Object, e As DragEventArgs) Handles TCDetails.DragEnter + Drag_Enter(e) + End Sub #End Region #Region "Follow Up" - Private Sub ListViewFollowUp_SelectedIndexChanged(sender As Object, e As EventArgs) Handles ListViewFollowUp.SelectedIndexChanged - If Me.ListViewFollowUp.SelectedItems.Count > 0 Then - FOLL_UP_ID = ListViewFollowUp.SelectedItems(0).Text + 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 If FOLL_UP_ID = DR.Item("GUID") Then @@ -2455,6 +2620,7 @@ Public Class frmForm_Constructor_Main_2 FOLL_UP_DATE_CTRL_ID = DR.Item("DEPENDENT_DATE_CTRL_ID") Dim datevalue = ClassControlValues.Get_Control_Value_for_ID(DR.Item("DEPENDENT_DATE_CTRL_ID"), CURRENT_RECORD_ID) If Not IsNothing(datevalue) Then + dtpFollowUp.Enabled = True If datevalue = "00:00:00" Then dtpFollowUp.Value = CDate(Now) End If @@ -2464,9 +2630,13 @@ 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 - dtpFollowUp.Text = CStr(caption) + lblWiedervorlage_Control.Text = CStr(caption) + + Else + lblWiedervorlage_Control.Text = "Wiedervorlage:" End If FOLL_UP_DONE_CTRL_ID = DR.Item("DEPENDENT_DONE_CTRL_ID") Dim checkvalue = ClassControlValues.Get_Control_Value_for_ID(DR.Item("DEPENDENT_DONE_CTRL_ID"), CURRENT_RECORD_ID) @@ -2540,12 +2710,12 @@ Public Class frmForm_Constructor_Main_2 FOLLOW_UPisActive = True 'Die Wiedervorlageprofile in den Listview laden - ListViewFollowUp.Items.Clear() + ListViewFollowUps.Items.Clear() Dim anz As Integer = 0 For Each DR As DataRow In DT_FU_ENTITY.Rows Dim name = DR.Item("NAME") - ListViewFollowUp.Items.Add(DR.Item("GUID")) - ListViewFollowUp.Items(anz).SubItems.Add(DR.Item("NAME")) + ListViewFollowUps.Items.Add(DR.Item("GUID")) + ListViewFollowUps.Items(anz).SubItems.Add(name) anz += 1 Next @@ -2641,7 +2811,7 @@ Public Class frmForm_Constructor_Main_2 EBENE2_RECID = 0 EBENE3_ENTITY = "" EBENE3_RECID = 0 - + NavPane.Categories.Clear() Load_Tree_View(CONSTRUCTORID) End Sub @@ -2672,39 +2842,13 @@ Public Class frmForm_Constructor_Main_2 Dim FormId As Integer = SelectedNode.Tag If FormId > 0 Then CURRENT_FORM_ID = FormId - Cursor = Cursors.WaitCursor OpenFormLevelDesigner() - Cursor = Cursors.Default End If End If Catch ex As Exception MsgBox("Unexpected Error in Open Designer: " & ex.Message, MsgBoxStyle.Critical) End Try End Sub - Sub OpenFormLevelDesigner() - Dim frm As New frmLevel_Designer - frm = frmLevel_Designer.Instance - 'frm.MdiParent = frmMain - 'frmMain.tscMain.ContentPanel.Controls.Add(frm) - frm.Show() - - Dim frm2 As New frmTool_ControlDesigner - frm2 = frmTool_ControlDesigner.Instance - If My.Settings.User_DesignPanels_areChild = True Then - frm2.MdiParent = frmMain - End If - - 'frmMain.tscMain.ContentPanel.Controls.Add(frm2) - frm2.Show() - - Dim frm3 As New frmTool_ControlProperties - frm3 = frmTool_ControlProperties.Instance - If My.Settings.User_DesignPanels_areChild = True Then - frm3.MdiParent = frmMain - End If - 'frmMain.tscMain.ContentPanel.Controls.Add(frm3) - frm3.Show() - End Sub Private Sub ButtonExportToExcel_Click(sender As Object, e As EventArgs) Handles ButtonExportToExcel.Click Dim saveFileDialog1 As New SaveFileDialog saveFileDialog1.Filter = "Excel File|*.xlsx" @@ -2817,7 +2961,7 @@ Public Class frmForm_Constructor_Main_2 Cursor = Cursors.WaitCursor If ClassOfficeTemplate.Open_Word_Template(TemplateID, CURRENT_RECORD_ID) = True Then RUN_WD_SEARCH(WD_Suche, "RECORD") - Update_Status_Label(True, "Vorlagen-Datei erfolgreich nach windream importiert!") + Update_Status_Label(True, "Vorlagen-Datei erfolgreich nach windream importiert!", EditState.Insert) End If Cursor = Cursors.Default Else @@ -2855,27 +2999,41 @@ Public Class frmForm_Constructor_Main_2 End Sub Private Sub grvwGridPos_CellValueChanged(sender As Object, e As CellValueChangedEventArgs) Handles grvwGridPos.CellValueChanged - Dim column = e.Column.FieldName - Dim sql = String.Format("select guid from TBPMO_CONTROL where COL_NAME = '{0}' and FORM_ID = {1}", column, POS_ENTITY) - Dim controlid = ClassDatabase.Execute_Scalar(sql, True) - If Not IsNothing(controlid) Then - - - 'Überprüfen ob schon value vorhanden - sql = String.Format("SELECT CONTROL_ID FROM VWPMO_VALUES WHERE CONTROL_ID = {0} AND FORM_ID = {1} AND CONTROL_COLUMN = '{2}' AND RECORD_ID = {3}", controlid, POS_ENTITY, column, POS_RECORD_ID) - Dim cId As Integer = ClassDatabase.Execute_Scalar(sql) - - ' Wenn cId = 0, existiert noch kein wert für diese controlId/FormId Kombination - If cId = 0 Then - ClassControlCommandsUI.InsertControlValue(controlid, POS_RECORD_ID, e.Value) - Update_Status_Label(True, "Datensatz wurde eingefügt", EditState.Insert) + Try + Dim column = e.Column.FieldName + Dim sql = String.Format("select guid from TBPMO_CONTROL where COL_NAME = '{0}' and FORM_ID = {1}", column, POS_ENTITY) + Dim controlid = ClassDatabase.Execute_Scalar(sql, True) + If Not IsNothing(controlid) Then + 'Überprüfen ob schon value vorhanden + sql = String.Format("SELECT CONTROL_ID FROM VWPMO_VALUES WHERE CONTROL_ID = {0} AND FORM_ID = {1} AND CONTROL_COLUMN = '{2}' AND RECORD_ID = {3}", controlid, POS_ENTITY, column, POS_RECORD_ID) + Dim cId As Integer = ClassDatabase.Execute_Scalar(sql) + If IsNothing(POS_RECORD_ID) Or IsDBNull(POS_RECORD_ID) Then + If ClassControlCommandsUI.CreateRecord(POS_ENTITY) = True Then + Dim recid = ClassControlCommandsUI.GetLastRecord + If Not IsNothing(recid) Then + 'Die neue Record-ID setzen + POS_RECORD_ID = recid + ClassControlCommandsUI.ConnectRecord(CURRENT_PARENTID, POS_RECORD_ID, "POS_LINK for Entity " & POS_ENTITY.ToString) + Else + MsgBox("Unexpected Error in Creating POS", MsgBoxStyle.Exclamation) + End If + End If + End If + ' Wenn cId = 0, existiert noch kein wert für diese controlId/FormId Kombination + If cId = 0 Then + ClassControlCommandsUI.InsertControlValue(controlid, POS_RECORD_ID, e.Value) + Update_Status_Label(True, "Datensatz wurde eingefügt", EditState.Insert) + Else + ClassControlCommandsUI.UpdateControlValue(controlid, POS_RECORD_ID, e.Value) + Update_Status_Label(True, "Datensatz wurde aktualisiert", EditState.Update) + End If Else - ClassControlCommandsUI.UpdateControlValue(controlid, POS_RECORD_ID, e.Value) - Update_Status_Label(True, "Datensatz wurde aktualisiert", EditState.Update) + Update_Status_Label(False) End If - Else - Update_Status_Label(False) - End If + Catch ex As Exception + MsgBox("Error in grvwGridPos_CellValueChanged:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) + End Try + End Sub @@ -2904,4 +3062,57 @@ Public Class frmForm_Constructor_Main_2 Private Sub GridControlPos_Leave(sender As Object, e As EventArgs) Handles GridControlPos.Leave Save_POSGrid_Layout() End Sub + + Private Sub grvwGridPos_RowStyle(sender As Object, e As DevExpress.XtraGrid.Views.Grid.RowStyleEventArgs) Handles grvwGridPos.RowStyle + If e.RowHandle = DevExpress.XtraGrid.GridControl.AutoFilterRowHandle Then + e.Appearance.BackColor = Color.LemonChiffon + End If + End Sub + + Private Sub grvwGrid_RowStyle(sender As Object, e As DevExpress.XtraGrid.Views.Grid.RowStyleEventArgs) Handles grvwGrid.RowStyle + If e.RowHandle = DevExpress.XtraGrid.GridControl.AutoFilterRowHandle Then + e.Appearance.BackColor = Color.LemonChiffon + End If + End Sub + + + + Private Sub grvwGrid_SelectionChanged(sender As Object, e As DevExpress.Data.SelectionChangedEventArgs) Handles grvwGrid.SelectionChanged + + End Sub + Private Sub grvwGrid_MouseDown(sender As Object, e As MouseEventArgs) Handles grvwGrid.MouseDown, grvwTiles.MouseDown, grvwCarousel.MouseDown + If e.Button = Windows.Forms.MouseButtons.Right Then + RightMouse_Clicked = True + Else + RightMouse_Clicked = False + End If + End Sub + + Private Sub btnAddUser_FollowUp_Click(sender As Object, e As EventArgs) Handles btnAddUser_FollowUp.Click + If cmbFollowUpUser.SelectedIndex <> -1 And FOLL_UP_ID > 0 Then + Try + Dim ins = "INSERT INTO TBPMO_FOLLUPEMAIL_RECORD (FOLLOW_UP_ID,USER_ID,RECORD_ID,ADDED_WHO) VALUES (" & FOLL_UP_ID & ", " & cmbFollowUpUser.SelectedValue & ", " & CURRENT_RECORD_ID & ", '" & Environment.UserName & "')" + If ClassDatabase.Execute_non_Query(ins, True) = True Then + Load_FUUser(FOLL_UP_ID) + Update_Status_Label(True, "User added to Follow Up", EditState.Insert) + End If + Catch ex As Exception + MsgBox("Error in Add User2FollowUp_Record:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) + End Try + End If + End Sub + + Private Sub btnRemoveUser_FollowUp_Click(sender As Object, e As EventArgs) Handles btnRemoveUser_FollowUp.Click + If ListBoxUser2Profile.SelectedIndex <> -1 Then + Try + Dim del = "DELETE FROM TBPMO_FOLLUPEMAIL_RECORD WHERE GUID = " & ListBoxUser2Profile.SelectedValue + If ClassDatabase.Execute_non_Query(del, True) = True Then + Update_Status_Label(True, "User removed from Follow Up", EditState.Update) + Load_FUUser(FOLL_UP_ID) + End If + Catch ex As Exception + MsgBox("Error in Delete Userlink FollowUp:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) + End Try + End If + End Sub End Class \ No newline at end of file diff --git a/app/DD-Record-Organiser/frmLevel_Designer.vb b/app/DD-Record-Organiser/frmLevel_Designer.vb index 24ab471..a646717 100644 --- a/app/DD-Record-Organiser/frmLevel_Designer.vb +++ b/app/DD-Record-Organiser/frmLevel_Designer.vb @@ -102,75 +102,80 @@ #Region "+++++ Drag Drop Funktionen +++++" Public Sub ControlDragDrop(type As String, Parent As GroupBox) - Dim r As New System.Random() - Dim def_font_family As String = DefaultFont.Name - Dim def_font_color As Integer = DefaultForeColor.ToArgb - Dim def_font_style As Integer = 0 - Dim def_font_size As Integer = 8 + Try + Dim r As New System.Random() + Dim def_font_family As String = DefaultFont.Name + Dim def_font_color As Integer = DefaultForeColor.ToArgb + Dim def_font_style As Integer = 0 + Dim def_font_size As Integer = 8 - 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) - ' 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) - ' 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) - ' 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) - ' Aktuelles Control in die Datenbank speichern - ClassControlCommands.InsertControl(CtrlBuilder.CurrentControl) - Case "dgv" - CtrlBuilder.AddDataGridView("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) - ' 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) - ' Aktuelles Control in die Datenbank speichern - ClassControlCommands.InsertControl(CtrlBuilder.CurrentControl) - Case "pb" - CtrlBuilder.AddPictureBox("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) - ' 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) + 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) + ' 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) + ' 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) + ' 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) + ' Aktuelles Control in die Datenbank speichern + ClassControlCommands.InsertControl(CtrlBuilder.CurrentControl) + Case "dgv" + CtrlBuilder.AddDataGridView("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) + ' 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) + ' Aktuelles Control in die Datenbank speichern + ClassControlCommands.InsertControl(CtrlBuilder.CurrentControl) + Case "pb" + CtrlBuilder.AddPictureBox("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) + ' 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) - 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) + 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) - 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) - ' 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) - ' Aktuelles Control in die Datenbank speichern - ClassControlCommands.InsertControl(CtrlBuilder.CurrentControl) - Case Else - MsgBox("Event '" & type & "' nicht definiert") - End Select + 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) + ' 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) + ' Aktuelles Control in die Datenbank speichern + ClassControlCommands.InsertControl(CtrlBuilder.CurrentControl) + Case Else + MsgBox("Event '" & type & "' nicht definiert") + End Select + Catch ex As Exception + MsgBox("unexpected Error in ControlDragDrop: " & vbNewLine, MsgBoxStyle.Critical) + End Try + End Sub Public Sub Groupbox_DragDrop(sender As Object, e As DragEventArgs) diff --git a/app/DD-Record-Organiser/frmSQLEditor.vb b/app/DD-Record-Organiser/frmSQLEditor.vb index a2369ac..a7f2547 100644 --- a/app/DD-Record-Organiser/frmSQLEditor.vb +++ b/app/DD-Record-Organiser/frmSQLEditor.vb @@ -293,7 +293,11 @@ Public Class frmSQLEditor Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click Try - Dim upd As String = "UPDATE TBPMO_CONTROL SET SQL_COMMAND_1 = '" & txtValue.Text & "', CONNECTION_ID_1 = " & cmbConnection.SelectedValue & ", CHANGED_WHO = '" & Environment.UserName & "' WHERE GUID = " & CURRENT_CONTROL_ID + Dim sql_comamnd As String = txtValue.Text + If txtValue.Text.Contains("'") Then + sql_comamnd = txtValue.Text.Replace("'", "''") + End If + Dim upd As String = "UPDATE TBPMO_CONTROL SET SQL_COMMAND_1 = '" & sql_comamnd & "', CONNECTION_ID_1 = " & cmbConnection.SelectedValue & ", CHANGED_WHO = '" & Environment.UserName & "' WHERE GUID = " & CURRENT_CONTROL_ID If ClassDatabase.Execute_non_Query(upd, True) Then MsgBox("SQL-Befehl erfolgreich gespeichert!", MsgBoxStyle.Exclamation) End If diff --git a/app/SetupWiX/Product.wxs b/app/SetupWiX/Product.wxs index 72885d4..9f0a27a 100644 --- a/app/SetupWiX/Product.wxs +++ b/app/SetupWiX/Product.wxs @@ -1,7 +1,7 @@ - +