From 7b599e36b6cceecf1661f4f0120335f8672abb09 Mon Sep 17 00:00:00 2001
From: Mike Risher <mrisher@catalyte.io>
Date: Tue, 24 Mar 2020 16:40:02 +0000
Subject: [PATCH] lp1362743 holdings view duplicate barcodes

Modify holdings view's "replace barcodes" UI so that it doesn't allow one
to enter a duplicate barcode.

Signed-off-by: Mike Risher <mrisher@catalyte.io>

Changes to be committed:
	modified:   Open-ILS/src/templates/staff/cat/share/t_replace_barcode.tt2
	modified:   Open-ILS/web/js/ui/default/staff/cat/catalog/app.js

Signed-off-by: Jason Etheridge <jason@EquinoxInitiative.org>
---
 .../staff/cat/share/t_replace_barcode.tt2        |  8 +++++---
 .../web/js/ui/default/staff/cat/catalog/app.js   | 16 ++++++++++++++++
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/Open-ILS/src/templates/staff/cat/share/t_replace_barcode.tt2 b/Open-ILS/src/templates/staff/cat/share/t_replace_barcode.tt2
index 62f9c8b9db..7e859faebb 100644
--- a/Open-ILS/src/templates/staff/cat/share/t_replace_barcode.tt2
+++ b/Open-ILS/src/templates/staff/cat/share/t_replace_barcode.tt2
@@ -1,5 +1,6 @@
 <div>
-<div class="row ">
+<script>window.duplicate_barcode_string = "[% l('Duplicate Barcode') %]";</script>
+<div class="row">
   <div class="col-md-1"></div>
   <div class="col-md-6">
     <h2 class="center-block">[% l('Replace Item Barcode') %]</h2>
@@ -19,10 +20,11 @@
       <div class="form-group">
         <label for="barcode2">[% l('Enter New Barcode for Item') %]</label>
         <input type="text" class="form-control" id="barcode2" select-me="focusBarcode2"
-          ng-model="barcode2"
+          ng-model="barcode2" ng-change="checkCurrentBarcode()"
           required placeholder="[% l('New Barcode...') %]">
+        <div class="label label-danger" ng-if="duplicate_barcode">{{duplicate_barcode_string}}</div>
       </div>
-      <button type="submit" class="btn btn-default">[% l('Submit') %]</button>
+      <button type="submit" class="btn btn-default" ng-disabled="duplicate_barcode">[% l('Submit') %]</button>
       <button ng-if="isModal" class="btn btn-warning" ng-click="cancel($event)">[% l('Cancel') %]</button>
     </form>
   </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 414f3ea03a..5678a98260 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
@@ -1045,11 +1045,27 @@ function($scope , $routeParams , $location , $window , $q , egCore , egHolds , e
                 controller:
                            ['$scope','$uibModalInstance',
                     function($scope , $uibModalInstance) {
+                        $scope.duplicate_barcode = false;
                         $scope.isModal = true;
                         $scope.focusBarcode = false;
                         $scope.focusBarcode2 = true;
                         $scope.barcode1 = cp.barcode();
 
+                        // check input to see if it's a duplicate barcode
+                        $scope.checkCurrentBarcode = function() {
+                            if (!$scope.duplicate_barcode_string) {
+                                $scope.duplicate_barcode_string = window.duplicate_barcode_string;
+                            }
+                            var searchParams = {
+                                deleted : 'f',
+                                'barcode' : $scope.barcode2,
+                                id : { '!=' : $scope.copyId }
+                            };
+                            egCore.pcrud.search('acp', searchParams).then(function (res) {
+                                $scope.duplicate_barcode = res;
+                            });
+                        }
+
                         $scope.updateBarcode = function() {
                             $scope.copyNotFound = false;
                             $scope.updateOK = false;
-- 
2.43.2