dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 6029
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2012-02-17 22:48:13 +0700
message:
  (patient)Remove no column of dataelement list in data entry form.
modified:
  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/listPatient.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-02-17 14:13:38 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm	2012-02-17 15:48:13 +0000
@@ -52,14 +52,12 @@
 		</div>
 	#else
 		<table id="defaultEntryScreenContainer" class='entryScreen formSection'>
-			<col id="noCol">
 			<col id="deCol">    
 			<col id="entryCol">
 			#if( $programStageInstance.programInstance.program.displayProvidedOtherFacility == 'true' )
 			<col id="facilityCol">       
 			#end
 			<tr>
-				<th>$i18n.getString( "nr" )</th>
 				<th>$i18n.getString( "data_element" )</th>                   
 				<th>$i18n.getString( "entry" )</th>
 				#if( $programStageInstance.programInstance.program.displayProvidedOtherFacility == 'true' )
@@ -76,8 +74,6 @@
 			#set( $key = $programStageDataElement.dataElement.id )
 			#set( $patientDataValue = $patientDataValueMap.get( $key ) )    
 			<tr #alternate( $mark )>
-				##dataElementRowCount
-				<td>$dataElementRowCount</td>        
 				##data element name
 				<td class='text-column'>
 					<span id="value[$programStageDataElement.dataElement.id].name" title="$!encoder.htmlEncode( $programStageDataElement.dataElement.description )">

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/listPatient.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/listPatient.vm	2012-02-17 13:00:14 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/listPatient.vm	2012-02-17 15:48:13 +0000
@@ -24,6 +24,7 @@
 		  <col width="20">                        
 		  <col width="20"> 
           <tr>
+			<th>#</th>
             <th>$i18n.getString( "full_name" )</th>        
             <th>$i18n.getString( "gender" )</th>
             <th>$i18n.getString( "date_of_birth" )</th>
@@ -39,7 +40,10 @@
           
           #foreach( $patient in $patients )
           	<tr #alternate( $mark )>
-				
+				<td>
+					#set( $nr = ( ( $paging.getCurrentPage() - 1  ) * $paging.pageSize ) + $velocityCount )
+					$nr
+                </td>
 				<td>			
 					$encoder.htmlEncode( $patient.getFullName() )
 				</td>