X-Git-Url: https://www.flypig.org.uk/git/?p=harbour-pedalo.git;a=blobdiff_plain;f=qml%2Fpages%2FAddJourney.qml;h=2330b13c8d9d7688d52e645e060cbcc5bac40070;hp=b0d81708ca8f23dfd1189169d468a3f774434731;hb=e917baa52e7157c7c41424527c3881c22ff65588;hpb=0108947ead4cc9e0ff23fee82db2fb1fd7cb2dad diff --git a/qml/pages/AddJourney.qml b/qml/pages/AddJourney.qml index b0d8170..2330b13 100644 --- a/qml/pages/AddJourney.qml +++ b/qml/pages/AddJourney.qml @@ -27,21 +27,19 @@ Dialog { ValueButton { id: startDate - function openDateDialog() { - var dialog = pageStack.push("Sailfish.Silica.DatePickerDialog", { - date: value - }) - + property date date: new Date() + label: "Date" + value: Qt.formatDate(date, 'd MMM yyyy') + width: parent.width + onClicked: { + var dialog = pageStack.push("Sailfish.Silica.DatePickerDialog", { date: value }) dialog.accepted.connect(function() { - value = dialog.dateText - selectedDate = dialog.date + date = dialog.date }) } - - label: "Date" - value: Qt.formatDate(new Date(), 'd MMM yyyy') - width: parent.width - onClicked: openDateDialog() + onDateChanged: { + value = Qt.formatDate(date, 'd MMM yyyy') + } } ValueButton { @@ -123,4 +121,12 @@ Dialog { } } } + + onAccepted: { + var start = new Date(startDate.date.getFullYear(), startDate.date.getMonth(), startDate.date.getDate(), startTime.time.getHours(), startTime.time.getMinutes()) + var duration = (durationTime.duration.getHours() * 24 * 60) + (durationTime.duration.getMinutes() * 60) + (durationTime.duration.getSeconds()) + var overtook = parseInt(faster.text) + var overtakenby = parseInt(slower.text) + journeymodel.addJourney(start, duration, overtook, overtakenby) + } }