AppCustom/MultiTool
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

First pass of new mandator selection

Browse Source
This commit is contained in:
Jonathan Jenne
2021-11-19 16:23:18 +01:00
parent dec45ef493
commit ac50cf661b
19 changed files with 235 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
MultiTool.Form/MyApplication.vb
View File

@@ -4,6 +4,7 @@ Namespace My
<HideModuleName()>
Module MyExtensions
Friend Property TemplateConfiguration As TemplateConfig
Friend Property MappingConfiguration As New List(Of MappingConfig)
Friend Property MappingConfiguration As MappingConfig
Friend Property MandatorConfiguration As MandatorConfig
End Module
End Namespace

64
MultiTool.Form/frmImportMain.Designer.vb generated
View File

@@ -29,13 +29,12 @@ Partial Class frmImportMain
Me.SplitContainerMain = New DevExpress.XtraEditors.SplitContainerControl()
Me.GridControlFiles = New DevExpress.XtraGrid.GridControl()
Me.GridViewFiles = New DevExpress.XtraGrid.Views.BandedGrid.AdvBandedGridView()
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()
Me.cmbMandators = New DevExpress.XtraEditors.Repository.RepositoryItemComboBox()
Me.BandedGridColumn1 = New DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn()
Me.RibbonControl = New DevExpress.XtraBars.Ribbon.RibbonControl()
Me.txtVersion = New DevExpress.XtraBars.BarStaticItem()
Me.txtFilesLoaded = New DevExpress.XtraBars.BarStaticItem()
@@ -86,6 +85,9 @@ Partial Class frmImportMain
Me.GridView4 = New DevExpress.XtraGrid.Views.Grid.GridView()
Me.BehaviorManager = New DevExpress.Utils.Behaviors.BehaviorManager(Me.components)
Me.SplashScreenManager = New DevExpress.XtraSplashScreen.SplashScreenManager(Me, GetType(Global.MultiTool.Form.frmWaitForm), True, True)
Me.gridBand1 = New DevExpress.XtraGrid.Views.BandedGrid.GridBand()
Me.GridBand2 = New DevExpress.XtraGrid.Views.BandedGrid.GridBand()
Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem()
CType(Me.SplitContainerMain, System.ComponentModel.ISupportInitialize).BeginInit()
Me.SplitContainerMain.SuspendLayout()
CType(Me.GridControlFiles, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -137,8 +139,8 @@ Partial Class frmImportMain
'
'GridViewFiles
'
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.Bands.AddRange(New DevExpress.XtraGrid.Views.BandedGrid.GridBand() {Me.gridBand1, Me.GridBand2})
Me.GridViewFiles.Columns.AddRange(New DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn() {Me.colSelected, Me.colFilename, Me.colMandator, Me.colCreatedAt, Me.BandedGridColumn1})
Me.GridViewFiles.GridControl = Me.GridControlFiles
Me.GridViewFiles.Name = "GridViewFiles"
Me.GridViewFiles.OptionsView.ShowBands = False
@@ -146,12 +148,6 @@ Partial Class frmImportMain
Me.GridViewFiles.OptionsView.ShowGroupPanel = False
Me.GridViewFiles.OptionsView.ShowIndicator = False
'
'gridBand1
'
resources.ApplyResources(Me.gridBand1, "gridBand1")
Me.gridBand1.Columns.Add(Me.colSelected)
Me.gridBand1.VisibleIndex = 0
'
'colSelected
'
Me.colSelected.AutoFillDown = True
@@ -164,18 +160,10 @@ 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")
Me.colFilename.FieldName = "Name"
Me.colFilename.FieldName = "FileName"
Me.colFilename.Name = "colFilename"
Me.colFilename.OptionsColumn.AllowEdit = False
Me.colFilename.OptionsColumn.ReadOnly = True
@@ -195,7 +183,7 @@ Partial Class frmImportMain
Me.colMandator.ColumnEdit = Me.cmbMandators
Me.colMandator.FieldName = "MandatorId"
Me.colMandator.Name = "colMandator"
Me.colMandator.RowIndex = 2
Me.colMandator.RowIndex = 1
'
'cmbMandators
'
@@ -204,12 +192,18 @@ Partial Class frmImportMain
Me.cmbMandators.Items.AddRange(New Object() {resources.GetString("cmbMandators.Items")})
Me.cmbMandators.Name = "cmbMandators"
'
'BandedGridColumn1
'
resources.ApplyResources(Me.BandedGridColumn1, "BandedGridColumn1")
Me.BandedGridColumn1.FieldName = "Mandator"
Me.BandedGridColumn1.Name = "BandedGridColumn1"
'
'RibbonControl
'
Me.RibbonControl.ExpandCollapseItem.Id = 0
Me.RibbonControl.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl.ExpandCollapseItem, Me.RibbonControl.SearchEditItem, Me.txtVersion, 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.txtCulture, Me.btnRemoveRow, Me.BarWorkspaceMenuItem1, Me.btnTestTransferFile})
Me.RibbonControl.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl.ExpandCollapseItem, Me.RibbonControl.SearchEditItem, Me.txtVersion, 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.txtCulture, Me.btnRemoveRow, Me.BarWorkspaceMenuItem1, Me.btnTestTransferFile, Me.BarButtonItem1})
resources.ApplyResources(Me.RibbonControl, "RibbonControl")
Me.RibbonControl.MaxItemId = 30
Me.RibbonControl.MaxItemId = 31
Me.RibbonControl.Name = "RibbonControl"
Me.RibbonControl.PageHeaderItemLinks.Add(Me.BarWorkspaceMenuItem1)
Me.RibbonControl.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1, Me.RibbonPage2})
@@ -571,6 +565,26 @@ Partial Class frmImportMain
'
Me.SplashScreenManager.ClosingDelay = 500
'
'gridBand1
'
resources.ApplyResources(Me.gridBand1, "gridBand1")
Me.gridBand1.Columns.Add(Me.colSelected)
Me.gridBand1.VisibleIndex = 0
'
'GridBand2
'
resources.ApplyResources(Me.GridBand2, "GridBand2")
Me.GridBand2.Columns.Add(Me.colFilename)
Me.GridBand2.Columns.Add(Me.colCreatedAt)
Me.GridBand2.Columns.Add(Me.colMandator)
Me.GridBand2.VisibleIndex = 1
'
'BarButtonItem1
'
resources.ApplyResources(Me.BarButtonItem1, "BarButtonItem1")
Me.BarButtonItem1.Id = 30
Me.BarButtonItem1.Name = "BarButtonItem1"
'
'frmImportMain
'
resources.ApplyResources(Me, "$this")
@@ -671,9 +685,11 @@ 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
Friend WithEvents BarWorkspaceMenuItem1 As DevExpress.XtraBars.BarWorkspaceMenuItem
Friend WithEvents WorkspaceManager1 As DevExpress.Utils.WorkspaceManager
Friend WithEvents btnTestTransferFile As DevExpress.XtraBars.BarButtonItem
Friend WithEvents BandedGridColumn1 As DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn
Friend WithEvents gridBand1 As DevExpress.XtraGrid.Views.BandedGrid.GridBand
Friend WithEvents GridBand2 As DevExpress.XtraGrid.Views.BandedGrid.GridBand
Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem
End Class

