dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #05857
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 1839: Fixed bugs in NBITS Reports
------------------------------------------------------------
revno: 1839
committer: HISP <HISP@HISP-PC>
branch nick: trunk
timestamp: Wed 2010-05-12 11:55:11 +0530
message:
Fixed bugs in NBITS Reports
modified:
local/in/dhis-in-services/dhis-in-service-configuration/pom.xml
local/in/dhis-in-services/dhis-in-service-survey/pom.xml
local/in/dhis-in-services/pom.xml
local/in/dhis-web-reports-national/pom.xml
local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/activeplan/action/ActivePlanReportsResultAction.java
local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/pivottable/action/GetPivotTableAction.java
local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/ranking/action/GenerateRankingReportResultAction.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 'local/in/dhis-in-services/dhis-in-service-configuration/pom.xml'
--- local/in/dhis-in-services/dhis-in-service-configuration/pom.xml 2010-04-12 10:13:41 +0000
+++ local/in/dhis-in-services/dhis-in-service-configuration/pom.xml 2010-05-12 06:25:11 +0000
@@ -26,10 +26,13 @@
<artifactId>dhis-in-api</artifactId>
<version>${version}</version>
</dependency>
+ <!--
<dependency>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-service-jdbc</artifactId>
+ <version>${version}</version>
</dependency>
+ -->
<dependency>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-service-core</artifactId>
=== modified file 'local/in/dhis-in-services/dhis-in-service-survey/pom.xml'
--- local/in/dhis-in-services/dhis-in-service-survey/pom.xml 2010-04-12 10:13:41 +0000
+++ local/in/dhis-in-services/dhis-in-service-survey/pom.xml 2010-05-12 06:25:11 +0000
@@ -26,10 +26,12 @@
<artifactId>dhis-in-api</artifactId>
<version>${version}</version>
</dependency>
+ <!--
<dependency>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-service-jdbc</artifactId>
</dependency>
+ -->
<dependency>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-service-core</artifactId>
=== modified file 'local/in/dhis-in-services/pom.xml'
--- local/in/dhis-in-services/pom.xml 2010-04-12 10:13:41 +0000
+++ local/in/dhis-in-services/pom.xml 2010-05-12 06:25:11 +0000
@@ -18,7 +18,7 @@
<!--<module>dhis-in-service-dbmanager</module>
<module>dhis-in-service-linelisting</module> -->
<!--<module>dhis-in-service-reports</module>-->
- <!-- <module>dhis-in-service-survey</module>-->
+ <module>dhis-in-service-survey</module>
</modules>
<dependencies>
=== modified file 'local/in/dhis-web-reports-national/pom.xml'
--- local/in/dhis-web-reports-national/pom.xml 2010-04-12 10:13:41 +0000
+++ local/in/dhis-web-reports-national/pom.xml 2010-05-12 06:25:11 +0000
@@ -39,10 +39,12 @@
<artifactId>dhis-in-service-configuration</artifactId>
<version>${version}</version>
</dependency>
+ <!--
<dependency>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-service-jdbc</artifactId>
</dependency>
+ -->
<dependency>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-service-patient</artifactId>
@@ -70,10 +72,12 @@
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-service-datamart-default</artifactId>
</dependency>
+ <!--
<dependency>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-service-user-hibernate</artifactId>
</dependency>
+ -->
<dependency>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-service-aggregationengine-default</artifactId>
@@ -128,11 +132,12 @@
</dependency>
<!-- Other -->
-
+ <!--
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring</artifactId>
</dependency>
+ -->
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
=== modified file 'local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/activeplan/action/ActivePlanReportsResultAction.java'
--- local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/activeplan/action/ActivePlanReportsResultAction.java 2010-03-04 04:54:04 +0000
+++ local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/activeplan/action/ActivePlanReportsResultAction.java 2010-05-12 06:25:11 +0000
@@ -818,7 +818,7 @@
Collection<ProgramStageInstance> psisList = patientCompletedPSIList.get( patient );
//System.out.println( "psisList size = " + psisList.size() );
String dename = d1e.getShortName();
- if ( psisList.size() != 0 )
+ if ( psisList != null && psisList.size() != 0 )
{
for ( ProgramStageInstance programStageInstanceName : psisList )
{
=== modified file 'local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/pivottable/action/GetPivotTableAction.java'
--- local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/pivottable/action/GetPivotTableAction.java 2010-04-12 21:23:33 +0000
+++ local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/pivottable/action/GetPivotTableAction.java 2010-05-12 06:25:11 +0000
@@ -27,19 +27,17 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+import java.util.Collections;
import java.util.Comparator;
import org.hisp.dhis.i18n.I18nFormat;
import org.hisp.dhis.indicator.Indicator;
import org.hisp.dhis.period.Period;
-
-
-import com.opensymphony.xwork2.Action;
-
-import edu.emory.mathcs.backport.java.util.Collections;
import org.hisp.dhis.reports.api.PivotTable;
import org.hisp.dhis.reports.api.PivotTableService;
+import com.opensymphony.xwork2.Action;
+
/**
* @author Lars Helge Overland
* @version $Id$
=== modified file 'local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/ranking/action/GenerateRankingReportResultAction.java'
--- local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/ranking/action/GenerateRankingReportResultAction.java 2010-02-26 12:20:54 +0000
+++ local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/ranking/action/GenerateRankingReportResultAction.java 2010-05-12 06:25:11 +0000
@@ -6,6 +6,7 @@
import java.io.InputStream;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.Date;
import java.util.Iterator;
import java.util.List;
@@ -57,8 +58,6 @@
import com.opensymphony.xwork2.Action;
-import edu.emory.mathcs.backport.java.util.Collections;
-
public class GenerateRankingReportResultAction implements Action
{
private static final String NULL_REPLACEMENT = "0";
