more filter work, from clauses, etc.

git-svn-id: svn://svn.open-ils.org/ILS/trunk@6307 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 ce1edf1..a67ab95 100644 (file)
--- a/Open-ILS/web/reports/oils_rpt_builder.js
+++ b/Open-ILS/web/reports/oils_rpt_builder.js
@@ -12,6 +12,9 @@ function oilsInitReportBuilder() {
                        unHideMe(DOM.oils_rpt_table); 
                }
        );
+
+       DOM.oils_rpt_builder_save_template.onclick = oilsReportBuilderSave;
+       oilsRpt.folder = new CGI().param('folder');
 }
 
 function oilsReportBuilderReset() {
@@ -28,6 +31,33 @@ function oilsReportBuilderReset() {
        oilsRptResetParams();
 }
 
+function oilsReportBuilderSave() {
+       if(!confirm('Name : '+oilsRpt.name + '\nDescription: ' 
+                       + oilsRpt.description+'\nSave Template?'))
+               return;
+
+       var tmpl = new rt();
+       tmpl.name( oilsRpt.name );
+       tmpl.description( oilsRpt.desc );
+       tmpl.ower(USER.id());
+       tmpl.folder(oilsRpt.folder);
+       tmpl.data(js2JSON(oilsRpt.def));
+
+       var req = new Request(OILS_RPT_CREATE_TEMPLATE, SESSION, tmpl);
+       req.callback(
+               function(r) {
+                       var res = r.getResultObject();
+                       if( res != 0 ) {
+                               oilsRptAlertSuccess();
+                               _l('oils_rpt.xhtml');
+                       }
+               }
+       );
+       
+       req.send();
+}
+
+
 
 /* adds an item to the display window */
 function oilsAddRptDisplayItem(path, name, tform, params) {
@@ -160,6 +190,7 @@ function oilsDelSelectedDisplayItems() {
        oilsRptDebug();
 }
 
+
 /* for each item in the path list, remove the associated data
        from the "from" clause */
 
@@ -167,6 +198,7 @@ function oilsRptPruneFromClause(relation, node) {
        _debug("removing relation from 'from' clause " + relation);
        if(!node) node = oilsRpt.def.from.join;
        for( var i in node ) {
+               _debug("looking at node "+node[i].alias);
                if( node[i].alias == relation ) {
                        if( node[i].join ) {
                                /* if we have subtrees, don't delete our tree node */
@@ -193,24 +225,24 @@ function oilsRptPruneFromClause(relation, node) {
        return false;
 }
 
-function oilsRptFilterName(path, tform, filter) {
-}
-
-/* adds an item to the display window */
-function oilsAddRptFilterItem(path, tform, filter) {
-       _debug("Adding filter item for "+path+" tform="+tform+" filter="+filter);
-
+function oilsRptMkFilterTags(path, tform, filter) {
        var name = oilsRptMakeLabel(path);
        if(tform) name += ' ('+tform+')';
        name += ' "' + filter + '"';
-
        var epath = path + ':'+filter+':';
        if(tform) epath += tform;
 
-       /*
-       if( ! oilsAddSelectorItem(oilsRptFilterSelector, path, name) )
-               return;
-               */
+       return [ name, epath ];
+}
+
+
+/* adds an item to the display window */
+function oilsAddRptFilterItem(path, tform, filter) {
+       _debug("Adding filter item for "+path+" tform="+tform+" filter="+filter);
+
+       var name = oilsRptMkFilterTags(path, tform, filter);
+       var epath = name[1];
+       name = name[0];
 
        if( ! oilsAddSelectorItem(oilsRptFilterSelector, epath, name) )
                return;
@@ -239,7 +271,7 @@ function oilsAddRptFilterItem(path, tform, filter) {
 /* removes selected items from the display window */
 function oilsDelSelectedFilterItems() {
 
-       /* the values in this list are formed:  <path>:<operation>:<tform (optional)> */
+       /* the values in this list are formed:  <path>:<operation>:<transform> */
        var list = oilsDelSelectedItems(oilsRptFilterSelector);
 
        var flist = [];
@@ -248,7 +280,7 @@ function oilsDelSelectedFilterItems() {
                var item = list[i];
                flist.push( {
                        path:           item.replace(/:.*/,''),
-                       filter: item.replace(/.*:(.*):.*/,'$1'),
+                       operation:      item.replace(/.*:(.*):.*/,'$1'),
                        tform:  item.replace(/.*?:.*?:(.*)/,'$1')
                });
        }
@@ -261,35 +293,54 @@ function oilsDelSelectedFilterItems() {
        /* remove the de-selected columns from the report output */
        oilsRpt.def.where = grep( oilsRpt.def.where, 
                function(i) {
-                       for( var j = 0; j < list.length; j++ ) {
-                               var d = list[j];
+                       for( var j = 0; j < flist.length; j++ ) {
+                               var fil = flist[j];
                                var col = i.column;
-
-                               if( oilsRptPathRel(d) == i.relation && oilsRptPathCol(d) == col.colname ) {
-                                       var param = (i.alias) ? i.alias.match(/::PARAM\d*/) : null;
-                                       if( param ) delete oilsRpt.params[param];
-                                       return false;
+                               var frel = oilsRptPathRel(fil.path);
+                               var fcol = oilsRptPathCol(fil.path);
+
+                               var op = oilsRptObjectKeys(i.condition)[0];
+
+                               if(     frel == i.relation && 
+                                               fcol == col.colname && 
+                                               fil.operation == op &&
+                                               fil.tform == col.transform ) {
+                                               /* we have found a where clause with the same 
+                                                       relation, column,  operation and transform */
+                                               
+                                               /* we aren't setting params on template build.. */
+                                               //var param = (i.column.params) ? i.columns.params.match(/::P\d*/) : null;
+                                               //if( param ) delete oilsRpt.params[param];
+                                               //param = (i.condition[op]) ? i.condition[op].match(/::P\d*/) : null;
+                                               //if( param ) delete oilsRpt.params[param];
+
+                                               return false;
                                }
                        }
                        return true;
                }
        );
 
-       if(!oilsRpt.def.where) {
+       if(!oilsRpt.def.where) 
                oilsRpt.def.where = [];
-               //oilsReportBuilderReset();
 
-       } else {
-               for( var j = 0; j < list.length; j++ ) 
-                       /* if there are no items left in the "select", "where", or "having" clauses 
-                               for the given relation, trim this relation from the "from" clause */
-                       if(     !grep(oilsRpt.def.select,
-                                       function(i){ return (i.relation == oilsRptPathRel(list[j])); })
-                               && !grep(oilsRpt.def.where,
-                                       function(i){ return (i.relation == oilsRptPathRel(list[j])); })
-                               && !grep(oilsRpt.def.having,
-                                       function(i){ return (i.relation == oilsRptPathRel(list[j])); })
-                       ) oilsRptPruneFromClause(oilsRptPathRel(list[j]));
+
+       for( var j = 0; j < flist.length; j++ ) {
+               var path = flist[j].path;
+               var rel = oilsRptPathRel(path);
+               /* if there are no items left in the "select", "where", or "having" clauses 
+                       for the given relation, trim this relation from the "from" clause */
+
+               var func = function(i){ return (i.relation == rel); };
+
+               if(     !grep(oilsRpt.def.select, func) &&
+                               !grep(oilsRpt.def.where, func) &&
+                               !grep(oilsRpt.def.having, func) ) {
+
+                       _debug("pruning item with path "+ path + ' and relation '+ rel);
+
+                       oilsRptPruneFromClause(oilsRptPathRel(path)); 
+               }
        }
 
        oilsRptDebug();
@@ -326,7 +377,7 @@ function oilsDelSelectedAggFilterItems() {
                                if( typeof col != 'string' ) col = col[0];
 
                                if( oilsRptPathRel(d) == i.relation && oilsRptPathCol(d) == col ) {
-                                       var param = (i.alias) ? i.alias.match(/::PARAM\d*/) : null;
+                                       var param = (i.alias) ? i.alias.match(/::P\d*/) : null;
                                        if( param ) delete oilsRpt.params[param];
                                        return false;
                                }

diff --git a/Open-ILS/web/reports/oils_rpt_builder.xhtml b/Open-ILS/web/reports/oils_rpt_builder.xhtml
index 2a64038..fd7d5e7 100644 (file)
--- a/Open-ILS/web/reports/oils_rpt_builder.xhtml
+++ b/Open-ILS/web/reports/oils_rpt_builder.xhtml
@@ -31,18 +31,23 @@
                        <tbody>
                                <tr>
                                        <td id='oils_rpt_table_left_td' align='left'>
+
                                                <table id='oils_rpt_name_table'><tbody>
                                                        <tr>
                                                                <td width='20%'>Template Name: </td>
                                                                <td><input size='32' onchange="oilsRpt.name=this.value"/></td>
                                                        </tr><tr>
                                                                <td>Template Description: </td>
-                                                               <td><textarea cols='50' rows='2' id='oils_rpt_builder_desc_text'/></td>
+                                                               <td><textarea cols='50' rows='2' id='oils_rpt_builder_desc_text' onchange='oilsRpt.desc = this.value;'/></td>
                                                        </tr><tr>
                                                                <td>Template Type: </td>
                                                                <td><select id='oils_rpt_builder_type_selector'/></td>
+                                                       </tr><tr>
+                                                               <td>Save this Template: </td>
+                                                               <td><input type='submit' value='Save Template' id='oils_rpt_builder_save_template'/></td>
                                                        </tr>
                                                </tbody></table>
+
                                                <div id='oils_rpt_tree_div'>
                                                </div>
                                        </td>

diff --git a/Open-ILS/web/reports/oils_rpt_folder_window.js b/Open-ILS/web/reports/oils_rpt_folder_window.js
index 0704fc1..c3ab9bc 100644 (file)
--- a/Open-ILS/web/reports/oils_rpt_folder_window.js
+++ b/Open-ILS/web/reports/oils_rpt_folder_window.js
@@ -94,6 +94,10 @@ oilsRptFolderWindow.prototype.drawEditActions = function() {
                                break;
                        case 'delete':
                                obj.doFolderDelete();
+                               break;
+                       case 'create_template':
+                               goTo( 'oils_rpt_builder.xhtml'+location.search+'&folder='+obj.folderNode.folder.id());
+                               break;
                }
        }
 

diff --git a/Open-ILS/web/reports/oils_rpt_folder_window.xhtml b/Open-ILS/web/reports/oils_rpt_folder_window.xhtml
index 027efb3..083f7ba 100644 (file)
--- a/Open-ILS/web/reports/oils_rpt_folder_window.xhtml
+++ b/Open-ILS/web/reports/oils_rpt_folder_window.xhtml
@@ -5,6 +5,7 @@
                                <td> 
                                        <span>
                                                <select id='oils_rpt_folder_contents_action_selector' style='width: auto;'>
+                                                       <option value='create_template' type='template'>Create a new template in this folder</option>
                                                        <option type='template' value='create_report'>Create a new report from selected template</option>
                                                        <option type='template' value='clone_template'>Clone selected template</option>
                                                        <option type='template' value='delete_template'>Delete selected template(s)</option>