Switch from 12-hour clock to 24-hour clock in time axis labels and in…

… tooltips (#446) * Switch from 12-hour clock to 24-hour clock in time axis labels and in tooltips Signed-off-by: F.N. Claessen <felix@seita.nl> * Changelog entry Signed-off-by: F.N. Claessen <felix@seita.nl> * Fix test Signed-off-by: F.N. Claessen <felix@seita.nl> * Add redundant brackets for ease of reading Signed-off-by: F.N. Claessen <felix@seita.nl> * Add comment explaining the chosen timeFormat Signed-off-by: F.N. Claessen <felix@seita.nl>
FlexMeasures · Jul 8, 2022 · 1acd3f4 · 1acd3f4
1 parent 16aa4bd
commit 1acd3f4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/documentation/changelog.rst b/documentation/changelog.rst
@@ -9,6 +9,7 @@ New features
 -------------
 * Individual sensor charts show available annotations [see `PR #428 <http://www.github.com/FlexMeasures/flexmeasures/pull/428>`_]
 * Collapsible sidepanel (hover/swipe) used for date selection on sensor charts, and various styling improvements [see `PR #447 <http://www.github.com/FlexMeasures/flexmeasures/pull/447>`_]
+* Switched from 12-hour AM/PM to 24-hour clock notation for time series chart axis labels [see `PR #446 <http://www.github.com/FlexMeasures/flexmeasures/pull/446>`_]
 
 Bugfixes
 -----------

diff --git a/flexmeasures/data/models/charts/defaults.py b/flexmeasures/data/models/charts/defaults.py
@@ -10,20 +10,22 @@
 WIDTH = "container"
 REDUCED_HEIGHT = REDUCED_WIDTH = 60
 SELECTOR_COLOR = "darkred"
-TIME_FORMAT = "%I:%M %p on %A %b %e, %Y"
+TIME_FORMAT = "%H:%M on %A %b %e, %Y"
+# Use default timeFormat for date or second labels, and use 24-hour clock notation for other (hour and minute) labels
+FORMAT_24H = "(hours(datum.value) == 0 & minutes(datum.value) == 0) | seconds(datum.value) != 0 ? timeFormat(datum.value) : timeFormat(datum.value, '%H:%M')"
 TIME_SELECTION_TOOLTIP = "Click and drag to select a time window"
 FIELD_DEFINITIONS = {
     "event_start": dict(
         field="event_start",
         type="temporal",
         title=None,
-        axis={"labelOverlap": True, "labelSeparation": 1},
+        axis={"labelExpr": FORMAT_24H, "labelOverlap": True, "labelSeparation": 1},
     ),
     "event_end": dict(
         field="event_end",
         type="temporal",
         title=None,
-        axis={"labelOverlap": True, "labelSeparation": 1},
+        axis={"labelExpr": FORMAT_24H, "labelOverlap": True, "labelSeparation": 1},
     ),
     "event_value": dict(
         field="event_value",