------------------------------------------------------------
revno: 8625
committer: Tran Chau <[email protected]>
branch nick: dhis2
timestamp: Mon 2012-10-22 13:11:19 +0700
message:
Enable event-box if status is changed from skipped to other status in
dashboard.
modified:
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/visitSchedule.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/commons.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js 2012-10-22 06:00:03 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js 2012-10-22 06:11:19 +0000
@@ -787,16 +787,19 @@
status:status
}, function ( json )
{
+ enable('ps_' + programStageInstanceId);
var eventBox = jQuery('#ps_' + programStageInstanceId);
eventBox.attr('status',status);
setEventColorStatus( programStageInstanceId, status );
resetActiveEvent( eventBox.attr("pi") );
+
if( status==1 || status==2 ){
hideById('del_' + programStageInstanceId);
}
else{
showById('del_' + programStageInstanceId);
if( status==5){
+ disable('ps_' + programStageInstanceId);
var id = 'ps_' + programStageInstanceId;
if( jQuery(".stage-object-selected").attr('id')==id )
{
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/visitSchedule.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/visitSchedule.vm 2012-10-22 03:02:27 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/visitSchedule.vm 2012-10-22 06:11:19 +0000
@@ -70,11 +70,7 @@
#if($status==4)
<option value='4'>$i18n.getString("overdue")</option>
<option value='5'>$i18n.getString("skipped")</option>
- #elseif($status==3)
- <option value='3'>$i18n.getString("scheduled_in_future")</option>
- <option value='5'>$i18n.getString("skipped")</option>
- #elseif($status==5)
- <option value='4'>$i18n.getString("overdue")</option>
+ #elseif($status==3 || $status==5 )
<option value='3'>$i18n.getString("scheduled_in_future")</option>
<option value='5'>$i18n.getString("skipped")</option>
#else
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : [email protected]
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
