From b46b2595f00277d38ca25879ad5e9380d5423805 Mon Sep 17 00:00:00 2001
From: Galen Charlton <gmc@equinoxinitiative.org>
Date: Tue, 1 May 2018 00:56:53 -0400
Subject: [PATCH] user feedback for catalog records - staff

Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
---
 .../src/templates/staff/cat/catalog/t_catalog.tt2  |  5 ++++
 .../templates/staff/cat/share/t_record_summary.tt2 |  4 +--
 .../templates/staff/cat/share/t_view_feedback.tt2  | 19 +++++++++++++
 .../web/js/ui/default/staff/cat/catalog/app.js     | 33 ++++++++++++++++++++++
 .../web/js/ui/default/staff/cat/services/record.js |  8 ++++++
 5 files changed, 67 insertions(+), 2 deletions(-)
 create mode 100644 Open-ILS/src/templates/staff/cat/share/t_view_feedback.tt2

diff --git a/Open-ILS/src/templates/staff/cat/catalog/t_catalog.tt2 b/Open-ILS/src/templates/staff/cat/catalog/t_catalog.tt2
index c1e326ea33..b07be65875 100644
--- a/Open-ILS/src/templates/staff/cat/catalog/t_catalog.tt2
+++ b/Open-ILS/src/templates/staff/cat/catalog/t_catalog.tt2
@@ -91,6 +91,11 @@
                         [% l('View/Place Orders') %]
                    </a>
             </li>
+            <li role="menuitem">
+                   <a ng-click="view_feedback()" href="">
+                        [% l('View Feedback') %]
+                   </a>
+            </li>
         </ul>
         </div>
     </div>
diff --git a/Open-ILS/src/templates/staff/cat/share/t_record_summary.tt2 b/Open-ILS/src/templates/staff/cat/share/t_record_summary.tt2
index c98b087034..fe96160338 100644
--- a/Open-ILS/src/templates/staff/cat/share/t_record_summary.tt2
+++ b/Open-ILS/src/templates/staff/cat/share/t_record_summary.tt2
@@ -100,8 +100,8 @@
     <div class="flex-cell strong-text">[% l('Bib Call #:') %]</div>
     <div class="flex-cell flex-2"><span tooltip-html-unsafe="{{bib_cn_tooltip}}">{{bib_cn}}<span></div>
 
-    <div class="flex-cell strong-text"></div>
-    <div class="flex-cell"></div>
+    <div class="flex-cell strong-text">[% l('Feedback?') %]</div>
+    <div class="flex-cell">{{feedback.present}}</div>
 
     <div class="flex-cell strong-text">[% l('Record Owner:') %]</div>
     <div class="flex-cell">{{record.owner().shortname()}}</div>
diff --git a/Open-ILS/src/templates/staff/cat/share/t_view_feedback.tt2 b/Open-ILS/src/templates/staff/cat/share/t_view_feedback.tt2
new file mode 100644
index 0000000000..5aa6a7c8ac
--- /dev/null
+++ b/Open-ILS/src/templates/staff/cat/share/t_view_feedback.tt2
@@ -0,0 +1,19 @@
+<div>
+  <div class="modal-header">
+    <button type="button" class="close"
+      ng-click="cancel()" aria-hidden="true">&times;</button>
+    <h4 class="modal-title">[% l('View Record Feedback') %]</h4>
+  </div>
+  <div class="modal-body">
+    <div ng-repeat="f in feedback" class="row">
+        <div class="col-md-2">{{f.create_date() | date:egDateAndTimeFormat}}</div>
+        <div class="col-md-8" ng-class="{ acknowledged : f.acked() == 't' }">{{f.value()}}</div>
+        <div class="col-md-2"><button ng-click="f.acked('t')" class="btn btn-info btn-xs">[% l('Acknowledge') %]</button></div>
+    </div>
+  </div>
+  <div class="modal-footer">
+    <input type="submit" ng-click="ok()"
+        class="btn btn-primary" value="[% l('OK') %]"/>
+    <button class="btn btn-warning" ng-click="cancel()">[% l('Cancel') %]</button>
+  </div>
+</div>
diff --git a/Open-ILS/web/js/ui/default/staff/cat/catalog/app.js b/Open-ILS/web/js/ui/default/staff/cat/catalog/app.js
index 4b3d186975..aaf24f8aa2 100644
--- a/Open-ILS/web/js/ui/default/staff/cat/catalog/app.js
+++ b/Open-ILS/web/js/ui/default/staff/cat/catalog/app.js
@@ -971,6 +971,39 @@ function($scope , $routeParams , $location , $window , $q , egCore , egHolds , e
         $timeout(function() { $window.open(url, '_blank') });
     }
 
+    $scope.view_feedback = function() {
+        var recId = $scope.record_id;
+        $uibModal.open({
+            templateUrl : './cat/share/t_view_feedback',
+            backdrop : 'static',
+            animation : true,
+            controller:
+                       ['$scope','$uibModalInstance',
+                function($scope , $uibModalInstance) {
+                    $scope.feedback = [];
+                    egCore.pcrud.search('brf',
+                        { record : recId, acked : 'f' }, {}, { atomic : true }
+                    ).then(function(list) {
+                        $scope.feedback = list;
+                    });
+
+                    $scope.ok = function() {
+                        angular.forEach($scope.feedback, function(f) {
+                            if (f.acked() == 't') {
+                                egCore.pcrud.update(f);
+                            }
+                        });
+                        $uibModalInstance.close();
+                    }
+                    $scope.cancel = function($event) {
+                        $uibModalInstance.dismiss();
+                        $event.preventDefault();
+                    }
+                }
+            ]
+        });
+    }
+
     $scope.replaceBarcodes = function() {
         var copy_list = gatherSelectedRawCopies();
         if (copy_list.length == 0) return;
diff --git a/Open-ILS/web/js/ui/default/staff/cat/services/record.js b/Open-ILS/web/js/ui/default/staff/cat/services/record.js
index 5560553f9e..8201f32eb1 100644
--- a/Open-ILS/web/js/ui/default/staff/cat/services/record.js
+++ b/Open-ILS/web/js/ui/default/staff/cat/services/record.js
@@ -183,6 +183,14 @@ angular.module('egCoreMod')
                             $scope.bib_cn_tooltip = $sce.trustAsHtml(tooltip);
                         }
                     });
+                    $scope.feedback = {};
+                    egCore.pcrud.search('brf',
+                        { record : $scope.recordId, acked : 'f' },
+                        {},
+                        { atomic : true }
+                    ).then(function(list) {
+                        $scope.feedback['present'] = (list.length > 0) ? true : false;
+                    });
                 }
 
                 $scope.$watch('recordId', 
-- 
2.11.0