[open-ils-commits] [GIT] Evergreen ILS branch master updated. 958a31fdcc15e6c7676b1a93708a7aa1c5d4a098
Evergreen Git
git at git.evergreen-ils.org
Mon Oct 21 15:45:49 EDT 2019
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".
The branch, master has been updated
via 958a31fdcc15e6c7676b1a93708a7aa1c5d4a098 (commit)
via 9b26fa924578db1220721793c2e3590edfdc944e (commit)
via b0601307cc59fb02d7c42215d2a24db42ade3ae2 (commit)
via dc9e629df0d08107c12fa0145be08456ca4cdf03 (commit)
via d0c2bc324bc2740496923c0abe076b1201870a71 (commit)
via ec1ca4bf57241d181569d8d65c7dc2d12f452fdd (commit)
via 1e6cb7a8714f5b37277d55085d72db90a5c1b86c (commit)
via 15a76e8a10fbec84f95468f4d3f6f337edc293a8 (commit)
via c18a41e76c21a4e416f49315cebfecb5f15c7700 (commit)
via 3ff15fe339fbf5b1d59e67900895028185e56017 (commit)
via 1ea335444f51591e348e7f74ad2b4e9ed5ecfb75 (commit)
via 620f8989d88554bcce7762cd30a3a4ce352e0009 (commit)
via c2f7da619c2edbe6306160db1fa9543f5f6b959e (commit)
from 3a24c34eceff19a4d4dcd2a99d1a020a6a798c17 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 958a31fdcc15e6c7676b1a93708a7aa1c5d4a098
Author: Galen Charlton <gmc at equinoxinitiative.org>
Date: Fri Oct 18 11:56:54 2019 -0400
LP#1816475: offset the start time after end time alert
Move the alert over to align with the date inputs for a slightly
tidier appearance.
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
diff --git a/Open-ILS/src/eg2/src/app/staff/booking/create-reservation-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/booking/create-reservation-dialog.component.html
index f5beb368f1..f2fa02107d 100644
--- a/Open-ILS/src/eg2/src/app/staff/booking/create-reservation-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/booking/create-reservation-dialog.component.html
@@ -34,7 +34,7 @@
formControlName="endTime"
[timezone]="timezone">
</eg-datetime-select>
- <div role="alert" class="alert alert-danger" *ngIf="create.errors && create.errors.startTimeNotBeforeEndTime">
+ <div role="alert" class="alert alert-danger offset-lg-4" *ngIf="create.errors && create.errors.startTimeNotBeforeEndTime">
<span class="material-icons" aria-hidden="true">error</span>
<span i18n>Start time must be before end time</span>
</div>
commit 9b26fa924578db1220721793c2e3590edfdc944e
Author: Jane Sandberg <sandbej at linnbenton.edu>
Date: Mon Oct 14 14:47:49 2019 -0700
LP1816475: form validation prevents users from making reservations in the past
Signed-off-by: Jane Sandberg <sandbej at linnbenton.edu>
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
diff --git a/Open-ILS/src/eg2/src/app/staff/booking/create-reservation-dialog.component.ts b/Open-ILS/src/eg2/src/app/staff/booking/create-reservation-dialog.component.ts
index 82a14bfdbe..0ef212b1a6 100644
--- a/Open-ILS/src/eg2/src/app/staff/booking/create-reservation-dialog.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/booking/create-reservation-dialog.component.ts
@@ -11,6 +11,7 @@ import {NetService} from '@eg/core/net.service';
import {OrgService} from '@eg/core/org.service';
import {PcrudService} from '@eg/core/pcrud.service';
import {DialogComponent} from '@eg/share/dialog/dialog.component';
+import {notBeforeMomentValidator} from '@eg/share/validators/not_before_moment_validator.directive';
import {PatronBarcodeValidator} from '@eg/share/validators/patron_barcode_validator.directive';
import {ToastService} from '@eg/share/toast/toast.service';
import {AlertDialogComponent} from '@eg/share/dialog/alert.component';
@@ -79,7 +80,7 @@ export class CreateReservationDialogComponent
[this.pbv.validate]
),
'emailNotify': new FormControl(true),
- 'startTime': new FormControl(),
+ 'startTime': new FormControl(null, notBeforeMomentValidator(Moment().add('15', 'minutes'))),
'endTime': new FormControl(),
'resourceList': new FormControl(),
}, [startTimeIsBeforeEndTimeValidator]
commit b0601307cc59fb02d7c42215d2a24db42ade3ae2
Author: Jane Sandberg <sandbej at linnbenton.edu>
Date: Mon Oct 14 12:27:46 2019 -0700
LP1816475: give booking pull list columns the correct datatype
Signed-off-by: Jane Sandberg <sandbej at linnbenton.edu>
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
diff --git a/Open-ILS/src/eg2/src/app/staff/booking/pull-list.component.html b/Open-ILS/src/eg2/src/app/staff/booking/pull-list.component.html
index d6715dd59e..296d2a1b5e 100644
--- a/Open-ILS/src/eg2/src/app/staff/booking/pull-list.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/booking/pull-list.component.html
@@ -36,8 +36,8 @@
<eg-grid-column label="Call number sortkey" path="call_number_sortkey" i18n-label></eg-grid-column>
<eg-grid-column name="barcode" label="Barcode" i18n-label path="current_resource.barcode"></eg-grid-column>
<eg-grid-column name="title" label="Title or name" i18n-label path="target_resource_type.name"></eg-grid-column>
- <eg-grid-column label="Reservation start time" [datePlusTime]="true" path="reservations.0.start_time" i18n-label></eg-grid-column>
- <eg-grid-column label="Reservation end time" [datePlusTime]="true" path="reservations.0.end_time" i18n-label></eg-grid-column>
+ <eg-grid-column label="Reservation start time" datatype="timestamp" [datePlusTime]="true" path="reservations.0.start_time" i18n-label></eg-grid-column>
+ <eg-grid-column label="Reservation end time" datatype="timestamp" [datePlusTime]="true" path="reservations.0.end_time" i18n-label></eg-grid-column>
<eg-grid-column label="Patron first name" path="reservations.0.usr.first_given_name" i18n-label></eg-grid-column>
<eg-grid-column label="Patron last name" path="reservations.0.usr.family_name" i18n-label></eg-grid-column>
</eg-grid>
commit dc9e629df0d08107c12fa0145be08456ca4cdf03
Author: Jane Sandberg <sandbej at linnbenton.edu>
Date: Wed Oct 9 20:27:43 2019 -0700
LP1816475: Strip whitespace from patron barcodes
Signed-off-by: Jane Sandberg <sandbej at linnbenton.edu>
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
diff --git a/Open-ILS/src/eg2/src/app/share/validators/patron_barcode_validator.directive.ts b/Open-ILS/src/eg2/src/app/share/validators/patron_barcode_validator.directive.ts
index 81d1b159b0..0910bf3ba1 100644
--- a/Open-ILS/src/eg2/src/app/share/validators/patron_barcode_validator.directive.ts
+++ b/Open-ILS/src/eg2/src/app/share/validators/patron_barcode_validator.directive.ts
@@ -19,7 +19,7 @@ export class PatronBarcodeValidator implements AsyncValidator {
'open-ils.actor.get_barcodes',
this.auth.token(),
this.auth.user().ws_ou(),
- 'actor', control.value));
+ 'actor', control.value.trim()));
}
private parseActorCall = (actorCall: Observable<any>) => {
diff --git a/Open-ILS/src/eg2/src/app/staff/booking/create-reservation-dialog.component.ts b/Open-ILS/src/eg2/src/app/staff/booking/create-reservation-dialog.component.ts
index 370e35ae90..82a14bfdbe 100644
--- a/Open-ILS/src/eg2/src/app/staff/booking/create-reservation-dialog.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/booking/create-reservation-dialog.component.ts
@@ -104,7 +104,7 @@ export class CreateReservationDialogComponent
'open-ils.booking',
'open-ils.booking.reservations.create',
this.auth.token(),
- this.patronBarcode.value,
+ this.patronBarcode.value.trim(),
this.selectedTimes,
this.pickupLibId,
this.targetResourceType.id,
@@ -147,7 +147,7 @@ export class CreateReservationDialogComponent
'open-ils.actor.get_barcodes',
this.auth.token(),
this.auth.user().ws_ou(),
- 'actor', this.patronBarcode.value).pipe(
+ 'actor', this.patronBarcode.value.trim()).pipe(
single(),
switchMap((result) => {
return this.pcrud.retrieve('au', result[0]['id']).pipe(
diff --git a/Open-ILS/src/eg2/src/app/staff/booking/manage-reservations.component.ts b/Open-ILS/src/eg2/src/app/staff/booking/manage-reservations.component.ts
index 283257eda1..dd3e0ca32f 100644
--- a/Open-ILS/src/eg2/src/app/staff/booking/manage-reservations.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/booking/manage-reservations.component.ts
@@ -73,7 +73,7 @@ export class ManageReservationsComponent implements OnInit, OnDestroy {
'open-ils.actor',
'open-ils.actor.get_barcodes',
this.auth.token(), this.auth.user().ws_ou(),
- 'actor', this.patronBarcode.value).pipe(
+ 'actor', this.patronBarcode.value.trim()).pipe(
single(),
tap((response) =>
this.router.navigate(['/staff', 'booking', 'manage_reservations', 'by_patron', response[0].id])
diff --git a/Open-ILS/src/eg2/src/app/staff/share/patron.service.ts b/Open-ILS/src/eg2/src/app/staff/share/patron.service.ts
index b11626c71d..12fd1e137b 100644
--- a/Open-ILS/src/eg2/src/app/staff/share/patron.service.ts
+++ b/Open-ILS/src/eg2/src/app/staff/share/patron.service.ts
@@ -16,7 +16,7 @@ export class PatronService {
'open-ils.actor',
'open-ils.actor.get_barcodes',
this.auth.token(), this.auth.user().ws_ou(),
- 'actor', barcode);
+ 'actor', barcode.trim());
}
}
commit d0c2bc324bc2740496923c0abe076b1201870a71
Author: Jane Sandberg <sandbej at linnbenton.edu>
Date: Wed Oct 9 12:25:17 2019 -0700
LP1816475: Change calendar_today icon to event icon
The locally served calendar_today icon doesn't look good in buttons
(like the date-select and datetime-select component buttons). But the
event icon looks very similar, and doesn't have the same negative
effects when placed in buttons.
Signed-off-by: Jane Sandberg <sandbej at linnbenton.edu>
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
diff --git a/Open-ILS/src/eg2/src/app/share/date-select/date-select.component.html b/Open-ILS/src/eg2/src/app/share/date-select/date-select.component.html
index 80f0188482..f137beb496 100644
--- a/Open-ILS/src/eg2/src/app/share/date-select/date-select.component.html
+++ b/Open-ILS/src/eg2/src/app/share/date-select/date-select.component.html
@@ -23,7 +23,7 @@
<button class="btn btn-outline-secondary" [disabled]="disabled"
(click)="datePicker.toggle()" type="button">
<span title="Select Date" i18n-title
- class="material-icons mat-icon-in-button">calendar_today</span>
+ class="material-icons mat-icon-in-button">event</span>
</button>
</div>
</div>
diff --git a/Open-ILS/src/eg2/src/app/share/datetime-select/datetime-select.component.html b/Open-ILS/src/eg2/src/app/share/datetime-select/datetime-select.component.html
index 3b931e904c..f25e29acee 100644
--- a/Open-ILS/src/eg2/src/app/share/datetime-select/datetime-select.component.html
+++ b/Open-ILS/src/eg2/src/app/share/datetime-select/datetime-select.component.html
@@ -17,7 +17,7 @@
<div class="input-group-btn">
<button class="btn btn-primary" ngbDropdownToggle
aria-label="Select date and time" i18n-aria-label>
- <span class="material-icons mat-icon-in-button">calendar_today</span>
+ <span class="material-icons mat-icon-in-button">event</span>
</button>
</div>
<div ngbDropdownMenu>
commit ec1ca4bf57241d181569d8d65c7dc2d12f452fdd
Author: Jane Sandberg <sandbej at linnbenton.edu>
Date: Wed Oct 9 11:42:08 2019 -0700
LP1816475: use [routerLink] instead of href in Angular app
Using <a href=""> forces a reload of the Angular app in the user's
browser, which substantially slows down the experience. This commit
changes some href attributes to routerLink directives in the booking
navigation menu.
Signed-off-by: Jane Sandberg <sandbej at linnbenton.edu>
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
diff --git a/Open-ILS/src/eg2/src/app/staff/nav.component.html b/Open-ILS/src/eg2/src/app/staff/nav.component.html
index d682541afb..265368a62a 100644
--- a/Open-ILS/src/eg2/src/app/staff/nav.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/nav.component.html
@@ -310,11 +310,11 @@
Booking
</a>
<div class="dropdown-menu" ngbDropdownMenu>
- <a class="dropdown-item" href="staff/booking/create_reservation">
+ <a class="dropdown-item" routerLink="/staff/booking/create_reservation">
<span class="material-icons">add</span>
<span i18n>Create Reservations</span>
</a>
- <a class="dropdown-item" href="staff/booking/pull_list">
+ <a class="dropdown-item" routerLink="/staff/booking/pull_list">
<span class="material-icons">list</span>
<span i18n>Pull List</span>
</a>
@@ -322,15 +322,15 @@
<span class="material-icons">pin_drop</span>
<span i18n>Capture Resources</span>
</a>
- <a class="dropdown-item" href="staff/booking/pickup">
+ <a class="dropdown-item" routerLink="/staff/booking/pickup">
<span class="material-icons">trending_up</span>
<span i18n>Pick Up Reservations</span>
</a>
- <a class="dropdown-item" href="staff/booking/return">
+ <a class="dropdown-item" routerLink="/staff/booking/return">
<span class="material-icons">trending_down</span>
<span i18n>Return Reservations</span>
</a>
- <a class="dropdown-item" href="staff/booking/manage_reservations">
+ <a class="dropdown-item" routerLink="/staff/booking/manage_reservations">
<span class="material-icons">layers</span>
<span i18n>Manage Reservations</span>
</a>
commit 1e6cb7a8714f5b37277d55085d72db90a5c1b86c
Author: Jane Sandberg <sandbej at linnbenton.edu>
Date: Fri Sep 13 11:04:27 2019 -0700
LP1816475: Fix resource type filter in manage reservations grid
Signed-off-by: Jane Sandberg <sandbej at linnbenton.edu>
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
diff --git a/Open-ILS/src/eg2/src/app/staff/booking/manage-reservations.component.html b/Open-ILS/src/eg2/src/app/staff/booking/manage-reservations.component.html
index 82cd431e21..1a7e94b8da 100644
--- a/Open-ILS/src/eg2/src/app/staff/booking/manage-reservations.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/booking/manage-reservations.component.html
@@ -49,7 +49,7 @@
</ngb-tab>
<ngb-tab id="type">
<ng-template ngbTabTitle>
- <span class="material-icons" *ngIf="resourceType.value">filter_list</span> <span i18n>Filter by resource type</span>
+ <span class="material-icons" *ngIf="resourceTypeForGrid">filter_list</span> <span i18n>Filter by resource type</span>
</ng-template>
<ng-template ngbTabContent>
<div class="m-2">
diff --git a/Open-ILS/src/eg2/src/app/staff/booking/reservations-grid.component.ts b/Open-ILS/src/eg2/src/app/staff/booking/reservations-grid.component.ts
index 40cf8f8005..4e75a61503 100644
--- a/Open-ILS/src/eg2/src/app/staff/booking/reservations-grid.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/booking/reservations-grid.component.ts
@@ -1,4 +1,4 @@
-import {Component, EventEmitter, Input, Output, OnInit, ViewChild} from '@angular/core';
+import {Component, EventEmitter, Input, Output, OnChanges, OnInit, ViewChild} from '@angular/core';
import {Router} from '@angular/router';
import {Observable, from, of} from 'rxjs';
import {tap, switchMap, mergeMap} from 'rxjs/operators';
@@ -25,7 +25,7 @@ import * as Moment from 'moment-timezone';
selector: 'eg-reservations-grid',
templateUrl: './reservations-grid.component.html',
})
-export class ReservationsGridComponent implements OnInit {
+export class ReservationsGridComponent implements OnChanges, OnInit {
@Input() patron: number;
@Input() resourceBarcode: string;
@@ -276,6 +276,8 @@ export class ReservationsGridComponent implements OnInit {
};
}
+ ngOnChanges() { this.reloadGrid(); }
+
enrichRow$ = (row: IdlObject): Observable<IdlObject> => {
return from(this.org.settings('lib.timezone', row.pickup_lib().id())).pipe(
switchMap((tz) => {
commit 15a76e8a10fbec84f95468f4d3f6f337edc293a8
Author: Jane Sandberg <sandbej at linnbenton.edu>
Date: Fri Sep 13 08:16:15 2019 -0700
LP1816475: Add ancestors checkbox to manage reservations screen
Signed-off-by: Jane Sandberg <sandbej at linnbenton.edu>
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
diff --git a/Open-ILS/src/eg2/src/app/staff/booking/manage-reservations.component.html b/Open-ILS/src/eg2/src/app/staff/booking/manage-reservations.component.html
index 8fb6071fb5..82cd431e21 100644
--- a/Open-ILS/src/eg2/src/app/staff/booking/manage-reservations.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/booking/manage-reservations.component.html
@@ -4,7 +4,7 @@
<form [formGroup]="filters" class="row">
<div class="col-sm-3">
- <eg-org-family-select [hideAncestorSelector]="true" labelText="Reservation location" i18n-labelText formControlName="pickupLibraries">
+ <eg-org-family-select labelText="Reservation location" i18n-labelText formControlName="pickupLibraries">
</eg-org-family-select>
</div>
<div class="col-sm-6 offset-sm-3">
commit c18a41e76c21a4e416f49315cebfecb5f15c7700
Author: Jane Sandberg <sandbej at linnbenton.edu>
Date: Mon Sep 9 18:18:06 2019 -0700
LP1816475: Don't let users edit reservation.email_notify, pickup_lib, request_lib
Signed-off-by: Jane Sandberg <sandbej at linnbenton.edu>
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
diff --git a/Open-ILS/src/eg2/src/app/staff/booking/reservations-grid.component.ts b/Open-ILS/src/eg2/src/app/staff/booking/reservations-grid.component.ts
index 05fe1046ec..40cf8f8005 100644
--- a/Open-ILS/src/eg2/src/app/staff/booking/reservations-grid.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/booking/reservations-grid.component.ts
@@ -249,7 +249,7 @@ export class ReservationsGridComponent implements OnInit {
this.listReadOnlyFields = () => {
let list = 'usr,xact_start,request_time,capture_time,pickup_time,return_time,capture_staff,target_resource_type,' +
- 'current_resource,target_resource,unrecovered,request_library,pickup_library,fine_interval,fine_amount,max_fine';
+ 'email_notify,current_resource,target_resource,unrecovered,request_lib,pickup_lib,fine_interval,fine_amount,max_fine';
if (this.status && ('pickupReady' !== this.status)) { list = list + ',start_time'; }
if (this.status && ('returnedToday' === this.status)) { list = list + ',end_time'; }
return list;
commit 3ff15fe339fbf5b1d59e67900895028185e56017
Author: Jane Sandberg <sandbej at linnbenton.edu>
Date: Mon Sep 9 14:52:16 2019 -0700
LP1816475: Add action buttons to Pickup and Return reservation screens
Signed-off-by: Jane Sandberg <sandbej at linnbenton.edu>
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
diff --git a/Open-ILS/src/eg2/src/app/staff/booking/reservations-grid.component.html b/Open-ILS/src/eg2/src/app/staff/booking/reservations-grid.component.html
index a0579b5fc3..b8b5b51e8d 100644
--- a/Open-ILS/src/eg2/src/app/staff/booking/reservations-grid.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/booking/reservations-grid.component.html
@@ -12,6 +12,13 @@
<eg-grid-toolbar-action label="View Item Status" i18n-label (onClick)="viewItemStatus($event)" [disableOnRows]="notOneCatalogedItemSelected"></eg-grid-toolbar-action>
<eg-grid-toolbar-action label="View Reservations for This Resource" i18n-label (onClick)="viewByResource($event)" [disableOnRows]="notOneResourceSelected"></eg-grid-toolbar-action>
<eg-grid-toolbar-button *ngIf="!status" label="Create New Reservation" i18n-label (onClick)="redirectToCreate($event)"></eg-grid-toolbar-button>
+ <eg-grid-toolbar-button *ngIf="'pickupReady' === status" label="Pick Up Selected" i18n-label
+ (onClick)="pickupSelected($event)" [disabled]="!grid.context.getSelectedRows().length">
+ </eg-grid-toolbar-button>
+ <eg-grid-toolbar-button *ngIf="'returnReady' === status" label="Return Selected" i18n-label
+ (onClick)="returnSelected($event)" [disabled]="!grid.context.getSelectedRows().length">
+ </eg-grid-toolbar-button>
+
<eg-grid-column name="id" [hidden]="true" [index]="true" i18n-label label="ID" path="id"></eg-grid-column>
<eg-grid-column label="Patron username" [hidden]="true" i18n-label path="usr.usrname"></eg-grid-column>
commit 1ea335444f51591e348e7f74ad2b4e9ed5ecfb75
Author: Jane Sandberg <sandbej at linnbenton.edu>
Date: Mon Sep 9 08:02:53 2019 -0700
LP1816475: Return reservations screen refreshes properly
Signed-off-by: Jane Sandberg <sandbej at linnbenton.edu>
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
diff --git a/Open-ILS/src/eg2/src/app/staff/booking/reservations-grid.component.ts b/Open-ILS/src/eg2/src/app/staff/booking/reservations-grid.component.ts
index a8c544309f..05fe1046ec 100644
--- a/Open-ILS/src/eg2/src/app/staff/booking/reservations-grid.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/booking/reservations-grid.component.ts
@@ -19,6 +19,8 @@ import {CancelReservationDialogComponent} from './cancel-reservation-dialog.comp
import * as Moment from 'moment-timezone';
+// A filterable grid of reservations used in various booking interfaces
+
@Component({
selector: 'eg-reservations-grid',
templateUrl: './reservations-grid.component.html',
@@ -34,6 +36,7 @@ export class ReservationsGridComponent implements OnInit {
@Input() onlyCaptured = false;
@Output() onPickup = new EventEmitter<IdlObject>();
+ @Output() onReturn = new EventEmitter<IdlObject>();
gridSource: GridDataSource;
patronBarcode: string;
@@ -237,7 +240,10 @@ export class ReservationsGridComponent implements OnInit {
this.auth.token(),
{'patron_barcode': this.patronBarcode, 'reservation': reservation})
.pipe(tap(
- () => { this.grid.reload(); },
+ () => {
+ this.onReturn.emit(reservation);
+ this.grid.reload();
+ },
));
};
commit 620f8989d88554bcce7762cd30a3a4ce352e0009
Author: Jane Sandberg <sandbej at linnbenton.edu>
Date: Mon Sep 9 05:27:51 2019 -0700
LP1816475: Fix an icon spacing issue
Signed-off-by: Jane Sandberg <sandbej at linnbenton.edu>
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
diff --git a/Open-ILS/src/eg2/src/app/staff/booking/create-reservation.component.html b/Open-ILS/src/eg2/src/app/staff/booking/create-reservation.component.html
index 104e82d287..1d6e6843f6 100644
--- a/Open-ILS/src/eg2/src/app/staff/booking/create-reservation.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/booking/create-reservation.component.html
@@ -30,7 +30,7 @@
<ngb-tabset #details="ngbTabset">
<ngb-tab id="select-resource-type">
<ng-template ngbTabTitle>
- <span class="material-icons">category</span>
+ <span class="material-icons">dns</span>
<ng-container i18n>Choose resource by type</ng-container>
</ng-template>
<ng-template ngbTabContent>
commit c2f7da619c2edbe6306160db1fa9543f5f6b959e
Author: Jane Sandberg <sandbej at linnbenton.edu>
Date: Mon Sep 9 05:11:15 2019 -0700
LP1816475: Add a Create Reservation button to the Create Reservation screen
Signed-off-by: Jane Sandberg <sandbej at linnbenton.edu>
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
diff --git a/Open-ILS/src/eg2/src/app/share/grid/grid-toolbar.component.ts b/Open-ILS/src/eg2/src/app/share/grid/grid-toolbar.component.ts
index ae55c56f32..b9c1d30728 100644
--- a/Open-ILS/src/eg2/src/app/share/grid/grid-toolbar.component.ts
+++ b/Open-ILS/src/eg2/src/app/share/grid/grid-toolbar.component.ts
@@ -78,7 +78,7 @@ export class GridToolbarComponent implements OnInit {
performButtonAction(button: GridToolbarButton) {
const rows = this.gridContext.getSelectedRows();
- button.onClick.emit();
+ button.onClick.emit(rows);
if (button.action) { button.action(); }
}
diff --git a/Open-ILS/src/eg2/src/app/staff/booking/create-reservation.component.html b/Open-ILS/src/eg2/src/app/staff/booking/create-reservation.component.html
index 64bbdf84df..104e82d287 100644
--- a/Open-ILS/src/eg2/src/app/staff/booking/create-reservation.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/booking/create-reservation.component.html
@@ -170,6 +170,7 @@
[rowFlairCallback]="resourceAvailabilityIcon"
[disablePaging]="true"
persistKey="disabled">
+ <eg-grid-toolbar-button label="Create Reservation" i18n-label (onClick)="openTheDialog($event)"></eg-grid-toolbar-button>
<eg-grid-toolbar-action label="Create Reservation" i18n-label (onClick)="openTheDialog($event)"></eg-grid-toolbar-action>
<eg-grid-column path="time" [index]="true" name="Time" i18n-name [cellTemplate]="timeTemplate" ></eg-grid-column>
<eg-grid-column *ngFor="let resource of resources" path="{{resource.barcode()}}" [cellTemplate]="reservationsTemplate" [disableTooltip]="true"></eg-grid-column>
-----------------------------------------------------------------------
Summary of changes:
.../src/app/share/date-select/date-select.component.html | 2 +-
.../share/datetime-select/datetime-select.component.html | 2 +-
.../src/eg2/src/app/share/grid/grid-toolbar.component.ts | 2 +-
.../validators/patron_barcode_validator.directive.ts | 2 +-
.../booking/create-reservation-dialog.component.html | 2 +-
.../staff/booking/create-reservation-dialog.component.ts | 7 ++++---
.../app/staff/booking/create-reservation.component.html | 3 ++-
.../app/staff/booking/manage-reservations.component.html | 4 ++--
.../app/staff/booking/manage-reservations.component.ts | 2 +-
.../eg2/src/app/staff/booking/pull-list.component.html | 4 ++--
.../app/staff/booking/reservations-grid.component.html | 7 +++++++
.../src/app/staff/booking/reservations-grid.component.ts | 16 ++++++++++++----
Open-ILS/src/eg2/src/app/staff/nav.component.html | 10 +++++-----
Open-ILS/src/eg2/src/app/staff/share/patron.service.ts | 2 +-
14 files changed, 41 insertions(+), 24 deletions(-)
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list