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

Add settings and start of record edit screen.

Browse Source
This commit is contained in:
Kevin Whitaker
2020-08-20 22:24:45 -04:00
parent 0d2a1d64bf
commit ea5779764d
9 changed files with 264 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/CMakeLists.txt
View File

@@ -12,5 +12,5 @@ target_link_libraries(vehiclevoyage Qt5::Core Qt5::Qml Qt5::Quick Qt5::QuickCont
install(TARGETS vehiclevoyage ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})
if (CMAKE_SYSTEM_NAME STREQUAL "Android")
kirigami_package_breeze_icons(ICONS list-add application-javascript help-about edit-find edit-delete window-close mail-sent globe)
kirigami_package_breeze_icons(ICONS list-add application-javascript help-about edit-find edit-delete window-close mail-sent globe preferences-system edit-symbolic)
endif()

125
src/contents/ui/EditRecord.qml Normal file
View File

@@ -0,0 +1,125 @@
import QtQuick 2.14
import org.kde.kirigami 2.12 as Kirigami
import QtQuick.Controls 2.14 as Controls
import QtQuick.Layouts 1.14 as Layouts
import QtQuick.Controls 1.4 as Old
import QtQuick.Dialogs 1.3 as Dialogs
Kirigami.PageRoute {
name: "editrecord"
Component {
Kirigami.Page {
id: editRecordPage
title: qsTr("Edit Service Record")
property var serviceId: Kirigami.PageRouter.data.id
property var record: recordModel.getRecord(serviceId)
Layouts.ColumnLayout {
anchors.fill: parent
Kirigami.InlineMessage {
Layouts.Layout.fillWidth: true
Layouts.Layout.leftMargin: 10
Layouts.Layout.rightMargin: 10
z: 9997
type: Kirigami.MessageType.Error
showCloseButton: true
id: formError
}
Kirigami.FormLayout {
Layouts.Layout.alignment: Qt.AlignHCenter
Layouts.Layout.fillWidth: true
width: editRecordPage.width
Item {
Kirigami.FormData.isSection: true
Kirigami.FormData.label: "Service Information"
}
Controls.TextField {
id: providerField
selectByMouse: true
Kirigami.FormData.label: qsTr("Service Provider")+":"
text: record["serviceprovider"]
}
Controls.TextField {
id: typeField
enabled: false
text: record["servicetypename"]
Kirigami.FormData.label: qsTr("Service Type")+":"
}
Layouts.RowLayout {
Kirigami.FormData.label: qsTr("Date")+":"
Controls.TextField {
id: dateField
text: new Date(record["servicedate"]).toLocaleDateString(Qt.locale())
readOnly: true
}
Controls.Button {
icon.name: "office-calendar"
text: qsTr("Select Date")
display: Controls.AbstractButton.IconOnly
onClicked: {
calendarPopup.open();
}
}
}
Controls.TextField {
id: milesField
selectByMouse: true
Kirigami.FormData.label: qsTr("Miles")+":"
text: record["miles"]
inputMethodHints: Qt.ImhDigitsOnly
validator: IntValidator {
bottom: 0
top: 500000
}
}
Controls.TextArea {
id: notesField
placeholderText: qsTr("Notes about service")
selectByMouse: true
Kirigami.FormData.label: qsTr("Notes")+":"
text: record["notes"]
}
Layouts.RowLayout {
Controls.Button {
text: qsTr("Save")
highlighted: true
onClicked: {
var dateObj = Date.fromLocaleDateString(Qt.locale(), dateField.text);
if(milesField.acceptableInput) {
recordModel.updateRecord(serviceId, providerField.text, dateObj.toISOString(), parseInt(milesField.text), notesField.text);
router.popRoute();
} else {
formError.text = qsTr("Invalid number of miles.");
formError.visible = true;
}
}
}
Controls.Button {
text: qsTr("Cancel")
onClicked: {
router.popRoute();
}
}
}
}
}
Kirigami.OverlaySheet {
id: calendarPopup
Old.Calendar {
selectedDate: Date.fromLocaleDateString(Qt.locale(), dateField.text)
onClicked: {
dateField.text = date.toLocaleDateString(Qt.locale());
}
}
}
}
}
}

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

