dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3313
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2011-04-07 13:55:24 +0200
message:
  Work in progress
added:
  labs/dhis-web-light/src/main/java/org/hisp/dhis/light/action/GetReportAction.java
modified:
  labs/dhis-web-light/src/main/java/org/hisp/dhis/light/action/GetReportParamsAction.java
  labs/dhis-web-light/src/main/resources/META-INF/dhis/beans.xml
  labs/dhis-web-light/src/main/resources/struts.xml
  labs/dhis-web-light/src/main/webapp/dhis-web-light/inputReportParamsForm.vm
  labs/dhis-web-light/src/main/webapp/dhis-web-light/javascript/dhis-web-light.js
  labs/dhis-web-light/src/main/webapp/dhis-web-light/style/dhis-web-light.css


--
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 'labs/dhis-web-light/src/main/java/org/hisp/dhis/light/action/GetReportAction.java'
--- labs/dhis-web-light/src/main/java/org/hisp/dhis/light/action/GetReportAction.java	1970-01-01 00:00:00 +0000
+++ labs/dhis-web-light/src/main/java/org/hisp/dhis/light/action/GetReportAction.java	2011-04-07 11:55:24 +0000
@@ -0,0 +1,105 @@
+package org.hisp.dhis.light.action;
+
+/*
+ * Copyright (c) 2004-2010, 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.common.Grid;
+import org.hisp.dhis.i18n.I18nFormat;
+import org.hisp.dhis.reporttable.ReportTableService;
+
+import com.opensymphony.xwork2.Action;
+
+public class GetReportAction
+    implements Action
+{
+    // -------------------------------------------------------------------------
+    // Dependencies
+    // -------------------------------------------------------------------------
+
+    private ReportTableService reportTableService;
+
+    public void setReportTableService( ReportTableService reportTableService )
+    {
+        this.reportTableService = reportTableService;
+    }
+    
+    private I18nFormat format;
+
+    public void setFormat( I18nFormat format )
+    {
+        this.format = format;
+    }
+    
+    // -------------------------------------------------------------------------
+    // Input
+    // -------------------------------------------------------------------------
+
+    private Integer id;
+    
+    public void setId( Integer id )
+    {
+        this.id = id;
+    }
+
+    private Integer reportingPeriod;
+
+    public void setReportingPeriod( Integer reportingPeriod )
+    {
+        this.reportingPeriod = reportingPeriod;
+    }
+
+    private Integer organisationUnitId;
+
+    public void setOrganisationUnitId( Integer organisationUnitId )
+    {
+        this.organisationUnitId = organisationUnitId;
+    }
+    
+    // -------------------------------------------------------------------------
+    // Output
+    // -------------------------------------------------------------------------
+
+    private Grid grid;
+
+    public Grid getGrid()
+    {
+        return grid;
+    }
+
+    // -------------------------------------------------------------------------
+    // Result implementation
+    // -------------------------------------------------------------------------
+
+    @Override
+    public String execute()
+        throws Exception
+    {
+        grid = reportTableService.getReportTableGrid( id, format, reportingPeriod, organisationUnitId );
+        
+        return SUCCESS;
+    }
+}

=== modified file 'labs/dhis-web-light/src/main/java/org/hisp/dhis/light/action/GetReportParamsAction.java'
--- labs/dhis-web-light/src/main/java/org/hisp/dhis/light/action/GetReportParamsAction.java	2011-04-07 08:52:20 +0000
+++ labs/dhis-web-light/src/main/java/org/hisp/dhis/light/action/GetReportParamsAction.java	2011-04-07 11:55:24 +0000
@@ -44,7 +44,6 @@
 
 /**
  * @author Lars Helge Overland
- * @version $Id$
  */
 public class GetReportParamsAction
     implements Action

=== modified file 'labs/dhis-web-light/src/main/resources/META-INF/dhis/beans.xml'
--- labs/dhis-web-light/src/main/resources/META-INF/dhis/beans.xml	2011-04-07 08:52:20 +0000
+++ labs/dhis-web-light/src/main/resources/META-INF/dhis/beans.xml	2011-04-07 11:55:24 +0000
@@ -11,6 +11,11 @@
     <property name="currentUserService" ref="org.hisp.dhis.user.CurrentUserService"/>
   </bean>
 	
