From: erickson <erickson@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Tue, 3 Oct 2006 02:49:29 +0000 (+0000)
Subject: fixed the "between" param op, made the output display limiter an onchange, and made... 
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=dda76f2b7fee452427e775fb9df9842456b70d37;p=Evergreen.git

fixed the "between" param op, made the output display limiter an onchange, and made it a little less intrusive


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

diff --git a/Open-ILS/web/reports/oils_rpt_folder_window.js b/Open-ILS/web/reports/oils_rpt_folder_window.js
index a0c8473cd3..04673370d1 100644
--- a/Open-ILS/web/reports/oils_rpt_folder_window.js
+++ b/Open-ILS/web/reports/oils_rpt_folder_window.js
@@ -19,11 +19,13 @@ oilsRptFolderWindow.prototype.draw = function() {
 
 	var obj = this;
 	setSelector(DOM.oils_rpt_output_limit_selector, oilsRptOutputLimit);
-	DOM.oils_rpt_output_limit_redraw.onclick = function() {
+
+	DOM.oils_rpt_output_limit_selector.onchange = function() {
 		oilsRptOutputLimit = getSelectorVal(DOM.oils_rpt_output_limit_selector);
 		obj.draw();
 	}
 
+
 	if( this.folderNode.folder.owner().id() == USER.id() && this.type == 'template') 
 		unHideMe(DOM.oils_rpt_folder_window_contents_new_template.parentNode);
 	else hideMe(DOM.oils_rpt_folder_window_contents_new_template.parentNode);
diff --git a/Open-ILS/web/reports/oils_rpt_folder_window.xhtml b/Open-ILS/web/reports/oils_rpt_folder_window.xhtml
index 759d86caad..fbabb1c6cd 100644
--- a/Open-ILS/web/reports/oils_rpt_folder_window.xhtml
+++ b/Open-ILS/web/reports/oils_rpt_folder_window.xhtml
@@ -21,30 +21,28 @@
 					<input type='submit' value='Submit' id='oils_rpt_folder_content_action_go'/>
 				</td>
 			</tr>
+
+			<tr>
+				<td style='text-align:left;'>
+					<div>
+						Limit output to 
+						<select id='oils_rpt_output_limit_selector'>
+							<option value='5'>5</option>
+							<option value='10'>10</option>
+							<option value='25'>25</option>
+							<option value='50'>50</option>
+							<option value=''>All</option>
+						</select>
+					</div>
+				</td>
+			</tr>
+
 			<tr class='oils_rpt_folder_window_contents_row'>
-				<td width='100%' align='center'>
-					<table width='100%'><tbody>
-						<tr>
-							<td align='center'>
-								<h4>Folder Contents</h4>
-								<span style='padding-left: 10px;'>
-									Limit output to 
-									<select id='oils_rpt_output_limit_selector'>
-										<option value='5'>5</option>
-										<option value='10'>10</option>
-										<option value='25'>25</option>
-										<option value='50'>50</option>
-										<option value=''>All</option>
-									</select>
-									rows.
-									<input type='submit' value='Re-Draw' id='oils_rpt_output_limit_redraw'/>
-								</span>
-							</td>
-						</tr>
-						<tr><td><div id='oils_rpt_folder_contents_selector'/></td></tr>
-					</tbody></table>
+				<td width='100%'>
+					<div id='oils_rpt_folder_contents_selector'/>
 				</td>
 			</tr>
+
 		</tbody>
 	</table>
 
diff --git a/Open-ILS/web/reports/oils_rpt_param_editor.js b/Open-ILS/web/reports/oils_rpt_param_editor.js
index 836703eb1c..3c8fd13d68 100644
--- a/Open-ILS/web/reports/oils_rpt_param_editor.js
+++ b/Open-ILS/web/reports/oils_rpt_param_editor.js
@@ -58,6 +58,8 @@ oilsRptParamEditor.prototype.buildWidget = function(param, node) {
 			} else {
 				return new oilsRptInputMultiWidget({node:node});
 			}
+		case 'between':
+			return new oilsRptMultiInputWidget({node:node});
 
 		default:
 			return new oilsRptWidget({node:node});
diff --git a/Open-ILS/web/reports/oils_rpt_report_editor.js b/Open-ILS/web/reports/oils_rpt_report_editor.js
index b9dcb2e11b..9ff5140bdd 100644
--- a/Open-ILS/web/reports/oils_rpt_report_editor.js
+++ b/Open-ILS/web/reports/oils_rpt_report_editor.js
@@ -108,7 +108,7 @@ oilsRptReportEditor.prototype.save = function() {
 	schedule.excel_format((DOM.oils_rpt_format_excel.checked) ? 't' : 'f');
 	schedule.html_format((DOM.oils_rpt_format_html.checked) ? 't' : 'f');
 	schedule.csv_format((DOM.oils_rpt_format_csv.checked) ? 't' : 'f');
-	schedule.chart_pie((DOM.oils_rpt_format_chart_pie.checked) ? 't' : 'f');
+	//schedule.chart_pie((DOM.oils_rpt_format_chart_pie.checked) ? 't' : 'f');
 	schedule.chart_bar((DOM.oils_rpt_format_chart_bar.checked) ? 't' : 'f');
 	schedule.chart_line((DOM.oils_rpt_format_chart_line.checked) ? 't' : 'f');
 
@@ -116,6 +116,8 @@ oilsRptReportEditor.prototype.save = function() {
 	debugFMObject(report);
 	debugFMObject(schedule);
 
+	//return;
+
 	var req = new Request(OILS_RPT_CREATE_REPORT, SESSION, report, schedule );
 	req.callback(
 		function(r) {
diff --git a/Open-ILS/web/reports/oils_rpt_widget.js b/Open-ILS/web/reports/oils_rpt_widget.js
index 201099efd7..ebcba85eb9 100644
--- a/Open-ILS/web/reports/oils_rpt_widget.js
+++ b/Open-ILS/web/reports/oils_rpt_widget.js
@@ -38,20 +38,21 @@ oilsRptMultiInputWidget.prototype.initInputWidget = function(args) {
 	this.count = (args.count) ? args.count : 2;
 	this.dest = [];
 	for( var i = 0; i < this.count; i++ )
-		this.dest.push(elem('input',{type:'text'}));
+		this.dest.push(elem('input',{type:'text',size:10}));
 }
 
 oilsRptMultiInputWidget.prototype.getValue = function() {
 	var vals = [];
 	for( var i = 0; i < this.dest.length; i++ )
-		vals.push(this.dest.value);
+		vals.push(this.dest[i].value);
 	return vals;
 }
 
 oilsRptMultiInputWidget.prototype.draw = function() {
 	removeChildren(this.node);
 	for( var i = 0; i < this.dest.length; i++ ) {
-		this.node.appendChild(this.label[i]);
+		if( this.label )
+			this.node.appendChild(this.label[i]);
 		this.node.appendChild(this.dest[i]);
 	}
 }