64
MultiTool.Form/frmImportMain.resx
View File

@@ -150,7 +150,7 @@
<data name="gridBand1.Width" type="System.Int32, mscorlib">
<value>27</value>
</data>
<data name="gridBand3.Caption" xml:space="preserve">
<data name="GridBand2.Caption" xml:space="preserve">
<value>gridBand3</value>
</data>
<data name="colFilename.Caption" xml:space="preserve">
@@ -160,7 +160,7 @@
<value>True</value>
</data>
<data name="colFilename.Width" type="System.Int32, mscorlib">
<value>303</value>
<value>683</value>
</data>
<data name="colCreatedAt.Caption" xml:space="preserve">
<value>Eingegangen</value>
@@ -169,7 +169,7 @@
<value>True</value>
</data>
<data name="colCreatedAt.Width" type="System.Int32, mscorlib">
<value>303</value>
<value>299</value>
</data>
<data name="colMandator.Caption" xml:space="preserve">
<value>Mandant</value>
@@ -184,14 +184,23 @@
<data name="cmbMandators.Items" xml:space="preserve">
<value>SIVT</value>
</data>
<data name="colMandator.Visible" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="colMandator.Width" type="System.Int32, mscorlib">
<value>144</value>
<value>384</value>
</data>
<data name="gridBand3.Name" xml:space="preserve">
<value>gridBand3</value>
<data name="GridBand2.Name" xml:space="preserve">
<value>GridBand2</value>
</data>
<data name="gridBand3.Width" type="System.Int32, mscorlib">
<value>303</value>
<data name="GridBand2.Width" type="System.Int32, mscorlib">
<value>683</value>
</data>
<data name="BandedGridColumn1.Caption" xml:space="preserve">
<value>BandedGridColumn1</value>
</data>
<data name="BandedGridColumn1.Visible" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="txtVersion.Caption" xml:space="preserve">
<value>Version 1.0.0.0</value>
@@ -262,6 +271,9 @@
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
<value>1215, 746</value>
</data>
<data name="BarButtonItem1.Caption" xml:space="preserve">
<value>BarButtonItem1</value>
</data>
<data name="RibbonStatusBar.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 722</value>
</data>
@@ -311,24 +323,12 @@
<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>
</data>
<data name="&gt;&gt;gridBand1.Name" xml:space="preserve">
<value>gridBand1</value>
</data>
<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>
</data>
<data name="&gt;&gt;colSelected.Name" xml:space="preserve">
<value>colSelected</value>
</data>
<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>
</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">
<value>colFilename</value>
</data>
@@ -353,6 +353,12 @@
<data name="&gt;&gt;cmbMandators.Type" xml:space="preserve">
<value>DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="&gt;&gt;BandedGridColumn1.Name" xml:space="preserve">
<value>BandedGridColumn1</value>
</data>
<data name="&gt;&gt;BandedGridColumn1.Type" xml:space="preserve">
<value>DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="&gt;&gt;txtVersion.Name" xml:space="preserve">
<value>txtVersion</value>
</data>
@@ -581,6 +587,24 @@
<data name="&gt;&gt;SplashScreenManager.Type" xml:space="preserve">
<value>DevExpress.XtraSplashScreen.SplashScreenManager, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="&gt;&gt;gridBand1.Name" xml:space="preserve">
<value>gridBand1</value>
</data>
<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>
</data>
<data name="&gt;&gt;GridBand2.Name" xml:space="preserve">
<value>GridBand2</value>
</data>
<data name="&gt;&gt;GridBand2.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;BarButtonItem1.Name" xml:space="preserve">
<value>BarButtonItem1</value>
</data>
<data name="&gt;&gt;BarButtonItem1.Type" xml:space="preserve">
<value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="&gt;&gt;$this.Name" xml:space="preserve">
<value>frmImportMain</value>
</data>

