LPXXX Show holds count; avoid frozen holds

Signed-off-by: Bill Erickson <berickxx@gmail.com>

diff --git a/Open-ILS/src/eg2/src/app/staff/circ/holds/pull-list.component.html b/Open-ILS/src/eg2/src/app/staff/circ/holds/pull-list.component.html
index 6bec9bf..6da9e19 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/circ/holds/pull-list.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/circ/holds/pull-list.component.html
@@ -4,8 +4,8 @@
 <eg-holds-grid
   printTemplate="holds_pull_list"
   persistKey="circ.holds.pull_list"
-  preFetchSetting="circ.holds.pull_list.prefetch"
   printTemplate="hold_pull_list"
+  [enablePreFetch]="true"
   [hidePickupLibFilter]="true"
   [pullListOrg]="targetOrg()">
 </eg-holds-grid>

diff --git a/Open-ILS/src/eg2/src/app/staff/share/holds/grid.component.html b/Open-ILS/src/eg2/src/app/staff/share/holds/grid.component.html
index 8bf7e7c..34925ce 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/share/holds/grid.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/share/holds/grid.component.html
@@ -33,6 +33,8 @@
 
   <ng-container *ngIf="mode == 'list' && initComplete()">
 
+    <h3 i18n>Holds Count: {{holdsCount}}</h3>
+
     <div class="row" *ngIf="!hidePickupLibFilter">
       <div class="col-lg-4">
         <div class="input-group">

diff --git a/Open-ILS/src/eg2/src/app/staff/share/holds/grid.component.ts b/Open-ILS/src/eg2/src/app/staff/share/holds/grid.component.ts
index ab355a3..6d26c3a 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/share/holds/grid.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/share/holds/grid.component.ts
@@ -50,7 +50,7 @@ export class HoldsGridComponent implements OnInit {
     // If set, all holds are fetched on grid load and sorting/paging all
     // happens in the client.  If false, sorting and paging occur on
     // the server.
-    enablePreFetch: boolean;
+    @Input() enablePreFetch: boolean;
 
     // How to sort when no sort parameters have been applied
     // via grid controls.  This uses the eg-grid sort format:
@@ -164,8 +164,6 @@ export class HoldsGridComponent implements OnInit {
             this.store.getItem(this.preFetchSetting).then(
                 applied => this.enablePreFetch = Boolean(applied)
             );
-        } else {
-            this.enablePreFetch = false;
         }
 
         if (!this.defaultSort) {
@@ -225,8 +223,9 @@ export class HoldsGridComponent implements OnInit {
         if (this.pullListOrg) {
             filters.cancel_time = null;
             filters.capture_time = null;
+            filters.frozen = 'f';
 
-            // Oddly, there are aliases for these (cp_status, cp_circ_lib),
+            // There are aliases for these (cp_status, cp_circ_lib),
             // but the API complains when I use them.
             filters['cp.status'] = [0, 7];
             filters['cp.circ_lib'] = this.pullListOrg;