mirror/openscale
1
0
Fork 0
mirror of https://github.com/oliexdev/openScale.git synced 2025-02-06 17:13:36 +01:00
Code Issues Releases Wiki Activity

get tuple data entries only from the selected user.

Browse Source
This commit is contained in:
OliE 2017-07-29 21:03:39 +02:00
parent e713562ba6
commit b1cb0a3b8f
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -160,7 +160,7 @@ public class OpenScale {
public ScaleData[] getTupleScaleData(long id)
{
return scaleDB.getTupleDataEntry(id);
return scaleDB.getTupleDataEntry(getSelectedScaleUser().id, id);
}
public int addScaleData(ScaleData scaleData) {

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

@ -172,7 +172,7 @@ public class ScaleDatabase extends SQLiteOpenHelper {
dbWrite.update(TABLE_NAME, values, COLUMN_NAME_ID + "=" + id, null);
}
public ScaleData[] getTupleDataEntry(long id)
public ScaleData[] getTupleDataEntry(int userId, long id)
{
Cursor cursorScaleDB;
@ -182,8 +182,8 @@ public class ScaleDatabase extends SQLiteOpenHelper {
cursorScaleDB = dbRead.query(
TABLE_NAME, // The table to query
projection, // The columns to return
COLUMN_NAME_ID + "=?", // The columns for the WHERE clause
new String[] {Long.toString(id)}, // The values for the WHERE clause
COLUMN_NAME_USER_ID + "=? AND " + COLUMN_NAME_ID + "=?", // The columns for the WHERE clause
new String[] {Integer.toString(userId), Long.toString(id)}, // The values for the WHERE clause
null, // don't group the rows
null, // don't filter by row groups
null, // The sort order
@ -201,8 +201,8 @@ public class ScaleDatabase extends SQLiteOpenHelper {
cursorScaleDB = dbRead.query(
TABLE_NAME, // The table to query
projection, // The columns to return
COLUMN_NAME_DATE_TIME + "<? AND " + COLUMN_NAME_ENABLE + "=1", // The columns for the WHERE clause
new String[] {formatDateTime.format(tupleScaleData[1].getDateTime())}, // The values for the WHERE clause
COLUMN_NAME_USER_ID + "=? AND " + COLUMN_NAME_DATE_TIME + "<? AND " + COLUMN_NAME_ENABLE + "=1", // The columns for the WHERE clause
new String[] {Integer.toString(userId), formatDateTime.format(tupleScaleData[1].getDateTime())}, // The values for the WHERE clause
null, // don't group the rows
null, // don't filter by row groups
COLUMN_NAME_DATE_TIME + " DESC", // The sort order
@ -222,8 +222,8 @@ public class ScaleDatabase extends SQLiteOpenHelper {
cursorScaleDB = dbRead.query(
TABLE_NAME, // The table to query
projection, // The columns to return
COLUMN_NAME_DATE_TIME + ">? AND " + COLUMN_NAME_ENABLE + "=1", // The columns for the WHERE clause
new String[] {formatDateTime.format(tupleScaleData[1].getDateTime())}, // The values for the WHERE clause
COLUMN_NAME_USER_ID + "=? AND " + COLUMN_NAME_DATE_TIME + ">? AND " + COLUMN_NAME_ENABLE + "=1", // The columns for the WHERE clause
new String[] {Integer.toString(userId), formatDateTime.format(tupleScaleData[1].getDateTime())}, // The values for the WHERE clause
null, // don't group the rows
null, // don't filter by row groups
COLUMN_NAME_DATE_TIME, // The sort order