ff ui : only show no-items message after initial query

Signed-off-by: Bill Erickson <berick@esilibrary.com>

diff --git a/Open-ILS/src/templates/staff/fulfillment/t_item_table.tt2 b/Open-ILS/src/templates/staff/fulfillment/t_item_table.tt2
index 167ca2b..335e130 100644 (file)
--- a/Open-ILS/src/templates/staff/fulfillment/t_item_table.tt2
+++ b/Open-ILS/src/templates/staff/fulfillment/t_item_table.tt2
@@ -1,5 +1,5 @@
 
-<div class="row" ng-hide="itemList.count()">
+<div class="row" ng-show="lookupComplete && !itemList.count()">
     <div class="col-lg-10 col-lg-offset-1">
       <div class="alert alert-info">[% l('No Items To Display') %]</div>
   </div>

diff --git a/Open-ILS/src/templates/staff/fulfillment/t_pending.tt2 b/Open-ILS/src/templates/staff/fulfillment/t_pending.tt2
index 22f1b24..0ba6995 100644 (file)
--- a/Open-ILS/src/templates/staff/fulfillment/t_pending.tt2
+++ b/Open-ILS/src/templates/staff/fulfillment/t_pending.tt2
@@ -21,7 +21,7 @@
 
   <br/>
 
-  <div class="row" ng-hide="itemList.count()">
+  <div class="row" ng-show="lookupComplete && !itemList.count()">
     <div class="col-lg-10 col-lg-offset-1">
       <div class="alert alert-info">[% l('No Items To Display') %]</div>
     </div>

diff --git a/Open-ILS/web/js/ui/default/staff/fulfillment/app.js b/Open-ILS/web/js/ui/default/staff/fulfillment/app.js
index fed493f..f9d6db5 100644 (file)
--- a/Open-ILS/web/js/ui/default/staff/fulfillment/app.js
+++ b/Open-ILS/web/js/ui/default/staff/fulfillment/app.js
@@ -511,6 +511,7 @@ function ($scope,  $q,  egPCRUD,  orgSelector) {
 
     $scope.setCollector(function() {
         $scope.itemList.items = [];
+        $scope.lookupComplete = false;
 
         var fullPath = orgSelector.relatedOrgs();
 
@@ -550,6 +551,7 @@ function ($scope,  $q,  egPCRUD,  orgSelector) {
                 order_by : {'atc' : 'source_send_time, id'}
             }, {atomic : true}
         ).then(function(transits) {
+            $scope.lookupComplete = true;
             angular.forEach(transits, function(transit) {
                 $scope.itemList.addItem(
                   {barcode : transit.target_copy().barcode()});
@@ -566,6 +568,7 @@ function ($scope,  $q,  egPCRUD,  orgSelector) {
 
     $scope.setCollector(function() {
         $scope.itemList.items = [];
+        $scope.lookupComplete = false;
 
         var fullPath = orgSelector.relatedOrgs();
 
@@ -605,6 +608,7 @@ function ($scope,  $q,  egPCRUD,  orgSelector) {
                 order_by : {ahr : 'request_time, id'}
             }, {atomic : true}
         ).then(function(holds) {
+            $scope.lookupComplete = true;
             angular.forEach(holds, function(hold) {
                 $scope.itemList.addItem(
                   {barcode : hold.current_copy().barcode()});
@@ -624,6 +628,7 @@ function ($scope,  $q,  egPCRUD,  orgSelector) {
 
     $scope.setCollector(function() {
         $scope.itemList.items = [];
+        $scope.lookupComplete = false;
 
         var fullPath = orgSelector.relatedOrgs();
 
@@ -661,6 +666,7 @@ function ($scope,  $q,  egPCRUD,  orgSelector) {
                 order_by : {'circ' : 'xact_start, id'}
             }, {atomic : true}
         ).then(function(circs) {
+            $scope.lookupComplete = true;
             angular.forEach(circs, function(circ) {
                 $scope.itemList.addItem(
                   {barcode : circ.target_copy().barcode()});
@@ -726,6 +732,8 @@ function ($scope,  $q,  $route,  egNet,  egAuth,  egPCRUD,  egOrg,  orgSelector)
 
     $scope.drawTable = function() {
         $scope.itemList.items = [];
+        $scope.lookupComplete = false;
+
         var fullPath = orgSelector.relatedOrgs();
 
         var query = {   
@@ -787,6 +795,7 @@ function ($scope,  $q,  $route,  egNet,  egAuth,  egPCRUD,  egOrg,  orgSelector)
             null, // success
             null, // error
             function(hold) { // notify handler
+                $scope.lookupComplete = true;
                 hold.index = $scope.itemList.count();
 
                 hold.request_lib = egOrg.get(hold.request_lib).shortname();