dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 8681
committer: Lai <lai.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2012-10-24 16:02:06 +0700
message:
  fix bug of single event in web-light
modified:
  dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/singleevent/action/FindSingleEventOptionSetAction.java
  dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/singleevent/action/GetSingleEventFormAction.java
  dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/findBeneficiaryForm.vm
  dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/singleevent/singleEventOptionSetFindForm.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/java/org/hisp/dhis/light/singleevent/action/FindSingleEventOptionSetAction.java'
--- dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/singleevent/action/FindSingleEventOptionSetAction.java	2012-10-03 07:43:08 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/singleevent/action/FindSingleEventOptionSetAction.java	2012-10-24 09:02:06 +0000
@@ -69,6 +69,11 @@
         this.keyword = keyword;
     }
 
+    public String getKeyword()
+    {
+        return keyword;
+    }
+
     private int dataElementIdForSearching;
 
     public void setDataElementIdForSearching( int dataElementIdForSearching )

=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/singleevent/action/GetSingleEventFormAction.java'
--- dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/singleevent/action/GetSingleEventFormAction.java	2012-10-12 09:22:44 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/singleevent/action/GetSingleEventFormAction.java	2012-10-24 09:02:06 +0000
@@ -246,7 +246,7 @@
             // For editing if user finished the form
             Patient patient = patientService.getPatient( this.patientId );
 
-            if ( programInstanceService.getProgramInstances( patient, program ) != null )
+            if ( programInstanceService.getProgramInstances( patient, program ).size() != 0 )
             {
                 List<ProgramInstance> proInstanceList = (List<ProgramInstance>) programInstanceService
                     .getProgramInstances( patient, program );
@@ -260,7 +260,7 @@
 
                 ProgramStageInstance proStageInstance = programStageInstanceService.getProgramStageInstance(
                     proInstance, programStage );
-                
+
                 this.programStageInstanceId = proStageInstance.getId();
 
                 for ( ProgramStageDataElement each : programStageDataElements )

=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/findBeneficiaryForm.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/findBeneficiaryForm.vm	2012-09-27 06:54:00 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/findBeneficiaryForm.vm	2012-10-24 09:02:06 +0000
@@ -7,7 +7,6 @@
 	#else
 	
 	#end
-
 <form action="findBeneficiary.action" method="POST">
 <div class="header-box" align="center">
 <input type="hidden" name="orgUnitId" value="$orgUnitId"/>	

=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/singleevent/singleEventOptionSetFindForm.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/singleevent/singleEventOptionSetFindForm.vm	2012-10-12 09:22:44 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/singleevent/singleEventOptionSetFindForm.vm	2012-10-24 09:02:06 +0000
@@ -1,4 +1,5 @@
 <h2>$i18n.getString("option_set_searching_result")</h2>
+<p>Searching for: "$keyword"</p>
 <p>
 	#if( $searchingResultList.size() == 0 )
 		No result