From 1773d31c6372561ad40a7bbc553b828d32c38feb Mon Sep 17 00:00:00 2001 From: JenneJ Date: Wed, 25 Nov 2015 16:15:38 +0100 Subject: [PATCH] jj_25_11 --- app/DD-Record-Organiser.sln | 3 + app/DD-Record-Organiser/ClassControlValues.vb | 2 +- .../ModuleHelperMethods.vb | 122 +++++--- .../ModuleRuntimeVariables.vb | 2 + .../frmForm_Constructor_Main_2.Designer.vb | 37 +-- .../frmForm_Constructor_Main_2.vb | 261 +++++++++--------- app/DD-Record-Organiser/frmMain.vb | 65 ++--- 7 files changed, 285 insertions(+), 207 deletions(-) diff --git a/app/DD-Record-Organiser.sln b/app/DD-Record-Organiser.sln index 7b7b308..e33e10e 100644 --- a/app/DD-Record-Organiser.sln +++ b/app/DD-Record-Organiser.sln @@ -129,4 +129,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(Performance) = preSolution + HasPerformanceSessions = true + EndGlobalSection EndGlobal diff --git a/app/DD-Record-Organiser/ClassControlValues.vb b/app/DD-Record-Organiser/ClassControlValues.vb index 099f789..0556b1b 100644 --- a/app/DD-Record-Organiser/ClassControlValues.vb +++ b/app/DD-Record-Organiser/ClassControlValues.vb @@ -268,7 +268,7 @@ Public Class ClassControlValues Combobox.DataSource = DT_Combobox Combobox.DisplayMember = DT_Combobox.Columns(1).ColumnName Combobox.ValueMember = DT_Combobox.Columns(0).ColumnName - Combobox.AutoCompleteMode = AutoCompleteMode.SuggestAppend + Combobox.AutoCompleteMode = AutoCompleteMode.Suggest 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 006bf3a..9c65379 100644 --- a/app/DD-Record-Organiser/ModuleHelperMethods.vb +++ b/app/DD-Record-Organiser/ModuleHelperMethods.vb @@ -151,8 +151,8 @@ CURRENT_SCREEN_ID = ScreenID Dim frm As New frmFormInput - frm.MdiParent = frmMain - 'frmMain.tscMain.ContentPanel.Controls.Add(frm) + frm.MdiParent = MAIN_FORM + frm.Show() frm.BringToFront() End Sub @@ -161,51 +161,57 @@ Dim frm As New frmCalendar frm = frmCalendar.Instance() If My.Settings.User_Calendar_isChild = True Then - frm.MdiParent = frmMain + frm.MdiParent = MAIN_FORM End If - 'frmMain.tscMain.ContentPanel.Controls.Add(frm) + frm.Show() End Sub Public Sub OpenFormOverview() Dim frm As New frmForm_Overview frm = frmForm_Overview.Instance() - frm.MdiParent = frmMain - 'frmMain.tscMain.ContentPanel.Controls.Add(frm) + frm.MdiParent = MAIN_FORM + frm.Show() End Sub Public Sub OpenFormLevelDesigner() Dim frm As New frmLevel_Designer frm = frmLevel_Designer.Instance - frm.MdiParent = frmMain - 'frmMain.tscMain.ContentPanel.Controls.Add(frm) + frm.MdiParent = MAIN_FORM + frm.Show() Dim frm2 As New frmTool_ControlDesigner frm2 = frmTool_ControlDesigner.Instance If My.Settings.User_DesignPanels_areChild = True Then - frm2.MdiParent = frmMain + frm2.MdiParent = MAIN_FORM 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 + frm3.MdiParent = MAIN_FORM End If - 'frmMain.tscMain.ContentPanel.Controls.Add(frm3) + frm3.Show() End Sub Public Sub OpenFormConstructor(id As Integer) CURRENT_CONSTRUCTOR_ID = id - Dim frm As New frmForm_Constructor - ' frm = frmForm_Constructor.Instance() - frm.MdiParent = frmMain + Dim frm As New frmForm_Constructor() + + Dim activeChild As Form = MAIN_FORM.ActiveMdiChild + If activeChild IsNot Nothing Then + activeChild.WindowState = FormWindowState.Normal + End If + + frm.MdiParent = MAIN_FORM frm.Show() + ' frm = frmForm_Constructor.Instance() + End Sub ' TODO: NUR FÜR WINDREAM CON!!! @@ -214,7 +220,13 @@ CURRENT_CONSTRUCTOR_ID = id Dim frm As New frmForm_Constructor_Main_2() ' frm = frmForm_Constructor.Instance() - frm.MdiParent = frmMain + + Dim activeChild As Form = MAIN_FORM.ActiveMdiChild + If activeChild IsNot Nothing Then + activeChild.WindowState = FormWindowState.Normal + End If + + frm.MdiParent = MAIN_FORM frm.Show() Catch ex As Exception ClassLogger.Add(ex) @@ -226,59 +238,107 @@ Public Sub OpenTaskmanagement() Dim frm As New frmTaskmanagement frm = frmTaskmanagement.Instance() - frm.MdiParent = frmMain - 'frmMain.tscMain.ContentPanel.Controls.Add(frm) + frm.MdiParent = MAIN_FORM + + Dim activeChild As Form = MAIN_FORM.ActiveMdiChild + If activeChild IsNot Nothing Then + activeChild.WindowState = FormWindowState.Normal + End If + frm.Show() End Sub Public Sub OpenDokumentartt() Dim frm As New frmDokumentart_Konfig frm = frmDokumentart_Konfig.Instance() - frm.MdiParent = frmMain - 'frmMain.tscMain.ContentPanel.Controls.Add(frm) + frm.MdiParent = MAIN_FORM + + Dim activeChild As Form = MAIN_FORM.ActiveMdiChild + If activeChild IsNot Nothing Then + activeChild.WindowState = FormWindowState.Normal + End If + frm.Show() End Sub Public Sub OpenMenuDesigner() Dim frm As New frmMenuDesigner - frm.MdiParent = frmMain - 'frmMain.tscMain.ContentPanel.Controls.Add(frm) + frm.MdiParent = MAIN_FORM + + Dim activeChild As Form = MAIN_FORM.ActiveMdiChild + If activeChild IsNot Nothing Then + activeChild.WindowState = FormWindowState.Normal + End If + frm.Show() End Sub Public Sub OpenUserKonfig() Dim frm As New frmUserKonfig frm = frmUserKonfig.Instance() - frm.MdiParent = frmMain - 'frmMain.tscMain.ContentPanel.Controls.Add(frm) + frm.MdiParent = MAIN_FORM + + Dim activeChild As Form = MAIN_FORM.ActiveMdiChild + If activeChild IsNot Nothing Then + activeChild.WindowState = FormWindowState.Normal + End If + frm.Show() End Sub Public Sub OpenImageManager() Dim frm As New frmQuickAccessManager 'frm = frmImageManager.Instance() - frm.MdiParent = frmMain - 'frmMain.tscMain.ContentPanel.Controls.Add(frm) + frm.MdiParent = MAIN_FORM + + Dim activeChild As Form = MAIN_FORM.ActiveMdiChild + If activeChild IsNot Nothing Then + activeChild.WindowState = FormWindowState.Normal + End If + frm.Show() End Sub Public Sub OpenObjecttypeConfig() Dim frm As New frmObjecttypeConfig frm = frmObjecttypeConfig.Instance() - frm.MdiParent = frmMain - 'frmMain.tscMain.ContentPanel.Controls.Add(frm) + frm.MdiParent = MAIN_FORM + + Dim activeChild As Form = MAIN_FORM.ActiveMdiChild + If activeChild IsNot Nothing Then + activeChild.WindowState = FormWindowState.Normal + End If + frm.Show() End Sub Public Sub OpenWiedervorlage() Dim frm As New frmWiedervorlage - frm.MdiParent = frmMain + frm.MdiParent = MAIN_FORM + + Dim activeChild As Form = MAIN_FORM.ActiveMdiChild + If activeChild IsNot Nothing Then + activeChild.WindowState = FormWindowState.Normal + End If + frm.Show() End Sub Public Sub OpenLogRecord() Dim frm As New frmLogRecord frm = frmLogRecord.Instance() - frm.MdiParent = frmMain + frm.MdiParent = MAIN_FORM + + Dim activeChild As Form = MAIN_FORM.ActiveMdiChild + If activeChild IsNot Nothing Then + activeChild.WindowState = FormWindowState.Normal + End If + frm.Show() End Sub Public Sub OpenTemplatemanagement() Dim frm As New frmTemplates - frm.MdiParent = frmMain + frm.MdiParent = MAIN_FORM + + Dim activeChild As Form = MAIN_FORM.ActiveMdiChild + If activeChild IsNot Nothing Then + activeChild.WindowState = FormWindowState.Normal + End If + frm.Show() End Sub End Module diff --git a/app/DD-Record-Organiser/ModuleRuntimeVariables.vb b/app/DD-Record-Organiser/ModuleRuntimeVariables.vb index ffbdda3..40ef738 100644 --- a/app/DD-Record-Organiser/ModuleRuntimeVariables.vb +++ b/app/DD-Record-Organiser/ModuleRuntimeVariables.vb @@ -1,4 +1,6 @@ Module ModuleRuntimeVariables + Public MAIN_FORM As frmMain = Nothing + Public CtrlBuilder As ClassControlBuilder Public CtrlCommandUI As ClassControlCommandsUI 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 38abd19..4abce73 100644 --- a/app/DD-Record-Organiser/frmForm_Constructor_Main_2.Designer.vb +++ b/app/DD-Record-Organiser/frmForm_Constructor_Main_2.Designer.vb @@ -22,12 +22,13 @@ Partial Class frmForm_Constructor_Main_2 '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_2)) 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_2 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_2 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() @@ -174,7 +175,6 @@ Partial Class frmForm_Constructor_Main_2 Me.GridControlMain.Name = "GridControlMain" Me.GridControlMain.Size = New System.Drawing.Size(779, 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}) ' 'ContextMenuGrid @@ -271,10 +271,11 @@ Partial Class frmForm_Constructor_Main_2 Me.grvwTiles.OptionsBehavior.AllowDeleteRows = DevExpress.Utils.DefaultBoolean.[False] Me.grvwTiles.OptionsBehavior.ReadOnly = True Me.grvwTiles.OptionsFind.AlwaysVisible = True - Me.grvwTiles.OptionsTiles.IndentBetweenGroups = 8 - Me.grvwTiles.OptionsTiles.ItemSize = New System.Drawing.Size(300, 145) + Me.grvwTiles.OptionsTiles.HorizontalContentAlignment = DevExpress.Utils.HorzAlignment.Near + Me.grvwTiles.OptionsTiles.ItemSize = New System.Drawing.Size(240, 116) Me.grvwTiles.OptionsTiles.RowCount = 2 Me.grvwTiles.OptionsTiles.ScrollMode = DevExpress.XtraEditors.TileControlScrollMode.ScrollBar + Me.grvwTiles.OptionsTiles.VerticalContentAlignment = DevExpress.Utils.VertAlignment.Top ' 'NavPane ' @@ -469,7 +470,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 @@ -480,7 +481,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 ' @@ -489,7 +490,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" ' @@ -523,7 +524,7 @@ Partial Class frmForm_Constructor_Main_2 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 @@ -874,7 +875,7 @@ Partial Class frmForm_Constructor_Main_2 Me.TBPMO_FILES_USERBindingSource.DataMember = "TBPMO_FILES_USER" Me.TBPMO_FILES_USERBindingSource.DataSource = Me.DD_DMSDataSet ' - 'frmForm_Constructor_Main + 'frmForm_Constructor_Main_2 ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font @@ -882,7 +883,7 @@ Partial Class frmForm_Constructor_Main_2 Me.Controls.Add(Me.SplitContainerMain) Me.Controls.Add(Me.StatusStrip_Main) Me.Controls.Add(Me.NavPane) - Me.Name = "frmForm_Constructor_Main" + Me.Name = "frmForm_Constructor_Main_2" Me.Text = "frmForm_Constructor_Main" CType(Me.grvwGrid, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.GridControlMain, System.ComponentModel.ISupportInitialize).EndInit() diff --git a/app/DD-Record-Organiser/frmForm_Constructor_Main_2.vb b/app/DD-Record-Organiser/frmForm_Constructor_Main_2.vb index ebe6947..d4f108f 100644 --- a/app/DD-Record-Organiser/frmForm_Constructor_Main_2.vb +++ b/app/DD-Record-Organiser/frmForm_Constructor_Main_2.vb @@ -315,7 +315,7 @@ Public Class frmForm_Constructor_Main_2 VIEW_ID = 3 End If - + ' GridControlMain.MainView = grvwGrid End If End If @@ -400,6 +400,8 @@ Public Class frmForm_Constructor_Main_2 Exit Sub End If Check_Record_Changed() + DisableEditMode() + Get_RecordCounts_Nodes() Show_Selected_Record_Data("Record-ID") Hide_Grid_Columns() @@ -439,6 +441,7 @@ Public Class frmForm_Constructor_Main_2 End Sub Private Sub TreeViewMain_AfterSelect(sender As Object, e As TreeViewEventArgs) Handles TreeViewMain.AfterSelect + DisableEditMode() SetSelectedNodeStyle(TreeViewMain.Nodes) Load_Tree_View_Data() End Sub @@ -546,6 +549,7 @@ Public Class frmForm_Constructor_Main_2 CURRENT_FORM_ID = FormId Dim Sql = "SELECT GUID from VWPMO_CONSTRUCTOR_FORMS WHERE CONSTRUCT_ID = " & CONSTRUCTORID & " AND FORM_ID = " & CURRENT_FORM_ID CONSTRUCTOR_DETAIL_ID = ClassDatabase.Execute_Scalar(Sql, True) + Get_RecordCounts_Nodes() Load_Entity_Data(ACT_EBENE) End If End Sub @@ -834,7 +838,8 @@ Public Class frmForm_Constructor_Main_2 Get_Grid_Row_Handle(CURRENT_RECORD_ID) 'Die Daten auf dem Panel laden ClassControlValues.LoadControlValues(CURRENT_RECORD_ID, CURRENT_FORM_ID, CtrlBuilder.AllControls) - pnlDetails.Enabled = True + ' Laden der Daten bedeutet nicht dass Daten vom Benutzer geändert wurden! + RECORD_CHANGED = False End If End If End If @@ -863,28 +868,67 @@ Public Class frmForm_Constructor_Main_2 End Sub Private Sub tsButtonEditMode_Click(sender As Object, e As EventArgs) Handles tsButtonEditMode.Click + ToggleEditMode() + + 'If RECORD_ENABLED = False Then + ' RECORD_ENABLED = True + ' Me.pnlDetails.Enabled = True + ' Me.tsButtonDelete.Enabled = True + ' Me.tsButtonAdd.Enabled = True + ' Me.tsButtonSave.Enabled = True + ' Me.tsButtonEditMode.Text = "Bearbeiten beenden" + ' 'Funktion zum Vollständigen load der Inhalte + + ' ClassControlValues.LoadControlValuesList(SELECTED_RECORD_ID, CURRENT_FORM_ID, CtrlBuilder.AllControls) + 'Else + ' RECORD_ENABLED = False + ' Me.pnlDetails.Enabled = False + ' Me.tsButtonDelete.Enabled = False + ' Me.tsButtonAdd.Enabled = False + ' Me.tsButtonSave.Enabled = False + ' Me.tsButtonEditMode.Text = "Bearbeiten" + ' 'Funktion nur zum load der Inhalte + + ' ClassControlValues.UnloadControlValuesList(SELECTED_RECORD_ID, CURRENT_RECORD_ID, CtrlBuilder.AllControls) + + 'End If + End Sub + + Sub ToggleEditMode() If RECORD_ENABLED = False Then - RECORD_ENABLED = True - Me.pnlDetails.Enabled = True - Me.tsButtonDelete.Enabled = True - Me.tsButtonAdd.Enabled = True - Me.tsButtonSave.Enabled = True - Me.tsButtonEditMode.Text = "Bearbeiten beenden" - 'Funktion zum Vollständigen load der Inhalte + EnableEditMode() + Else + DisableEditMode() + End If + End Sub + + Sub EnableEditMode() + RECORD_ENABLED = True + Me.pnlDetails.Enabled = True + 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) - Else - RECORD_ENABLED = False - Me.pnlDetails.Enabled = False - Me.tsButtonDelete.Enabled = False - Me.tsButtonAdd.Enabled = False - Me.tsButtonSave.Enabled = False - Me.tsButtonEditMode.Text = "Bearbeiten" - 'Funktion nur zum load der Inhalte + End If + End Sub - ClassControlValues.UnloadControlValuesList(SELECTED_RECORD_ID, CURRENT_RECORD_ID, CtrlBuilder.AllControls) + Sub DisableEditMode() + RECORD_ENABLED = False + Me.pnlDetails.Enabled = False + Me.tsButtonDelete.Enabled = False + Me.tsButtonAdd.Enabled = False + Me.tsButtonSave.Enabled = False + Me.tsButtonEditMode.Text = "Bearbeiten" + 'Funktion nur zum load der Inhalte + If RECORD_ENABLED = True Then + ClassControlValues.UnloadControlValuesList(SELECTED_RECORD_ID, CURRENT_RECORD_ID, CtrlBuilder.AllControls) End If + End Sub #End Region @@ -924,7 +968,7 @@ Public Class frmForm_Constructor_Main_2 Try Me.Cursor = Cursors.WaitCursor CURRENT_RECORD_ID = 0 - + 'VerknüpfungenToolStripMenuItem.Enabled = False CURRENT_FORM_TYPE = ClassDatabase.Execute_Scalar("SELECT FORM_TYPE_ID FROM TBPMO_FORM WHERE GUID = " & CURRENT_FORM_ID) IS_SINGLE_RECORD = ClassDatabase.Execute_Scalar("SELECT SINGLE_RECORD FROM TBPMO_FORM WHERE GUID = " & CURRENT_FORM_ID) @@ -1079,7 +1123,7 @@ Public Class frmForm_Constructor_Main_2 'Überprüfen ob windream Dos angezeigt werden sollen? Check_windream_Show(act_FormViewID) - + If windream_Docshow = True Then Clear_Windream_ResultList() @@ -1091,12 +1135,13 @@ Public Class frmForm_Constructor_Main_2 If CURRENT_FORM_TYPE = 5 Or IS_SINGLE_RECORD = True Then GET_GROUP_OR_SINGLE_RECORD() ClassControlValues.LoadControlValues(CURRENT_RECORD_ID, CURRENT_FORM_ID, CtrlBuilder.AllControls) - + ' Laden der Daten bedeutet nicht dass Daten vom Benutzer geändert wurden! + RECORD_CHANGED = False Show_Selected_Record_Data("Record-ID") 'Hide_Grid_Columns() Else - + GridControlMain.Visible = True Dim DTEntity As DataTable = ClassDatabase.Return_Datatable(CURRENT_ENTITYSQL, "LoadEntityData - Get DTEntity") @@ -1120,52 +1165,10 @@ Public Class frmForm_Constructor_Main_2 Load_Grid_Layout() End If - - 'Select Case CURRENT_FORM_TYPE - ' Case 5 - ' 'Nur eine Gruppen-Entität: d.h. es wird nur die Dateientab angezeigt - ' Console.WriteLine("OnlyGroupType") - ' GridControlMain.Visible = False - ' Case Else - - ' If IS_SINGLE_RECORD = True Then - ' 'Load_Controls(act_FormViewID) - ' ClassControlValues.LoadControlValues(SELECTED_RECORD_ID, CURRENT_FORM_ID, CtrlBuilder.AllControls) - ' Else - ' GridControlMain.Visible = True - - ' Dim DTEntity As DataTable = ClassDatabase.Return_Datatable(CURRENT_ENTITYSQL, "LoadEntityData - Get DTEntity") - ' Dim primaryKey(1) As DataColumn - ' primaryKey(0) = DTEntity.Columns("Record-ID") - ' DTEntity.PrimaryKey = primaryKey - ' DT_SELECTION = DTEntity - ' LoadGrid_Selection() - - ' 'If LOAD_DIRECT = True Or IS_SINGLE_RECORD Then - ' ' Dim sql1 = CURRENT_ENTITYSQL - ' ' sql1.Replace("T.*", "TOP 1 [Record-ID]") - ' ' Dim id = ClassDatabase.Execute_Scalar(sql1, True) - ' ' If Not id Is Nothing Then - ' ' If LogErrorsOnly = False Then ClassLogger.Add(">> Load Record directly - RecordID: " & CURRENT_RECORD_ID, False) - ' ' Load_Record_Data() - ' ' End If - ' 'End If - ' 'Überprüfen ob es für diese Entität Wiedervorlagen gibt? - ' Check_FOLLOWUP_IsConfigured(CURRENT_FORM_ID) - ' End If - - - - 'End Select - Load_Templates() Me.Cursor = Cursors.Default - - - - 'Zurücksetzen ENTITY_LOADED = True Catch ex As Exception @@ -1196,6 +1199,7 @@ Public Class frmForm_Constructor_Main_2 Dim PrimaryFont As New Font("Segoe UI", 12, FontStyle.Bold) Dim SecondaryFont As New Font("Segoe UI", 10) + Dim WhiteBackground As Color = System.Drawing.Color.FromArgb(230, Color.White) ' Datatable laden GridControlMain.DataSource = DT @@ -1216,16 +1220,15 @@ Public Class frmForm_Constructor_Main_2 Dim TextHeaderColumn As TileViewItemElement Select Case index - Case 0 - ' RecordId - RECORDID_Column = New TileViewItemElement() - With RECORDID_Column - .Column = grvwTiles.Columns(0) - .Column.OptionsFilter.AllowFilter = True - .TextAlignment = TileItemContentAlignment.TopLeft - .Column.Caption = "Record-ID" - End With - grvwTiles.TileTemplate.Add(RECORDID_Column) + 'Case 0 + ' ' RecordId + ' RECORDID_Column = New TileViewItemElement() + ' With RECORDID_Column + ' .Column = grvwTiles.Columns(0) + ' .Column.OptionsFilter.AllowFilter = True + ' .TextAlignment = TileItemContentAlignment.TopLeft + ' End With + ' grvwTiles.TileTemplate.Add(RECORDID_Column) Case 1 ' Index 1 ist das Bild If Column.DataType.ToString.Contains("Byte") Then @@ -1233,9 +1236,11 @@ Public Class frmForm_Constructor_Main_2 With ImageColumn .Image = My.Resources.keinbild .Column = grvwTiles.Columns(1) - .ImageSize = New Size(186, 90) - .ImageScaleMode = TileItemImageScaleMode.Squeeze - .ImageAlignment = TileItemContentAlignment.BottomLeft + '.ImageSize = New Size(186, 90) + .ImageSize = New Size(186, 118) + .ImageScaleMode = TileItemImageScaleMode.ZoomInside + .ImageAlignment = TileItemContentAlignment.Manual + .ImageLocation = New Point(-10, -10) End With grvwTiles.TileTemplate.Add(ImageColumn) End If @@ -1259,16 +1264,19 @@ Public Class frmForm_Constructor_Main_2 With TextHeaderColumn .Text = Column.ColumnName .TextAlignment = TileItemContentAlignment.Manual - .TextLocation = New Point(140, 40 + (OffsetIndex * 50)) + .TextLocation = New Point(120, 20 + (OffsetIndex * 40)) .Appearance.Normal.Font = SecondaryFont - .Appearance.Normal.ForeColor = Color.Gray + .Appearance.Normal.ForeColor = Color.DarkGray + .Appearance.Normal.BackColor = WhiteBackground End With With TextColumn .Column = grvwTiles.Columns(index) .TextAlignment = TileItemContentAlignment.Manual - .TextLocation = New Point(140, 40 + 15 + (OffsetIndex * 50)) + .TextLocation = New Point(120, 20 + 18 + (OffsetIndex * 40)) .Appearance.Normal.Font = SecondaryFont + .Appearance.Normal.ForeColor = Color.Black + .Appearance.Normal.BackColor = WhiteBackground End With grvwTiles.TileTemplate.Add(TextHeaderColumn) @@ -1433,13 +1441,13 @@ Public Class frmForm_Constructor_Main_2 'Überhaupt Columns in Grid? If Get_Grid_Column_Count() = 0 Then - Me.pnlDetails.Enabled = False + 'Me.pnlDetails.Enabled = False Me.tsButtonShowWorkflowTasks.Enabled = False 'tsstatus_Detail_show(True, "Keine Columns in Grid") Exit Sub Else - Me.pnlDetails.Enabled = True + 'Me.pnlDetails.Enabled = True End If ''Überhaupt Rows in Grid? If Get_Grid_Row_Count() > 0 Then @@ -1462,7 +1470,7 @@ Public Class frmForm_Constructor_Main_2 SELECTED_RECORD_ID = Grid_RecordID CURRENT_RECORD_ID = Grid_RecordID End If - + Else 'tsstatus_Detail_show(True, "Grid_RecordID konnte nicht gewählt werden!") ClassLogger.Add(">> Grid_RecordID konnte nicht gewählt werden - SelectedRecord_ShowData", True) @@ -1471,6 +1479,8 @@ Public Class frmForm_Constructor_Main_2 End If 'Daten zu Record in jedem Fall laden ClassControlValues.LoadControlValues(SELECTED_RECORD_ID, CURRENT_FORM_ID, CtrlBuilder.AllControls) + ' Laden der Daten bedeutet nicht dass Daten vom Benutzer geändert wurden! + RECORD_CHANGED = False End If Else 'Record wird direkt geladen @@ -1593,48 +1603,48 @@ Public Class frmForm_Constructor_Main_2 End Try End Function - Sub Get_Selected_Record() - Select Case EDIT_STATE - Case EditState.None - 'Ganz normalerDatensatzwechsel Wechsel - Show_Selected_Record_Data("Record-ID") - 'Refresh_Treeview_SelectedData() - - Update_Status_Label(False) - 'tslblStatusMain_show(False, "") - Case EditState.Insert - 'Refresh_Treeview_SelectedData() - Case EditState.Update - ' Refresh_Treeview_SelectedData() - End Select - Select Case TCDetails.SelectedTabPageIndex - Case 0 - 'Die Values in die Controls laden - If EDIT_STATE = EditState.None Then - 'TabPageDetails.Text = "Detaileingabe zu '" & ACT_EBENE_STRING & "' - Record(" & SelectedRecordID & ")" - 'Die Daten auf dem Panel laden - ClassControlValues.LoadControlValues(SELECTED_RECORD_ID, CURRENT_FORM_ID, CtrlBuilder.AllControls) - 'Load_Control_Values(CtrlBuilder.AllControls) - 'Refresh_Treeview_SelectedData() - RECORD_CHANGED = False - End If - Case 1 - RUN_WD_SEARCH(WD_Suche, "RECORD") - Case 2 - 'If FOLLOW_UPisActive = True Then Refresh_FollowUps() - End Select - 'DT_FU_Record = Nothing - 'VerknüpfungenToolStripMenuItem.Enabled = True - Update_Record_Label(SELECTED_RECORD_ID) - - If FOLLOW_UPisActive = True Then Refresh_FollowUp_TabHeader() - - Show_act_WFTask() - Get_RecordCounts_Nodes() - pnlDetails.Enabled = False - - Refresh_TaskOverview() - End Sub + 'Sub Get_Selected_Record() + ' Select Case EDIT_STATE + ' Case EditState.None + ' 'Ganz normalerDatensatzwechsel Wechsel + ' Show_Selected_Record_Data("Record-ID") + ' 'Refresh_Treeview_SelectedData() + + ' Update_Status_Label(False) + ' 'tslblStatusMain_show(False, "") + ' Case EditState.Insert + ' 'Refresh_Treeview_SelectedData() + ' Case EditState.Update + ' ' Refresh_Treeview_SelectedData() + ' End Select + ' Select Case TCDetails.SelectedTabPageIndex + ' Case 0 + ' 'Die Values in die Controls laden + ' If EDIT_STATE = EditState.None Then + ' 'TabPageDetails.Text = "Detaileingabe zu '" & ACT_EBENE_STRING & "' - Record(" & SelectedRecordID & ")" + ' 'Die Daten auf dem Panel laden + ' ClassControlValues.LoadControlValues(SELECTED_RECORD_ID, CURRENT_FORM_ID, CtrlBuilder.AllControls) + ' 'Load_Control_Values(CtrlBuilder.AllControls) + ' 'Refresh_Treeview_SelectedData() + ' RECORD_CHANGED = False + ' End If + ' Case 1 + ' RUN_WD_SEARCH(WD_Suche, "RECORD") + ' Case 2 + ' 'If FOLLOW_UPisActive = True Then Refresh_FollowUps() + ' End Select + ' 'DT_FU_Record = Nothing + ' 'VerknüpfungenToolStripMenuItem.Enabled = True + ' Update_Record_Label(SELECTED_RECORD_ID) + + ' If FOLLOW_UPisActive = True Then Refresh_FollowUp_TabHeader() + + ' Show_act_WFTask() + ' Get_RecordCounts_Nodes() + ' pnlDetails.Enabled = False + + ' Refresh_TaskOverview() + 'End Sub Private Sub Refresh_FollowUp_TabHeader() Try @@ -1659,6 +1669,7 @@ Public Class frmForm_Constructor_Main_2 Dim ResultMessage = CtrlCommandUI.SaveRecord(SELECTED_RECORD_ID, CURRENT_FORM_ID, PARENT_RECORDID) 'Jetzt die für die Entität notwendigen Prroceduren ausführen Customer_Run_Procedures() + RECORD_CHANGED = False Return ResultMessage End Function diff --git a/app/DD-Record-Organiser/frmMain.vb b/app/DD-Record-Organiser/frmMain.vb index 007bafe..27c96cc 100644 --- a/app/DD-Record-Organiser/frmMain.vb +++ b/app/DD-Record-Organiser/frmMain.vb @@ -11,6 +11,39 @@ Public Class frmMain 'Private USER_GUID + Private Sub frmMain_Load(sender As Object, e As EventArgs) Handles Me.Load + Try + ' Referenz zu frmMain speichern + MAIN_FORM = Me + + ' Form Titel setzen + ClassWindowLocation.LoadFormLocationSize(Me, 1, CURRENT_SCREEN_ID, "frmMain") + Me.Text = Application.ProductName + LabelVersion.Caption = String.Format("Version {0}", My.Application.Info.Version.ToString) + LabelUser.Caption = Environment.UserName + LabelMachine.Caption = My.Computer.Name + + SetBackground() + + Dim splash As New frmSplash() + splash.ShowDialog() + + If USER_IS_ADMIN = True Then + pageAdmin.Visible = True + End If + + LabelLoggedIn.Caption = "Anzahl Angemeldete User: " & USERS_LOGGED_IN.ToString() + + 'LoadMenuItems() + LoadMenuItems2() + LoadQuickStartItems() + VWPMO_WF_USER_ACTIVETableAdapter.Connection.ConnectionString = MyConnectionString + VWPMO_WF_USER_ACTIVETableAdapter.Connection.ConnectionString = MyConnectionString + Catch ex As Exception + MsgBox("Error in Load Form:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) + End Try + End Sub + Private Sub frmMain_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing Try Dim sql = "UPDATE TBDD_USER SET LOGGED_IN = @LogInOut, LOGGED_WHERE = '@ANGEMELDETWO' WHERE (LOWER(USERNAME) = LOWER('@user'))" @@ -255,38 +288,6 @@ Public Class frmMain Me.BackgroundImageLayout = ImageLayout.Center End If End Sub - - - - Private Sub frmMain_Load(sender As Object, e As EventArgs) Handles Me.Load - Try - ' Form Titel setzen - ClassWindowLocation.LoadFormLocationSize(Me, 1, CURRENT_SCREEN_ID, "frmMain") - Me.Text = Application.ProductName - LabelVersion.Caption = String.Format("Version {0}", My.Application.Info.Version.ToString) - LabelUser.Caption = Environment.UserName - LabelMachine.Caption = My.Computer.Name - - SetBackground() - - Dim splash As New frmSplash() - splash.ShowDialog() - - If USER_IS_ADMIN = True Then - pageAdmin.Visible = True - End If - - LabelLoggedIn.Caption = "Anzahl Angemeldete User: " & USERS_LOGGED_IN.ToString() - - 'LoadMenuItems() - LoadMenuItems2() - LoadQuickStartItems() - VWPMO_WF_USER_ACTIVETableAdapter.Connection.ConnectionString = MyConnectionString - VWPMO_WF_USER_ACTIVETableAdapter.Connection.ConnectionString = MyConnectionString - Catch ex As Exception - MsgBox("Error in Load Form:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) - End Try - End Sub Sub Refresh_TaskReminder() Try