------------------------------------------------------------
revno: 11202
committer: Tran Chau <tran.hispviet...@gmail.com>
branch nick: dhis2
timestamp: Wed 2013-06-12 10:54:02 +0700
message:
Load program report when to click on the Details icon in Lost follow-up list.
modified:
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/smsReminder.js
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingRecords.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingSelect.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/updatePatientForm.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/smsReminder.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/smsReminder.js 2013-05-29 08:36:29 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/smsReminder.js 2013-06-12 03:54:02 +0000
@@ -284,3 +284,22 @@
validateAdvancedSearch();
}
}
+
+// load program instance history
+function programTrackingReport( programInstanceId )
+{
+ $('#programTrackingReportDiv').load("getProgramReportHistory.action",
+ {
+ programInstanceId:programInstanceId
+ }).dialog(
+ {
+ title:i18n_program_report,
+ maximize:true,
+ closable:true,
+ modal:true,
+ overlay:{background:'#000000', opacity:0.1},
+ width:850,
+ height:500
+ });
+}
+
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingRecords.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingRecords.vm 2013-06-03 06:15:53 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingRecords.vm 2013-06-12 03:54:02 +0000
@@ -87,7 +87,7 @@
#if( $patientId != $patient.id )
<td class='$alterclass' name='opt_$patient.id'>
<a href="javascript:isDashboard=false;showPatientDashboardForm( '$patient.id' )" title="$i18n.getString( 'patient_dashboard' )"><img src="../images/enroll.png" alt='$i18n.getString( "patient_dashboard" )'></a>
- <a href="javascript:showPatientHistory('$patient.id')" title='$i18n.getString( "patient_details_and_history" )'><img src="../images/information.png" alt='$i18n.getString( "patient_details_and_history" )'></a>
+ <a href="javascript:programTrackingReport( $programStageInstance.programInstance.id )" title='$i18n.getString( "patient_details_and_history" )'><img src="../images/information.png" alt='$i18n.getString( "patient_details_and_history" )'></a>
</td>
#else
<script>
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingSelect.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingSelect.vm 2013-06-04 06:13:22 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingSelect.vm 2013-06-12 03:54:02 +0000
@@ -49,6 +49,7 @@
<div id='listRelationshipDiv'></div> <!-- List relationship -->
<div id='addRelationshipDiv'></div> <!-- Add relationship -->
<div id='migrationPatientDiv'></div> <!-- Migration Patient -->
+<div id='programTrackingReportDiv'></div>
#parse( "dhis-web-commons/loader/loader.vm" )
@@ -161,6 +162,7 @@
var i18n_reenrollment_confirm_message = '$encoder.jsEscape( $i18n.getString( "reenrollment_confirm_message" ) , "'")';
var i18n_comment = '$encoder.jsEscape( $i18n.getString( "comment" ) , "'")';
var i18n_message = '$encoder.jsEscape( $i18n.getString( "message" ) , "'")';
+ var i18n_program_report = '$encoder.jsEscape( $i18n.getString( "program_report" ) , "'")';
var checkedDuplicate = false;
var registration = false;
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/updatePatientForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/updatePatientForm.vm 2013-06-10 04:48:07 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/updatePatientForm.vm 2013-06-12 03:54:02 +0000
@@ -78,7 +78,7 @@
<tr>
<td colspan='2'><br><div id='barcodePatient'></div></td>
<script>
- $("#barcodePatient").barcode("$!systemIdentifier", "code39",{barWidth:2, barHeight:30});
+ $("#barcodePatient").barcode("$!systemIdentifier", "ean13",{barWidth:2, barHeight:30});
</script>
</tr>
<tr>
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
