From: erickson <erickson@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Thu, 5 Oct 2006 21:35:31 +0000 (+0000)
Subject: added move up/down buttons to display items for basic sorting
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=0424ed1d8a7c15c72a4f403b163cbaec9d91d418;p=evergreen%2Fpines.git

added move up/down buttons to display items for basic sorting


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

diff --git a/Open-ILS/web/reports/oils_rpt_builder.js b/Open-ILS/web/reports/oils_rpt_builder.js
index 6691099cc2..9f39ba9ebc 100644
--- a/Open-ILS/web/reports/oils_rpt_builder.js
+++ b/Open-ILS/web/reports/oils_rpt_builder.js
@@ -179,11 +179,59 @@ function oilsRptBuildFromClause(path) {
 	return obj;
 }
 
+function oilsMoveUpDisplayItems() {
+	var sel = oilsRptDisplaySelector;
+	var idx = sel.selectedIndex;
+	if( idx == 0 ) return;
+	var opt = sel.options[idx];
+	sel.options[idx] = null;
+	idx--;
+	var val = opt.getAttribute('value');
+	insertSelectorVal(sel, idx, opt.innerHTML, val);
+	sel.options[idx].selected = true;
+
+	var arr = oilsRpt.def.select;
+	for( var i = 0; i < arr.length; i++ ) {
+		if( arr[i].path == val ) {
+			var other = arr[i-1];
+			arr[i-1] = arr[i];
+			arr[i] = other;
+			break;
+		}
+	}
+	oilsRptDebug();
+}
+
+function oilsMoveDownDisplayItems() {
+	var sel = oilsRptDisplaySelector;
+	var idx = sel.selectedIndex;
+	if( idx == sel.options.length - 1 ) return;
+	var opt = sel.options[idx];
+	sel.options[idx] = null;
+	idx++;
+	var val = opt.getAttribute('value');
+	insertSelectorVal(sel, idx, opt.innerHTML, val);
+	sel.options[idx].selected = true;
+
+	var arr = oilsRpt.def.select;
+	for( var i = 0; i < arr.length; i++ ) {
+		if( arr[i].path == val ) {
+			var other = arr[i+1];
+			arr[i+1] = arr[i];
+			arr[i] = other;
+			break;
+		}
+	}
+	oilsRptDebug();
+}
+
 
 /* removes a specific item from the display window */
+/*
 function oilsDelDisplayItem(val) {
 	oilsDelSelectorItem(oilsRptDisplaySelector, val);
 }
+*/
 
 /* removes selected items from the display window */
 function oilsDelSelectedDisplayItems() {
@@ -573,12 +621,14 @@ function oilsRptSetDataWindowActions(div) {
 	DOM.oils_rpt_agg_filter_tab.onclick = 
 		function(){oilsRptHideEditorDivs();unHideMe(DOM.oils_rpt_agg_filter_div)};
 
+	/*
 	DOM.oils_rpt_order_by_tab.onclick = 
 		function(){
 			oilsRptHideEditorDivs();
 			oilsRptDrawOrderByWindow();
 			unHideMe(DOM.oils_rpt_order_by_div);
 			};
+			*/
 
 	DOM.oils_rpt_tform_tab.onclick();
 	DOM.oils_rpt_column_editor_close_button.onclick = function(){hideMe(div);};
diff --git a/Open-ILS/web/reports/oils_rpt_builder.xhtml b/Open-ILS/web/reports/oils_rpt_builder.xhtml
index 0f5c4bde92..73f6060570 100644
--- a/Open-ILS/web/reports/oils_rpt_builder.xhtml
+++ b/Open-ILS/web/reports/oils_rpt_builder.xhtml
@@ -56,6 +56,8 @@
 							<div class='oils_rpt_info_item oils_rpt_info_title'>Template Display Items</div>
 							<select id='oils_rpt_display_selector' class='oils_rpt_info_item oils_rpt_info_selector' multiple='multiple'/>
 							<button onclick='oilsDelSelectedDisplayItems();'><u>X</u> Remove Selected</button>
+							<button onclick='oilsMoveUpDisplayItems();'>Move &uarr;</button>
+							<button onclick='oilsMoveDownDisplayItems();'>Move &darr;</button>
 						</div>
 						<div class='oils_rpt_info_div'>
 							<div class='oils_rpt_info_item oils_rpt_info_title'>Template Filters</div>
@@ -81,7 +83,9 @@
 					<td width='25%'><a id='oils_rpt_tform_tab' href='javascript:void(0);'>Display Items</a></td>
 					<td width='25%'><a id='oils_rpt_filter_tab' href='javascript:void(0);'>Filters</a></td>
 					<td width='25%'><a id='oils_rpt_agg_filter_tab' href='javascript:void(0);'>Aggregate Filters</a></td>
+					<!--
 					<td width='25%'><a id='oils_rpt_order_by_tab' href='javascript:void(0);'>Column Sorting</a></td>
+					-->
 				</tr>
 			</tbody></table>
 
diff --git a/Open-ILS/web/reports/oils_rpt_widget.js b/Open-ILS/web/reports/oils_rpt_widget.js
index baf4372f24..44f6965d77 100644
--- a/Open-ILS/web/reports/oils_rpt_widget.js
+++ b/Open-ILS/web/reports/oils_rpt_widget.js
@@ -602,6 +602,10 @@ oilsRptTruncPicker.prototype.getDisplayValue = function() {
 }
 
 
+/* --------------------------------------------------------------------- 
+	Atomic remote object picker
+	--------------------------------------------------------------------- */
+