added the beginnings of filter support

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

diff --git a/Open-ILS/web/reports/oils_rpt.css b/Open-ILS/web/reports/oils_rpt.css
index 0c332da..12fa6c5 100644 (file)
--- a/Open-ILS/web/reports/oils_rpt.css
+++ b/Open-ILS/web/reports/oils_rpt.css
@@ -43,7 +43,7 @@ table { border-collapse: collapse; }
 }
 
 .oils_rpt_info_item {
-       width: 270px;
+       width: 290px;
 }
 
 .oils_rpt_info_title {
@@ -54,17 +54,16 @@ table { border-collapse: collapse; }
 
 .oils_rpt_info_selector {
        border: 1px solid blue; 
-       /*background: #E0F0E0;*/
        background: #E0F0F0; 
-       min-height: 130px;
-       max-height: 240px;
+       min-height: 150px;
+       max-height: 290px;
        overflow: scroll;
        font-size: 8pt;
 }
 
 .oils_rpt_info_div { 
        text-align: center; 
-       width: 280px; 
+       width: 300px; 
        padding-left: 10px; 
        padding: 10px;
        border-left: 2px solid #E0E0E0; 
@@ -123,7 +122,7 @@ button {
        border-top: 2px solid #E0E0E0;
 }
 
-.oils_rpt_tform_window {
+.oils_rpt_field_editor_window {
        margin: 5px;    
        text-align: left;
        padding: 5px;
@@ -139,7 +138,7 @@ button {
        background: red;
 }
 
-#oils_rpt_tform_tbody td {
+.oils_rpt_editor_window_tbody td {
        border-bottom: 1px solid #A0A0A0;
        padding: 4px;
 }

diff --git a/Open-ILS/web/reports/oils_rpt_builder.js b/Open-ILS/web/reports/oils_rpt_builder.js
index cc5f8c7..8e34acf 100644 (file)
--- a/Open-ILS/web/reports/oils_rpt_builder.js
+++ b/Open-ILS/web/reports/oils_rpt_builder.js
@@ -284,6 +284,8 @@ function oilsRptDrawDataWindow(path) {
        var cls = oilsRptPathClass(path);
        var field = grep(oilsIDL[cls].fields, function(f){return (f.name==col);})[0];
 
+       appendClear(DOM.oils_rpt_editor_window_label, text(oilsRptMakeLabel(path)));
+
        _debug("setting update data window for column "+col+' on class '+cls);
 
        var div = DOM.oils_rpt_column_editor;
@@ -318,7 +320,6 @@ function oilsRptDrawDataWindow(path) {
 
 /* draws the transform window */
 function oilsRptDrawTransformWindow(path, col, cls, field) {
-       appendClear(DOM.oils_rpt_tform_label, text(oilsRptMakeLabel(path)));
        DOM.oils_rpt_tform_label_input.value = oilsRptMakeLabel(path);
        var dtype = field.datatype;
 

diff --git a/Open-ILS/web/reports/oils_rpt_builder.xhtml b/Open-ILS/web/reports/oils_rpt_builder.xhtml
index 8e41c59..cb1f307 100644 (file)
--- a/Open-ILS/web/reports/oils_rpt_builder.xhtml
+++ b/Open-ILS/web/reports/oils_rpt_builder.xhtml
@@ -95,16 +95,20 @@
 
                <div id='oils_rpt_column_editor' class='floaty hide_me'>
 
-                       <table id='oils_rpt_editor_tab_table'><tbody><tr>
-                               <td width='33%'><a id='oils_rpt_tform_tab' href='javascript:void(0);'>Display Items and Transforms</a></td>
-                               <td width='33%'><a id='oils_rpt_filter_tab' href='javascript:void(0);'>Filters</a></td>
-                               <td width='33%'><a id='oils_rpt_agg_filter_tab' href='javascript:void(0);'>Aggregate Filters</a></td>
-                       </tr></tbody></table>
+                       <table id='oils_rpt_editor_tab_table'><tbody>
+                               <tr>
+                                       <td width='33%'><a id='oils_rpt_tform_tab' href='javascript:void(0);'>Display Items</a></td>
+                                       <td width='33%'><a id='oils_rpt_filter_tab' href='javascript:void(0);'>Filters</a></td>
+                                       <td width='33%'><a id='oils_rpt_agg_filter_tab' href='javascript:void(0);'>Aggregate Filters</a></td>
+                               </tr>
+                       </tbody></table>
 
+                       <div style='margin-bottom: 10px;'>
+                               <b style='padding-right: 15px;' id='oils_rpt_editor_window_label'/>
+                       </div>
                        <div id='oils_rpt_tform_div'>
-                               <b style='padding-right: 15px;' id='oils_rpt_tform_label'/>
                                <input size='28' id='oils_rpt_tform_label_input'/>
-                               <div class='oils_rpt_tform_window'>
+                               <div class='oils_rpt_field_editor_window'>
                                        <div style='margin-bottom: 10px;'>Select how this field should be displayed:</div>
                                        <!--#include virtual="oils_rpt_tform_table.xhtml"-->
                                </div>
@@ -113,11 +117,15 @@
                        </div>
 
                        <div id='oils_rpt_filter_div' class='hide_me'>
-                               <button id='oils_rpt_filter_submit'>Add Item</button>
+                               <div class='oils_rpt_field_editor_window'>
+                                       <div style='margin-bottom: 10px;'>Select what filter should be applied to this field:</div>
+                                       <!--#include virtual="oils_rpt_filter_table.xhtml"-->
+                               </div>
+                               <button id='oils_rpt_filter_submit'>Create Filter</button>
                        </div>
 
                        <div id='oils_rpt_agg_filter_div' class='hide_me'>
-                               <button id='oils_rpt_agg_filter_submit'>Add Item</button>
+                               <button id='oils_rpt_agg_filter_submit'>Create Aggregate Filter</button>
                        </div>
 
                        <div id='oils_rpt_column_editor_close_div'>

diff --git a/Open-ILS/web/reports/oils_rpt_tform_table.xhtml b/Open-ILS/web/reports/oils_rpt_tform_table.xhtml
index 46ec880..b81f012 100644 (file)
--- a/Open-ILS/web/reports/oils_rpt_tform_table.xhtml
+++ b/Open-ILS/web/reports/oils_rpt_tform_table.xhtml
@@ -1,5 +1,5 @@
 <table>
-       <tbody id='oils_rpt_tform_tbody'>
+       <tbody id='oils_rpt_tform_tbody' class='oils_rpt_editor_window_tbody'>
                <tr datatype='all'>
                        <td colspan='2'>
                                <input type='radio' name='oils_rpt_tform_input' id='oils_rpt_tform_all_raw'/>