=== 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 2013-03-14 11:51:43 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/AbstractRelativePeriodsAction.java 2013-03-17 14:52:32 +0000
@@ -155,6 +155,13 @@
this.last3Months = last3Months;
}
+ protected boolean last6BiMonths;
+
+ public void setLast6BiMonths( boolean last6BiMonths )
+ {
+ this.last6BiMonths = last6BiMonths;
+ }
+
protected boolean last5FinancialYears;
public void setLast5FinancialYears( boolean last5FinancialYears )
@@ -195,7 +202,7 @@
RelativePeriods relatives = new RelativePeriods( reportingMonth, reportingBimonth, reportingQuarter, lastSixMonth,
monthsThisYear, quartersThisYear, thisYear,
monthsLastYear, quartersLastYear, lastYear,
- last5Years, last12Months, last3Months, false, last4Quarters, last2SixMonths,
+ last5Years, last12Months, last3Months, last6BiMonths, last4Quarters, last2SixMonths,
thisFinancialYear, lastFinancialYear, last5FinancialYears,
lastWeek, last4Weeks, last12Weeks, last52Weeks );
=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module.properties 2013-03-14 17:20:25 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module.properties 2013-03-17 14:52:32 +0000
@@ -192,6 +192,7 @@
confirm_delete=Are you sure you want to delete this object?
leaf_parent_organisation_unit=Leaf organisation units
reporting_bimonth=Reporting bimonth
+last_6_bimonths=Last 6 bimonths
reporting_quarter=Reporting quarter
include_organisation_unit_group_sets=Include org unit group sets param
reporting_period=Reporting period
=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/relativePeriodsInput.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/relativePeriodsInput.vm 2013-03-14 17:20:25 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/relativePeriodsInput.vm 2013-03-17 14:52:32 +0000
@@ -36,12 +36,14 @@
+
+
-
+
+
-
-
+
\ No newline at end of file