added basic support for showing template-defined params in the report editor

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

diff --git a/Open-ILS/web/reports/oils_rpt_param_editor.js b/Open-ILS/web/reports/oils_rpt_param_editor.js
index 83efd4c..8455217 100644 (file)
--- a/Open-ILS/web/reports/oils_rpt_param_editor.js
+++ b/Open-ILS/web/reports/oils_rpt_param_editor.js
@@ -74,6 +74,7 @@ oilsRptParamEditor.prototype.buildWidget = function(param, node) {
        widgetArgs.calFormat = OILS_RPT_TRANSFORMS[transform].cal_format;
        widgetArgs.inputSize = OILS_RPT_TRANSFORMS[transform].input_size;
        widgetArgs.regex = OILS_RPT_TRANSFORMS[transform].regex;
+    widgetArgs.value = param.value;
 
        switch(transform) {
                case 'date':
@@ -182,6 +183,9 @@ oilsRptParamEditor.prototype.buildWidget = function(param, node) {
             break;
        }
 
+    if(widgetArgs.value != undefined) 
+        return new oilsRptTemplateWidget(widgetArgs);
+
 
        switch(param.op) {
                case 'in':
@@ -199,6 +203,7 @@ oilsRptParamEditor.prototype.buildWidget = function(param, node) {
                default:
                        return new atomicWidget(widgetArgs);
        }
+
 }
 
 

diff --git a/Open-ILS/web/reports/oils_rpt_widget.js b/Open-ILS/web/reports/oils_rpt_widget.js
index 7b19f43..8c333e5 100644 (file)
--- a/Open-ILS/web/reports/oils_rpt_widget.js
+++ b/Open-ILS/web/reports/oils_rpt_widget.js
@@ -400,7 +400,7 @@ oilsRptNumberWidget.prototype.getDisplayValue = function() {
 
 /* --------------------------------------------------------------------- 
        Relative dates widget
-       --------------------------------------------------------------------- */
+       -------------------------------------------------------------------- */
 
 function oilsRptNullWidget(args) {
     this.node = args.node;
@@ -411,9 +411,17 @@ oilsRptNullWidget.prototype.getValue = function() {
     return null;
 }
 
+function oilsRptTemplateWidget(args) {
+    this.node = args.node;
+    this.value = args.value;
+}
+oilsRptTemplateWidget.prototype.draw = function() {
+    this.node.appendChild(text(''+this.value));
+}
+
 /* --------------------------------------------------------------------- 
        Relative dates widget
-       --------------------------------------------------------------------- */
+       -------------------------------------------------------------------- */
 function oilsRptTruncPicker(args) {
        this.node = args.node;
        this.type = args.type;