From e934633370e272f92ff354f0ec043b82cf7dfff6 Mon Sep 17 00:00:00 2001 From: Stef <48526421+StefBuwalda@users.noreply.github.com> Date: Wed, 8 Oct 2025 19:12:19 +0200 Subject: [PATCH 1/2] Development (#12) * Adjusted GUI of daily dashboard to better deal with float values * Change password + New base (#10) * created a new Base template to test with * Changed out the base and added a new password page * Password change works, UI needs redisgn * Daily log now sums up amount per item in a day --- application/user/routes.py | 20 +++++++++++++++----- application/user/templates/daily_log.html | 8 ++++---- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/application/user/routes.py b/application/user/routes.py index c4513b2..c50f7d2 100644 --- a/application/user/routes.py +++ b/application/user/routes.py @@ -15,6 +15,7 @@ from datetime import datetime from application.utils import login_required, macro_arr_to_json from numpy import array from zoneinfo import ZoneInfo +from sqlalchemy import func user_bp = Blueprint( "user", @@ -40,14 +41,23 @@ def daily_log(): session["selected_date"] = today.isoformat() # Get logs from today - logs_today = current_user.food_logs.filter_by( - date_=today.isoformat() - ).all() + logs_today = ( + current_user.food_logs.join( + FoodItem, FoodItem.id == FoodLog.food_item_id + ) + .filter(FoodLog.date_ == today) + .group_by(FoodItem.id) + .with_entities( + FoodItem, # the full object + func.sum(FoodLog.amount).label("total_amount"), + ) + .all() + ) # calculate macros macros = array((0.0, 0.0, 0.0, 0.0)) - for log in logs_today: - macros += array(log.food_item.macros()) / 100 * log.amount + for food_item, amount in logs_today: + macros += array(food_item.macros()) / 100 * amount macros = macro_arr_to_json(macros.tolist()) # Render HTML diff --git a/application/user/templates/daily_log.html b/application/user/templates/daily_log.html index 9fd6017..3d4774f 100644 --- a/application/user/templates/daily_log.html +++ b/application/user/templates/daily_log.html @@ -29,22 +29,22 @@
Items Eaten Today
- {% for log in logs %} + {% for food_item, amount in logs %}
- ({{ log.amount | int }}g) + ({{ amount | int }}g) - {{ log.food_item.name }} + {{ food_item.name }} - {{ (log.food_item.energy_100 * log.amount / 100) | int }} kcal + {{ (food_item.energy_100 * amount / 100) | int }} kcal
{% endfor %} From 312eda85dff13328f02baf0af69262e8eb32b5a5 Mon Sep 17 00:00:00 2001 From: Stef Date: Fri, 10 Oct 2025 19:50:18 +0200 Subject: [PATCH 2/2] Can now set macro target --- application/templates/navbar.html | 5 +-- application/templates/new_navbar.html | 1 + application/user/routes.py | 19 +++++++- application/user/templates/settings.html | 30 +++++++++++++ application/utils.py | 31 ++++++++----- forms.py | 24 ++++++++++ migrations/versions/21ec41b645e9_.py | 56 ++++++++++++++++++++++++ models.py | 14 ++++++ 8 files changed, 163 insertions(+), 17 deletions(-) create mode 100644 application/user/templates/settings.html create mode 100644 migrations/versions/21ec41b645e9_.py diff --git a/application/templates/navbar.html b/application/templates/navbar.html index 58625d2..c8c7848 100644 --- a/application/templates/navbar.html +++ b/application/templates/navbar.html @@ -17,15 +17,12 @@
    - {% if current_user.is_authenticated %}
  • Logout
    • - {% else %}
  • - Login + Set
    • - {% endif %}
    • diff --git a/application/templates/new_navbar.html b/application/templates/new_navbar.html index 7733e8a..153e180 100644 --- a/application/templates/new_navbar.html +++ b/application/templates/new_navbar.html @@ -24,6 +24,7 @@
    • Change Password
      • +
    • Set macros
    • Profile
    • diff --git a/application/user/routes.py b/application/user/routes.py index c50f7d2..bd2aae8 100644 --- a/application/user/routes.py +++ b/application/user/routes.py @@ -9,7 +9,7 @@ from flask import ( ) from flask_login import current_user from application import db -from forms import FoodItemForm +from forms import FoodItemForm, MacroForm from models import FoodItem, FoodLog from datetime import datetime from application.utils import login_required, macro_arr_to_json @@ -117,3 +117,20 @@ def remove_log(id: int): db.session.delete(log) db.session.commit() return redirect(url_for("user.daily_log")) + + +@user_bp.route("/set_macros", methods=["GET", "POST"]) +def set_macros(): + form = MacroForm() + + if form.validate_on_submit(): + current_user.set_macros( + form.protein.data, + form.carbohydrates.data, + form.fat.data, + form.calories.data, + ) + db.session.commit() + return redirect(url_for("user.daily_log")) + + return render_template("settings.html", form=form) diff --git a/application/user/templates/settings.html b/application/user/templates/settings.html new file mode 100644 index 0000000..ccd8668 --- /dev/null +++ b/application/user/templates/settings.html @@ -0,0 +1,30 @@ +{% extends "base.html"%} + +{% block title %} Daily Macro Settings {% endblock %} + +{% block content %} +
      +

      Set Your Daily Macro Targets

      +
      + {{ form.hidden_tag() }} +
      + + {{form.protein(class="form-control")}} +
      +
      + + {{form.carbohydrates(class="form-control")}} +
      +
      + + {{form.fat(class="form-control")}} +
      +
      + + {{form.calories(class="form-control")}} +
      + {{form.submit(class="btn btn-primary")}} +
      + +
      +{% endblock %} \ No newline at end of file diff --git a/application/utils.py b/application/utils.py index c50ea0b..a6e9522 100644 --- a/application/utils.py +++ b/application/utils.py @@ -41,9 +41,11 @@ def macro_arr_to_json(data: list[float]): { "name": "Calories", "current": cal, - "target": 2000, - "bar_width": 100 - abs(cal / 20 - 100), - "bar_width_overflow": max(0, cal / 20 - 100), + "target": current_user.calories, + "bar_width": 100 - abs(cal * 100 / current_user.calories - 100), + "bar_width_overflow": max( + 0, cal * 100 / current_user.calories - 100 + ), "unit": " kcal", "color": "bg-calories", "overflow_color": "bg-calories-dark", @@ -51,9 +53,11 @@ def macro_arr_to_json(data: list[float]): { "name": "Protein", "current": pro, - "target": 150, - "bar_width": 100 - abs(pro / 1.5 - 100), - "bar_width_overflow": max(0, pro / 1.5 - 100), + "target": current_user.protein, + "bar_width": 100 - abs(pro * 100 / current_user.protein - 100), + "bar_width_overflow": max( + 0, pro * 100 / current_user.protein - 100 + ), "unit": "g", "color": "bg-protein", "overflow_color": "bg-protein-dark", @@ -61,9 +65,12 @@ def macro_arr_to_json(data: list[float]): { "name": "Carbs", "current": car, - "target": 250, - "bar_width": 100 - abs(car / 2.5 - 100), - "bar_width_overflow": max(0, car / 2.5 - 100), + "target": current_user.carbohydrates, + "bar_width": 100 + - abs(car * 100 / current_user.carbohydrates - 100), + "bar_width_overflow": max( + 0, car * 100 / current_user.carbohydrates - 100 + ), "unit": "g", "color": "bg-carbs", "overflow_color": "bg-carbs-dark", @@ -71,9 +78,9 @@ def macro_arr_to_json(data: list[float]): { "name": "Fat", "current": fat, - "target": 70, - "bar_width": 100 - abs(fat / 0.7 - 100), - "bar_width_overflow": max(0, fat / 0.7 - 100), + "target": current_user.fat, + "bar_width": 100 - abs(fat * 100 / current_user.fat - 100), + "bar_width_overflow": max(0, fat * 100 / current_user.fat - 100), "unit": "g", "color": "bg-fat", "overflow_color": "bg-fat-dark", diff --git a/forms.py b/forms.py index ea3ab1d..83c45d4 100644 --- a/forms.py +++ b/forms.py @@ -68,6 +68,30 @@ class FoodItemForm(FlaskForm): submit = SubmitField("Add Item") +class MacroForm(FlaskForm): + protein = FloatField( + "Protein (g)", + validators=[InputRequired()], + render_kw={"inputmode": "decimal"}, + ) + carbohydrates = FloatField( + "Carbohydrates (g)", + validators=[InputRequired()], + render_kw={"inputmode": "decimal"}, + ) + fat = FloatField( + "Fat (g)", + validators=[InputRequired()], + render_kw={"inputmode": "decimal"}, + ) + calories = FloatField( + "Calories (kcal)", + validators=[InputRequired()], + render_kw={"inputmode": "decimal"}, + ) + submit = SubmitField("Update macros") + + class FoodLogForm(FlaskForm): amount = FloatField("amount of food (g/ml)", validators=[DataRequired()]) submit = SubmitField("Log Item") diff --git a/migrations/versions/21ec41b645e9_.py b/migrations/versions/21ec41b645e9_.py new file mode 100644 index 0000000..e4251bf --- /dev/null +++ b/migrations/versions/21ec41b645e9_.py @@ -0,0 +1,56 @@ +"""empty message + +Revision ID: 21ec41b645e9 +Revises: 65eaeafb0904 +Create Date: 2025-10-10 19:26:21.718736 + +""" + +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = "21ec41b645e9" +down_revision = "65eaeafb0904" +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + with op.batch_alter_table("user", schema=None) as batch_op: + batch_op.add_column( + sa.Column( + "protein", sa.Float(), nullable=False, server_default="100" + ) + ) + batch_op.add_column( + sa.Column( + "carbohydrates", + sa.Float(), + nullable=False, + server_default="250", + ) + ) + batch_op.add_column( + sa.Column("fat", sa.Float(), nullable=False, server_default="60") + ) + batch_op.add_column( + sa.Column( + "calories", sa.Float(), nullable=False, server_default="2000" + ) + ) + + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + with op.batch_alter_table("user", schema=None) as batch_op: + batch_op.drop_column("calories") + batch_op.drop_column("fat") + batch_op.drop_column("carbohydrates") + batch_op.drop_column("protein") + + # ### end Alembic commands ### diff --git a/models.py b/models.py index 7eabf87..c9e13bf 100644 --- a/models.py +++ b/models.py @@ -16,6 +16,11 @@ class User(UserMixin, db.Model): is_admin = db.Column(db.Boolean, nullable=False, default=False) must_change_password = db.Column(db.Boolean, nullable=False, default=False) + protein = db.Column(db.Float, nullable=False) + carbohydrates = db.Column(db.Float, nullable=False) + fat = db.Column(db.Float, nullable=False) + calories = db.Column(db.Float, nullable=False) + food_items = db.relationship("FoodItem", lazy="dynamic", backref="user") food_logs = db.relationship("FoodLog", lazy="dynamic", backref="user") @@ -32,6 +37,15 @@ class User(UserMixin, db.Model): self.is_admin = is_admin self.must_change_password = must_change_password + def set_macros( + self, protein: float, carbs: float, fat: float, calories: float + ): + self.protein = protein + self.carbohydrates = carbs + self.fat = fat + self.calories = calories + return + def check_password(self, password: str) -> bool: return check_password_hash(pwhash=self.password, password=password)