[open-ils-commits] r10713 - in trunk/Open-ILS: src/perlmods/OpenILS/Application web/vandelay

[svn at svn.open-ils.org]

Author: erickson
Date: 2008-09-26 16:19:19 -0400 (Fri, 26 Sep 2008)
New Revision: 10713

Modified:
   trunk/Open-ILS/src/perlmods/OpenILS/Application/Vandelay.pm
   trunk/Open-ILS/web/vandelay/vandelay.js
   trunk/Open-ILS/web/vandelay/vandelay.xml
Log:
added ability to only fetch/dislplay non-imported recs in queue retrieval.  hiding page footer for now, since it seems to be causing probs with the bottom grid scroll

Modified: trunk/Open-ILS/src/perlmods/OpenILS/Application/Vandelay.pm
===================================================================
--- trunk/Open-ILS/src/perlmods/OpenILS/Application/Vandelay.pm	2008-09-26 19:39:57 UTC (rev 10712)
+++ trunk/Open-ILS/src/perlmods/OpenILS/Application/Vandelay.pm	2008-09-26 20:19:19 UTC (rev 10713)
@@ -342,14 +342,16 @@
     my $retrieve = ($type eq 'bib') ? 
         'retrieve_vandelay_queued_bib_record' : 'retrieve_vandelay_queued_authority_record';
 
+    my $filter = ($$options{non_imported}) ? {import_time => undef} : {};
+
     my $record_ids;
     if($self->api_name =~ /matches/) {
         # fetch only matched records
-        $record_ids = queued_records_with_matches($e, $type, $queue_id, $limit, $offset);
+        $record_ids = queued_records_with_matches($e, $type, $queue_id, $limit, $offset, $filter);
     } else {
         # fetch all queue records
         $record_ids = $e->$search([
-                {queue => $queue_id}, 
+                {queue => $queue_id, %$filter}, 
                 {order_by => {$class => 'id'}, limit => $limit, offset => $offset}
             ],
             {idlist => 1}

Modified: trunk/Open-ILS/web/vandelay/vandelay.js
===================================================================
--- trunk/Open-ILS/web/vandelay/vandelay.js	2008-09-26 19:39:57 UTC (rev 10712)
+++ trunk/Open-ILS/web/vandelay/vandelay.js	2008-09-26 20:19:19 UTC (rev 10713)
@@ -266,19 +266,20 @@
     var method = 'open-ils.vandelay.'+type+'_queue.records.retrieve.atomic';
     if(vlQueueGridShowMatches.checked)
         method = method.replace('records', 'records.matches');
+    var params = [authtoken, queueId, {clear_marc: 1, offset: offset, limit: limit}];
 
+    if(vlQueueGridShowNonImport.checked)
+        params[2].non_imported = 1;
+        
+
     var limit = parseInt(vlQueueDisplayLimit.getValue());
     var offset = limit * parseInt(vlQueueDisplayPage.getValue()-1);
 
     fieldmapper.standardRequest(
         ['open-ils.vandelay', method],
         {   async: true,
-            params: [authtoken, queueId, 
-                {   clear_marc: 1, 
-                    offset: offset,
-                    limit: limit
-                }
-            ],
+            params: params,
+
             /* intermittent bug in streaming, multipart requests prevents use of onreponse for now...
             onresponse: function(r) {
                 var rec = r.recv().content();

Modified: trunk/Open-ILS/web/vandelay/vandelay.xml
===================================================================
--- trunk/Open-ILS/web/vandelay/vandelay.xml	2008-09-26 19:39:57 UTC (rev 10712)
+++ trunk/Open-ILS/web/vandelay/vandelay.xml	2008-09-26 20:19:19 UTC (rev 10713)
@@ -173,6 +173,10 @@
                                         <input dojoType='dijit.form.CheckBox' jsId='vlQueueGridShowMatches' checked='checked'/>
                                     </td>
                                     <td class='filter_td' style='padding-left:5px;'>
+                                        Limit to Non-Imported Records 
+                                        <input dojoType='dijit.form.CheckBox' jsId='vlQueueGridShowNonImport' checked='checked'/>
+                                    </td>
+                                    <td class='filter_td' style='padding-left:5px;'>
                                         Results Per Page 
                                         <select style='width:68px;' jsId='vlQueueDisplayLimit' dojoType='dijit.form.FilteringSelect' value='10'>
                                             <option value='10'>10</option>
@@ -403,9 +407,11 @@
 
 	</div>
 
+        <!--
         <div style='text-align:center;width:100%;' dojoType="dijit.layout.ContentPane" layoutAlign='bottom'>
             Powered by Evergreen!
         </div>
+        -->
       </div>
     </body>
 </html>