dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 5520
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2011-12-21 17:15:27 +0700
message:
  Add patient infor into table.
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStageDataElementService.java
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/detailsPatient.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-api/src/main/java/org/hisp/dhis/program/ProgramStageDataElementService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStageDataElementService.java	2010-02-22 09:19:15 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStageDataElementService.java	2011-12-21 10:15:27 +0000
@@ -52,4 +52,5 @@
     Collection<ProgramStageDataElement> get( ProgramStage programStage );
     
     Collection<DataElement> getListDataElement( ProgramStage programStage );
+    
 }

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/detailsPatient.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/detailsPatient.vm	2011-12-21 09:21:08 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/detailsPatient.vm	2011-12-21 10:15:27 +0000
@@ -1,26 +1,38 @@
 <table>
 	<tr>
-		<td><label class="bold">$i18n.getString('full_name') : </label>
+		<td>
+			<label class="bold">$i18n.getString('full_name') : </label>
+		</td>
+		<td>
 			$patient.getFullName()
 		</td>
 	</tr>
 	<tr>
-		<td><label class="bold">$i18n.getString('gender') : </label>
+		<td>
+			<label class="bold">$i18n.getString('gender') : </label>
+		</td>
+		<td>
 			$i18n.getString($patient.gender)
 		</td>
 	</tr>
 	<tr>
 		<td><label class="bold">$i18n.getString('dob_type') : </label>
+		</td>
+		<td>
 			$!patient.dobType
 		</td>
 	</tr>
 	<tr>
 		<td><label class="bold">$i18n.getString('date_of_birth') : </label>
+		</td>
+		<td>
 			$format.formatDate( $!patient.birthDate )
 		</td>
 	</tr>
 	<tr>
 		<td><label class="bold">$i18n.getString('blood_group') : </label>
+		</td>
+		<td>
 			#if($!patient.bloodGroup && !$patient.bloodGroup.equals("")) $patient.bloodGroup #else $i18n.getString('none') #end
 		</td>
 	</tr>
@@ -34,9 +46,11 @@
 		<td>
 			<label class="bold">
 				#if($!patientIdentifier.identifierType)  $!patientIdentifier.identifierType.name
-				#else $i18n.getString( "patient_system_id") #end 
+				#else $i18n.getString( "patient_system_id") #end :
 			</label>
-			 : $patientIdentifier.identifier
+		</td>
+		<td>
+			  $patientIdentifier.identifier
 		</td>
 	</tr>
 	#end
@@ -49,6 +63,8 @@
 		#if( $patientAttributeValueMap.get( $attribute.id ) != " " )
 		<tr>
 			<td><label class="bold">$attribute.name : </label>
+			</td>
+			<td>
 				#if($attribute.valueType=="YES/NO")
 					$i18n.getString( $patientAttributeValueMap.get( $attribute.id ) )
 				#else
@@ -62,11 +78,10 @@
 	<tr><td>&nbsp;</td></tr>
 	<tr>
 		<td><label class="bold">$i18n.getString( "enrolled_in_program" )</label></td>
-	</tr>
-	#foreach( $program in $patient.programs )
-	<tr>
-		<td>$program.name</td>
-	</tr>
-	#end
-	
+		<td>
+			#foreach( $program in $patient.programs )
+				$program.name<br>
+			#end
+		</td>
+	</tr>
 </table>
\ No newline at end of file