From 7f536f9826c81017473ee5e281dc9a2d6954f473 Mon Sep 17 00:00:00 2001
From: miker <miker@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Fri, 2 Dec 2005 21:25:53 +0000
Subject: [PATCH] libraries are now filtered on id (there are duplicate names,
 such as "Bookmobile")

git-svn-id: svn://svn.open-ils.org/ILS/trunk@2174 dcc99617-32d9-48b4-a31d-7c20da2025e4
---
 Open-ILS/src/reporter/tables.example.xml      | 27 +++++++++----------
 .../templates/widgets/lib-choose.dropdown     |  4 +--
 .../templates/widgets/lib-choose.multiselect  |  4 +--
 3 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/Open-ILS/src/reporter/tables.example.xml b/Open-ILS/src/reporter/tables.example.xml
index a28445e049..c72eff74b2 100644
--- a/Open-ILS/src/reporter/tables.example.xml
+++ b/Open-ILS/src/reporter/tables.example.xml
@@ -110,30 +110,35 @@
 			<link
 			  field="create_date_day"
 			  table="generic_day_series"
+			  hidden="false"
 			  id="copy_create_day"
 			  key="date"
 			  type="has_a"/>
 			<link
 			  field="create_date_hour"
 			  table="generic_hour_series"
+			  hidden="false"
 			  id="copy_create_hour"
 			  key="date_hour"
 			  type="has_a"/>
 			<link
 			  field="edit_date_day"
 			  table="generic_day_series"
+			  hidden="false"
 			  id="copy_edit_day"
 			  key="date"
 			  type="has_a"/>
 			<link
 			  field="edit_date_hour"
 			  table="generic_hour_series"
+			  hidden="false"
 			  id="copy_edit_hour"
 			  key="date_hour"
 			  type="has_a"/>
 			<link
 			  field="owning_lib"
 			  table="org_unit"
+			  hidden="false"
 			  id="copy_owning_lib"
 			  key="id"
 			  type="has_a"/>
@@ -174,14 +179,16 @@
 			<field
 			  name="id"
 			  primary="true"
+			  filterable='true'
+			  widget-family="lib-choose"
 			  create-type="serial"
 			  datatype="int">
-				<label>ID</label>
-				<description>Library ID</description>
+				<label>Unique Library ID</label>
+				<description>Unique Library ID</description>
 			</field>
 			<field
 			  name="name"
-			  widget-family="lib-choose"
+			  widget-family="string-choose"
 			  datatype="text">
 				<label>Name</label>
 				<description>Library Name</description>
@@ -228,12 +235,7 @@
 			<field
 			  name="date"
 			  primary='true'
-			  datatype="text">
-				<label>Date joiner</label>
-				<description>Date joiner</description>
-			</field>
-			<field
-			  name="date_label"
+			  filterable='true'
 			  datatype="timestamptz">
 				<label>Date</label>
 				<description>Date</description>
@@ -250,12 +252,7 @@
 			<field
 			  name="date_hour"
 			  primary='true'
-			  datatype="text">
-				<label>time joiner</label>
-				<description>time joiner</description>
-			</field>
-			<field
-			  name="date_hour_label"
+			  filterable='true'
 			  datatype="timestamptz">
 				<label>Date and Hour</label>
 				<description>Date and Hour</description>
diff --git a/Open-ILS/src/reporter/templates/widgets/lib-choose.dropdown b/Open-ILS/src/reporter/templates/widgets/lib-choose.dropdown
index 4d27612d60..c84eb138cb 100644
--- a/Open-ILS/src/reporter/templates/widgets/lib-choose.dropdown
+++ b/Open-ILS/src/reporter/templates/widgets/lib-choose.dropdown
@@ -32,7 +32,7 @@ WRAPPER select id=input_prefix name=input_prefix onchange='change_hier_' _ table
 	INCLUDE option value='' content='Select One';
 	INCLUDE option value='' content='----------';
 	FOR f = DBI.query(root);
-		INCLUDE option value=f.$fieldname;
+		INCLUDE option value=f.id content=f.name;
 		INCLUDE next_level parent_ou = f.id depth;
 	END;
 END;
@@ -62,7 +62,7 @@ BLOCK next_level;
 			x = x - 1;
 		END;
 
-		INCLUDE option value=f.name content=val _ f.name id='dr_' _ f.id;
+		INCLUDE option value=f.id content=f.name content=val _ f.name id='dr_' _ f.id;
 		INCLUDE next_level parent_ou = f.id;
 	END;
 END;
diff --git a/Open-ILS/src/reporter/templates/widgets/lib-choose.multiselect b/Open-ILS/src/reporter/templates/widgets/lib-choose.multiselect
index 96ae4bf8a7..05c57b6f58 100644
--- a/Open-ILS/src/reporter/templates/widgets/lib-choose.multiselect
+++ b/Open-ILS/src/reporter/templates/widgets/lib-choose.multiselect
@@ -34,7 +34,7 @@ org_unit_type = DBI.tie('actor.org_unit_type', 'id')
 WRAPPER select name=input_prefix multi="multi" onchange='change_multihier_' _ table_alias _ '(this);';
 	depth = 0;
 	FOR f = DBI.query(root);
-		INCLUDE option value=f.$fieldname;
+		INCLUDE option value=f.id content=f.name;
 		INCLUDE next_level parent_ou = f.id depth;
 	END;
 END;
@@ -63,7 +63,7 @@ BLOCK next_level;
 			x = x - 1;
 		END;
 
-		INCLUDE option value=f.name content=val _ f.name id='mh_' _ f.id;
+		INCLUDE option value=f.id content=f.name content=val _ f.name id='mh_' _ f.id;
 		INCLUDE next_level parent_ou = f.id;
 	END;
 END;
-- 
2.43.2