From 82bd76d669dfef99c243a8ab9e946bd3018ca46d Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Mon, 24 Jan 2022 10:46:16 +0100 Subject: [PATCH] Show empty string for DateTime.MinValue in Export form --- MultiTool.Form/frmExportMain.Designer.vb | 26 ++++++++++++------------ MultiTool.Form/frmExportMain.vb | 6 ++++++ 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/MultiTool.Form/frmExportMain.Designer.vb b/MultiTool.Form/frmExportMain.Designer.vb index 9120fb3..0005311 100644 --- a/MultiTool.Form/frmExportMain.Designer.vb +++ b/MultiTool.Form/frmExportMain.Designer.vb @@ -49,6 +49,7 @@ Partial Class frmExportMain Me.GridColumn5 = New DevExpress.XtraGrid.Columns.GridColumn() Me.GridColumn6 = New DevExpress.XtraGrid.Columns.GridColumn() Me.GridColumn8 = New DevExpress.XtraGrid.Columns.GridColumn() + Me.RepositoryItemDateEdit1 = New DevExpress.XtraEditors.Repository.RepositoryItemDateEdit() Me.GridColumn9 = New DevExpress.XtraGrid.Columns.GridColumn() Me.GridColumn10 = New DevExpress.XtraGrid.Columns.GridColumn() Me.SplitContainerControl1 = New DevExpress.XtraEditors.SplitContainerControl() @@ -82,12 +83,13 @@ 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() CType(Me.RepositoryItemImageComboBox1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.BooleanImages, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.RepositoryItemDateEdit1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.RepositoryItemDateEdit1.CalendarTimeProperties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.SplitContainerControl1.Panel1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainerControl1.Panel1.SuspendLayout() @@ -116,8 +118,6 @@ 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 @@ -341,6 +341,14 @@ Partial Class frmExportMain Me.GridColumn8.Visible = True Me.GridColumn8.VisibleIndex = 9 ' + '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 = "" + ' 'GridColumn9 ' Me.GridColumn9.Caption = "Exportiert Wer" @@ -668,14 +676,6 @@ 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!) @@ -695,6 +695,8 @@ Partial Class frmExportMain CType(Me.GridViewDocuments, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.RepositoryItemImageComboBox1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.BooleanImages, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.RepositoryItemDateEdit1.CalendarTimeProperties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.RepositoryItemDateEdit1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.SplitContainerControl1.Panel1, System.ComponentModel.ISupportInitialize).EndInit() Me.SplitContainerControl1.Panel1.ResumeLayout(False) CType(Me.SplitContainerControl1.Panel2, System.ComponentModel.ISupportInitialize).EndInit() @@ -724,8 +726,6 @@ 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() diff --git a/MultiTool.Form/frmExportMain.vb b/MultiTool.Form/frmExportMain.vb index 45d555b..336cf0b 100644 --- a/MultiTool.Form/frmExportMain.vb +++ b/MultiTool.Form/frmExportMain.vb @@ -214,4 +214,10 @@ Public Class frmExportMain Private Sub BarButtonItem3_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem3.ItemClick FormHelper.TryOpenDirectory(My.GeneralConfiguration.TemplateDirectory, My.Resources.frmImportMainExtra.Vorlagenverzeichnis) End Sub + + Private Sub GridViewDocuments_CustomDrawCell(sender As Object, e As DevExpress.XtraGrid.Views.Base.RowCellCustomDrawEventArgs) Handles GridViewDocuments.CustomDrawCell + If e.Column.ColumnType = GetType(Date) AndAlso e.CellValue = Date.MinValue Then + e.DisplayText = "" + End If + End Sub End Class \ No newline at end of file