diff --git a/AKPlan/templates/AKPlan/plan_akslot.html b/AKPlan/templates/AKPlan/plan_akslot.html index 95b6ac0eb488dba8d6a7fcbbb96fd86968503c83..a3215326e795e60feb728dce47c6278d3327e909 100644 --- a/AKPlan/templates/AKPlan/plan_akslot.html +++ b/AKPlan/templates/AKPlan/plan_akslot.html @@ -1,6 +1,7 @@ {% load static %} {% load tz %} {% load i18n %} +{% load tags_AKPlan %} {% include "AKPlan/load_fullcalendar.html" %} @@ -27,6 +28,7 @@ scrollTime: '08:00:00', allDaySlot: false, nowIndicator: true, + now: "{% timestamp_now event.timezone %}", eventTextColor: '#fff', eventColor: '#127ba3', // Create entries for all scheduled slots diff --git a/AKPlan/templates/AKPlan/plan_detail.html b/AKPlan/templates/AKPlan/plan_detail.html index 7c4423dac832d3a6d45e5c78efca62800381d8ec..417f4c59eb175574d39c95380d1e8ab4b4720a7f 100644 --- a/AKPlan/templates/AKPlan/plan_detail.html +++ b/AKPlan/templates/AKPlan/plan_detail.html @@ -4,6 +4,7 @@ {% load i18n %} {% load static %} {% load tz %} +{% load tags_AKPlan %} {% block fullcalendar %} @@ -36,6 +37,7 @@ scrollTime: '08:00:00', allDaySlot: false, nowIndicator: true, + now: "{% timestamp_now event.timezone %}", eventTextColor: '#fff', eventColor: '#127ba3', // Create entries for all scheduled slots diff --git a/AKPlan/templates/AKPlan/plan_index.html b/AKPlan/templates/AKPlan/plan_index.html index 0f2129bcddb16252171f11028d329fff929abbc3..c7a5460bcb880a64face98b5f60ad244b6dc0d40 100644 --- a/AKPlan/templates/AKPlan/plan_index.html +++ b/AKPlan/templates/AKPlan/plan_index.html @@ -4,6 +4,7 @@ {% load i18n %} {% load static %} {% load tz %} +{% load tags_AKPlan %} {% block fullcalendar %} @@ -47,6 +48,7 @@ editable: false, allDaySlot: false, nowIndicator: true, + now: "{% timestamp_now event.timezone %}", eventTextColor: '#fff', eventColor: '#127ba3', resourceAreaWidth: '15%', diff --git a/AKPlan/templates/AKPlan/plan_wall.html b/AKPlan/templates/AKPlan/plan_wall.html index d4ae656b8923004b6983186579e0110b8f5aadfd..2ff5eeaf0eebd09ccdfc60b26277ccfa7fa17af2 100644 --- a/AKPlan/templates/AKPlan/plan_wall.html +++ b/AKPlan/templates/AKPlan/plan_wall.html @@ -3,6 +3,7 @@ {% load bootstrap4 %} {% load fontawesome_5 %} {% load tags_AKModel %} +{% load tags_AKPlan %} {% load tz %} @@ -43,6 +44,7 @@ editable: false, allDaySlot: false, nowIndicator: true, + now: "{% timestamp_now event.timezone %}", eventTextColor: '#fff', eventColor: '#127ba3', height: '90%', diff --git a/AKPlan/templatetags/tags_AKPlan.py b/AKPlan/templatetags/tags_AKPlan.py index 5618fd57694fbfe75988bed3e9f3341f8a6c8818..c4d5b32bf0d704703680eb3b74f96fdcad403e4a 100644 --- a/AKPlan/templatetags/tags_AKPlan.py +++ b/AKPlan/templatetags/tags_AKPlan.py @@ -1,4 +1,7 @@ +from datetime import datetime + from django import template +from django.utils.formats import date_format from AKPlan.templatetags.color_gradients import darken from AKPlanning import settings @@ -18,3 +21,8 @@ def highlight_change_colors(akslot): recentness = seconds_since_update / settings.PLAN_MAX_HIGHLIGHT_UPDATE_SECONDS return darken("#b71540", recentness) # return linear_blend("#b71540", "#000000", recentness) + + +@register.simple_tag +def timestamp_now(tz): + return date_format(datetime.now().astimezone(tz), "c") diff --git a/AKScheduling/templates/admin/AKScheduling/scheduling.html b/AKScheduling/templates/admin/AKScheduling/scheduling.html index 9a140a4cf8614cc97067d333fe821992697cefac..28b8b17d1dc2df15b8fb6280c4e99f3ddbeacdf0 100644 --- a/AKScheduling/templates/admin/AKScheduling/scheduling.html +++ b/AKScheduling/templates/admin/AKScheduling/scheduling.html @@ -138,6 +138,7 @@ }, allDaySlot: false, nowIndicator: true, + now: "{% timestamp_now event.timezone %}", eventTextColor: '#fff', eventColor: '#127ba3', eventBackgroundColor: '#28B62C',