dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 8410
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Sat 2012-10-06 22:26:50 +0700
message:
  Minor fix for patient details and program reports form.
modified:
  dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramInstanceService.java
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientHistory.vm
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programInstanceHistory.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-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramInstanceService.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramInstanceService.java	2012-09-20 03:11:15 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramInstanceService.java	2012-10-06 15:26:50 +0000
@@ -330,11 +330,14 @@
         grid.addRow();
         grid.addValue( programInstance.getProgram().getDateOfEnrollmentDescription() );
         grid.addValue( format.formatDate( programInstance.getEnrollmentDate() ) );
+
+        if ( programInstance.getProgram().getDisplayIncidentDate() )
+        {
+            grid.addRow();
+            grid.addValue( programInstance.getProgram().getDateOfIncidentDescription() );
+            grid.addValue( format.formatDate( programInstance.getDateOfIncident() ) );
+        }
         
-        grid.addRow();
-        grid.addValue( programInstance.getProgram().getDateOfIncidentDescription() );
-        grid.addValue( format.formatDate( programInstance.getDateOfIncident() ) );
-
         getProgramStageInstancesReport( grid, programInstance, format, i18n );
 
         return grid;
@@ -356,8 +359,8 @@
             grid.addValue( "" );
 
             grid.addRow();
-            grid.addValue( ">> " + i18n.getString( "program_stage" ) );
-            grid.addValue( programStageInstance.getProgramStage().getName() );
+            grid.addValue( ">> " + programStageInstance.getProgramStage().getName() );
+            grid.addValue( "" );
 
             // -----------------------------------------------------------------
             // due-date && report-date

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientHistory.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientHistory.vm	2012-06-07 09:55:49 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientHistory.vm	2012-10-06 15:26:50 +0000
@@ -26,7 +26,6 @@
 			#set( $mark = false )
 			#foreach( $row in $grid.getVisibleRows() )
 			<tr #alternate($mark)>
-				#set( $nameCol='false' )
 				#foreach( $col in $row )
 					#set( $index = ( $velocityCount - 1 ) )
 					#if( $grid.getVisibleHeaders().get( $index ).meta )

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programInstanceHistory.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programInstanceHistory.vm	2012-09-04 10:10:05 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programInstanceHistory.vm	2012-10-06 15:26:50 +0000
@@ -11,30 +11,16 @@
 		#set( $mark = false )
 		#set( $flag = 0 )
 		#foreach( $row in $grid.getVisibleRows() )
-		<tr #alternate($mark)>
-			#set( $nameCol='false' )
-			#if($flag>1) #set( $flag = 0 ) #end
-			#foreach( $col in $row )
-				#set( $index = ( $velocityCount - 1 ) )
-				#if($col=='')
-					<td>&nbsp;</td>
-					#set( $flag = 1 )
-				#elseif( $flag > 0 )
-					#if( $grid.getVisibleHeaders().get( $index ).meta )
-						<th>$!encoder.htmlEncode( $col )</th>
-					#else 
-						<th>$!col</th>
-					#end
-					#set( $flag = $flag + 1 )
-				#else
-					#if( $grid.getVisibleHeaders().get( $index ).meta )
-						<td>$!encoder.htmlEncode( $col )</td>
+			<tr #alternate($mark)>
+				#foreach( $col in $row )
+					#set( $index = ( $velocityCount - 1 ) )
+					#if( $grid.getVisibleHeaders().get( $index ).meta )
+						<td >$!encoder.htmlEncode( $col )</td>
 					#else 
 						<td>$!col</td>
 					#end
 				#end
-			#end
-		</tr>
+			</tr>
 		#end
 		#set( $mark = !$mark)
 	</tbody>