dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 5554
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2011-12-22 19:14:45 +0100
message:
  Fixed typo in Chart object
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/Chart.java
  dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.java
  dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/reporttable/impl/DefaultReportTableService.java
  dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/utils/WebLinkPopulator.java
  dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/chart/action/SaveChartAction.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	2011-12-22 17:28:35 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/Chart.java	2011-12-22 18:14:45 +0000
@@ -90,7 +90,7 @@
     public static final String DIMENSION_PERIOD = "PERIOD";
     public static final String DIMENSION_ORGANISATIONUNIT = "ORGANISATIONUNIT";
 
-    private String domainAxixLabel;
+    private String domainAxisLabel;
 
     private String rangeAxisLabel;
 
@@ -348,14 +348,14 @@
 
     @XmlElement( name = "domainAxisLabel" )
     @JsonProperty( value = "domainAxisLabel" )
-    public String getDomainAxixLabel()
+    public String getDomainAxisLabel()
     {
-        return domainAxixLabel;
+        return domainAxisLabel;
     }
 
-    public void setDomainAxixLabel( String domainAxixLabel )
+    public void setDomainAxisLabel( String domainAxisLabel )
     {
-        this.domainAxixLabel = domainAxixLabel;
+        this.domainAxisLabel = domainAxisLabel;
     }
 
     @XmlElement

=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.java'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.java	2011-12-22 17:28:35 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.java	2011-12-22 18:14:45 +0000
@@ -546,7 +546,7 @@
 
         CategoryAxis xAxis = plot.getDomainAxis();
         xAxis.setCategoryLabelPositions( CategoryLabelPositions.UP_45 );
-        xAxis.setLabel( chart.getDomainAxixLabel() );
+        xAxis.setLabel( chart.getDomainAxisLabel() );
 
         ValueAxis yAxis = plot.getRangeAxis();
         yAxis.setLabel( chart.getRangeAxisLabel() );
@@ -567,12 +567,12 @@
 
         if ( chart.isType( TYPE_STACKED_BAR ) )
         {
-            stackedBarChart = ChartFactory.createStackedBarChart( chart.getName(), chart.getDomainAxixLabel(),
+            stackedBarChart = ChartFactory.createStackedBarChart( chart.getName(), chart.getDomainAxisLabel(),
                 chart.getRangeAxisLabel(), dataSet, PlotOrientation.VERTICAL, true, false, false );
         }
         else
         {
-            stackedBarChart = ChartFactory.createStackedBarChart3D( chart.getName(), chart.getDomainAxixLabel(),
+            stackedBarChart = ChartFactory.createStackedBarChart3D( chart.getName(), chart.getDomainAxisLabel(),
                 chart.getRangeAxisLabel(), dataSet, PlotOrientation.VERTICAL, true, false, false );
         }
 

=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/reporttable/impl/DefaultReportTableService.java'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/reporttable/impl/DefaultReportTableService.java	2011-12-22 17:28:35 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/reporttable/impl/DefaultReportTableService.java	2011-12-22 18:14:45 +0000
@@ -43,7 +43,6 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Date;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
@@ -171,6 +170,7 @@
     public Grid getReportTableGrid( String uid, I18nFormat format, Date reportingPeriod, String organisationUnitUid )
     {
         ReportTable reportTable = getReportTable( uid );
+        
         OrganisationUnit organisationUnit = organisationUnitService.getOrganisationUnit( organisationUnitUid );
 
         return getReportTableGrid( reportTable.getId(), format, reportingPeriod, organisationUnit.getId() );

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/utils/WebLinkPopulator.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/utils/WebLinkPopulator.java	2011-12-22 13:18:22 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/utils/WebLinkPopulator.java	2011-12-22 18:14:45 +0000
@@ -416,7 +416,6 @@
             handleIdentifiableObjectCollection( reportTable.getCategoryOptionCombos() );
             handleIdentifiableObjectCollection( reportTable.getDataElements() );
             handleIdentifiableObjectCollection( reportTable.getIndicators() );
-            handleIdentifiableObjectCollection( reportTable.getGroups() );
             handleIdentifiableObjectCollection( reportTable.getDataSets() );
         }
     }

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/chart/action/SaveChartAction.java'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/chart/action/SaveChartAction.java	2011-12-22 13:09:31 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/chart/action/SaveChartAction.java	2011-12-22 18:14:45 +0000
@@ -320,7 +320,7 @@
         }
 
         chart.setName( name );
-        chart.setDomainAxixLabel( StringUtils.trimToNull( domainAxisLabel ) );
+        chart.setDomainAxisLabel( StringUtils.trimToNull( domainAxisLabel ) );
         chart.setRangeAxisLabel( StringUtils.trimToNull( rangeAxisLabel ) );
         chart.setHideSubtitle( hideSubtitle );
         chart.setType( type );