[open-ils-commits] r13092 - in trunk/Open-ILS/web/vandelay: . inc (erickson)

[svn at svn.open-ils.org]

Author: erickson
Date: 2009-05-06 14:18:23 -0400 (Wed, 06 May 2009)
New Revision: 13092

Modified:
   trunk/Open-ILS/web/vandelay/inc/queue.xml
   trunk/Open-ILS/web/vandelay/vandelay.js
Log:
out with the old-style grid column picker, in with the new

Modified: trunk/Open-ILS/web/vandelay/inc/queue.xml
===================================================================
--- trunk/Open-ILS/web/vandelay/inc/queue.xml	2009-05-06 17:29:05 UTC (rev 13091)
+++ trunk/Open-ILS/web/vandelay/inc/queue.xml	2009-05-06 18:18:23 UTC (rev 13092)
@@ -33,28 +33,6 @@
 </script>
 <div id='vl-queue-div-grid' class='tall' dojoType="dijit.layout.ContentPane" layoutAlign='client'>
 
-    <!-- column picker dialog -->
-    <div dojoType="dijit.Dialog" jsId='vlQueueGridColumePickerDialog' title="&vandelay.queue.column_picker.title;">
-        <table class='form_table'>
-            <thead>
-                <tr><th width='33%'>&vandelay.column;</th>
-                <th width='33%'>&vandelay.display;</th>
-                <th width='33%'>&vandelay.auto.width;</th></tr>
-            </thead>
-            <tbody>
-                <tr>
-                    <td colspan='3' align='center'>
-                        <button jsId='vlQueueGridColumnPickerButton' 
-                            onclick='
-                                vlQueueGridColumePickerDialog.hide();
-                                vlQueueGridColumePicker[currentType].update(true);'
-                            dojoType='dijit.form.Button'>&vandelay.done;</button>
-                    </td>
-                </tr>
-            </tbody>
-        </table>
-    </div>
-
     <!-- queue grid navigation row -->
     <div dojoType="dijit.layout.ContentPane" layoutAlign='client'>
         <table width='100%' style='margin-bottom:0px;'>
@@ -119,24 +97,29 @@
                     <span style='padding-right:10px;'>
                         <a href='javascript:void(0);' onclick='vlQueueGridNextPage();'>&vandelay.next.page; &#187;</a>
                     </span>
-                    <span style='background:#e8e1cf;padding:3px 2px 2px 6px;-moz-border-radius:6px 0px 0px 0px;'>
-                        <a href='javascript:void(0);' onclick='vlQueueGridColumePickerDialog.show();'>&vandelay.select.cols;</a>
-                    </span>
                 </td>
             </tr>
         </table>
     </div>
 
     <!-- Queue Grid -->
-    <div dojoType="openils.widget.GridColumnPicker" jsid="vlQueueGridMenu" style="display: none;" grid='vlQueueGrid'>
-        <div dojoType="dojox.widget.PlaceholderMenuItem" label="GridColumns"></div>
+    <div class='hidden' id='vl-bib-queue-grid-wrapper'>
+        <div dojoType="openils.widget.GridColumnPicker" jsid="vlBibQueueGridMenu" style="display: none;" grid='vlBibQueueGrid'>
+            <div dojoType="dojox.widget.PlaceholderMenuItem" label="GridColumns"></div>
+        </div>
+        <div style='height:600px' dojoType="dijit.layout.ContentPane" layoutAlign='client'>
+            <table dojoType='dojox.grid.DataGrid' jsId='vlBibQueueGrid' query="{id:'*'}" headerMenu='vlBibQueueGridMenu'> 
+            </table>
+        </div>
     </div>
