dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 7033
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2012-05-24 17:58:47 +0700
message:
  (patient) Exception when moving from program summary to tabulary report.
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/SearchPatientAction.java
  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/reportsMenu.vm
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/selectPatient.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/java/org/hisp/dhis/caseentry/action/patient/SearchPatientAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/SearchPatientAction.java	2012-05-24 10:44:17 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/SearchPatientAction.java	2012-05-24 10:58:47 +0000
@@ -72,8 +72,6 @@
 
     private List<Integer> searchingAttributeId = new ArrayList<Integer>();
 
-    private String facilityLB;
-
     // -------------------------------------------------------------------------
     // Output
     // -------------------------------------------------------------------------
@@ -112,11 +110,6 @@
         return patientAttributes;
     }
 
-    public void setFacilityLB( String facilityLB )
-    {
-        this.facilityLB = facilityLB;
-    }
-
     public Map<Integer, String> getMapPatientOrgunit()
     {
         return mapPatientOrgunit;

=== 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	2012-05-24 05:13:57 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml	2012-05-24 10:58:47 +0000
@@ -637,7 +637,7 @@
 			<result name="success" type="velocity">/main.vm</result>
 			<param name="page">/dhis-web-caseentry/tabularReportSelect.vm</param>
 			<param name="menu">/dhis-web-caseentry/reportsMenu.vm</param>
-			<param name="javascripts">../dhis-web-commons/ouwt/ouwt.js,javascript/tabularReport.js,javascript/commons.js</param>
+			<param name="javascripts">../dhis-web-commons/ouwt/ouwt.js,javascript/commons.js</param>
 			<param name="stylesheets">style/report.css</param>
 			<param name="requiredAuthorities">F_GENERATE_BENEFICIARY_TABULAR_REPORT</param>
 		</action>

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportsMenu.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportsMenu.vm	2012-05-23 16:19:55 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportsMenu.vm	2012-05-24 10:58:47 +0000
@@ -2,7 +2,7 @@
 <a href="index.action"><h2>$i18n.getString( "reports" )&nbsp;</h2></a>
 <ul>
     <li><a href="reportSelect.action">$i18n.getString( "program_summary" )&nbsp;</a></li>
-	<li><a href="tabularReportSelect.action"> $i18n.getString( "tabular_report" )&nbsp;</a></li> 
+	<li><a href="app/index.html"> $i18n.getString( "tabular_report" )&nbsp;</a></li> 
 </ul>
 
 <br>

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/selectPatient.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/selectPatient.vm	2012-05-24 05:21:12 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/selectPatient.vm	2012-05-24 10:58:47 +0000
@@ -1,5 +1,4 @@
 <div id='selectDiv'>
-	
 	<h3>$i18n.getString( "patient_management" ) #openHelp( "patient" )</h3>
 	
 	<input type="hidden" id="isShowPatientList" name="isShowPatientList" />
@@ -13,11 +12,22 @@
 			<td><input type="button" value='$i18n.getString( "add_new" )' onclick="showAddPatientForm();"></td>
 		</tr>
 	</table>
-
 </div>
 
 <div id='searchPatientDiv'>
 	<table id='advancedSearchTB'>	
+		<tr>
+			<td>
+				$i18n.getString('search_in')
+			</td>
+			<td>
+				<select id='facilityLB' name='facilityLB' style="width:20.4em" >
+					<option value='1'>$i18n.getString('all_levels')</option>
+					<option value='2'>$i18n.getString("selected_orgunit")</option>
+					<option value='3'>$i18n.getString("include_level_above")</option>
+				</select>
+			</td>
+		</tr>
 		<tbody>
 			<tr id='advSearchBox0'>	       
 				<td id='searchingAttributeIdTD'>