dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 18468
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2015-03-03 17:42:44 +0100
message:
  Event analytics, including legend set info in header
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/GridHeader.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/QueryItem.java
  dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/DefaultEventAnalyticsService.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/common/GridHeader.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/GridHeader.java	2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/GridHeader.java	2015-03-03 16:42:44 +0000
@@ -54,6 +54,8 @@
     private boolean meta;
     
     private String optionSet;
+    
+    private String legendSet;
 
     // -------------------------------------------------------------------------
     // Constructors
@@ -128,7 +130,7 @@
      * @param meta meta
      * @param optionSet optionSet
      */
-    public GridHeader( String name, String column, String type, boolean hidden, boolean meta, String optionSet )
+    public GridHeader( String name, String column, String type, boolean hidden, boolean meta, String optionSet, String legendSet )
     {
         this.name = name;
         this.column = column;
@@ -136,6 +138,7 @@
         this.hidden = hidden;
         this.meta = meta;
         this.optionSet = optionSet;
+        this.legendSet = legendSet;
     }
 
     // -------------------------------------------------------------------------
@@ -223,6 +226,18 @@
         this.optionSet = optionSet;
     }
 
+    @JsonProperty
+    @JsonView( {DetailedView.class} )
+    public String getLegendSet()
+    {
+        return legendSet;
+    }
+
+    public void setLegendSet( String legendSet )
+    {
+        this.legendSet = legendSet;
+    }
+
     // -------------------------------------------------------------------------
     // hashCode, equals, toString
     // -------------------------------------------------------------------------

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/QueryItem.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/QueryItem.java	2015-02-27 18:45:42 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/QueryItem.java	2015-03-03 16:42:44 +0000
@@ -119,6 +119,11 @@
         return legendSet != null;
     }
     
+    public String getLegendSetUid()
+    {
+        return legendSet != null ? legendSet.getUid() : null;
+    }
+    
     public boolean hasFilter()
     {
         return filters != null && !filters.isEmpty();

=== modified file 'dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/DefaultEventAnalyticsService.java'
--- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/DefaultEventAnalyticsService.java	2015-03-03 10:20:32 +0000
+++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/DefaultEventAnalyticsService.java	2015-03-03 16:42:44 +0000
@@ -181,7 +181,9 @@
 
         for ( QueryItem item : params.getItems() )
         {
-            grid.addHeader( new GridHeader( item.getItem().getUid(), item.getItem().getName(), item.getTypeAsString(), false, true, item.getOptionSet() ) );
+            String legendSet = item.hasLegendSet() ? item.getLegendSet().getUid() : null;
+            
+            grid.addHeader( new GridHeader( item.getItem().getUid(), item.getItem().getName(), item.getTypeAsString(), false, true, item.getOptionSet(), legendSet ) );
         }
 
         grid.addHeader( new GridHeader( "value", "Value", Double.class.getName(), false, false ) );
@@ -290,7 +292,7 @@
 
         for ( QueryItem item : params.getItems() )
         {
-            grid.addHeader( new GridHeader( item.getItem().getUid(), item.getItem().getName(), item.getTypeAsString(), false, true, item.getOptionSet() ) );
+            grid.addHeader( new GridHeader( item.getItem().getUid(), item.getItem().getName(), item.getTypeAsString(), false, true, item.getOptionSet(), item.getLegendSetUid() ) );
         }
 
         // ---------------------------------------------------------------------