From c11811470862b364c22018ca7801964ad788b539 Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Mon, 17 Aug 2020 13:17:41 +0000 Subject: [PATCH] Left pad time parts with a leading zero if needed, add hint about times being in 24-hour format --- CHANGELOG.md | 1 + .../CurbsidePickup/configure.tt | 64 +++++++++++-------- 2 files changed, 37 insertions(+), 28 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 73d1553..2c7ee5b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [1.0.6] - 2020-08-17 ## Added - Added default CURBSIDE notice +- Hours and minutes in configuration are now formatted correctly for 24-hour time ## [1.0.5] - 2020-08-17 ## Changed diff --git a/Koha/Plugin/Com/ByWaterSolutions/CurbsidePickup/configure.tt b/Koha/Plugin/Com/ByWaterSolutions/CurbsidePickup/configure.tt index f703a86..f928608 100644 --- a/Koha/Plugin/Com/ByWaterSolutions/CurbsidePickup/configure.tt +++ b/Koha/Plugin/Com/ByWaterSolutions/CurbsidePickup/configure.tt @@ -1,4 +1,7 @@ [% USE KohaDates %] +[% USE format %] +[% USE format_minutes = format('%02d') %] +[% MACRO minutes_format BLOCK %][% IF m != "" %][% format_minutes(m) %][% END %][% END %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] Koha: Curbside pickup: Configuration @@ -68,102 +71,107 @@ Curbside pickup hours for [% l.branchname %]
    +
  1. + + Times should be in 24-hour format ( 00:00 to 23:59 ). +
    2. +
  2. - + : - + to - + : - +
  3. - + : - + to - + : - +
  4. - + : - + to - + : - +
  5. - + : - + to - + : - +
  6. - + : - + to - + : - +
  7. - + : - + to - + : - +
  8. - + : - + to - + : - +