From 0e2842b7cc6fb24bc47c7ce66c79ba7df70ae0cc Mon Sep 17 00:00:00 2001
From: Bill Erickson <berick@esilibrary.com>
Date: Mon, 9 Jun 2014 11:31:57 -0400
Subject: [PATCH] billing docs/fixes; moving rec out to service

Signed-off-by: Bill Erickson <berick@esilibrary.com>
---
 Open-ILS/src/templates/staff/cat/item/index.tt2    |  2 +-
 Open-ILS/src/templates/staff/cat/item/t_view.tt2   |  2 +-
 .../t_record_summary.tt2}                          | 30 +++++++---------
 .../templates/staff/circ/patron/t_xact_details.tt2 |  2 --
 Open-ILS/web/js/ui/default/staff/cat/item/app.js   |  1 +
 .../cat/services/{record_html.js => record.js}     | 40 +++++++++++++++++++++-
 .../js/ui/default/staff/circ/services/billing.js   |  9 +++++
 7 files changed, 64 insertions(+), 22 deletions(-)
 rename Open-ILS/src/templates/staff/cat/{item/summary_header.tt2 => share/t_record_summary.tt2} (52%)
 rename Open-ILS/web/js/ui/default/staff/cat/services/{record_html.js => record.js} (65%)

diff --git a/Open-ILS/src/templates/staff/cat/item/index.tt2 b/Open-ILS/src/templates/staff/cat/item/index.tt2
index af7f795f4e..61f063d904 100644
--- a/Open-ILS/src/templates/staff/cat/item/index.tt2
+++ b/Open-ILS/src/templates/staff/cat/item/index.tt2
@@ -10,7 +10,7 @@
 <script src="[% ctx.media_prefix %]/js/ui/default/staff/services/ui.js"></script>
 <script src="[% ctx.media_prefix %]/js/ui/default/staff/services/file.js"></script>
 <script src="[% ctx.media_prefix %]/js/ui/default/staff/cat/item/app.js"></script>
-<script src="[% ctx.media_prefix %]/js/ui/default/staff/cat/services/record_html.js"></script>
+<script src="[% ctx.media_prefix %]/js/ui/default/staff/cat/services/record.js"></script>
 [% END %]
 
 <style>
diff --git a/Open-ILS/src/templates/staff/cat/item/t_view.tt2 b/Open-ILS/src/templates/staff/cat/item/t_view.tt2
index 124ff16c97..e4495912d6 100644
--- a/Open-ILS/src/templates/staff/cat/item/t_view.tt2
+++ b/Open-ILS/src/templates/staff/cat/item/t_view.tt2
@@ -1,4 +1,4 @@
-[% INCLUDE 'staff/cat/item/summary_header.tt2' %]
+<eg-record-summary record="summaryRecord"></eg-record-summary>
 
 <!-- tabbed copy data view -->
 
diff --git a/Open-ILS/src/templates/staff/cat/item/summary_header.tt2 b/Open-ILS/src/templates/staff/cat/share/t_record_summary.tt2
similarity index 52%
rename from Open-ILS/src/templates/staff/cat/item/summary_header.tt2
rename to Open-ILS/src/templates/staff/cat/share/t_record_summary.tt2
index 64a8300b5b..c5066ddebe 100644
--- a/Open-ILS/src/templates/staff/cat/item/summary_header.tt2
+++ b/Open-ILS/src/templates/staff/cat/share/t_record_summary.tt2
@@ -1,52 +1,48 @@
+<div class="strong-text-2">[% l('Record Summary') %]</div>
 
-<div class="flex-container-striped flex-container-bordered"
-  ng-hide="context.itemNotFound">
+<div class="flex-container-striped flex-container-bordered">
   <div class="flex-row">
     <div class="flex-cell strong-text">[% l('Title:') %]</div>
-    <div class="flex-cell flex-2">
-      {{copy.call_number().record().simple_record().title() || copy.dummy_title()}}
-    </div>
+    <div class="flex-cell flex-2">{{record.simple_record().title()}}</div>
 
     <div class="flex-cell strong-text">[% l('Edition:') %]</div>
     <div class="flex-cell"><!-- FIXME: no edition field on simple record --></div>
 
     <div class="flex-cell strong-text">[% l('TCN:') %]</div>
-    <div class="flex-cell">{{copy.call_number().record().tcn_value()}}</div>
+    <div class="flex-cell">{{record.tcn_value()}}</div>
 
     <div class="flex-cell strong-text">[% l('Created By:') %]</div>
-    <div class="flex-cell">{{copy.call_number().record().creator().usrname()}}</div>
+    <div class="flex-cell">{{record.creator().usrname()}}</div>
   </div><!-- flex-row -->
 
   <div class="flex-row">
     <div class="flex-cell strong-text">[% l('Author:') %]</div>
-    <div class="flex-cell flex-2">
-      {{copy.call_number().record().simple_record().author() || copy.dummy_author()}}
-    </div>
+    <div class="flex-cell flex-2">{{record.simple_record().author()}}</div>
 
     <div class="flex-cell strong-text">[% l('Pub Date:') %]</div>
     <div class="flex-cell">
-      {{copy.call_number().record().simple_record().pubdate()}}
+      {{record.simple_record().pubdate()}}
     </div>
 
     <div class="flex-cell strong-text">[% l('Databse ID:') %]</div>
-    <div class="flex-cell">{{copy.call_number().record().id()}}</div>
+    <div class="flex-cell">{{record.id()}}</div>
 
     <div class="flex-cell strong-text">[% l('Last Edited By:') %]</div>
