dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #20646
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 9553: Minor
------------------------------------------------------------
revno: 9553
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2013-01-18 11:24:06 +0100
message:
Minor
modified:
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/AbstractRelativePeriodsAction.java
--
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-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/AbstractRelativePeriodsAction.java'
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/AbstractRelativePeriodsAction.java 2012-09-23 15:49:44 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/AbstractRelativePeriodsAction.java 2013-01-18 10:24:06 +0000
@@ -162,20 +162,35 @@
this.last5FinancialYears = last5FinancialYears;
}
+ protected boolean last4Weeks;
+
+ public void setLast4Weeks( boolean last4Weeks )
+ {
+ this.last4Weeks = last4Weeks;
+ }
+
+ protected boolean last12Weeks;
+
+ public void setLast12Weeks( boolean last12Weeks )
+ {
+ this.last12Weeks = last12Weeks;
+ }
+
protected boolean last52Weeks;
public void setLast52Weeks( boolean last52Weeks )
{
this.last52Weeks = last52Weeks;
}
-
+
protected RelativePeriods getRelativePeriods()
{
RelativePeriods relatives = new RelativePeriods( reportingMonth, reportingBimonth, reportingQuarter, lastSixMonth,
monthsThisYear, quartersThisYear, thisYear,
monthsLastYear, quartersLastYear, lastYear,
last5Years, last12Months, last3Months, false, last4Quarters, last2SixMonths,
- thisFinancialYear, lastFinancialYear, last5FinancialYears, last52Weeks );
+ thisFinancialYear, lastFinancialYear, last5FinancialYears,
+ last4Weeks, last12Weeks, last52Weeks );
return relatives;
}