more work on metarecord holds

git-svn-id: svn://svn.open-ils.org/ILS/trunk@4640 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/web/opac/common/js/utils.js b/Open-ILS/web/opac/common/js/utils.js
index d39c87a..e5eaca7 100644 (file)
--- a/Open-ILS/web/opac/common/js/utils.js
+++ b/Open-ILS/web/opac/common/js/utils.js
@@ -176,6 +176,23 @@ function setSelector( sel, value ) {
        }
 }
 
+function setSelectorRegex( sel, regex ) {
+       if(sel && regex != null) {
+               for( var i = 0; i!= sel.options.length; i++ ) { 
+                       if( sel.options[i] ) {
+                               var val = sel.options[i].value;
+                               if( val == null || val == "" ) /* for IE */
+                                       val = sel.options[i].innerHTML;
+                               value += ""; /* in case of number */ 
+                               if( val && val.match(regex) ) {
+                                       sel.selectedIndex = i;
+                                       sel.options[i].selected = true;
+                               }
+                       }
+               }
+       }
+}
+
 function getSelectorVal( sel ) {
        if(!sel) return null;
        var o = sel.options[sel.selectedIndex];
@@ -201,6 +218,14 @@ function setSelectorByName( sel, name ) {
        }
 }
 
+function findSelectorOptByValue( sel, val ) {
+       for( var i = 0; i < sel.options.length; i++ ) {
+               var opt = sel.options[i];
+               if( opt.value == val ) return opt;
+       }
+       return null;
+}
+
 function debugSelector(sel) {
        var s = 'Selector\n';
        for( var i = 0; i != sel.options.length; i++ ) {
@@ -273,6 +298,7 @@ function insertSelectorVal( selector, index, name, value, action, indent ) {
        return opt;
 }
 
+/* changes the value of the option at the specified index */
 function setSelectorVal( selector, index, name, value, action, indent ) {
        if(!indent || indent < 0) indent = 0;
        indent = parseInt(indent);

diff --git a/Open-ILS/web/opac/skin/default/js/holds.js b/Open-ILS/web/opac/skin/default/js/holds.js
index 0de3202..8f6752b 100644 (file)
--- a/Open-ILS/web/opac/skin/default/js/holds.js
+++ b/Open-ILS/web/opac/skin/default/js/holds.js
@@ -344,25 +344,48 @@ function holdsSetFormatSelector() {
        var type = holdArgs.type;
        if( type == 'C' || type == 'V' ) return;
 
-       var data = holdGetAvailableTypesAndForms();
-       var avail_types = data.avail_types;
-       var avail_forms = data.avail_forms;
-       var item_lang   = data.item_lang;
+       var data = holdGetTypesAndForms();
+       var item_lang           = data.item_lang;
+       var avail_types = data.avail_types;
+       var avail_forms = data.avail_forms;
+       var selected_forms = data.selected_forms;
+       var selected_types = data.selected_types;
+
+
+       if( avail_types.length > 1 ) {
 
-       /*
-       if( avail_types.length > 1 || avail_forms.length > 1 ) {
                unHideMe($('holds_alt_formats_row'));
-               alert('lang: ' + item_lang + '\navail types: ' + avail_types + '\navail forms: ' + avail_forms);
+
+               var selector = $('hold_alt_form_selector');
+
+               if( avail_forms.length > 0 ) 
+                       unHideMe(findSelectorOptByValue(selector, 'at-d'));
+
+               if( selected_forms.length > 0 ) 
+                       setSelector(selector, 'at-d');
+
+               for( var i = 0; i < avail_types.length; i++ ) {
+                       var t = avail_types[i];
+                       if( t == 'a' || t == 't' ) t = 'at'
+                       unHideMe(findSelectorOptByValue(selector, t));
+               }
+
+               for( var i = 0; i < selected_types.length; i++ ) {
+                       var t = selected_types[i];
+                       if( t == 'a' || t == 't' ) t = 'at'
+                       setSelector(selector, t);
+               }
        }
-       */
 }
 
 
-function holdGetAvailableTypesAndForms() {
+function holdGetTypesAndForms() {
 
+       var item_lang;
        var item_types = [];
        var item_forms  = [];
-       var item_lang;
+       var selected_forms = [];
+       var selected_types = [];
 
        var type = holdArgs.type;
        var desc = holdArgs.recordDescriptors;
@@ -376,6 +399,8 @@ function holdGetAvailableTypesAndForms() {
                        var d = desc[i];
                        if( d.record() == holdArgs.record ) {
                                item_lang = d.item_lang();
+                               selected_forms.push(d.item_form());
+                               selected_types.push(d.item_type());
                                break;
                        }
                }
@@ -394,7 +419,9 @@ function holdGetAvailableTypesAndForms() {
        return { 
                avail_types : item_types, 
                avail_forms     : item_forms, 
-               item_lang : item_lang 
+               item_lang : item_lang,
+               selected_forms : selected_forms,
+               selected_types : selected_types,
        };
 }
 

diff --git a/Open-ILS/web/opac/skin/default/xml/common/holds.xml b/Open-ILS/web/opac/skin/default/xml/common/holds.xml
index 8f112dd..b0e96f8 100644 (file)
--- a/Open-ILS/web/opac/skin/default/xml/common/holds.xml
+++ b/Open-ILS/web/opac/skin/default/xml/common/holds.xml
@@ -112,9 +112,19 @@
                                </tr>
                                <tr id='holds_alt_formats_row' class='hide_me'>
                                        <td class='holds_cell'>
-                                               I would also be interested in receiving my hold in the following alternate formats:
+                                               <div style='margin-bottom: 5px;'>
+                                                       Any of the following formats are acceptible for this hold: 
+                                               </div>
+                                               <div>(control-click to select multiple formats)</div>
                                        </td>
                                        <td class='holds_cell'>
+                                               <select id='hold_alt_form_selector' multiple='true' style='width: 13em;'>
+                                                       <option value='at'      class='hide_me'>&opac.search.books;</option>
+                                                       <option value='at-d' class='hide_me'>&opac.search.largePrint;</option>
+                                                       <option value='i'               class='hide_me'>&opac.search.audioBooks;</option>
+                                                       <option value='g'               class='hide_me'>&opac.search.videoRecordings;</option>
+                                                       <option value='j'               class='hide_me'>&opac.search.music;</option>
+                                               </select>
                                        </td>
                                </tr>