subtotals for checkout counts

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

diff --git a/Open-ILS/xul/staff_client/server/patron/summary.js b/Open-ILS/xul/staff_client/server/patron/summary.js
index 1ceaf73..5263b87 100644 (file)
--- a/Open-ILS/xul/staff_client/server/patron/summary.js
+++ b/Open-ILS/xul/staff_client/server/patron/summary.js
@@ -143,11 +143,12 @@ patron.summary.prototype = {
                                                                        'FM_CIRC_COUNT_RETRIEVE_VIA_USER',
                                                                        [ ses(), obj.patron.id() ],
                                                                        function(req) {
-                                                                               e.setAttribute('value', req.getResultObject().out       );
-                                                                               if (e2) e2.setAttribute('value', req.getResultObject().overdue  );
-                                                                               if (e3) e3.setAttribute('value', req.getResultObject().claims_returned  );
-                                                                               if (e4) e4.setAttribute('value', req.getResultObject().long_overdue     );
-                                                                               if (e5) e5.setAttribute('value', req.getResultObject().lost     );
+                                                                               var robj = req.getResultObject();
+                                                                               e.setAttribute('value', robj.out + robj.overdue + robj.claims_returned + robj.long_overdue );
+                                                                               if (e2) e2.setAttribute('value', robj.overdue   );
+                                                                               if (e3) e3.setAttribute('value', robj.claims_returned   );
+                                                                               if (e4) e4.setAttribute('value', robj.long_overdue      );
+                                                                               if (e5) e5.setAttribute('value', robj.lost      );
                                                                        }
                                                                );
                                                        };

diff --git a/Open-ILS/xul/staff_client/server/patron/summary_overlay.xul b/Open-ILS/xul/staff_client/server/patron/summary_overlay.xul
index b5c395a..792d21f 100644 (file)
--- a/Open-ILS/xul/staff_client/server/patron/summary_overlay.xul
+++ b/Open-ILS/xul/staff_client/server/patron/summary_overlay.xul
@@ -80,23 +80,24 @@
                        <label id="PatronSummaryStatus_checkouts_label" class="text_left items_out label"
                                value="&staff.patron_display.checkouts.label;" />
                        <label id="patron_checkouts" class="items_out value"/>
-               </row><row>
-                       <label id="PatronSummaryStatus_checkouts_overdue_label" class="text_left items_overdue label"
-                               value="&staff.patron_display.checkouts_overdue.label;" />
-                       <label id="patron_overdue" class="items_overdue value"/>
+               </row>
+               <row>
+                       <label id="PatronSummaryStatus_checkouts_overdue_label" class="text_right items_overdue label"
+                               value="&staff.patron_display.checkouts_overdue.label;" style="background: grey"/>
+                       <label id="patron_overdue" class="items_overdue value" style="background: grey"/>
                </row>
                <row id="pdsgr5">
-                       <label id="PatronSummaryStatus_long_overdue_label" value="Long Overdue:" class="text_left items_long_overdue label"/>
-                       <label id="patron_long_overdue" class="items_long_overdue value"/>
+                       <label id="PatronSummaryStatus_long_overdue_label" value="Long Overdue:" class="text_right items_long_overdue label" style="background: grey"/>
+                       <label id="patron_long_overdue" class="items_long_overdue value" style="background: grey"/>
+               </row>
+               <row id="pdsgr7">
+                       <label id="PatronSummaryStatus_claimed_returned_label" value="Claimed Returned:" class="text_right items_long_overdue label" style="background: grey"/>
+                       <label id="patron_claimed_returned" class="items_claimed_returned value" style="background: grey"/>
                </row>
                <row id="pdsgr6">
                        <label id="PatronSummaryStatus_lost_label" value="Lost:" class="text_left items_lost label"/>
                        <label id="patron_lost" class="items_lost value"/>
                </row>
-               <row id="pdsgr7">
-                       <label id="PatronSummaryStatus_claimed_returned_label" value="Claimed Returned:" class="text_left items_long_overdue label"/>
-                       <label id="patron_claimed_returned" class="items_claimed_returned value"/>
-               </row>
        </rows>
 </grid>