added output deleted, wired up the ASAP button, etc.

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

diff --git a/Open-ILS/web/reports/oils_rpt.css b/Open-ILS/web/reports/oils_rpt.css
index 4c2d358..3d860da 100644 (file)
--- a/Open-ILS/web/reports/oils_rpt.css
+++ b/Open-ILS/web/reports/oils_rpt.css
@@ -1,4 +1,4 @@
-body { font-size: 9pt; font-family: Helvetica, Arial, Tahoma, sans-serif; font-size: 9pt;} 
+body { background: white; font-size: 9pt; font-family: Helvetica, Arial, Tahoma, sans-serif; font-size: 9pt;} 
 table { border-collapse: collapse; }
 
 .hide_me { display: none; visibility: hidden; }
@@ -65,7 +65,6 @@ table { border-collapse: collapse; }
        min-height: 150px;
        max-height: 290px;
        overflow: scroll;
-       font-size: 8pt;
 }
 
 .oils_rpt_small_info_selector {
@@ -73,7 +72,6 @@ table { border-collapse: collapse; }
        background: #E0F0F0; 
        height: 80px;
        overflow: scroll;
-       font-size: 8pt;
        width: 12em;
 }
 

diff --git a/Open-ILS/web/reports/oils_rpt_editor.xhtml b/Open-ILS/web/reports/oils_rpt_editor.xhtml
index 099a47c..d3ada34 100644 (file)
--- a/Open-ILS/web/reports/oils_rpt_editor.xhtml
+++ b/Open-ILS/web/reports/oils_rpt_editor.xhtml
@@ -60,18 +60,17 @@
 
                                </td>
                        </tr>
-                       <tr>
-                               <td colspan='2'>
-                                       <input id='oils_rpt_report_editor_run_now' type='submit' value='Run ASAP'/> or...
-                               </td>
-                       </tr>
                        <tr><td colspan='2'><hr/></td></tr>
                        <tr>
                                <td colspan='2'>
                                        <table>
                                                <tbody>
                                                        <tr>
-                                                               <th>Run on:</th>
+                                                               <th>
+                                                                       <span>Run ASAP </span>
+                                                                               <input type='checkbox' id='oils_rpt_report_editor_run_now'/>
+                                                                       <span> or at :</span>
+                                                               </th>
                                                                <td>
                                                                        <input id="oils_rpt_param_editor_sched_start_date" type="text" size="10"/>
                                                                                at

