------------------------------------------------------------
revno: 10227
committer: Lars Helge Øverland <larshe...@gmail.com>
branch nick: dhis2
timestamp: Thu 2013-03-14 18:20:25 +0100
message:
Added last week, last 4 weeks, last 12 weeks relative periods to report table
modified:
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.js
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-resources/src/main/webapp/dhis-web-commons/javascripts/commons.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.js 2013-03-05 14:39:17 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.js 2013-03-14 17:20:25 +0000
@@ -1574,7 +1574,10 @@
isChecked( "last2SixMonths" ) ||
isChecked( "thisFinancialYear" ) ||
isChecked( "lastFinancialYear" ) ||
- isChecked( "last5FinancialYears" ) )
+ isChecked( "last5FinancialYears" ) ||
+ isChecked( "lastWeek" ) ||
+ isChecked( "last4Weeks" ) ||
+ isChecked( "last12Weeks" ) )
{
return true;
}
=== 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-05 19:00:51 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module.properties 2013-03-14 17:20:25 +0000
@@ -37,6 +37,9 @@
this_year=This year
reporting_sixmonth=Reporting six-month
last_2_sixmonths=Last 2 six-months
+last_week=Last week
+last_4_weeks=Last 4 weeks
+last_12_weeks=Last 12 weeks
months_last_year=Months last year
quarters_last_year=Quarters last year
last_year=Last year
=== 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 2012-09-23 15:49:44 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/relativePeriodsInput.vm 2013-03-14 17:20:25 +0000
@@ -24,17 +24,24 @@
<input type="checkbox" id="lastYear" name="lastYear" value="true"#if( $relatives.isLastYear() ) checked#end>
<label for="lastFinancialYear">$i18n.getString( "last_financial_year" )</label>
<input type="checkbox" id="lastFinancialYear" name="lastFinancialYear" value="true"#if( $relatives.isLastFinancialYear() ) 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>
+
+<label for="lastWeek">$i18n.getString( "last_week" )</label>
+<input type="checkbox" id="lastWeek" name="lastWeek" value="true""#if( $relatives.isLastWeek() ) checked#end>
+<label for="last4Weeks">$i18n.getString( "last_4_weeks" )</label>
+<input type="checkbox" id="last4Weeks" name="last4Weeks" value="true"#if( $relatives.isLast4Weeks() ) checked#end>
+<label for="last12Weeks">$i18n.getString( "last_12_weeks" )</label>
+<input type="checkbox" id="last12Weeks" name="last12Weeks" value="true"#if( $relatives.isLast12Weeks() ) checked#end>
+<label for="last3Months">$i18n.getString( "last_3_months" )</label>
+<input type="checkbox" id="last3Months" name="last3Months" value="true"#if( $relatives.isLast3Months() ) checked#end><br><br>
+
<label for="last12Months">$i18n.getString( "last_12_months" )</label>
<input type="checkbox" id="last12Months" name="last12Months" value="true"#if( $relatives.isLast12Months() ) checked#end>
<label for="last4Quarters">$i18n.getString( "last_4_quarters" )</label>
<input type="checkbox" id="last4Quarters" name="last4Quarters" value="true"#if( $relatives.isLast4Quarters() ) checked#end>
<label for="last2SixMonths">$i18n.getString( "last_2_sixmonths" )</label>
-<input type="checkbox" id="last2SixMonths" name="last2SixMonths" value="true"#if( $relatives.isLast2SixMonths() ) checked#end><br><br>
+<input type="checkbox" id="last2SixMonths" name="last2SixMonths" value="true"#if( $relatives.isLast2SixMonths() ) checked#end>
+<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>
-<label for="last3Months">$i18n.getString( "last_3_months" )</label>
-<input type="checkbox" id="last3Months" name="last3Months" value="true"#if( $relatives.isLast3Months() ) checked#end>
<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
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
