diff --git a/application/add_meal_v2/routes.py b/application/add_meal_v2/routes.py
index 1aef4a4..fbe3aa2 100644
--- a/application/add_meal_v2/routes.py
+++ b/application/add_meal_v2/routes.py
@@ -148,7 +148,6 @@ def step4():
food_item_id=item.id,
user_id=current_user.id,
amount=form.amount.data,
- part_of_day=0,
date_=datetime.strptime(
session["selected_date"], "%Y-%m-%d"
).date(),
diff --git a/application/templates/base.html b/application/templates/base.html
index 7d14a2d..70ef8ad 100644
--- a/application/templates/base.html
+++ b/application/templates/base.html
@@ -22,9 +22,6 @@
- -
- Daily Log
-
-
Daily Log (new)
diff --git a/application/user/routes.py b/application/user/routes.py
index d0380a6..6d3d172 100644
--- a/application/user/routes.py
+++ b/application/user/routes.py
@@ -11,7 +11,7 @@ from flask_login import current_user
from application import db
from forms import FoodItemForm
from models import FoodItem, FoodLog
-from datetime import datetime, timezone, timedelta
+from datetime import datetime
from application.utils import login_required
from numpy import array
from zoneinfo import ZoneInfo
@@ -119,40 +119,6 @@ def edit_food_item(id: int):
return redirect(url_for("user.dashboard"))
-@user_bp.route("/", methods=["GET"])
-@user_bp.route("/", methods=["GET"])
-def daily_log(offset: int = 0):
- try:
- offset = int(offset)
- except ValueError:
- abort(400) # or handle invalid input
- today = datetime.now(timezone.utc).date()
- day = today + timedelta(days=offset)
- session["offset"] = offset
- logs_today = current_user.food_logs.filter_by(date_=day).all()
- logs = [[], [], [], []]
- calories: float = 0
- protein: float = 0
- carbs: float = 0
- fat: float = 0
- for log in logs_today:
- logs[log.part_of_day].append(log)
- calories += log.amount * log.food_item.energy_100 / 100
- protein += log.amount * log.food_item.protein_100 / 100
- carbs += log.amount * log.food_item.carbs_100 / 100
- fat += log.amount * log.food_item.fat_100 / 100
- return render_template(
- "daily_log.html",
- date=(day.strftime("%d/%m/%y")),
- logs=logs,
- calories=calories,
- protein=protein,
- carbs=carbs,
- fat=fat,
- offset=offset,
- )
-
-
@user_bp.route("/daily_log2", methods=["GET"])
def daily_log2():
# Get today's date according to user's timezone
diff --git a/models.py b/models.py
index 7c6b27e..7eabf87 100644
--- a/models.py
+++ b/models.py
@@ -142,7 +142,6 @@ class FoodLog(db.Model):
food_item_id: int,
user_id: int,
amount: float,
- part_of_day: int,
date_: Optional[date] = None,
):
super().__init__()
@@ -151,4 +150,3 @@ class FoodLog(db.Model):
self.amount = amount
if date_ is not None:
self.date_ = date_
- self.part_of_day = part_of_day
diff --git a/seed.py b/seed.py
index 66b0748..9272420 100644
--- a/seed.py
+++ b/seed.py
@@ -22,10 +22,10 @@ with app.app_context():
)
FoodLog.query.delete()
- db.session.add(FoodLog(1, 1, 200, 0))
- db.session.add(FoodLog(1, 1, 200, 1))
- db.session.add(FoodLog(1, 1, 200, 2))
- db.session.add(FoodLog(1, 1, 200, 3))
- db.session.add(FoodLog(1, 1, 100, 1))
+ db.session.add(FoodLog(1, 1, 200))
+ db.session.add(FoodLog(1, 1, 200))
+ db.session.add(FoodLog(1, 1, 200))
+ db.session.add(FoodLog(1, 1, 200))
+ db.session.add(FoodLog(1, 1, 100))
db.session.commit()