dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #39547
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 20023: Minor
------------------------------------------------------------
revno: 20023
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2015-09-07 13:33:05 +0200
message:
Minor
modified:
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/program/ProgramIndicatorServiceTest.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-core/src/test/java/org/hisp/dhis/program/ProgramIndicatorServiceTest.java'
--- dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/program/ProgramIndicatorServiceTest.java 2015-09-07 10:51:25 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/program/ProgramIndicatorServiceTest.java 2015-09-07 11:33:05 +0000
@@ -291,7 +291,6 @@
programA.getProgramIndicators().add( indicatorA );
indicatorB = createProgramIndicator( 'B', programA, "70", null );
- //indicatorB.setValueType( ProgramIndicator.VALUE_TYPE_DATE );
programA.getProgramIndicators().add( indicatorB );
indicatorC = createProgramIndicator( 'C', programA, "0", null );
@@ -325,13 +324,11 @@
+ KEY_DATAELEMENT + "{" + psA.getUid() + "." + deB.getUid() + "} ) + " + KEY_DATAELEMENT + "{"
+ psA.getUid() + "." + deA.getUid() + "}";
indicatorI = createProgramIndicator( 'I', programB, expressionI, null );
- //indicatorI.setValueType( VALUE_TYPE_DATE );
String expressionJ = "(" + KEY_ATTRIBUTE + "{" + atC.getUid() + "} - " + KEY_PROGRAM_VARIABLE + "{"
+ ProgramIndicator.VAR_ENROLLMENT_DATE + "} ) + " + KEY_DATAELEMENT + "{" + psA.getUid() + "." + deA.getUid()
+ "} * " + ProgramIndicator.KEY_CONSTANT + "{" + constantA.getUid() + "}";
indicatorJ = createProgramIndicator( 'J', programB, expressionJ, null );
- //indicatorJ.setValueType( VALUE_TYPE_DATE );
}
// -------------------------------------------------------------------------