dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 5537
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2011-12-22 12:33:49 +0700
message:
  Show Provided elsewhere wrong in Sunnmary report.
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/report.js
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/records.vm
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/report.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/javascript/report.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/report.js	2011-12-21 03:46:55 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/report.js	2011-12-22 05:33:49 +0000
@@ -92,7 +92,7 @@
 
 function viewRecords( programStageInstanceId ) 
 {
-	$('<div id="viewRecordsDiv">' )
+	$('#viewRecordsDiv' )
 		.load( 'viewRecords.action?id=' + programStageInstanceId )
 		.dialog({
 			title: i18n_reports,

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/records.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/records.vm	2011-10-06 05:05:42 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/records.vm	2011-12-22 05:33:49 +0000
@@ -72,8 +72,10 @@
 	      
 	        ##providedByAnotherFacility                
 	        <td style="text-align:center">            
-	            #if( $patientDataValue.providedByAnotherFacility )
-	                $i18n.getString( "yes" )  
+	            #if( !$patientDataValue.providedByAnotherFacility )
+					$patientDataValue.organisationUnit.name
+				#else
+					$i18n.getString("other_facility")
 	            #end                         
 	        </td>    
 	    </tr>    

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/report.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/report.vm	2011-09-29 06:14:57 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/report.vm	2011-12-22 05:33:49 +0000
@@ -57,5 +57,7 @@
     </td>
 </tr>
 </table>
+
+<div id="viewRecordsDiv"></div>
 #end
 <p></p>
\ No newline at end of file