From 7c7e9acf9a30bb8b3aef4c56969771c744b7a1f8 Mon Sep 17 00:00:00 2001
From: pines <pines@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Fri, 1 Sep 2006 16:23:39 +0000
Subject: [PATCH] noncat display and sorting

git-svn-id: svn://svn.open-ils.org/ILS/trunk@5835 dcc99617-32d9-48b4-a31d-7c20da2025e4
---
 .../staff_client/server/circ/in_house_use.js  | 18 +++++++++--
 .../server/main/gen_offline_widgets.xul       | 31 +++++++++++++++----
 2 files changed, 41 insertions(+), 8 deletions(-)

diff --git a/Open-ILS/xul/staff_client/server/circ/in_house_use.js b/Open-ILS/xul/staff_client/server/circ/in_house_use.js
index 14d4b65e8d..7fb74823fa 100644
--- a/Open-ILS/xul/staff_client/server/circ/in_house_use.js
+++ b/Open-ILS/xul/staff_client/server/circ/in_house_use.js
@@ -60,11 +60,25 @@ circ.in_house_use.prototype = {
 											function(o) {
 												return util.fm_utils.compare_aou_a_is_b_or_ancestor(o.owning_lib(), obj.data.list.au[0].ws_ou());
 											}
+										).sort(
+
+											function(a,b) {
+												try { 
+													return util.fm_utils.sort_func_aou_by_depth_and_then_string(
+														[ a.owning_lib(), a.name() ],
+														[ b.owning_lib(), b.name() ]
+													);
+												} catch(E) {
+													alert('error in noncat sorting: ' + E);
+													return 0;
+												}
+											}
+
 										),
 										function(o) {
-											return [ o.name(), o.id() ];
+											return [ obj.data.hash.aou[ o.owning_lib() ].shortname() + ' : ' + o.name(), o.id() ];
 										}
-									).sort()
+									)
 								);
 								g.error.sdump('D_TRACE','items = ' + js2JSON(items));
 								util.widgets.remove_children( e );
diff --git a/Open-ILS/xul/staff_client/server/main/gen_offline_widgets.xul b/Open-ILS/xul/staff_client/server/main/gen_offline_widgets.xul
index b23e66d835..38078860a6 100644
--- a/Open-ILS/xul/staff_client/server/main/gen_offline_widgets.xul
+++ b/Open-ILS/xul/staff_client/server/main/gen_offline_widgets.xul
@@ -160,13 +160,32 @@
 		}
 
 		function build_cnct_list() {
+			JSAN.use('util.fm_utils');
 			return [
-				util.functional.map_list( 
-					g.data.list.cnct,
-					function(obj) { return [ 
-						obj.name(), 
-						js2JSON( [ obj.id(), obj.circ_duration() ] )
-					]; }
+				util.functional.map_list(
+					util.functional.filter_list(
+						g.data.list.cnct,
+						function(o) {
+							return util.fm_utils.compare_aou_a_is_b_or_ancestor(o.owning_lib(), g.data.list.au[0].ws_ou());
+						}
+					).sort(
+
+						function(a,b) {
+							try { 
+								return util.fm_utils.sort_func_aou_by_depth_and_then_string(
+									[ a.owning_lib(), a.name() ],
+									[ b.owning_lib(), b.name() ]
+								);
+							} catch(E) {
+								alert('error in noncat sorting: ' + E);
+								return 0;
+							}
+						}
+
+					),
+					function(o) {
+						return [ g.data.hash.aou[ o.owning_lib() ].shortname() + ' : ' + o.name(), js2JSON( [ o.id(), o.circ_duration() ] ) ];
+					}
 				)
 			];
 		}
-- 
2.43.2