Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

self review cleanup

Tom Bowyer8459f16a165e
diff --git a/wger/nutrition/forms.py b/wger/nutrition/forms.py
index 9916e8351..c3390886c 100644
--- a/wger/nutrition/forms.py
+++ b/wger/nutrition/forms.py
@@ -265,15 +265,19 @@ class MealItemForm(forms.ModelForm):
class MealLogItemForm(MealItemForm):
+ datetime_format = '%Y-%m-%dT%H:%M'
+ now = datetime.now().strftime(datetime_format)
+
datetime = forms.DateTimeField(
- input_formats=['%Y-%m-%dT%H:%M'],
+ input_formats=[datetime_format],
widget=forms.DateTimeInput(
attrs={
'type': 'datetime-local',
'class': 'form-control',
- 'value': datetime.now().strftime("%Y-%m-%dT%H:%M")
+ 'value': datetime.now().strftime(now),
+ 'max': datetime.now().strftime(now)
},
- format='%Y-%m-%dT%H:%M',
+ format=datetime_format,
)
)
diff --git a/wger/nutrition/migrations/0011_alter_logitem_datetime.py b/wger/nutrition/migrations/0011_alter_logitem_datetime.py
index d39f3caa4..919c30458 100644
--- a/wger/nutrition/migrations/0011_alter_logitem_datetime.py
+++ b/wger/nutrition/migrations/0011_alter_logitem_datetime.py
@@ -1,4 +1,4 @@
-# Generated by Django 3.2.13 on 2022-05-16 05:47
+# Generated by Django 3.2.13 on 2022-05-16 09:27
from django.db import migrations, models
import django.utils.timezone
@@ -14,6 +14,6 @@ class Migration(migrations.Migration):
migrations.AlterField(
model_name='logitem',
name='datetime',
- field=models.DateTimeField(default=django.utils.timezone.now, verbose_name='Date and Time'),
+ field=models.DateTimeField(default=django.utils.timezone.now, verbose_name='Date and Time (Approx.)'),
),
]
diff --git a/wger/nutrition/models/log.py b/wger/nutrition/models/log.py
index 13190494d..43cce97b3 100644
--- a/wger/nutrition/models/log.py
+++ b/wger/nutrition/models/log.py
@@ -63,8 +63,7 @@ class LogItem(BaseMealItem, models.Model):
"""
datetime = models.DateTimeField(
- verbose_name=_('Date and Time'),
- blank=False,
+ verbose_name=_('Date and Time (Approx.)'),
default=timezone.now
)
"""