dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 8149
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2012-09-20 13:42:42 +0700
message:
  Add link to dashboard of relationship.
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/reminder/SetEventStatusAction.java
  dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties
  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/java/org/hisp/dhis/caseentry/action/reminder/SetEventStatusAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/reminder/SetEventStatusAction.java	2012-09-20 05:15:30 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/reminder/SetEventStatusAction.java	2012-09-20 06:42:42 +0000
@@ -27,8 +27,6 @@
 
 package org.hisp.dhis.caseentry.action.reminder;
 
-import java.util.Date;
-
 import org.hisp.dhis.program.ProgramStageInstance;
 import org.hisp.dhis.program.ProgramStageInstanceService;
 

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties	2012-09-20 05:15:30 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties	2012-09-20 06:42:42 +0000
@@ -456,4 +456,5 @@
 relationships = Relationships
 no_program_available_for_enrollment = No program is available for enrollment
 reschedule = Re-schedule
-the_date_is_scheduled = The date is scheduled
\ No newline at end of file
+the_date_is_scheduled = The date is scheduled
+move_to_dashboard_of = Move to dashboard of
\ No newline at end of file

=== 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-19 13:30:52 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientDashboard.vm	2012-09-20 06:42:42 +0000
@@ -153,14 +153,14 @@
 								<table width='100%'>
 									#foreach( $rel in $relationship )
 										#if($rel.patientA.id==$patient.id)
-											<tr>
-												<td>$rel.relationshipType.bIsToA</td>
-												<td>$rel.patientB.getFullName()</td>
+											<tr onclick="showPatientDashboardForm($rel.patientB.id)" title='$i18n.getString( "move_to_dashboard_of" ) $rel.patientB.getFullName()'>
+												<td><a href='#'>$rel.relationshipType.bIsToA</a></td>
+												<td><a href='#'>$rel.patientB.getFullName()</a></td>
 											</tr>
 										#else
-											<tr>
-												<td>$rel.relationshipType.aIsToB</td>
-												<td>$rel.patientA.getFullName()</td>
+											<tr onclick="showPatientDashboardForm($rel.patientA.id)" title='$i18n.getString( "move_to_dashboard_of" ) $rel.patientB.getFullName()'>
+												<td><a href='#'>$rel.relationshipType.aIsToB</a></td>
+												<td><a href='#'>$rel.patientA.getFullName()</a></td>
 											</tr>
 										#end
 									#end