dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 1939
committer: Lars <larshelg@larshelg-laptop>
branch nick: trunk
timestamp: Thu 2010-08-19 11:43:45 +0200
message:
  Fixed minor bug, period names were not displayed for report tables with static periods
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTable.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/inputReportParamsForm.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-api/src/main/java/org/hisp/dhis/reporttable/ReportTable.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTable.java	2010-06-21 14:17:13 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTable.java	2010-08-19 09:43:45 +0000
@@ -423,6 +423,18 @@
         allUnits.addAll( relativeUnits );
 
         // ---------------------------------------------------------------------
+        // Set name on periods
+        // ---------------------------------------------------------------------
+
+        for ( Period period : allPeriods )
+        {
+            if ( period.getName() == null && i18nFormat != null )
+            {
+                period.setName( i18nFormat.formatPeriod( period ) );
+            }
+        }
+        
+        // ---------------------------------------------------------------------
         // Init dimensional lists
         // ---------------------------------------------------------------------
 

=== 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-07-18 15:17:23 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module.properties	2010-08-19 09:43:45 +0000
@@ -276,13 +276,13 @@
 month = Month
 year = Year
 total = Total
-data_source = Data source
-aggregate_data = Aggregate data
-use_existing_data = Use existing data
 select_dimension = Select dimension
 tally_sheet_report = Tally Sheet report
 data_completeness_report = Data Completeness Report
 configuration = Configuration
+method = Method
+get_updated_data = Get updated aggregated data
+use_existing_data = Use existing aggregated data
 generate_before_export = Please generate table before exporting
 based_on_subjective = Based on complete data set registrations
 based_on_objective = Based on compulsory data elements

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/inputReportParamsForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/inputReportParamsForm.vm	2010-08-04 08:54:59 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/inputReportParamsForm.vm	2010-08-19 09:43:45 +0000
@@ -15,12 +15,12 @@
 	<!-- Data source -->
 	
     <tr>
-        <th>$i18n.getString( "data_source" )</th>
+        <th>$i18n.getString( "method" )</th>
     </tr>
     <tr>
     	<td>
 			<select id="doDataMart" name="doDataMart" style="width:325px">
-				<option value="true">$i18n.getString( "aggregate_data" )</a>
+				<option value="true">$i18n.getString( "get_updated_data" )</a>
 				<option value="false">$i18n.getString( "use_existing_data" )</a>
 			</select>
 		</td>