webstaff serials: support combined pattern regularity

Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>

diff --git a/Open-ILS/src/templates/staff/serials/t_prediction_wizard.tt2 b/Open-ILS/src/templates/staff/serials/t_prediction_wizard.tt2
index 2596a46..cd97232 100644 (file)
--- a/Open-ILS/src/templates/staff/serials/t_prediction_wizard.tt2
+++ b/Open-ILS/src/templates/staff/serials/t_prediction_wizard.tt2
@@ -345,7 +345,10 @@
                </div>
                <div class="col-md-6">
                  <div class="row" ng-repeat="part in reg.parts">
-                   <div class="col-md-8">
+                   <div class="col-md-8" ng-if="reg.regularity_type == 'c'">
+                     <label>[% l('Combined issue code') %] <input type="text" ng-model="part.combined_code"></label>
+                   </div>
+                   <div class="col-md-8" ng-if="reg.regularity_type != 'c'">
                      <div ng-if="reg.chron_type == 's'">
                        <label>[% l('Every') %] <eg-season-selector ng-model="part.season"></eg-season-selector></label>
                      </div>

diff --git a/Open-ILS/web/js/ui/default/staff/serials/directives/prediction_wizard.js b/Open-ILS/web/js/ui/default/staff/serials/directives/prediction_wizard.js
index b575d48..d9beaff 100644 (file)
--- a/Open-ILS/web/js/ui/default/staff/serials/directives/prediction_wizard.js
+++ b/Open-ILS/web/js/ui/default/staff/serials/directives/prediction_wizard.js
@@ -204,7 +204,9 @@ function($scope , $q , egSerialsCoreSvc , egCore , egGridDataProvider) {
                     var chron_type = value.substring(1, 2);
                     value.substring(2).split(/,/).forEach(function(value) {
                         var piece = {};
-                        if (chron_type == 'd') {
+                        if (regularity_type == 'c') {
+                            piece.combined_code = value;
+                        } else if (chron_type == 'd') {
                             if (value.match(/^\d\d$/)) {
                                 piece.sub_type = 'day_of_month';
                                 piece.day_of_month = value;
@@ -347,7 +349,9 @@ function($scope , $q , egSerialsCoreSvc , egCore , egGridDataProvider) {
                     patternCode.push('y');
                     var val = reg.regularity_type + reg.chron_type;
                     val += reg.parts.map(function(part) {
-                        if (reg.chron_type == 'd') {
+                        if (reg.regularity_type == 'c') {
+                            return part.combined_code;
+                        } else if (reg.chron_type == 'd') {
                             return part[part.sub_type];
                         } else if (reg.chron_type == 'm') {
                             return part.month;