mirror of
https://github.com/bckelley/cgm-remote-monitor.git
synced 2026-08-24 03:14:12 -05:00
proper handling carbs from food
This commit is contained in:
@@ -347,24 +347,26 @@ function init(client, $) {
|
||||
}
|
||||
|
||||
// Load foods
|
||||
record.carbs = 0;
|
||||
record.foods = _.cloneDeep(foods);
|
||||
if (record.foods.length) {
|
||||
var carbs = 0, gisum = 0;
|
||||
var gisum = 0;
|
||||
for (var fi=0; fi<record.foods.length; fi++) {
|
||||
var f = record.foods[fi];
|
||||
carbs += f.carbs * f.portions;
|
||||
record.carbs += f.carbs * f.portions;
|
||||
gisum += f.carbs * f.portions * f.gi;
|
||||
}
|
||||
record.gi = (gisum / carbs).toFixed(2);
|
||||
record.gi = (gisum / record.carbs).toFixed(2);
|
||||
} else {
|
||||
record.gi = $('#bc_gi').val();
|
||||
}
|
||||
|
||||
// Load Carbs
|
||||
record.carbs = 0;
|
||||
record.insulincarbs = 0;
|
||||
if ($('#bc_usecarbs').is(':checked')) {
|
||||
record.carbs = parseInt($('#bc_carbs').val().replace(',','.'));
|
||||
if (record.carbs === 0) { // not set from foods
|
||||
record.carbs = parseInt($('#bc_carbs').val().replace(',','.'));
|
||||
}
|
||||
if (isNaN(record.carbs)) {
|
||||
record.carbs = 0;
|
||||
}
|
||||
@@ -642,8 +644,8 @@ function init(client, $) {
|
||||
if (index !== null && !isNaN(portions) && portions >0) {
|
||||
foodlist[index].portions = portions;
|
||||
foods.push(_.cloneDeep(foodlist[index]));
|
||||
boluscalc.calculateInsulin();
|
||||
$( this ).dialog( 'close' );
|
||||
boluscalc.calculateInsulin();
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user