mirror/openscale
1
0
Fork 0
mirror of https://github.com/oliexdev/openScale.git synced 2025-08-27 10:15:00 +02:00
Code Issues Releases Wiki Activity

fix sql double precision problem

Browse Source
This commit is contained in:
OliE
2015-07-04 08:44:50 +02:00
parent f6f467699b
commit e4c784d772
3 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
android_app/app/src/main/java/com/health/openscale/core/ScaleUserDatabase.java
View File

@@ -166,12 +166,14 @@ public class ScaleUserDatabase extends SQLiteOpenHelper {
scaleUser.body_height = cursorScaleDB.getInt(cursorScaleDB.getColumnIndexOrThrow(COLUMN_NAME_BODY_HEIGHT)); scaleUser.body_height = cursorScaleDB.getInt(cursorScaleDB.getColumnIndexOrThrow(COLUMN_NAME_BODY_HEIGHT));
scaleUser.scale_unit = cursorScaleDB.getInt(cursorScaleDB.getColumnIndexOrThrow(COLUMN_NAME_SCALE_UNIT)); scaleUser.scale_unit = cursorScaleDB.getInt(cursorScaleDB.getColumnIndexOrThrow(COLUMN_NAME_SCALE_UNIT));
scaleUser.gender = cursorScaleDB.getInt(cursorScaleDB.getColumnIndexOrThrow(COLUMN_NAME_GENDER)); scaleUser.gender = cursorScaleDB.getInt(cursorScaleDB.getColumnIndexOrThrow(COLUMN_NAME_GENDER));
scaleUser.goal_weight = cursorScaleDB.getFloat(cursorScaleDB.getColumnIndexOrThrow(COLUMN_NAME_GOAL_WEIGHT)); double goal_weight = cursorScaleDB.getFloat(cursorScaleDB.getColumnIndexOrThrow(COLUMN_NAME_GOAL_WEIGHT));
String goal_date = cursorScaleDB.getString(cursorScaleDB.getColumnIndexOrThrow(COLUMN_NAME_GOAL_DATE)); String goal_date = cursorScaleDB.getString(cursorScaleDB.getColumnIndexOrThrow(COLUMN_NAME_GOAL_DATE));
scaleUser.birthday = formatDateTime.parse(birthday); scaleUser.birthday = formatDateTime.parse(birthday);
scaleUser.goal_date = formatDateTime.parse(goal_date); scaleUser.goal_date = formatDateTime.parse(goal_date);
scaleUser.goal_weight = Math.round(goal_weight * 100.0) / 100.0;
cursorScaleDB.moveToNext(); cursorScaleDB.moveToNext();
} catch (ParseException ex) { } catch (ParseException ex) {
@@ -223,13 +225,15 @@ public class ScaleUserDatabase extends SQLiteOpenHelper {
scaleUser.body_height = cursorScaleDB.getInt(cursorScaleDB.getColumnIndexOrThrow(COLUMN_NAME_BODY_HEIGHT)); scaleUser.body_height = cursorScaleDB.getInt(cursorScaleDB.getColumnIndexOrThrow(COLUMN_NAME_BODY_HEIGHT));
scaleUser.scale_unit = cursorScaleDB.getInt(cursorScaleDB.getColumnIndexOrThrow(COLUMN_NAME_SCALE_UNIT)); scaleUser.scale_unit = cursorScaleDB.getInt(cursorScaleDB.getColumnIndexOrThrow(COLUMN_NAME_SCALE_UNIT));
scaleUser.gender = cursorScaleDB.getInt(cursorScaleDB.getColumnIndexOrThrow(COLUMN_NAME_GENDER)); scaleUser.gender = cursorScaleDB.getInt(cursorScaleDB.getColumnIndexOrThrow(COLUMN_NAME_GENDER));
scaleUser.goal_weight = cursorScaleDB.getFloat(cursorScaleDB.getColumnIndexOrThrow(COLUMN_NAME_GOAL_WEIGHT)); double goal_weight = cursorScaleDB.getFloat(cursorScaleDB.getColumnIndexOrThrow(COLUMN_NAME_GOAL_WEIGHT));
String goal_date = cursorScaleDB.getString(cursorScaleDB.getColumnIndexOrThrow(COLUMN_NAME_GOAL_DATE)); String goal_date = cursorScaleDB.getString(cursorScaleDB.getColumnIndexOrThrow(COLUMN_NAME_GOAL_DATE));
scaleUser.birthday = formatDateTime.parse(birthday); scaleUser.birthday = formatDateTime.parse(birthday);
scaleUser.goal_date = formatDateTime.parse(goal_date); scaleUser.goal_date = formatDateTime.parse(goal_date);
scaleUserDBEntries.add(scaleUser); scaleUser.goal_weight = Math.round(goal_weight * 100.0) / 100.0;
scaleUserDBEntries.add(scaleUser);
cursorScaleDB.moveToNext(); cursorScaleDB.moveToNext();
} }

8
android_app/app/src/main/res/layout/activity_newentry.xml
View File

@@ -49,7 +49,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:ems="10" android:ems="10"
android:hint="@string/info_enter_value_unit" android:hint="@string/info_enter_value_unit"
android:inputType="numberDecimal" android:inputType="numberDecimal|numberSigned"
android:layout_column="2"> android:layout_column="2">
<requestFocus /> <requestFocus />
@@ -84,7 +84,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:ems="10" android:ems="10"
android:hint="@string/info_enter_value_percent" android:hint="@string/info_enter_value_percent"
android:inputType="numberDecimal" android:inputType="numberDecimal|numberSigned"
android:layout_column="2" /> android:layout_column="2" />
</TableRow> </TableRow>
@@ -116,7 +116,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:ems="10" android:ems="10"
android:hint="@string/info_enter_value_percent" android:hint="@string/info_enter_value_percent"
android:inputType="numberDecimal" android:inputType="numberDecimal|numberSigned"
android:layout_column="2" /> android:layout_column="2" />
</TableRow> </TableRow>
@@ -148,7 +148,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:ems="10" android:ems="10"
android:hint="@string/info_enter_value_percent" android:hint="@string/info_enter_value_percent"
android:inputType="numberDecimal" android:inputType="numberDecimal|numberSigned"
android:layout_column="2" /> android:layout_column="2" />
</TableRow> </TableRow>

2
android_app/app/src/main/res/layout/activity_usersettings.xml
View File

@@ -62,7 +62,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:ems="10" android:ems="10"
android:hint="@string/info_enter_value_cm" android:hint="@string/info_enter_value_cm"
android:inputType="numberDecimal|numberSigned" /> android:inputType="numberSigned" />
</TableRow> </TableRow>