dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #28546
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 14262: minor rename
------------------------------------------------------------
revno: 14262
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2014-03-17 16:56:48 +0100
message:
minor rename
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentityattributevalue/TrackedEntityAttributeValueService.java
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/trackedentity/AbstractTrackedEntityInstanceService.java
dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/DefaultTrackedEntityInstanceService.java
dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentityattributevalue/DefaultTrackedEntityAttributeValueService.java
dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramInstanceServiceTest.java
dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramStageInstanceServiceTest.java
dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/trackedentity/TrackedEntityInstanceReminderServiceTest.java
dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/trackedentity/TrackedEntityInstanceServiceTest.java
dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/trackedentity/TrackedEntityInstanceStoreTest.java
dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/trackedentityattributevalue/TrackedEntityAttributeValueServiceTest.java
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/trackedentity/SaveAttributeAction.java
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/beneficiaryenrollment/action/SaveMobileProgramEnrollmentAction.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-api/src/main/java/org/hisp/dhis/trackedentityattributevalue/TrackedEntityAttributeValueService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentityattributevalue/TrackedEntityAttributeValueService.java 2014-02-07 20:25:49 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentityattributevalue/TrackedEntityAttributeValueService.java 2014-03-17 15:56:48 +0000
@@ -49,7 +49,7 @@
* @param attributeValue The to TrackedEntityAttribute add.
*
*/
- void saveTrackedEntityAttributeValue( TrackedEntityAttributeValue attributeValue );
+ void addTrackedEntityAttributeValue( TrackedEntityAttributeValue attributeValue );
/**
* Updates an {@link TrackedEntityAttribute}.
=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/trackedentity/AbstractTrackedEntityInstanceService.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/trackedentity/AbstractTrackedEntityInstanceService.java 2014-03-17 13:36:52 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/trackedentity/AbstractTrackedEntityInstanceService.java 2014-03-17 15:56:48 +0000
@@ -360,7 +360,7 @@
attributeValue.setValue( attribute.getValue() );
attributeValue.setAttribute( entityAttribute );
- attributeValueService.saveTrackedEntityAttributeValue( attributeValue );
+ attributeValueService.addTrackedEntityAttributeValue( attributeValue );
}
}
}
=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/DefaultTrackedEntityInstanceService.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/DefaultTrackedEntityInstanceService.java 2014-03-17 14:55:54 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/DefaultTrackedEntityInstanceService.java 2014-03-17 15:56:48 +0000
@@ -263,7 +263,7 @@
for ( TrackedEntityAttributeValue pav : attributeValues )
{
- attributeValueService.saveTrackedEntityAttributeValue( pav );
+ attributeValueService.addTrackedEntityAttributeValue( pav );
instance.getAttributeValues().add( pav );
}
@@ -437,7 +437,7 @@
for ( TrackedEntityAttributeValue av : valuesForSave )
{
- attributeValueService.saveTrackedEntityAttributeValue( av );
+ attributeValueService.addTrackedEntityAttributeValue( av );
}
for ( TrackedEntityAttributeValue av : valuesForUpdate )
=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentityattributevalue/DefaultTrackedEntityAttributeValueService.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentityattributevalue/DefaultTrackedEntityAttributeValueService.java 2014-02-07 20:25:49 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentityattributevalue/DefaultTrackedEntityAttributeValueService.java 2014-03-17 15:56:48 +0000
@@ -115,7 +115,7 @@
}
@Override
- public void saveTrackedEntityAttributeValue( TrackedEntityAttributeValue attributeValue )
+ public void addTrackedEntityAttributeValue( TrackedEntityAttributeValue attributeValue )
{
if ( attributeValue.getValue() != null )
{
@@ -206,7 +206,7 @@
TrackedEntityAttributeValue _attributeValue = new TrackedEntityAttributeValue(
attributeValue.getAttribute(), destination, attributeValue.getValue() );
- saveTrackedEntityAttributeValue( _attributeValue );
+ addTrackedEntityAttributeValue( _attributeValue );
}
}
=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramInstanceServiceTest.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramInstanceServiceTest.java 2014-03-17 13:36:52 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramInstanceServiceTest.java 2014-03-17 15:56:48 +0000
@@ -569,7 +569,7 @@
TrackedEntityAttributeValue attributeValue = createTrackedEntityAttributeValue( 'A', entityInstanceA, attribute );
attributeValue.setValue( "123456789" );
- attributeValueService.saveTrackedEntityAttributeValue( attributeValue );
+ attributeValueService.addTrackedEntityAttributeValue( attributeValue );
entityInstanceA.getAttributeValues().add( attributeValue );
entityInstanceService.updateTrackedEntityInstance( entityInstanceA );
=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramStageInstanceServiceTest.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramStageInstanceServiceTest.java 2014-03-17 13:36:52 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramStageInstanceServiceTest.java 2014-03-17 15:56:48 +0000
@@ -181,7 +181,7 @@
TrackedEntityAttributeValue attributeValue = createTrackedEntityAttributeValue( 'A', entityInstanceA, attribute );
attributeValue.setValue( "123456789" );
- attributeValueService.saveTrackedEntityAttributeValue( attributeValue );
+ attributeValueService.addTrackedEntityAttributeValue( attributeValue );
entityInstanceA.getAttributeValues().add( attributeValue );
entityInstanceService.updateTrackedEntityInstance( entityInstanceA );
=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/trackedentity/TrackedEntityInstanceReminderServiceTest.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/trackedentity/TrackedEntityInstanceReminderServiceTest.java 2014-03-17 13:36:52 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/trackedentity/TrackedEntityInstanceReminderServiceTest.java 2014-03-17 15:56:48 +0000
@@ -198,7 +198,7 @@
TrackedEntityAttributeValue attributeValue = createTrackedEntityAttributeValue( 'A', entityInstance, attribute );
attributeValue.setValue( "123456789" );
- attributeValueService.saveTrackedEntityAttributeValue( attributeValue );
+ attributeValueService.addTrackedEntityAttributeValue( attributeValue );
entityInstance.getAttributeValues().add( attributeValue );
entityInstanceService.updateTrackedEntityInstance( entityInstance );
=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/trackedentity/TrackedEntityInstanceServiceTest.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/trackedentity/TrackedEntityInstanceServiceTest.java 2014-03-17 13:36:52 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/trackedentity/TrackedEntityInstanceServiceTest.java 2014-03-17 15:56:48 +0000
@@ -410,7 +410,7 @@
TrackedEntityAttributeValue attributeValue = createTrackedEntityAttributeValue( 'A', entityInstanceA3,
entityInstanceAttribute );
- attributeValueService.saveTrackedEntityAttributeValue( attributeValue );
+ attributeValueService.addTrackedEntityAttributeValue( attributeValue );
entityInstanceA3.getAttributeValues().add( attributeValue );
programInstanceService.enrollTrackedEntityInstance( entityInstanceA3, programA, date, date, organisationUnit, null );
@@ -445,7 +445,7 @@
TrackedEntityAttributeValue attributeValue = createTrackedEntityAttributeValue( 'A', entityInstanceA3,
entityInstanceAttribute );
- attributeValueService.saveTrackedEntityAttributeValue( attributeValue );
+ attributeValueService.addTrackedEntityAttributeValue( attributeValue );
programInstanceService.enrollTrackedEntityInstance( entityInstanceA3, programA, date, date, organisationUnit, null );
programInstanceService.enrollTrackedEntityInstance( entityInstanceB1, programA, date, date, organisationUnit, null );
@@ -481,7 +481,7 @@
Set<TrackedEntityAttributeValue> attributeValues = new HashSet<TrackedEntityAttributeValue>();
TrackedEntityAttributeValue attributeValue = createTrackedEntityAttributeValue( 'A', entityInstanceA3, phoneAttribute );
attributeValue.setValue( "123456789" );
- attributeValueService.saveTrackedEntityAttributeValue( attributeValue );
+ attributeValueService.addTrackedEntityAttributeValue( attributeValue );
attributeValues.add( attributeValue );
entityInstanceA3.addAttributeValue( attributeValue );
@@ -516,14 +516,14 @@
TrackedEntityAttributeValue attributeValue = createTrackedEntityAttributeValue( 'A', entityInstanceA1,
entityInstanceAttribute );
attributeValue.setValue( "123456789" );
- attributeValueService.saveTrackedEntityAttributeValue( attributeValue );
+ attributeValueService.addTrackedEntityAttributeValue( attributeValue );
entityInstanceA1.addAttributeValue( attributeValue );
entityInstanceService.updateTrackedEntityInstance( entityInstanceA1 );
attributeValue = createTrackedEntityAttributeValue( 'A', entityInstanceA2, entityInstanceAttribute );
attributeValue.setValue( "123456789" );
- attributeValueService.saveTrackedEntityAttributeValue( attributeValue );
+ attributeValueService.addTrackedEntityAttributeValue( attributeValue );
entityInstanceA2.addAttributeValue( attributeValue );
entityInstanceService.updateTrackedEntityInstance( entityInstanceA2 );
=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/trackedentity/TrackedEntityInstanceStoreTest.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/trackedentity/TrackedEntityInstanceStoreTest.java 2014-03-17 13:15:21 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/trackedentity/TrackedEntityInstanceStoreTest.java 2014-03-17 15:56:48 +0000
@@ -269,14 +269,14 @@
TrackedEntityAttributeValue attributeValue = createTrackedEntityAttributeValue( 'A', entityInstanceA1,
attribute );
attributeValue.setValue( "123456789" );
- attributeValueService.saveTrackedEntityAttributeValue( attributeValue );
+ attributeValueService.addTrackedEntityAttributeValue( attributeValue );
entityInstanceA1.addAttributeValue( attributeValue );
entityInstanceStore.update( entityInstanceA1 );
attributeValue = createTrackedEntityAttributeValue( 'A', entityInstanceB1, attribute );
attributeValue.setValue( "123456789" );
- attributeValueService.saveTrackedEntityAttributeValue( attributeValue );
+ attributeValueService.addTrackedEntityAttributeValue( attributeValue );
entityInstanceB1.addAttributeValue( attributeValue );
entityInstanceStore.update( entityInstanceB1 );
@@ -298,7 +298,7 @@
TrackedEntityAttributeValue attributeValue = createTrackedEntityAttributeValue( 'A', entityInstanceA3,
entityInstanceAttribute );
- attributeValueService.saveTrackedEntityAttributeValue( attributeValue );
+ attributeValueService.addTrackedEntityAttributeValue( attributeValue );
programInstanceService.enrollTrackedEntityInstance( entityInstanceA3, programA, date, date, organisationUnit,
null );
=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/trackedentityattributevalue/TrackedEntityAttributeValueServiceTest.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/trackedentityattributevalue/TrackedEntityAttributeValueServiceTest.java 2014-03-17 13:36:52 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/trackedentityattributevalue/TrackedEntityAttributeValueServiceTest.java 2014-03-17 15:56:48 +0000
@@ -143,8 +143,8 @@
public void testSaveTrackedEntityAttributeValue()
{
- attributeValueService.saveTrackedEntityAttributeValue( attributeValueA );
- attributeValueService.saveTrackedEntityAttributeValue( attributeValueB );
+ attributeValueService.addTrackedEntityAttributeValue( attributeValueA );
+ attributeValueService.addTrackedEntityAttributeValue( attributeValueB );
assertNotNull( attributeValueService.getTrackedEntityAttributeValue( entityInstanceA, attributeA ) );
assertNotNull( attributeValueService.getTrackedEntityAttributeValue( entityInstanceA, attributeA ) );
@@ -153,7 +153,7 @@
@Test
public void testUpdateTrackedEntityAttributeValue()
{
- attributeValueService.saveTrackedEntityAttributeValue( attributeValueA );
+ attributeValueService.addTrackedEntityAttributeValue( attributeValueA );
assertNotNull( attributeValueService.getTrackedEntityAttributeValue( entityInstanceA, attributeA ) );
@@ -166,8 +166,8 @@
@Test
public void testDeleteTrackedEntityAttributeValue()
{
- attributeValueService.saveTrackedEntityAttributeValue( attributeValueA );
- attributeValueService.saveTrackedEntityAttributeValue( attributeValueB );
+ attributeValueService.addTrackedEntityAttributeValue( attributeValueA );
+ attributeValueService.addTrackedEntityAttributeValue( attributeValueB );
assertNotNull( attributeValueService.getTrackedEntityAttributeValue( entityInstanceA, attributeA ) );
assertNotNull( attributeValueService.getTrackedEntityAttributeValue( entityInstanceA, attributeB ) );
@@ -186,9 +186,9 @@
@Test
public void testDeleteTrackedEntityAttributeValueByEntityInstance()
{
- attributeValueService.saveTrackedEntityAttributeValue( attributeValueA );
- attributeValueService.saveTrackedEntityAttributeValue( attributeValueB );
- attributeValueService.saveTrackedEntityAttributeValue( attributeValueC );
+ attributeValueService.addTrackedEntityAttributeValue( attributeValueA );
+ attributeValueService.addTrackedEntityAttributeValue( attributeValueB );
+ attributeValueService.addTrackedEntityAttributeValue( attributeValueC );
assertNotNull( attributeValueService.getTrackedEntityAttributeValue( entityInstanceA, attributeA ) );
assertNotNull( attributeValueService.getTrackedEntityAttributeValue( entityInstanceA, attributeB ) );
@@ -209,9 +209,9 @@
@Test
public void testDeleteTrackedEntityAttributeValueByAttribute()
{
- attributeValueService.saveTrackedEntityAttributeValue( attributeValueA );
- attributeValueService.saveTrackedEntityAttributeValue( attributeValueB );
- attributeValueService.saveTrackedEntityAttributeValue( attributeValueC );
+ attributeValueService.addTrackedEntityAttributeValue( attributeValueA );
+ attributeValueService.addTrackedEntityAttributeValue( attributeValueB );
+ attributeValueService.addTrackedEntityAttributeValue( attributeValueC );
assertNotNull( attributeValueService.getTrackedEntityAttributeValue( entityInstanceA, attributeA ) );
assertNotNull( attributeValueService.getTrackedEntityAttributeValue( entityInstanceA, attributeB ) );
@@ -233,8 +233,8 @@
@Test
public void testGetTrackedEntityAttributeValue()
{
- attributeValueService.saveTrackedEntityAttributeValue( attributeValueA );
- attributeValueService.saveTrackedEntityAttributeValue( attributeValueC );
+ attributeValueService.addTrackedEntityAttributeValue( attributeValueA );
+ attributeValueService.addTrackedEntityAttributeValue( attributeValueC );
assertEquals( attributeValueA, attributeValueService.getTrackedEntityAttributeValue( entityInstanceA, attributeA ) );
assertEquals( attributeValueC, attributeValueService.getTrackedEntityAttributeValue( entityInstanceB, attributeA ) );
@@ -243,9 +243,9 @@
@Test
public void testGetTrackedEntityAttributeValuesByEntityInstance()
{
- attributeValueService.saveTrackedEntityAttributeValue( attributeValueA );
- attributeValueService.saveTrackedEntityAttributeValue( attributeValueB );
- attributeValueService.saveTrackedEntityAttributeValue( attributeValueC );
+ attributeValueService.addTrackedEntityAttributeValue( attributeValueA );
+ attributeValueService.addTrackedEntityAttributeValue( attributeValueB );
+ attributeValueService.addTrackedEntityAttributeValue( attributeValueC );
Collection<TrackedEntityAttributeValue> attributeValues = attributeValueService.getTrackedEntityAttributeValues( entityInstanceA );
@@ -261,9 +261,9 @@
@Test
public void testGetTrackedEntityAttributeValuesbyAttribute()
{
- attributeValueService.saveTrackedEntityAttributeValue( attributeValueA );
- attributeValueService.saveTrackedEntityAttributeValue( attributeValueB );
- attributeValueService.saveTrackedEntityAttributeValue( attributeValueC );
+ attributeValueService.addTrackedEntityAttributeValue( attributeValueA );
+ attributeValueService.addTrackedEntityAttributeValue( attributeValueB );
+ attributeValueService.addTrackedEntityAttributeValue( attributeValueC );
Collection<TrackedEntityAttributeValue> attributeValues = attributeValueService
.getTrackedEntityAttributeValues( attributeA );
@@ -279,9 +279,9 @@
@Test
public void testGetTrackedEntityAttributeValuesbyEntityInstanceList()
{
- attributeValueService.saveTrackedEntityAttributeValue( attributeValueA );
- attributeValueService.saveTrackedEntityAttributeValue( attributeValueB );
- attributeValueService.saveTrackedEntityAttributeValue( attributeValueC );
+ attributeValueService.addTrackedEntityAttributeValue( attributeValueA );
+ attributeValueService.addTrackedEntityAttributeValue( attributeValueB );
+ attributeValueService.addTrackedEntityAttributeValue( attributeValueC );
Collection<TrackedEntityInstance> entityInstances = new HashSet<TrackedEntityInstance>();
entityInstances.add( entityInstanceA );
@@ -295,9 +295,9 @@
@Test
public void testGetAllTrackedEntityAttributeValues()
{
- attributeValueService.saveTrackedEntityAttributeValue( attributeValueA );
- attributeValueService.saveTrackedEntityAttributeValue( attributeValueB );
- attributeValueService.saveTrackedEntityAttributeValue( attributeValueC );
+ attributeValueService.addTrackedEntityAttributeValue( attributeValueA );
+ attributeValueService.addTrackedEntityAttributeValue( attributeValueB );
+ attributeValueService.addTrackedEntityAttributeValue( attributeValueC );
assertTrue( equals( attributeValueService.getAllTrackedEntityAttributeValues(), attributeValueA, attributeValueB,
attributeValueC ) );
@@ -306,9 +306,9 @@
@Test
public void testGetTrackedEntityAttributeValueMapForEntityInstances()
{
- attributeValueService.saveTrackedEntityAttributeValue( attributeValueA );
- attributeValueService.saveTrackedEntityAttributeValue( attributeValueB );
- attributeValueService.saveTrackedEntityAttributeValue( attributeValueC );
+ attributeValueService.addTrackedEntityAttributeValue( attributeValueA );
+ attributeValueService.addTrackedEntityAttributeValue( attributeValueB );
+ attributeValueService.addTrackedEntityAttributeValue( attributeValueC );
Collection<TrackedEntityInstance> entityInstances = new HashSet<TrackedEntityInstance>();
entityInstances.add( entityInstanceA );
@@ -325,9 +325,9 @@
@Test
public void testGetTrackedEntityAttributeValueMapForEntityInstancesAttributes()
{
- attributeValueService.saveTrackedEntityAttributeValue( attributeValueA );
- attributeValueService.saveTrackedEntityAttributeValue( attributeValueB );
- attributeValueService.saveTrackedEntityAttributeValue( attributeValueC );
+ attributeValueService.addTrackedEntityAttributeValue( attributeValueA );
+ attributeValueService.addTrackedEntityAttributeValue( attributeValueB );
+ attributeValueService.addTrackedEntityAttributeValue( attributeValueC );
Collection<TrackedEntityInstance> entityInstances = new HashSet<TrackedEntityInstance>();
entityInstances.add( entityInstanceA );
@@ -344,9 +344,9 @@
@Test
public void testSearchTrackedEntityAttributeValue()
{
- attributeValueService.saveTrackedEntityAttributeValue( attributeValueA );
- attributeValueService.saveTrackedEntityAttributeValue( attributeValueB );
- attributeValueService.saveTrackedEntityAttributeValue( attributeValueC );
+ attributeValueService.addTrackedEntityAttributeValue( attributeValueA );
+ attributeValueService.addTrackedEntityAttributeValue( attributeValueB );
+ attributeValueService.addTrackedEntityAttributeValue( attributeValueC );
Collection<TrackedEntityAttributeValue> attributeValues = attributeValueService.searchTrackedEntityAttributeValue(
attributeA, "A" );
@@ -356,8 +356,8 @@
@Test
public void testCopyTrackedEntityAttributeValues()
{
- attributeValueService.saveTrackedEntityAttributeValue( attributeValueB );
- attributeValueService.saveTrackedEntityAttributeValue( attributeValueC );
+ attributeValueService.addTrackedEntityAttributeValue( attributeValueB );
+ attributeValueService.addTrackedEntityAttributeValue( attributeValueC );
attributeValueService.copyTrackedEntityAttributeValues( entityInstanceA, entityInstanceB );
@@ -371,9 +371,9 @@
@Test
public void testGetEntityInstances()
{
- attributeValueService.saveTrackedEntityAttributeValue( attributeValueA );
- attributeValueService.saveTrackedEntityAttributeValue( attributeValueB );
- attributeValueService.saveTrackedEntityAttributeValue( attributeValueC );
+ attributeValueService.addTrackedEntityAttributeValue( attributeValueA );
+ attributeValueService.addTrackedEntityAttributeValue( attributeValueB );
+ attributeValueService.addTrackedEntityAttributeValue( attributeValueC );
Collection<TrackedEntityInstance> entityInstances = attributeValueService.getTrackedEntityInstance( attributeA, "A" );
assertEquals( 1, entityInstances.size() );
@@ -383,9 +383,9 @@
@Test
public void testCountByEntityInstanceAttributeoption()
{
- attributeValueService.saveTrackedEntityAttributeValue( attributeValueA );
- attributeValueService.saveTrackedEntityAttributeValue( attributeValueD );
- attributeValueService.saveTrackedEntityAttributeValue( attributeValueE );
+ attributeValueService.addTrackedEntityAttributeValue( attributeValueA );
+ attributeValueService.addTrackedEntityAttributeValue( attributeValueD );
+ attributeValueService.addTrackedEntityAttributeValue( attributeValueE );
int count = attributeValueService.countByAttributeOption( attributeOpionA );
assertEquals( 1, count );
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/trackedentity/SaveAttributeAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/trackedentity/SaveAttributeAction.java 2014-02-20 16:11:16 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/trackedentity/SaveAttributeAction.java 2014-03-17 15:56:48 +0000
@@ -199,7 +199,7 @@
}
}
- attributeValueService.saveTrackedEntityAttributeValue( attributeValue );
+ attributeValueService.addTrackedEntityAttributeValue( attributeValue );
entityInstance.getAttributeValues().add( attributeValue );
}
else
=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/beneficiaryenrollment/action/SaveMobileProgramEnrollmentAction.java'
--- dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/beneficiaryenrollment/action/SaveMobileProgramEnrollmentAction.java 2014-02-14 16:13:55 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/beneficiaryenrollment/action/SaveMobileProgramEnrollmentAction.java 2014-03-17 15:56:48 +0000
@@ -410,7 +410,7 @@
{
for ( TrackedEntityAttributeValue patientAttributeValue : patientAttributeValues )
{
- patientAttributeValueService.saveTrackedEntityAttributeValue( patientAttributeValue );
+ patientAttributeValueService.addTrackedEntityAttributeValue( patientAttributeValue );
}
}
