dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 265
committer: Lars Helge Oeverland larshelge@xxxxxxxxx
branch nick: trunk
timestamp: Wed 2009-04-29 20:52:10 +0200
message:
  Work in progress on advanced report table features
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTableData.java
  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/jdbc/JDBCReportTableManager.java
  dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/reporttable/statement/GetReportTableStatement.java

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTableData.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTableData.java	2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTableData.java	2009-04-29 18:52:10 +0000
@@ -28,9 +28,7 @@
  */
 
 import java.util.ArrayList;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 import java.util.SortedMap;
 import java.util.TreeMap;
 
@@ -46,7 +44,7 @@
     
     private List<String> prettyPrintColumns = new ArrayList<String>();
     
-    private Set<SortedMap<Integer, String>> rows = new HashSet<SortedMap<Integer,String>>();
+    private List<SortedMap<Integer, String>> rows = new ArrayList<SortedMap<Integer,String>>();
 
     // -------------------------------------------------------------------------
     // Constructors
@@ -90,12 +88,12 @@
         this.prettyPrintColumns = prettyPrintColumns;
     }
 
-    public Set<SortedMap<Integer, String>> getRows()
+    public List<SortedMap<Integer, String>> getRows()
     {
         return rows;
     }
 
-    public void setRows( Set<SortedMap<Integer, String>> rows )
+    public void setRows( List<SortedMap<Integer, String>> rows )
     {
         this.rows = rows;
     }

=== 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	2009-03-24 10:31:31 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/reporttable/impl/DefaultReportTableService.java	2009-04-29 18:52:10 +0000
@@ -282,7 +282,11 @@
     
     public ReportTableData getReportTableData( int id )
     {
-        return reportTableManager.getReportTable( getReportTable( id ) );
+        ReportTable reportTable = getReportTable( id );
+        
+        reportTable.init();
+        
+        return reportTableManager.getReportTable( reportTable );
     }
 
     // -------------------------------------------------------------------------

=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/reporttable/jdbc/JDBCReportTableManager.java'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/reporttable/jdbc/JDBCReportTableManager.java	2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/reporttable/jdbc/JDBCReportTableManager.java	2009-04-29 18:52:10 +0000
@@ -161,9 +161,9 @@
 
             while ( resultSet.next() )
             {
-                Double value = resultSet.getDouble( 1 );
+                final double value = resultSet.getDouble( 1 );
                 
-                StringBuffer identifier = new StringBuffer();
+                final StringBuffer identifier = new StringBuffer();
                 
                 for ( int i = 0; i < columnCount - 1; i++ )
                 {
@@ -172,7 +172,7 @@
                     identifier.append( resultSet.getInt( columnIndex ) + SEPARATOR );                    
                 }
                 
-                String key = identifier.substring( 0, identifier.lastIndexOf( SEPARATOR ) );
+                final String key = identifier.substring( 0, identifier.lastIndexOf( SEPARATOR ) );
                 
                 map.put( key, value );
             }
@@ -219,7 +219,7 @@
 
             for ( int i = 0; i < columnCount; i++ )
             {
-                int index = i + 1;
+                final int index = i + 1;
                 
                 data.getColumns().put( index, metaData.getColumnName( index ) );
                 
@@ -236,7 +236,7 @@
                 
                 for ( int i = 0; i < columnCount; i++ )
                 {
-                    int index = i + 1;
+                    final int index = i + 1;
                                 
                     row.put( index, String.valueOf( resultSet.getObject( index ) ) );
                 }

=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/reporttable/statement/GetReportTableStatement.java'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/reporttable/statement/GetReportTableStatement.java	2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/reporttable/statement/GetReportTableStatement.java	2009-04-29 18:52:10 +0000
@@ -1,5 +1,7 @@
 package org.hisp.dhis.reporttable.statement;
 
+import java.util.Iterator;
+
 import org.hisp.dhis.reporttable.ReportTable;
 
 public class GetReportTableStatement
@@ -21,6 +23,28 @@
     @Override
     protected void init( ReportTable reportTable )
     {
-        statement = "SELECT * FROM " + reportTable.getTableName();
+        StringBuffer buffer = new StringBuffer();
+        
+        buffer.append( "SELECT * FROM " + reportTable.getTableName() );
+        
+        Iterator<String> indexNameColumns = reportTable.getIndexNameColumns().iterator();
+        
+        if ( indexNameColumns.hasNext() )
+        {
+            buffer.append( " ORDER BY " );
+            
+            while ( indexNameColumns.hasNext() )
+            {
+                buffer.append( indexNameColumns.next() );
+                
+                if ( indexNameColumns.hasNext() )
+                {
+                    buffer.append( SEPARATOR );
+                }
+            }
+        }
+        
+        System.out.println( buffer.toString() );
+        statement = buffer.toString();
     }
 }



--
Trunk
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.