------------------------------------------------------------
revno: 8166
committer: Tran Chau <[email protected]>
branch nick: dhis2
timestamp: Fri 2012-09-21 08:14:43 +0700
message:
Search persons by selected unit as default.
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/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/commons.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js 2012-09-20 11:08:58 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js 2012-09-21 01:14:43 +0000
@@ -291,7 +291,8 @@
params += '&listAll=false';
if( getFieldValue('searchByProgramStage') == "false"){
- params += '&searchBySelectedOrgunit=' + byId('searchBySelectedOrgunit').checked;
+ var searchInAllFacility = byId('searchInAllFacility').checked;
+ params += '&searchBySelectedOrgunit=' + !searchInAllFacility;
}
else
{
=== 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 2012-09-21 01:10:53 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/searchPatientCriteria.vm 2012-09-21 01:14:43 +0000
@@ -74,8 +74,8 @@
<input type="button" class='small-button' value='+' onclick='addAttributeOption();'>
</td>
<td id='searchBySelectedUnitTD'>
- $i18n.getString('search_by_selected_unit')
- <input type='checkbox' id='searchBySelectedOrgunit' name='searchBySelectedOrgunit' />
+ $i18n.getString('search_in_all_facilities')
+ <input type='checkbox' id='searchInAllFacility' name='searchInAllFacility' />
</td>
<td>
<input type="button" class='large-button' value='$i18n.getString( "search" )' onclick='validateAdvancedSearch();' id='searchPatientBtn'>
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : [email protected]
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
