dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 14934
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2014-04-22 08:05:56 +0800
message:
  Fixed bug - Exception thrown when to click on the Download as Excel button in Tracked entity instance details and history form of Find/Add TEI form
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/activityPlanSelect.vm
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/activityPlan.js
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/selectTrackedEntityInstance.vm
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/trackedEntityInstanceHistory.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/activityPlanSelect.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/activityPlanSelect.vm	2014-04-21 23:47:56 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/activityPlanSelect.vm	2014-04-22 00:05:56 +0000
@@ -132,6 +132,7 @@
 
 <div id='contentDataRecord'></div>
 <div id='eventList'></div>
+<div id='detailsInfo'></div>
 
 #parse( "dhis-web-commons/loader/loader.vm" )
 	

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/activityPlan.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/activityPlan.js	2014-04-21 23:47:56 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/activityPlan.js	2014-04-22 00:05:56 +0000
@@ -141,9 +141,9 @@
 				+ "'></a>";
 		table += "<a href=\"javascript:showTrackedEntityInstanceHistory( '" + uid + "' ) \" "
 				+ " title='"
-				+ i18n_edit
-				+ "'><img src= '../images/edit.png' alt='"
-				+ i18n_edit
+				+ i18n_tracked_entity_instance_details_and_history
+				+ "'><img src= '../images/information.png' alt='"
+				+ i18n_tracked_entity_instance_details_and_history
 				+ "'></a>";
 		table += "</td>";
 		table += "</tr>";

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/selectTrackedEntityInstance.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/selectTrackedEntityInstance.vm	2014-04-21 23:47:56 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/selectTrackedEntityInstance.vm	2014-04-22 00:05:56 +0000
@@ -24,6 +24,7 @@
 <div id='listRelationshipDiv'></div> <!-- List relationship -->
 <div id='addRelationshipDiv'></div> <!-- Add relationship -->
 <div id='migrationEntityInstanceDiv'></div> <!-- Migration EntityInstance -->
+<div id="detailsInfo"></div>
 
 #parse( "/dhis-web-commons/loader/loader.vm" )
 

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/trackedEntityInstanceHistory.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/trackedEntityInstanceHistory.vm	2014-02-07 20:25:49 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/trackedEntityInstanceHistory.vm	2014-04-22 00:05:56 +0000
@@ -1,7 +1,7 @@
 <p></p>
 <div style="margin-bottom:15px">
-<input type="button" value="$i18n.getString( 'get_report_as_xls' )" onclick="exportTrackedEntityInstanceHistory( '$entityInstance.id', 'xls' )" >
-<input type="button" value="$i18n.getString( 'get_report_as_pdf' )" onclick="exportTrackedEntityInstanceHistory( '$entityInstance.id', 'pdf' )" >
+<input type="button" value="$i18n.getString( 'get_report_as_xls' )" onclick="exportTrackedEntityInstanceHistory( '$entityInstance.uid', 'xls' )" >
+<input type="button" value="$i18n.getString( 'get_report_as_pdf' )" onclick="exportTrackedEntityInstanceHistory( '$entityInstance.uid', 'pdf' )" >
 </div>
 <div>
 #foreach( $grid in $grids )