9
MultiTool.Form/frmImportMain.vb
View File

@@ -76,7 +76,7 @@ Public Class frmImportMain
GridViewFiles.OptionsView.ShowAutoFilterRow = False
FileEx = New DigitalData.Modules.Filesystem.File(LogConfig)
Winline = New WinlineData(LogConfig, Database, ConfigManager.Config)
Winline = New WinlineData(LogConfig, Database, ConfigManager.Config, My.MappingConfiguration, My.MandatorConfiguration)
WebService = New WebServiceData(LogConfig, ConfigManager.Config, Application.UserAppDataPath)
AddHandler WebService.WebServiceProgress, AddressOf WebService_Progress
@@ -238,7 +238,11 @@ Public Class frmImportMain
SplashScreenManager.SetWaitFormDescription(oMessage)
End Sub
If DocumentLoader.LoadFiles(ConfigManager.Config.InputDirectory, CurrentTemplate, lookupMandator.EditValue) Then
If DocumentLoader.LoadFiles(
ConfigManager.Config.InputDirectory,
CurrentTemplate,
lookupMandator.EditValue
) Then
GridControlFiles.DataSource = Nothing
GridControlFiles.DataSource = DocumentLoader.Files
@@ -272,7 +276,6 @@ Public Class frmImportMain
Try
If oResult = DialogResult.Yes Then
Dim oDocument As Document = GridViewFiles.GetRow(GridViewFiles.FocusedRowHandle)
Dim oNewDocument = DocumentLoader.LoadFile(oDocument.File, CurrentTemplate, lookupMandator.EditValue)
Dim oIndex = DocumentLoader.Files.IndexOf(oDocument)
DocumentLoader.Files.Item(oIndex) = oNewDocument

2
MultiTool.Form/frmMain.vb
View File

@@ -56,10 +56,12 @@ Public Class frmMain
Await TemplateLoader.LoadTemplates()
Await TemplateLoader.LoadTemplateConfiguration()
Await TemplateLoader.LoadMappingConfiguration()
Await TemplateLoader.LoadMandatorConfiguration()
' Save Schema data in 'My' Namespace
My.MappingConfiguration = TemplateLoader.MappingConfiguration
My.TemplateConfiguration = TemplateLoader.TemplateConfiguration
My.MandatorConfiguration = TemplateLoader.MandatorConfiguration
Dim oBindingSource = New BindingList(Of Template)
For Each oTemplate As Template In TemplateLoader.TemplateList