ETM-Schurig/powersync-app
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix leap years in calendar

Browse Source
This commit is contained in:
Michael Zanetti 2019-12-15 13:08:44 +01:00
parent 187d306a0b
commit 9d2828bfaf
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nymea-app/ui/components/DatePicker.qml
View File

@ -96,9 +96,9 @@ ColumnLayout {
property date firstOfMonth: new Date(root.date.getFullYear(), root.date.getMonth(), 1) property date firstOfMonth: new Date(root.date.getFullYear(), root.date.getMonth(), 1)
property int offset: ((firstOfMonth.getDay() - 1) % 7 + 7) % 7 property int offset: ((firstOfMonth.getDay() - 1) % 7 + 7) % 7
property bool isLeapYear: false property bool isLeapYear: firstOfMonth.getFullYear() % 4 == 0 && firstOfMonth.getFullYear() % 100 != 0
property int daysInMonth: isLeapYear ? monthModel.get(root.date.getMonth()).leapDays : monthModel.get(root.date.getMonth()).days 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).leapDays : monthModel.get((root.date.getMonth() + 11) % 12).days property int daysInPreviousMonth: isLeapYear ? monthModel.get((root.date.getMonth() + 11) % 12).leapYearDays : monthModel.get((root.date.getMonth() + 11) % 12).days
Repeater { Repeater {
model: 6 * 7 model: 6 * 7

2
nymea-app/ui/system/GeneralSettingsPage.qml
View File

@ -38,7 +38,7 @@ Page {
RowLayout { RowLayout {
Layout.fillWidth: true Layout.fillWidth: true
visible: engine.systemController.automaticTimeAvailable visible: engine.jsonRpcClient.ensureServerVersion("4.1") && engine.systemController.automaticTimeAvailable
Label { Label {
text: qsTr("Set date and time automatically") text: qsTr("Set date and time automatically")
Layout.fillWidth: true Layout.fillWidth: true