Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Better handling of timezone aware datetimes

Roland Geiderbc1168d4537d
diff --git a/wger/manager/management/commands/dummy-generator-workout-diary.py b/wger/manager/management/commands/dummy-generator-workout-diary.py
index d410f76a2..8be47e26b 100644
--- a/wger/manager/management/commands/dummy-generator-workout-diary.py
+++ b/wger/manager/management/commands/dummy-generator-workout-diary.py
@@ -13,13 +13,14 @@
# You should have received a copy of the GNU Affero General Public License
# Standard Library
+import datetime
import logging
import random
-from datetime import time
# Django
from django.contrib.auth.models import User
from django.core.management.base import BaseCommand
+from django.utils.timezone import make_aware
# wger
from wger.manager.consts import RIR_OPTIONS
@@ -50,7 +51,7 @@ class Command(BaseCommand):
)
def handle(self, **options):
- self.stdout.write(f'** Generating dummy workout log entries')
+ self.stdout.write('** Generating dummy workout log entries')
users = (
[User.objects.get(pk=options['user_id'])] if options['user_id'] else User.objects.all()
@@ -62,6 +63,9 @@ class Command(BaseCommand):
logs = []
for routine in Routine.objects.filter(user=user):
for day_data in routine.date_sequence:
+ aware_date = make_aware(
+ datetime.datetime.combine(day_data.date, datetime.time())
+ )
if day_data.day is None:
continue
@@ -91,12 +95,12 @@ class Command(BaseCommand):
)
hour_start = random.randint(8, 20)
- time_start = time(
+ time_start = datetime.time(
hour_start,
random.randint(0, 59),
random.randint(0, 59),
)
- time_end = time(
+ time_end = datetime.time(
hour_start + random.randint(1, 3),
random.randint(0, 59),
random.randint(0, 59),
@@ -133,7 +137,7 @@ class Command(BaseCommand):
weight=weight,
weight_target=set_data.weight,
weight_unit_id=set_data.weight_unit,
- date=day_data.date,
+ date=aware_date,
rir=rir,
rir_target=set_data.rir,
rest=rest,
diff --git a/wger/manager/models/log.py b/wger/manager/models/log.py
index 5370e84c9..bd0c94f3c 100644
--- a/wger/manager/models/log.py
+++ b/wger/manager/models/log.py
@@ -14,13 +14,11 @@
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-# Standard Library
-import datetime
-
# Django
from django.contrib.auth.models import User
from django.core.exceptions import ValidationError
from django.db import models
+from django.utils import timezone
# wger
from wger.core.models import (
@@ -50,7 +48,7 @@ class WorkoutLog(models.Model):
date = models.DateTimeField(
verbose_name='Date',
- default=datetime.datetime.now,
+ default=timezone.now,
)
user = models.ForeignKey(
diff --git a/wger/nutrition/models/plan.py b/wger/nutrition/models/plan.py
index 635d2a804..137c8deb7 100644
--- a/wger/nutrition/models/plan.py
+++ b/wger/nutrition/models/plan.py
@@ -23,6 +23,7 @@ from django.contrib.auth.models import User
from django.core.cache import cache
from django.db import models
from django.urls import reverse
+from django.utils.timezone import make_aware
# wger
from wger.nutrition.consts import ENERGY_FACTOR
@@ -175,15 +176,16 @@ class NutritionPlan(models.Model):
Returns None if there are no entries.
"""
target = self.creation_date
+ target_aware = make_aware(datetime.datetime.combine(target, datetime.time()))
closest_entry_gte = (
WeightEntry.objects.filter(user=self.user)
- .filter(date__gte=target)
+ .filter(date__gte=target_aware)
.order_by('date')
.first()
)
closest_entry_lte = (
WeightEntry.objects.filter(user=self.user)
- .filter(date__lte=target)
+ .filter(date__lte=target_aware)
.order_by('-date')
.first()
)
diff --git a/wger/weight/helpers.py b/wger/weight/helpers.py
index 134d7539f..f5a7984ba 100644
--- a/wger/weight/helpers.py
+++ b/wger/weight/helpers.py
@@ -21,6 +21,9 @@ import decimal
import io
import logging
+# Django
+from django.utils.timezone import make_aware
+
# wger
from wger.weight.models import WeightEntry
@@ -46,7 +49,9 @@ def parse_weight_csv(request, cleaned_data):
# Process the CSV items first
for row in parsed_csv:
try:
- parsed_date = datetime.datetime.strptime(row[0], cleaned_data['date_format'])
+ parsed_date = make_aware(
+ datetime.datetime.strptime(row[0], cleaned_data['date_format'])
+ )
parsed_weight = decimal.Decimal(row[1].replace(',', '.'))
duplicate_date_in_db = WeightEntry.objects.filter(
date=parsed_date, user=request.user