From 1fecb8a6d71da23a319382cdbcd47a2a13aefa2c Mon Sep 17 00:00:00 2001
From: Cesar Velez <cesar.velez@equinoxinitiative.org>
Date: Thu, 15 Jun 2017 11:30:48 -0400
Subject: [PATCH] LP#1685933 - Add Owning Library column to grids in ItemsOut
 and checkout views

Added necessary fleshing in egCirc service and items out to get acn.owning_lib.shortname

Signed-off by: Cesar Velez <cesar.velez@equinoxinitiative.org>

Signed-off-by: Jason Etheridge <jason@equinoxinitiative.org>
---
 Open-ILS/src/templates/staff/circ/patron/t_checkout.tt2   | 1 +
 Open-ILS/src/templates/staff/circ/patron/t_items_out.tt2  | 1 +
 Open-ILS/web/js/ui/default/staff/circ/patron/items_out.js | 2 +-
 Open-ILS/web/js/ui/default/staff/circ/services/circ.js    | 8 +++++++-
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/Open-ILS/src/templates/staff/circ/patron/t_checkout.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_checkout.tt2
index c9c59bbfa6..57f4b453ba 100644
--- a/Open-ILS/src/templates/staff/circ/patron/t_checkout.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/t_checkout.tt2
@@ -109,6 +109,7 @@
     path="author" hidden></eg-grid-field>
   <eg-grid-field path="acp.circ_modifier.name" label="[% l('Circulation Modifier') %]"></eg-grid-field>
   <eg-grid-field path="acp.circ_lib.shortname" label="[% l('Circulation Library') %]"></eg-grid-field>
+  <eg-grid-field path="acn.owning_lib.shortname" label="[% l('Owning Library') %]"></eg-grid-field>
   <eg-grid-field path="circ.*" parent-idl-class="circ" hidden></eg-grid-field>
   <eg-grid-field path="acp.*" parent-idl-class="acp" hidden></eg-grid-field>
   <eg-grid-field path="acn.*" parent-idl-class="acn" hidden></eg-grid-field>
diff --git a/Open-ILS/src/templates/staff/circ/patron/t_items_out.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_items_out.tt2
index c8b0d1f619..01edcab7fd 100644
--- a/Open-ILS/src/templates/staff/circ/patron/t_items_out.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/t_items_out.tt2
@@ -84,6 +84,7 @@
   <eg-grid-field label="[% l('Workstation') %]" path='workstation.name'></eg-grid-field>
   <eg-grid-field label="[% l('Checkin Workstation') %]" path='checkin_workstation.name'></eg-grid-field>
   <eg-grid-field label="[% l('Checkout / Renewal Library') %]" path='circ_lib.shortname'></eg-grid-field>
+  <eg-grid-field label="[% l('Owning Library') %]" path='target_copy.call_number.owning_lib.shortname'></eg-grid-field>
   <eg-grid-field label="[% l('Renewals Remaining') %]" path='renewal_remaining'></eg-grid-field>
   <eg-grid-field label="[% l('Fines Stopped') %]" path='stop_fines'></eg-grid-field>
   <eg-grid-field label="[% l('Title') %]" path="target_copy.call_number.record.simple_record.title" name="title">
diff --git a/Open-ILS/web/js/ui/default/staff/circ/patron/items_out.js b/Open-ILS/web/js/ui/default/staff/circ/patron/items_out.js
index be77ab2923..2f9692f866 100644
--- a/Open-ILS/web/js/ui/default/staff/circ/patron/items_out.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/patron/items_out.js
@@ -107,7 +107,7 @@ function($scope,  $q,  $routeParams,  $timeout,  egCore , egUser,  patronSvc , $
                 flesh_fields : {
                     circ : ['target_copy', 'workstation', 'checkin_workstation'],
                     acp : ['call_number', 'holds_count', 'status'],
-                    acn : ['record'],
+                    acn : ['record', 'owning_lib'],
                     bre : ['simple_record']
                 },
                 // avoid fetching the MARC blob by specifying which 
diff --git a/Open-ILS/web/js/ui/default/staff/circ/services/circ.js b/Open-ILS/web/js/ui/default/staff/circ/services/circ.js
index 00dc29332a..3ec7822ff8 100644
--- a/Open-ILS/web/js/ui/default/staff/circ/services/circ.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/services/circ.js
@@ -536,9 +536,10 @@ function($uibModal , $q , egCore , egAlertDialog , egConfirmDialog,
         var promises = [];
         var payload;
         if (!evt[0] || !(payload = evt[0].payload)) return $q.when();
-
+        
         promises.push(service.flesh_copy_location(payload.copy));
         if (payload.copy) {
+            promises.push(service.flesh_acn_owning_lib(payload.volume));
             promises.push(service.flesh_copy_circ_library(payload.copy));
             promises.push(service.flesh_copy_circ_modifier(payload.copy));
             promises.push(
@@ -594,6 +595,11 @@ function($uibModal , $q , egCore , egAlertDialog , egConfirmDialog,
         return $q.all(promises);
     }
 
+    service.flesh_acn_owning_lib = function(acn) {
+        if (!acn) return $q.when();
+        return $q.when(acn.owning_lib(egCore.org.get( acn.owning_lib() )));
+    }
+
     service.flesh_copy_circ_library = function(copy) {
         if (!copy) return $q.when();
         
-- 
2.43.2