dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 5539 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2011-12-22 10:52:21 +0100
message:
  lastSixMonth bug fixed.
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/RelativePeriods.java
  dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/app.js


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/RelativePeriods.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/RelativePeriods.java	2011-12-19 19:58:47 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/RelativePeriods.java	2011-12-22 09:50:44 +0000
@@ -222,6 +222,7 @@
         this.reportingMonth = false;
         this.reportingBimonth = false;
         this.reportingQuarter = false;
+        this.lastSixMonth = false;
         this.monthsThisYear = false;
         this.quartersThisYear = false;
         this.thisYear = false;

=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/app.js'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/app.js	2011-12-21 23:12:40 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/app.js	2011-12-22 09:50:44 +0000
@@ -2100,8 +2100,8 @@
                                                     },
                                                     {
                                                         xtype: 'checkbox',
-                                                        paramName: 'lastYear',
-                                                        boxLabel: 'Last year'
+                                                        paramName: 'thisYear',
+                                                        boxLabel: 'This year'
                                                     },
                                                     {
                                                         xtype: 'checkbox',