marco/calorimeter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

Fix handling of kcal amount extraction from json

Browse Source
This commit is contained in:
Marco 2024-12-23 19:38:45 +01:00
parent 766a3ca6b0
commit d4abba2df2
2 changed files with 29 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/food_entry/food_entry_bloc.dart
View File

@ -170,14 +170,10 @@ class FoodEntryBloc extends Bloc<FoodEvent, GlobalEntryState> {
return;
}
int kcalToDisplay = response.food?.kcalPer100g ?? 0;
if (response.food?.kcalPer100gPrepared != 0) {
kcalToDisplay = response.food?.kcalPer100gPrepared ?? 0;
}
var newEntryFinishedWaiting = FoodEntryState(
name: response.food?.name ?? "",
mass: response.food?.mass ?? 0,
kcalPer100: kcalToDisplay,
kcalPer100: response.food?.kcalPer100g ?? 0,
waitingForNetwork: false,
isSelected: false,
);

41
lib/food_scan/food_fact_lookup.dart
View File

@ -47,35 +47,50 @@ class FoodFactLookupClient {
class FoodFactModel {
final String name;
final int kcalPer100g;
final int kcalPer100gPrepared;
final int mass;
FoodFactModel({
required this.name,
required this.mass,
required this.kcalPer100g,
required this.kcalPer100gPrepared,
});
factory FoodFactModel.fromJson(Map<String, dynamic> json) {
int kcalPer100g = json['product']['nutriments']['energy-kcal_100g'] ?? 0;
int kcalPer100gPrepared =
json['product']['nutriments']['energy-kcal_prepared_100g'] ?? 0;
String quantityString = json['product']['product_quantity'] ?? "0";
int quantity;
int kcalPer100gForModel = 0;
int kcalPer100g = 0;
int kcalPer100gPrepared = 0;
try {
quantity = int.parse(quantityString);
kcalPer100g = (json['product']['nutriments']['energy-kcal_100g'] as num)
.toDouble()
.ceil();
kcalPer100gForModel = kcalPer100g;
} catch (e) {
try {
kcalPer100gPrepared =
(json['product']['nutriments']['energy-kcal_prepared_100g'] as num)
.toDouble()
.ceil();
kcalPer100gForModel = kcalPer100gPrepared;
} catch (e) {
kcalPer100gForModel = 0;
}
}
String quantityString = json['product']['product_quantity'] ?? "0";
double quantity;
try {
quantity = double.parse(quantityString);
} catch (e) {
quantity = 0;
}
return FoodFactModel(
name: json['product']['product_name'] ?? "",
kcalPer100g: kcalPer100g,
kcalPer100gPrepared: kcalPer100gPrepared,
mass: quantity);
name: json['product']['product_name'] ?? "",
kcalPer100g: kcalPer100gForModel,
mass: quantity.ceil(),
);
}
}