From: Adam Bowling <abowling@emeralddata.net>
Date: Thu, 7 Mar 2019 04:06:09 +0000 (-0500)
Subject: LP #1705497 Replaces functionality in web client from legacy
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=refs%2Fheads%2Fuser%2Fabowling%2Flp1705497_originating_acquisition_restore;p=working%2FEvergreen.git

LP #1705497 Replaces functionality in web client from legacy
XUL client by including a find function for originating
acquisition where it exists.

Signed-off-by: Adam Bowling <abowling@emeralddata.net>
---

diff --git a/Open-ILS/src/templates/staff/cat/item/index.tt2 b/Open-ILS/src/templates/staff/cat/item/index.tt2
index 7bd48f5cda..8373049e04 100644
--- a/Open-ILS/src/templates/staff/cat/item/index.tt2
+++ b/Open-ILS/src/templates/staff/cat/item/index.tt2
@@ -90,7 +90,7 @@
         <li><a href ng-click="cancel_transit()">[% l('Cancel Transit') %]</a></li>
         <li><a href ng-click="update_inventory()">[% l('Update Inventory') %]</a></li>
 
-        <p><b>[% l('Find') %]</b></p>
+        <p><b>[% l('Show') %]</b></p>
         <li><a href ng-click="findAcquisition()">[% l('Originating Acquisition') %]</a></li>
 
         <p><b>[% l('Mark') %]</b></p>    
diff --git a/Open-ILS/src/templates/staff/cat/item/t_list.tt2 b/Open-ILS/src/templates/staff/cat/item/t_list.tt2
index 7f67e46ded..acf90e4a58 100644
--- a/Open-ILS/src/templates/staff/cat/item/t_list.tt2
+++ b/Open-ILS/src/templates/staff/cat/item/t_list.tt2
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="Windows-1252"?>
 <eg-grid
   id-field="index"
   idl-class="acp"
@@ -40,7 +41,9 @@
     label="[% l('Record Holds') %]"></eg-grid-action>
   <eg-grid-action handler="print_labels" group="[% l('Show') %]"
     label="[% l('Print Labels') %]"></eg-grid-action>
-    
+  <eg-grid-action handler="locateAcquisition" group="[% l('Show') %]"
+    label="[% l('Originating Acquisition') %]"></eg-grid-action>
+
   <eg-grid-action handler="selectedHoldingsDamaged" group="[% l('Mark') %]"
     label="[% l('Item as Damaged') %]"></eg-grid-action>
   <eg-grid-action handler="selectedHoldingsMissing" group="[% l('Mark') %]"
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 6420faa891..26f21ba16e 100644
--- a/Open-ILS/web/js/ui/default/staff/cat/item/app.js
+++ b/Open-ILS/web/js/ui/default/staff/cat/item/app.js
@@ -53,7 +53,7 @@ angular.module('egItemStatus',
  */
 .controller('SearchCtrl', 
        ['$scope','$q','$window','$location','$timeout','egCore','egNet','egGridDataProvider','egItem',
-function($scope , $q, $window , $location , $timeout , egCore , egNet , egGridDataProvider , itemSvc) {
+function($scope , $q , $window , $location , $timeout , egCore , egNet , egGridDataProvider , itemSvc) {
     $scope.args = {}; // search args
 
     // sub-scopes (search / detail-view) apply their version 
@@ -103,29 +103,35 @@ function($scope , $q, $window , $location , $timeout , egCore , egNet , egGridDa
     $scope.findAcquisition = function() {
         var acqData;
         var promises = [];
-        promises.push(
-            egCore.pcrud.search('jub', {eg_bib_id: $scope.args.copyId}).then(
-                null,
-                null,
-                function (data) {
-                    acqData = data;
-                }
+        $scope.openAcquisitionLineItem([$scope.args.copyId]);
+    }
+
+    $scope.openAcquisitionLineItem = function (cp_list) {
+        var hasResults = false;
+        var promises = [];
+
+        angular.forEach(cp_list, function (copyId) {
+            promises.push(
+                egNet.request(
+                    'open-ils.acq',
+                    'open-ils.acq.lineitem.retrieve.by_copy_id',
+                    egCore.auth.token(),
+                    copyId
+                ).then(function (acqData) {
+                    if (acqData) {
+                        if (acqData.a) {
+                            acqData = egCore.idl.toHash(acqData);
+                            var url = '/eg/acq/po/view/' + acqData.purchase_order + '/' + acqData.id;
+                            $timeout(function () { $window.open(url, '_blank') });
+                            hasResults = true;
+                        }
+                    }
+                })
             )
-        );
+        });
 
-        $q.all(promises).then(function() {
-            if (acqData) {
-                acqData = egCore.idl.toHash(acqData);
-                var url = '/eg/acq/po/view/' + acqData.purchase_order + '/' + acqData.id;
-                $timeout(
-                    function() {
-                        $window.open(url, '_blank')
-                    }).then(
-                        function() {$timeout(function(){$window.close()});}
-                    );
-            } else {
-                alert('There is no corresponding purchase order for this item.');
-            }
+        $q.all(promises).then(function () {
+            !hasResults ? alert('There is no corresponding purchase order for this item.') : false;
         });
     }
 
@@ -273,10 +279,11 @@ function($scope , $q, $window , $location , $timeout , egCore , egNet , egGridDa
        ['$scope','$q','$routeParams','$location','$timeout','$window','egCore',
         'egGridDataProvider','egItem','egUser','$uibModal','egCirc','egConfirmDialog',
         'egProgressDialog', 'ngToast',
-function($scope , $q , $routeParams , $location , $timeout , $window , egCore , 
-         egGridDataProvider , itemSvc , egUser , $uibModal , egCirc , egConfirmDialog,
-         egProgressDialog, ngToast) {
-
+// function($scope , $q , $routeParams , $location , $timeout , $window , egCore , 
+//          egGridDataProvider , itemSvc , egUser , $uibModal , egCirc , egConfirmDialog,
+//          egProgressDialog, ngToast) {
+    function($scope , $q , $routeParams , $location , $timeout , $window , egCore , egGridDataProvider , itemSvc , egUser , $uibModal , egCirc , egConfirmDialog,
+                 egProgressDialog, ngToast) {
     var copyId = [];
     var cp_list = $routeParams.idList;
     if (cp_list) {
@@ -421,6 +428,17 @@ function($scope , $q , $routeParams , $location , $timeout , $window , egCore ,
         itemSvc.add_copies_to_bucket(copy_list);
     }
 
+    $scope.locateAcquisition = function() {
+        if (gatherSelectedHoldingsIds) {
+            var cp_list = gatherSelectedHoldingsIds();
+            if (cp_list) {
+                if (cp_list.length > 0) {
+                    $scope.openAcquisitionLineItem(cp_list);
+                }
+            }
+        }
+    }
+
     $scope.update_inventory = function() {
         var copy_list = gatherSelectedHoldingsIds();
         itemSvc.updateInventory(copy_list, $scope.gridControls.allItems()).then(function(res) {