From: phasefx <phasefx@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Mon, 31 Jul 2006 21:57:46 +0000 (+0000)
Subject: items out items in
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=c53afa3d84a5971c4e076051d03aa99d60c7cfbb;p=Evergreen.git

items out items in


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

diff --git a/Open-ILS/xul/staff_client/chrome/content/main/constants.js b/Open-ILS/xul/staff_client/chrome/content/main/constants.js
index 982ccc94c7..25ea825989 100644
--- a/Open-ILS/xul/staff_client/chrome/content/main/constants.js
+++ b/Open-ILS/xul/staff_client/chrome/content/main/constants.js
@@ -5,7 +5,6 @@ const api = {
 	'AUTH_DELETE' : { 'app' : 'open-ils.auth', 'method' : 'open-ils.auth.session.delete' },
 	'AUTH_WORKSTATION' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.workstation.register' },
 	'BILL_PAY' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.money.payment' },
-	'BLOB_CHECKOUTS_RETRIEVE' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.actor.user.checked_out' },
 	'BLOB_MARC_CALLNUMBERS_RETRIEVE' : { 'app' : 'open-ils.cat', 'method' : 'open-ils.cat.biblio.record.marc_cn.retrieve' },
 	'BLOB_MOBTS_CIRC_MVR_HAVING_BALANCE' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.transactions.have_balance.fleshed' },
 	'BLOB_MOBTS_CIRC_MVR_OPEN' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.transactions.fleshed' },
@@ -79,6 +78,7 @@ const api = {
 	'FM_CCS_RETRIEVE' : { 'app' : 'open-ils.search', 'method' : 'open-ils.search.config.copy_status.retrieve.all' },
 	'FM_CIRC_RETRIEVE_VIA_ID' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.retrieve' },
 	/*'FM_CIRC_RETRIEVE_VIA_USER' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.actor.user.checked_out.slim' },*/
+	'FM_CIRC_IN_WITH_FINES_VIA_USER' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.checked_in_with_fines' },
 	'FM_CIRC_RETRIEVE_VIA_USER' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.checked_out' },
 	'FM_CIRC_RETRIEVE_VIA_COPY' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.copy_checkout_history.retrieve' },
 	/*'FM_CIRC_COUNT_RETRIEVE_VIA_USER' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.checked_out.count' },*/
diff --git a/Open-ILS/xul/staff_client/server/patron/items.js b/Open-ILS/xul/staff_client/server/patron/items.js
index 1874f5d326..6a04837739 100644
--- a/Open-ILS/xul/staff_client/server/patron/items.js
+++ b/Open-ILS/xul/staff_client/server/patron/items.js
@@ -478,21 +478,32 @@ patron.items.prototype = {
 		if (window.xulG && window.xulG.checkouts) {
 			obj.checkouts = window.xulG.checkouts;
 		} else {
-			var robj = obj.network.request(
-				api.FM_CIRC_RETRIEVE_VIA_USER.app,
-				api.FM_CIRC_RETRIEVE_VIA_USER.method,
+			obj.checkouts = [];
+			obj.checkouts2 = [];
+			var robj = obj.network.simple_request(
+				'FM_CIRC_RETRIEVE_VIA_USER',
 				[ ses(), obj.patron_id ]
 			);
 			if (typeof robj.ilsevent!='undefined') {
 				obj.error.standard_unexpected_error_alert('Error retrieving circulations.',E);
+			} else {
+				obj.checkouts = obj.checkouts.concat( robj.overdue );
+				obj.checkouts = obj.checkouts.concat( robj.out );
+				obj.checkouts2 = obj.checkouts2.concat( robj.lost );
+				obj.checkouts2 = obj.checkouts2.concat( robj.claims_returned );
+				obj.checkouts2 = obj.checkouts2.concat( robj.long_overdue );
+			}
+			var robj = obj.network.simple_request(
+				'FM_CIRC_IN_WITH_FINES_VIA_USER',
+				[ ses(), obj.patron_id ]
+			);
+			if (typeof robj.ilsevent!='undefined') {
+				obj.error.standard_unexpected_error_alert('Error retrieving circulations.',E);
+			} else {
+				obj.checkouts2 = obj.checkouts2.concat( robj.lost );
+				obj.checkouts2 = obj.checkouts2.concat( robj.claims_returned );
+				obj.checkouts2 = obj.checkouts2.concat( robj.long_overdue );
 			}
-			obj.checkouts = [];
-			obj.checkouts2 = [];
-			obj.checkouts = obj.checkouts.concat( robj.long_overdue );
-			obj.checkouts = obj.checkouts.concat( robj.overdue );
-			obj.checkouts2 = obj.checkouts2.concat( robj.claims_returned );
-			obj.checkouts2 = obj.checkouts2.concat( robj.lost );
-			obj.checkouts = obj.checkouts.concat( robj.out );
 		}
 
 		function gen_list_append(circ_id,which_list) {
diff --git a/Open-ILS/xul/staff_client/server/patron/items_overlay.xul b/Open-ILS/xul/staff_client/server/patron/items_overlay.xul
index d6b7b409d4..34ae66b5b3 100644
--- a/Open-ILS/xul/staff_client/server/patron/items_overlay.xul
+++ b/Open-ILS/xul/staff_client/server/patron/items_overlay.xul
@@ -49,7 +49,7 @@
 	</groupbox>
 	<splitter><grippy/></splitter>
 	<groupbox flex="1">
-		<caption label="Lost / Claimed Returned" />
+		<caption label="Lost / Claimed Returned / Long Overdue" />
 		<vbox flex="0">
 			<hbox id="items_top_ui2" />
 		</vbox>