dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 15798
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Sun 2014-06-22 09:52:26 +0800
message:
  Minor fixed - Add storedby as aggregated_from_tracker for aggregate data values which are generated from aggregate query builder formulas.
modified:
  dhis-2/dhis-services/dhis-service-eventreporting/src/main/java/org/hisp/dhis/caseaggregation/hibernate/HibernateCaseAggregationConditionStore.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 'dhis-2/dhis-services/dhis-service-eventreporting/src/main/java/org/hisp/dhis/caseaggregation/hibernate/HibernateCaseAggregationConditionStore.java'
--- dhis-2/dhis-services/dhis-service-eventreporting/src/main/java/org/hisp/dhis/caseaggregation/hibernate/HibernateCaseAggregationConditionStore.java	2014-05-17 11:46:23 +0000
+++ dhis-2/dhis-services/dhis-service-eventreporting/src/main/java/org/hisp/dhis/caseaggregation/hibernate/HibernateCaseAggregationConditionStore.java	2014-06-22 01:52:26 +0000
@@ -166,7 +166,7 @@
             grid.addHeader( new GridHeader( i18n.getString( "categoryoptioncomboid" ), true, true ) );
             grid.addHeader( new GridHeader( i18n.getString( "periodid" ), true, true ) );
             grid.addHeader( new GridHeader( i18n.getString( "organisationunitid" ), true, true ) );
-            grid.addHeader( new GridHeader( i18n.getString( "comment" ), true, true ) );
+            grid.addHeader( new GridHeader( i18n.getString( "storedby" ), true, true ) );
             grid.addHeader( new GridHeader( i18n.getString( "dataelementname" ), false, true ) );
             grid.addHeader( new GridHeader( i18n.getString( "categoryoptioncomboname" ), false, true ) );
             grid.addHeader( new GridHeader( i18n.getString( "organisationunitname" ), false, true ) );
@@ -266,11 +266,11 @@
         String sql = "SELECT '" + aggregateDeId + "' as dataelementid, '" + optionComboId
             + "' as categoryoptioncomboid, '" + optionComboId
             + "' as attributeoptioncomboid, ou.organisationunitid as sourceid, '" + period.getId() + "' as periodid,'"
-            + CaseAggregationCondition.AUTO_STORED_BY + "' as comment, ";
+            + CaseAggregationCondition.AUTO_STORED_BY + "' as storedby, ";
 
         if ( isInsert )
         {
-            sql = "INSERT INTO datavalue (dataelementid, categoryoptioncomboid, attributeoptioncomboid, sourceid, periodid, comment, value) "
+            sql = "INSERT INTO datavalue (dataelementid, categoryoptioncomboid, attributeoptioncomboid, sourceid, periodid, storedby, value) "
                 + sql;
         }
         else