dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 9683
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2013-02-01 13:45:27 +0200
message:
  Added web pivot to portal
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/comparator/PeriodComparator.java
  dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultAnalyticsService.java
  dhis-2/dhis-web/dhis-web-portal/pom.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-api/src/main/java/org/hisp/dhis/period/comparator/PeriodComparator.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/comparator/PeriodComparator.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/comparator/PeriodComparator.java	2013-02-01 11:45:27 +0000
@@ -40,6 +40,8 @@
 public class PeriodComparator
     implements Comparator<Period>
 {
+    public static final PeriodComparator INSTANCE = new PeriodComparator();
+    
     public int compare( Period period1, Period period2 )
     {
         if ( period1.getStartDate() == null )

=== modified file 'dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultAnalyticsService.java'
--- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultAnalyticsService.java	2013-02-01 11:13:47 +0000
+++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultAnalyticsService.java	2013-02-01 11:45:27 +0000
@@ -101,6 +101,7 @@
     
     //TODO completeness
     //TODO make sure data x dims are successive
+    //TODO check if partition table exists before query
     
     @Autowired
     private AnalyticsManager analyticsManager;

=== modified file 'dhis-2/dhis-web/dhis-web-portal/pom.xml'
--- dhis-2/dhis-web/dhis-web-portal/pom.xml	2012-12-07 19:38:28 +0000
+++ dhis-2/dhis-web/dhis-web-portal/pom.xml	2013-02-01 11:45:27 +0000
@@ -170,6 +170,12 @@
       <version>${project.version}</version>
       <type>war</type>
     </dependency>
+    <dependency>
+      <groupId>org.hisp.dhis</groupId>
+      <artifactId>dhis-web-pivot</artifactId>
+      <version>${project.version}</version>
+      <type>war</type>
+    </dependency>
   </dependencies>
   <properties>
     <rootDir>../../</rootDir>