dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 8784
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2012-10-31 14:27:43 +0700
message:
  Minor fix.
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/reportDataEntryForm.vm
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/singleDataEntryForm.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-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-10-29 07:10:34 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties	2012-10-31 07:27:43 +0000
@@ -8,7 +8,7 @@
 data_entry=Data entry
 reports=Reports
 please_select_a_program=Please select a program
-records_for=Records for
+records_of=Records of
 please_choose_a_valid_start_end_date=Please choose a valid start and end date combination
 report_generation_failed=Report generation failed
 generate=Generate
@@ -78,6 +78,7 @@
 added=Added
 updated=Updated
 in=in
+on_value=on
 value=Value
 status=Status
 no_value_added_or_update=No values added or updated
@@ -89,7 +90,6 @@
 violate_validation=Violating validation
 dob_type=DOB type
 intro_multiple_individual_records=Enter data for multiple program stages and persons for a program. The entry screen gives an overview of the stage status.
-in=In
 is_null=is null
 data_value=data value
 successful_validation=The data entry screen successfully passed validation

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportDataEntryForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportDataEntryForm.vm	2012-10-26 05:42:01 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportDataEntryForm.vm	2012-10-31 07:27:43 +0000
@@ -1,5 +1,5 @@
 <div id='reportTitle' name='reportTitle' style="display:none;">
-	<h3>$i18n.getString('records_for') $organisationUnit.name $i18n.getString('at') $programStage.name $i18n.getString('on') $format.formatDate($programStageInstance.executionDate)</h3>
+	<h3>$i18n.getString('records_of') $encoder.htmlEncode( $patient.getFullName() )  $i18n.getString('at') $programStage.name $i18n.getString('in') $organisationUnit.name  $i18n.getString('on_value') $format.formatDate($programStageInstance.executionDate)</h3>
 	<hr/>
 </div>
 

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/singleDataEntryForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/singleDataEntryForm.vm	2012-10-22 03:02:27 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/singleDataEntryForm.vm	2012-10-31 07:27:43 +0000
@@ -2,7 +2,6 @@
 	<tr>
 		<th colspan='2'>$programStage.program.name</th>
 	</tr>
-	#set( $mark = true )
 	<!-- Identifiers/Attributes belong to the selected single program -->
 	#set($program = $programStage.program)
 	#parse( "/dhis-web-caseentry/identifierAndAttributeForm.vm" )
@@ -15,7 +14,7 @@
 	#set( $patientDataValue = false )
 	#set( $key = $programStageDataElement.dataElement.id )
 	#set( $patientDataValue = $patientDataValueMap.get( $key ) )    
-	<tr #alternate( $mark )>
+	<tr>
 		##data element name
 		<td class='text-column' align='center'>
 			<span id="value[$programStageDataElement.dataElement.id].name" title="$!encoder.htmlEncode( $programStageDataElement.dataElement.description )">
@@ -83,7 +82,6 @@
 			#end
 		</td>
 	</tr>
-	#set( $mark = !$mark )
 	#set( $tabIndex = $tabIndex + 1 )
 #end	
 </tbody>