@@ -25,6 +25,13 @@ Kirigami.PageRoute {
importDialog.visible = true;
}
},
Kirigami.Action {
iconName: "preferences-system"
text: qsTr("Settings")
onTriggered: {
router.navigateToRoute(["main","settings"]);
}
},
Kirigami.Action {
iconName: "help-about"
text: qsTr("About")

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

@@ -8,17 +8,17 @@ Kirigami.PageRoute {
Component {
Kirigami.ScrollablePage {
property var serviceId: Kirigami.PageRouter.data.id
property var vehicleId: Kirigami.PageRouter.data.id
Component.onCompleted: {
recordModel.changeVehicleFilter(serviceId);
recordModel.changeVehicleFilter(vehcileId);
//Check vehicle warnings
dbAnalytics.checkOilChangeNeededForVehicle(serviceId, appAnalyticsSettings.value("milesForOilChange",5000), appAnalyticsSettings.value("monthsForOilChange",6));
dbAnalytics.checkOilChangeNeededForVehicle(vehicleId, appAnalyticsSettings.value("milesForOilChange",5000), appAnalyticsSettings.value("monthsForOilChange",6));
}
Connections {
target: recordModel
function onVehicleUpdated(vehicleId) {
//Check vehicle warnings
if(vehicleId == serviceId) {
if(vehicleId == vehicleId) {
dbAnalytics.checkOilChangeNeededForVehicle(vehicleId, appAnalyticsSettings.value("milesForOilChange",5000), appAnalyticsSettings.value("monthsForOilChange",6));
}
}
@@ -29,7 +29,7 @@ Kirigami.PageRoute {
text: qsTr("Add Service Record")
iconName: "list-add"
onTriggered: {
router.pushRoute({"route": "addrecord", "data": serviceId});
router.pushRoute({"route": "addrecord", "data": vehicleId});
}
}
ListView {
@@ -90,6 +90,16 @@ Kirigami.PageRoute {
onTriggered: {
recordModel.removeRecord(index);
}
},
Kirigami.Action {
text: qsTr("Edit")
iconName: "edit-symbolic"
onTriggered: {
if(router.routeActive(["main","servicerecords","editrecord"])) {
router.popRoute();
}
router.pushRoute({"route": "editrecord", "data": {"id": index}});
}
}
]
}

83
src/contents/ui/Settings.qml Normal file
View File

@@ -0,0 +1,83 @@
import QtQuick 2.14
import org.kde.kirigami 2.12 as Kirigami
import QtQuick.Controls 2.14 as Controls
import QtQuick.Layouts 1.14 as Layouts
Kirigami.PageRoute {
name: "settings"
Component {
Kirigami.Page {
id: settingsPage
title: qsTr("Settings")
Layouts.ColumnLayout {
anchors.fill: parent
Kirigami.InlineMessage {
Layouts.Layout.fillWidth: true
Layouts.Layout.leftMargin: 10
Layouts.Layout.rightMargin: 10
z: 9997
type: Kirigami.MessageType.Error
showCloseButton: true
id: formError
}
Kirigami.FormLayout {
Layouts.Layout.alignment: Qt.AlignHCenter
Layouts.Layout.fillWidth: true
width: settingsPage.width
Item {
Kirigami.FormData.label: qsTr("Warning Thresholds")
Kirigami.FormData.isSection: true
}
Controls.TextField {
id: oilChangeMiles
Kirigami.FormData.label: qsTr("Oil Change Miles")
text: appAnalyticsSettings.value("milesForOilChange",5000)
validator: IntValidator {
bottom: 1
top: 500000
}
}
Controls.TextField {
id: oilChangeMonths
Kirigami.FormData.label: qsTr("Oil Change Months")
text: appAnalyticsSettings.value("monthsForOilChange",6)
validator: IntValidator {
bottom: 1
top: 500000
}
}
Layouts.RowLayout {
Controls.Button {
text: qsTr("Save")
highlighted: true
onClicked: {
if(oilChangeMiles.acceptableInput) {
if(oilChangeMonths.acceptableInput) {
appAnalyticsSettings.setValue("milesForOilChange", parseInt(oilChangeMiles.text));
appAnalyticsSettings.setValue("monthsForOilChange", parseInt(oilChangeMonths.text));
router.popRoute();
} else {
formError.text = qsTr("Number of Months is invalid!");
formError.visible = true;
}
} else {
formError.text = qsTr("Number of Miles is invalid!");
formError.visible = true;
}
}
}
Controls.Button {
text: qsTr("Cancel")
onClicked: {
router.popRoute();
}
}
}
}
}
}
}
}

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

@@ -4,7 +4,7 @@ import QtQuick.Controls 2.14 as Controls
import QtQuick.Layouts 1.14 as Layouts
import QtQuick.Controls 1.4 as Old
import QtQuick.Dialogs 1.3 as Dialogs
import Qt.labs.settings 1.0 as Settings
import Qt.labs.settings 1.0 as QtSettings
Kirigami.ApplicationWindow {
id: root
@@ -26,7 +26,7 @@ Kirigami.ApplicationWindow {
id: contextDrawer
}
Settings.Settings {
QtSettings.Settings {
id: appAnalyticsSettings
category: "analytics"
}
@@ -60,5 +60,9 @@ Kirigami.ApplicationWindow {
ServiceRecords{}
AddRecord{}
Settings{}
EditRecord{}
}
}

22
src/db/sqlservicerecord.cpp
View File

@@ -99,6 +99,28 @@ void SqlServiceRecord::changeVehicleFilter(int id)
this->currentVehicleID = id;
}
QVariantMap SqlServiceRecord::getRecord(int index)
{
QHash<int, QByteArray> names = roleNames();
QHashIterator<int, QByteArray> i(names);
QVariantMap res;
QModelIndex idx = this->index(index, 0);
while(i.hasNext()) {
i.next();
QVariant data = idx.data(i.key());
res[i.value()] = data;
}
return res;
}
void SqlServiceRecord::updateRecord(int index, QString serviceProvider, QString dateISO, int miles, QString notes)
{
//TODO
}

3
src/db/sqlservicerecord.h
View File

@@ -19,6 +19,7 @@
#define SQLSERVICERECORD_H
#include <QSqlTableModel>
#include <QSqlRecord>
/**
* Model to access service records.
@@ -34,6 +35,8 @@ public:
Q_INVOKABLE void addNewRecord(QString serviceProvider, int serviceType, QString serviceTypeName, QString dateISO, int miles, QString notes);
Q_INVOKABLE void removeRecord(int index);
Q_INVOKABLE void changeVehicleFilter(int id);
Q_INVOKABLE QVariantMap getRecord(int index);
Q_INVOKABLE void updateRecord(int index, QString serviceProvider, QString dateISO, int miles, QString notes);
signals:
void vehicleUpdated(int vehicleId);

2
src/resources.qrc
View File

@@ -5,6 +5,8 @@
<file alias="AddVehicle.qml">contents/ui/AddVehicle.qml</file>
<file alias="ServiceRecords.qml">contents/ui/ServiceRecords.qml</file>
<file alias="AddRecord.qml">contents/ui/AddRecord.qml</file>
<file alias="Settings.qml">contents/ui/Settings.qml</file>
<file alias="EditRecord.qml">contents/ui/EditRecord.qml</file>
<file alias="speed.svg">contents/speed.svg</file>
<file alias="license.svg">contents/license.svg</file>
<file alias="logo.svg">../packaging/org.eyecreate.vehiclevoyage.svg</file>