progress bar to show lineitem update progress. some small style cleanup

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

diff --git a/Open-ILS/web/css/skin/default/acq.css b/Open-ILS/web/css/skin/default/acq.css
index f50f19c..883e2de 100644 (file)
--- a/Open-ILS/web/css/skin/default/acq.css
+++ b/Open-ILS/web/css/skin/default/acq.css
@@ -27,7 +27,6 @@
 #oils-acq-search-fields-label { margin-bottom: 10px; }
 /*#oils-acq-search-fields-submit-block { margin: 5px; text-align: center;}*/
 #oils-acq-search-fields-submit-block { margin: 5px; }
-#oils-acq-search-progress {width: 100%; text-align: center;}
 #oils-acq-search-source-select option {padding: 5px;}
 #oils-acq-search-fields-tbody td {padding: 3px;}
 

diff --git a/Open-ILS/web/js/ui/default/acq/common/li_table.js b/Open-ILS/web/js/ui/default/acq/common/li_table.js
index 582b2c7..263fdd7 100644 (file)
--- a/Open-ILS/web/js/ui/default/acq/common/li_table.js
+++ b/Open-ILS/web/js/ui/default/acq/common/li_table.js
@@ -63,12 +63,13 @@ function AcqLiTable() {
         self.toggleState = !self.toggleState;
     };
 
-    this.getSelected = function() {
+    /** @param all If true, assume all are selected */
+    this.getSelected = function(all) {
         var selected = [];
         dojo.forEach(self.selectors, 
             function(i) { 
-                if(!i.checked) return;
-                selected.push(self.liCache[i.parentNode.parentNode.getAttribute('li')]);
+                if(i.checked || all)
+                    selected.push(self.liCache[i.parentNode.parentNode.getAttribute('li')]);
             }
         );
         return selected;

diff --git a/Open-ILS/web/js/ui/default/acq/picklist/bib_search.js b/Open-ILS/web/js/ui/default/acq/picklist/bib_search.js
index 40346e9..e62075b 100644 (file)
--- a/Open-ILS/web/js/ui/default/acq/picklist/bib_search.js
+++ b/Open-ILS/web/js/ui/default/acq/picklist/bib_search.js
@@ -1,4 +1,5 @@
 dojo.require('dijit.form.FilteringSelect');
+dojo.require('dijit.ProgressBar');
 dojo.require('dijit.Dialog');
 dojo.require('dojox.form.CheckedMultiSelect');
 dojo.require('fieldmapper.Fieldmapper');
@@ -169,10 +170,8 @@ function loadPLSelect() {
 
 
 function saveResults(values) {
-    selectedLIs = resultLIs;
-
-    if(values.which == 'selected') 
-        selectedLIs = liTable.getSelected();
+    openils.Util.show('oils-acq-update-li-progress');
+    selectedLIs = liTable.getSelected( (values.which == 'all') );
 
     if(values.new_name && values.new_name != '') {
         // save selected lineitems to a new picklist
@@ -201,10 +200,13 @@ function saveResults(values) {
 }
 
 function updateLiList(pl, list, idx, oncomplete) {
-    if(idx >= list.length)
+    if(idx >= list.length) {
+        openils.Util.hide('oils-acq-update-li-progress');
         return oncomplete();
+    }
     var li = selectedLIs[idx];
     li.picklist(pl);
+    liUpdateProgress.update({maximum: list.length, progress: idx});
     new openils.acq.Lineitem({lineitem:li}).update(
         function(r) {
             updateLiList(pl, list, ++idx, oncomplete);
@@ -213,3 +215,5 @@ function updateLiList(pl, list, idx, oncomplete) {
 }
 
 openils.Util.addOnLoad(drawForm);
+
+

diff --git a/Open-ILS/web/templates/default/acq/common/li_table.tt2 b/Open-ILS/web/templates/default/acq/common/li_table.tt2
index 8b1137f..c4cae9f 100644 (file)
--- a/Open-ILS/web/templates/default/acq/common/li_table.tt2
+++ b/Open-ILS/web/templates/default/acq/common/li_table.tt2
@@ -23,7 +23,7 @@
                     <td>
                         <table>
                             <tr>
-                                <td rowspan='3'><img style='width:40px;height:65px;' name='jacket' onerror='dojo.style(this, "display", "none")'/></td>
+                                <td rowspan='3'><img style='width:40px;height:65px;' name='jacket'/></td>
                                 <td colspan='0'><a href='javascript:void(0);' attr='title'></a></td>
                             </tr>
                             <tr class='acq-lit-alt-row'>
@@ -45,6 +45,7 @@
             </tbody>
         </table>
     </div>
+
     <div id='acq-lit-info-div' class='hidden'>
         <div dojoType='dijit.form.Button' id='acq-lit-info-back-button'>&#x2196; Return</div>
         <table>
@@ -54,8 +55,9 @@
         </table>
         <div style='margin-top:40px;'>
             <h3>MARC Record</h3>
-            <div id='acq-lit-marc-div' style='margin-top:20px;'/>
+            <div id='acq-lit-marc-div' style='margin-top:20px;'> </div>
         </div>
     </div>
+
 </div>
 

diff --git a/Open-ILS/web/templates/default/acq/picklist/bib_search.tt2 b/Open-ILS/web/templates/default/acq/picklist/bib_search.tt2
index f9fedd4..f8b7eeb 100644 (file)
--- a/Open-ILS/web/templates/default/acq/picklist/bib_search.tt2
+++ b/Open-ILS/web/templates/default/acq/picklist/bib_search.tt2
@@ -54,6 +54,9 @@
     <div dojoType="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
         <div>Search Results</div>
         <div>
+            <div id='oils-acq-update-li-progress' class='hidden'>
+                <div dojoType="dijit.ProgressBar" style="width:300px" jsId="liUpdateProgress"></div>
+            </div>
             <div dojoType='dijit.form.Button' onClick='showDiv("oils-acq-search-block");'>New Search</div>
             <div dojoType="dijit.form.DropDownButton">
                 <span>Save Results</span>