------------------------------------------------------------
revno: 15643
committer: Tran Chau <tran.hispviet...@gmail.com>
branch nick: dhis2
timestamp: Thu 2014-06-12 15:02:29 +0800
message:
Fixed bug - Under the tracked Instance dashboard, the messages button doesnt
load for viewing sent messages and sending messages; the Reports dont load for
viewing and download.
modified:
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/eventMessage.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentForm.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/eventMessage.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/eventMessage.vm 2014-02-07 20:25:49 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/eventMessage.vm 2014-06-12 07:02:29 +0000
@@ -8,7 +8,7 @@
</colgroup>
<thead>
<tr>
- <th class="{sorter: false}">$i18n.getString( "date" )</th>
+ <th class="">$i18n.getString( "date" )</th>
<th class="{sorter: false}">$i18n.getString( "program_stage" )</th>
<th class="{sorter: false}">$i18n.getString( "sender" )</th>
<th class="{sorter: false}">$i18n.getString( "type" )</th>
@@ -117,7 +117,8 @@
var i18n_confirmation_delete_message = '$encoder.jsEscape( $i18n.getString( "confirmation_delete_message" ) , "'" )';
var i18n_deleting = '$encoder.jsEscape( $i18n.getString( "deleting" ) , "'" )';
commentDivToggle(true);
- tableSorter( 'messageList' );
- var sorting = [[0,1]];
- $("#messageList").trigger("sorton", [sorting]);
+ $("#messageList").tablesorter({
+ sortList: [[0,1]]
+ });
+
</script>
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentForm.vm 2014-05-29 15:19:07 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentForm.vm 2014-06-12 07:02:29 +0000
@@ -184,17 +184,17 @@
$('#tabs').tabs();
- $( "#tabs" ).bind( "tabsselect", function(event, ui) {
- if( ui.tab.hash == '#tab-3' ){
+ $("#tabs").tabs().on('tabsactivate', function (event, ui) {
+ if( ui.newPanel.selector == '#tab-3' ){
getVisitSchedule(getFieldValue('programInstanceId'));
}
- else if( ui.tab.hash == '#tab-5' ){
+ else if( ui.newPanel.selector == '#tab-5' ){
programReports(getFieldValue('programInstanceUid'));
}
- else if( ui.tab.hash == '#tab-4' ){
+ else if( ui.newPanel.selector == '#tab-4' ){
getEventMessages(getFieldValue('programInstanceId'));
}
- });
+ });
showById('toogleRiskStatusTD');
jQuery('#tb_$!programInstance.id').css('margin-top',-25);
_______________________________________________
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
