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

Don't need to convert goal weight as it is already in kg

Browse Source 
Fix #272.
This commit is contained in:
Erik Johansson
2018-05-23 20:34:19 +02:00
parent 68fb526a71
commit 7875bf4cb3
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
android_app/app/src/main/java/com/health/openscale/gui/fragments/StatisticsFragment.java
View File

@@ -186,12 +186,15 @@ public class StatisticsFragment extends Fragment implements FragmentUpdateListen
ScaleMeasurement goalScaleMeasurement = new ScaleMeasurement(); ScaleMeasurement goalScaleMeasurement = new ScaleMeasurement();
goalScaleMeasurement.setUserId(currentScaleUser.getId()); goalScaleMeasurement.setUserId(currentScaleUser.getId());
goalScaleMeasurement.setWeight(Converters.toKilogram(currentScaleUser.getGoalWeight(), unit)); goalScaleMeasurement.setWeight(currentScaleUser.getGoalWeight());
txtGoalWeight.setText(String.format("%.1f %s", Converters.fromKilogram(goalScaleMeasurement.getWeight(), unit), unit.toString())); txtGoalWeight.setText(String.format("%.1f %s",
Converters.fromKilogram(goalScaleMeasurement.getWeight(), unit),
unit.toString()));
double weight_diff = Converters.fromKilogram(goalScaleMeasurement.getWeight() - lastScaleMeasurement.getWeight(), unit); txtGoalDiff.setText(String.format("%.1f %s",
txtGoalDiff.setText(String.format("%.1f %s", weight_diff, unit.toString())); Converters.fromKilogram(goalScaleMeasurement.getWeight() - lastScaleMeasurement.getWeight(), unit),
unit.toString()));
Calendar goalCalendar = Calendar.getInstance(); Calendar goalCalendar = Calendar.getInstance();
goalCalendar.setTime(currentScaleUser.getGoalDate()); goalCalendar.setTime(currentScaleUser.getGoalDate());