=== 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-06-24 14:23:58 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/activityPlan.js 2014-07-08 08:27:29 +0000 @@ -279,7 +279,12 @@ for ( var i in json.events) { var row = json.events[i]; var uid = row.event; + var eventDate = row.eventDate; + if(eventDate===undefined){ + eventDate = row.dueDate; + } + eventDate = eventDate.substring(0,10); table += "" + eventDate + ""; } table += ""; === 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 2014-05-25 14:36:40 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/smsReminder.js 2014-07-08 08:27:29 +0000 @@ -324,6 +324,10 @@ var row = json.events[i]; var uid = row.event; var eventDate = row.eventDate; + if(eventDate===undefined){ + eventDate = row.dueDate; + } + eventDate = eventDate.substring(0,10); table += "" + eventDate + ""; } table += "";