mirror/openscale
1
0
Fork 0
mirror of https://github.com/oliexdev/openScale.git synced 2025-08-23 16:53:04 +02:00
Code Issues Releases Wiki Activity

save data entry while moving back and forward.

Browse Source
This commit is contained in:
OliE
2015-08-08 20:18:54 +02:00
parent 6da83067e6
commit 474eba9fa9
3 changed files with 33 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
android_app/app/src/main/java/com/health/openscale/core/OpenScale.java
View File

@@ -169,14 +169,19 @@ public class OpenScale {
updateScaleData(); updateScaleData();
} }
public void updateScaleData(long id, float weight, float fat, float water, float muscle, String comment) { public void updateScaleData(long id, String date_time, float weight, float fat, float water, float muscle, String comment) {
ScaleData scaleData = new ScaleData(); ScaleData scaleData = new ScaleData();
scaleData.weight = weight; try {
scaleData.fat = fat; scaleData.date_time = dateTimeFormat.parse(date_time);
scaleData.water = water; scaleData.weight = weight;
scaleData.muscle = muscle; scaleData.fat = fat;
scaleData.comment = comment; scaleData.water = water;
scaleData.muscle = muscle;
scaleData.comment = comment;
} catch (ParseException e) {
Log.e("OpenScale", "Can't parse date time string while adding to the database");
}
scaleDB.updateEntry(id, scaleData); scaleDB.updateEntry(id, scaleData);

1
android_app/app/src/main/java/com/health/openscale/core/ScaleDatabase.java
View File

@@ -132,6 +132,7 @@ public class ScaleDatabase extends SQLiteOpenHelper {
SQLiteDatabase db = getWritableDatabase(); SQLiteDatabase db = getWritableDatabase();
ContentValues values = new ContentValues(); ContentValues values = new ContentValues();
values.put(COLUMN_NAME_DATE_TIME, formatDateTime.format(scaleData.date_time));
values.put(COLUMN_NAME_WEIGHT, scaleData.weight); values.put(COLUMN_NAME_WEIGHT, scaleData.weight);
values.put(COLUMN_NAME_FAT, scaleData.fat); values.put(COLUMN_NAME_FAT, scaleData.fat);
values.put(COLUMN_NAME_WATER, scaleData.water); values.put(COLUMN_NAME_WATER, scaleData.water);

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

@@ -253,6 +253,23 @@ public class DataEntryActivity extends Activity {
return false; return false;
} }
private void saveScaleData() {
if (validateInput()) {
float weight = Float.valueOf(txtWeight.getText().toString());
float fat = Float.valueOf(txtFat.getText().toString());
float water = Float.valueOf(txtWater.getText().toString());
float muscle = Float.valueOf(txtMuscle.getText().toString());
String comment = txtComment.getText().toString();
String date = txtDate.getText().toString();
String time = txtTime.getText().toString();
OpenScale openScale = OpenScale.getInstance(context);
openScale.updateScaleData(id, date + " " + time, weight, fat, water, muscle, comment);
}
}
private boolean moveLeft() { private boolean moveLeft() {
ArrayList<ScaleData> scaleDataList = OpenScale.getInstance(context).getScaleDataList(); ArrayList<ScaleData> scaleDataList = OpenScale.getInstance(context).getScaleDataList();
@@ -265,6 +282,7 @@ public class DataEntryActivity extends Activity {
if (scaleData.id == id) if (scaleData.id == id)
{ {
if (scaleDataIterator.hasNext()) { if (scaleDataIterator.hasNext()) {
saveScaleData();
getIntent().putExtra("id",scaleDataIterator.next().id ); getIntent().putExtra("id",scaleDataIterator.next().id );
updateOnView(); updateOnView();
return true; return true;
@@ -291,6 +309,7 @@ public class DataEntryActivity extends Activity {
if (scaleData.id == id) if (scaleData.id == id)
{ {
if (scaleDataIterator.hasPrevious()) { if (scaleDataIterator.hasPrevious()) {
saveScaleData();
getIntent().putExtra("id", scaleDataIterator.previous().id); getIntent().putExtra("id", scaleDataIterator.previous().id);
updateOnView(); updateOnView();
return true; return true;
@@ -357,19 +376,8 @@ public class DataEntryActivity extends Activity {
private class onClickListenerOk implements View.OnClickListener { private class onClickListenerOk implements View.OnClickListener {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
if (validateInput()) { saveScaleData();
float weight = Float.valueOf(txtWeight.getText().toString()); finish();
float fat = Float.valueOf(txtFat.getText().toString());
float water = Float.valueOf(txtWater.getText().toString());
float muscle = Float.valueOf(txtMuscle.getText().toString());
String comment = txtComment.getText().toString();
OpenScale openScale = OpenScale.getInstance(context);
openScale.updateScaleData(id, weight, fat, water, muscle, comment);
finish();
}
} }
} }