mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-28 05:00:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

mobile/summary: use more intuitive time periods

Browse source 
No one will ask you about your dives in the last seven months (and the
existing code actually provided the past 210 days in that case). Instead
do more intuitive periods. Last month, quarter, half year, year.

Use Qt's ability to make sane date calculations easy.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2020-02-07 15:49:31 -08:00
parent fb057b7094
commit 6c7411c776
2 changed files with 26 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
mobile-widgets/qml/DiveSummary.qml
View file

@ -48,19 +48,11 @@ Kirigami.ScrollablePage {
ListModel { ListModel {
id: monthModel id: monthModel
ListElement {text: qsTr("Total")} ListElement {text: qsTr("All")}
ListElement {text: qsTr(" 1 month [ 30 days]")} ListElement {text: qsTr("1 month")}
ListElement {text: qsTr(" 2 month [ 60 days]")} ListElement {text: qsTr("3 months")}
ListElement {text: qsTr(" 3 month [ 90 days]")} ListElement {text: qsTr("6 months")}
ListElement {text: qsTr(" 4 month [120 days]")} ListElement {text: qsTr("1 year")}
ListElement {text: qsTr(" 5 month [150 days]")}
ListElement {text: qsTr(" 6 month [180 days]")}
ListElement {text: qsTr(" 7 month [210 days]")}
ListElement {text: qsTr(" 8 month [240 days]")}
ListElement {text: qsTr(" 9 month [270 days]")}
ListElement {text: qsTr("10 month [300 days]")}
ListElement {text: qsTr("11 month [330 days]")}
ListElement {text: qsTr("12 month [360 days]")}
} }
TemplateLabel { TemplateLabel {

26
qt-models/divesummarymodel.cpp
View file

@ -242,12 +242,28 @@ void DiveSummaryModel::calc(int column, int period)
if (column >= (int)results.size()) if (column >= (int)results.size())
return; return;
QDateTime localTime; QDateTime currentTime = QDateTime::currentDateTime();
QDateTime startTime = currentTime;
// Calculate Start of the 2 periods. // Calculate Start of the periods.
timestamp_t now, start; switch (period) {
now = QDateTime::currentMSecsSinceEpoch() / 1000L + gettimezoneoffset(); case 0: // having startTime == currentTime is used as special case below
start = (period == 0) ? 0 : now - period * 30 * 24 * 60 * 60; break;
case 1: startTime = currentTime.addMonths(-1);
break;
case 2: startTime = currentTime.addMonths(-3);
break;
case 3: startTime = currentTime.addMonths(-6);
break;
case 4: startTime = currentTime.addYears(-1);
break;
default: qWarning("DiveSummaryModel::calc called with invalid period");
}
timestamp_t start;
if (startTime == currentTime)
start = 0;
else
start = startTime.toMSecsSinceEpoch() / 1000L + gettimezoneoffset();
// Loop over all dives and sum up data // Loop over all dives and sum up data
Stats stats = loopDives(start); Stats stats = loopDives(start);