Skip to content

Commit

Permalink
Fix NaN bug
Browse files Browse the repository at this point in the history
  • Loading branch information
StarOne01 committed May 17, 2024
1 parent 8ae741c commit 6ad8525
Showing 1 changed file with 16 additions and 16 deletions.
32 changes: 16 additions & 16 deletions assets/js/script.js
Original file line number Diff line number Diff line change
Expand Up @@ -102,10 +102,10 @@ function addItem(option, time) {
).toFixed(2);
});*/
listBefore[timeNum[time]].push(option)
nutriDataTime[timeNum[time]][0] += Number(calorieCounts[inde]).toFixed(2)
nutriDataTime[timeNum[time]][1] += Number(fatCounts[option]).toFixed(2)
nutriDataTime[timeNum[time]][2] += Number(proteinCounts[option]).toFixed(2)
nutriDataTime[timeNum[time]][3] += Number(carbohydrateCounts[option]).toFixed(2)
nutriDataTime[timeNum[time]][0] = Number(nutriDataTime[timeNum[time]][0]).toFixed(2) + Number(calorieCounts[inde]).toFixed(2)
nutriDataTime[timeNum[time]][1] = Number(nutriDataTime[timeNum[time]][1]).toFixed(2) + Number(fatCounts[option]).toFixed(2)
nutriDataTime[timeNum[time]][2] = Number(nutriDataTime[timeNum[time]][2] ).toFixed(2) + Number(proteinCounts[option]).toFixed(2)
nutriDataTime[timeNum[time]][3] = Number(nutriDataTime[timeNum[time]][3] ).toFixed(2) + Number(carbohydrateCounts[option]).toFixed(2)
}


Expand Down Expand Up @@ -137,10 +137,10 @@ function deleteItem(option,time,e) {
listBefore[timeNum[time]].splice(index, 1);
}
e.target.parentNode.remove();
nutriDataTime[timeNum[time]][0] -= Number(calorieCounts[index]).toFixed(2)
nutriDataTime[timeNum[time]][1] -= Number(fatCounts[option]).toFixed(2)
nutriDataTime[timeNum[time]][2] -= Number(proteinCounts[option]).toFixed(2)
nutriDataTime[timeNum[time]][3] -= Number(carbohydrateCounts[option]).toFixed(2)
nutriDataTime[timeNum[time]][0] = Number(nutriDataTime[timeNum[time]][0]).toFixed(2) - Number(calorieCounts[index]).toFixed(2)
nutriDataTime[timeNum[time]][1] = Number(nutriDataTime[timeNum[time]][1]).toFixed(2) - Number(fatCounts[option]).toFixed(2)
nutriDataTime[timeNum[time]][2] = Number(nutriDataTime[timeNum[time]][2]).toFixed(2) - Number(proteinCounts[option]).toFixed(2)
nutriDataTime[timeNum[time]][3] = Number(nutriDataTime[timeNum[time]][3]).toFixed(2) - Number(carbohydrateCounts[option]).toFixed(2)
}


Expand All @@ -158,19 +158,19 @@ function updateTable(e) {
foodData[daysNum[days]][i].push(forTime);
}

calorieTableDb[daysNum[days]][i] += Number(nutriDataTime[i][0]);
fatTableDb[daysNum[days]][i] += Number(nutriDataTime[i][1]);
proteinTableDb[daysNum[days]][i] += Number(nutriDataTime[i][2]);
carbsTableDb[daysNum[days]][i] += Number(nutriDataTime[i][3]);
calorieTableDb[daysNum[days]][i] = Number(calorieTableDb[daysNum[days]][i]).toFixed(2)+ Number(nutriDataTime[i][0]).toFixed(2);
fatTableDb[daysNum[days]][i] = Number(fatTableDb[daysNum[days]][i]).toFixed(2) + Number(nutriDataTime[i][1]).toFixed(2);
proteinTableDb[daysNum[days]][i] = Number(proteinTableDb[daysNum[days]][i]).toFixed(2) + Number(nutriDataTime[i][2]).toFixed(2);
carbsTableDb[daysNum[days]][i] = Number(carbsTableDb[daysNum[days]][i] ).toFixed(2) + Number(nutriDataTime[i][3]).toFixed(2);

}

for (let i = 0; i < 7; i++) {

calorieCount[daysNum[days]] += Number(calorieTableDb[daysNum[days]][i])
fatCount[daysNum[days]] += Number(fatTableDb[daysNum[days]][i])
proteinCount[daysNum[days]] += Number(proteinTableDb[daysNum[days]][i])
carbsCount[daysNum[days]] += Number(carbsTableDb[daysNum[days]][i])
calorieCount[daysNum[days]] = Number(calorieCount[daysNum[days]] ).toFixed(2)+ Number(calorieTableDb[daysNum[days]][i]).toFixed(2)
fatCount[daysNum[days]] = Number(fatCount[daysNum[days]] ).toFixed(2) + Number(fatTableDb[daysNum[days]][i]).toFixed(2)
proteinCount[daysNum[days]] = Number( proteinCount[daysNum[days]] ).toFixed(2)+Number(proteinTableDb[daysNum[days]][i]).toFixed(2)
carbsCount[daysNum[days]] = Number(carbsCount[daysNum[days]] ).toFixed(2)+ Number(carbsTableDb[daysNum[days]][i]).toFixed(2)
}
})
for (let i = 0; i < 7; i++) {
Expand Down

0 comments on commit 6ad8525

Please sign in to comment.