From 9d2828bfaf5c69f7463b3a684687241e3a92fce2 Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Sun, 15 Dec 2019 13:08:44 +0100 Subject: [PATCH] Fix leap years in calendar --- nymea-app/ui/components/DatePicker.qml | 6 +++--- nymea-app/ui/system/GeneralSettingsPage.qml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nymea-app/ui/components/DatePicker.qml b/nymea-app/ui/components/DatePicker.qml index c3fa0460..000bc76a 100644 --- a/nymea-app/ui/components/DatePicker.qml +++ b/nymea-app/ui/components/DatePicker.qml @@ -96,9 +96,9 @@ ColumnLayout { property date firstOfMonth: new Date(root.date.getFullYear(), root.date.getMonth(), 1) property int offset: ((firstOfMonth.getDay() - 1) % 7 + 7) % 7 - property bool isLeapYear: false - property int daysInMonth: isLeapYear ? monthModel.get(root.date.getMonth()).leapDays : monthModel.get(root.date.getMonth()).days - property int daysInPreviousMonth: isLeapYear ? monthModel.get((root.date.getMonth() + 11) % 12).leapDays : monthModel.get((root.date.getMonth() + 11) % 12).days + property bool isLeapYear: firstOfMonth.getFullYear() % 4 == 0 && firstOfMonth.getFullYear() % 100 != 0 + property int daysInMonth: isLeapYear ? monthModel.get(root.date.getMonth()).leapYearDays : monthModel.get(root.date.getMonth()).days + property int daysInPreviousMonth: isLeapYear ? monthModel.get((root.date.getMonth() + 11) % 12).leapYearDays : monthModel.get((root.date.getMonth() + 11) % 12).days Repeater { model: 6 * 7 diff --git a/nymea-app/ui/system/GeneralSettingsPage.qml b/nymea-app/ui/system/GeneralSettingsPage.qml index c25c81f3..1aff4b5b 100644 --- a/nymea-app/ui/system/GeneralSettingsPage.qml +++ b/nymea-app/ui/system/GeneralSettingsPage.qml @@ -38,7 +38,7 @@ Page { RowLayout { Layout.fillWidth: true - visible: engine.systemController.automaticTimeAvailable + visible: engine.jsonRpcClient.ensureServerVersion("4.1") && engine.systemController.automaticTimeAvailable Label { text: qsTr("Set date and time automatically") Layout.fillWidth: true