Move DocumentRow into Documents Namespace

This commit is contained in:
Jonathan Jenne 2021-11-11 10:55:50 +01:00
parent e732ce7099
commit 8dcd06154d
6 changed files with 80 additions and 55 deletions

View File

@ -28,8 +28,9 @@ Partial Class frmImportMain
Me.SplitContainerMain = New DevExpress.XtraEditors.SplitContainerControl() Me.SplitContainerMain = New DevExpress.XtraEditors.SplitContainerControl()
Me.GridControlFiles = New DevExpress.XtraGrid.GridControl() Me.GridControlFiles = New DevExpress.XtraGrid.GridControl()
Me.GridViewFiles = New DevExpress.XtraGrid.Views.BandedGrid.AdvBandedGridView() 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.colSelected = New DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn()
Me.gridBand3 = New DevExpress.XtraGrid.Views.BandedGrid.GridBand()
Me.colFilename = New DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn() Me.colFilename = New DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn()
Me.colCreatedAt = New DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn() Me.colCreatedAt = New DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn()
Me.colMandator = 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") resources.ApplyResources(Me.SplitContainerMain.Panel1, "SplitContainerMain.Panel1")
Me.SplitContainerMain.Panel2.Controls.Add(Me.SplitContainerGrids) Me.SplitContainerMain.Panel2.Controls.Add(Me.SplitContainerGrids)
resources.ApplyResources(Me.SplitContainerMain.Panel2, "SplitContainerMain.Panel2") resources.ApplyResources(Me.SplitContainerMain.Panel2, "SplitContainerMain.Panel2")
Me.SplitContainerMain.SplitterPosition = 380 Me.SplitContainerMain.SplitterPosition = 340
' '
'GridControlFiles 'GridControlFiles
' '
@ -134,7 +135,7 @@ Partial Class frmImportMain
' '
'GridViewFiles '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.Columns.AddRange(New DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn() {Me.colSelected, Me.colFilename, Me.colMandator, Me.colCreatedAt})
Me.GridViewFiles.GridControl = Me.GridControlFiles Me.GridViewFiles.GridControl = Me.GridControlFiles
Me.GridViewFiles.Name = "GridViewFiles" Me.GridViewFiles.Name = "GridViewFiles"
@ -143,17 +144,15 @@ Partial Class frmImportMain
Me.GridViewFiles.OptionsView.ShowGroupPanel = False Me.GridViewFiles.OptionsView.ShowGroupPanel = False
Me.GridViewFiles.OptionsView.ShowIndicator = False Me.GridViewFiles.OptionsView.ShowIndicator = False
' '
'gridBand3 'gridBand1
' '
resources.ApplyResources(Me.gridBand3, "gridBand3") resources.ApplyResources(Me.gridBand1, "gridBand1")
Me.gridBand3.Columns.Add(Me.colSelected) Me.gridBand1.Columns.Add(Me.colSelected)
Me.gridBand3.Columns.Add(Me.colFilename) Me.gridBand1.VisibleIndex = 0
Me.gridBand3.Columns.Add(Me.colCreatedAt)
Me.gridBand3.Columns.Add(Me.colMandator)
Me.gridBand3.VisibleIndex = 0
' '
'colSelected 'colSelected
' '
Me.colSelected.AutoFillDown = True
resources.ApplyResources(Me.colSelected, "colSelected") resources.ApplyResources(Me.colSelected, "colSelected")
Me.colSelected.FieldName = "Selected" Me.colSelected.FieldName = "Selected"
Me.colSelected.ImageOptions.SvgImage = CType(resources.GetObject("colSelected.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) 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.OptionsColumn.FixedWidth = True
Me.colSelected.UnboundType = DevExpress.Data.UnboundColumnType.[Boolean] 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 'colFilename
' '
resources.ApplyResources(Me.colFilename, "colFilename") resources.ApplyResources(Me.colFilename, "colFilename")
@ -633,7 +640,6 @@ Partial Class frmImportMain
Friend WithEvents txtCurrentFile As DevExpress.XtraBars.BarStaticItem Friend WithEvents txtCurrentFile As DevExpress.XtraBars.BarStaticItem
Friend WithEvents btnConfig As DevExpress.XtraBars.BarButtonItem Friend WithEvents btnConfig As DevExpress.XtraBars.BarButtonItem
Friend WithEvents RibbonPageGroup6 As DevExpress.XtraBars.Ribbon.RibbonPageGroup 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 RepositoryItemProgressBar1 As Repository.RepositoryItemProgressBar
Friend WithEvents SplashScreenManager As DevExpress.XtraSplashScreen.SplashScreenManager Friend WithEvents SplashScreenManager As DevExpress.XtraSplashScreen.SplashScreenManager
Friend WithEvents txtCulture As DevExpress.XtraBars.BarStaticItem Friend WithEvents txtCulture As DevExpress.XtraBars.BarStaticItem
@ -647,4 +653,6 @@ Partial Class frmImportMain
Friend WithEvents GridView3 As GridView Friend WithEvents GridView3 As GridView
Friend WithEvents GridControl4 As DevExpress.XtraGrid.GridControl Friend WithEvents GridControl4 As DevExpress.XtraGrid.GridControl
Friend WithEvents GridView4 As GridView 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 End Class

View File

@ -131,8 +131,8 @@
<data name="GridControlFiles.Location" type="System.Drawing.Point, System.Drawing"> <data name="GridControlFiles.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 33</value> <value>0, 33</value>
</data> </data>
<data name="gridBand3.Caption" xml:space="preserve"> <data name="gridBand1.Caption" xml:space="preserve">
<value>gridBand3</value> <value>gridBand1</value>
</data> </data>
<data name="colSelected.Caption" xml:space="preserve"> <data name="colSelected.Caption" xml:space="preserve">
<value>Ausgewählt</value> <value>Ausgewählt</value>
@ -163,6 +163,15 @@
<data name="colSelected.Width" type="System.Int32, mscorlib"> <data name="colSelected.Width" type="System.Int32, mscorlib">
<value>27</value> <value>27</value>
</data> </data>
<data name="gridBand1.Name" xml:space="preserve">
<value>gridBand1</value>
</data>
<data name="gridBand1.Width" type="System.Int32, mscorlib">
<value>27</value>
</data>
<data name="gridBand3.Caption" xml:space="preserve">
<value>gridBand3</value>
</data>
<data name="colFilename.Caption" xml:space="preserve"> <data name="colFilename.Caption" xml:space="preserve">
<value>Dateiname</value> <value>Dateiname</value>
</data> </data>
@ -170,7 +179,7 @@
<value>True</value> <value>True</value>
</data> </data>
<data name="colFilename.Width" type="System.Int32, mscorlib"> <data name="colFilename.Width" type="System.Int32, mscorlib">
<value>296</value> <value>303</value>
</data> </data>
<data name="colCreatedAt.Caption" xml:space="preserve"> <data name="colCreatedAt.Caption" xml:space="preserve">
<value>Eingegangen</value> <value>Eingegangen</value>
@ -179,7 +188,7 @@
<value>True</value> <value>True</value>
</data> </data>
<data name="colCreatedAt.Width" type="System.Int32, mscorlib"> <data name="colCreatedAt.Width" type="System.Int32, mscorlib">
<value>125</value> <value>303</value>
</data> </data>
<data name="colMandator.Caption" xml:space="preserve"> <data name="colMandator.Caption" xml:space="preserve">
<value>Mandant</value> <value>Mandant</value>
@ -197,15 +206,11 @@
<data name="colMandator.Width" type="System.Int32, mscorlib"> <data name="colMandator.Width" type="System.Int32, mscorlib">
<value>144</value> <value>144</value>
</data> </data>
<assembly alias="DevExpress.XtraGrid.v19.2" name="DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<data name="gridBand3.Fixed" type="DevExpress.XtraGrid.Columns.FixedStyle, DevExpress.XtraGrid.v19.2">
<value>Right</value>
</data>
<data name="gridBand3.Name" xml:space="preserve"> <data name="gridBand3.Name" xml:space="preserve">
<value>gridBand3</value> <value>gridBand3</value>
</data> </data>
<data name="gridBand3.Width" type="System.Int32, mscorlib"> <data name="gridBand3.Width" type="System.Int32, mscorlib">
<value>323</value> <value>303</value>
</data> </data>
<data name="txtVersion.Caption" xml:space="preserve"> <data name="txtVersion.Caption" xml:space="preserve">
<value>Version 1.0.0.0</value> <value>Version 1.0.0.0</value>
@ -328,7 +333,7 @@
<value>2</value> <value>2</value>
</data> </data>
<data name="GridControlFiles.Size" type="System.Drawing.Size, System.Drawing"> <data name="GridControlFiles.Size" type="System.Drawing.Size, System.Drawing">
<value>380, 531</value> <value>340, 531</value>
</data> </data>
<data name="GridControlFiles.TabIndex" type="System.Int32, mscorlib"> <data name="GridControlFiles.TabIndex" type="System.Int32, mscorlib">
<value>0</value> <value>0</value>
@ -375,6 +380,9 @@
<data name="&gt;&gt;LabelControl1.ZOrder" xml:space="preserve"> <data name="&gt;&gt;LabelControl1.ZOrder" xml:space="preserve">
<value>0</value> <value>0</value>
</data> </data>
<data name="lookupMandator.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
</data>
<data name="lookupMandator.Location" type="System.Drawing.Point, System.Drawing"> <data name="lookupMandator.Location" type="System.Drawing.Point, System.Drawing">
<value>75, 6</value> <value>75, 6</value>
</data> </data>
@ -400,7 +408,7 @@
<value>1</value> <value>1</value>
</data> </data>
<data name="lookupMandator.Size" type="System.Drawing.Size, System.Drawing"> <data name="lookupMandator.Size" type="System.Drawing.Size, System.Drawing">
<value>280, 20</value> <value>255, 20</value>
</data> </data>
<data name="lookupMandator.TabIndex" type="System.Int32, mscorlib"> <data name="lookupMandator.TabIndex" type="System.Int32, mscorlib">
<value>1</value> <value>1</value>
@ -424,7 +432,7 @@
<value>0, 0</value> <value>0, 0</value>
</data> </data>
<data name="PanelControl1.Size" type="System.Drawing.Size, System.Drawing"> <data name="PanelControl1.Size" type="System.Drawing.Size, System.Drawing">
<value>380, 33</value> <value>340, 33</value>
</data> </data>
<data name="PanelControl1.TabIndex" type="System.Int32, mscorlib"> <data name="PanelControl1.TabIndex" type="System.Int32, mscorlib">
<value>2</value> <value>2</value>
@ -463,7 +471,7 @@
<value>0, 0</value> <value>0, 0</value>
</data> </data>
<data name="GridControl1.Size" type="System.Drawing.Size, System.Drawing"> <data name="GridControl1.Size" type="System.Drawing.Size, System.Drawing">
<value>825, 129</value> <value>865, 129</value>
</data> </data>
<data name="GridControl1.TabIndex" type="System.Int32, mscorlib"> <data name="GridControl1.TabIndex" type="System.Int32, mscorlib">
<value>0</value> <value>0</value>
@ -490,7 +498,7 @@
<value>0, 0</value> <value>0, 0</value>
</data> </data>
<data name="GridControl2.Size" type="System.Drawing.Size, System.Drawing"> <data name="GridControl2.Size" type="System.Drawing.Size, System.Drawing">
<value>825, 149</value> <value>865, 149</value>
</data> </data>
<data name="GridControl2.TabIndex" type="System.Int32, mscorlib"> <data name="GridControl2.TabIndex" type="System.Int32, mscorlib">
<value>0</value> <value>0</value>
@ -511,7 +519,7 @@
<value>Panel2</value> <value>Panel2</value>
</data> </data>
<data name="SplitContainerGrids1.Size" type="System.Drawing.Size, System.Drawing"> <data name="SplitContainerGrids1.Size" type="System.Drawing.Size, System.Drawing">
<value>825, 288</value> <value>865, 288</value>
</data> </data>
<data name="SplitContainerGrids1.TabIndex" type="System.Int32, mscorlib"> <data name="SplitContainerGrids1.TabIndex" type="System.Int32, mscorlib">
<value>0</value> <value>0</value>
@ -544,7 +552,7 @@
<value>0, 0</value> <value>0, 0</value>
</data> </data>
<data name="GridControl3.Size" type="System.Drawing.Size, System.Drawing"> <data name="GridControl3.Size" type="System.Drawing.Size, System.Drawing">
<value>825, 126</value> <value>865, 126</value>
</data> </data>
<data name="GridControl3.TabIndex" type="System.Int32, mscorlib"> <data name="GridControl3.TabIndex" type="System.Int32, mscorlib">
<value>0</value> <value>0</value>
@ -571,7 +579,7 @@
<value>0, 0</value> <value>0, 0</value>
</data> </data>
<data name="GridControl4.Size" type="System.Drawing.Size, System.Drawing"> <data name="GridControl4.Size" type="System.Drawing.Size, System.Drawing">
<value>825, 130</value> <value>865, 130</value>
</data> </data>
<data name="GridControl4.TabIndex" type="System.Int32, mscorlib"> <data name="GridControl4.TabIndex" type="System.Int32, mscorlib">
<value>0</value> <value>0</value>
@ -592,7 +600,7 @@
<value>Panel2</value> <value>Panel2</value>
</data> </data>
<data name="SplitContainerGrids2.Size" type="System.Drawing.Size, System.Drawing"> <data name="SplitContainerGrids2.Size" type="System.Drawing.Size, System.Drawing">
<value>825, 266</value> <value>865, 266</value>
</data> </data>
<data name="SplitContainerGrids2.TabIndex" type="System.Int32, mscorlib"> <data name="SplitContainerGrids2.TabIndex" type="System.Int32, mscorlib">
<value>0</value> <value>0</value>
@ -613,7 +621,7 @@
<value>Panel2</value> <value>Panel2</value>
</data> </data>
<data name="SplitContainerGrids.Size" type="System.Drawing.Size, System.Drawing"> <data name="SplitContainerGrids.Size" type="System.Drawing.Size, System.Drawing">
<value>825, 564</value> <value>865, 564</value>
</data> </data>
<data name="SplitContainerGrids.TabIndex" type="System.Int32, mscorlib"> <data name="SplitContainerGrids.TabIndex" type="System.Int32, mscorlib">
<value>0</value> <value>0</value>
@ -693,10 +701,10 @@
<data name="&gt;&gt;GridViewFiles.Type" xml:space="preserve"> <data name="&gt;&gt;GridViewFiles.Type" xml:space="preserve">
<value>DevExpress.XtraGrid.Views.BandedGrid.AdvBandedGridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value> <value>DevExpress.XtraGrid.Views.BandedGrid.AdvBandedGridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data> </data>
<data name="&gt;&gt;gridBand3.Name" xml:space="preserve"> <data name="&gt;&gt;gridBand1.Name" xml:space="preserve">
<value>gridBand3</value> <value>gridBand1</value>
</data> </data>
<data name="&gt;&gt;gridBand3.Type" xml:space="preserve"> <data name="&gt;&gt;gridBand1.Type" xml:space="preserve">
<value>DevExpress.XtraGrid.Views.BandedGrid.GridBand, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value> <value>DevExpress.XtraGrid.Views.BandedGrid.GridBand, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data> </data>
<data name="&gt;&gt;colSelected.Name" xml:space="preserve"> <data name="&gt;&gt;colSelected.Name" xml:space="preserve">
@ -705,6 +713,12 @@
<data name="&gt;&gt;colSelected.Type" xml:space="preserve"> <data name="&gt;&gt;colSelected.Type" xml:space="preserve">
<value>DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value> <value>DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data> </data>
<data name="&gt;&gt;gridBand3.Name" xml:space="preserve">
<value>gridBand3</value>
</data>
<data name="&gt;&gt;gridBand3.Type" xml:space="preserve">
<value>DevExpress.XtraGrid.Views.BandedGrid.GridBand, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="&gt;&gt;colFilename.Name" xml:space="preserve"> <data name="&gt;&gt;colFilename.Name" xml:space="preserve">
<value>colFilename</value> <value>colFilename</value>
</data> </data>

View File

@ -16,7 +16,7 @@ Imports MultiTool.Shared.Schemas
Imports MultiTool.Shared.Winline Imports MultiTool.Shared.Winline
Imports MultiTool.Shared.Constants Imports MultiTool.Shared.Constants
Imports DevExpress.XtraReports.UI Imports DevExpress.XtraReports.UI
Imports MultiTool.Shared.DocumentRow Imports MultiTool.Shared.Documents.DocumentRow
Public Class frmImportMain Public Class frmImportMain
Private LogConfig As LogConfig Private LogConfig As LogConfig

View File

@ -2,7 +2,7 @@
Imports DevExpress.XtraGrid.Views.Grid Imports DevExpress.XtraGrid.Views.Grid
Imports DevExpress.XtraVerticalGrid.Rows Imports DevExpress.XtraVerticalGrid.Rows
Imports MultiTool.Shared.Documents Imports MultiTool.Shared.Documents
Imports MultiTool.Shared.DocumentRow Imports MultiTool.Shared.Documents.DocumentRow
Imports MultiTool.Shared Imports MultiTool.Shared
Imports DevExpress.XtraEditors.Repository Imports DevExpress.XtraEditors.Repository
Imports MultiTool.Shared.Winline Imports MultiTool.Shared.Winline

View File

@ -1,4 +1,5 @@
Public Class DocumentRow Namespace Documents
Public Class DocumentRow
''' <summary> ''' <summary>
''' Tabellen/Elementname aus XML ''' Tabellen/Elementname aus XML
''' </summary> ''' </summary>
@ -22,3 +23,5 @@
End Function End Function
End Class End Class
End Class End Class
End Namespace

View File

@ -3,7 +3,7 @@ Imports System.Text.RegularExpressions
Imports AutoMapper Imports AutoMapper
Imports AutoMapper.Configuration Imports AutoMapper.Configuration
Imports DigitalData.Modules.Logging Imports DigitalData.Modules.Logging
Imports MultiTool.Shared.DocumentRow Imports MultiTool.Shared.Documents.DocumentRow
Public Class Mapper Public Class Mapper
Private MapperConfig As MapperConfiguration Private MapperConfig As MapperConfiguration