diff options
| author |  Jocke <j.bygdell@gmail.com> | 2018-07-16 18:01:56 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2018-08-11 11:19:07 -0700 |
| commit | 94428b9a1823fd7df9f2f0f7815900efca2213a4 (patch) | |
| tree | 995486e8dc3301ed8c0d4808fe856ab9c8fcebff /mobile-widgets/qml | |
| parent | 6b93e5fe272dd9ee67973c0eec6e3310dcee1b19 (diff) | |
| download | subsurface-94428b9a1823fd7df9f2f0f7815900efca2213a4.tar.gz | |
Mobile: save edited cylinders
Save the edited cylinder in the correct slot.
Since the cylinder number and the used cylinder number need not be
the same we first need to test if the cylinder are used.
Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
Diffstat (limited to 'mobile-widgets/qml')
| -rw-r--r-- | mobile-widgets/qml/DiveDetailsEdit.qml | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/mobile-widgets/qml/DiveDetailsEdit.qml b/mobile-widgets/qml/DiveDetailsEdit.qml index 7a05975a5..7de718b82 100644 --- a/mobile-widgets/qml/DiveDetailsEdit.qml +++ b/mobile-widgets/qml/DiveDetailsEdit.qml @@ -70,14 +70,30 @@ Item { function saveData() { diveDetailsPage.state = "view" // run the transition + // join cylinder info from separate string into a list. + if (usedCyl[0] != null) { + usedCyl[0] = cylinderBox0.currentText + } + if (usedCyl[1] != null) { + usedCyl[1] = cylinderBox1.currentText + } + if (usedCyl[2] != null) { + usedCyl[2] = cylinderBox2.currentText + } + if (usedCyl[3] != null) { + usedCyl[3] = cylinderBox3.currentText + } + if (usedCyl[4] != null) { + usedCyl[4] = cylinderBox4.currentText + } + // apply the changes to the dive_table manager.commitChanges(dive_id, detailsEdit.dateText, locationBox.editText, detailsEdit.gpsText, detailsEdit.durationText, detailsEdit.depthText, detailsEdit.airtempText, detailsEdit.watertempText, suitBox.currentText != "" ? suitBox.currentText : suitBox.editText, buddyBox.editText, divemasterBox.currentText != "" ? divemasterBox.currentText : divemasterBox.editText, detailsEdit.weightText, detailsEdit.notesText, detailsEdit.startpressureText, - detailsEdit.endpressureText, detailsEdit.gasmixText, - cylinderBox.currentText != "" ? cylinderBox.currentText : cylinderBox.editText, + detailsEdit.endpressureText, detailsEdit.gasmixText, usedCyl , detailsEdit.rating, detailsEdit.visibility) // trigger the profile to be redrawn @@ -97,7 +113,6 @@ Item { diveDetailsListView.currentItem.modelData.suit = suitBox.currentText diveDetailsListView.currentItem.modelData.buddy = buddyBox.currentText diveDetailsListView.currentItem.modelData.divemaster = divemasterBox.currentText - diveDetailsListView.currentItem.modelData.cylinder = cylinderBox.currentText diveDetailsListView.currentItem.modelData.notes = detailsEdit.notesText diveDetailsListView.currentItem.modelData.rating = detailsEdit.rating diveDetailsListView.currentItem.modelData.visibility = detailsEdit.visibility |