diff --git a/MultiTool.Form/MultiTool.Form.vbproj b/MultiTool.Form/MultiTool.Form.vbproj index 1fe6034..095b6a0 100644 --- a/MultiTool.Form/MultiTool.Form.vbproj +++ b/MultiTool.Form/MultiTool.Form.vbproj @@ -338,6 +338,8 @@ + + diff --git a/MultiTool.Form/My Project/AssemblyInfo.vb b/MultiTool.Form/My Project/AssemblyInfo.vb index e0b6626..1b6bfa8 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/My Project/Resources.Designer.vb b/MultiTool.Form/My Project/Resources.Designer.vb index 39bc43c..0178da4 100644 --- a/MultiTool.Form/My Project/Resources.Designer.vb +++ b/MultiTool.Form/My Project/Resources.Designer.vb @@ -420,6 +420,26 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property logical2() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("logical2", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property logical3() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("logical3", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. ''' diff --git a/MultiTool.Form/My Project/Resources.resx b/MultiTool.Form/My Project/Resources.resx index c8d6386..c7ecce3 100644 --- a/MultiTool.Form/My Project/Resources.resx +++ b/MultiTool.Form/My Project/Resources.resx @@ -202,6 +202,9 @@ ..\Resources\wraptext.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\logical2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\tableproperties.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -232,6 +235,9 @@ ..\Resources\open23.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\insertpagecount.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\open2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -274,8 +280,8 @@ ..\Resources\preview.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\insertpagecount.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\bo_sale.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\exporttopdf.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -316,7 +322,7 @@ ..\Resources\actions_checkcircled2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\bo_sale.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\logical3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a \ No newline at end of file diff --git a/MultiTool.Form/Resources/logical2.svg b/MultiTool.Form/Resources/logical2.svg new file mode 100644 index 0000000..77a949b --- /dev/null +++ b/MultiTool.Form/Resources/logical2.svg @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/MultiTool.Form/Resources/logical3.svg b/MultiTool.Form/Resources/logical3.svg new file mode 100644 index 0000000..77a949b --- /dev/null +++ b/MultiTool.Form/Resources/logical3.svg @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/MultiTool.Form/frmConfig.vb b/MultiTool.Form/frmConfig.vb index 2584bca..cd19b4a 100644 --- a/MultiTool.Form/frmConfig.vb +++ b/MultiTool.Form/frmConfig.vb @@ -115,15 +115,17 @@ Public Class frmConfig End Sub Private Sub Save() + GridViewConfig.ValidateEditor() DS_DD_ECM.TBMT_CONFIG.AcceptChanges() TBMT_CONFIGTableAdapter.Update(DS_DD_ECM.TBMT_CONFIG) + GridViewSchema.ValidateEditor() + DS_DD_ECM.TBMT_TEMPLATE_ITEMS.AcceptChanges() + TBMT_TEMPLATE_ITEMSTableAdapter.Update(DS_DD_ECM.TBMT_TEMPLATE_ITEMS) + TBMT_CONFIG_GENERAL.AcceptChanges() SaveGeneralConfig(TBMT_CONFIG_GENERAL) TBMT_CONFIGTableAdapter.Update(TBMT_CONFIG_GENERAL) - - DS_DD_ECM.TBMT_TEMPLATE_ITEMS.AcceptChanges() - TBMT_TEMPLATE_ITEMSTableAdapter.Update(DS_DD_ECM.TBMT_TEMPLATE_ITEMS) End Sub Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick diff --git a/MultiTool.Form/frmExportMain.Designer.vb b/MultiTool.Form/frmExportMain.Designer.vb index 826de62..a1288f9 100644 --- a/MultiTool.Form/frmExportMain.Designer.vb +++ b/MultiTool.Form/frmExportMain.Designer.vb @@ -30,6 +30,7 @@ Partial Class frmExportMain Me.btnOpenInputDirectory = New DevExpress.XtraBars.BarButtonItem() Me.btnOpenOutputDirectory = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem3 = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItem4 = New DevExpress.XtraBars.BarButtonItem() Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() @@ -71,6 +72,7 @@ Partial Class frmExportMain Me.comboDocumentType = New DevExpress.XtraEditors.GridLookUpEdit() Me.GridView3 = New DevExpress.XtraGrid.Views.Grid.GridView() Me.comboDocumentKind = New DevExpress.XtraEditors.CheckedComboBoxEdit() + Me.comboYear = New DevExpress.XtraEditors.ComboBoxEdit() Me.Root = New DevExpress.XtraLayout.LayoutControlGroup() Me.LayoutControlItem1 = New DevExpress.XtraLayout.LayoutControlItem() Me.EmptySpaceItem1 = New DevExpress.XtraLayout.EmptySpaceItem() @@ -82,12 +84,11 @@ Partial Class frmExportMain Me.LayoutControlItem8 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem10 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem9 = New DevExpress.XtraLayout.LayoutControlItem() + Me.LayoutControlItem4 = New DevExpress.XtraLayout.LayoutControlItem() Me.LabelControl2 = New DevExpress.XtraEditors.LabelControl() Me.colName2 = New DevExpress.XtraGrid.Columns.GridColumn() Me.colId2 = New DevExpress.XtraGrid.Columns.GridColumn() Me.SplashScreenManager = New DevExpress.XtraSplashScreen.SplashScreenManager(Me, GetType(Global.MultiTool.Form.frmWaitForm), True, True) - Me.comboYear = New DevExpress.XtraEditors.ComboBoxEdit() - Me.LayoutControlItem4 = New DevExpress.XtraLayout.LayoutControlItem() CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridControlDocuments, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridViewDocuments, System.ComponentModel.ISupportInitialize).BeginInit() @@ -117,6 +118,7 @@ Partial Class frmExportMain CType(Me.comboDocumentType.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridView3, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.comboDocumentKind.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.comboYear.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.Root, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.EmptySpaceItem1, System.ComponentModel.ISupportInitialize).BeginInit() @@ -128,16 +130,15 @@ Partial Class frmExportMain CType(Me.LayoutControlItem8, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem10, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem9, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.comboYear.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem4, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'RibbonControl1 ' Me.RibbonControl1.ExpandCollapseItem.Id = 0 - Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItem1, Me.txtResults, Me.BarButtonItem2, Me.btnOpenInputDirectory, Me.btnOpenOutputDirectory, Me.BarButtonItem3}) + Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItem1, Me.txtResults, Me.BarButtonItem2, Me.btnOpenInputDirectory, Me.btnOpenOutputDirectory, Me.BarButtonItem3, Me.BarButtonItem4}) Me.RibbonControl1.Location = New System.Drawing.Point(0, 0) - Me.RibbonControl1.MaxItemId = 9 + Me.RibbonControl1.MaxItemId = 10 Me.RibbonControl1.Name = "RibbonControl1" Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1, Me.RibbonPage3}) Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] @@ -189,6 +190,13 @@ Partial Class frmExportMain Me.BarButtonItem3.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.open3 Me.BarButtonItem3.Name = "BarButtonItem3" ' + 'BarButtonItem4 + ' + Me.BarButtonItem4.Caption = "Logverzeichnis öffnen" + Me.BarButtonItem4.Id = 9 + Me.BarButtonItem4.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.logical3 + Me.BarButtonItem4.Name = "BarButtonItem4" + ' 'RibbonPage1 ' Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup2}) @@ -219,6 +227,7 @@ Partial Class frmExportMain Me.RibbonPageGroup3.ItemLinks.Add(Me.btnOpenInputDirectory) Me.RibbonPageGroup3.ItemLinks.Add(Me.btnOpenOutputDirectory) Me.RibbonPageGroup3.ItemLinks.Add(Me.BarButtonItem3) + Me.RibbonPageGroup3.ItemLinks.Add(Me.BarButtonItem4) Me.RibbonPageGroup3.Name = "RibbonPageGroup3" Me.RibbonPageGroup3.Text = "Verzeichnisse" ' @@ -584,6 +593,16 @@ Partial Class frmExportMain Me.comboDocumentKind.StyleController = Me.LayoutControl1 Me.comboDocumentKind.TabIndex = 14 ' + 'comboYear + ' + Me.comboYear.Location = New System.Drawing.Point(112, 45) + Me.comboYear.MenuManager = Me.RibbonControl1 + Me.comboYear.Name = "comboYear" + Me.comboYear.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) + Me.comboYear.Size = New System.Drawing.Size(171, 20) + Me.comboYear.StyleController = Me.LayoutControl1 + Me.comboYear.TabIndex = 15 + ' 'Root ' Me.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True] @@ -690,6 +709,16 @@ Partial Class frmExportMain Me.LayoutControlItem9.Text = "Belegtyp" Me.LayoutControlItem9.TextSize = New System.Drawing.Size(85, 13) ' + 'LayoutControlItem4 + ' + Me.LayoutControlItem4.Control = Me.comboYear + Me.LayoutControlItem4.Location = New System.Drawing.Point(0, 30) + Me.LayoutControlItem4.Name = "LayoutControlItem4" + Me.LayoutControlItem4.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) + Me.LayoutControlItem4.Size = New System.Drawing.Size(278, 30) + Me.LayoutControlItem4.Text = "Wirtschaftsjahr" + Me.LayoutControlItem4.TextSize = New System.Drawing.Size(85, 13) + ' 'LabelControl2 ' Me.LabelControl2.Appearance.Font = New System.Drawing.Font("Tahoma", 48.0!) @@ -722,26 +751,6 @@ Partial Class frmExportMain ' Me.SplashScreenManager.ClosingDelay = 500 ' - 'comboYear - ' - Me.comboYear.Location = New System.Drawing.Point(112, 45) - Me.comboYear.MenuManager = Me.RibbonControl1 - Me.comboYear.Name = "comboYear" - Me.comboYear.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) - Me.comboYear.Size = New System.Drawing.Size(171, 20) - Me.comboYear.StyleController = Me.LayoutControl1 - Me.comboYear.TabIndex = 15 - ' - 'LayoutControlItem4 - ' - Me.LayoutControlItem4.Control = Me.comboYear - Me.LayoutControlItem4.Location = New System.Drawing.Point(0, 30) - Me.LayoutControlItem4.Name = "LayoutControlItem4" - Me.LayoutControlItem4.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem4.Size = New System.Drawing.Size(278, 30) - Me.LayoutControlItem4.Text = "Wirtschaftsjahr" - Me.LayoutControlItem4.TextSize = New System.Drawing.Size(85, 13) - ' 'frmExportMain ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -786,6 +795,7 @@ Partial Class frmExportMain CType(Me.comboDocumentType.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.GridView3, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.comboDocumentKind.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.comboYear.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.Root, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.EmptySpaceItem1, System.ComponentModel.ISupportInitialize).EndInit() @@ -797,7 +807,6 @@ Partial Class frmExportMain CType(Me.LayoutControlItem8, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem10, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem9, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.comboYear.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem4, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -869,4 +878,5 @@ Partial Class frmExportMain Friend WithEvents LayoutControlItem10 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents comboYear As DevExpress.XtraEditors.ComboBoxEdit Friend WithEvents LayoutControlItem4 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents BarButtonItem4 As DevExpress.XtraBars.BarButtonItem End Class diff --git a/MultiTool.Form/frmExportMain.vb b/MultiTool.Form/frmExportMain.vb index 2946bc6..461e31e 100644 --- a/MultiTool.Form/frmExportMain.vb +++ b/MultiTool.Form/frmExportMain.vb @@ -289,4 +289,8 @@ Public Class frmExportMain e.DisplayText = "" End If End Sub + + Private Sub BarButtonItem4_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem4.ItemClick + FormHelper.TryOpenDirectory(LogConfig.LogDirectory, My.Resources.frmImportMainExtra.Logverzeichnis) + End Sub End Class \ No newline at end of file diff --git a/MultiTool.Form/frmImportMain.Designer.vb b/MultiTool.Form/frmImportMain.Designer.vb index 09381b9..d100f63 100644 --- a/MultiTool.Form/frmImportMain.Designer.vb +++ b/MultiTool.Form/frmImportMain.Designer.vb @@ -56,6 +56,7 @@ Partial Class frmImportMain Me.btnDebugExportReport = New DevExpress.XtraBars.BarButtonItem() Me.btnEditRow = New DevExpress.XtraBars.BarButtonItem() Me.btnCalculatePrices = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem() Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroupLoad = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroupReport = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() @@ -221,9 +222,9 @@ Partial Class frmImportMain 'RibbonControl ' Me.RibbonControl.ExpandCollapseItem.Id = 0 - Me.RibbonControl.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl.ExpandCollapseItem, Me.RibbonControl.SearchEditItem, Me.txtFilesLoaded, Me.btnLoadFiles, Me.btnTransferFile, Me.btnOpenInputDirectory, Me.btnOpenOutputDirectory, Me.btnOpenSchemaDirectory, Me.btnReloadFile, Me.btnTransferAllFiles, Me.btnOpenReport, Me.btnShowXml, Me.btnOpenLogDirectory, Me.btnOpenConfigDirectory, Me.txtCurrentFile, Me.btnConfig, Me.btnRemoveRow, Me.btnTestTransferFile, Me.BarButtonItem1, Me.btnDebugExportReport, Me.btnEditRow, Me.btnCalculatePrices}) + Me.RibbonControl.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl.ExpandCollapseItem, Me.RibbonControl.SearchEditItem, Me.txtFilesLoaded, Me.btnLoadFiles, Me.btnTransferFile, Me.btnOpenInputDirectory, Me.btnOpenOutputDirectory, Me.btnOpenSchemaDirectory, Me.btnReloadFile, Me.btnTransferAllFiles, Me.btnOpenReport, Me.btnShowXml, Me.btnOpenLogDirectory, Me.btnOpenConfigDirectory, Me.txtCurrentFile, Me.btnConfig, Me.btnRemoveRow, Me.btnTestTransferFile, Me.BarButtonItem1, Me.btnDebugExportReport, Me.btnEditRow, Me.btnCalculatePrices, Me.BarButtonItem2}) resources.ApplyResources(Me.RibbonControl, "RibbonControl") - Me.RibbonControl.MaxItemId = 37 + Me.RibbonControl.MaxItemId = 38 Me.RibbonControl.Name = "RibbonControl" Me.RibbonControl.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1, Me.RibbonPage2}) Me.RibbonControl.RepositoryItems.AddRange(New DevExpress.XtraEditors.Repository.RepositoryItem() {Me.RepositoryItemComboBox1, Me.RepositoryItemProgressBar1}) @@ -381,6 +382,13 @@ Partial Class frmImportMain Me.btnCalculatePrices.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.bo_sale Me.btnCalculatePrices.Name = "btnCalculatePrices" ' + 'BarButtonItem2 + ' + resources.ApplyResources(Me.BarButtonItem2, "BarButtonItem2") + Me.BarButtonItem2.Id = 37 + Me.BarButtonItem2.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.logical2 + Me.BarButtonItem2.Name = "BarButtonItem2" + ' 'RibbonPage1 ' Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroupLoad, Me.RibbonPageGroupReport, Me.RibbonPageGroupTransfer, Me.RibbonPageGroupEdit}) @@ -428,11 +436,13 @@ Partial Class frmImportMain Me.RibbonPageGroup5.ItemLinks.Add(Me.btnOpenInputDirectory) Me.RibbonPageGroup5.ItemLinks.Add(Me.btnOpenOutputDirectory) Me.RibbonPageGroup5.ItemLinks.Add(Me.btnOpenSchemaDirectory) + Me.RibbonPageGroup5.ItemLinks.Add(Me.BarButtonItem2) Me.RibbonPageGroup5.Name = "RibbonPageGroup5" resources.ApplyResources(Me.RibbonPageGroup5, "RibbonPageGroup5") ' 'RibbonPageGroup2 ' + Me.RibbonPageGroup2.Alignment = DevExpress.XtraBars.Ribbon.RibbonPageGroupAlignment.Far Me.RibbonPageGroup2.ItemLinks.Add(Me.btnShowXml) Me.RibbonPageGroup2.ItemLinks.Add(Me.btnDebugExportReport) Me.RibbonPageGroup2.Name = "RibbonPageGroup2" @@ -732,4 +742,5 @@ Partial Class frmImportMain Friend WithEvents GridBand2 As DevExpress.XtraGrid.Views.BandedGrid.GridBand Friend WithEvents btnEditRow As DevExpress.XtraBars.BarButtonItem Friend WithEvents btnCalculatePrices As DevExpress.XtraBars.BarButtonItem + Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem End Class diff --git a/MultiTool.Form/frmImportMain.resx b/MultiTool.Form/frmImportMain.resx index 2baed8b..711dd62 100644 --- a/MultiTool.Form/frmImportMain.resx +++ b/MultiTool.Form/frmImportMain.resx @@ -250,6 +250,9 @@ Preiskalkulation ausführen + + Logverzeichnis öffnen + 0, 0 @@ -272,7 +275,7 @@ Verzeichnisse - RibbonPageGroup2 + Erweiterte Funktionen Erweitert @@ -941,6 +944,12 @@ DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + BarButtonItem2 + + + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + RibbonPage1 diff --git a/MultiTool.Form/frmImportMain.vb b/MultiTool.Form/frmImportMain.vb index 4532766..8d73791 100644 --- a/MultiTool.Form/frmImportMain.vb +++ b/MultiTool.Form/frmImportMain.vb @@ -797,5 +797,9 @@ Public Class frmImportMain End Try End Sub + Private Sub BarButtonItem2_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem2.ItemClick + FormHelper.TryOpenDirectory(LogConfig.LogDirectory, My.Resources.frmImportMainExtra.Logverzeichnis) + End Sub + #End Region End Class \ No newline at end of file diff --git a/MultiTool.Shared/Documents/DocumentLoader.vb b/MultiTool.Shared/Documents/DocumentLoader.vb index 7d673f1..e8bc105 100644 --- a/MultiTool.Shared/Documents/DocumentLoader.vb +++ b/MultiTool.Shared/Documents/DocumentLoader.vb @@ -327,12 +327,16 @@ Namespace Documents For Each oField In oRow.Fields If oTable Is Nothing Then + Logger.Warn("Table [{0}] was not found in the Schema. Exiting.", oRow.TableName) Exit For + End If Dim oColumn = oTable.Columns.Where(Function(c) c.Name = oField.Key).SingleOrDefault() If oColumn Is Nothing Then + Logger.Warn("Column [{0}] was not found in Table [{0}]. Skipping.", oField.Key, oTable.Name) Continue For + End If Dim oFunctionName = oColumn.Config.FunctionName @@ -340,32 +344,42 @@ Namespace Documents Dim oParamsDict = ParseFunctionParamsAsDict(oFunctionParams) If oFunctionName = Constants.FUNCTION_FIELD Then + Try + Logger.Debug("Applying function FIELD to field [{0}]", oField.Key) - Dim oParam = oParamsDict.FirstOrDefault() + Dim oParam = oParamsDict.FirstOrDefault() - If IsNothing(oParam) Then - Logger.Warn("FIELD function needs exactly one parameter!") - Continue For - End If + If IsNothing(oParam) Then + Logger.Warn("Function FIELD needs exactly one parameter. Skipping") + Continue For - Dim oFieldName = oParam.Key - Dim oSubKey = oParam.Value - - Dim oReferencedField = oRow.Fields. - Where(Function(field) field.Key = oFieldName). - FirstOrDefault() - - If IsNothing(oReferencedField) = False Then - Dim oValue As String = Utils.NotNull(oReferencedField.Value.GetValue(oSubKey), String.Empty) - - If oValue <> String.Empty Then - oField.Value.Final = oValue End If - Else - Logger.Warn("Referenced Field [{0}] was not found!", oFieldName) - Continue For - End If + Dim oFieldName = oParam.Key + Dim oSubKey = oParam.Value + + Dim oReferencedField = oRow.Fields. + Where(Function(field) field.Key = oFieldName). + FirstOrDefault() + + If IsNothing(oReferencedField) = False Then + Dim oRawValue = oReferencedField.Value?.GetValue(oSubKey) + Dim oValue As String = Utils.NotNull(oRawValue, String.Empty) + + If oValue <> String.Empty Then + oField.Value.Final = oValue + End If + + Else + Logger.Warn("Referenced Field [{0}] was not found. Skipping.", oFieldName) + Continue For + + End If + Catch ex As Exception + Logger.Warn("Function FIELD could not be applied to field [{0}]. Skipping.", oField.Key) + Continue For + + End Try End If Next Next diff --git a/MultiTool.Shared/Patterns.vb b/MultiTool.Shared/Patterns.vb index 491d02d..7bd4c13 100644 --- a/MultiTool.Shared/Patterns.vb +++ b/MultiTool.Shared/Patterns.vb @@ -51,6 +51,9 @@ Public Class Patterns Case "FILENAME" oValue = pDocument.FileName + Case "MANDATORDB" + oValue = pDocument.Mandator.Database + Case Else oValue = "" diff --git a/MultiTool.Shared/Report/ReportGenerator.vb b/MultiTool.Shared/Report/ReportGenerator.vb index 56a53c4..36a7807 100644 --- a/MultiTool.Shared/Report/ReportGenerator.vb +++ b/MultiTool.Shared/Report/ReportGenerator.vb @@ -6,6 +6,7 @@ Imports MultiTool.Shared.Documents Imports MultiTool.Shared.Documents.DocumentRow Imports MultiTool.Shared.Report Imports MultiTool.Shared.Templates +Imports MultiTool.Shared.Winline.Entities Public Class ReportGenerator(Of TReport As IReport) Inherits BaseClass diff --git a/MultiTool.Shared/Winline/WinlineData.vb b/MultiTool.Shared/Winline/WinlineData.vb index bc2bb7e..847f680 100644 --- a/MultiTool.Shared/Winline/WinlineData.vb +++ b/MultiTool.Shared/Winline/WinlineData.vb @@ -135,7 +135,7 @@ Namespace Winline Accounts.AddRange(oAccounts) If oAccounts.Count = 0 Then - Logger.Warn("No Acconts loaded for Mandator [{0}]", pMandator) + Logger.Warn("No Accounts loaded for Mandator [{0}]", pMandator) End If Logger.Info("[{0}] Accounts loaded for Mandator [{1}]", oAccounts.Count, pMandator)