Merge pull request #414 from patfreeman/record_date

honor record_date of posted drinks
Kegbot · Jun 28, 2020 · ef3e871 · ef3e871
2 parents c662a37 + 790a987
commit ef3e871
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/pykeg/web/api/forms.py b/pykeg/web/api/forms.py
@@ -15,6 +15,7 @@ class DrinkPostForm(forms.Form):
     ticks = forms.IntegerField()
     volume_ml = forms.FloatField(required=False)
     username = forms.RegexField(required=False, max_length=30, regex=USERNAME_REGEX)
+    record_date = forms.CharField(required=False)
     pour_time = forms.IntegerField(required=False)
     now = forms.IntegerField(required=False)
     duration = forms.IntegerField(required=False)

diff --git a/pykeg/web/api/views.py b/pykeg/web/api/views.py
@@ -661,7 +661,9 @@ def _tap_detail_post(request, tap):
     if not form.is_valid():
         raise kbapi.BadRequestError(_form_errors(form))
     cd = form.cleaned_data
-    if cd.get("pour_time") and cd.get("now"):
+    if cd.get("record_date"):
+        pour_time = datetime.datetime.fromisoformat(cd.get("record_date"))
+    elif cd.get("pour_time") and cd.get("now"):
         pour_time = datetime.datetime.fromtimestamp(cd.get("pour_time"))
         pour_now = datetime.datetime.fromtimestamp(cd.get("now"))
         pour_time_ago = pour_now - pour_time