eyecreate/vehicle-voyage
Public Access
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Fix typo. Only have warning show for correct vehicle. Remove log screen when vehicle deleted.

Browse Source
This commit is contained in:
Kevin Whitaker
2020-08-22 19:47:44 -04:00
parent 43035181af
commit e20d6ce723
4 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/contents/ui/MainPage.qml
View File

@@ -119,6 +119,7 @@ Kirigami.PageRoute {
iconName: "edit-delete"
onTriggered: {
vehicleModel.removeVehicle(index);
router.navigateToRoute(["main"]);
}
}
]

8
src/contents/ui/ServiceRecords.qml
View File

@@ -10,7 +10,7 @@ Kirigami.PageRoute {
Kirigami.ScrollablePage {
property var vehicleId: Kirigami.PageRouter.data.id
Component.onCompleted: {
recordModel.changeVehicleFilter(vehcileId);
recordModel.changeVehicleFilter(vehicleId);
//Check vehicle warnings
dbAnalytics.checkOilChangeNeededForVehicle(vehicleId, appAnalyticsSettings.value("milesForOilChange",5000), appAnalyticsSettings.value("monthsForOilChange",6));
}
@@ -49,8 +49,10 @@ Kirigami.PageRoute {
text: qsTr("You are due for an oil change!")
Connections {
target: dbAnalytics
function onIsOilChangeNeeded(changeNeeded) {
oilMessage.visible = changeNeeded;
function onIsOilChangeNeeded(changeNeeded, vehicle) {
if(vehicle == vehicleId) {
oilMessage.visible = changeNeeded;
}
}
}
}

5
src/db/recordanalytics.cpp
View File

@@ -1,5 +1,4 @@
/*
* <one line to give the program's name and a brief idea of what it does.>
* Copyright (C) 2020 <Kevin Whitakerr> <eyecreate@eyecreate.org>
*
* This program is free software: you can redistribute it and/or modify
@@ -47,9 +46,9 @@ void RecordAnalytics::checkOilChangeNeededForVehicle(int vehicleId, int milesFor
}
}
if(lastKnownMiles-lastOilMiles > milesForChange || lastOilMiles == 0 || !lastOilDate.isValid() || lastOilDate.daysTo(QDateTime::currentDateTime()) > 30*monthsForChange) {
emit this->isOilChangeNeeded(true);
emit this->isOilChangeNeeded(true, vehicleId);
} else {
emit this->isOilChangeNeeded(false);
emit this->isOilChangeNeeded(false, vehicleId);
}
});
}

3
src/db/recordanalytics.h
View File

@@ -1,5 +1,4 @@
/*
* <one line to give the program's name and a brief idea of what it does.>
* Copyright (C) 2020 <Kevin Whitaker> <eyecreate@eyecreate.org>
*
* This program is free software: you can redistribute it and/or modify
@@ -34,7 +33,7 @@ public:
Q_INVOKABLE void checkOilChangeNeededForVehicle(int vehicleId, int milesForChange=5000, int monthsForChange=6);
signals:
void isOilChangeNeeded(bool changeNeeded);
void isOilChangeNeeded(bool changeNeeded, int vehicleId);
private:
QSqlDatabase _db;