[open-ils-commits] r14833 - tags/rel_1_6_0_0/Open-ILS/web/opac/skin/default/js (erickson)

[svn at svn.open-ils.org]

Author: erickson
Date: 2009-11-08 20:13:30 -0500 (Sun, 08 Nov 2009)
New Revision: 14833

Modified:
   tags/rel_1_6_0_0/Open-ILS/web/opac/skin/default/js/myopac.js
Log:
back-porting 14370:  sort checked out items by due date, oldest first. this brings the items that need the most attention to the top of the list. previously, there was no sorting

Modified: tags/rel_1_6_0_0/Open-ILS/web/opac/skin/default/js/myopac.js
===================================================================
--- tags/rel_1_6_0_0/Open-ILS/web/opac/skin/default/js/myopac.js	2009-11-09 01:12:52 UTC (rev 14832)
+++ tags/rel_1_6_0_0/Open-ILS/web/opac/skin/default/js/myopac.js	2009-11-09 01:13:30 UTC (rev 14833)
@@ -166,19 +166,42 @@
 		return;
 	}
 
+    var totalAsync = checked.overdue.length + checked.out.length;
+    var fetchedCircs = [];
+    var collectCircs = function(r) {
+        var circ = r.getResultObject();
+        circ._od = r.od;
+        fetchedCircs.push(circ);
+        if(fetchedCircs.length < totalAsync) return;
+
+        // sort by due date, oldest to newest
+        fetchedCircs = fetchedCircs.sort(
+            function(a, b) {
+                if(a.due_date() > b.due_date()) return 1;
+                return -1;
+            }
+        )
+
+        dojo.forEach(fetchedCircs, 
+            function(circ) { 
+                myOPACDrawCheckedItem(circ, tbody);
+            }
+        );
+    }
+
 	for( var i = 0; i < checked.overdue.length; i++ ) {
 		var req = new Request(FETCH_CIRC_BY_ID, G.user.session, checked.overdue[i]);
-		req.request.tbody = tbody;
+		//req.request.tbody = tbody;
 		req.request.od = true;
-		req.callback(myOPACDrawCheckedItem);
+		req.callback(collectCircs);
 		req.send();
 	}
 
 
 	for( var i = 0; i < checked.out.length; i++ ) {
 		var req = new Request(FETCH_CIRC_BY_ID, G.user.session, checked.out[i]);
-		req.request.tbody = tbody;
-		req.callback(myOPACDrawCheckedItem);
+		//req.request.tbody = tbody;
+		req.callback(collectCircs);
 		req.send();
 	}
 
@@ -194,13 +217,14 @@
 }
 
 
-function myOPACDrawCheckedItem(r) {
+//function myOPACDrawCheckedItem(r) {
+function myOPACDrawCheckedItem(circ, tbody) {
 
-	var circ = r.getResultObject();
-	var tbody = r.tbody;
+	//var circ = r.getResultObject();
+	//var tbody = r.tbody;
 	var row = checkedRowTemplate.cloneNode(true);
 	row.id = 'myopac_checked_row_ ' + circ.id();
-   row.setAttribute('circid', circ.id());
+    row.setAttribute('circid', circ.id());
 
 	var due = _trimTime(circ.due_date());
 
@@ -209,7 +233,7 @@
 	//var rnlink = $n( row, "myopac_checked_renew_link" );
 
 	//if( r.od ) due = elem('b', {style:'color:red;font-size:110%'},due);
-	if( r.od ) {
+	if( circ._od ) {
       due = elem('b', null, due);
       addCSSClass(due, 'overdue');
    } else {