dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 5667
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2012-01-06 13:26:27 +0700
message:
  Remove provided elsewhere column for anonymous-program entry form.
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.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/webapp/dhis-web-caseentry/dataEntryForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm	2012-01-04 04:55:19 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm	2012-01-06 06:26:27 +0000
@@ -50,12 +50,16 @@
 				<col id="noCol">
 				<col id="deCol">    
 				<col id="entryCol">
+				#if( $programStageInstance.programInstance.program.anonymous == 'false' )
 				<col id="facilityCol">       
+				#end
 				<tr>
 					<th>$i18n.getString( "nr" )</th>
 					<th>$i18n.getString( "data_element" )</th>                   
 					<th>$i18n.getString( "entry" )</th>
-					<th>$i18n.getString( "provided_elsewhere" )</th>             
+					#if( $programStageInstance.programInstance.program.anonymous == 'false' )
+						<th>$i18n.getString( "provided_elsewhere" )</th>             
+					#end
 				</tr>
 			#set( $dataElementRowCount = 0 )
 			#set( $mark = 0 )
@@ -113,7 +117,10 @@
 								<input name="entryfield" data="{compulsory: $programStageDataElement.compulsory, deName:'$programStageDataElement.dataElement.name', deType:'$programStageDataElement.dataElement.getDetailedNumberType()' }" #if($programStageInstance.completed) disabled="disabled" #end id="$id" type="text" value="$!encoder.htmlEncode( $patientDataValue.value )" onchange="saveVal( $programStageDataElement.dataElement.id, $optionCombo.id )" onkeypress="return keyPress(event, this)" tabindex="$tabIndex"  style="text-align:center;">
 							#end
 						#end
-					</td>   
+					</td>  
+					
+					#if($programStageInstance.programInstance.program.anonymous == 'false') 					
+					
 					##providedByAnotherFacility                
 					<td>   
 						#set( $id = $programStageDataElement.programStage.id + '_' + $programStageDataElement.dataElement.id + '_facility' )
@@ -128,7 +135,9 @@
 						 #else
 							<input name="providedByAnotherFacility" id="$id" type="checkbox" onclick="updateProvidingFacility( $programStageDataElement.dataElement.id, this )" #if($programStageInstance.completed) disabled="disabled" #end >
 						 #end                         
-					</td>    
+					</td>
+					
+					#end					
 				</tr>
 				#set( $tabIndex = $tabIndex + 1 )
 			#end