QML UI: show date and time for dive

We keep losing the time when people move code around. date really is just the
date and doesn't include the time component.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2016-01-20 13:58:04 -08:00
parent 60e0a6e833
commit 3116bc06fb
2 changed files with 2 additions and 11 deletions

View file

@ -24,7 +24,7 @@ MobileComponents.Page {
diveListView.currentIndex = diveListView.indexAt(diveListView.contentX+1, 1);
detailsEdit.dive_id = diveListView.currentItem.modelData.dive.id
detailsEdit.number = diveListView.currentItem.modelData.dive.number
detailsEdit.dateText = diveListView.currentItem.modelData.dive.date
detailsEdit.dateText = diveListView.currentItem.modelData.dive.date + " " + diveListView.currentItem.modelData.dive.time
detailsEdit.locationText = diveListView.currentItem.modelData.dive.location
detailsEdit.durationText = diveListView.currentItem.modelData.dive.duration
detailsEdit.depthText = diveListView.currentItem.modelData.dive.depth

View file

@ -37,14 +37,6 @@ Item {
rowSpacing: MobileComponents.Units.smallSpacing * 2
columnSpacing: MobileComponents.Units.smallSpacing
/*Connections {
target: diveDetailsWindow
onDive_idChanged: {
qmlProfile.diveId = diveDetailsWindow.dive_id
qmlProfile.update()
}
}*/
MobileComponents.Heading {
id: detailsViewHeading
Layout.fillWidth: true
@ -79,7 +71,7 @@ Item {
opacity: 0.6
}
MobileComponents.Label {
text: dive.date
text: dive.date + " " + dive.time
Layout.columnSpan: 2
}
MobileComponents.Label {
@ -123,7 +115,6 @@ Item {
anchors.fill: parent
}
//Rectangle { color: "green"; opacity: 0.4; anchors.fill: parent } // used for debugging the dive profile sizing, will be removed later
}
MobileComponents.Heading {