LP1903357 Angstcat Hold Activate Date Validation

Prevent setting activation dates in the past when placing holds in the
Angular Staff Catalog.

Signed-off-by: Bill Erickson <berickxx@gmail.com>
Signed-off-by: Josh Stompro <stompro@stompro.org>

diff --git a/Open-ILS/src/eg2/src/app/staff/catalog/hold/hold.component.html b/Open-ILS/src/eg2/src/app/staff/catalog/hold/hold.component.html
index cdc864d..a5fcb52 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/catalog/hold/hold.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/catalog/hold/hold.component.html
@@ -2,6 +2,13 @@
 <eg-patron-search-dialog #patronSearch>
 </eg-patron-search-dialog>
 
+<eg-alert-dialog #activeDateAlert
+  i18n-dialogTitle i18n-dialogBody
+  dialogTitle="Invalid Hold Activation Date"
+  dialogBody="Hold activation date {{activeDateYmd}} is not valid.
+    Please chose a date in the future">
+</eg-alert-dialog>
+
 <div class="row">
   <div class="col-lg-1">
     <button class="btn btn-info label-with-material-icon"
@@ -94,9 +101,13 @@
           </div>
         </div>
         <div class="col-lg-6">
-          <eg-date-select [(ngModel)]="activeDate" name='active-date'
-            (onChangeAsIso)="activeDateSelected($event)" [disabled]="!suspend">
-          </eg-date-select>
+          <div [ngClass]="{'border border-danger rounded': activeDateInvalid}">
+            <eg-date-select [(ngModel)]="activeDate" name='active-date'
+              (onChangeAsYmd)="activeDateYmd = $event"
+              (onChangeAsDate)="setActiveDate($event)"
+              (onChangeAsIso)="activeDateSelected($event)" [disabled]="!suspend">
+            </eg-date-select>
+          </div>
         </div>
       </div>
       <div class="row mt-2" *ngIf="multiHoldsActive">
@@ -192,7 +203,6 @@
           <li class="list-group-item">
             <button class="btn btn-success" (click)="placeHolds()"
               [disabled]="!readyToPlaceHolds()" i18n>Place Hold(s)</button>
-
             <button class="btn btn-outline-dark ml-2" (click)="resetForm()" i18n>Reset</button>
           </li>
         </ul><!-- col -->

diff --git a/Open-ILS/src/eg2/src/app/staff/catalog/hold/hold.component.ts b/Open-ILS/src/eg2/src/app/staff/catalog/hold/hold.component.ts
index 5399cd3..25943b9 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/catalog/hold/hold.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/catalog/hold/hold.component.ts
@@ -1,4 +1,4 @@
-import {Component, OnInit, Input, ViewChild} from '@angular/core';
+import {Component, OnInit, ViewChild} from '@angular/core';
 import {Router, ActivatedRoute, ParamMap} from '@angular/router';
 import {tap} from 'rxjs/operators';
 import {EventService} from '@eg/core/event.service';
@@ -18,6 +18,7 @@ import {ComboboxEntry, ComboboxComponent} from '@eg/share/combobox/combobox.comp
 import {PatronService} from '@eg/staff/share/patron/patron.service';
 import {PatronSearchDialogComponent
   } from '@eg/staff/share/patron/search-dialog.component';
+import {AlertDialogComponent} from '@eg/share/dialog/alert.component';
 
 class HoldContext {
     holdMeta: HoldRequestTarget;
@@ -64,7 +65,9 @@ export class HoldComponent implements OnInit {
     smsValue: string;
     suspend: boolean;
     activeDateStr: string;
+    activeDateYmd: string;
     activeDate: Date;
+    activeDateInvalid = false;
 
     holdContexts: HoldContext[];
     recordSummaries: BibRecordSummary[];
@@ -94,6 +97,8 @@ export class HoldComponent implements OnInit {
 
     @ViewChild('smsCbox', {static: false}) smsCbox: ComboboxComponent;
 
+    @ViewChild('activeDateAlert') private activeDateAlert: AlertDialogComponent;
+
     constructor(
         private router: Router,
         private route: ActivatedRoute,
@@ -328,6 +333,16 @@ export class HoldComponent implements OnInit {
         this.activeDateStr = dateStr;
     }
 
+    setActiveDate(date: Date) {
+        this.activeDate = date;
+        if (date && date < new Date()) {
+            this.activeDateInvalid = true;
+            this.activeDateAlert.open();
+        } else {
+            this.activeDateInvalid = false;
+        }
+    }
+
     userBarcodeChanged() {
         const newBc = this.userBarcode;
 
@@ -476,7 +491,7 @@ export class HoldComponent implements OnInit {
     }
 
     readyToPlaceHolds(): boolean {
-        if (!this.user || this.placeHoldsClicked) {
+        if (!this.user || this.placeHoldsClicked || this.activeDateInvalid) {
             return false;
         }
         if (this.notifySms) {