dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #39256
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 19895: change references in JdbcEventAnalyticsTableManager from using ValueType.fromDataElement to using...
------------------------------------------------------------
revno: 19895
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2015-08-31 11:38:16 +0700
message:
change references in JdbcEventAnalyticsTableManager from using ValueType.fromDataElement to using DataElement.getValueType directly
modified:
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcEventAnalyticsTableManager.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-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcEventAnalyticsTableManager.java'
--- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcEventAnalyticsTableManager.java 2015-08-28 10:55:55 +0000
+++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcEventAnalyticsTableManager.java 2015-08-31 04:38:16 +0000
@@ -260,7 +260,7 @@
for ( DataElement dataElement : table.getProgram().getAllDataElements() )
{
- ValueType valueType = ValueType.getFromDataElement( dataElement );
+ ValueType valueType = dataElement.getValueType();
String dataType = getColumnType( valueType );
String dataClause = dataElement.isNumericType() ? numericClause : dataElement.isDateType() ? dateClause : "";
String select = getSelectClause( valueType );
@@ -275,7 +275,7 @@
for ( DataElement dataElement : table.getProgram().getDataElementsWithLegendSet() )
{
String column = quote( dataElement.getUid() + PartitionUtils.SEP + dataElement.getLegendSet().getUid() );
- String select = getSelectClause( ValueType.getFromDataElement( dataElement ) );
+ String select = getSelectClause( dataElement.getValueType() );
String sql = "(select l.uid from maplegend l inner join maplegendsetmaplegend lsl on l.maplegendid=lsl.maplegendid " +
"inner join trackedentitydatavalue dv on l.startvalue <= " + select + " and l.endvalue > " + select + " " +