dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 12572
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2013-10-11 14:11:20 +0700
message:
  Add authority for searching person in other orgunits.
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties
  dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/searchPatientCriteria.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties


--
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/resources/org/hisp/dhis/caseentry/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties	2013-10-11 06:50:09 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties	2013-10-11 07:11:20 +0000
@@ -685,6 +685,6 @@
 there_are_active_search_filter_click_on_arrow_to_show_them = there are active search filter, click on arrow to show them.
 add_relative = Add relative
 orgunit_search_type = Orgunit search type
-all_orgunits = All orgunits
-user_orgunits = User orgunits
-selected_and_all_below = Selected and all below
\ No newline at end of file
+selected_and_all_below = Selected and all below
+all_visible = All visible
+all_in_system = All in system
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml	2013-10-09 11:26:54 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml	2013-10-11 07:11:20 +0000
@@ -36,6 +36,12 @@
 			</result>
 			<param name="requiredAuthorities">F_SEARCH_PATIENT_IN_ALL_FACILITIES</param>
 		</action>
+		
+		<action name="searchInOtherOrgunits" class="org.hisp.dhis.caseentry.action.NoAction">
+			<result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonResponseSuccess.vm
+			</result>
+			<param name="requiredAuthorities">F_SEARCH_PATIENT_IN_OTHER_ORGUNITS</param>
+		</action>
 
 		<action name="searchPatient"
 			class="org.hisp.dhis.caseentry.action.patient.SearchPatientAction">

=== 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-10-11 06:50:09 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/searchPatientCriteria.vm	2013-10-11 07:11:20 +0000
@@ -81,24 +81,25 @@
 		<tr>
 			<td colspan='4'>
 				$i18n.getString('select_orgunit_for_search'): <span id='orgunitForSearch'>$!organisationUnit.name</span>
-				<input type='button' id='selectOtherOrgunitBtn' value='$i18n.getString("select_other_orgunit")' />
-				<input type='button' id='clearAndCloseSearchBtn' value='$i18n.getString("clear_and_close")' onclick='clearAndCloseSearch();'/>
+				&nbsp;&nbsp;&nbsp;<input type='button' id='clearAndCloseSearchBtn' value='$i18n.getString("clear_and_close")' onclick='clearAndCloseSearch();'/>
 			</td>
 		</tr>
-		<tr id='searchBySelectedUnitTD'>
+		<tr>
 			<td>$i18n.getString('orgunit_search_type')</td>
 			<td>
 				<select id='facilityLB' name='facilityLB'>
 					<option value='' />$i18n.getString('selected')</option>
+					#if( $auth.hasAccess( "dhis-web-caseentry", "searchInOtherOrgunits" ) )
+						<option value='searchInBelowSelectedOrgunit' />$i18n.getString('selected_and_all_below')</option>
+					#end
+					<option value='searchInUserOrgunits' />$i18n.getString('all_visible')</option>
 					#if( $auth.hasAccess( "dhis-web-caseentry", "searchAllFacilities" ) )
-						<option value='searchInAllOrgunits' />$i18n.getString('all_orgunits')</option>
+						<option value='searchInAllOrgunits' />$i18n.getString('all_in_system')</option>
 					#end
-					<option value='searchInUserOrgunits' />$i18n.getString('user_orgunits')</option>
-					<option value='searchBelowOrgunit' />$i18n.getString('selected_and_all_below')</option>
 				</select>
 			</td>
 		</tr>
-		<tr id='enrollmentSelectTR' class='hidden' >
+		<tr id="enrollmentSelectTR" class='hidden' >
 			<td>$i18n.getString('show')</td>
 			<td>
 				<select id='statusEnrollment'>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties	2013-10-11 04:31:33 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties	2013-10-11 07:11:20 +0000
@@ -132,7 +132,8 @@
 F_PATIENTATTRIBUTEVALUE_ADD=Add Person Attribute Value
 F_ADD_PROGRAM_INDICATOR = Add/Update Program Indicator
 F_PATIENT_CHANGE_LOCATION = Change Person Location
-F_SEARCH_PATIENT_IN_ALL_FACILITIES = Search Person In All Facilities
+F_SEARCH_PATIENT_IN_ALL_FACILITIES = Search Person In All Orgunits
+F_SEARCH_PATIENT_IN_OTHER_ORGUNITS = Search Person In Other Orgunits
 F_ADD_PATIENT_REGISTRATION_FORM=Add Person Registration Form
 F_PROGRAM_INSTANCE_MANAGEMENT = Program Event Management
 F_PROGRAM_INSTANCE_DELETE = Delete Program Enrollment