dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 6209
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2012-03-08 13:39:51 +0700
message:
  (patient) Minor fix for tabular report.
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/caseAggregationForm.vm
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/tabularReportSelect.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties


--
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-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties	2012-03-08 04:56:36 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties	2012-03-08 06:39:51 +0000
@@ -77,7 +77,7 @@
 days=days
 please_select=Please select
 immediate_children=Immediate Children
-child_tree=Child Tree
+all_children=All children
 aggregate=Aggregate
 added=Added
 updated=Updated

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/caseAggregationForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/caseAggregationForm.vm	2012-03-07 05:54:02 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/caseAggregationForm.vm	2012-03-08 06:39:51 +0000
@@ -55,7 +55,7 @@
 					<select id="facilityLB" name="facilityLB" style="width: 30em">
 						<option value="random" selected>$i18n.getString( "selected" )</option>
 						<option value="immChildren" >$i18n.getString( "immediate_children" )</option>
-						<option value="children" >$i18n.getString( "child_tree" )</option>
+						<option value="children" >$i18n.getString( "all_children" )</option>
 					</select>
 				</td>
 			</tr>

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/tabularReportSelect.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/tabularReportSelect.vm	2012-03-07 05:54:02 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/tabularReportSelect.vm	2012-03-08 06:39:51 +0000
@@ -89,7 +89,7 @@
 			<select id="facilityLB" name="facilityLB" style="width: 30em">
 				<option value="random" selected>$i18n.getString( "selected" )</option>
 				<option value="immChildren" >$i18n.getString( "immediate_children" )</option>
-				<option value="children" >$i18n.getString( "child_tree" )</option>
+				<option value="children" >$i18n.getString( "all_child" )</option>
 			</select>
 		</td>
 	</tr>
@@ -101,7 +101,7 @@
 	<tr>
     	<td></td>
     	<td><input type="submit" id='generateBtn' name='generateBtn' #if($!programs) #else disabled #end value="$i18n.getString( 'generate' )" />
-    		<input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='index.action'" />
+    		<input type="button" value="$i18n.getString( 'cancel' )" onclick="hideCriteria();" />
     	</td>
     </tr>	                		
 </table>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties	2012-03-05 12:58:32 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties	2012-03-08 06:39:51 +0000
@@ -250,4 +250,5 @@
 add_all_values=Add all values
 display_provided_other_facility_column=Display provided other facility column
 aggregation_query_builder=Aggregation Query Builder
-patient_org_unit_registration=Beneficiary Org Unit Registration
\ No newline at end of file
+patient_org_unit_registration=Beneficiary Org Unit Registration
+dataset= Dataset
\ No newline at end of file