------------------------------------------------------------
revno: 15425
committer: Morten Olav Hansen <morte...@gmail.com>
branch nick: dhis2
timestamp: Tue 2014-05-27 13:24:09 +0200
message:
minor fixes to tracker import
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityAttribute.java
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/ExchangeClasses.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/trackedentity/TrackedEntityAttribute.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityAttribute.java 2014-05-23 14:58:07 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityAttribute.java 2014-05-27 11:24:09 +0000
@@ -165,9 +165,8 @@
this.description = description;
}
- // TODO remove WithoutOrganisationUnitsView, temporary hack
@JsonProperty
- @JsonView( { DetailedView.class, WithoutOrganisationUnitsView.class } )
+ @JsonView( { DetailedView.class, ExportView.class, WithoutOrganisationUnitsView.class } )
@JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
public String getValueType()
{
@@ -180,7 +179,7 @@
}
@JsonProperty( "trackedEntityAttributeGroup" )
- @JsonView( { DetailedView.class } )
+ @JsonView( { DetailedView.class } )
@JsonSerialize( as = BaseIdentifiableObject.class )
@JacksonXmlProperty( localName = "trackedEntityAttributeGroup", namespace = DxfNamespaces.DXF_2_0 )
public TrackedEntityAttributeGroup getAttributeGroup()
=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/ExchangeClasses.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/ExchangeClasses.java 2014-05-26 14:19:42 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/ExchangeClasses.java 2014-05-27 11:24:09 +0000
@@ -177,13 +177,16 @@
allExportClasses.put( RelationshipType.class, "relationshipTypes" );
allExportClasses.put( ValidationCriteria.class, "validationCriterias" );
allExportClasses.put( ProgramStageSection.class, "programStageSections" );
- allExportClasses.put( ProgramStage.class, "programStages" );
- allExportClasses.put( ProgramValidation.class, "programValidations" );
- allExportClasses.put( Program.class, "programs" );
allExportClasses.put( TrackedEntity.class, "trackedEntities" );
allExportClasses.put( TrackedEntityAttribute.class, "trackedEntityAttributes" );
allExportClasses.put( TrackedEntityAttributeGroup.class, "trackedEntityAttributeGroups" );
+ /*
+ allExportClasses.put( ProgramStage.class, "programStages" );
+ allExportClasses.put( Program.class, "programs" );
+ allExportClasses.put( ProgramValidation.class, "programValidations" );
+ */
+
allExportClasses.put( BaseDimensionalObject.class, "dimensions" );
exportClasses = Maps.newLinkedHashMap( allExportClasses );
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
