From cf5f06ac73361a11b0f045f3237a6d5bc3891b86 Mon Sep 17 00:00:00 2001
From: Bill Erickson <berickxx@gmail.com>
Date: Wed, 9 Sep 2015 20:52:14 -0400
Subject: [PATCH] Phys Char Wiz various additions and repairs

 * Show <unset> as selector value when no value is selected
 * Properly handle gaps (undefined slots) in 007 field value
 * Return to origin value when dialog Cancel is chosen

Signed-off-by: Bill Erickson <berickxx@gmail.com>
---
 .../staff/cat/share/t_physchar_wizard.tt2          |  6 ++--
 .../js/ui/default/staff/cat/services/marcedit.js   | 33 ++++++++++++++--------
 2 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/Open-ILS/src/templates/staff/cat/share/t_physchar_wizard.tt2 b/Open-ILS/src/templates/staff/cat/share/t_physchar_wizard.tt2
index 1aa6576b28..f8d67d32cc 100644
--- a/Open-ILS/src/templates/staff/cat/share/t_physchar_wizard.tt2
+++ b/Open-ILS/src/templates/staff/cat/share/t_physchar_wizard.tt2
@@ -10,7 +10,8 @@
       <div class="col-md-4">
         <div class="btn-group" dropdown>
           <button type="button" class="btn btn-default dropdown-toggle">
-           <span style="padding-right: 5px;">{{selected_option.label()}}</span>
+           <span style="padding-right: 5px;" ng-if="selected_option">{{selected_option.label()}}</span>
+           <span style="padding-right: 5px;" ng-if="!selected_option">[% l('<unset>') | html %]</span>
            <span class="caret"></span>
          </button>
          <ul class="dropdown-menu">
@@ -28,7 +29,8 @@
       <div class="col-md-4">
         <div class="btn-group" dropdown>
           <button type="button" class="btn btn-default dropdown-toggle">
-           <span style="padding-right: 5px;">{{selected_option.label()}}</span>
+           <span style="padding-right: 5px;" ng-if="selected_option">{{selected_option.label()}}</span>
+           <span style="padding-right: 5px;" ng-if="!selected_option">[% l('<unset>') | html %]</span>
            <span class="caret"></span>
          </button>
          <ul class="dropdown-menu">
diff --git a/Open-ILS/web/js/ui/default/staff/cat/services/marcedit.js b/Open-ILS/web/js/ui/default/staff/cat/services/marcedit.js
index 00b7901809..26a1e6c7d5 100644
--- a/Open-ILS/web/js/ui/default/staff/cat/services/marcedit.js
+++ b/Open-ILS/web/js/ui/default/staff/cat/services/marcedit.js
@@ -455,7 +455,8 @@ angular.module('egMarcMod', ['egCoreMod', 'ui.bootstrap'])
                 $scope.spawnPhysCharWizard = function() {
                     var args = {
                         changed : false,
-                        field : $scope.field
+                        field : $scope.field,
+                        orig_value : $scope.field.data
                     };
                     $modal.open({
                         templateUrl: './cat/share/t_physchar_dialog',
@@ -464,11 +465,14 @@ angular.module('egMarcMod', ['egCoreMod', 'ui.bootstrap'])
                             $scope.focusMe = true;
                             $scope.args = args;
                             $scope.ok = function(args) { $modalInstance.close(args) };
-                            $scope.cancel = function () { $modalInstance.dismiss() };
+                            $scope.cancel = function () { 
+                                $modalInstance.dismiss();
+                                args.field.data = args.orig_value;
+                            };
                         }],
                     }).result.then(function (args) {
-                        if (!args.changed) return;
-                        // $scope.field.data = ...
+                        // $scope.field.data is changed within the 
+                        // wizard.  Nothing left to do on submit.
                     });
 
                 }
@@ -1457,10 +1461,13 @@ angular.module('egMarcMod', ['egCoreMod', 'ui.bootstrap'])
 
                 // $scope.step is the 1-based position in the list of 
                 // subfields for the currently selected type.
+                // step==0 means we are currently selecting the type
                 $scope.step = 0;
 
-                if (!$scope.field.data) $scope.field.data = '';
+                if (!$scope.field.data) 
+                    $scope.field.data = '';
 
+                // currently selected subfield value selector option
                 $scope.selected_option = null;
 
                 function current_ptype() {
@@ -1506,11 +1513,13 @@ angular.module('egMarcMod', ['egCoreMod', 'ui.bootstrap'])
                     $scope.selected_option = option;
                     var new_val = option.value();
                     get_step_slot().then(function(slot) {
-                        // TODO fill in gaps with "|" values.
                         var value = $scope.field.data;
+                        while (value.length < (slot[0] + slot[1])) 
+                            value += ' ';
                         var before = value.substr(0, slot[0]);
                         var after = value.substr(slot[0] + slot[1]);
-                        $scope.field.data = before + new_val.substr(0, slot[1]) + after;
+                        $scope.field.data = 
+                            before + new_val.substr(0, slot[1]) + after;
                     });
                 }
 
@@ -1523,8 +1532,8 @@ angular.module('egMarcMod', ['egCoreMod', 'ui.bootstrap'])
 
                 $scope.is_last_step = function() {
                     // This one is called w/ every digest, so avoid async
-                    // calls.  Wait until we know for sure if this is 
-                    // the last step.
+                    // calls.  Wait until we have loaded the current ptype
+                    // subfields to determine if this is the last step.
                     return (
                         current_ptype() && 
                         egTagTable.phys_char_sf_map[current_ptype()] &&
@@ -1563,14 +1572,14 @@ angular.module('egMarcMod', ['egCoreMod', 'ui.bootstrap'])
                                 $scope.field.data, slot);
                             if (val) {
                                 $scope.selected_option = $scope.values_for_step
-                                .filter(function(opt) { return (opt.value() == val)})[0];
+                                .filter(function(opt) { 
+                                    return (opt.value() == val)})[0];
                             } else {
-                                $scope.selected_option = $scope.values_for_step[0];
+                                $scope.selected_option = null;
                             }
                         })
                     }
                 }
-
                 set_values_for_step();
             }
         ]
-- 
2.11.0