mirror/openscale
1
0
Fork 0
mirror of https://github.com/oliexdev/openScale.git synced 2025-08-28 18:49:56 +02:00
Code Issues Releases Wiki Activity

Set date time header when adding first measurment as well

Browse Source
This commit is contained in:
Erik Johansson
2017-12-22 21:14:11 +01:00
committed by OliE
parent a4dde33de6
commit 2f53b72a76
1 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
android_app/app/src/main/java/com/health/openscale/gui/activities/DataEntryActivity.java
View File

@@ -181,6 +181,8 @@ public class DataEntryActivity extends Activity {
id = getIntent().getExtras().getLong("id"); id = getIntent().getExtras().getLong("id");
} }
ScaleData scaleData;
if (id > 0) { if (id > 0) {
// keep edit mode state if we are moving to left or right // keep edit mode state if we are moving to left or right
if (prefs.getBoolean(String.valueOf(switchEditMode.getId()), false)) { if (prefs.getBoolean(String.valueOf(switchEditMode.getId()), false)) {
@@ -202,40 +204,40 @@ public class DataEntryActivity extends Activity {
ScaleData[] tupleScaleData = openScale.getTupleScaleData(id); ScaleData[] tupleScaleData = openScale.getTupleScaleData(id);
ScaleData prevScaleData = tupleScaleData[0]; ScaleData prevScaleData = tupleScaleData[0];
ScaleData selectedScaleData = tupleScaleData[1]; scaleData = tupleScaleData[1];
if (prevScaleData == null) { if (prevScaleData == null) {
prevScaleData = new ScaleData(); prevScaleData = new ScaleData();
} }
txtDataNr.setText(DateFormat.getDateTimeInstance(DateFormat.LONG, DateFormat.SHORT).format(selectedScaleData.getDateTime()));
// show selected scale data // show selected scale data
for (MeasurementView measurement : dataEntryMeasurements) { for (MeasurementView measurement : dataEntryMeasurements) {
measurement.updateValue(selectedScaleData); measurement.updateValue(scaleData);
measurement.updateDiff(selectedScaleData, prevScaleData); measurement.updateDiff(scaleData, prevScaleData);
measurement.setExpand(doExpand); measurement.setExpand(doExpand);
} }
} else if (!OpenScale.getInstance(getApplicationContext()).getScaleDataList().isEmpty()) {
setViewMode(MeasurementView.MeasurementViewMode.ADD);
txtDataNr.setText(DateFormat.getDateTimeInstance(DateFormat.LONG, DateFormat.SHORT).format(new Date()));
ScaleData lastScaleData = OpenScale.getInstance(getApplicationContext()).getScaleDataList().get(0);
// show as default last scale data
lastScaleData.setDateTime(new Date());
lastScaleData.setComment("");
for (MeasurementView measurement : dataEntryMeasurements) {
measurement.updateValue(lastScaleData);
}
} else { } else {
setViewMode(MeasurementView.MeasurementViewMode.ADD); setViewMode(MeasurementView.MeasurementViewMode.ADD);
// show default values
ScaleData newScaleData = new ScaleData(); if (OpenScale.getInstance(getApplicationContext()).getScaleDataList().isEmpty()) {
// Show default values
scaleData = new ScaleData();
}
else {
// Show the last scale data as default
scaleData = OpenScale.getInstance(getApplicationContext()).getScaleDataList().get(0);
scaleData.setDateTime(new Date());
scaleData.setComment("");
}
for (MeasurementView measurement : dataEntryMeasurements) { for (MeasurementView measurement : dataEntryMeasurements) {
measurement.updateValue(newScaleData); measurement.updateValue(scaleData);
} }
} }
txtDataNr.setText(DateFormat.getDateTimeInstance(
DateFormat.LONG, DateFormat.SHORT).format(scaleData.getDateTime()));
onMeasurementViewUpdateListener updateListener = new onMeasurementViewUpdateListener(); onMeasurementViewUpdateListener updateListener = new onMeasurementViewUpdateListener();
for (MeasurementView measurement : dataEntryMeasurements) { for (MeasurementView measurement : dataEntryMeasurements) {
measurement.setOnUpdateListener(updateListener); measurement.setOnUpdateListener(updateListener);