dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 5070
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2011-11-01 12:32:39 +0100
message:
  (mobile) minor fixes
modified:
  dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/dataEntry.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-light/src/main/webapp/dhis-web-light/dataEntry.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/dataEntry.vm	2011-10-27 17:40:17 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/dataEntry.vm	2011-11-01 11:32:39 +0000
@@ -1,7 +1,13 @@
 
 #set( $Integer = 0 )
 
-<h2>$encoder.htmlEncode( $dataSet.name )</h2>
+#if( $dataSet.alternativeName )
+	#set( $dataSetName = $dataSet.alternativeName )
+#else
+	#set( $dataSetName = $dataSet.name )
+#end
+
+<h2>$encoder.htmlEncode( $dataSetName )</h2>
 
 #set( $validationRuleViolationsSize = $validationRuleViolations.size() )
 #set( $validationViolationsSize = $validationViolations.size() )
@@ -47,9 +53,16 @@
 	<h3 style="text-align: left;">$sectionName</h3>
 	<p style="text-align: left;">
 		#foreach( $dataElement in $dataElements)
+			#if( $dataElement.shortName )
+				#set( $dataElementName = $dataElement.shortName )
+			#else
+				#set( $dataElementName = $dataElement.name )
+			#end
+
 			#foreach( $optionCombo in $dataElement.categoryCombo.optionCombos )
 				#set( $key = "DE${dataElement.id}OC${optionCombo.id}" )
-				<label>$dataElement.name #if($optionCombo.name!="(default)")$optionCombo.name#end</label>
+
+				<label>$encoder.htmlEncode( $dataElementName ) #if( $optionCombo.name!="(default)")$encoder.htmlEncode( $optionCombo.name )#end</label>
 
 				#if( $validationViolations.get( $key ) )
 					#set( $validationViolation = $validationViolations.get( $key ) )