dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 11025
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2013-05-27 20:24:15 +0200
message:
  Report table, null check
modified:
  dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/DataQueryParams.java
  dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/tablecreator/action/GetReportParamsAction.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-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/DataQueryParams.java'
--- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/DataQueryParams.java	2013-05-26 14:06:51 +0000
+++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/DataQueryParams.java	2013-05-27 18:24:15 +0000
@@ -334,7 +334,7 @@
      */
     public int getIndicatorDimensionIndex()
     {
-        return getInputDimensionNamesAsList().indexOf( INDICATOR_DIM_ID );
+        return getDimensionIdentifiersAsList().indexOf( INDICATOR_DIM_ID );
     }
     
     /**
@@ -342,7 +342,7 @@
      */
     public int getDataElementDimensionIndex()
     {
-        return getInputDimensionNamesAsList().indexOf( DATAELEMENT_DIM_ID );
+        return getDimensionIdentifiersAsList().indexOf( DATAELEMENT_DIM_ID );
     }
     
     /**
@@ -350,7 +350,7 @@
      */
     public int getDataSetDimensionIndex()
     {
-        return getInputDimensionNamesAsList().indexOf( DATASET_DIM_ID );
+        return getDimensionIdentifiersAsList().indexOf( DATASET_DIM_ID );
     }
 
     /**
@@ -358,7 +358,7 @@
      */
     public int getCategoryOptionComboDimensionIndex()
     {
-        return getInputDimensionNamesAsList().indexOf( CATEGORYOPTIONCOMBO_DIM_ID );
+        return getDimensionIdentifiersAsList().indexOf( CATEGORYOPTIONCOMBO_DIM_ID );
     }
     
     /**
@@ -366,7 +366,7 @@
      */
     public int getPeriodDimensionIndex()
     {
-        return getInputDimensionNamesAsList().indexOf( PERIOD_DIM_ID );
+        return getDimensionIdentifiersAsList().indexOf( PERIOD_DIM_ID );
     }
     
     /**
@@ -834,7 +834,7 @@
     // Supportive methods
     // -------------------------------------------------------------------------
 
-    private List<String> getInputDimensionNamesAsList()
+    private List<String> getDimensionIdentifiersAsList()
     {
         List<String> list = new ArrayList<String>();
         

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/tablecreator/action/GetReportParamsAction.java'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/tablecreator/action/GetReportParamsAction.java	2013-01-25 15:24:37 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/tablecreator/action/GetReportParamsAction.java	2013-05-27 18:24:15 +0000
@@ -175,7 +175,7 @@
             }
         }
         
-        if ( reportParams.isParamReportingMonth() && relatives != null )
+        if ( reportParams != null && reportParams.isParamReportingMonth() && relatives != null )
         {
             CalendarPeriodType periodType = (CalendarPeriodType) relatives.getPeriodType();
             periods = periodType.generateLast5Years( new Date() );