diff --git a/src/contents/ui/IncidenceInfo.qml b/src/contents/ui/IncidenceInfo.qml index 80646f1a2245ea5995c056678789b52dd5c28dfb..482146bbddf61523f48afbd2831b06f33792d177 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("Date:") + 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("Time:") 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("Duration:") - 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 }