From 04c619e88b4dbad80968e72af96a40ffa8e44436 Mon Sep 17 00:00:00 2001
From: erickson <erickson@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Fri, 22 Sep 2006 16:16:13 +0000
Subject: [PATCH] better support for removing items from the "from" clause

git-svn-id: svn://svn.open-ils.org/ILS/trunk@6192 dcc99617-32d9-48b4-a31d-7c20da2025e4
---
 Open-ILS/web/reports/oils_rpt_builder.js | 51 ++++++++++++++++++++++++++------
 Open-ILS/web/reports/oils_rpt_utils.js   |  7 +++++
 2 files changed, 49 insertions(+), 9 deletions(-)

diff --git a/Open-ILS/web/reports/oils_rpt_builder.js b/Open-ILS/web/reports/oils_rpt_builder.js
index 900e3eda9a..cfe6844f9a 100644
--- a/Open-ILS/web/reports/oils_rpt_builder.js
+++ b/Open-ILS/web/reports/oils_rpt_builder.js
@@ -4,6 +4,8 @@
 function oilsInitReportBuilder() {
 	oilsInitReports();
 	oilsReportBuilderReset();
+	DOM.oils_rpt_table.onclick = 
+		function(){hideMe(DOM.oils_rpt_column_editor)};
 	oilsDrawRptTree(
 		function() { 
 			hideMe(DOM.oils_rpt_tree_loading); 
@@ -24,6 +26,7 @@ function oilsReportBuilderReset() {
 	oilsRptResetParams();
 }
 
+
 /* returns just the column name */
 function oilsRptPathCol(path) {
 	var parts = path.split(/-/);
@@ -53,10 +56,7 @@ function oilsRptMakeLabel(path) {
 			if( i == 0 )
 				str += oilsIDL[parts[i]].label;
 		} else {
-			var column = parts[i];
-			var data = oilsIDL[parts[i-1]];
-			var f = grep(data.fields, 
-				function(j){return (j.name == column); })[0];
+			var f = oilsRptFindField(oilsIDL[parts[i-1]], parts[i]);
 			str += ":"+f.label;
 		}
 	}
@@ -171,15 +171,47 @@ function oilsDelSelectedDisplayItems() {
 
 	} else {
 		for( var j = 0; j < list.length; j++ ) 
-			oilsRptPruneFromClause(list[j]);
+			/* if there are no items left in the "select" clause for the given 
+				relation, trim this relation from the "from" clause */
+			if(!grep(oilsRpt.def.select,
+					function(i){ return (i.relation == oilsRptPathRel(list[j])); })) 
+				oilsRptPruneFromClause(oilsRptPathRel(list[j]));
 	}
 
 	oilsRptDebug();
 }
 
 /* for each item in the path list, remove the associated data
-from the "from" clause */
-function oilsRptPruneFromClause(pathlist) {
+	from the "from" clause */
+
+function oilsRptPruneFromClause(relation, node) {
+	_debug("removing relation from 'from' clause " + relation);
+	if(!node) node = oilsRpt.def.from.join;
+	for( var i in node ) {
+		if( node[i].alias == relation ) {
+			if( node[i].join ) {
+				/* if we have subtrees, don't delete our tree node */
+				return false;
+			} else {
+				delete node[i];
+				return true;
+			} 
+		} else {
+			if( node[i].join ) {
+				if( oilsRptPruneFromClause(relation, node[i].join ) ) {
+					if(oilsRptObjectKeys(node[i].join).length == 0) {
+						delete node[i].join;
+						/* if there are no items in the select clause with a relation matching
+							this nodes alias, we can safely remove this node from the tree */
+						if(!grep(oilsRpt.def.select,function(r){return (r.relation==node[i].alias)}))
+							delete node[i];
+						return true;
+					}
+				}
+			}
+		}
+	}
+	return false;
 }
 
 /* adds an item to the display window */
@@ -248,9 +280,10 @@ function oilsRptHideEditorDivs() {
   filter, and aggregate filter picker window
   */
 function oilsRptDrawDataWindow(path) {
-	var col = oilsRptPathCol(path);
-	var cls = oilsRptPathClass(path);
+	var col	= oilsRptPathCol(path);
+	var cls	= oilsRptPathClass(path);
 	var field = grep(oilsIDL[cls].fields, function(f){return (f.name==col);})[0];
+
 	_debug("setting update data window for column "+col+' on class '+cls);
 
 	var div = DOM.oils_rpt_column_editor;
diff --git a/Open-ILS/web/reports/oils_rpt_utils.js b/Open-ILS/web/reports/oils_rpt_utils.js
index c1f966a4f9..9672d9fcc7 100644
--- a/Open-ILS/web/reports/oils_rpt_utils.js
+++ b/Open-ILS/web/reports/oils_rpt_utils.js
@@ -119,3 +119,10 @@ function oilsRptIdObjects(node) {
 		oilsRptIdObjects(children[c]);
 }
 
+
+function oilsRptObjectKeys(obj) {
+	var k = [];
+	for( var i in obj ) k.push(i);
+	return k;
+}
+
-- 
2.11.0