dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 4812
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2011-10-04 09:51:20 +0700
message:
  Remove title Common Information, id rows and close icon in top corner in details area ( Summary Report ).
modified:
  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/javascript/report.js
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportSelect.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/detailsPatient.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/detailsPatient.vm	2011-09-29 05:04:07 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/detailsPatient.vm	2011-10-04 02:51:20 +0000
@@ -1,16 +1,8 @@
 <div style="float:right">
-	<a href="javascript:hideDetails()" title="$i18n.getString( 'hide_details' )"><img src="../images/close.png" alt="$i18n.getString( 'hide_details' )"></a>
+	<a href="javascript:hideDetails()" title="$i18n.getString( 'hide_details' )"><img src="../images/close.png" alt="$i18n.getString( 'hide_details' )" id='closeBtn'></a>
 </div>
 <table>
 	<tr>
-		<td><label class="bold">$i18n.getString( "common_info" )</label></td>
-	</tr>
-	<tr>
-		<td><label class="bold">$i18n.getString('id') : </label>
-			$patient.id
-		</td>
-	</tr>
-	<tr>
 		<td><label class="bold">$i18n.getString('full_name') : </label>
 			$patient.getFullName()
 		</td>

=== 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-09-29 07:02:02 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/report.js	2011-10-04 02:51:20 +0000
@@ -109,7 +109,11 @@
 
 function patientDetails( patientId )
 {
-	$('<div id="patientDetailsArea">' ).load( 'getPatientDetails.action?id=' + patientId ).dialog({
+	jQuery('#patientDetailsArea' ).load( 'getPatientDetails.action?id=' + patientId 
+		,function(){
+			hideById('closeBtn');
+			$( "#loaderDiv" ).hide();
+		}).dialog({
 			title: i18n_patient_profile,
 			maximize: true, 
 			closable: true,

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportSelect.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportSelect.vm	2011-10-04 02:39:49 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportSelect.vm	2011-10-04 02:51:20 +0000
@@ -53,6 +53,7 @@
 <hr style="clear:both">
 
 <div id="contentDiv"></div>
+<div id='patientDetailsArea' style='display:none;'></div>
 
 <span id="message"></span>