Properly show un-finished past appointments, and use 12-hour times for display in...

Signed-off-by: Mike Rylander <mrylander@gmail.com>

diff --git a/Open-ILS/src/templates/opac/myopac/holds_curbside.tt2 b/Open-ILS/src/templates/opac/myopac/holds_curbside.tt2
index d8d21c6..813cef2 100644 (file)
--- a/Open-ILS/src/templates/opac/myopac/holds_curbside.tt2
+++ b/Open-ILS/src/templates/opac/myopac/holds_curbside.tt2
@@ -96,13 +96,13 @@
             <span class="egtd">
                 [% IF appointment || cs_date; # checking times %]
                   [% current_date = cs_date %]
-                  [% IF ctx.cs_times.$current_date.size; # show a select %]
+                  [% IF appointment || ctx.cs_times.$current_date.size; # show a select %]
                     <select name="cs_time" [% IF disable_me %]disabled="disabled"[% END %]>
                       [% found_time = 0 %]
                       [% FOR t IN ctx.cs_times.$current_date %]
                         <option value="[% t.0 | html %]"
                           [% IF cs_time == t.0; found_time=1 %] selected="selected"[% END %]
-                          [% IF t.1 == 0 %] disabled="disabled[% END %]>[% t.0 | html %]
+                          [% IF t.1 == 0 %] disabled="disabled[% END %]>[% date.format(current_date _ ' ' _ t.0,'%l:%M %p') | html %]
                         </option>
                       [% END %]
                       [% IF cs_time && !found_time %]