From: Dan Scott <dscott@laurentian.ca>
Date: Fri, 1 Nov 2013 20:29:52 +0000 (-0400)
Subject: Library schema: cut over to OpeningHoursSpecification
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=0447d72b4dd3b5f6854472b13bc3f88660c8bd10;p=working%2FEvergreen.git

Library schema: cut over to OpeningHoursSpecification

This allows more precision, as well as supporting validFrom / validUntil
ranges (assuming our database schema eventually supports that).

Signed-off-by: Dan Scott <dscott@laurentian.ca>
---

diff --git a/Open-ILS/src/templates/opac/library.tt2 b/Open-ILS/src/templates/opac/library.tt2
index 52c8008ff6..089d31c0ce 100644
--- a/Open-ILS/src/templates/opac/library.tt2
+++ b/Open-ILS/src/templates/opac/library.tt2
@@ -16,15 +16,36 @@
 
     [%- IF ctx.hours_schema; %]
     <h2>[% l('Opening hours') %]</h2>
-    <time class="opening-hours" property="openingHours" datetime="[% ctx.hours_schema %]">
-        <div>[% l('Monday: [_1]-[_2]', ctx.hours.dow_0_open.substr(0, 5), ctx.hours.dow_0_close) %]</div>
-        <div>[% l('Tuesday: [_1]-[_2]', ctx.hours.dow_1_open.substr(0, 5), ctx.hours.dow_1_close) %]</div>
-        <div>[% l('Wednesday: [_1]-[_2]', ctx.hours.dow_2_open.substr(0, 5), ctx.hours.dow_2_close) %]</div>
-        <div>[% l('Thursday: [_1]-[_2]', ctx.hours.dow_3_open.substr(0, 5), ctx.hours.dow_3_close) %]</div>
-        <div>[% l('Friday: [_1]-[_2]', ctx.hours.dow_4_open.substr(0, 5), ctx.hours.dow_4_close) %]</div>
-        <div>[% l('Saturday: [_1]-[_2]', ctx.hours.dow_5_open.substr(0, 5), ctx.hours.dow_5_close) %]</div>
-        <div>[% l('Sunday: [_1]-[_2]', ctx.hours.dow_6_open.substr(0, 5), ctx.hours.dow_6_close) %]</div>
-    </time>
+    <div class="opening-hours" property="openingHoursSpecification" typeof="OpeningHoursSpecification">
+        <time><link property="dayOfWeek" href="http://purl.org/goodrelations/v1#Monday" />[%
+            l('Monday: [_1]-[_2]', '<span property="opens">' _ ctx.hours.dow_0_open.substr(0, 5) _ '</span>',
+             '<span property="closes">' _ ctx.hours.dow_0_close _ '</span>') -%]
+        </time>
+        <time><link property="dayOfWeek" href="http://purl.org/goodrelations/v1#Tuesday" />[%
+            l('Tuesday: [_1]-[_2]', '<span property="opens">' _ ctx.hours.dow_1_open.substr(0, 5) _ '</span>',
+             '<span property="closes">' _ ctx.hours.dow_1_close _ '</span>') -%]
+        </time>
+        <time><link property="dayOfWeek" href="http://purl.org/goodrelations/v1#Wednesday" />[%
+            l('Wednesday: [_1]-[_2]', '<span property="opens">' _ ctx.hours.dow_2_open.substr(0, 5) _ '</span>',
+             '<span property="closes">' _ ctx.hours.dow_2_close _ '</span>') -%]
+        </time>
+        <time><link property="dayOfWeek" href="http://purl.org/goodrelations/v1#Thursday" />[%
+            l('Thursday: [_1]-[_2]', '<span property="opens">' _ ctx.hours.dow_3_open.substr(0, 5) _ '</span>',
+             '<span property="closes">' _ ctx.hours.dow_3_close _ '</span>') -%]
+        </time>
+        <time><link property="dayOfWeek" href="http://purl.org/goodrelations/v1#Friday" />[%
+            l('Friday: [_1]-[_2]', '<span property="opens">' _ ctx.hours.dow_4_open.substr(0, 5) _ '</span>',
+             '<span property="closes">' _ ctx.hours.dow_4_close _ '</span>') -%]
+        </time>
+        <time><link property="dayOfWeek" href="http://purl.org/goodrelations/v1#Saturday" />[%
+            l('Saturday: [_1]-[_2]', '<span property="opens">' _ ctx.hours.dow_5_open.substr(0, 5) _ '</span>',
+             '<span property="closes">' _ ctx.hours.dow_5_close _ '</span>') -%]
+        </time>
+        <time><link property="dayOfWeek" href="http://purl.org/goodrelations/v1#Sunday" />[%
+            l('Sunday: [_1]-[_2]', '<span property="opens">' _ ctx.hours.dow_6_open.substr(0, 5) _ '</span>',
+             '<span property="closes">' _ ctx.hours.dow_6_close _ '</span>') -%]
+        </time>
+    </div>
     [% END; -%]
 
     [%- IF (ctx.library.email OR ctx.library.phone); %]