From e4345f3b760eb29287ba61ef44d1fb9ce905a3b7 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Thu, 12 May 2022 13:03:31 +0200 Subject: [PATCH] Autoload template, ask for reload on selecting mandator --- MultiTool.Form/DS_DD_ECM.Designer.vb | 60 +++- MultiTool.Form/DS_DD_ECM.xsd | 62 ++-- MultiTool.Form/My Project/AssemblyInfo.vb | 4 +- MultiTool.Form/frmConfig.Designer.vb | 419 +++++++++++++++++----- MultiTool.Form/frmConfig.resx | 12 +- MultiTool.Form/frmConfig.vb | 4 +- MultiTool.Form/frmImportMain.vb | 95 +++-- 7 files changed, 477 insertions(+), 179 deletions(-) diff --git a/MultiTool.Form/DS_DD_ECM.Designer.vb b/MultiTool.Form/DS_DD_ECM.Designer.vb index 35327d9..ce4f25e 100644 --- a/MultiTool.Form/DS_DD_ECM.Designer.vb +++ b/MultiTool.Form/DS_DD_ECM.Designer.vb @@ -511,6 +511,8 @@ Partial Public Class DS_DD_ECM Private columnTABLE_NAME As Global.System.Data.DataColumn + Private columnPREFER_EXTERNAL As Global.System.Data.DataColumn + _ Public Sub New() @@ -698,6 +700,14 @@ Partial Public Class DS_DD_ECM End Get End Property + _ + Public ReadOnly Property PREFER_EXTERNALColumn() As Global.System.Data.DataColumn + Get + Return Me.columnPREFER_EXTERNAL + End Get + End Property + _ @@ -753,9 +763,10 @@ Partial Public Class DS_DD_ECM ByVal ACTIVE As Boolean, _ ByVal COMMENT As String, _ ByVal TEMPLATE_NAME As String, _ - ByVal TABLE_NAME As String) As TBMT_TEMPLATE_ITEMSRow + ByVal TABLE_NAME As String, _ + ByVal PREFER_EXTERNAL As Boolean) As TBMT_TEMPLATE_ITEMSRow Dim rowTBMT_TEMPLATE_ITEMSRow As TBMT_TEMPLATE_ITEMSRow = CType(Me.NewRow,TBMT_TEMPLATE_ITEMSRow) - Dim columnValuesArray() As Object = New Object() {Nothing, XML_NAME, XML_TYPE_ID, IS_READ_ONLY, IS_VISIBLE, ORDER_KEY, FUNCTION_ID, IS_REQUIRED, XML_TABLE_ID, IS_VIRTUAL, FUNCTION_PARAMETERS, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, ACTIVE, COMMENT, TEMPLATE_NAME, TABLE_NAME} + Dim columnValuesArray() As Object = New Object() {Nothing, XML_NAME, XML_TYPE_ID, IS_READ_ONLY, IS_VISIBLE, ORDER_KEY, FUNCTION_ID, IS_REQUIRED, XML_TABLE_ID, IS_VIRTUAL, FUNCTION_PARAMETERS, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, ACTIVE, COMMENT, TEMPLATE_NAME, TABLE_NAME, PREFER_EXTERNAL} rowTBMT_TEMPLATE_ITEMSRow.ItemArray = columnValuesArray Me.Rows.Add(rowTBMT_TEMPLATE_ITEMSRow) Return rowTBMT_TEMPLATE_ITEMSRow @@ -803,6 +814,7 @@ Partial Public Class DS_DD_ECM Me.columnCOMMENT = MyBase.Columns("COMMENT") Me.columnTEMPLATE_NAME = MyBase.Columns("TEMPLATE_NAME") Me.columnTABLE_NAME = MyBase.Columns("TABLE_NAME") + Me.columnPREFER_EXTERNAL = MyBase.Columns("PREFER_EXTERNAL") End Sub _ + Public Property PREFER_EXTERNAL() As Boolean + Get + Return CType(Me(Me.tableTBMT_TEMPLATE_ITEMS.PREFER_EXTERNALColumn),Boolean) + End Get + Set + Me(Me.tableTBMT_TEMPLATE_ITEMS.PREFER_EXTERNALColumn) = value + End Set + End Property + _ Public Function IsFUNCTION_IDNull() As Boolean @@ -3779,6 +3805,7 @@ Namespace DS_DD_ECMTableAdapters tableMapping.ColumnMappings.Add("COMMENT", "COMMENT") tableMapping.ColumnMappings.Add("TEMPLATE_NAME", "TEMPLATE_NAME") tableMapping.ColumnMappings.Add("TABLE_NAME", "TABLE_NAME") + tableMapping.ColumnMappings.Add("PREFER_EXTERNAL", "PREFER_EXTERNAL") Me._adapter.TableMappings.Add(tableMapping) Me._adapter.DeleteCommand = New Global.System.Data.SqlClient.SqlCommand() Me._adapter.DeleteCommand.Connection = Me.Connection @@ -3819,10 +3846,11 @@ Namespace DS_DD_ECMTableAdapters "S_REQUIRED = @IS_REQUIRED, IS_VIRTUAL = @IS_VIRTUAL, FUNCTION_ID = @FUNCTION_ID,"& _ " FUNCTION_PARAMETERS = @FUNCTION_PARAMETERS, ADDED_WHO = @ADDED_WHO, ADDED_WHEN "& _ "= @ADDED_WHEN, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" CHANGED_WHO = @CHANGED_WHO, CHANGED_WH"& _ - "EN = @CHANGED_WHEN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUID = @Original_GUID); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, ORDER_K"& _ - "EY, XML_NAME, XML_TABLE_ID, XML_TYPE_ID, IS_READ_ONLY, IS_VISIBLE, IS_REQUIRED, "& _ - "IS_VIRTUAL, FUNCTION_ID, FUNCTION_PARAMETERS, ADDED_WHO, ADDED_WHEN, CHANGED_WHO"& _ - ", CHANGED_WHEN FROM TBMT_TEMPLATE_ITEMS WHERE (GUID = @GUID)" + "EN = @CHANGED_WHEN, PREFER_EXTERNAL = @PREFER_EXTERNAL, ACTIVE = @ACTIVE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE "& _ + " (GUID = @Original_GUID); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, ORDER_KEY, XML_NAME, XML_TABLE"& _ + "_ID, XML_TYPE_ID, IS_READ_ONLY, IS_VISIBLE, IS_REQUIRED, IS_VIRTUAL, FUNCTION_ID"& _ + ", FUNCTION_PARAMETERS, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBM"& _ + "T_TEMPLATE_ITEMS WHERE (GUID = @GUID)" Me._adapter.UpdateCommand.CommandType = Global.System.Data.CommandType.Text Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ORDER_KEY", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "ORDER_KEY", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@XML_NAME", Global.System.Data.SqlDbType.NVarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "XML_NAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) @@ -3838,6 +3866,8 @@ Namespace DS_DD_ECMTableAdapters Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHEN", Global.System.Data.SqlDbType.DateTime, 8, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHEN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_WHO", Global.System.Data.SqlDbType.NVarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_WHEN", Global.System.Data.SqlDbType.DateTime, 8, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHEN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PREFER_EXTERNAL", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "PREFER_EXTERNAL", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ACTIVE", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "ACTIVE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) End Sub @@ -3863,11 +3893,11 @@ Namespace DS_DD_ECMTableAdapters "TEMS.FUNCTION_PARAMETERS, TBMT_TEMPLATE_ITEMS.ACTIVE, TBMT_TEMPLATE_ITEMS.COMMEN"& _ "T, TBMT_TEMPLATE_ITEMS.ADDED_WHO, TBMT_TEMPLATE_ITEMS.ADDED_WHEN, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" "& _ " TBMT_TEMPLATE_ITEMS.CHANGED_WHO, TBMT_TEMPLATE_ITEMS.CHANGED_WHEN, "& _ - "TBTEMPLATES.NAME AS TEMPLATE_NAME, TBTABLES.NAME AS TABLE_NAME"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM "& _ - "TBMT_TEMPLATE_ITEMS INNER JOIN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" TBMT_TABLES AS TBTABLES"& _ - " ON TBMT_TEMPLATE_ITEMS.XML_TABLE_ID = TBTABLES.GUID INNER JOIN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" "& _ - " TBMT_TEMPLATES AS TBTEMPLATES ON TBTABLES.TEMPLATE_ID = TBTEMPLATES.GU"& _ - "ID" + "TBTEMPLATES.NAME AS TEMPLATE_NAME, TBTABLES.NAME AS TABLE_NAME, TBMT_TEMPLATE_IT"& _ + "EMS.PREFER_EXTERNAL"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM TBMT_TEMPLATE_ITEMS INNER JOIN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" "& _ + " TBMT_TABLES AS TBTABLES ON TBMT_TEMPLATE_ITEMS.XML_TABLE_ID = TBTA"& _ + "BLES.GUID INNER JOIN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" TBMT_TEMPLATES AS TBTEMPLATES ON "& _ + "TBTABLES.TEMPLATE_ID = TBTEMPLATES.GUID" Me._commandCollection(0).CommandType = Global.System.Data.CommandType.Text End Sub @@ -4025,6 +4055,8 @@ Namespace DS_DD_ECMTableAdapters ByVal ADDED_WHEN As Global.System.Nullable(Of Date), _ ByVal CHANGED_WHO As String, _ ByVal CHANGED_WHEN As Global.System.Nullable(Of Date), _ + ByVal PREFER_EXTERNAL As Boolean, _ + ByVal ACTIVE As Boolean, _ ByVal Original_GUID As Integer, _ ByVal GUID As Integer) As Integer Me.Adapter.UpdateCommand.Parameters(0).Value = CType(ORDER_KEY,Integer) @@ -4069,8 +4101,10 @@ Namespace DS_DD_ECMTableAdapters Else Me.Adapter.UpdateCommand.Parameters(13).Value = Global.System.DBNull.Value End If - Me.Adapter.UpdateCommand.Parameters(14).Value = CType(Original_GUID,Integer) - Me.Adapter.UpdateCommand.Parameters(15).Value = CType(GUID,Integer) + Me.Adapter.UpdateCommand.Parameters(14).Value = CType(PREFER_EXTERNAL,Boolean) + Me.Adapter.UpdateCommand.Parameters(15).Value = CType(ACTIVE,Boolean) + Me.Adapter.UpdateCommand.Parameters(16).Value = CType(Original_GUID,Integer) + Me.Adapter.UpdateCommand.Parameters(17).Value = CType(GUID,Integer) Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.UpdateCommand.Connection.State If ((Me.Adapter.UpdateCommand.Connection.State And Global.System.Data.ConnectionState.Open) _ <> Global.System.Data.ConnectionState.Open) Then diff --git a/MultiTool.Form/DS_DD_ECM.xsd b/MultiTool.Form/DS_DD_ECM.xsd index f0bc00c..072037a 100644 --- a/MultiTool.Form/DS_DD_ECM.xsd +++ b/MultiTool.Form/DS_DD_ECM.xsd @@ -46,7 +46,7 @@ SELECT GUID, ORDER_KEY, XML_NAME, XML_TABLE_ID, XML_TYPE_ID, IS_READ_ONLY, IS_VI SELECT TBMT_TEMPLATE_ITEMS.GUID, TBMT_TEMPLATE_ITEMS.ORDER_KEY, TBMT_TEMPLATE_ITEMS.XML_NAME, TBMT_TEMPLATE_ITEMS.XML_TABLE_ID, TBMT_TEMPLATE_ITEMS.XML_TYPE_ID, TBMT_TEMPLATE_ITEMS.IS_READ_ONLY, TBMT_TEMPLATE_ITEMS.IS_VISIBLE, TBMT_TEMPLATE_ITEMS.IS_REQUIRED, TBMT_TEMPLATE_ITEMS.IS_VIRTUAL, TBMT_TEMPLATE_ITEMS.FUNCTION_ID, TBMT_TEMPLATE_ITEMS.FUNCTION_PARAMETERS, TBMT_TEMPLATE_ITEMS.ACTIVE, TBMT_TEMPLATE_ITEMS.COMMENT, TBMT_TEMPLATE_ITEMS.ADDED_WHO, TBMT_TEMPLATE_ITEMS.ADDED_WHEN, - TBMT_TEMPLATE_ITEMS.CHANGED_WHO, TBMT_TEMPLATE_ITEMS.CHANGED_WHEN, TBTEMPLATES.NAME AS TEMPLATE_NAME, TBTABLES.NAME AS TABLE_NAME + TBMT_TEMPLATE_ITEMS.CHANGED_WHO, TBMT_TEMPLATE_ITEMS.CHANGED_WHEN, TBTEMPLATES.NAME AS TEMPLATE_NAME, TBTABLES.NAME AS TABLE_NAME, TBMT_TEMPLATE_ITEMS.PREFER_EXTERNAL FROM TBMT_TEMPLATE_ITEMS INNER JOIN TBMT_TABLES AS TBTABLES ON TBMT_TEMPLATE_ITEMS.XML_TABLE_ID = TBTABLES.GUID INNER JOIN TBMT_TEMPLATES AS TBTEMPLATES ON TBTABLES.TEMPLATE_ID = TBTEMPLATES.GUID @@ -54,30 +54,32 @@ FROM TBMT_TEMPLATE_ITEMS INNER JOIN - + UPDATE TBMT_TEMPLATE_ITEMS SET ORDER_KEY = @ORDER_KEY, XML_NAME = @XML_NAME, XML_TABLE_ID = @XML_TABLE_ID, XML_TYPE_ID = @XML_TYPE_ID, IS_READ_ONLY = @IS_READ_ONLY, IS_VISIBLE = @IS_VISIBLE, IS_REQUIRED = @IS_REQUIRED, IS_VIRTUAL = @IS_VIRTUAL, FUNCTION_ID = @FUNCTION_ID, FUNCTION_PARAMETERS = @FUNCTION_PARAMETERS, ADDED_WHO = @ADDED_WHO, ADDED_WHEN = @ADDED_WHEN, - CHANGED_WHO = @CHANGED_WHO, CHANGED_WHEN = @CHANGED_WHEN -WHERE (GUID = @Original_GUID); + CHANGED_WHO = @CHANGED_WHO, CHANGED_WHEN = @CHANGED_WHEN, PREFER_EXTERNAL = @PREFER_EXTERNAL, ACTIVE = @ACTIVE +WHERE (GUID = @Original_GUID); SELECT GUID, ORDER_KEY, XML_NAME, XML_TABLE_ID, XML_TYPE_ID, IS_READ_ONLY, IS_VISIBLE, IS_REQUIRED, IS_VIRTUAL, FUNCTION_ID, FUNCTION_PARAMETERS, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBMT_TEMPLATE_ITEMS WHERE (GUID = @GUID) - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + @@ -103,6 +105,7 @@ SELECT GUID, ORDER_KEY, XML_NAME, XML_TABLE_ID, XML_TYPE_ID, IS_READ_ONLY, IS_VI + @@ -402,7 +405,7 @@ WHERE (TEMPLATE_ID IS NULL) - + @@ -466,10 +469,11 @@ WHERE (TEMPLATE_ID IS NULL) + - + @@ -483,7 +487,7 @@ WHERE (TEMPLATE_ID IS NULL) - + @@ -504,7 +508,7 @@ WHERE (TEMPLATE_ID IS NULL) - + @@ -520,7 +524,7 @@ WHERE (TEMPLATE_ID IS NULL) - + @@ -548,7 +552,7 @@ WHERE (TEMPLATE_ID IS NULL) - + @@ -623,9 +627,9 @@ WHERE (TEMPLATE_ID IS NULL) - - - + + + \ No newline at end of file diff --git a/MultiTool.Form/My Project/AssemblyInfo.vb b/MultiTool.Form/My Project/AssemblyInfo.vb index dbe60c9..1730748 100644 --- a/MultiTool.Form/My Project/AssemblyInfo.vb +++ b/MultiTool.Form/My Project/AssemblyInfo.vb @@ -13,7 +13,7 @@ Imports System.Runtime.InteropServices - + @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' indem Sie "*" wie unten gezeigt eingeben: ' - + diff --git a/MultiTool.Form/frmConfig.Designer.vb b/MultiTool.Form/frmConfig.Designer.vb index 47a16c8..cbaaf90 100644 --- a/MultiTool.Form/frmConfig.Designer.vb +++ b/MultiTool.Form/frmConfig.Designer.vb @@ -32,6 +32,7 @@ Partial Class frmConfig Me.DS_DD_ECM = New MultiTool.Form.DS_DD_ECM() Me.GridViewSchema = New DevExpress.XtraGrid.Views.Grid.GridView() Me.colGUID = New DevExpress.XtraGrid.Columns.GridColumn() + Me.colACTIVE2 = New DevExpress.XtraGrid.Columns.GridColumn() Me.colXML_NAME = New DevExpress.XtraGrid.Columns.GridColumn() Me.colXML_TYPE_ID = New DevExpress.XtraGrid.Columns.GridColumn() Me.colIS_READ_ONLY = New DevExpress.XtraGrid.Columns.GridColumn() @@ -43,6 +44,7 @@ Partial Class frmConfig Me.colFUNCTION_ID = New DevExpress.XtraGrid.Columns.GridColumn() Me.colFUNCTION_PARAMETERS = New DevExpress.XtraGrid.Columns.GridColumn() Me.RepositoryItemMemoExEdit1 = New DevExpress.XtraEditors.Repository.RepositoryItemMemoExEdit() + Me.colPREFER_EXTERNAL = New DevExpress.XtraGrid.Columns.GridColumn() Me.colXML_TABLE_ID = New DevExpress.XtraGrid.Columns.GridColumn() Me.colADDED_WHO1 = New DevExpress.XtraGrid.Columns.GridColumn() Me.colADDED_WHEN1 = New DevExpress.XtraGrid.Columns.GridColumn() @@ -51,6 +53,26 @@ Partial Class frmConfig Me.colTABLE_NAME = New DevExpress.XtraGrid.Columns.GridColumn() Me.colTEMPLATE_NAME = New DevExpress.XtraGrid.Columns.GridColumn() Me.RepositoryItemMemoEdit1 = New DevExpress.XtraEditors.Repository.RepositoryItemMemoEdit() + Me.SidePanel1 = New DevExpress.XtraEditors.SidePanel() + Me.LayoutControl2 = New DevExpress.XtraLayout.LayoutControl() + Me.CheckEdit1 = New DevExpress.XtraEditors.CheckEdit() + Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl() + Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItem3 = New DevExpress.XtraBars.BarButtonItem() + Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() + Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() + Me.CheckEdit2 = New DevExpress.XtraEditors.CheckEdit() + Me.CheckEdit3 = New DevExpress.XtraEditors.CheckEdit() + Me.CheckEdit4 = New DevExpress.XtraEditors.CheckEdit() + Me.CheckEdit5 = New DevExpress.XtraEditors.CheckEdit() + Me.LayoutControlGroup4 = New DevExpress.XtraLayout.LayoutControlGroup() + Me.LayoutControlItem7 = New DevExpress.XtraLayout.LayoutControlItem() + Me.LayoutControlItem8 = New DevExpress.XtraLayout.LayoutControlItem() + Me.LayoutControlItem9 = New DevExpress.XtraLayout.LayoutControlItem() + Me.LayoutControlItem10 = New DevExpress.XtraLayout.LayoutControlItem() + Me.LayoutControlItem11 = New DevExpress.XtraLayout.LayoutControlItem() Me.tabPageConfig = New DevExpress.XtraTab.XtraTabPage() Me.GridConfig = New DevExpress.XtraGrid.GridControl() Me.TBMT_CONFIGBindingSource = New System.Windows.Forms.BindingSource(Me.components) @@ -65,13 +87,6 @@ Partial Class frmConfig Me.colCOMMENT = New DevExpress.XtraGrid.Columns.GridColumn() Me.colACTIVE = New DevExpress.XtraGrid.Columns.GridColumn() Me.colTEMPLATE_ID = New DevExpress.XtraGrid.Columns.GridColumn() - Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl() - Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() - Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem() - Me.BarButtonItem3 = New DevExpress.XtraBars.BarButtonItem() - Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() - Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() - Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() Me.LayoutControl1 = New DevExpress.XtraLayout.LayoutControl() Me.txtYearOverride = New DevExpress.XtraEditors.TextEdit() Me.txtWebserviceBaseurl = New DevExpress.XtraEditors.TextEdit() @@ -94,6 +109,9 @@ Partial Class frmConfig Me.TBMT_TEMPLATE_ITEMSTableAdapter = New MultiTool.Form.DS_DD_ECMTableAdapters.TBMT_TEMPLATE_ITEMSTableAdapter() Me.TBMT_CONFIGTableAdapter = New MultiTool.Form.DS_DD_ECMTableAdapters.TBMT_CONFIGTableAdapter() Me.TableAdapterManager = New MultiTool.Form.DS_DD_ECMTableAdapters.TableAdapterManager() + Me.CheckEdit6 = New DevExpress.XtraEditors.CheckEdit() + Me.LayoutControlItem12 = New DevExpress.XtraLayout.LayoutControlItem() + Me.SimpleLabelItem1 = New DevExpress.XtraLayout.SimpleLabelItem() CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).BeginInit() Me.XtraTabControl1.SuspendLayout() Me.tabPageSchema.SuspendLayout() @@ -104,11 +122,25 @@ Partial Class frmConfig CType(Me.RepositoryItemSpinEdit1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.RepositoryItemMemoExEdit1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.RepositoryItemMemoEdit1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SidePanel1.SuspendLayout() + CType(Me.LayoutControl2, System.ComponentModel.ISupportInitialize).BeginInit() + Me.LayoutControl2.SuspendLayout() + CType(Me.CheckEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.CheckEdit2.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.CheckEdit3.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.CheckEdit4.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.CheckEdit5.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlGroup4, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem7, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem8, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem9, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem10, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem11, System.ComponentModel.ISupportInitialize).BeginInit() Me.tabPageConfig.SuspendLayout() CType(Me.GridConfig, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBMT_CONFIGBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridViewConfig, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).BeginInit() Me.LayoutControl1.SuspendLayout() CType(Me.txtYearOverride.Properties, System.ComponentModel.ISupportInitialize).BeginInit() @@ -128,6 +160,9 @@ Partial Class frmConfig CType(Me.LayoutControlItem5, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem6, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.EmptySpaceItem1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.CheckEdit6.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem12, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.SimpleLabelItem1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'XtraTabControl1 @@ -143,6 +178,7 @@ Partial Class frmConfig 'tabPageSchema ' Me.tabPageSchema.Controls.Add(Me.GridSchema) + Me.tabPageSchema.Controls.Add(Me.SidePanel1) Me.tabPageSchema.Name = "tabPageSchema" Me.tabPageSchema.Size = New System.Drawing.Size(1130, 582) Me.tabPageSchema.Text = "Schema" @@ -155,7 +191,7 @@ Partial Class frmConfig Me.GridSchema.MainView = Me.GridViewSchema Me.GridSchema.Name = "GridSchema" Me.GridSchema.RepositoryItems.AddRange(New DevExpress.XtraEditors.Repository.RepositoryItem() {Me.RepositoryItemMemoEdit1, Me.RepositoryItemSpinEdit1, Me.RepositoryItemMemoExEdit1}) - Me.GridSchema.Size = New System.Drawing.Size(1130, 582) + Me.GridSchema.Size = New System.Drawing.Size(796, 582) Me.GridSchema.TabIndex = 0 Me.GridSchema.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewSchema}) ' @@ -171,7 +207,7 @@ Partial Class frmConfig ' 'GridViewSchema ' - Me.GridViewSchema.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colGUID, Me.colXML_NAME, Me.colXML_TYPE_ID, Me.colIS_READ_ONLY, Me.colIS_VISIBLE, Me.colORDER_KEY, Me.colIS_REQUIRED, Me.colIS_VIRTUAL, Me.colFUNCTION_ID, Me.colFUNCTION_PARAMETERS, Me.colXML_TABLE_ID, Me.colADDED_WHO1, Me.colADDED_WHEN1, Me.colCHANGED_WHO1, Me.colCHANGED_WHEN1, Me.colTABLE_NAME, Me.colTEMPLATE_NAME}) + Me.GridViewSchema.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colGUID, Me.colACTIVE2, Me.colXML_NAME, Me.colXML_TYPE_ID, Me.colIS_READ_ONLY, Me.colIS_VISIBLE, Me.colORDER_KEY, Me.colIS_REQUIRED, Me.colIS_VIRTUAL, Me.colFUNCTION_ID, Me.colFUNCTION_PARAMETERS, Me.colPREFER_EXTERNAL, Me.colXML_TABLE_ID, Me.colADDED_WHO1, Me.colADDED_WHEN1, Me.colCHANGED_WHO1, Me.colCHANGED_WHEN1, Me.colTABLE_NAME, Me.colTEMPLATE_NAME}) Me.GridViewSchema.GridControl = Me.GridSchema Me.GridViewSchema.GroupCount = 2 Me.GridViewSchema.Name = "GridViewSchema" @@ -182,12 +218,17 @@ Partial Class frmConfig Me.colGUID.FieldName = "GUID" Me.colGUID.Name = "colGUID" ' + 'colACTIVE2 + ' + Me.colACTIVE2.Caption = "Aktiv" + Me.colACTIVE2.FieldName = "ACTIVE" + Me.colACTIVE2.Name = "colACTIVE2" + ' 'colXML_NAME ' Me.colXML_NAME.Caption = "Name" Me.colXML_NAME.FieldName = "XML_NAME" - Me.colXML_NAME.MaxWidth = 120 - Me.colXML_NAME.MinWidth = 100 + Me.colXML_NAME.MinWidth = 10 Me.colXML_NAME.Name = "colXML_NAME" Me.colXML_NAME.Visible = True Me.colXML_NAME.VisibleIndex = 0 @@ -197,30 +238,23 @@ Partial Class frmConfig ' Me.colXML_TYPE_ID.Caption = "Typ" Me.colXML_TYPE_ID.FieldName = "XML_TYPE_ID" - Me.colXML_TYPE_ID.MaxWidth = 80 Me.colXML_TYPE_ID.Name = "colXML_TYPE_ID" Me.colXML_TYPE_ID.Visible = True - Me.colXML_TYPE_ID.VisibleIndex = 1 + Me.colXML_TYPE_ID.VisibleIndex = 2 Me.colXML_TYPE_ID.Width = 55 ' 'colIS_READ_ONLY ' Me.colIS_READ_ONLY.Caption = "Read Only" Me.colIS_READ_ONLY.FieldName = "IS_READ_ONLY" - Me.colIS_READ_ONLY.MaxWidth = 80 Me.colIS_READ_ONLY.Name = "colIS_READ_ONLY" - Me.colIS_READ_ONLY.Visible = True - Me.colIS_READ_ONLY.VisibleIndex = 2 Me.colIS_READ_ONLY.Width = 80 ' 'colIS_VISIBLE ' Me.colIS_VISIBLE.Caption = "Sichtbar" Me.colIS_VISIBLE.FieldName = "IS_VISIBLE" - Me.colIS_VISIBLE.MaxWidth = 80 Me.colIS_VISIBLE.Name = "colIS_VISIBLE" - Me.colIS_VISIBLE.Visible = True - Me.colIS_VISIBLE.VisibleIndex = 3 Me.colIS_VISIBLE.Width = 80 ' 'colORDER_KEY @@ -228,10 +262,9 @@ Partial Class frmConfig Me.colORDER_KEY.Caption = "Sortierung" Me.colORDER_KEY.ColumnEdit = Me.RepositoryItemSpinEdit1 Me.colORDER_KEY.FieldName = "ORDER_KEY" - Me.colORDER_KEY.MaxWidth = 80 Me.colORDER_KEY.Name = "colORDER_KEY" Me.colORDER_KEY.Visible = True - Me.colORDER_KEY.VisibleIndex = 6 + Me.colORDER_KEY.VisibleIndex = 2 Me.colORDER_KEY.Width = 80 ' 'RepositoryItemSpinEdit1 @@ -244,30 +277,23 @@ Partial Class frmConfig ' Me.colIS_REQUIRED.Caption = "Pflichtfeld" Me.colIS_REQUIRED.FieldName = "IS_REQUIRED" - Me.colIS_REQUIRED.MaxWidth = 80 Me.colIS_REQUIRED.Name = "colIS_REQUIRED" - Me.colIS_REQUIRED.Visible = True - Me.colIS_REQUIRED.VisibleIndex = 4 Me.colIS_REQUIRED.Width = 80 ' 'colIS_VIRTUAL ' Me.colIS_VIRTUAL.Caption = "Virtuell" Me.colIS_VIRTUAL.FieldName = "IS_VIRTUAL" - Me.colIS_VIRTUAL.MaxWidth = 80 Me.colIS_VIRTUAL.Name = "colIS_VIRTUAL" - Me.colIS_VIRTUAL.Visible = True - Me.colIS_VIRTUAL.VisibleIndex = 5 Me.colIS_VIRTUAL.Width = 80 ' 'colFUNCTION_ID ' Me.colFUNCTION_ID.Caption = "Funktion" Me.colFUNCTION_ID.FieldName = "FUNCTION_ID" - Me.colFUNCTION_ID.MaxWidth = 80 Me.colFUNCTION_ID.Name = "colFUNCTION_ID" Me.colFUNCTION_ID.Visible = True - Me.colFUNCTION_ID.VisibleIndex = 7 + Me.colFUNCTION_ID.VisibleIndex = 9 Me.colFUNCTION_ID.Width = 80 ' 'colFUNCTION_PARAMETERS @@ -277,7 +303,7 @@ Partial Class frmConfig Me.colFUNCTION_PARAMETERS.FieldName = "FUNCTION_PARAMETERS" Me.colFUNCTION_PARAMETERS.Name = "colFUNCTION_PARAMETERS" Me.colFUNCTION_PARAMETERS.Visible = True - Me.colFUNCTION_PARAMETERS.VisibleIndex = 8 + Me.colFUNCTION_PARAMETERS.VisibleIndex = 5 Me.colFUNCTION_PARAMETERS.Width = 401 ' 'RepositoryItemMemoExEdit1 @@ -286,6 +312,14 @@ Partial Class frmConfig Me.RepositoryItemMemoExEdit1.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) Me.RepositoryItemMemoExEdit1.Name = "RepositoryItemMemoExEdit1" ' + 'colPREFER_EXTERNAL + ' + Me.colPREFER_EXTERNAL.Caption = "Extern Bevorzugen" + Me.colPREFER_EXTERNAL.FieldName = "PREFER_EXTERNAL" + Me.colPREFER_EXTERNAL.Name = "colPREFER_EXTERNAL" + Me.colPREFER_EXTERNAL.Visible = True + Me.colPREFER_EXTERNAL.VisibleIndex = 8 + ' 'colXML_TABLE_ID ' Me.colXML_TABLE_ID.FieldName = "XML_TABLE_ID" @@ -332,6 +366,204 @@ Partial Class frmConfig Me.RepositoryItemMemoEdit1.LinesCount = 5 Me.RepositoryItemMemoEdit1.Name = "RepositoryItemMemoEdit1" ' + 'SidePanel1 + ' + Me.SidePanel1.Controls.Add(Me.LayoutControl2) + Me.SidePanel1.Dock = System.Windows.Forms.DockStyle.Right + Me.SidePanel1.Location = New System.Drawing.Point(796, 0) + Me.SidePanel1.Name = "SidePanel1" + Me.SidePanel1.Size = New System.Drawing.Size(334, 582) + Me.SidePanel1.TabIndex = 2 + Me.SidePanel1.Text = "SidePanel1" + ' + 'LayoutControl2 + ' + Me.LayoutControl2.Controls.Add(Me.CheckEdit1) + Me.LayoutControl2.Controls.Add(Me.CheckEdit2) + Me.LayoutControl2.Controls.Add(Me.CheckEdit3) + Me.LayoutControl2.Controls.Add(Me.CheckEdit4) + Me.LayoutControl2.Controls.Add(Me.CheckEdit5) + Me.LayoutControl2.Controls.Add(Me.CheckEdit6) + Me.LayoutControl2.Dock = System.Windows.Forms.DockStyle.Fill + Me.LayoutControl2.Location = New System.Drawing.Point(1, 0) + Me.LayoutControl2.Name = "LayoutControl2" + Me.LayoutControl2.Root = Me.LayoutControlGroup4 + Me.LayoutControl2.Size = New System.Drawing.Size(333, 582) + Me.LayoutControl2.TabIndex = 0 + Me.LayoutControl2.Text = "LayoutControl2" + ' + 'CheckEdit1 + ' + Me.CheckEdit1.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBEDIXMLITEMSBindingSource, "ACTIVE", True)) + Me.CheckEdit1.Location = New System.Drawing.Point(20, 53) + Me.CheckEdit1.MenuManager = Me.RibbonControl1 + Me.CheckEdit1.Name = "CheckEdit1" + Me.CheckEdit1.Properties.Caption = "Aktiv" + Me.CheckEdit1.Size = New System.Drawing.Size(293, 20) + Me.CheckEdit1.StyleController = Me.LayoutControl2 + Me.CheckEdit1.TabIndex = 4 + ' + 'RibbonControl1 + ' + Me.RibbonControl1.CommandLayout = DevExpress.XtraBars.Ribbon.CommandLayout.Simplified + Me.RibbonControl1.ExpandCollapseItem.Id = 0 + Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItem1, Me.BarButtonItem2, Me.BarButtonItem3}) + Me.RibbonControl1.Location = New System.Drawing.Point(0, 0) + Me.RibbonControl1.MaxItemId = 4 + Me.RibbonControl1.Name = "RibbonControl1" + Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) + Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] + Me.RibbonControl1.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.Hide + Me.RibbonControl1.ShowToolbarCustomizeItem = False + Me.RibbonControl1.Size = New System.Drawing.Size(1132, 63) + Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 + Me.RibbonControl1.Toolbar.ShowCustomizeItem = False + ' + 'BarButtonItem1 + ' + Me.BarButtonItem1.Caption = "Speichern" + Me.BarButtonItem1.Id = 1 + Me.BarButtonItem1.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.BarButtonItem1.Name = "BarButtonItem1" + ' + 'BarButtonItem2 + ' + Me.BarButtonItem2.Caption = "Neuer Eintrag" + Me.BarButtonItem2.Id = 2 + Me.BarButtonItem2.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.actions_addcircled + Me.BarButtonItem2.Name = "BarButtonItem2" + ' + 'BarButtonItem3 + ' + Me.BarButtonItem3.Caption = "Eintrag löschen" + Me.BarButtonItem3.Id = 3 + Me.BarButtonItem3.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.actions_deletecircled1 + Me.BarButtonItem3.Name = "BarButtonItem3" + ' + 'RibbonPage1 + ' + Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1}) + Me.RibbonPage1.Name = "RibbonPage1" + Me.RibbonPage1.Text = "Start" + ' + 'RibbonPageGroup1 + ' + Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem2) + Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem1) + Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem3) + Me.RibbonPageGroup1.Name = "RibbonPageGroup1" + Me.RibbonPageGroup1.Text = "RibbonPageGroup1" + ' + 'RibbonStatusBar1 + ' + Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 670) + Me.RibbonStatusBar1.Name = "RibbonStatusBar1" + Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1 + Me.RibbonStatusBar1.Size = New System.Drawing.Size(1132, 24) + ' + 'CheckEdit2 + ' + Me.CheckEdit2.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBEDIXMLITEMSBindingSource, "IS_READ_ONLY", True)) + Me.CheckEdit2.Location = New System.Drawing.Point(20, 93) + Me.CheckEdit2.MenuManager = Me.RibbonControl1 + Me.CheckEdit2.Name = "CheckEdit2" + Me.CheckEdit2.Properties.Caption = "Read-Only" + Me.CheckEdit2.Size = New System.Drawing.Size(293, 20) + Me.CheckEdit2.StyleController = Me.LayoutControl2 + Me.CheckEdit2.TabIndex = 5 + ' + 'CheckEdit3 + ' + Me.CheckEdit3.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBEDIXMLITEMSBindingSource, "IS_VISIBLE", True)) + Me.CheckEdit3.Location = New System.Drawing.Point(20, 133) + Me.CheckEdit3.MenuManager = Me.RibbonControl1 + Me.CheckEdit3.Name = "CheckEdit3" + Me.CheckEdit3.Properties.Caption = "Sichbar" + Me.CheckEdit3.Size = New System.Drawing.Size(293, 20) + Me.CheckEdit3.StyleController = Me.LayoutControl2 + Me.CheckEdit3.TabIndex = 6 + ' + 'CheckEdit4 + ' + Me.CheckEdit4.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBEDIXMLITEMSBindingSource, "IS_REQUIRED", True)) + Me.CheckEdit4.Location = New System.Drawing.Point(20, 173) + Me.CheckEdit4.MenuManager = Me.RibbonControl1 + Me.CheckEdit4.Name = "CheckEdit4" + Me.CheckEdit4.Properties.Caption = "Pflichtfeld" + Me.CheckEdit4.Size = New System.Drawing.Size(293, 20) + Me.CheckEdit4.StyleController = Me.LayoutControl2 + Me.CheckEdit4.TabIndex = 7 + ' + 'CheckEdit5 + ' + Me.CheckEdit5.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBEDIXMLITEMSBindingSource, "PREFER_EXTERNAL", True)) + Me.CheckEdit5.Location = New System.Drawing.Point(20, 213) + Me.CheckEdit5.MenuManager = Me.RibbonControl1 + Me.CheckEdit5.Name = "CheckEdit5" + Me.CheckEdit5.Properties.Caption = "Externen Wert bevorzugen" + Me.CheckEdit5.Size = New System.Drawing.Size(293, 20) + Me.CheckEdit5.StyleController = Me.LayoutControl2 + Me.CheckEdit5.TabIndex = 8 + ' + 'LayoutControlGroup4 + ' + Me.LayoutControlGroup4.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True] + Me.LayoutControlGroup4.GroupBordersVisible = False + Me.LayoutControlGroup4.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem7, Me.LayoutControlItem8, Me.LayoutControlItem9, Me.LayoutControlItem10, Me.LayoutControlItem11, Me.LayoutControlItem12, Me.SimpleLabelItem1}) + Me.LayoutControlGroup4.Name = "LayoutControlGroup4" + Me.LayoutControlGroup4.Size = New System.Drawing.Size(333, 582) + Me.LayoutControlGroup4.TextVisible = False + ' + 'LayoutControlItem7 + ' + Me.LayoutControlItem7.Control = Me.CheckEdit1 + Me.LayoutControlItem7.Location = New System.Drawing.Point(0, 33) + Me.LayoutControlItem7.Name = "LayoutControlItem7" + Me.LayoutControlItem7.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) + Me.LayoutControlItem7.Size = New System.Drawing.Size(313, 40) + Me.LayoutControlItem7.TextSize = New System.Drawing.Size(0, 0) + Me.LayoutControlItem7.TextVisible = False + ' + 'LayoutControlItem8 + ' + Me.LayoutControlItem8.Control = Me.CheckEdit2 + Me.LayoutControlItem8.Location = New System.Drawing.Point(0, 73) + Me.LayoutControlItem8.Name = "LayoutControlItem8" + Me.LayoutControlItem8.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) + Me.LayoutControlItem8.Size = New System.Drawing.Size(313, 40) + Me.LayoutControlItem8.TextSize = New System.Drawing.Size(0, 0) + Me.LayoutControlItem8.TextVisible = False + ' + 'LayoutControlItem9 + ' + Me.LayoutControlItem9.Control = Me.CheckEdit3 + Me.LayoutControlItem9.Location = New System.Drawing.Point(0, 113) + Me.LayoutControlItem9.Name = "LayoutControlItem9" + Me.LayoutControlItem9.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) + Me.LayoutControlItem9.Size = New System.Drawing.Size(313, 40) + Me.LayoutControlItem9.TextSize = New System.Drawing.Size(0, 0) + Me.LayoutControlItem9.TextVisible = False + ' + 'LayoutControlItem10 + ' + Me.LayoutControlItem10.Control = Me.CheckEdit4 + Me.LayoutControlItem10.Location = New System.Drawing.Point(0, 153) + Me.LayoutControlItem10.Name = "LayoutControlItem10" + Me.LayoutControlItem10.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) + Me.LayoutControlItem10.Size = New System.Drawing.Size(313, 40) + Me.LayoutControlItem10.TextSize = New System.Drawing.Size(0, 0) + Me.LayoutControlItem10.TextVisible = False + ' + 'LayoutControlItem11 + ' + Me.LayoutControlItem11.Control = Me.CheckEdit5 + Me.LayoutControlItem11.Location = New System.Drawing.Point(0, 193) + Me.LayoutControlItem11.Name = "LayoutControlItem11" + Me.LayoutControlItem11.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) + Me.LayoutControlItem11.Size = New System.Drawing.Size(313, 40) + Me.LayoutControlItem11.TextSize = New System.Drawing.Size(0, 0) + Me.LayoutControlItem11.TextVisible = False + ' 'tabPageConfig ' Me.tabPageConfig.Controls.Add(Me.GridConfig) @@ -435,64 +667,6 @@ Partial Class frmConfig Me.colTEMPLATE_ID.VisibleIndex = 3 Me.colTEMPLATE_ID.Width = 87 ' - 'RibbonControl1 - ' - Me.RibbonControl1.CommandLayout = DevExpress.XtraBars.Ribbon.CommandLayout.Simplified - Me.RibbonControl1.ExpandCollapseItem.Id = 0 - Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItem1, Me.BarButtonItem2, Me.BarButtonItem3}) - Me.RibbonControl1.Location = New System.Drawing.Point(0, 0) - Me.RibbonControl1.MaxItemId = 4 - Me.RibbonControl1.Name = "RibbonControl1" - Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) - Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] - Me.RibbonControl1.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.Hide - Me.RibbonControl1.ShowToolbarCustomizeItem = False - Me.RibbonControl1.Size = New System.Drawing.Size(1132, 63) - Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 - Me.RibbonControl1.Toolbar.ShowCustomizeItem = False - ' - 'BarButtonItem1 - ' - Me.BarButtonItem1.Caption = "Speichern" - Me.BarButtonItem1.Id = 1 - Me.BarButtonItem1.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) - Me.BarButtonItem1.Name = "BarButtonItem1" - ' - 'BarButtonItem2 - ' - Me.BarButtonItem2.Caption = "Neuer Eintrag" - Me.BarButtonItem2.Id = 2 - Me.BarButtonItem2.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.actions_addcircled - Me.BarButtonItem2.Name = "BarButtonItem2" - ' - 'BarButtonItem3 - ' - Me.BarButtonItem3.Caption = "Eintrag löschen" - Me.BarButtonItem3.Id = 3 - Me.BarButtonItem3.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.actions_deletecircled1 - Me.BarButtonItem3.Name = "BarButtonItem3" - ' - 'RibbonPage1 - ' - Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1}) - Me.RibbonPage1.Name = "RibbonPage1" - Me.RibbonPage1.Text = "Start" - ' - 'RibbonPageGroup1 - ' - Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem2) - Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem1) - Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem3) - Me.RibbonPageGroup1.Name = "RibbonPageGroup1" - Me.RibbonPageGroup1.Text = "RibbonPageGroup1" - ' - 'RibbonStatusBar1 - ' - Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 670) - Me.RibbonStatusBar1.Name = "RibbonStatusBar1" - Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1 - Me.RibbonStatusBar1.Size = New System.Drawing.Size(1132, 24) - ' 'LayoutControl1 ' Me.LayoutControl1.Controls.Add(Me.txtYearOverride) @@ -683,6 +857,36 @@ Partial Class frmConfig Me.TableAdapterManager.TBMT_TEMPLATESTableAdapter = Nothing Me.TableAdapterManager.UpdateOrder = MultiTool.Form.DS_DD_ECMTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete ' + 'CheckEdit6 + ' + Me.CheckEdit6.Location = New System.Drawing.Point(20, 253) + Me.CheckEdit6.MenuManager = Me.RibbonControl1 + Me.CheckEdit6.Name = "CheckEdit6" + Me.CheckEdit6.Properties.Caption = "Virtuell" + Me.CheckEdit6.Size = New System.Drawing.Size(293, 20) + Me.CheckEdit6.StyleController = Me.LayoutControl2 + Me.CheckEdit6.TabIndex = 9 + ' + 'LayoutControlItem12 + ' + Me.LayoutControlItem12.Control = Me.CheckEdit6 + Me.LayoutControlItem12.Location = New System.Drawing.Point(0, 233) + Me.LayoutControlItem12.Name = "LayoutControlItem12" + Me.LayoutControlItem12.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) + Me.LayoutControlItem12.Size = New System.Drawing.Size(313, 329) + Me.LayoutControlItem12.TextSize = New System.Drawing.Size(0, 0) + Me.LayoutControlItem12.TextVisible = False + ' + 'SimpleLabelItem1 + ' + Me.SimpleLabelItem1.AllowHotTrack = False + Me.SimpleLabelItem1.Location = New System.Drawing.Point(0, 0) + Me.SimpleLabelItem1.Name = "SimpleLabelItem1" + Me.SimpleLabelItem1.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) + Me.SimpleLabelItem1.Size = New System.Drawing.Size(313, 33) + Me.SimpleLabelItem1.Text = "Weitere Einstellungen" + Me.SimpleLabelItem1.TextSize = New System.Drawing.Size(114, 13) + ' 'frmConfig ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -706,11 +910,25 @@ Partial Class frmConfig CType(Me.RepositoryItemSpinEdit1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.RepositoryItemMemoExEdit1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.RepositoryItemMemoEdit1, System.ComponentModel.ISupportInitialize).EndInit() + Me.SidePanel1.ResumeLayout(False) + CType(Me.LayoutControl2, System.ComponentModel.ISupportInitialize).EndInit() + Me.LayoutControl2.ResumeLayout(False) + CType(Me.CheckEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.CheckEdit2.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.CheckEdit3.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.CheckEdit4.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.CheckEdit5.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlGroup4, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem7, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem8, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem9, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem10, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem11, System.ComponentModel.ISupportInitialize).EndInit() Me.tabPageConfig.ResumeLayout(False) CType(Me.GridConfig, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TBMT_CONFIGBindingSource, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.GridViewConfig, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).EndInit() Me.LayoutControl1.ResumeLayout(False) CType(Me.txtYearOverride.Properties, System.ComponentModel.ISupportInitialize).EndInit() @@ -730,6 +948,9 @@ Partial Class frmConfig CType(Me.LayoutControlItem5, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem6, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.EmptySpaceItem1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.CheckEdit6.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem12, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.SimpleLabelItem1, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -803,4 +1024,22 @@ Partial Class frmConfig Friend WithEvents RepositoryItemSpinEdit1 As Repository.RepositoryItemSpinEdit Friend WithEvents RepositoryItemMemoEdit1 As Repository.RepositoryItemMemoEdit Friend WithEvents RepositoryItemMemoExEdit1 As Repository.RepositoryItemMemoExEdit + Friend WithEvents colACTIVE2 As DevExpress.XtraGrid.Columns.GridColumn + Friend WithEvents colPREFER_EXTERNAL As DevExpress.XtraGrid.Columns.GridColumn + Friend WithEvents SidePanel1 As SidePanel + Friend WithEvents LayoutControl2 As LayoutControl + Friend WithEvents CheckEdit1 As CheckEdit + Friend WithEvents CheckEdit2 As CheckEdit + Friend WithEvents CheckEdit3 As CheckEdit + Friend WithEvents CheckEdit4 As CheckEdit + Friend WithEvents CheckEdit5 As CheckEdit + Friend WithEvents LayoutControlGroup4 As LayoutControlGroup + Friend WithEvents LayoutControlItem7 As LayoutControlItem + Friend WithEvents LayoutControlItem8 As LayoutControlItem + Friend WithEvents LayoutControlItem9 As LayoutControlItem + Friend WithEvents LayoutControlItem10 As LayoutControlItem + Friend WithEvents LayoutControlItem11 As LayoutControlItem + Friend WithEvents CheckEdit6 As CheckEdit + Friend WithEvents LayoutControlItem12 As LayoutControlItem + Friend WithEvents SimpleLabelItem1 As SimpleLabelItem End Class diff --git a/MultiTool.Form/frmConfig.resx b/MultiTool.Form/frmConfig.resx index daad873..4b0f83e 100644 --- a/MultiTool.Form/frmConfig.resx +++ b/MultiTool.Form/frmConfig.resx @@ -123,12 +123,6 @@ 194, 17 - - 194, 17 - - - 758, 17 - @@ -146,6 +140,12 @@ IC8+DQo8L3N2Zz4L + + 194, 17 + + + 758, 17 + 533, 17 diff --git a/MultiTool.Form/frmConfig.vb b/MultiTool.Form/frmConfig.vb index 88dd627..247db12 100644 --- a/MultiTool.Form/frmConfig.vb +++ b/MultiTool.Form/frmConfig.vb @@ -15,13 +15,13 @@ Public Class frmConfig Private View As GridView = GridViewSchema - Private ReadOnly Property Config As MultiTool.Common.Config + Private ReadOnly Property Config As Common.Config Get Return ConfigManager?.Config End Get End Property - Public Sub New(pLogConfig As LogConfig, pConfigManager As ConfigManager(Of MultiTool.Common.Config)) + Public Sub New(pLogConfig As LogConfig, pConfigManager As ConfigManager(Of Common.Config)) ' Dieser Aufruf ist für den Designer erforderlich. InitializeComponent() diff --git a/MultiTool.Form/frmImportMain.vb b/MultiTool.Form/frmImportMain.vb index aa24f2e..a91ed26 100644 --- a/MultiTool.Form/frmImportMain.vb +++ b/MultiTool.Form/frmImportMain.vb @@ -39,6 +39,7 @@ Public Class frmImportMain Private CurrentGrid As GridControl = Nothing Private CurrentDocument As Document = Nothing Private CurrentDocumentReadOnly As Boolean = False + Private FilesLoading As Boolean = False Public Sub New(pLogConfig As LogConfig, pConfigManager As ConfigManager(Of Config), pTemplate As Template) InitializeComponent() @@ -80,7 +81,7 @@ Public Class frmImportMain Text = String.Format(My.Resources.frmShared._0____WebService_Multitool_für_WinLine, CurrentTemplate.Name) End Sub - Private Sub frmImportMain_Shown(sender As Object, e As EventArgs) Handles MyBase.Shown + Private Async Sub frmImportMain_Shown(sender As Object, e As EventArgs) Handles MyBase.Shown btnLoadFiles.Enabled = False SplashScreenManager.ShowWaitForm() @@ -114,6 +115,8 @@ Public Class frmImportMain SplashScreenManager.CloseWaitForm() btnLoadFiles.Enabled = True End Try + + Await LoadFiles() End Sub Private Sub frmImportMain_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing @@ -440,34 +443,7 @@ Public Class frmImportMain End Function Private Async Sub btnReloadFile_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnReloadFile.ItemClick - Dim oCurrentMandator As Mandator = TryCast(lookupMandator.EditValue, Mandator) - If oCurrentMandator Is Nothing Then - MsgBox(My.Resources.frmImportMainExtra.Bitte_wählen_Sie_einen_Mandanten_aus__bevor_Sie_fortfahren, MsgBoxStyle.Exclamation, Text) - Exit Sub - End If - - Dim oMessage = String.Format(My.Resources.frmImportMainExtra.Wollen_Sie_wirklich_die_aktuelle_Datei_neu_laden, oCurrentMandator) - Dim oResult As DialogResult = MsgBox(oMessage, MsgBoxStyle.Question Or MsgBoxStyle.YesNo, Text) - - Try - BeginLoadingUI() - - If oResult = DialogResult.Yes Then - Dim oDocument As Document = GridViewFiles.GetRow(GridViewFiles.FocusedRowHandle) - Dim oNewDocument = Await DocumentLoader.LoadFile(oDocument.File, CurrentTemplate, lookupMandator.EditValue) - Dim oIndex = DocumentLoader.Files.IndexOf(oDocument) - DocumentLoader.Files.Item(oIndex) = oNewDocument - - LoadDocument(oNewDocument) - End If - - Catch ex As Exception - FormHelper.ShowError(ex, My.Resources.frmImportMainExtra.Neuladen_des_Dokuments) - - Finally - EndLoadingUI() - - End Try + Await ReloadFile() End Sub Private Sub btnOpenInputDirectory_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnOpenInputDirectory.ItemClick @@ -661,6 +637,7 @@ Public Class frmImportMain Private Async Function LoadFiles() As Task Try BeginLoadingUI() + FilesLoading = True DocumentCleaner.CleanImportedDocuments(DocumentLoader.Files) @@ -688,10 +665,44 @@ Public Class frmImportMain FormHelper.ShowError(ex, My.Resources.frmImportMainExtra.Laden_der_Dokumente) Finally + FilesLoading = False EndLoadingUI() End Try End Function + Public Async Function ReloadFile() As Task + Dim oCurrentMandator As Mandator = TryCast(lookupMandator.EditValue, Mandator) + If oCurrentMandator Is Nothing Then + MsgBox(My.Resources.frmImportMainExtra.Bitte_wählen_Sie_einen_Mandanten_aus__bevor_Sie_fortfahren, MsgBoxStyle.Exclamation, Text) + Exit Function + End If + + Dim oMessage = String.Format(My.Resources.frmImportMainExtra.Wollen_Sie_wirklich_die_aktuelle_Datei_neu_laden, oCurrentMandator) + Dim oResult As DialogResult = MsgBox(oMessage, MsgBoxStyle.Question Or MsgBoxStyle.YesNo, Text) + + Try + BeginLoadingUI() + FilesLoading = True + + If oResult = DialogResult.Yes Then + Dim oDocument As Document = GridViewFiles.GetRow(GridViewFiles.FocusedRowHandle) + Dim oNewDocument = Await DocumentLoader.LoadFile(oDocument.File, CurrentTemplate, lookupMandator.EditValue) + Dim oIndex = DocumentLoader.Files.IndexOf(oDocument) + DocumentLoader.Files.Item(oIndex) = oNewDocument + + LoadDocument(oNewDocument) + End If + + Catch ex As Exception + FormHelper.ShowError(ex, My.Resources.frmImportMainExtra.Neuladen_des_Dokuments) + + Finally + FilesLoading = False + EndLoadingUI() + + End Try + End Function + Private Function EditRow(pRow As DataRow, pView As GridView) As DocumentRow Try If CurrentDocumentReadOnly = True Then @@ -832,6 +843,7 @@ Public Class frmImportMain SetDocumentButtonsEnabled(False) GridControlFiles.Enabled = False SplitContainerGrids.Enabled = False + lookupMandator.Enabled = False RibbonPageGroupLoad.Enabled = False RibbonPageGroupEdit.Enabled = False @@ -845,6 +857,7 @@ Public Class frmImportMain RibbonPageGroupReport.Enabled = True RibbonPageGroupTransfer.Enabled = True + lookupMandator.Enabled = True SplitContainerGrids.Enabled = True GridControlFiles.Enabled = True SetDocumentButtonsEnabled(True) @@ -861,14 +874,6 @@ Public Class frmImportMain btnEditRow.Enabled = pEnabled End Sub - Private Sub lookupMandator_EditValueChanged(sender As Object, e As EventArgs) Handles lookupMandator.EditValueChanged - If lookupMandator.EditValue Is Nothing Then - lookupMandator.BackColor = Color.LightCoral - Else - lookupMandator.BackColor = Nothing - End If - End Sub - Private Sub btnShowErrors_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnShowErrors.ItemClick If CurrentDocument IsNot Nothing Then Dim oErrors = CurrentDocument.Errors. @@ -879,8 +884,24 @@ Public Class frmImportMain End If End Sub + Private Sub lookupMandator_EditValueChanged(sender As Object, e As EventArgs) Handles lookupMandator.EditValueChanged + If lookupMandator.EditValue Is Nothing Then + lookupMandator.BackColor = Color.LightCoral + Else + lookupMandator.BackColor = Nothing + End If + End Sub + Private Async Function lookupMandator_EditValueChanging(sender As Object, e As DevExpress.XtraEditors.Controls.ChangingEventArgs) As Task Handles lookupMandator.EditValueChanging + If e.OldValue Is Nothing And e.NewValue IsNot Nothing And FilesLoading = False Then + Dim oMandator As Mandator = e.NewValue + Dim oResult = MsgBox($"Sie haben den Mandanten '{oMandator}' ausgewählt. Wollen Sie jetzt die aktuelle Datei neu laden?", MsgBoxStyle.Question Or MsgBoxStyle.YesNo, Text) + If oResult = MsgBoxResult.Yes Then + Await ReloadFile() + End If + End If + End Function #End Region End Class \ No newline at end of file