From 8dcd06154d2110f1bda324e5b04a4ddfd4c19b4d Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Thu, 11 Nov 2021 10:55:50 +0100 Subject: [PATCH] Move DocumentRow into Documents Namespace --- MultiTool.Form/frmImportMain.Designer.vb | 30 +++++++----- MultiTool.Form/frmImportMain.resx | 58 ++++++++++++++--------- MultiTool.Form/frmImportMain.vb | 2 +- MultiTool.Form/frmRowEditor.vb | 2 +- MultiTool.Shared/Documents/DocumentRow.vb | 41 ++++++++-------- MultiTool.Shared/Mapper.vb | 2 +- 6 files changed, 80 insertions(+), 55 deletions(-) diff --git a/MultiTool.Form/frmImportMain.Designer.vb b/MultiTool.Form/frmImportMain.Designer.vb index 0712853..4a4356c 100644 --- a/MultiTool.Form/frmImportMain.Designer.vb +++ b/MultiTool.Form/frmImportMain.Designer.vb @@ -28,8 +28,9 @@ Partial Class frmImportMain Me.SplitContainerMain = New DevExpress.XtraEditors.SplitContainerControl() Me.GridControlFiles = New DevExpress.XtraGrid.GridControl() Me.GridViewFiles = New DevExpress.XtraGrid.Views.BandedGrid.AdvBandedGridView() - Me.gridBand3 = New DevExpress.XtraGrid.Views.BandedGrid.GridBand() + Me.gridBand1 = New DevExpress.XtraGrid.Views.BandedGrid.GridBand() Me.colSelected = New DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn() + Me.gridBand3 = New DevExpress.XtraGrid.Views.BandedGrid.GridBand() Me.colFilename = New DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn() Me.colCreatedAt = New DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn() Me.colMandator = New DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn() @@ -121,7 +122,7 @@ Partial Class frmImportMain resources.ApplyResources(Me.SplitContainerMain.Panel1, "SplitContainerMain.Panel1") Me.SplitContainerMain.Panel2.Controls.Add(Me.SplitContainerGrids) resources.ApplyResources(Me.SplitContainerMain.Panel2, "SplitContainerMain.Panel2") - Me.SplitContainerMain.SplitterPosition = 380 + Me.SplitContainerMain.SplitterPosition = 340 ' 'GridControlFiles ' @@ -134,7 +135,7 @@ Partial Class frmImportMain ' 'GridViewFiles ' - Me.GridViewFiles.Bands.AddRange(New DevExpress.XtraGrid.Views.BandedGrid.GridBand() {Me.gridBand3}) + Me.GridViewFiles.Bands.AddRange(New DevExpress.XtraGrid.Views.BandedGrid.GridBand() {Me.gridBand1, Me.gridBand3}) Me.GridViewFiles.Columns.AddRange(New DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn() {Me.colSelected, Me.colFilename, Me.colMandator, Me.colCreatedAt}) Me.GridViewFiles.GridControl = Me.GridControlFiles Me.GridViewFiles.Name = "GridViewFiles" @@ -143,17 +144,15 @@ Partial Class frmImportMain Me.GridViewFiles.OptionsView.ShowGroupPanel = False Me.GridViewFiles.OptionsView.ShowIndicator = False ' - 'gridBand3 + 'gridBand1 ' - resources.ApplyResources(Me.gridBand3, "gridBand3") - Me.gridBand3.Columns.Add(Me.colSelected) - Me.gridBand3.Columns.Add(Me.colFilename) - Me.gridBand3.Columns.Add(Me.colCreatedAt) - Me.gridBand3.Columns.Add(Me.colMandator) - Me.gridBand3.VisibleIndex = 0 + resources.ApplyResources(Me.gridBand1, "gridBand1") + Me.gridBand1.Columns.Add(Me.colSelected) + Me.gridBand1.VisibleIndex = 0 ' 'colSelected ' + Me.colSelected.AutoFillDown = True resources.ApplyResources(Me.colSelected, "colSelected") Me.colSelected.FieldName = "Selected" Me.colSelected.ImageOptions.SvgImage = CType(resources.GetObject("colSelected.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) @@ -163,6 +162,14 @@ Partial Class frmImportMain Me.colSelected.OptionsColumn.FixedWidth = True Me.colSelected.UnboundType = DevExpress.Data.UnboundColumnType.[Boolean] ' + 'gridBand3 + ' + resources.ApplyResources(Me.gridBand3, "gridBand3") + Me.gridBand3.Columns.Add(Me.colFilename) + Me.gridBand3.Columns.Add(Me.colCreatedAt) + Me.gridBand3.Columns.Add(Me.colMandator) + Me.gridBand3.VisibleIndex = 1 + ' 'colFilename ' resources.ApplyResources(Me.colFilename, "colFilename") @@ -633,7 +640,6 @@ Partial Class frmImportMain Friend WithEvents txtCurrentFile As DevExpress.XtraBars.BarStaticItem Friend WithEvents btnConfig As DevExpress.XtraBars.BarButtonItem Friend WithEvents RibbonPageGroup6 As DevExpress.XtraBars.Ribbon.RibbonPageGroup - Friend WithEvents gridBand3 As DevExpress.XtraGrid.Views.BandedGrid.GridBand Friend WithEvents RepositoryItemProgressBar1 As Repository.RepositoryItemProgressBar Friend WithEvents SplashScreenManager As DevExpress.XtraSplashScreen.SplashScreenManager Friend WithEvents txtCulture As DevExpress.XtraBars.BarStaticItem @@ -647,4 +653,6 @@ Partial Class frmImportMain Friend WithEvents GridView3 As GridView Friend WithEvents GridControl4 As DevExpress.XtraGrid.GridControl Friend WithEvents GridView4 As GridView + Friend WithEvents gridBand1 As DevExpress.XtraGrid.Views.BandedGrid.GridBand + Friend WithEvents gridBand3 As DevExpress.XtraGrid.Views.BandedGrid.GridBand End Class diff --git a/MultiTool.Form/frmImportMain.resx b/MultiTool.Form/frmImportMain.resx index 0c78b94..4d60936 100644 --- a/MultiTool.Form/frmImportMain.resx +++ b/MultiTool.Form/frmImportMain.resx @@ -131,8 +131,8 @@ 0, 33 - - gridBand3 + + gridBand1 Ausgewählt @@ -163,6 +163,15 @@ 27 + + gridBand1 + + + 27 + + + gridBand3 + Dateiname @@ -170,7 +179,7 @@ True - 296 + 303 Eingegangen @@ -179,7 +188,7 @@ True - 125 + 303 Mandant @@ -197,15 +206,11 @@ 144 - - - Right - gridBand3 - 323 + 303 Version 1.0.0.0 @@ -328,7 +333,7 @@ 2 - 380, 531 + 340, 531 0 @@ -375,6 +380,9 @@ 0 + + Top, Left, Right + 75, 6 @@ -400,7 +408,7 @@ 1 - 280, 20 + 255, 20 1 @@ -424,7 +432,7 @@ 0, 0 - 380, 33 + 340, 33 2 @@ -463,7 +471,7 @@ 0, 0 - 825, 129 + 865, 129 0 @@ -490,7 +498,7 @@ 0, 0 - 825, 149 + 865, 149 0 @@ -511,7 +519,7 @@ Panel2 - 825, 288 + 865, 288 0 @@ -544,7 +552,7 @@ 0, 0 - 825, 126 + 865, 126 0 @@ -571,7 +579,7 @@ 0, 0 - 825, 130 + 865, 130 0 @@ -592,7 +600,7 @@ Panel2 - 825, 266 + 865, 266 0 @@ -613,7 +621,7 @@ Panel2 - 825, 564 + 865, 564 0 @@ -693,10 +701,10 @@ DevExpress.XtraGrid.Views.BandedGrid.AdvBandedGridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - gridBand3 + + gridBand1 - + DevExpress.XtraGrid.Views.BandedGrid.GridBand, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -705,6 +713,12 @@ DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + gridBand3 + + + DevExpress.XtraGrid.Views.BandedGrid.GridBand, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + colFilename diff --git a/MultiTool.Form/frmImportMain.vb b/MultiTool.Form/frmImportMain.vb index 22d2f6c..700617d 100644 --- a/MultiTool.Form/frmImportMain.vb +++ b/MultiTool.Form/frmImportMain.vb @@ -16,7 +16,7 @@ Imports MultiTool.Shared.Schemas Imports MultiTool.Shared.Winline Imports MultiTool.Shared.Constants Imports DevExpress.XtraReports.UI -Imports MultiTool.Shared.DocumentRow +Imports MultiTool.Shared.Documents.DocumentRow Public Class frmImportMain Private LogConfig As LogConfig diff --git a/MultiTool.Form/frmRowEditor.vb b/MultiTool.Form/frmRowEditor.vb index 809fb66..f43e109 100644 --- a/MultiTool.Form/frmRowEditor.vb +++ b/MultiTool.Form/frmRowEditor.vb @@ -2,7 +2,7 @@ Imports DevExpress.XtraGrid.Views.Grid Imports DevExpress.XtraVerticalGrid.Rows Imports MultiTool.Shared.Documents -Imports MultiTool.Shared.DocumentRow +Imports MultiTool.Shared.Documents.DocumentRow Imports MultiTool.Shared Imports DevExpress.XtraEditors.Repository Imports MultiTool.Shared.Winline diff --git a/MultiTool.Shared/Documents/DocumentRow.vb b/MultiTool.Shared/Documents/DocumentRow.vb index 4d10afb..ee4adb9 100644 --- a/MultiTool.Shared/Documents/DocumentRow.vb +++ b/MultiTool.Shared/Documents/DocumentRow.vb @@ -1,24 +1,27 @@ -Public Class DocumentRow - ''' - ''' Tabellen/Elementname aus XML - ''' - Public Name As String - Public Id As New Guid +Namespace Documents + Public Class DocumentRow + ''' + ''' Tabellen/Elementname aus XML + ''' + Public Name As String + Public Id As New Guid - Public Fields As Dictionary(Of String, FieldValue) + Public Fields As Dictionary(Of String, FieldValue) - Public Sub New() - Id = Guid.NewGuid() - End Sub + Public Sub New() + Id = Guid.NewGuid() + End Sub - Public Class FieldValue - Public Original As String = "" - Public External As String = "" - Public Final As String = "" - Public Property DataType As Constants.ColumnType = Constants.ColumnType.String + Public Class FieldValue + Public Original As String = "" + Public External As String = "" + Public Final As String = "" + Public Property DataType As Constants.ColumnType = Constants.ColumnType.String - Public Overrides Function ToString() As String - Return Final - End Function + Public Overrides Function ToString() As String + Return Final + End Function + End Class End Class -End Class + +End Namespace diff --git a/MultiTool.Shared/Mapper.vb b/MultiTool.Shared/Mapper.vb index e2e7ff6..916fac9 100644 --- a/MultiTool.Shared/Mapper.vb +++ b/MultiTool.Shared/Mapper.vb @@ -3,7 +3,7 @@ Imports System.Text.RegularExpressions Imports AutoMapper Imports AutoMapper.Configuration Imports DigitalData.Modules.Logging -Imports MultiTool.Shared.DocumentRow +Imports MultiTool.Shared.Documents.DocumentRow Public Class Mapper Private MapperConfig As MapperConfiguration