dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 7598
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2012-07-13 09:11:36 +0700
message:
  clean up code.
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/ShowAddPatientFormAction.java
  dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/GenerateTabularReportAction.java


--
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/ShowAddPatientFormAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/ShowAddPatientFormAction.java	2012-03-27 01:29:30 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/ShowAddPatientFormAction.java	2012-07-13 02:11:36 +0000
@@ -97,8 +97,6 @@
 
     private OrganisationUnit organisationUnit;
 
-    private String year;
-
     // -------------------------------------------------------------------------
     // Action implementation
     // -------------------------------------------------------------------------
@@ -115,10 +113,6 @@
 
         organisationUnit = selectionManager.getSelectedOrganisationUnit();
 
-        SimpleDateFormat dataFormat = new SimpleDateFormat( "y" );
-
-        year = dataFormat.format( new Date() );
-
         return SUCCESS;
     }
 
@@ -145,9 +139,4 @@
     {
         return organisationUnit;
     }
-
-    public String getYear()
-    {
-        return year;
-    }
 }

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/GenerateTabularReportAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/GenerateTabularReportAction.java	2012-07-09 08:32:27 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/GenerateTabularReportAction.java	2012-07-13 02:11:36 +0000
@@ -340,10 +340,7 @@
             grid = programStageInstanceService.getTabularReport( programStage, columns, organisationUnits, level,
                 startValue, endValue, !orderByOrgunitAsc, null, null );
         }
-
-        System.out.println();
-        System.out.println( grid );
-
+        
         return type == null ? SUCCESS : type;
     }