dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 10783
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2013-05-09 16:04:30 +0200
message:
  Cleanup
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/Chart.java
  dhis-2/dhis-web/dhis-web-visualizer/src/main/java/org/hisp/dhis/visualizer/action/AddOrUpdateChartAction.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-api/src/main/java/org/hisp/dhis/chart/Chart.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/Chart.java	2013-05-08 22:56:40 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/Chart.java	2013-05-09 14:04:30 +0000
@@ -54,7 +54,6 @@
 import org.hisp.dhis.common.view.DimensionalView;
 import org.hisp.dhis.common.view.ExportView;
 import org.hisp.dhis.dataelement.DataElement;
-import org.hisp.dhis.dataelement.DataElementCategoryOption;
 import org.hisp.dhis.dataelement.DataElementGroup;
 import org.hisp.dhis.dataset.DataSet;
 import org.hisp.dhis.i18n.I18nFormat;

=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/java/org/hisp/dhis/visualizer/action/AddOrUpdateChartAction.java'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/java/org/hisp/dhis/visualizer/action/AddOrUpdateChartAction.java	2013-05-09 08:37:01 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/java/org/hisp/dhis/visualizer/action/AddOrUpdateChartAction.java	2013-05-09 14:04:30 +0000
@@ -99,13 +99,6 @@
         this.organisationUnitService = organisationUnitService;
     }
 
-    private OrganisationUnitGroupService organisationUnitGroupService;
-
-    public void setOrganisationUnitGroupService( OrganisationUnitGroupService organisationUnitGroupService )
-    {
-        this.organisationUnitGroupService = organisationUnitGroupService;
-    }
-
     private CurrentUserService currentUserService;
 
     public void setCurrentUserService( CurrentUserService currentUserService )
@@ -159,7 +152,7 @@
         this.category = category;
     }
 
-    private String filter;
+    private String filter; //TODO fix
 
     public void setFilter( String filter )
     {
@@ -278,13 +271,6 @@
         this.organisationUnitIds = organisationUnitIds;
     }
 
-    private String organisationUnitGroupSetId;
-
-    public void setOrganisationUnitGroupSetId( String organisationUnitGroupSetId )
-    {
-        this.organisationUnitGroupSetId = organisationUnitGroupSetId;
-    }
-
     private Boolean system;
 
     public void setSystem( Boolean system )
@@ -487,9 +473,6 @@
             }
         }
 
-        /*chart.setOrganisationUnitGroupSet( organisationUnitGroupSetId != null ? organisationUnitGroupService
-            .getOrganisationUnitGroupSet( organisationUnitGroupSetId ) : null ); */
-
         chart.setUser( system == null ? currentUserService.getCurrentUser() : null );
 
         chart.setRegression( trendLine );