Merge authors:
Bob Jolliffe bobjolliffe@gmail.com
revision-diff.txt (15.9 KB)
···
------------------------------------------------------------
revno: 4500 [merge]
committer: Bob Jolliffe bobjolliffe@gmail.com
branch nick: dhis2
timestamp: Fri 2011-09-02 10:50:17 +0100
message:
Work in progress:
Implemented arbitrary attributes on datavalue and id scheme attributes on datavalueset. See testJaxbDimensions. No underlying logic yet 
Ignore storedBy attribute. Its not illegal - no attribute is illegal - it just isn't used. storedBy is determined by currentUserService.
modified:
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/model/DataValue.java
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/model/DataValueSet.java
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/service/DataValueSetService.java
dhis-2/dhis-services/dhis-service-importexport/src/test/java/org/hisp/dhis/importexport/dxf2/service/DataValueSetServiceTest.java
dhis-2/dhis-services/dhis-service-importexport/src/test/resources/dxf2/dataValueSet.xml
--
lp:dhis2
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to OpenID transaction in progress