dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 10277
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sun 2013-03-17 15:52:32 +0100
message:
  Report table, added relative period last 6 bi-months
modified:
  dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/AbstractRelativePeriodsAction.java
  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/webapp/dhis-web-reporting/relativePeriodsInput.vm


--
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	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 @@
 
 <label for="last12Months">$i18n.getString( "last_12_months" )</label>
 <input type="checkbox" id="last12Months" name="last12Months" value="true"#if( $relatives.isLast12Months() ) checked#end>&nbsp;
+<label for="last6BiMonths">$i18n.getString( "last_6_bimonths" )</label>
+<input type="checkbox" id="last6BiMonths" name="last6BiMonths" value="true"#if( $relatives.isLast6BiMonths() ) checked#end>&nbsp;
 <label for="last4Quarters">$i18n.getString( "last_4_quarters" )</label>
 <input type="checkbox" id="last4Quarters" name="last4Quarters" value="true"#if( $relatives.isLast4Quarters() ) checked#end>&nbsp;
 <label for="last2SixMonths">$i18n.getString( "last_2_sixmonths" )</label>
-<input type="checkbox" id="last2SixMonths" name="last2SixMonths" value="true"#if( $relatives.isLast2SixMonths() ) checked#end>&nbsp;
+<input type="checkbox" id="last2SixMonths" name="last2SixMonths" value="true"#if( $relatives.isLast2SixMonths() ) checked#end><br><br>
+
 <label for="last5Years">$i18n.getString( "last_5_years" )</label>
-<input type="checkbox" id="last5Years" name="last5Years" value="true"#if( $relatives.isLast5Years() ) checked#end><br><br>
-
+<input type="checkbox" id="last5Years" name="last5Years" value="true"#if( $relatives.isLast5Years() ) checked#end>&nbsp;
 <label for="last5FinancialYears">$i18n.getString( "last_5_financial_years" )</label>
 <input type="checkbox" id="last5FinancialYears" name="last5FinancialYears" value="true"#if( $relatives.isLast5FinancialYears() ) checked#end>
\ No newline at end of file