-    <div style='height:600px' dojoType="dijit.layout.ContentPane" layoutAlign='client'>
-        <!--
-        <table dojoType='dojox.grid.DataGrid' jsId='vlQueueGrid' query="{id:'*'}" headerMenu='vlQueueGridMenu'> 
-        -->
-        <table dojoType='dojox.grid.DataGrid' jsId='vlQueueGrid' query="{id:'*'}"> 
-        </table>
+    <div class='hidden' id='vl-auth-queue-grid-wrapper'>
+        <div dojoType="openils.widget.GridColumnPicker" jsid="vlAuthQueueGridMenu" style="display: none;" grid='vlAuthQueueGrid'>
+            <div dojoType="dojox.widget.PlaceholderMenuItem" label="GridColumns"></div>
+        </div>
+        <div style='height:600px' dojoType="dijit.layout.ContentPane" layoutAlign='client'>
+            <table dojoType='dojox.grid.DataGrid' jsId='vlAuthQueueGrid' query="{id:'*'}" headerMenu='vlAuthQueueGridMenu'> 
+            </table>
+        </div>
     </div>
 </div>
 

Modified: trunk/Open-ILS/web/vandelay/vandelay.js
===================================================================
--- trunk/Open-ILS/web/vandelay/vandelay.js	2009-05-06 17:29:05 UTC (rev 13091)
+++ trunk/Open-ILS/web/vandelay/vandelay.js	2009-05-06 18:18:23 UTC (rev 13092)
@@ -612,6 +612,18 @@
 function buildRecordGrid(type) {
     displayGlobalDiv('vl-queue-div');
 
+    if(type == 'bib') {
+        openils.Util.show('vl-bib-queue-grid-wrapper');
+        openils.Util.hide('vl-auth-queue-grid-wrapper');
+        vlQueueGrid = vlBibQueueGrid;
+        vlQueueGridMenu = vlBibQueueGridMenu;
+    } else {
+        openils.Util.show('vl-auth-queue-grid-wrapper');
+        openils.Util.hide('vl-bib-queue-grid-wrapper');
+        vlQueueGrid = vlAuthQueueGrid;
+        vlQueueGridMenu = vlAuthQueueGridMenu;
+    }
+
     if(valLastQueueType != type) {
         valLastQueueType = type;
         resetVlQueueGridLayout();
@@ -638,21 +650,19 @@
 
     var store = new dojo.data.ItemFileReadStore({data:storeData});
     vlQueueGrid.setStore(store);
-    vlQueueGrid.attr('structure', vlQueueGridLayout);
 
-    /*
     if(vlQueueGridColumePicker[type]) {
         vlQueueGrid.update();
     } else {
-        vlQueueGridColumePicker[type] = 
-            new vlQueueGridMenu.init({
-                grid : vlQueueGrid, 
-                authtoken : authtoken, 
-                persistPrefix : 'vandelay.queue.'+type
-            });
-        vlQueueGridColumePicker[type].load();
+        vlQueueGrid.attr('structure', vlQueueGridLayout);
+        vlQueueGridMenu.init({
+            grid : vlQueueGrid, 
+            authtoken : authtoken, 
+            prefix : 'vandelay.queue.'+type
+        });
+        vlQueueGridMenu.load();
+        vlQueueGridColumePicker[type] = vlQueueGridMenu;
     }
-    */
 }
 
 function vlQueueGridPrevPage() {
@@ -801,7 +811,6 @@
     currentType = dijit.byId('vl-record-type').getValue();
 
     var handleProcessSpool = function() {
-        console.log('records uploaded and spooled');
         if(vlUploadQueueAutoImport.checked) {
             vlImportRecordQueue(currentType, currentQueueId, true,  
                 function() {
@@ -814,20 +823,17 @@
     }
 
     var handleUploadMARC = function(key) {
-        console.log('marc uploaded');
         dojo.style(dojo.byId('vl-upload-status-processing'), 'display', 'block');
         processSpool(key, currentQueueId, currentType, handleProcessSpool);
     };
 
     var handleCreateQueue = function(queue) {
-        console.log('queue created ' + queue.name());
         currentQueueId = queue.id();
         uploadMARC(handleUploadMARC);
     };
     
     if(vlUploadQueueSelector.getValue() && !queueName) {
         currentQueueId = vlUploadQueueSelector.getValue();
-        console.log('adding records to existing queue ' + currentQueueId);
         uploadMARC(handleUploadMARC);
     } else {
         createQueue(queueName, currentType, handleCreateQueue);