dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 6135
committer: Hieu <hieu.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2012-02-29 09:50:11 +0700
message:
  local vn - Changed model to fix bug translation.
modified:
  local/vn/dhis-service-spreadsheet-reporting/pom.xml
  local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/ExportReport.java
  local/vn/dhis-web-spreadsheet-reporting/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 'local/vn/dhis-service-spreadsheet-reporting/pom.xml'
--- local/vn/dhis-service-spreadsheet-reporting/pom.xml	2012-02-28 08:50:46 +0000
+++ local/vn/dhis-service-spreadsheet-reporting/pom.xml	2012-02-29 02:50:11 +0000
@@ -29,10 +29,6 @@
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-service-aggregationengine-default</artifactId>
     </dependency>
-    <!--dependency>
-      <groupId>org.hisp.dhis</groupId>
-      <artifactId>dhis-service-options</artifactId>
-    </dependency-->
         
   </dependencies>
   <properties>

=== modified file 'local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/ExportReport.java'
--- local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/ExportReport.java	2011-11-18 04:24:39 +0000
+++ local/vn/dhis-service-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/ExportReport.java	2012-02-29 02:50:11 +0000
@@ -33,6 +33,7 @@
 import java.util.List;
 import java.util.Set;
 
+import org.hisp.dhis.common.BaseIdentifiableObject;
 import org.hisp.dhis.organisationunit.OrganisationUnit;
 import org.hisp.dhis.user.UserAuthorityGroup;
 
@@ -41,11 +42,8 @@
  * @version $Id$
  */
 public abstract class ExportReport
+    extends BaseIdentifiableObject
 {
-    private int id;
-
-    private String name;
-
     private Integer periodRow;
 
     private Integer periodColumn;
@@ -197,7 +195,7 @@
     public Collection<ExportItem> getExportItemsByItemType( String... types )
     {
         List<ExportItem> items = new ArrayList<ExportItem>();
-        
+
         for ( ExportItem e : this.exportItems )
         {
             for ( String type : types )

=== modified file 'local/vn/dhis-web-spreadsheet-reporting/pom.xml'
--- local/vn/dhis-web-spreadsheet-reporting/pom.xml	2012-02-28 08:50:46 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/pom.xml	2012-02-29 02:50:11 +0000
@@ -33,7 +33,7 @@
     <dependency>
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-service-spreadsheet-reporting</artifactId>
-	  <version>2.8-SNAPSHOT</version>
+	  <version>${project.version}</version>
     </dependency>
 	<dependency>
       <groupId>org.hisp.dhis</groupId>