dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #19441
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 8473: Validate search criteria in program-stacking.
------------------------------------------------------------
revno: 8473
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2012-10-11 13:52:44 +0700
message:
Validate search criteria in program-stacking.
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-10-11 06:45:11 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js 2012-10-11 06:52:44 +0000
@@ -180,7 +180,9 @@
var flag = true;
var dateOperator = '';
- if (getFieldValue('searchByProgramStage') == "false"){
+ if (getFieldValue('searchByProgramStage') == "false"
+ || ( getFieldValue('searchByProgramStage') == "true"
+ && jQuery( '#advancedSearchTB tr' ).length > 1) ){
jQuery("#searchDiv :input").each( function( i, item )
{
var elementName = $(this).attr('name');
=== 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-10-11 06:45:11 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/searchPatientCriteria.vm 2012-10-11 06:52:44 +0000
@@ -53,8 +53,8 @@
</tr>
#if( $auth.hasAccess( "dhis-web-caseentry", "searchAllFacilities" ) )
<tr id='searchBySelectedUnitTD'>
- <td align='right'>$i18n.getString('search_in_all_facilities') </td>
<td>
+ $i18n.getString('search_in_all_facilities')
<input type='checkbox' id='searchInAllFacility' name='searchInAllFacility' />
</td>
</tr>