From a8fc2e9917bf8218d928b25ca07598e16d7145a3 Mon Sep 17 00:00:00 2001
From: Claudio Cambra <claudio.cambra@gmail.com>
Date: Mon, 13 Sep 2021 19:15:28 +0200
Subject: [PATCH 1/2] Fixed displaying of time-related info for todos in todo
 view

---
 src/contents/ui/IncidenceInfo.qml | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/src/contents/ui/IncidenceInfo.qml b/src/contents/ui/IncidenceInfo.qml
index 80646f1a..f129d5b5 100644
--- a/src/contents/ui/IncidenceInfo.qml
+++ b/src/contents/ui/IncidenceInfo.qml
@@ -227,22 +227,31 @@ Kirigami.OverlayDrawer {
                     QQC2.Label {
                         Layout.alignment: Qt.AlignTop
                         text: i18n("<b>Date:</b>")
+                        visible: !isNaN(incidenceInfo.incidenceData.startTime.getTime()) || !isNaN(incidenceInfo.incidenceData.endTime.getTime())
                     }
                     QQC2.Label {
                         Layout.alignment: Qt.AlignTop
                         Layout.fillWidth: true
 
-                        text: incidenceInfo.incidenceData.startTime.toDateString() == incidenceInfo.incidenceData.endTime.toDateString() ?
-                        incidenceInfo.incidenceData.startTime.toLocaleDateString(Qt.locale()) :
-                        incidenceInfo.incidenceData.startTime.toLocaleDateString(Qt.locale()) + " - " + incidenceInfo.incidenceData.endTime.toLocaleDateString(Qt.locale())
+                        text: if(incidenceInfo.incidenceData.startTime.toDateString() == incidenceInfo.incidenceData.endTime.toDateString()) {
+                            return incidenceInfo.incidenceData.startTime.toLocaleDateString(Qt.locale());
+                        } else if (!isNaN(incidenceInfo.incidenceData.startTime.getTime()) && !isNaN(incidenceInfo.incidenceData.endTime.getTime())) {
+                            incidenceInfo.incidenceData.startTime.toLocaleDateString(Qt.locale()) + " - " + incidenceInfo.incidenceData.endTime.toLocaleDateString(Qt.locale())
+                        } else if (isNaN(incidenceInfo.incidenceData.startTime.getTime()) && !isNaN(incidenceInfo.incidenceData.endTime.getTime())) {
+                            return incidenceInfo.incidenceData.endTime.toLocaleDateString(Qt.locale())
+                        } else if (isNaN(incidenceInfo.incidenceData.endTime.getTime()) && !isNaN(incidenceInfo.incidenceData.startTime.getTime())) {
+                            return incidenceInfo.incidenceData.startTime.toLocaleDateString(Qt.locale())
+                        }
                         wrapMode: Text.Wrap
+                        visible: !isNaN(incidenceInfo.incidenceData.startTime.getTime()) || !isNaN(incidenceInfo.incidenceData.endTime.getTime())
                     }
 
                     QQC2.Label {
                         Layout.alignment: Qt.AlignTop
                         text: i18n("<b>Time:</b>")
                         visible: !incidenceInfo.incidenceData.allDay &&
-                        incidenceInfo.incidenceData.startTime.toDateString() == incidenceInfo.incidenceData.endTime.toDateString()
+                            incidenceInfo.incidenceData.startTime.toDateString() == incidenceInfo.incidenceData.endTime.toDateString() &&
+                            (!isNaN(incidenceInfo.incidenceData.startTime.getTime()) || !isNaN(incidenceInfo.incidenceData.endTime.getTime()))
                     }
                     QQC2.Label {
                         Layout.alignment: Qt.AlignTop
@@ -257,20 +266,23 @@ Kirigami.OverlayDrawer {
                         }
                         wrapMode: Text.Wrap
                         visible: !incidenceInfo.incidenceData.allDay &&
-                        incidenceInfo.incidenceData.startTime.toDateString() == incidenceInfo.incidenceData.endTime.toDateString()
+                            incidenceInfo.incidenceData.startTime.toDateString() == incidenceInfo.incidenceData.endTime.toDateString() &&
+                            (!isNaN(incidenceInfo.incidenceData.startTime.getTime()) || !isNaN(incidenceInfo.incidenceData.endTime.getTime()))
                     }
 
                     QQC2.Label {
                         Layout.alignment: Qt.AlignTop
                         text: i18n("<b>Duration:</b>")
-                        visible: incidenceInfo.incidenceData.durationString
+                        visible: incidenceInfo.incidenceData.durationString &&
+                            (!isNaN(incidenceInfo.incidenceData.startTime.getTime()) || !isNaN(incidenceInfo.incidenceData.endTime.getTime()))
                     }
                     QQC2.Label {
                         Layout.alignment: Qt.AlignTop
                         Layout.fillWidth: true
 
                         text: incidenceInfo.incidenceData.durationString
-                        visible: incidenceInfo.incidenceData.durationString
+                        visible: incidenceInfo.incidenceData.durationString &&
+                            (!isNaN(incidenceInfo.incidenceData.startTime.getTime()) || !isNaN(incidenceInfo.incidenceData.endTime.getTime()))
                         wrapMode: Text.Wrap
                     }
 
-- 
GitLab


From 9c01de97ccc6e9e0ba2f56d5ce88cd875337fc3e Mon Sep 17 00:00:00 2001
From: Carl Schwan <carl@carlschwan.eu>
Date: Mon, 13 Sep 2021 17:31:49 +0000
Subject: [PATCH 2/2] Apply 1 suggestion(s) to 1 file(s)

---
 src/contents/ui/IncidenceInfo.qml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/contents/ui/IncidenceInfo.qml b/src/contents/ui/IncidenceInfo.qml
index f129d5b5..482146bb 100644
--- a/src/contents/ui/IncidenceInfo.qml
+++ b/src/contents/ui/IncidenceInfo.qml
@@ -233,7 +233,7 @@ Kirigami.OverlayDrawer {
                         Layout.alignment: Qt.AlignTop
                         Layout.fillWidth: true
 
-                        text: if(incidenceInfo.incidenceData.startTime.toDateString() == incidenceInfo.incidenceData.endTime.toDateString()) {
+                        text: if(incidenceInfo.incidenceData.startTime.toDateString() === incidenceInfo.incidenceData.endTime.toDateString()) {
                             return incidenceInfo.incidenceData.startTime.toLocaleDateString(Qt.locale());
                         } else if (!isNaN(incidenceInfo.incidenceData.startTime.getTime()) && !isNaN(incidenceInfo.incidenceData.endTime.getTime())) {
                             incidenceInfo.incidenceData.startTime.toLocaleDateString(Qt.locale()) + " - " + incidenceInfo.incidenceData.endTime.toLocaleDateString(Qt.locale())
-- 
GitLab