← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 11534: Fix bug - Exception thrown when adding a new person for relationship.

 

------------------------------------------------------------
revno: 11534
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2013-07-29 12:32:58 +0700
message:
  Fix bug - Exception thrown when adding a new person for relationship.
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	2013-07-26 03:33:38 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/relationshipPatient.js	2013-07-29 05:32:58 +0000
@@ -102,11 +102,10 @@
 			showById('listPatientDiv');
 			jQuery('#loaderDiv').hide();
 
-			if( getFieldValue( 'isShowPatientList' ) == 'false' )
-			{
-				showRelationshipList( getFieldValue('id') );
-			}else
-			{
+			if( getFieldValue( 'isShowPatientList' ) == 'false' ){
+				showRelationshipList( getFieldValue('relationshipId') );
+			}
+			else{
 				loadPatientList();
 			}
 		}});

=== 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	2013-06-21 05:44:54 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientDashboard.vm	2013-07-29 05:32:58 +0000
@@ -243,7 +243,7 @@
 <div id='dashboardHistoryDiv' class="dashboard-history" style="display:none;height:250px;width:400px;">
 	<table width="400px;">
 		<colgroup>
-			<col width="100px">
+			<col width="200px">
 			<col width="100px">
 			<col>
 		</colgroup>
@@ -258,7 +258,7 @@
 	<div style="height:200px;width:450px;overflow:auto">
 		<table width='400px'>
 			<colgroup>
-				<col width="100px">
+				<col width="200px">
 				<col width="100px">
 				<col>
 			</colgroup>