Changeset 9427

Timestamp:

04/22/08 14:00:31 (6 months ago)

Author:

erickson

Message:

added support for defining pivot data and label columns

Location:

branches/rel_1_2/Open-ILS/web/reports

Files:

• oils_rpt_editor.xhtml (modified) (1 diff)
• oils_rpt_report_editor.js (modified) (2 diffs)

branches/rel_1_2/Open-ILS/web/reports/oils_rpt_editor.xhtml

@@ -35 +35 @@
                         <tr>
                                 <th>Report Columns:</th>
-                                <td><b id='oils_rpt_report_editor_cols'/></td>
-                        </tr>
+                                <td nowrap='nowrap'><b id='oils_rpt_report_editor_cols'/></td>
+                        </tr>
+                        <tr class='hide_me' id='oils_rpt_editor_pivot_label_row'>
+                                <th>Pivot Label Column:</th>
+                                <td>
+                    <select id='oils_rpt_editor_pivot_label'>
+                        <option selected='selected' value=''> -- Select One (optional) -- </option>
+                    </select>
+                </td>
+                        </tr>
+                        <tr class='hide_me' id='oils_rpt_editor_pivot_data_row'>
+                                <th>Pivot Data Column:</th>
+                                <td>
+                    <select id='oils_rpt_editor_pivot_data'>
+                    </select>
+                </td>
+                        </tr>
+
                         <!--
                         <tr><td colspan='2'><hr/></td></tr>

branches/rel_1_2/Open-ILS/web/reports/oils_rpt_report_editor.js

@@ -21 +21 @@
                 }
         );
+
+/*
+oils_rpt_editor_pivot_label
+oils_rpt_editor_pivot_data
+*/
+
+    var hasAgg = false;
+    iterate(rptObject.def.select, 
+        function(i) {
+            if(OILS_RPT_TRANSFORMS[i.column.transform].aggregate) 
+                hasAgg = true; 
+        }
+    );
+
+    while(DOM.oils_rpt_editor_pivot_label.getElementsByTagName('option').length > 1)
+        DOM.oils_rpt_editor_pivot_label.removeChild(DOM.oils_rpt_editor_pivot_label.lastChild);
+
+    while(DOM.oils_rpt_editor_pivot_data.lastChild)
+        DOM.oils_rpt_editor_pivot_data.removeChild(DOM.oils_rpt_editor_pivot_data.lastChild);
+
+    if(hasAgg) {
+        unHideMe(DOM.oils_rpt_editor_pivot_label_row);
+        unHideMe(DOM.oils_rpt_editor_pivot_data_row);
+
+        for(var i in rptObject.def.select) {
+            var col = rptObject.def.select[i];
+            if(OILS_RPT_TRANSFORMS[col.column.transform].aggregate) 
+               insertSelectorVal(DOM.oils_rpt_editor_pivot_data, -1, col.alias, parseInt(i)+1);
+            else
+               insertSelectorVal(DOM.oils_rpt_editor_pivot_label, -1, col.alias, parseInt(i)+1);
+        }
+
+    } else {
+        hideMe(DOM.oils_rpt_editor_pivot_label_row);
+        hideMe(DOM.oils_rpt_editor_pivot_data_row);
+    }
+ 
 
         if( rpt ) {
@@ -102 +139 @@
                 data[par.key] = val;
         }
+
+    if(getSelectorVal(DOM.oils_rpt_editor_pivot_data)) {
+        data.__pivot_label = getSelectorVal(DOM.oils_rpt_editor_pivot_label);
+        data.__pivot_data = getSelectorVal(DOM.oils_rpt_editor_pivot_data);
+    }
+
 
         data = js2JSON(data);