From 2a12d034dadc64de9786a0d671fdfae2befaa494 Mon Sep 17 00:00:00 2001
From: Jonathan Jenne <j.jenne@didalog.de>
Date: Tue, 19 Sep 2017 16:46:00 +0200
Subject: [PATCH] jj date fix

---
 .../ClassWindreamDocGrid.vb                   | 36 +++++++++----------
 .../frmConstructor_Main.vb                    |  8 ++++-
 2 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/app/DD-Record-Organizer/ClassWindreamDocGrid.vb b/app/DD-Record-Organizer/ClassWindreamDocGrid.vb
index eb762ee..f332cf8 100644
--- a/app/DD-Record-Organizer/ClassWindreamDocGrid.vb
+++ b/app/DD-Record-Organizer/ClassWindreamDocGrid.vb
@@ -5,6 +5,7 @@ Imports DevExpress.XtraGrid.Views.Grid
 Imports DevExpress.XtraEditors
 Imports DevExpress.XtraEditors.Repository
 Imports DevExpress.XtraGrid.Views.Base
+Imports DevExpress.XtraEditors.Controls
 
 Public Class ClassWindreamDocGrid
     Public Shared SELECTED_DOC_PATH As String
@@ -298,8 +299,6 @@ Public Class ClassWindreamDocGrid
         Next
     End Sub
 
-
-
     Public Shared Sub detailView_CustomRowCellEdit(grvw As GridView, e As CustomRowCellEditEventArgs)
         Try
             If (e.Column.Name = "colVALUE") Then
@@ -332,30 +331,29 @@ Public Class ClassWindreamDocGrid
                 If typeId = 4 Then
                     Dim dateedit As New RepositoryItemDateEdit()
 
-                    ' Brauchen wir Zeitangaben in den Custom Fields?
-                    AddHandler dateedit.CustomDisplayText, Sub(sender As Object, _e As DevExpress.XtraEditors.Controls.CustomDisplayTextEventArgs)
-                                                               Dim parsedDate As DateTime
+                    dateedit.DisplayFormat.FormatType = FormatType.DateTime
+                    dateedit.DisplayFormat.FormatString = CURRENT_DATE_FORMAT
+                    dateedit.EditFormat.FormatType = FormatType.DateTime
+                    dateedit.EditFormat.FormatString = CURRENT_DATE_FORMAT
+                    dateedit.EditMask = CURRENT_DATE_FORMAT
 
-                                                               If Not DateTime.TryParse(_e.Value, parsedDate) Then
-                                                                   Try
-                                                                       If _e.Value <> "" Then
-                                                                           parsedDate = DateTime.ParseExact(_e.Value, CURRENT_DATE_FORMAT, System.Globalization.DateTimeFormatInfo.InvariantInfo) '& " HH:MM:ss"
-                                                                           _e.DisplayText = parsedDate.ToString(CURRENT_DATE_FORMAT) '& " HH:MM:ss")
-                                                                       End If
-
-                                                                   Catch ex As Exception
-                                                                       If LogErrorsOnly = False Then ClassLogger.Add("Error in parse-Date: " & ex.Message, False)
-                                                                   End Try
+                    AddHandler dateedit.FormatEditValue, Sub(sender As Object, _e As ConvertEditValueEventArgs)
+                                                             _e.Handled = True
+                                                         End Sub
 
+                    AddHandler dateedit.CustomDisplayText, Sub(sender As Object, _e As Controls.CustomDisplayTextEventArgs)
+                                                               Dim parsedDate As DateTime
+                                                               Dim stringDate As String = _e.Value.ToString
+                                                               If stringDate.Trim() = String.Empty Then
+                                                                   _e.DisplayText = ""
                                                                Else
+                                                                   If Not DateTime.TryParse(stringDate, parsedDate) Then
+                                                                       parsedDate = DateTime.ParseExact(stringDate, CURRENT_DATE_FORMAT, Globalization.DateTimeFormatInfo.InvariantInfo)
+                                                                   End If
                                                                    _e.DisplayText = parsedDate.ToString(CURRENT_DATE_FORMAT)
                                                                End If
-
-
-
                                                            End Sub
 
-
                     AddHandler dateedit.EditValueChanged, _datepickerValueChangedHandler
                     e.RepositoryItem = dateedit
                 End If
diff --git a/app/DD-Record-Organizer/frmConstructor_Main.vb b/app/DD-Record-Organizer/frmConstructor_Main.vb
index bec0dc2..2421543 100644
--- a/app/DD-Record-Organizer/frmConstructor_Main.vb
+++ b/app/DD-Record-Organizer/frmConstructor_Main.vb
@@ -3698,7 +3698,13 @@ Public Class frmConstructor_Main
             Dim value As DateTime = DatePicker.EditValue
 
             Dim oldValue As Date
-            Dim validDate As Boolean = Date.TryParse(DatePicker.OldEditValue, oldValue)
+            Dim validDate As Boolean = False
+
+            Try
+                validDate = Date.TryParse(DatePicker.OldEditValue, oldValue)
+            Catch ex As Exception
+                oldValue = Date.MinValue
+            End Try
 
             If Not validDate Then
                 oldValue = Date.MinValue