adding month-comparative widget; fixing week picking widget

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

diff --git a/Open-ILS/src/reporter/templates/widgets/comparative-timerange.month b/Open-ILS/src/reporter/templates/widgets/comparative-timerange.month
new file mode 100644 (file)
index 0000000..1f339e7
--- /dev/null
+++ b/Open-ILS/src/reporter/templates/widgets/comparative-timerange.month
@@ -0,0 +1,24 @@
+[%
+
+PROCESS inputs;
+
+WRAPPER select name=input_prefix _ ":target";
+       count = 1;
+       WHILE count < 37;
+               INCLUDE option value=count selected=(count == 1 ? 1 : 0);
+               count = count + 1;
+       END;
+END;
+
+' months before runtime<br/>Compared to ';
+
+WRAPPER select name=input_prefix _ ":compare";
+       count = 1;
+       WHILE count < 37;
+               INCLUDE option value=count selected=(count == 12 ? 1 : 0);
+               count = count + 1;
+       END;
+END;
+' months before target';
+
+%]

diff --git a/Open-ILS/src/reporter/templates/widgets/specific-timerange.week b/Open-ILS/src/reporter/templates/widgets/specific-timerange.week
index 762d165..a6f7086 100644 (file)
--- a/Open-ILS/src/reporter/templates/widgets/specific-timerange.week
+++ b/Open-ILS/src/reporter/templates/widgets/specific-timerange.week
@@ -2,10 +2,17 @@
 
 PROCESS inputs;
 
 
 PROCESS inputs;
 

-'Week of year: ';
-WRAPPER select name=input_prefix;
+USE date;
+USE start = DateTime(now = 1);
+
+'Year: ';
+INCLUDE name=input_prefix _ ':year' text size=4 value=start.year;
+
+
+'<br/>Week of year: ';
+WRAPPER select name=input_prefix _ ':week';

        count = 1;
        count = 1;

-       WHILE count < 53;
+       WHILE count < 54;

                INCLUDE option value=count;
                count = count + 1;
        END;
                INCLUDE option value=count;
                count = count + 1;
        END;