------------------------------------------------------------
revno: 10832
committer: Tran Chau <tran.hispviet...@gmail.com>
branch nick: dhis2
timestamp: Tue 2013-05-14 20:16:44 +0700
message:
Include the dropdown that appears in the advanced search by default, showing
Overdue in tracking module.
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/searchPatientCriteria.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-06 04:40:47 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/smsReminder.js 2013-05-14 13:16:44 +0000
@@ -49,7 +49,6 @@
{
hideById('listEventDiv');
hideById('advanced-search');
- setFieldValue('statusEvent', "4");
contentDiv = 'listEventDiv';
$('#contentDataRecord').html('');
hideById('advanced-search');
@@ -66,7 +65,8 @@
var programId = getFieldValue('programIdAddPatient');
var searchTexts = "stat_" + programId + "_"
+ startDate + "_" + endDate + "_"
- + getFieldValue('orgunitId') + "_true_4";
+ + getFieldValue('orgunitId') + "_true_"
+ + getFieldValue('statusEvent');
showLoader();
jQuery('#listEventDiv').load('getSMSPatientRecords.action',
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/searchPatientCriteria.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/searchPatientCriteria.vm 2013-05-06 06:38:48 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/searchPatientCriteria.vm 2013-05-14 13:16:44 +0000
@@ -40,6 +40,18 @@
</select>
</td>
</tr>
+ <tr id='programStageAddPatientTR' class='hidden'>
+ <td>$i18n.getString('status')</td>
+ <td>
+ <select id="statusEvent" name="statusEvent">
+ <option value='4'>$i18n.getString("overdue")</option>
+ <option value='2'>$i18n.getString("incomplete")</option>
+ <option value='1'>$i18n.getString("completed")</option>
+ <option value='3'>$i18n.getString("scheduled_in_future")</option>
+ <option value='5'>$i18n.getString("skipped")</option>
+ </select>
+ </td>
+ </tr>
</table>
<div id='advanced-search' class='hidden advanced-search'>
@@ -54,18 +66,6 @@
#else
<input type='checkbox' class='hidden' id='searchInAllFacility' name='searchInAllFacility' />
#end
- <tr id='programStageAddPatientTR' class='hidden'>
- <td>$i18n.getString('status')</td>
- <td>
- <select id="statusEvent" name="statusEvent">
- <option value='4'>$i18n.getString("overdue")</option>
- <option value='2'>$i18n.getString("incomplete")</option>
- <option value='1'>$i18n.getString("completed")</option>
- <option value='3'>$i18n.getString("scheduled_in_future")</option>
- <option value='5'>$i18n.getString("skipped")</option>
- </select>
- </td>
- </tr>
<tr id='dueDateTR' class='hidden'>
<td>$i18n.getString('due_date_from_to')</td>
<td>
_______________________________________________
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
