Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix #79: weekly average not calculated correctly #81

Merged
merged 1 commit into from
Dec 2, 2020
Merged

fix #79: weekly average not calculated correctly #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
107 changes: 107 additions & 0 deletions app/schemas/org.secuso.privacyfriendlyfoodtracker.database.ApplicationDatabase/1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
{
"formatVersion": 1,
"database": {
"version": 1,
"identityHash": "1c4b4d71bcbdb586cc4af0a0585902ca",
"entities": [
{
"tableName": "ConsumedEntries",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `productId` INTEGER NOT NULL, `amount` INTEGER NOT NULL, `date` INTEGER, `name` TEXT, FOREIGN KEY(`productId`) REFERENCES `Product`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
"fields": [
{
"fieldPath": "id",
"columnName": "id",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "productId",
"columnName": "productId",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "amount",
"columnName": "amount",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "date",
"columnName": "date",
"affinity": "INTEGER",
"notNull": false
},
{
"fieldPath": "name",
"columnName": "name",
"affinity": "TEXT",
"notNull": false
}
],
"primaryKey": {
"columnNames": [
"id"
],
"autoGenerate": true
},
"indices": [],
"foreignKeys": [
{
"table": "Product",
"onDelete": "CASCADE",
"onUpdate": "NO ACTION",
"columns": [
"productId"
],
"referencedColumns": [
"id"
]
}
]
},
{
"tableName": "Product",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT, `energy` REAL NOT NULL, `barcode` TEXT)",
"fields": [
{
"fieldPath": "id",
"columnName": "id",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "name",
"columnName": "name",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "energy",
"columnName": "energy",
"affinity": "REAL",
"notNull": true
},
{
"fieldPath": "barcode",
"columnName": "barcode",
"affinity": "TEXT",
"notNull": false
}
],
"primaryKey": {
"columnNames": [
"id"
],
"autoGenerate": true
},
"indices": [],
"foreignKeys": []
}
],
"setupQueries": [
"CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
"INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, \"1c4b4d71bcbdb586cc4af0a0585902ca\")"
]
}
}
4 changes: 2 additions & 2 deletions app/src/main/java/org/secuso/privacyfriendlyfoodtracker/ui/MonthStatisticFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,8 @@ void UpdateGraph() {

try {

final Date startDate = getMonthByValue(-1);
final Date endDate = getMonthByValue(0);
final Date startDate = DateHelper.changeDateTimeToMidnight(getMonthByValue(-1));
final Date endDate = DateHelper.changeDateTimeToMidnight(getMonthByValue(0));
List<ConsumedEntrieAndProductDao.DateCalories> consumedEntriesList = databaseFacade.getCaloriesPerDayinPeriod(startDate,endDate);
List<ConsumedEntrieAndProductDao.DateCalories> calories = databaseFacade.getPeriodCalories(startDate,endDate);
DataPoint[] dataPointInterfaces = new DataPoint[consumedEntriesList.size()];
Expand Down
5 changes: 4 additions & 1 deletion app/src/main/java/org/secuso/privacyfriendlyfoodtracker/ui/WeekStatisticFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,14 +135,16 @@ void UpdateGraph() {
try {

Date startDate = getWeekByValue(-1);
startDate = DateHelper.changeDateTimeToMidnight(startDate); //set time to midnight so the period does not depend on the time of day
Date endDate = getWeekByValue(0);
endDate = DateHelper.changeDateTimeToMidnight(endDate);
consumedEntriesList = databaseFacade.getCaloriesPerDayinPeriod(startDate,endDate);
calories = databaseFacade.getPeriodCalories(startDate,endDate);
DataPoint[] dataPointInterfaces = new DataPoint[consumedEntriesList.size()];
for (int i = 0; i < consumedEntriesList.size(); i++) {
dataPointInterfaces[i] = (new DataPoint(consumedEntriesList.get(i).unique1.getTime(), consumedEntriesList.get(i).unique2/100));
}
int weekdays = 8;
int weekdays = 7;

float averageCalories = calories.get(0).unique2 / weekdays;

Expand Down Expand Up @@ -181,4 +183,5 @@ Date getWeekByValue(int value) {
return date;
}


}
16 changes: 16 additions & 0 deletions app/src/main/java/org/secuso/privacyfriendlyfoodtracker/ui/helper/DateHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,20 @@ public static String dateToString(Date date) {
DateFormat dateFormat = DateFormat.getDateInstance(DateFormat.SHORT, Locale.getDefault());
return dateFormat.format(date);
}

/**
* Sets a given Date's time to 00:00:00.00, so getting a weeks daily calories works reliably.
* @param date the date whose time shall be midnight
* @return the new changed date
*/
public static Date changeDateTimeToMidnight(Date date){
Calendar calendar = Calendar.getInstance();
calendar.setTime(date);
calendar.set(Calendar.HOUR_OF_DAY, 0);
calendar.set(Calendar.MINUTE, 0);
calendar.set(Calendar.SECOND, 0);
calendar.set(Calendar.MILLISECOND, 0);

return calendar.getTime();
}
}