dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 6560
committer: Long <thanhlongngo1988>
branch nick: dhis2
timestamp: Fri 2012-04-13 15:56:48 +0700
message:
  [mobile] fix minor bugs
added:
  dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/beneficiarySearchResult.vm
modified:
  dhis-2/dhis-web/dhis-web-light/src/main/resources/META-INF/dhis/beans.xml
  dhis-2/dhis-web/dhis-web-light/src/main/resources/struts.xml
  dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/beneficiaryList.vm
  dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/beneficiaryRegistrationForm.vm
  dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/beneficiarySearchingForm.vm
  dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/selectActivityType.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-light/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-light/src/main/resources/META-INF/dhis/beans.xml	2012-04-13 03:30:35 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/resources/META-INF/dhis/beans.xml	2012-04-13 08:56:48 +0000
@@ -243,6 +243,14 @@
 		scope="prototype">
 	</bean>
 	
+	<bean
+		id="org.hisp.dhis.light.beneficiaryenrollment.action.SearchBeneficiaryAction"
+		class="org.hisp.dhis.light.beneficiaryenrollment.action.SearchBeneficiaryAction"
+		scope="prototype">
+		<property name="patientService"
+			ref="org.hisp.dhis.patient.PatientService"/>
+	</bean>
+	
 	<!-- Dashboard -->
 	
 	<bean id="org.hisp.dhis.light.dashboard.action.ProvideContentAction"

=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-light/src/main/resources/struts.xml	2012-04-13 03:30:35 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/resources/struts.xml	2012-04-13 08:56:48 +0000
@@ -158,14 +158,22 @@
 				/dhis-web-light/main.vm</result>
 			<param name="page">
 				/dhis-web-light/selectEnrollmentOrganisationUnits.vm</param>
-		</action>
-		
-		<action name="showBeneficiarySearchingForm"
-			class="org.hisp.dhis.light.beneficiaryenrollment.action.GetBeneficiaryEnrollmentOrganisationUnitAction">
-			<result name="success" type="velocity">
-				/dhis-web-light/main.vm</result>
-			<param name="page">
-				/dhis-web-light/beneficiarySearchingForm.vm</param>
+		</action>
+		
+		<action name="showBeneficiarySearchingForm"
+			class="org.hisp.dhis.light.beneficiaryenrollment.action.GetBeneficiaryEnrollmentOrganisationUnitAction">
+			<result name="success" type="velocity">
+				/dhis-web-light/main.vm</result>
+			<param name="page">
+				/dhis-web-light/beneficiarySearchingForm.vm</param>
+		</action>
+		
+		<action name="searchBeneficiary"
+			class="org.hisp.dhis.light.beneficiaryenrollment.action.SearchBeneficiaryAction">
+			<result name="success" type="velocity">
+				/dhis-web-light/main.vm</result>
+			<param name="page">
+				/dhis-web-light/beneficiarySearchResult.vm</param>
 		</action>
 		<!-- Reports -->
 		

=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/beneficiaryList.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/beneficiaryList.vm	2012-04-10 06:49:47 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/beneficiaryList.vm	2012-04-13 08:56:48 +0000
@@ -1,5 +1,5 @@
 <h2>$i18n.getString( "beneficiary_list" )</h2>
-	#if( $validated && $current )
+	#if( $validated)
 		<div class="header-box">
 			<h3 style="text-align: left;">$i18n.getString("successfully_saved")</h3>
 		</div>

=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/beneficiaryRegistrationForm.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/beneficiaryRegistrationForm.vm	2012-04-13 04:19:58 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/beneficiaryRegistrationForm.vm	2012-04-13 08:56:48 +0000
@@ -71,7 +71,7 @@
 <div id="footer">
 <h2>$i18n.getString( "navigate_to" )</h2>
 <ul>
-	<li> <a href="selectRegistrationOrganisationUnit?orgUnitId=$orgUnitId"> $i18n.getString("organisation_unit")</a> </li>
+	<li> <a href="selectRegistrationOrganisationUnit.action"> $i18n.getString("organisation_unit")</a> </li>
 	<li><a href="index.action">$i18n.getString("home")</a></li>
 </ul>
 </div>

=== added file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/beneficiarySearchResult.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/beneficiarySearchResult.vm	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/beneficiarySearchResult.vm	2012-04-13 08:56:48 +0000
@@ -0,0 +1,24 @@
+<h2>$i18n.getString( "search_result_for" ) $keyword</h2>
+	#if( $validated && $current )
+		<div class="header-box">
+			<h3 style="text-align: left;">$i18n.getString("successfully_saved")</h3>
+		</div>
+	#else	
+	
+	#end
+<p>
+<ul>
+#foreach( $patient in $patientList )
+	#set($fullName = $patient.getFirstName() + $patient.getMiddle() + $patient.getLastName())
+	<li><a href="selectProgram.action?organisationUnitId=$organisationUnit.id&beneficiaryId=$beneficiary.id&current=$current">$!encoder.htmlEncode( ${fullName} )</a></li>
+#end
+</ul>
+</p>
+
+<div id="footer">
+<h2>$i18n.getString( "navigate_to" )</h2>
+<ul>
+	<li><a href="selectActivityType.action?orgUnitId=$organisationUnit.id">$i18n.getString("activity_type")</a></li>
+	<li><a href="index.action">$i18n.getString("home")</a></li>
+</ul>
+</div>
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/beneficiarySearchingForm.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/beneficiarySearchingForm.vm	2012-04-13 03:30:35 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/beneficiarySearchingForm.vm	2012-04-13 08:56:48 +0000
@@ -1,6 +1,6 @@
 <h2>$i18n.getString( "beneficiary_search" )</h2>
 
-	#if( $validated )
+	#if( $validated == true)
 		<div class="header-box">
 			<h3 style="text-align: left;">$i18n.getString("successfully_saved")</h3>
 		</div>

=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/selectActivityType.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/selectActivityType.vm	2012-04-10 06:49:47 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/selectActivityType.vm	2012-04-13 08:56:48 +0000
@@ -1,8 +1,8 @@
 <h2>$i18n.getString( "activity_type" )</h2>
 <p>
 <ul>
-	<li><a href="selectBeneficiary.action?organisationUnitId=$organisationUnitId&current=true">$i18n.getString( "current_activityplan" )</a></li>
-	<li><a href="selectBeneficiary.action?organisationUnitId=$organisationUnitId&current=false">$i18n.getString( "all_activityplan" )</a></li>
+	<li><a href="selectBeneficiary.action?organisationUnitId=$organisationUnitId&current=true&validated=false">$i18n.getString( "current_activityplan" )</a></li>
+	<li><a href="selectBeneficiary.action?organisationUnitId=$organisationUnitId&current=false&validated=false">$i18n.getString( "all_activityplan" )</a></li>
 </ul>
 </p>