Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Add date time selector for logs

Tom Bowyer2765342ca9ec
diff --git a/wger/nutrition/forms.py b/wger/nutrition/forms.py
index e8d947938..9916e8351 100644
--- a/wger/nutrition/forms.py
+++ b/wger/nutrition/forms.py
@@ -15,6 +15,7 @@
# You should have received a copy of the GNU Affero General Public License
# Standard Library
+from datetime import datetime
import logging
# Django
@@ -264,6 +265,17 @@ class MealItemForm(forms.ModelForm):
class MealLogItemForm(MealItemForm):
+ datetime = forms.DateTimeField(
+ input_formats=['%Y-%m-%dT%H:%M'],
+ widget=forms.DateTimeInput(
+ attrs={
+ 'type': 'datetime-local',
+ 'class': 'form-control',
+ 'value': datetime.now().strftime("%Y-%m-%dT%H:%M")
+ },
+ format='%Y-%m-%dT%H:%M',
+ )
+ )
class Meta:
model = LogItem
@@ -271,8 +283,24 @@ class MealLogItemForm(MealItemForm):
'ingredient',
'weight_unit',
'amount',
+ 'datetime',
]
+ def __init__(self, *args, **kwargs):
+ super(MealItemForm, self).__init__(*args, **kwargs)
+
+ self.helper = FormHelper()
+ self.helper.layout = Layout(
+ 'ingredient', 'ingredient_searchfield', HTML(
+ '<div id="ingredient_name"></div>'),
+ Row(
+ Column('amount', css_class='form-group col-6 mb-0'),
+ Column('weight_unit', css_class='form-group col-6 mb-0'),
+ Column('datetime', css_class='form-group col-6 mb-0'),
+ css_class='form-row'
+ )
+ )
+
class IngredientForm(forms.ModelForm):
diff --git a/wger/nutrition/migrations/0011_alter_logitem_datetime.py b/wger/nutrition/migrations/0011_alter_logitem_datetime.py
new file mode 100644
index 000000000..d39f3caa4
--- /dev/null
+++ b/wger/nutrition/migrations/0011_alter_logitem_datetime.py
@@ -0,0 +1,19 @@
+# Generated by Django 3.2.13 on 2022-05-16 05:47
+
+from django.db import migrations, models
+import django.utils.timezone
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('nutrition', '0010_logitem_meal'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='logitem',
+ name='datetime',
+ field=models.DateTimeField(default=django.utils.timezone.now, verbose_name='Date and Time'),
+ ),
+ ]
diff --git a/wger/nutrition/models/log.py b/wger/nutrition/models/log.py
index 6cebb59d9..13190494d 100644
--- a/wger/nutrition/models/log.py
+++ b/wger/nutrition/models/log.py
@@ -62,7 +62,11 @@ class LogItem(BaseMealItem, models.Model):
The plan this log belongs to
"""
- datetime = models.DateTimeField(default=timezone.now)
+ datetime = models.DateTimeField(
+ verbose_name=_('Date and Time'),
+ blank=False,
+ default=timezone.now
+ )
"""
Time and date when the log was added
"""