LP#1709476 Copy summary aged circ display repair

Always check active and aged circs (via "aacs" class) for circs to
display for a given copy in the item status Quick Summary and Recent
Circ History tabs.  When a aged circ is encountered, display the '<Aged
Circulation>' tag in lieu of the patron's name.

To test:
[1] Checkout and checkin a copy.
[2] Checkout and checkin the same copy to a different patron
[3] Manually delete the 2nd circulation in the database.
[4] Load the Item Status interface for the copy.
[5] Confirm chekout time, etc. for the 2nd show in the Quick Summary
    circulation data.
[6] Confirm the patron displayed under the 'Recent Circ History' tab
    shows '<Aged Circulation>'

Signed-off-by: Bill Erickson <berickxx@gmail.com>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>

diff --git a/Open-ILS/src/templates/staff/cat/item/t_circs_pane.tt2 b/Open-ILS/src/templates/staff/cat/item/t_circs_pane.tt2
index 8a165b3..be36803 100644 (file)
--- a/Open-ILS/src/templates/staff/cat/item/t_circs_pane.tt2
+++ b/Open-ILS/src/templates/staff/cat/item/t_circs_pane.tt2
@@ -23,7 +23,7 @@
       </a>
       <span ng-show="!prev_circ_usr">
         [% l('<Aged Circulation>') | html %]
       </a>
       <span ng-show="!prev_circ_usr">
         [% l('<Aged Circulation>') | html %]

-    </span>
+      </span>

     </div>
   </div>
 
     </div>
   </div>
 


@@ -109,13 +109,16 @@
     <div class="flex-cell">[% l('Patron') %]</div>
     <div class="flex-cell well">
       <a href="./circ/patron/{{circ.usr().id()}}/checkout" 
     <div class="flex-cell">[% l('Patron') %]</div>
     <div class="flex-cell well">
       <a href="./circ/patron/{{circ.usr().id()}}/checkout" 

-        ng-if="circ" target="_self">
+        ng-if="circ.usr()" target="_self">

         [% l('[_1], [_2] [_3] : [_4]', 
           '{{circ.usr().family_name()}}'
           '{{circ.usr().first_given_name()}}'
           '{{circ.usr().second_given_name()}}'
           '{{circ.usr().card().barcode()}}') %]
       </a>
         [% l('[_1], [_2] [_3] : [_4]', 
           '{{circ.usr().family_name()}}'
           '{{circ.usr().first_given_name()}}'
           '{{circ.usr().second_given_name()}}'
           '{{circ.usr().card().barcode()}}') %]
       </a>

+      <span ng-show="!circ.usr()">
+        [% l('<Aged Circulation>') | html %]
+      </span>

     </div>
   </div>
 
     </div>
   </div>
 

diff --git a/Open-ILS/web/js/ui/default/staff/cat/item/app.js b/Open-ILS/web/js/ui/default/staff/cat/item/app.js
index 7bd717d..8d73b9d 100644 (file)
--- a/Open-ILS/web/js/ui/default/staff/cat/item/app.js
+++ b/Open-ILS/web/js/ui/default/staff/cat/item/app.js
@@ -1449,11 +1449,11 @@ function($scope , $q , $location , $routeParams , $timeout , $window , egCore ,
         delete $scope.prev_circ_usr;
         if (!copyId) return;
         
         delete $scope.prev_circ_usr;
         if (!copyId) return;
         

-        egCore.pcrud.search('circ', 
+        egCore.pcrud.search('aacs', 

             {target_copy : copyId},
             {   flesh : 2,
                 flesh_fields : {
             {target_copy : copyId},
             {   flesh : 2,
                 flesh_fields : {

-                    circ : [
+                    aacs : [

                         'usr',
                         'workstation',                                         
                         'checkin_workstation',                                 
                         'usr',
                         'workstation',                                         
                         'checkin_workstation',                                 


@@ -1463,7 +1463,7 @@ function($scope , $q , $location , $routeParams , $timeout , $window , egCore ,
                     ],
                     au : ['card']
                 },
                     ],
                     au : ['card']
                 },

-                order_by : {circ : 'xact_start desc'}, 
+                order_by : {aacs : 'xact_start desc'}, 

                 limit :  1
             }
 
                 limit :  1
             }