From 706edf80267d4024e883ba534a33fef19a04161d Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Fri, 21 Jan 2022 15:03:51 +0100 Subject: [PATCH] Export Columns in Export Grid --- MultiTool.Form/My Project/licenses.licx | 17 ++++--- MultiTool.Form/frmExportMain.Designer.vb | 50 ++++++++++++++++++- MultiTool.Form/frmExportMain.vb | 2 +- MultiTool.Shared/Winline/Entities/Document.vb | 2 + MultiTool.Shared/Winline/WinlineData.vb | 17 +++++-- 5 files changed, 74 insertions(+), 14 deletions(-) diff --git a/MultiTool.Form/My Project/licenses.licx b/MultiTool.Form/My Project/licenses.licx index 3b88066..1b98ec5 100644 --- a/MultiTool.Form/My Project/licenses.licx +++ b/MultiTool.Form/My Project/licenses.licx @@ -1,14 +1,15 @@ -DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.GridLookUpEdit, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.Repository.RepositoryItemDateEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraEditors.LookUpEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraEditors.Repository.RepositoryItemProgressBar, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraEditors.Repository.RepositoryItemImageComboBox, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.GridLookUpEdit, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraEditors.DateEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraEditors.SearchLookUpEdit, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/MultiTool.Form/frmExportMain.Designer.vb b/MultiTool.Form/frmExportMain.Designer.vb index 96bdf25..9120fb3 100644 --- a/MultiTool.Form/frmExportMain.Designer.vb +++ b/MultiTool.Form/frmExportMain.Designer.vb @@ -48,6 +48,9 @@ Partial Class frmExportMain Me.colDate = New DevExpress.XtraGrid.Columns.GridColumn() Me.GridColumn5 = New DevExpress.XtraGrid.Columns.GridColumn() Me.GridColumn6 = New DevExpress.XtraGrid.Columns.GridColumn() + Me.GridColumn8 = New DevExpress.XtraGrid.Columns.GridColumn() + Me.GridColumn9 = New DevExpress.XtraGrid.Columns.GridColumn() + Me.GridColumn10 = New DevExpress.XtraGrid.Columns.GridColumn() Me.SplitContainerControl1 = New DevExpress.XtraEditors.SplitContainerControl() Me.LayoutControl1 = New DevExpress.XtraLayout.LayoutControl() Me.lookupMandator = New DevExpress.XtraEditors.GridLookUpEdit() @@ -79,6 +82,7 @@ Partial Class frmExportMain 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.RepositoryItemDateEdit1 = New DevExpress.XtraEditors.Repository.RepositoryItemDateEdit() CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridControlDocuments, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridViewDocuments, System.ComponentModel.ISupportInitialize).BeginInit() @@ -112,6 +116,8 @@ Partial Class frmExportMain CType(Me.LayoutControlItem5, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem6, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem7, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.RepositoryItemDateEdit1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.RepositoryItemDateEdit1.CalendarTimeProperties, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'RibbonControl1 @@ -224,14 +230,14 @@ Partial Class frmExportMain Me.GridControlDocuments.MainView = Me.GridViewDocuments Me.GridControlDocuments.MenuManager = Me.RibbonControl1 Me.GridControlDocuments.Name = "GridControlDocuments" - Me.GridControlDocuments.RepositoryItems.AddRange(New DevExpress.XtraEditors.Repository.RepositoryItem() {Me.RepositoryItemImageComboBox1}) + Me.GridControlDocuments.RepositoryItems.AddRange(New DevExpress.XtraEditors.Repository.RepositoryItem() {Me.RepositoryItemImageComboBox1, Me.RepositoryItemDateEdit1}) Me.GridControlDocuments.Size = New System.Drawing.Size(799, 538) Me.GridControlDocuments.TabIndex = 2 Me.GridControlDocuments.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewDocuments}) ' 'GridViewDocuments ' - Me.GridViewDocuments.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colImported, Me.colNumber, Me.colAccount, Me.GridColumn7, Me.colDate, Me.GridColumn5, Me.GridColumn6}) + Me.GridViewDocuments.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colImported, Me.colNumber, Me.colAccount, Me.GridColumn7, Me.colDate, Me.GridColumn5, Me.GridColumn6, Me.GridColumn8, Me.GridColumn9, Me.GridColumn10}) Me.GridViewDocuments.GridControl = Me.GridControlDocuments Me.GridViewDocuments.Name = "GridViewDocuments" Me.GridViewDocuments.OptionsSelection.CheckBoxSelectorField = "IsSelected" @@ -325,6 +331,32 @@ Partial Class frmExportMain Me.GridColumn6.VisibleIndex = 7 Me.GridColumn6.Width = 118 ' + 'GridColumn8 + ' + Me.GridColumn8.Caption = "Exportiert Wann" + Me.GridColumn8.ColumnEdit = Me.RepositoryItemDateEdit1 + Me.GridColumn8.FieldName = "ExportedWhen" + Me.GridColumn8.Name = "GridColumn8" + Me.GridColumn8.UnboundDataType = GetType(Date) + Me.GridColumn8.Visible = True + Me.GridColumn8.VisibleIndex = 9 + ' + 'GridColumn9 + ' + Me.GridColumn9.Caption = "Exportiert Wer" + Me.GridColumn9.FieldName = "ExportedWho" + Me.GridColumn9.Name = "GridColumn9" + Me.GridColumn9.Visible = True + Me.GridColumn9.VisibleIndex = 8 + ' + 'GridColumn10 + ' + Me.GridColumn10.Caption = "Exportierte Datei" + Me.GridColumn10.FieldName = "FilenameExport" + Me.GridColumn10.Name = "GridColumn10" + Me.GridColumn10.Visible = True + Me.GridColumn10.VisibleIndex = 10 + ' 'SplitContainerControl1 ' Me.SplitContainerControl1.Dock = System.Windows.Forms.DockStyle.Fill @@ -636,6 +668,14 @@ Partial Class frmExportMain ' Me.SplashScreenManager.ClosingDelay = 500 ' + 'RepositoryItemDateEdit1 + ' + Me.RepositoryItemDateEdit1.AutoHeight = False + Me.RepositoryItemDateEdit1.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) + Me.RepositoryItemDateEdit1.CalendarTimeProperties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) + Me.RepositoryItemDateEdit1.Name = "RepositoryItemDateEdit1" + Me.RepositoryItemDateEdit1.NullDate = "" + ' 'frmExportMain ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -684,6 +724,8 @@ Partial Class frmExportMain CType(Me.LayoutControlItem5, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem6, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem7, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.RepositoryItemDateEdit1.CalendarTimeProperties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.RepositoryItemDateEdit1, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -745,4 +787,8 @@ Partial Class frmExportMain Friend WithEvents RibbonPage3 As DevExpress.XtraBars.Ribbon.RibbonPage Friend WithEvents RibbonPageGroup3 As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents BarButtonItem3 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents GridColumn8 As DevExpress.XtraGrid.Columns.GridColumn + Friend WithEvents GridColumn9 As DevExpress.XtraGrid.Columns.GridColumn + Friend WithEvents GridColumn10 As DevExpress.XtraGrid.Columns.GridColumn + Friend WithEvents RepositoryItemDateEdit1 As DevExpress.XtraEditors.Repository.RepositoryItemDateEdit End Class diff --git a/MultiTool.Form/frmExportMain.vb b/MultiTool.Form/frmExportMain.vb index 3480182..45d555b 100644 --- a/MultiTool.Form/frmExportMain.vb +++ b/MultiTool.Form/frmExportMain.vb @@ -189,7 +189,7 @@ Public Class frmExportMain oDocument.IsExported = True Next - MsgBox($"{oExportCount} Dateien wurde erfolgreich exportiert!", MsgBoxStyle.Information, Text) + MsgBox($"{oExportCount} Dateien wurden erfolgreich exportiert!", MsgBoxStyle.Information, Text) Catch ex As MissingAttributeException FormHelper.ShowError(ex, "Exportieren der Daten") diff --git a/MultiTool.Shared/Winline/Entities/Document.vb b/MultiTool.Shared/Winline/Entities/Document.vb index 321fadb..1750e42 100644 --- a/MultiTool.Shared/Winline/Entities/Document.vb +++ b/MultiTool.Shared/Winline/Entities/Document.vb @@ -21,6 +21,8 @@ Public Property IsExported As Boolean = False Public Property FilenameExport As String + Public Property ExportedWhen As Date + Public Property ExportedWho As String End Class End Namespace \ No newline at end of file diff --git a/MultiTool.Shared/Winline/WinlineData.vb b/MultiTool.Shared/Winline/WinlineData.vb index c9bd4af..9989896 100644 --- a/MultiTool.Shared/Winline/WinlineData.vb +++ b/MultiTool.Shared/Winline/WinlineData.vb @@ -4,6 +4,7 @@ Imports MultiTool.Shared.Winline.Entities Imports System.Text.RegularExpressions Imports MultiTool.Shared.Templates Imports MultiTool.Shared.Constants +Imports DigitalData.Modules.Language Namespace Winline Public Class WinlineData @@ -569,7 +570,10 @@ Namespace Winline c100 GROSS_AMOUNT, c114 NET_AMOUNT, - U010 ALREADY_EXPORTED + U010 ALREADY_EXPORTED, + U011 EXPORTED_WHO, + U012 EXPORTED_WHEN, + U013 EXPORTED_FILE FROM [{pMandator.Database}].[dbo].[T025] WHERE @@ -621,7 +625,11 @@ Namespace Winline Dim oDocumentKind As Integer = pDataRow.Item("DOCUMENT_KIND") Dim oGrossAmount As Double = pDataRow.Item("GROSS_AMOUNT") Dim oNetAmount As Double = pDataRow.Item("NET_AMOUNT") - Dim oExported As Boolean = pDataRow.Item("ALREADY_EXPORTED") + Dim oExported As Boolean = pDataRow.ItemEx("ALREADY_EXPORTED", False) + Dim oExportedWho As String = pDataRow.ItemEx("EXPORTED_WHO", "") + Dim oExportedWhen As Date = pDataRow.ItemEx(Of Date)("EXPORTED_WHEN", Nothing) + Dim oExportFile As String = pDataRow.ItemEx("EXPORTED_FILE", "") + Dim oDocumentNumber As String = Nothing Dim oDocumentDate As Date = Nothing Dim oDocumentDateColumn As String = Nothing @@ -663,7 +671,10 @@ Namespace Winline .Kind = oKind, .GrossAmount = oGrossAmount, .NetAmount = oNetAmount, - .IsExported = oExported + .IsExported = oExported, + .ExportedWhen = oExportedWhen, + .ExportedWho = oExportedWho, + .FilenameExport = oExportFile } Return oDocument