+  <bean id="org.hisp.dhis.light.action.GetReportAction" 
+    class="org.hisp.dhis.light.action.GetReportAction" scope="prototype">
+    <property name="reportTableService" ref="org.hisp.dhis.reporttable.ReportTableService"/>
+  </bean>
+	
   <bean id="org.hisp.dhis.light.action.GetChartAction"
     class="org.hisp.dhis.light.action.GetChartAction" scope="prototype">
     <property name="chartService" ref="org.hisp.dhis.chart.ChartService"/>

=== modified file 'labs/dhis-web-light/src/main/resources/struts.xml'
--- labs/dhis-web-light/src/main/resources/struts.xml	2011-04-07 10:29:18 +0000
+++ labs/dhis-web-light/src/main/resources/struts.xml	2011-04-07 11:55:24 +0000
@@ -12,6 +12,11 @@
 	  <result name="success" type="velocity">/dhis-web-light/main.vm</result>
 	  <param name="page">/dhis-web-light/dashboard.vm</param>
     </action>
+    
+    <action name="getReport" class="org.hisp.dhis.light.action.GetReportAction">
+	  <result name="success" type="velocity">/dhis-web-light/main.vm</result>
+	  <param name="page">/dhis-web-commons/ajax/htmlGrid.vm</param>
+    </action>
 
     <action name="getReportParams" class="org.hisp.dhis.light.action.GetReportParamsAction">
 	  <result name="success" type="velocity">/dhis-web-light/main.vm</result>

=== modified file 'labs/dhis-web-light/src/main/webapp/dhis-web-light/inputReportParamsForm.vm'
--- labs/dhis-web-light/src/main/webapp/dhis-web-light/inputReportParamsForm.vm	2011-04-07 10:29:18 +0000
+++ labs/dhis-web-light/src/main/webapp/dhis-web-light/inputReportParamsForm.vm	2011-04-07 11:55:24 +0000
@@ -51,7 +51,7 @@
 
 <div class="labelDiv">
 #if( $!reportParams.isSet() )
-<input type="button" value="$i18n.getString( 'get_report' )" onclick="generateReport()" style="width:150px" />
+<input type="button" value="$i18n.getString( 'get_report' )" onclick="generateReport()" style="width:150px; height:26px;" />
 #end
 </div>
 

=== modified file 'labs/dhis-web-light/src/main/webapp/dhis-web-light/javascript/dhis-web-light.js'
--- labs/dhis-web-light/src/main/webapp/dhis-web-light/javascript/dhis-web-light.js	2011-04-07 08:52:20 +0000
+++ labs/dhis-web-light/src/main/webapp/dhis-web-light/javascript/dhis-web-light.js	2011-04-07 11:55:24 +0000
@@ -26,7 +26,7 @@
 	return false;
 }	
 
-function generateReportTable()
+function generateReport()
 {
 	if ( validationError() )
 	{
@@ -45,5 +45,5 @@
         url += "&organisationUnitId=" + paramOrganisationUnit;
     }
     
-	window.location.href = "exportTable.action?type=html&" + url;
+	window.location.href = "getReport.action?" + url;
 }

=== modified file 'labs/dhis-web-light/src/main/webapp/dhis-web-light/style/dhis-web-light.css'
--- labs/dhis-web-light/src/main/webapp/dhis-web-light/style/dhis-web-light.css	2011-04-07 10:29:18 +0000
+++ labs/dhis-web-light/src/main/webapp/dhis-web-light/style/dhis-web-light.css	2011-04-07 11:55:24 +0000
@@ -67,7 +67,7 @@
 
 div#selectionTree 
 {
-  font-size: 1em; /* Size to change */
+  font-size: 1em;
   background-color: white;
   overflow:auto;
   border:1px solid #cccccc;   
@@ -75,24 +75,21 @@
 
 div#selectionTree ul 
 {
-  margin: 0em 0em 0em 1.5em;
-}
-
-div#selectionTree>ul 
-{
-  margin-left: 0em;
+  padding: 0em;
+  margin: 0em;
 }
 
 div#selectionTree li 
 {
+  margin: 0em 0em 0em 1.1em;
   list-style-type: none;
-  white-space: nowrap; /* Makes list items never wrap */
+  white-space: nowrap;
 }
 
 div#selectionTree span.toggle 
 {
   font-family: courier new, monospace;
-  font-size: 1em; /* Size to change */
+  font-size: 1em;
   cursor: pointer;
 }