dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 8250
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2012-09-25 13:10:24 +0700
message:
  Add an Add-new link in Relationship area in dashboard..
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/relationshipPatient.js
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientDashboard.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/relationshipPatient.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/relationshipPatient.js	2012-09-24 05:02:17 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/relationshipPatient.js	2012-09-25 06:10:24 +0000
@@ -28,6 +28,8 @@
 	hideById( 'searchDiv' );
 	hideById( 'listPatientDiv' );
 	hideById( 'listRelationshipDiv' );
+	hideById( 'patientDashboard' );
+	hideById( 'enrollmentDiv' );
 	setInnerHTML('editPatientDiv', '');
 	
 	jQuery('#loaderDiv').show();

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientDashboard.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientDashboard.vm	2012-09-24 09:08:49 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientDashboard.vm	2012-09-25 06:10:24 +0000
@@ -13,9 +13,8 @@
 							<table width='100%'>
 								<tr><th>
 									$i18n.getString("demographics")
-									<a href="javascript:showUpdatePatientForm( '$patient.id', true );"><label class='bold'>&laquo; $i18n.getString("edit_profile") &raquo;</label></a>
-									<a href="javascript:getPatientLocation( '$patient.id', true );"><label class='bold'>&laquo; $i18n.getString("change_location") &raquo;</label></a>
-							
+									<a href="javascript:showUpdatePatientForm( '$patient.id', true );"><label class='bold'>&laquo;$i18n.getString("edit_profile")&raquo;</label></a>
+									<a href="javascript:getPatientLocation( '$patient.id', true );"><label class='bold'> &laquo;$i18n.getString("change_location")&raquo;</label></a>
 								</th></tr>
 							</table>
 							<div class="contentProviderTable">
@@ -77,7 +76,7 @@
 							<table width='100%'>
 								<tr><th>
 										$i18n.getString("active_programs")
-										<a href='javascript:showProgramEnrollmentForm( "$patient.id" )'><label class='bold'>&laquo; $i18n.getString("enroll_program") &raquo;</label></a>
+										<a href='javascript:showProgramEnrollmentForm( "$patient.id" )'><label class='bold'>&laquo;$i18n.getString("enroll_program")&raquo;</label></a>
 									</th>
 								</tr>
 							</table>
@@ -154,7 +153,8 @@
 							<table width='100%'>
 								<tr><th>
 									$i18n.getString("relationships")
-									<a href="javascript:setFieldValue( 'isShowPatientList', 'false' ); showRelationshipList( '$patient.id' );"><label class='bold'>&laquo; $i18n.getString("management") &raquo;</label></a>
+									<a href="javascript:setFieldValue( 'isShowPatientList', 'false' ); showRelationshipList( '$patient.id' );"><label class='bold'>&laquo;$i18n.getString("management")&raquo;</label></a>
+									<a href="javascript:showAddRelationshipPatient( '$patient.id', false );"><label class='bold'> &laquo;$i18n.getString("add_new_patient")&raquo;</label></a>
 									</th></tr>
 							</table>
 							<div class="contentProviderTable">