-    <div class="flex-cell">{{copy.call_number().record().editor().usrname()}}</div>
+    <div class="flex-cell">{{record.editor().usrname()}}</div>
   </div><!-- flex-row -->
 
   <div class="flex-row">
     <div class="flex-cell strong-text">[% l('Bib Call #:') %]</div>
     <div class="flex-cell flex-2"><!-- FIXME: no bib call no on simple rec --></div>
 
-    <div class="flex-cell strong-text">[% l('Item Call #:') %]</div>
-    <div class="flex-cell">{{copy.call_number().label()}}</div>
+    <div class="flex-cell strong-text"></div>
+    <div class="flex-cell"></div>
 
     <div class="flex-cell strong-text">[% l('Record Owner:') %]</div>
-    <div class="flex-cell">{{copy.call_number().record().owner().shortname()}}</div>
+    <div class="flex-cell">{{record.owner().shortname()}}</div>
 
     <div class="flex-cell strong-text">[% l('Last Edited On:') %]</div>
-    <div class="flex-cell">{{copy.edit_date() | date:'short'}}</div>
+    <div class="flex-cell">{{record.edit_date() | date:'short'}}</div>
   </div><!-- flex-row -->
 </div>
 
diff --git a/Open-ILS/src/templates/staff/circ/patron/t_xact_details.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_xact_details.tt2
index 078b9f1a87..1d11369d6f 100644
--- a/Open-ILS/src/templates/staff/circ/patron/t_xact_details.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/t_xact_details.tt2
@@ -106,8 +106,6 @@
 </div>
 
 
-<!-- TODO item summary -->
-
 <!-- set a lower default page size (limit) to allow for more space -->
 <hr/>
 <eg-grid
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 980714aeaa..2ac0b09b57 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
@@ -248,6 +248,7 @@ function($scope , $q, $location , $routeParams , egCore , itemSvc) {
             copyId = copy.id();
             $scope.copy = copy;
             $scope.recordId = copy.call_number().record().id();
+            $scope.summaryRecord = copy.call_number().record();
             $scope.args.barcode = '';
 
             // locally flesh org units
diff --git a/Open-ILS/web/js/ui/default/staff/cat/services/record_html.js b/Open-ILS/web/js/ui/default/staff/cat/services/record.js
similarity index 65%
rename from Open-ILS/web/js/ui/default/staff/cat/services/record_html.js
rename to Open-ILS/web/js/ui/default/staff/cat/services/record.js
index 5aeff5a42b..0dbc2515e7 100644
--- a/Open-ILS/web/js/ui/default/staff/cat/services/record_html.js
+++ b/Open-ILS/web/js/ui/default/staff/cat/services/record.js
@@ -59,4 +59,42 @@ angular.module('egCoreMod')
             }
         ]
     }
-});
+})
+
+.directive('egRecordSummary', function() {
+    return {
+        restrict : 'AE',
+        scope : {
+            recordId : '=',
+            record : '='
+        },
+        templateUrl : '/eg/staff/cat/share/t_record_summary', // FIXME: ABS URL
+        controller : 
+                   ['$scope','egCore',
+            function($scope , egCore) {
+
+                function loadRecord() {
+                    egCore.pcrud.retrieve('bre', $scope.recordId, {
+                        flesh : 1,
+                        flesh_fields : {
+                            bre : ['simple_record']
+                        }
+                    }).then(function(rec) {
+                        $scope.record = rec;
+                    });
+                }
+
+                $scope.$watch('recordId', 
+                    function(newVal, oldVal) {
+                        if (newVal && newVal !== oldVal) {
+                            loadRecord();
+                        }
+                    }
+                );
+
+                if ($scope.recordId) 
+                    loadRecord();
+            }
+        ]
+    }
+})
diff --git a/Open-ILS/web/js/ui/default/staff/circ/services/billing.js b/Open-ILS/web/js/ui/default/staff/circ/services/billing.js
index 4f10f8f03f..57fe012bd6 100644
--- a/Open-ILS/web/js/ui/default/staff/circ/services/billing.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/services/billing.js
@@ -11,6 +11,7 @@ function($modal , $q , egCore , egUser) {
 
     var service = {};
 
+    // fetch a fleshed money.billable_xact
     service.fetchXact = function(xact_id) {
         return egCore.pcrud.retrieve('mbt', {
             flesh : 5,
@@ -26,6 +27,8 @@ function($modal , $q , egCore , egUser) {
         );
     }
 
+    // apply a patron billing.  If no xact is provided, a grocery xact is
+    // created.
     service.billPatron = function(args, xact) {
         // apply a billing to an existing transaction
         if (xact) return service.createBilling(xact.id, args);
@@ -37,6 +40,7 @@ function($modal , $q , egCore , egUser) {
         });
     }
 
+    // create a new grocery xact
     service.createGroceryXact = function(args) {
         var groc = new egCore.idl.mg();
         groc.billing_location(egCore.auth.user().ws_ou());
@@ -57,6 +61,8 @@ function($modal , $q , egCore , egUser) {
         });
     }
 
+    // fetch the org-focused billing types
+    // Cache on egEnv
     service.fetchBillingTypes = function() {
         if (egCore.env.cbt) 
             return $q.when(egCore.env.cbt.list);
@@ -74,6 +80,7 @@ function($modal , $q , egCore , egUser) {
         });
     }
 
+    // create a patron billing
     service.createBilling = function(xact_id, args) {
         var bill = new egCore.idl.mb();
         bill.xact(xact_id);
@@ -98,6 +105,8 @@ function($modal , $q , egCore , egUser) {
     }
 
 
+    // Show the billing dialog.  
+    // Allows users to select amount, billing type, and note.
     // args:
     //   xact OR xact_id : if null, creates a grocery xact
     //   patron OR patron_id
-- 
2.11.0