dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 11462
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2013-07-22 18:18:51 +0700
message:
  minor changes to grid rendering, added CsvGridView
added:
  dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/view/CsvGridView.java
modified:
  dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/view/AbstractGridView.java
  dhis-2/dhis-web/dhis-web-api/src/main/resources/META-INF/dhis/servlet.xml


--
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-web/dhis-web-api/src/main/java/org/hisp/dhis/api/view/AbstractGridView.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/view/AbstractGridView.java	2013-07-22 10:26:11 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/view/AbstractGridView.java	2013-07-22 11:18:51 +0000
@@ -66,7 +66,7 @@
 
             for ( Field field : fields )
             {
-                Collection<IdentifiableObject> identifiableObjects = ReflectionUtils.invokeGetterMethod( field.getName(), webMetaData );
+                List<IdentifiableObject> identifiableObjects = ReflectionUtils.invokeGetterMethod( field.getName(), webMetaData );
 
                 if ( identifiableObjects.isEmpty() )
                 {
@@ -74,6 +74,8 @@
                 }
 
                 Grid grid = new ListGrid();
+                grid.setTitle( identifiableObjects.get( 0 ).getClass().getSimpleName() + "s" );
+
                 grid.addHeader( new GridHeader( "UID", false, false ) );
                 grid.addHeader( new GridHeader( "Name", false, false ) );
                 grid.addHeader( new GridHeader( "Code", false, false ) );
@@ -94,14 +96,11 @@
             IdentifiableObject identifiableObject = (IdentifiableObject) object;
 
             Grid grid = new ListGrid();
-            grid.addHeader( new GridHeader( "UID", false, false ) );
-            grid.addHeader( new GridHeader( "Name", false, false ) );
-            grid.addHeader( new GridHeader( "Code", false, false ) );
+            grid.addEmptyHeaders( 2 );
 
-            grid.addRow();
-            grid.addValue( identifiableObject.getUid() );
-            grid.addValue( identifiableObject.getName() );
-            grid.addValue( identifiableObject.getCode() );
+            grid.addRow().addValue( "UID" ).addValue( identifiableObject.getUid() );
+            grid.addRow().addValue( "Name" ).addValue( identifiableObject.getName() );
+            grid.addRow().addValue( "Code" ).addValue( identifiableObject.getCode() );
 
             grids.add( grid );
         }

=== added file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/view/CsvGridView.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/view/CsvGridView.java	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/view/CsvGridView.java	2013-07-22 11:18:51 +0000
@@ -0,0 +1,55 @@
+package org.hisp.dhis.api.view;
+
+/*
+ * Copyright (c) 2004-2013, 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 org.hisp.dhis.api.utils.ContextUtils;
+import org.hisp.dhis.common.Grid;
+import org.hisp.dhis.system.grid.GridUtils;
+
+import java.io.OutputStream;
+import java.util.List;
+
+/**
+ * @author Morten Olav Hansen <mortenoh@xxxxxxxxx>
+ */
+public class CsvGridView extends AbstractGridView
+{
+    public CsvGridView()
+    {
+        setContentType( ContextUtils.CONTENT_TYPE_CSV );
+    }
+
+    @Override
+    protected void renderGrids( List<Grid> grids, OutputStream outputStream ) throws Exception
+    {
+        if ( !grids.isEmpty() )
+        {
+            GridUtils.toCsv( grids.get( 0 ), outputStream );
+        }
+    }
+}

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/META-INF/dhis/servlet.xml'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/META-INF/dhis/servlet.xml	2013-07-22 10:26:11 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/META-INF/dhis/servlet.xml	2013-07-22 11:18:51 +0000
@@ -35,6 +35,7 @@
         <entry key="png" value="image/png" />
         <entry key="pdf" value="application/pdf" />
         <entry key="xls" value="application/vnd.ms-excel" />
+        <entry key="csv" value="application/csv" />
       </map>
     </constructor-arg>
   </bean>
@@ -66,6 +67,8 @@
         <bean class="org.hisp.dhis.api.view.PdfGridView" />
 
         <bean class="org.hisp.dhis.api.view.ExcelGridView" />
+
+        <bean class="org.hisp.dhis.api.view.CsvGridView" />
       </list>
     </property>