dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 670
committer: Lars Helge Oeverland larshelge@xxxxxxxxx
branch nick: trunk
timestamp: Fri 2009-09-11 11:43:24 +0200
message:
  Removed geoCode property from AggregatedMapValue.
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/aggregation/AggregatedMapValue.java
  dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/jdbc/JdbcDataMartStore.java
  dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/objectmapper/AggregatedMapValueRowMapper.java
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonAggregatedMapValues.vm


--
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/aggregation/AggregatedMapValue.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/aggregation/AggregatedMapValue.java	2009-04-06 18:55:31 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/aggregation/AggregatedMapValue.java	2009-09-11 09:43:24 +0000
@@ -35,8 +35,6 @@
 {
     private int organisationUnitId;
     
-    private String geoCode;
-    
     private String organisationUnitName;
     
     private double value;
@@ -49,10 +47,9 @@
     {   
     }
     
-    public AggregatedMapValue( int organisationUnitId, String geoCode, String organisationUnitName, double value )
+    public AggregatedMapValue( int organisationUnitId, String organisationUnitName, double value )
     {
         this.organisationUnitId = organisationUnitId;
-        this.geoCode = geoCode;
         this.organisationUnitName = organisationUnitName;
         this.value = value;
     }
@@ -64,7 +61,6 @@
     public void clear()
     {
         this.organisationUnitId = 0;
-        this.geoCode = null;
         this.organisationUnitName = null;
         this.value = 0.0;
     }
@@ -83,16 +79,6 @@
         this.organisationUnitId = organisationUnitId;
     }
     
-    public String getGeoCode()
-    {
-        return geoCode;
-    }
-
-    public void setGeoCode( String geoCode )
-    {
-        this.geoCode = geoCode;
-    }
-
     public String getOrganisationUnitName()
     {
         return organisationUnitName;

=== modified file 'dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/jdbc/JdbcDataMartStore.java'
--- dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/jdbc/JdbcDataMartStore.java	2009-08-09 12:33:08 +0000
+++ dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/jdbc/JdbcDataMartStore.java	2009-09-11 09:43:24 +0000
@@ -367,7 +367,7 @@
         try
         {
             final String sql = 
-                "SELECT o.organisationunitid, o.geocode, o.name, a.value " +
+                "SELECT o.organisationunitid, o.name, a.value " +
                 "FROM aggregatedindicatorvalue AS a, organisationunit AS o " +
                 "WHERE a.indicatorid  = " + indicatorId + " " +
                 "AND a.periodid = " + periodId + " " + 

=== modified file 'dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/objectmapper/AggregatedMapValueRowMapper.java'
--- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/objectmapper/AggregatedMapValueRowMapper.java	2009-04-06 18:55:31 +0000
+++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/objectmapper/AggregatedMapValueRowMapper.java	2009-09-11 09:43:24 +0000
@@ -45,9 +45,8 @@
         final AggregatedMapValue value = new AggregatedMapValue();
         
         value.setOrganisationUnitId( resultSet.getInt( 1 ) );
-        value.setGeoCode( resultSet.getString( 2 ) );
-        value.setOrganisationUnitName( resultSet.getString( 3 ) );
-        value.setValue( resultSet.getDouble( 4 ) );
+        value.setOrganisationUnitName( resultSet.getString( 2 ) );
+        value.setValue( resultSet.getDouble( 3 ) );
         
         return value;
     }

=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonAggregatedMapValues.vm'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonAggregatedMapValues.vm	2009-06-25 11:18:23 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonAggregatedMapValues.vm	2009-09-11 09:43:24 +0000
@@ -2,7 +2,6 @@
 #foreach( $value in $object )
   {
     "organisationUnitId": "$!{value.organisationUnitId}",
-    "geoCode": "$!{value.geoCode}",
     "orgUnit": "$!{value.organisationUnitName}",
     "value": "$!{value.value}"
   },