dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 1998
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: trunk
timestamp: Sat 2010-08-28 20:00:00 +0700
message:
  Minnor fix.
modified:
  dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/chart/action/SaveChartAction.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/addChartIndicatorModeForm.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-reporting/src/main/java/org/hisp/dhis/reporting/chart/action/SaveChartAction.java'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/chart/action/SaveChartAction.java	2010-07-18 15:17:23 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/chart/action/SaveChartAction.java	2010-08-28 13:00:00 +0000
@@ -261,7 +261,7 @@
         List<Indicator> indicators = new ArrayList<Indicator>();
         List<OrganisationUnit> organisationUnits = new ArrayList<OrganisationUnit>();
         List<Period> periods = new ArrayList<Period>( periodService.getPeriodsByExternalIds( selectedPeriods ) );
-        
+ System.out.println("\n\n ======= \n periods : " + periods);       
         for ( Integer id : getIntegerCollection( selectedIndicators ) )
         {
             indicators.add( indicatorService.getIndicator( id ) );

=== 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	2010-08-28 10:44:15 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module.properties	2010-08-28 13:00:00 +0000
@@ -313,4 +313,4 @@
 value_x_selected_indicators = Value (X) - Selected indicators
 value_x_available_indicators = Value (X) - Available indicators
 category_y_selected_periods = Value (Y) - Selected periods
-value_y_available_indicators = Value (Y) - Available periods
\ No newline at end of file
+category_y_available_periods = Value (Y) - Available periods
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addChartIndicatorModeForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addChartIndicatorModeForm.vm	2010-08-28 11:17:53 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addChartIndicatorModeForm.vm	2010-08-28 13:00:00 +0000
@@ -51,7 +51,54 @@
 <tr>
     <td colspan="2" style="height:15px"></td>
 </tr>
+<!-- Relative periods -->
 
+<tr>
+	<th colspan="2">$i18n.getString( "relative_periods" )</th>
+</tr>
+<tr>
+	<td colspan="2">
+	    <label for="reportingMonth">$i18n.getString( "reporting_month" )</label>
+		<input type="checkbox" id="reportingMonth" name="reportingMonth" value="true"#if( $!chart.relatives.isReportingMonth() ) checked#end>&nbsp;
+		<label for="last3Months">$i18n.getString( "last_3_months" )</label>
+		<input type="checkbox" id="last3Months" name="last3Months" value="true""#if( $!chart.relatives.isLast3Months() ) checked#end>&nbsp;
+		<label for="last6Months">$i18n.getString( "last_6_months" )</label>
+		<input type="checkbox" id="last6Months" name="last6Months" value="true"#if( $!chart.relatives.isLast6Months() ) checked#end>&nbsp;
+		<label for="last12Months">$i18n.getString( "last_12_months" )</label>
+		<input type="checkbox" id="last12Months" name="last12Months" value="true"#if( $!chart.relatives.isLast12Months() ) checked#end>
+	</td>
+</tr>
+<tr>
+	<td style="height:5px"></td>
+</tr>
+<tr>
+    <td colspan="2">
+    	<label for="last3To6Months">$i18n.getString( "last_3_to_6_months" )</label>
+        <input type="checkbox" id="last3To6Months" name="last3To6Months" value="true"#if( $!chart.relatives.isLast3To6Months() ) checked#end>&nbsp;
+        <label for="last6To9Months">$i18n.getString( "last_6_to_9_months" )</label>
+        <input type="checkbox" id="last6To9Months" name="last6To9Months" value="true""#if( $!chart.relatives.isLast6To9Months() ) checked#end>&nbsp;
+        <label for="last9To12Months">$i18n.getString( "last_9_to_12_months" )</label>
+        <input type="checkbox" id="last9To12Months" name="last9To12Months" value="true"#if( $!chart.relatives.isLast9To12Months() ) checked#end>&nbsp;
+        <label for="last12IndividualMonths">$i18n.getString( "last_12_individual_months" )</label>
+        <input type="checkbox" id="last12IndividualMonths" name="last12IndividualMonths" value="true"#if( $!chart.relatives.isLast12IndividualMonths() ) checked#end>           
+    </td>
+</tr>
+<tr>
+    <td style="height:5px"></td>
+</tr>
+<tr>
+    <td colspan="2">
+        <label for="soFarThisYear">$i18n.getString( "so_far_this_year" )</label>
+        <input type="checkbox" id="soFarThisYear" name="soFarThisYear" value="true"#if( $!chart.relatives.isSoFarThisYear() ) checked#end>&nbsp;
+        <label for="individualMonthsThisYear">$i18n.getString( "individual_months_this_year" )</label>
+        <input type="checkbox" id="individualMonthsThisYear" name="individualMonthsThisYear" value="true"#if( $!chart.relatives.isIndividualMonthsThisYear() ) checked#end>&nbsp;
+        <label for="individualQuartersThisYear">$i18n.getString( "individual_quarters_this_year" )</label>
+        <input type="checkbox" id="individualQuartersThisYear" name="individualQuartersThisYear" value="true"#if( $!chart.relatives.isIndividualQuartersThisYear() ) checked#end>           
+    </td>
+</tr>
+<tr>
+    <td style="height:15px"></td>
+</tr>
 <!-- Indicators -->
     <tr>
         <th colspan="2">$i18n.getString( "value_x_available_indicators" )</th>