From: erickson <erickson@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Tue, 12 May 2009 17:02:48 +0000 (+0000)
Subject: pile of dojo-1.3 compability fixes.  more to come
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=d7e97695526b78a9467b931b099c4a92583432eb;p=contrib%2FConifer.git

pile of dojo-1.3 compability fixes.  more to come

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

diff --git a/Open-ILS/web/js/ui/default/vandelay/vandelay.js b/Open-ILS/web/js/ui/default/vandelay/vandelay.js
index 5a8ed06315..347463b28c 100644
--- a/Open-ILS/web/js/ui/default/vandelay/vandelay.js
+++ b/Open-ILS/web/js/ui/default/vandelay/vandelay.js
@@ -516,12 +516,18 @@ function getRecAttrFromCode(rec, attrCode) {
 }
 
 function vlGetViewMatches(rowIdx, item) {
-    if(!item) return '';
-    var id = this.grid.store.getValue(item, 'id');
-    var rec = queuedRecordsMap[id];
-    if(rec.matches().length > 0)
-        return this.value.replace('RECID', id);
-    return '';
+    if(item) {
+        var id = this.grid.store.getValue(item, 'id');
+        var rec = queuedRecordsMap[id];
+        if(rec.matches().length > 0)
+            return id;
+    }
+    return -1
+}
+
+function vlFormatViewMatches(id) {
+    if(id == -1) return '';
+    return '<a href="javascript:void(0);" onclick="vlLoadMatchUI(' + id + ');">' + this.name + '</a>';
 }
 
 function getAttrValue(rowIdx, item) {
@@ -554,15 +560,27 @@ function vlGetCreator(rowIdx, item) {
 }
 
 function vlGetViewMARC(rowIdx, item) {
-    if(!item) return '';
-    return this.value.replace('RECID', this.grid.store.getValue(item, 'id'));
+    return item && this.grid.store.getValue(item, 'id');
+}
+
+function vlFormatViewMARC(id) {
+    return '<a href="javascript:void(0);" onclick="vlLoadMARCHtml(' + id + ', false, '+
+        'function(){displayGlobalDiv(\'vl-queue-div\');});">' + this.name + '</a>';
 }
 
 function vlGetOverlayTargetSelector(rowIdx, item) {
-    if(!item) return '';
-    var _id = this.grid.store.getValue(item, '_id');
-    var id = this.grid.store.getValue(item, 'id');
-    var value = this.value.replace(/GRIDID/g, _id);
+    if(!item) return;
+    return this.grid.store.getValue(item, '_id') + ':' + this.grid.store.getValue(item, 'id');
+}
+
+function vlFormatOverlayTargetSelector(val) {
+    if(!val) return '';
+    var parts = val.split(':');
+    var _id = parts[0];
+    var id = parts[1];
+    var value = '<input type="checkbox" name="vl-overlay-target-RECID" '+
+        'onclick="vlHandleOverlayTargetSelected(ID, GRIDID);" gridid="GRIDID" match="ID"/>';
+    value = value.replace(/GRIDID/g, _id);
     value = value.replace(/RECID/g, currentImportRecId);
     value = value.replace(/ID/g, id);
     if(_id == currentOverlayRecordsMapGid[currentImportRecId])
@@ -570,6 +588,7 @@ function vlGetOverlayTargetSelector(rowIdx, item) {
     return value;
 }
 
+
 /**
   * see if the user has enabled overlays for the current match set and, 
   * if so, map the current import record to the overlay target.
@@ -603,6 +622,7 @@ function vlHandleOverlayTargetSelected(recId, gridId) {
 }
 
 var valLastQueueType = null;
+var vlQueueGridLayout = null;
 function buildRecordGrid(type) {
     displayGlobalDiv('vl-queue-div');
 
@@ -618,9 +638,11 @@ function buildRecordGrid(type) {
         vlQueueGridMenu = vlAuthQueueGridMenu;
     }
 
+
     if(valLastQueueType != type) {
         valLastQueueType = type;
-        resetVlQueueGridLayout();
+        //resetVlQueueGridLayout();
+        vlQueueGridLayout = vlQueueGrid.attr('structure');
         var defs = (type == 'bib') ? bibAttrDefs : authAttrDefs;
         attrDefMap[type] = {};
         for(var i = 0; i < defs.length; i++) {
@@ -636,6 +658,12 @@ function buildRecordGrid(type) {
         }
     }
 
+    dojo.forEach(vlQueueGridLayout[0].cells[0], 
+        function(cell) { 
+            if(cell.field.match(/^\+/)) cell.nonSelectable=true;
+        }
+    );
+
     var storeData;
     if(type == 'bib')
         storeData = vqbr.toStoreData(queuedRecords);
@@ -688,8 +716,10 @@ function vlDeleteQueue(type, queueId, onload) {
 
 
 function vlQueueGridDrawSelectBox(rowIdx, item) {
-    if(!item) return '';
-    var id = this.grid.store.getValue(item, 'id');
+    return item &&  this.grid.store.getValue(item, 'id');
+}
+
+function vlQueueGridFormatSelectBox(id) {
     var domId = 'vl-record-list-selected-' + id;
     selectableGridRecords[domId] = id;
     return "<div><input type='checkbox' id='"+domId+"'/></div>";
diff --git a/Open-ILS/web/templates/default/vandelay/inc/matches.tt2 b/Open-ILS/web/templates/default/vandelay/inc/matches.tt2
index cead655c3a..3c43bbb716 100644
--- a/Open-ILS/web/templates/default/vandelay/inc/matches.tt2
+++ b/Open-ILS/web/templates/default/vandelay/inc/matches.tt2
@@ -7,8 +7,11 @@
                 {
                     name: '&vandelay.overlay.target;', 
                     get: vlGetOverlayTargetSelector,
+                    formatter : vlFormatOverlayTargetSelector,
+                    /*
                     value: '&lt;input type="checkbox" name="vl-overlay-target-RECID" '+
                         'onclick="vlHandleOverlayTargetSelected(ID, GRIDID);" gridid="GRIDID" match="ID"/>'
+                        */
                 },
                 {name:'&vandelay.source.match.point;', field:'src_matchpoint'},
                 {name:'&vandelay.dest.match.point;', field:'dest_matchpoint'},
diff --git a/Open-ILS/web/templates/default/vandelay/inc/queue.tt2 b/Open-ILS/web/templates/default/vandelay/inc/queue.tt2
index 4c35d5af85..64f483ec9d 100644
--- a/Open-ILS/web/templates/default/vandelay/inc/queue.tt2
+++ b/Open-ILS/web/templates/default/vandelay/inc/queue.tt2
@@ -1,4 +1,4 @@
-<table class='wide'>
+<table class='wide' dojoType="dijit.layout.ContentPane" layoutAlign='client'>
     <tr>
         <td align='left'>
             <h1>&vandelay.record.queue; <span style='font-style:italic;' id='vl-queue-summary-name'/></h1><br/>
@@ -9,37 +9,9 @@
         </td>
     </tr>
 </table>
-<script>
-    var vlQueueGridLayout;
-    function resetVlQueueGridLayout() {
-        vlQueueGridLayout = [{
-            cells : [[
-                {
-                    name: '&lt;input id="vl-queue-grid-row-selector" type="checkbox" onclick="vlToggleQueueGridSelect();"/>', 
-                    get: vlQueueGridDrawSelectBox, 
-                    styles : 'text-align: center;',
-                    nonSelectable : true
-                }, {   
-                    name: '&vandelay.view.marc;', 
-                    get: vlGetViewMARC, styles : 'text-align: center;',
-                    value: '&lt;a href="javascript:void(0);" onclick="vlLoadMARCHtml(RECID, false, '+
-                        'function(){displayGlobalDiv(\'vl-queue-div\');});">&vandelay.view.marc;&lt;/a>',
-                    nonSelectable : true
-                }, {   
-                    name: '&vandelay.matches;', 
-                    get: vlGetViewMatches, styles : 'text-align: center;',
-                    value:'&lt;a href="javascript:void(0);" onclick="vlLoadMatchUI(RECID);">&vandelay.matches;&lt;/a>',
-                    nonSelectable : true
-                }, {
-                    name: '&vandelay.import.time;', field:'import_time',  styles : 'text-align: center;',
-                    get:vlGetDateTimeField, 
-                }
-            ]]
-        }];
-    }
-</script>
-<div id='vl-queue-div-grid' class='tall' dojoType="dijit.layout.ContentPane" layoutAlign='client'>
 
+<br/>
+<div id='vl-queue-div-grid' class='tall' dojoType="dijit.layout.ContentPane" layoutAlign='client'>
     <!-- queue grid navigation row -->
     <div dojoType="dijit.layout.ContentPane" layoutAlign='client'>
         <table width='100%' style='margin-bottom:0px;'>
@@ -109,24 +81,83 @@
         </table>
     </div>
 
-    <!-- Queue Grid -->
+    <!-- Bib Queue Grid -->
     <div class='hidden tall' 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 class='tall' dojoType="dijit.layout.ContentPane" layoutAlign='client'>
-            <table dojoType='dojox.grid.DataGrid' jsId='vlBibQueueGrid' query="{id:'*'}" headerMenu='vlBibQueueGridMenu'> 
+        <div class='tall' dojoType="dijit.layout.ContentPane" layoutAlign='client' style='border:1px solid #FFF;'>
+            <table dojoType='dojox.grid.DataGrid' jsId='vlBibQueueGrid' query="{import_time:'*'}" headerMenu='vlBibQueueGridMenu' style='height:600px;'>
+                <thead>
+                    <tr>
+                        <th 
+                            field='+row_selector'
+                            get='vlQueueGridDrawSelectBox'
+                            formatter='vlQueueGridFormatSelectBox'
+                            styles='text-align: center;'
+                            nonSelectable='true'>
+                                <input id="vl-queue-grid-row-selector" type="checkbox" onclick="vlToggleQueueGridSelect();"></input>
+                        </th>
+                        <th
+                            field='+view_marc'
+                            get='vlGetViewMARC'
+                            formatter='vlFormatViewMARC' 
+                            styles='text-align: center;'
+                            nonSelectable='true'>&vandelay.view.marc;</th>
+                        <th
+                            field='+get_matches'
+                            get='vlGetViewMatches'
+                            formatter='vlFormatViewMatches'
+                            styles='text-align: center;'
+                            nonSelectable='true'>&vandelay.matches;</th>
+                        <th
+                            field='import_time'
+                            styles='text-align: center;'
+                            get='vlGetDateTimeField'>&vandelay.import.time;</th>
+                    </tr>
+                </thead>
             </table>
         </div>
     </div>
+
+    <!-- Auth Queue Grid -->
     <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 class='tall' dojoType="dijit.layout.ContentPane" layoutAlign='client'>
             <table dojoType='dojox.grid.DataGrid' jsId='vlAuthQueueGrid' query="{id:'*'}" headerMenu='vlAuthQueueGridMenu'> 
+                <thead>
+                    <tr>
+                        <th 
+                            field='+row_selector'
+                            get='vlQueueGridDrawSelectBox'
+                            formatter='vlQueueGridFormatSelectBox'
+                            styles='text-align: center;'
+                            nonSelectable='true'>
+                                <input id="vl-queue-grid-row-selector" type="checkbox" onclick="vlToggleQueueGridSelect();"></input>
+                        </th>
+                        <th
+                            field='+view_marc'
+                            get='vlGetViewMARC'
+                            formatter='vlFormatViewMARC' 
+                            styles='text-align: center;'
+                            nonSelectable='true'>&vandelay.view.marc;</th>
+                        <th
+                            field='+get_matches'
+                            get='vlGetViewMatches'
+                            formatter='vlFormatViewMatches'
+                            styles='text-align: center;'
+                            nonSelectable='true'>&vandelay.matches;</th>
+                        <th
+                            field='import_time'
+                            styles='text-align: center;'
+                            get='vlGetDateTimeField'>&vandelay.import.time;</th>
+                    </tr>
+                </thead>
             </table>
         </div>
     </div>
+
 </div>