Merge pull request #76 from Xpirix/fix_datetime_format

Remove second in feed form, change displayed format in the list
qgis · May 23, 2024 · c3c3890 · c3c3890
2 parents 461fda1 + 2177a69
commit c3c3890
Show file tree

Hide file tree

Showing 5 changed files with 5,692 additions and 4 deletions.
diff --git a/qgisfeedproject/qgisfeed/forms.py b/qgisfeedproject/qgisfeed/forms.py
@@ -125,6 +125,7 @@ def __init__(self, *args, **kwargs):
             'default_zoom': 2
         })
         self.fields['publish_from'].widget = forms.DateTimeInput(
+            format='%Y-%m-%dT%H:%M',
             attrs={
                 'type': 'datetime-local', 
                 'class': 'input', 
@@ -133,6 +134,7 @@ def __init__(self, *args, **kwargs):
         self.fields['publish_from'].initial = timezone.now()
 
         self.fields['publish_to'].widget = forms.DateTimeInput(
+            format='%Y-%m-%dT%H:%M',
             attrs={
                 'type': 'datetime-local', 
                 'class': 'input', 

diff --git a/qgisfeedproject/static/js/feed_item_form.js b/qgisfeedproject/static/js/feed_item_form.js
@@ -129,12 +129,12 @@ function refreshSpatialFilter() {
 function refreshDates() {
   publishFromPreview.forEach((item) => {
     item.innerText = publishFromField.value
-      ? new Date(publishFromField.value).toString()
+      ? moment(new Date(publishFromField.value)).format('ddd DD MMM YYYY HH:mm:ss [UTC]')
       : "-";
   });
   publishToPreview.forEach((item) => {
     item.innerText = publishToField.value
-      ? new Date(publishToField.value).toString()
+      ? moment(new Date(publishToField.value)).format('ddd DD MMM YYYY HH:mm:ss [UTC]')
       : "-";
   });
   checkFormValid();