dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 17409
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2014-11-10 21:29:29 +0100
message:
  PNG charts, implemented sorting of categories
added:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/NumericSortWrapper.java
modified:
  dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.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

=== added file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/NumericSortWrapper.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/NumericSortWrapper.java	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/NumericSortWrapper.java	2014-11-10 20:29:29 +0000
@@ -0,0 +1,100 @@
+package org.hisp.dhis.common;
+
+/*
+ * Copyright (c) 2004-2014, University of Oslo
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * Neither the name of the HISP project nor the names of its contributors may
+ * be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Class which wraps an object to make it easy to sort. This class provides a
+ * numeric for sorting and implements the Comparable interface.
+ * 
+ * @author Lars Helge Overland
+ */
+public class NumericSortWrapper<T>
+    implements Comparable<NumericSortWrapper<T>>
+{
+    private T object;
+
+    private Double number;
+    
+    private int sortOrder;
+    
+    /**
+     * @param object the object to wrap.
+     * @param number the number to use as basis for sorting.
+     * @param sortOrder the sort order, negative
+     */
+    public NumericSortWrapper( T object, Double number, int sortOrder )
+    {
+        this.object = object;
+        this.number = number;
+        this.sortOrder = sortOrder;
+    }
+    
+    @Override
+    public int compareTo( NumericSortWrapper<T> other )
+    {
+        if ( sortOrder < 0 )
+        {
+            return number != null ? other != null ? number.compareTo( other.getNumber() ) : 1 : -1;
+        }
+        else
+        {
+            return other != null && other.getNumber() != null ? number != null ? other.getNumber().compareTo( number ) : 1 : -1;
+        }
+    }
+    
+    public T getObject()
+    {
+        return object;
+    }
+    
+    public Double getNumber()
+    {
+        return number;
+    }
+    
+    public static <T> List<T> getObjectList( List<NumericSortWrapper<T>> wrapperList )
+    {
+        List<T> list = new ArrayList<>();
+        
+        for ( NumericSortWrapper<T> wrapper : wrapperList )
+        {
+            list.add( wrapper.getObject() );
+        }
+        
+        return list;
+    }
+    
+    public String toString()
+    {
+        return "[Number: " + number + ", object: " + object + "]"; 
+    }
+}

=== 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	2014-11-10 19:46:15 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.java	2014-11-10 20:29:29 +0000
@@ -45,6 +45,7 @@
 import java.awt.Font;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -67,6 +68,7 @@
 import org.hisp.dhis.common.DimensionalObject;
 import org.hisp.dhis.common.Grid;
 import org.hisp.dhis.common.NameableObject;
+import org.hisp.dhis.common.NumericSortWrapper;
 import org.hisp.dhis.dataelement.DataElement;
 import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
 import org.hisp.dhis.dataelement.DataElementOperand;
@@ -819,6 +821,11 @@
         List<NameableObject> seriez = new ArrayList<>( chart.series() );
         List<NameableObject> categories = new ArrayList<>( chart.category() );
         
+        if ( chart.hasSortOrder() )
+        {
+            categories = getSortedCategories( categories, chart, valueMap );
+        }
+        
         for ( NameableObject series : seriez )
         {
             double categoryIndex = 0;
@@ -879,6 +886,35 @@
         return BaseAnalyticalObject.sortKey( key );
     }
 
+    /**
+     * Returns a list of sorted nameable objects. Sorting is defined per the
+     * corresponding value in the given value map.
+     */
+    private List<NameableObject> getSortedCategories( List<NameableObject> categories, BaseChart chart, Map<String, Object> valueMap )
+    {
+        NameableObject series = chart.series().get( 0 );
+        
+        int sortOrder = chart.getSortOrder() * -1;
+        
+        List<NumericSortWrapper<NameableObject>> list = new ArrayList<>();
+        
+        for ( NameableObject category : categories )
+        {
+            String key = getKey( series, category, chart.getAnalyticsType() );
+            
+            Object value = valueMap.get( key );
+            
+            if ( value != null && value instanceof Number )
+            {
+                list.add( new NumericSortWrapper<NameableObject>( category, (Double ) value, sortOrder ) );
+            }
+        }
+        
+        Collections.sort( list );
+        
+        return NumericSortWrapper.getObjectList( list );
+    }
+    
     // -------------------------------------------------------------------------
     // CRUD operations
     // -------------------------------------------------------------------------