From f910fe640b1b15918a59d070e0e68ad680789fb2 Mon Sep 17 00:00:00 2001
From: Jason Etheridge <jason@EquinoxInitiative.org>
Date: Thu, 21 Jun 2018 17:12:39 -0400
Subject: [PATCH] 6-upc-not-on-patron-request-form

Adds a UPC column to the patron acq request table

Signed-off-by: Jason Etheridge <jason@EquinoxInitiative.org>
---
 Open-ILS/examples/fm_IDL.xml                                        | 2 ++
 Open-ILS/src/sql/Pg/200.schema.acq.sql                              | 1 +
 .../src/sql/Pg/upgrade/XXXX.data.schema.acq.patron_requests.sql     | 1 +
 Open-ILS/src/templates/staff/acq/requests/t_edit.tt2                | 6 ++++++
 Open-ILS/src/templates/staff/acq/requests/t_list.tt2                | 1 +
 Open-ILS/web/js/ui/default/staff/acq/services/requests.js           | 3 ++-
 6 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/Open-ILS/examples/fm_IDL.xml b/Open-ILS/examples/fm_IDL.xml
index 2f4d08b9d7..0ce5f7a4c2 100644
--- a/Open-ILS/examples/fm_IDL.xml
+++ b/Open-ILS/examples/fm_IDL.xml
@@ -8138,6 +8138,7 @@ SELECT  usr,
 			<field reporter:label="Need Before Date/Time" name="need_before" reporter:datatype="timestamp" />
 			<field reporter:label="Max Acceptable Fee" name="max_fee" reporter:datatype="text" />
 			<field reporter:label="ISxN" name="isxn" reporter:datatype="text" />
+			<field reporter:label="UPC" name="upc" reporter:datatype="text" />
 			<field reporter:label="Title" name="title" reporter:datatype="text" />
 			<field reporter:label="Volume" name="volume" reporter:datatype="text" />
 			<field reporter:label="Author" name="author" reporter:datatype="text" />
@@ -8211,6 +8212,7 @@ SELECT  usr,
 			<field reporter:label="Need Before Date/Time" name="need_before" reporter:datatype="timestamp" />
 			<field reporter:label="Max Acceptable Fee" name="max_fee" reporter:datatype="text" />
 			<field reporter:label="ISxN" name="isxn" reporter:datatype="text" />
+			<field reporter:label="UPC" name="upc" reporter:datatype="text" />
 			<field reporter:label="Title" name="title" reporter:datatype="text" />
 			<field reporter:label="Volume" name="volume" reporter:datatype="text" />
 			<field reporter:label="Author" name="author" reporter:datatype="text" />
diff --git a/Open-ILS/src/sql/Pg/200.schema.acq.sql b/Open-ILS/src/sql/Pg/200.schema.acq.sql
index f956abcae0..64e9ba1a53 100644
--- a/Open-ILS/src/sql/Pg/200.schema.acq.sql
+++ b/Open-ILS/src/sql/Pg/200.schema.acq.sql
@@ -977,6 +977,7 @@ CREATE TABLE acq.user_request (
   
     request_type        INT     NOT NULL REFERENCES acq.user_request_type (id),
     isxn                TEXT,
+    upc                 TEXT,
     title               TEXT,
     volume              TEXT,
     author              TEXT,
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.schema.acq.patron_requests.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.schema.acq.patron_requests.sql
index 1ba02b512c..c710d43567 100644
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.schema.acq.patron_requests.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.schema.acq.patron_requests.sql
@@ -3,6 +3,7 @@ BEGIN;
 --SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
 
 ALTER TABLE acq.user_request ADD COLUMN cancel_time TIMESTAMPTZ;
+ALTER TABLE acq.user_request ADD COLUMN upc TEXT;
 ALTER TABLE action.hold_request ADD COLUMN acq_request INT REFERENCES acq.user_request (id);
 
 UPDATE
diff --git a/Open-ILS/src/templates/staff/acq/requests/t_edit.tt2 b/Open-ILS/src/templates/staff/acq/requests/t_edit.tt2
index b1efd40492..d3868756c1 100644
--- a/Open-ILS/src/templates/staff/acq/requests/t_edit.tt2
+++ b/Open-ILS/src/templates/staff/acq/requests/t_edit.tt2
@@ -144,6 +144,12 @@
                     ng-disabled="mode=='view'" placeholder="[% l('ISxN...') %]"/>
             </div>
             <div class="form-group">
+                <label for="edit-request-upc">[% l('UPC') %]</label>
+                <input type="text" class="form-control" focus-me='focusMe'
+                    id="edit-request-upc" ng-model="request.upc"
+                    ng-disabled="mode=='view'" placeholder="[% l('UPC...') %]"/>
+            </div>
+            <div class="form-group">
                 <label for="edit-request-title">[% l('Title') %]</label>
                 <input type="text" class="form-control" focus-me='focusMe'
                     id="edit-request-title" ng-model="request.title"
diff --git a/Open-ILS/src/templates/staff/acq/requests/t_list.tt2 b/Open-ILS/src/templates/staff/acq/requests/t_list.tt2
index 1bc19566e3..5c279b4faa 100644
--- a/Open-ILS/src/templates/staff/acq/requests/t_list.tt2
+++ b/Open-ILS/src/templates/staff/acq/requests/t_list.tt2
@@ -67,6 +67,7 @@
   <eg-grid-field path='hold' sortable></eg-grid-field>
   <eg-grid-field path='pickup_lib.shortname' required sortable label="[% l('Pickup Lib') %]"></eg-grid-field>
   <eg-grid-field path='isxn' sortable></eg-grid-field>
+  <eg-grid-field path='upc' sortable></eg-grid-field>
   <eg-grid-field path='title' sortable></eg-grid-field>
   <eg-grid-field path='article_title' sortable></eg-grid-field>
   <eg-grid-field path='lineitem.id' required sortable label="[% l('Lineitem ID') %]" hidden></eg-grid-field>
diff --git a/Open-ILS/web/js/ui/default/staff/acq/services/requests.js b/Open-ILS/web/js/ui/default/staff/acq/services/requests.js
index 0af28e7a72..f3f1302dbe 100644
--- a/Open-ILS/web/js/ui/default/staff/acq/services/requests.js
+++ b/Open-ILS/web/js/ui/default/staff/acq/services/requests.js
@@ -129,10 +129,11 @@ function($uibModal , $q , egCore , ngToast) {
             }
         ).then(function(requests) {
             var aur_obj = requests[0];
-            var prepop = {
+            var prepop = { // based on acq.lineitem_marc_attr_definition
                 "1": [aur_obj.title(), aur_obj.article_title(), aur_obj.volume()].join(' '),
                 "2": aur_obj.author(),
                 "4": aur_obj.article_pages(),
+                "7": aur_obj.upc(),
                 "10": aur_obj.publisher(),
                 "11": aur_obj.pubdate()
             }
-- 
2.11.0