mirror of
https://github.com/StefBuwalda/cal_counter.git
synced 2025-10-29 19:00:00 +00:00
Add new daily log dashboard and macro summary
Introduces a new route and template for an enhanced daily log dashboard with macro nutrient summary. Refactors FoodItem model to add type annotations and a macros() method, and updates form handling to default missing values to zero. Also adds a navigation link to the new dashboard in the base template.
This commit is contained in:
@@ -13,6 +13,8 @@ from forms import FoodItemForm
|
||||
from models import FoodItem, FoodLog
|
||||
from datetime import datetime, timezone, timedelta
|
||||
from application.utils import login_required
|
||||
from typing import cast
|
||||
from numpy import array
|
||||
|
||||
user_bp = Blueprint(
|
||||
"user",
|
||||
@@ -21,6 +23,49 @@ user_bp = Blueprint(
|
||||
)
|
||||
|
||||
|
||||
def macro_arr_to_json(data: list[float]):
|
||||
assert len(data) == 4
|
||||
macros = [
|
||||
{
|
||||
"name": "Calories",
|
||||
"current": data[0],
|
||||
"target": 2000,
|
||||
"percent": data[0] / 20,
|
||||
"unit": " kcal",
|
||||
"color": "bg-calories",
|
||||
"overflow_color": "bg-calories-dark",
|
||||
},
|
||||
{
|
||||
"name": "Protein",
|
||||
"current": data[3],
|
||||
"target": 150,
|
||||
"percent": data[3] / 1.5,
|
||||
"unit": "g",
|
||||
"color": "bg-protein",
|
||||
"overflow_color": "bg-protein-dark",
|
||||
},
|
||||
{
|
||||
"name": "Carbs",
|
||||
"current": data[2],
|
||||
"target": 250,
|
||||
"percent": data[2] / 2.5,
|
||||
"unit": "g",
|
||||
"color": "bg-carbs",
|
||||
"overflow_color": "bg-carbs-dark",
|
||||
},
|
||||
{
|
||||
"name": "Fat",
|
||||
"current": data[1],
|
||||
"target": 70,
|
||||
"percent": data[1] / 0.7,
|
||||
"unit": "g",
|
||||
"color": "bg-fat",
|
||||
"overflow_color": "bg-fat-dark",
|
||||
},
|
||||
]
|
||||
return macros
|
||||
|
||||
|
||||
user_bp.before_request(login_required)
|
||||
|
||||
|
||||
@@ -100,6 +145,18 @@ def daily_log(offset: int = 0):
|
||||
)
|
||||
|
||||
|
||||
@user_bp.route("/daily_log2", methods=["GET"])
|
||||
def daily_log2():
|
||||
today = datetime.now(timezone.utc).date()
|
||||
logs_today = current_user.food_logs.filter_by(date_=today).all()
|
||||
macros = array((0.0, 0.0, 0.0, 0.0))
|
||||
for log in logs_today:
|
||||
item = cast(FoodItem, log.food_item)
|
||||
macros += array(item.macros()) / 100 * log.amount
|
||||
macros = macro_arr_to_json(macros.tolist())
|
||||
return render_template("daily_log2.html", macros=macros, logs=logs_today)
|
||||
|
||||
|
||||
@user_bp.route("/remove_log/<int:id>", methods=["POST"])
|
||||
def remove_log(id: int):
|
||||
log = db.session.get(FoodLog, id)
|
||||
|
||||
Reference in New Issue
Block a user