From ea1603bca71eef86482f344225a7caf401d0b4d1 Mon Sep 17 00:00:00 2001
From: Galen Charlton <gmc@equinoxinitiative.org>
Date: Fri, 5 Jun 2020 16:51:20 -0400
Subject: [PATCH] display warning if patron's appointment is in the past

Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
---
 .../staff/circ/curbside/t_schedule_pickup.tt2      | 69 ++++++++++++----------
 .../circ/curbside/directives/schedule_pickup.js    |  3 +
 2 files changed, 41 insertions(+), 31 deletions(-)

diff --git a/Open-ILS/src/templates/staff/circ/curbside/t_schedule_pickup.tt2 b/Open-ILS/src/templates/staff/circ/curbside/t_schedule_pickup.tt2
index 678db787fd..a0cb2b3bef 100644
--- a/Open-ILS/src/templates/staff/circ/curbside/t_schedule_pickup.tt2
+++ b/Open-ILS/src/templates/staff/circ/curbside/t_schedule_pickup.tt2
@@ -44,39 +44,46 @@
     <button ng-disabled="openAppointments.length > 0" ng-click="startNewAppointment()" class="btn btn-success">[% l('Make New Appointment') %]</button>
   </div>
   <br>
-  <div class="row form-inline" ng-repeat="appt in openAppointments">
+  <div class="form-inline" ng-repeat="appt in openAppointments">
     <ng-form name="forms['curbside' + appt.id]">
-      <div class="col-md-1">
-        <label for="appointment-id">[% l('Appointment') %]</label>
-        <div id="appointment-id">{{appt.id}}</div>
-      </div>
-      <div class="col-md-2">
-        <label for="appointment-day">[% l('Date') %]</label>
-        <eg-date-input id="appointment-day" hide-time-picker ng-model="appt.slot_date"
-                       required min-date="minDate">
-        </eg-date-input>
-      </div>
-      <div class="col-md-2">
-        <label for="appointment-time">[% l('Time') %]</label>
-        <select class="form-control" id="appointment-time" ng-model="appt.slot_time"
-                name="slot_time" style="display: block;"
-                required ng-focus="refreshAvailableTimes(appt)">
-          <option value=""></option>
-          <option ng-repeat="t in appt.available_times track by t.time" value="{{t.time}}"
-                  ng-disabled="t.available === 0 && appt.original_slot_time !== t.time">
-            [% l('[_1] (Available: [_2])', '{{t.time_fmt}}', '{{t.available}}') %]
-        </option>
-        </select>
-      </div>
-      <div class="col-md-2">
-        <label for="appointment-notes">[% l('Notes') %]</label>
-        <input class="form-control" type="text" id="appointment-notes" ng-model="appt.notes" style="display: block;"></input>
+      <div class="row">
+        <div class="col-md-1">
+          <label for="appointment-id">[% l('Appointment') %]</label>
+          <div id="appointment-id">{{appt.id}}</div>
+        </div>
+        <div class="col-md-2">
+          <label for="appointment-day">[% l('Date') %]</label>
+          <eg-date-input id="appointment-day" hide-time-picker ng-model="appt.slot_date"
+                         required min-date="minDate">
+          </eg-date-input>
+        </div>
+        <div class="col-md-2">
+          <label for="appointment-time">[% l('Time') %]</label>
+          <select class="form-control" id="appointment-time" ng-model="appt.slot_time"
+                  name="slot_time" style="display: block;"
+                  required ng-focus="refreshAvailableTimes(appt)">
+            <option value=""></option>
+            <option ng-repeat="t in appt.available_times track by t.time" value="{{t.time}}"
+                    ng-disabled="t.available === 0 && appt.original_slot_time !== t.time">
+              [% l('[_1] (Available: [_2])', '{{t.time_fmt}}', '{{t.available}}') %]
+          </option>
+          </select>
+        </div>
+        <div class="col-md-2">
+          <label for="appointment-notes">[% l('Notes') %]</label>
+          <input class="form-control" type="text" id="appointment-notes" ng-model="appt.notes" style="display: block;"></input>
+        </div>
+        <div class="col-md-2">
+          <label for="appointment-actions">[% l('Actions') %]</label>
+          <div id="appointment-actions">
+            <button ng-click="updateAppointment(appt)" ng-disabled="!forms['curbside' + appt.id].$valid" class="btn btn-primary">[% l('Save') %]</button>
+            <button ng-click="cancelAppointment(appt.id)" ng-disabled="!appt.id" class="btn btn-danger">[% l('Cancel Appointment') %]</button>
+          </div>
+        </div>
       </div>
-      <div class="col-md-2">
-        <label for="appointment-actions">[% l('Actions') %]</label>
-        <div id="appointment-actions">
-          <button ng-click="updateAppointment(appt)" ng-disabled="!forms['curbside' + appt.id].$valid" class="btn btn-primary">[% l('Save') %]</button>
-          <button ng-click="cancelAppointment(appt.id)" ng-disabled="!appt.id" class="btn btn-danger">[% l('Cancel Appointment') %]</button>
+      <div class="row pad-vert">
+        <div ng-if="appt.is_past" class="col-md-offset-1 col-md-4 alert alert-warning">
+          [% l('Appointment is in the past and may need to be rescheduled.') %]
         </div>
       </div>
     </ng-form>
diff --git a/Open-ILS/web/js/ui/default/staff/circ/curbside/directives/schedule_pickup.js b/Open-ILS/web/js/ui/default/staff/circ/curbside/directives/schedule_pickup.js
index a9ca76ecdb..6a3163f720 100644
--- a/Open-ILS/web/js/ui/default/staff/circ/curbside/directives/schedule_pickup.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/curbside/directives/schedule_pickup.js
@@ -261,6 +261,9 @@ function($scope , $q , egCurbsideCoreSvc , egCore , patronSvc ,
             }
         }
         hash.slot_date = new Date(hash.slot);
+        if (!isNew) {
+            hash.is_past = (hash.slot_date < new Date());
+        }
         hash.available_times = [];
         egCore.net.request (
             'open-ils.curbside',
-- 
2.11.0