diff --git a/Open-ILS/web/reports/oils_rpt_folder_window.js b/Open-ILS/web/reports/oils_rpt_folder_window.js
index 9eb6bcd..5c6541f 100644 (file)
--- a/Open-ILS/web/reports/oils_rpt_folder_window.js
+++ b/Open-ILS/web/reports/oils_rpt_folder_window.js
@@ -135,6 +135,7 @@ oilsRptFolderWindow.prototype.doFolderAction = function() {
                return alert('Please select an item from the list');
        var action = getSelectorVal(DOM.oils_rpt_folder_contents_action_selector);
 
+       var obj = this;
        switch(action) {
                case 'create_report' :
                        hideMe(DOM.oils_rpt_folder_table_right_td);
@@ -153,11 +154,26 @@ oilsRptFolderWindow.prototype.doFolderAction = function() {
                case 'show_output':
                        this.showOutput(objs[0]);
                        break;
+               case 'delete_output':
+                       this.deleteOutputs(objs,0, 
+                               function(){
+                                       oilsRptAlertSuccess();
+                                       obj.draw();
+                               }
+                       );
+                       break;
 
        }
 }
 
 
+oilsRptFolderWindow.prototype.deleteOutputs = function(list, idx, callback) {
+       if( idx >= list.length ) return callback();
+       var req = new Request(OILS_RPT_DELETE_SCHEDULE,SESSION,list[idx].id());
+       var obj = this;
+       req.callback(function(){obj.deleteOutputs(list, ++idx, callback);});
+       req.send();
+}
 
 oilsRptFolderWindow.prototype.showOutput = function(sched) {
        oilsRptFetchReport(sched.report(), 

diff --git a/Open-ILS/web/reports/oils_rpt_report_editor.js b/Open-ILS/web/reports/oils_rpt_report_editor.js
index e13c25e..f071f28 100644 (file)
--- a/Open-ILS/web/reports/oils_rpt_report_editor.js
+++ b/Open-ILS/web/reports/oils_rpt_report_editor.js
@@ -74,15 +74,23 @@ oilsRptReportEditor.prototype.save = function() {
        _debug("Built report:\n"+js2JSON(report));
 
 
-       var dt = DOM.oils_rpt_param_editor_sched_start_date.value;
-       if(!dt || !dt.match(/^\d{4}-\d{2}-\d{2}$/) ) {
-               /* for now.. make this better in the future */
-               alert('invalid start date -  YYYY-MM-DD');
-               return;
+       var time;
+       if( DOM.oils_rpt_report_editor_run_now.checked ) {
+               DOM.oils_rpt_report_editor_run_now.checked = false;
+               time = 'now';
+
+       } else {
+
+               var dt = DOM.oils_rpt_param_editor_sched_start_date.value;
+               if(!dt || !dt.match(/^\d{4}-\d{2}-\d{2}$/) ) {
+                       /* for now.. make this better in the future */
+                       alert('invalid start date -  YYYY-MM-DD');
+                       return;
+               }
+               var hour = getSelectorVal(DOM.oils_rpt_param_editor_sched_start_hour);
+               time = dt +'T'+hour+':00';
+               _debug("built run_time "+time);
        }
-       var hour = getSelectorVal(DOM.oils_rpt_param_editor_sched_start_hour);
-       var time = dt +'T'+hour+':00';
-       _debug("built run_time "+time);
 
        var schedule = new rs();
        schedule.folder(this.selectedOutputFolder.folder.id());
@@ -97,12 +105,9 @@ oilsRptReportEditor.prototype.save = function() {
        schedule.chart_bar((DOM.oils_rpt_format_chart_bar.checked) ? 't' : 'f');
        schedule.chart_line((DOM.oils_rpt_format_chart_line.checked) ? 't' : 'f');
 
+       debugFMObject(report);
        debugFMObject(schedule);
 
-       _debug("Built schedule:\n"+js2JSON(schedule));
-
-       return; /* XXX */
-
        var req = new Request(OILS_RPT_CREATE_REPORT, SESSION, report, schedule );
        req.callback(
                function(r) {

diff --git a/Open-ILS/web/reports/oils_rpt_vars.js b/Open-ILS/web/reports/oils_rpt_vars.js
index f656ef3..78f322a 100644 (file)
--- a/Open-ILS/web/reports/oils_rpt_vars.js
+++ b/Open-ILS/web/reports/oils_rpt_vars.js
@@ -75,6 +75,7 @@ var OILS_RPT_FETCH_ORG_FULL_PATH = 'open-ils.reporter:open-ils.reporter.org_unit
 var OILS_RPT_FETCH_ORG_TREE            = 'open-ils.actor:open-ils.actor.org_tree.retrieve';
 var OILS_RPT_DELETE_TEMPLATE           = 'open-ils.reporter:open-ils.reporter.template.delete';
 var OILS_RPT_DELETE_REPORT                     = 'open-ils.reporter:open-ils.reporter.report.delete';
+var OILS_RPT_DELETE_SCHEDULE           = 'open-ils.reporter:open-ils.reporter.schedule.delete';
 var OILS_RPT_TEMPLATE_HAS_RPTS = 'open-ils.reporter:open-ils.reporter.template_has_reports';
 var OILS_RPT_CREATE_REPORT                     = 'open-ils.reporter:open-ils.reporter.report.create';
 var OILS_RPT_CREATE_TEMPLATE           = 'open-ils.reporter:open-ils.reporter.template.create';