dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 8301
committer: Lai <lai.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2012-09-28 16:17:17 +0700
message:
  clean code
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/java/org/hisp/dhis/light/singleevent/action/SaveSingleEventAction.java
  dhis-2/dhis-web/dhis-web-light/src/main/resources/org/hisp/dhis/light/i18n_module.properties
  dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/beneficiaryProgramList.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-09-28 08:13:37 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/singleevent/action/FindSingleEventOptionSetAction.java	2012-09-28 09:17:17 +0000
@@ -128,13 +128,6 @@
     public String execute()
         throws Exception
     {
-/*        this.test = (Map<String, String>) SessionUtils.getSessionVar( "test" );
-        System.out.println( "size: " + this.test.size() );
-        System.out.println( "Key word: " + this.keyword );
-        System.out.println( "ID: " + this.dataElementIdForSearching );
-        System.out.println( "program ID: " + this.programId);
-        System.out.println( "patient ID: " + this.patientId);
-        System.out.println( "org ID: " + this.organisationUnitId);*/
         DataElement dataElement = dataElementService.getDataElement( this.dataElementIdForSearching );
         
         OptionSet optionSet = dataElement.getOptionSet();

=== 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-09-28 08:13:37 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/singleevent/action/GetSingleEventFormAction.java	2012-09-28 09:17:17 +0000
@@ -165,8 +165,6 @@
     public String execute()
         throws Exception
     {
-        System.out.println("searching Result: " + searchResult );
-        
         if( SessionUtils.getSessionVar( "prevDataValues" ) != null )
         {
             this.prevDataValues = (Map<String, String>) SessionUtils.getSessionVar( "prevDataValues" );

=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/singleevent/action/SaveSingleEventAction.java'
--- dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/singleevent/action/SaveSingleEventAction.java	2012-09-28 08:13:37 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/singleevent/action/SaveSingleEventAction.java	2012-09-28 09:17:17 +0000
@@ -422,9 +422,6 @@
             
             if( dataElement.getOptionSet() != null && dataElement.getOptionSet().getOptions().size() > 15)
             {
-                System.out.println("truoc: "+parameterMap.get( "preDE"+dataElement.getId() ));
-                System.out.println("sau: "+parameterMap.get( "DE"+dataElement.getId() ));
-                
                 this.keyword = parameterMap.get( "DE"+dataElement.getId() ).trim();
                 
                 dataElementIdForSearching = dataElement.getId();

=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/resources/org/hisp/dhis/light/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-light/src/main/resources/org/hisp/dhis/light/i18n_module.properties	2012-09-28 08:13:37 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/resources/org/hisp/dhis/light/i18n_module.properties	2012-09-28 09:17:17 +0000
@@ -43,6 +43,7 @@
 reply=Reply
 form_complete=Form complete
 completed=Completed
+complete_programs=Completed Programs
 saved_section=Saved Section
 sections=Sections
 current_activityplan=Current Activity Plan

=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/beneficiaryProgramList.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/beneficiaryProgramList.vm	2012-09-24 07:42:21 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/beneficiaryProgramList.vm	2012-09-28 09:17:17 +0000
@@ -30,7 +30,7 @@
         #end
 	</ul>
 </p>
-<h2>Completed Programs</h2>
+<h2>$i18n.getString("complete_programs")</h2>
 <p>
 	<ul>
 		#if( $listOfCompletedProgram.size() != 0 )