From: Bill Erickson Date: Wed, 18 Aug 2021 21:21:05 +0000 (-0400) Subject: LP1904036 Items Out grid allows due dates in the past X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=6e87f3183a96f18e9d5ff34ea6d748254e1a9c8e;p=evergreen%2Fpines.git LP1904036 Items Out grid allows due dates in the past Signed-off-by: Bill Erickson Signed-off-by: Jane Sandberg Signed-off-by: Galen Charlton --- diff --git a/Open-ILS/src/eg2/src/app/staff/share/circ/due-date-dialog.component.ts b/Open-ILS/src/eg2/src/app/staff/share/circ/due-date-dialog.component.ts index 7ce8b91840..1e677c0bb3 100644 --- a/Open-ILS/src/eg2/src/app/staff/share/circ/due-date-dialog.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/share/circ/due-date-dialog.component.ts @@ -22,6 +22,8 @@ export class DueDateDialogComponent extends DialogComponent implements OnInit { @Input() circs: IdlObject[] = []; + @Input() allowPastDate = false; + @ViewChild('successMsg', { static: true }) private successMsg: StringComponent; @ViewChild('errorMsg', { static: true }) private errorMsg: StringComponent; @@ -47,7 +49,7 @@ export class DueDateDialogComponent } dueDateChange(iso: string) { - if (iso && Date.parse(iso) > this.nowTime) { + if (iso && (this.allowPastDate || Date.parse(iso) > this.nowTime)) { this.dueDateIso = iso; } else { this.dueDateIso = null; diff --git a/Open-ILS/src/eg2/src/app/staff/share/circ/grid.component.html b/Open-ILS/src/eg2/src/app/staff/share/circ/grid.component.html index de5f7fee2d..31c008c45d 100644 --- a/Open-ILS/src/eg2/src/app/staff/share/circ/grid.component.html +++ b/Open-ILS/src/eg2/src/app/staff/share/circ/grid.component.html @@ -2,7 +2,7 @@ - + @@ -50,6 +50,11 @@ + + + @@ -81,7 +86,7 @@ diff --git a/Open-ILS/src/eg2/src/app/staff/share/circ/grid.component.ts b/Open-ILS/src/eg2/src/app/staff/share/circ/grid.component.ts index 2622081736..b6d831b10e 100644 --- a/Open-ILS/src/eg2/src/app/staff/share/circ/grid.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/share/circ/grid.component.ts @@ -268,7 +268,7 @@ export class CircGridComponent implements OnInit { this.copyAlertsDialog.open({size: 'lg'}).subscribe( modified => { if (modified) { - // TODO: verify the modiifed alerts are present + // TODO: verify the modified alerts are present // or go fetch them. this.circGrid.reload(); }