mirror of
https://github.com/StefBuwalda/cal_counter.git
synced 2025-10-29 10:50:00 +00:00
Remove part of day from remaining code
This commit is contained in:
@@ -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(),
|
||||
|
||||
@@ -22,9 +22,6 @@
|
||||
<div class="collapse navbar-collapse" id="navbarNav">
|
||||
<div class="d-flex w-100">
|
||||
<ul class="navbar-nav flex-grow-1">
|
||||
<li class="nav-item">
|
||||
<a class="nav-link" href="{{ url_for('user.daily_log') }}">Daily Log</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a class="nav-link" href="{{ url_for('user.daily_log2') }}">Daily Log (new)</a>
|
||||
</li>
|
||||
|
||||
@@ -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("/<offset>", 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
|
||||
|
||||
@@ -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
|
||||
|
||||
10
seed.py
10
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()
|
||||
|
||||
Reference in New Issue
Block a user