dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #26681
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 13197: new viewClass, 'withoutOrganisationUnits', used to remove ou assoc in dataSet/programs
------------------------------------------------------------
revno: 13197
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2013-12-10 20:08:51 +0100
message:
new viewClass, 'withoutOrganisationUnits', used to remove ou assoc in dataSet/programs
added:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/view/WithoutOrganisationUnitsView.java
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/DataSet.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/Program.java
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/utils/JacksonUtils.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
=== added file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/view/WithoutOrganisationUnitsView.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/view/WithoutOrganisationUnitsView.java 1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/view/WithoutOrganisationUnitsView.java 2013-12-10 19:08:51 +0000
@@ -0,0 +1,36 @@
+package org.hisp.dhis.common.view;
+
+/*
+ * Copyright (c) 2004-2013, University of Oslo
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * Neither the name of the HISP project nor the names of its contributors may
+ * be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/**
+ * @author Morten Olav Hansen <mortenoh@xxxxxxxxx>
+ */
+public class WithoutOrganisationUnitsView extends BasicView
+{
+}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/DataSet.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/DataSet.java 2013-12-09 14:33:53 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/DataSet.java 2013-12-10 19:08:51 +0000
@@ -44,6 +44,7 @@
import org.hisp.dhis.common.annotation.Scanned;
import org.hisp.dhis.common.view.DetailedView;
import org.hisp.dhis.common.view.ExportView;
+import org.hisp.dhis.common.view.WithoutOrganisationUnitsView;
import org.hisp.dhis.dataelement.DataElement;
import org.hisp.dhis.dataelement.DataElementOperand;
import org.hisp.dhis.dataentryform.DataEntryForm;
@@ -452,7 +453,7 @@
@JsonProperty
@JsonSerialize( using = JacksonPeriodTypeSerializer.class )
@JsonDeserialize( using = JacksonPeriodTypeDeserializer.class )
- @JsonView( { DetailedView.class, ExportView.class } )
+ @JsonView({ DetailedView.class, ExportView.class, WithoutOrganisationUnitsView.class })
@JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
public PeriodType getPeriodType()
{
@@ -465,7 +466,7 @@
}
@JsonProperty
- @JsonView( { DetailedView.class, ExportView.class } )
+ @JsonView({ DetailedView.class, ExportView.class, WithoutOrganisationUnitsView.class })
@JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
public DataEntryForm getDataEntryForm()
{
@@ -479,7 +480,7 @@
@JsonProperty
@JsonSerialize( contentAs = BaseIdentifiableObject.class )
- @JsonView( { DetailedView.class, ExportView.class } )
+ @JsonView({ DetailedView.class, ExportView.class, WithoutOrganisationUnitsView.class })
@JacksonXmlElementWrapper( localName = "dataElements", namespace = DxfNamespaces.DXF_2_0 )
@JacksonXmlProperty( localName = "dataElement", namespace = DxfNamespaces.DXF_2_0 )
public Set<DataElement> getDataElements()
@@ -494,7 +495,7 @@
@JsonProperty
@JsonSerialize( contentAs = BaseIdentifiableObject.class )
- @JsonView( { DetailedView.class, ExportView.class } )
+ @JsonView({ DetailedView.class, ExportView.class, WithoutOrganisationUnitsView.class })
@JacksonXmlElementWrapper( localName = "indicators", namespace = DxfNamespaces.DXF_2_0 )
@JacksonXmlProperty( localName = "indicator", namespace = DxfNamespaces.DXF_2_0 )
public Set<Indicator> getIndicators()
@@ -508,7 +509,7 @@
}
@JsonProperty
- @JsonView( { DetailedView.class, ExportView.class } )
+ @JsonView({ DetailedView.class, ExportView.class, WithoutOrganisationUnitsView.class })
@JacksonXmlElementWrapper( localName = "compulsoryDataElementOperands", namespace = DxfNamespaces.DXF_2_0 )
@JacksonXmlProperty( localName = "compulsoryDataElementOperand", namespace = DxfNamespaces.DXF_2_0 )
public Set<DataElementOperand> getCompulsoryDataElementOperands()
@@ -523,7 +524,7 @@
@JsonProperty( value = "organisationUnits" )
@JsonSerialize( contentAs = BaseIdentifiableObject.class )
- @JsonView( { DetailedView.class, ExportView.class } )
+ @JsonView({ DetailedView.class, ExportView.class })
@JacksonXmlElementWrapper( localName = "organisationUnits", namespace = DxfNamespaces.DXF_2_0 )
@JacksonXmlProperty( localName = "organisationUnit", namespace = DxfNamespaces.DXF_2_0 )
public Set<OrganisationUnit> getSources()
@@ -538,7 +539,7 @@
@JsonProperty( value = "organisationUnitGroups" )
@JsonSerialize( contentAs = BaseIdentifiableObject.class )
- @JsonView( { DetailedView.class, ExportView.class } )
+ @JsonView({ DetailedView.class, ExportView.class, WithoutOrganisationUnitsView.class })
@JacksonXmlElementWrapper( localName = "organisationUnitGroups", namespace = DxfNamespaces.DXF_2_0 )
@JacksonXmlProperty( localName = "organisationUnitGroup", namespace = DxfNamespaces.DXF_2_0 )
public Set<OrganisationUnitGroup> getOrganisationUnitGroups()
@@ -563,7 +564,7 @@
@JsonProperty
@JsonSerialize( contentAs = BaseIdentifiableObject.class )
- @JsonView( { DetailedView.class } )
+ @JsonView({ DetailedView.class, WithoutOrganisationUnitsView.class })
@JacksonXmlElementWrapper( localName = "sections", namespace = DxfNamespaces.DXF_2_0 )
@JacksonXmlProperty( localName = "section", namespace = DxfNamespaces.DXF_2_0 )
public Set<Section> getSections()
@@ -577,7 +578,7 @@
}
@JsonProperty
- @JsonView( { DetailedView.class, ExportView.class } )
+ @JsonView({ DetailedView.class, ExportView.class, WithoutOrganisationUnitsView.class })
@JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
public boolean isMobile()
{
@@ -590,7 +591,7 @@
}
@JsonProperty
- @JsonView( { DetailedView.class, ExportView.class } )
+ @JsonView({ DetailedView.class, ExportView.class, WithoutOrganisationUnitsView.class })
@JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
public Integer getVersion()
{
@@ -603,7 +604,7 @@
}
@JsonProperty
- @JsonView( { DetailedView.class, ExportView.class } )
+ @JsonView({ DetailedView.class, ExportView.class, WithoutOrganisationUnitsView.class })
@JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
public int getExpiryDays()
{
@@ -616,7 +617,7 @@
}
@JsonProperty
- @JsonView( { DetailedView.class, ExportView.class } )
+ @JsonView({ DetailedView.class, ExportView.class, WithoutOrganisationUnitsView.class })
@JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
public int getTimelyDays()
{
@@ -629,7 +630,7 @@
}
@JsonProperty
- @JsonView( { DetailedView.class, ExportView.class } )
+ @JsonView({ DetailedView.class, ExportView.class, WithoutOrganisationUnitsView.class })
@JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
public boolean isSkipAggregation()
{
@@ -642,7 +643,7 @@
}
@JsonProperty
- @JsonView( { DetailedView.class, ExportView.class } )
+ @JsonView({ DetailedView.class, ExportView.class, WithoutOrganisationUnitsView.class })
@JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
public UserGroup getNotificationRecipients()
{
@@ -655,7 +656,7 @@
}
@JsonProperty
- @JsonView( { DetailedView.class, ExportView.class } )
+ @JsonView({ DetailedView.class, ExportView.class, WithoutOrganisationUnitsView.class })
@JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
public boolean isNotifyCompletingUser()
{
@@ -668,7 +669,7 @@
}
@JsonProperty
- @JsonView( { DetailedView.class, ExportView.class } )
+ @JsonView({ DetailedView.class, ExportView.class, WithoutOrganisationUnitsView.class })
@JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
public boolean isAllowFuturePeriods()
{
@@ -681,7 +682,7 @@
}
@JsonProperty
- @JsonView( { DetailedView.class, ExportView.class } )
+ @JsonView({ DetailedView.class, ExportView.class, WithoutOrganisationUnitsView.class })
@JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
public boolean isFieldCombinationRequired()
{
@@ -694,7 +695,7 @@
}
@JsonProperty
- @JsonView( { DetailedView.class, ExportView.class } )
+ @JsonView({ DetailedView.class, ExportView.class, WithoutOrganisationUnitsView.class })
@JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
public boolean isValidCompleteOnly()
{
@@ -707,7 +708,7 @@
}
@JsonProperty
- @JsonView( { DetailedView.class, ExportView.class } )
+ @JsonView({ DetailedView.class, ExportView.class, WithoutOrganisationUnitsView.class })
@JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
public boolean isSkipOffline()
{
@@ -720,7 +721,7 @@
}
@JsonProperty
- @JsonView( { DetailedView.class, ExportView.class } )
+ @JsonView({ DetailedView.class, ExportView.class, WithoutOrganisationUnitsView.class })
@JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
public boolean isRenderAsTabs()
{
@@ -733,7 +734,7 @@
}
@JsonProperty
- @JsonView( { DetailedView.class, ExportView.class } )
+ @JsonView({ DetailedView.class, ExportView.class, WithoutOrganisationUnitsView.class })
@JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
public boolean isRenderHorizontally()
{
@@ -746,7 +747,7 @@
}
@JsonProperty
- @JsonView( { DetailedView.class, ExportView.class } )
+ @JsonView({ DetailedView.class, ExportView.class, WithoutOrganisationUnitsView.class })
@JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
public boolean isDataElementDecoration()
{
@@ -760,7 +761,7 @@
@JsonProperty
@JsonSerialize( as = BaseIdentifiableObject.class )
- @JsonView( {DetailedView.class, ExportView.class} )
+ @JsonView({ DetailedView.class, ExportView.class, WithoutOrganisationUnitsView.class })
@JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0)
public MapLegendSet getLegendSet()
{
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/Program.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/Program.java 2013-11-22 03:59:37 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/Program.java 2013-12-10 19:08:51 +0000
@@ -34,12 +34,12 @@
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
-
import org.apache.commons.lang.StringUtils;
import org.hisp.dhis.common.BaseIdentifiableObject;
import org.hisp.dhis.common.DxfNamespaces;
import org.hisp.dhis.common.view.DetailedView;
import org.hisp.dhis.common.view.ExportView;
+import org.hisp.dhis.common.view.WithoutOrganisationUnitsView;
import org.hisp.dhis.dataelement.DataElement;
import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.organisationunit.OrganisationUnitGroup;
@@ -59,7 +59,7 @@
/**
* @author Abyot Asalefew
*/
-@JacksonXmlRootElement( localName = "program", namespace = DxfNamespaces.DXF_2_0 )
+@JacksonXmlRootElement(localName = "program", namespace = DxfNamespaces.DXF_2_0)
public class Program
extends BaseIdentifiableObject
{
@@ -143,7 +143,7 @@
private Boolean relationshipFromA = false;
private Program relatedProgram;
-
+
private Boolean dataEntryMethod = false;
// -------------------------------------------------------------------------
@@ -199,7 +199,7 @@
return null;
}
- @SuppressWarnings( "unchecked" )
+ @SuppressWarnings("unchecked")
public ValidationCriteria isValid( Patient patient )
{
try
@@ -238,8 +238,8 @@
// -------------------------------------------------------------------------
@JsonProperty
- @JsonView( { DetailedView.class, ExportView.class } )
- @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
+ @JsonView({ DetailedView.class, ExportView.class, WithoutOrganisationUnitsView.class })
+ @JacksonXmlProperty(namespace = DxfNamespaces.DXF_2_0)
public String getDescription()
{
return description;
@@ -251,8 +251,8 @@
}
@JsonProperty
- @JsonView( { DetailedView.class, ExportView.class } )
- @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
+ @JsonView({ DetailedView.class, ExportView.class, WithoutOrganisationUnitsView.class })
+ @JacksonXmlProperty(namespace = DxfNamespaces.DXF_2_0)
public Integer getVersion()
{
return version;
@@ -263,11 +263,11 @@
this.version = version;
}
- @JsonProperty( value = "organisationUnits" )
- @JsonSerialize( contentAs = BaseIdentifiableObject.class )
- @JsonView( { DetailedView.class, ExportView.class } )
- @JacksonXmlElementWrapper( localName = "organisationUnits", namespace = DxfNamespaces.DXF_2_0 )
- @JacksonXmlProperty( localName = "organisationUnit", namespace = DxfNamespaces.DXF_2_0 )
+ @JsonProperty(value = "organisationUnits")
+ @JsonSerialize(contentAs = BaseIdentifiableObject.class)
+ @JsonView({ DetailedView.class, ExportView.class })
+ @JacksonXmlElementWrapper(localName = "organisationUnits", namespace = DxfNamespaces.DXF_2_0)
+ @JacksonXmlProperty(localName = "organisationUnit", namespace = DxfNamespaces.DXF_2_0)
public Set<OrganisationUnit> getOrganisationUnits()
{
return organisationUnits;
@@ -278,10 +278,10 @@
this.organisationUnits = organisationUnits;
}
- @JsonProperty( value = "programInstances" )
- @JsonView( { DetailedView.class, ExportView.class } )
- @JacksonXmlElementWrapper( localName = "programInstances", namespace = DxfNamespaces.DXF_2_0 )
- @JacksonXmlProperty( localName = "programInstance", namespace = DxfNamespaces.DXF_2_0 )
+ @JsonProperty(value = "programInstances")
+ @JsonView({ DetailedView.class, ExportView.class, WithoutOrganisationUnitsView.class })
+ @JacksonXmlElementWrapper(localName = "programInstances", namespace = DxfNamespaces.DXF_2_0)
+ @JacksonXmlProperty(localName = "programInstance", namespace = DxfNamespaces.DXF_2_0)
public Set<ProgramInstance> getProgramInstances()
{
return programInstances;
@@ -292,11 +292,11 @@
this.programInstances = programInstances;
}
- @JsonProperty( value = "programStages" )
- @JsonSerialize( contentAs = BaseIdentifiableObject.class )
- @JsonView( { DetailedView.class, ExportView.class } )
- @JacksonXmlElementWrapper( localName = "programStages", namespace = DxfNamespaces.DXF_2_0 )
- @JacksonXmlProperty( localName = "programStage", namespace = DxfNamespaces.DXF_2_0 )
+ @JsonProperty(value = "programStages")
+ @JsonSerialize(contentAs = BaseIdentifiableObject.class)
+ @JsonView({ DetailedView.class, ExportView.class, WithoutOrganisationUnitsView.class })
+ @JacksonXmlElementWrapper(localName = "programStages", namespace = DxfNamespaces.DXF_2_0)
+ @JacksonXmlProperty(localName = "programStage", namespace = DxfNamespaces.DXF_2_0)
public Set<ProgramStage> getProgramStages()
{
return programStages;
@@ -308,8 +308,8 @@
}
@JsonProperty
- @JsonView( { DetailedView.class, ExportView.class } )
- @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
+ @JsonView({ DetailedView.class, ExportView.class, WithoutOrganisationUnitsView.class })
+ @JacksonXmlProperty(namespace = DxfNamespaces.DXF_2_0)
public String getDateOfEnrollmentDescription()
{
return dateOfEnrollmentDescription;
@@ -321,8 +321,8 @@
}
@JsonProperty
- @JsonView( { DetailedView.class, ExportView.class } )
- @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
+ @JsonView({ DetailedView.class, ExportView.class, WithoutOrganisationUnitsView.class })
+ @JacksonXmlProperty(namespace = DxfNamespaces.DXF_2_0)
public String getDateOfIncidentDescription()
{
return dateOfIncidentDescription;
@@ -334,14 +334,14 @@
}
@JsonProperty
- @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
+ @JacksonXmlProperty(namespace = DxfNamespaces.DXF_2_0)
public String getKind()
{
return TYPE_LOOKUP.get( type );
}
@JsonProperty
- @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
+ @JacksonXmlProperty(namespace = DxfNamespaces.DXF_2_0)
public Integer getType()
{
return type;
@@ -352,11 +352,11 @@
this.type = type;
}
- @JsonProperty( value = "validationCriterias" )
- @JsonSerialize( contentAs = BaseIdentifiableObject.class )
- @JsonView( { DetailedView.class, ExportView.class } )
- @JacksonXmlElementWrapper( localName = "validationCriterias", namespace = DxfNamespaces.DXF_2_0 )
- @JacksonXmlProperty( localName = "validationCriteria", namespace = DxfNamespaces.DXF_2_0 )
+ @JsonProperty(value = "validationCriterias")
+ @JsonSerialize(contentAs = BaseIdentifiableObject.class)
+ @JsonView({ DetailedView.class, ExportView.class, WithoutOrganisationUnitsView.class })
+ @JacksonXmlElementWrapper(localName = "validationCriterias", namespace = DxfNamespaces.DXF_2_0)
+ @JacksonXmlProperty(localName = "validationCriteria", namespace = DxfNamespaces.DXF_2_0)
public Set<ValidationCriteria> getPatientValidationCriteria()
{
return patientValidationCriteria;
@@ -367,11 +367,11 @@
this.patientValidationCriteria = patientValidationCriteria;
}
- @JsonProperty( value = "identifierTypes" )
- @JsonSerialize( contentAs = BaseIdentifiableObject.class )
- @JsonView( { DetailedView.class, ExportView.class } )
- @JacksonXmlElementWrapper( localName = "identifierTypes", namespace = DxfNamespaces.DXF_2_0 )
- @JacksonXmlProperty( localName = "identifierType", namespace = DxfNamespaces.DXF_2_0 )
+ @JsonProperty(value = "identifierTypes")
+ @JsonSerialize(contentAs = BaseIdentifiableObject.class)
+ @JsonView({ DetailedView.class, ExportView.class, WithoutOrganisationUnitsView.class })
+ @JacksonXmlElementWrapper(localName = "identifierTypes", namespace = DxfNamespaces.DXF_2_0)
+ @JacksonXmlProperty(localName = "identifierType", namespace = DxfNamespaces.DXF_2_0)
public List<PatientIdentifierType> getPatientIdentifierTypes()
{
return patientIdentifierTypes;
@@ -382,11 +382,11 @@
this.patientIdentifierTypes = patientIdentifierTypes;
}
- @JsonProperty( value = "attributes" )
- @JsonSerialize( contentAs = BaseIdentifiableObject.class )
- @JsonView( { DetailedView.class, ExportView.class } )
- @JacksonXmlElementWrapper( localName = "attributes", namespace = DxfNamespaces.DXF_2_0 )
- @JacksonXmlProperty( localName = "attribute", namespace = DxfNamespaces.DXF_2_0 )
+ @JsonProperty(value = "attributes")
+ @JsonSerialize(contentAs = BaseIdentifiableObject.class)
+ @JsonView({ DetailedView.class, ExportView.class, WithoutOrganisationUnitsView.class })
+ @JacksonXmlElementWrapper(localName = "attributes", namespace = DxfNamespaces.DXF_2_0)
+ @JacksonXmlProperty(localName = "attribute", namespace = DxfNamespaces.DXF_2_0)
public List<PatientAttribute> getPatientAttributes()
{
return patientAttributes;
@@ -398,8 +398,8 @@
}
@JsonProperty
- @JsonView( { DetailedView.class, ExportView.class } )
- @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
+ @JsonView({ DetailedView.class, ExportView.class, WithoutOrganisationUnitsView.class })
+ @JacksonXmlProperty(namespace = DxfNamespaces.DXF_2_0)
public Boolean getDisplayIncidentDate()
{
return displayIncidentDate;
@@ -411,8 +411,8 @@
}
@JsonProperty
- @JsonView( { DetailedView.class, ExportView.class } )
- @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
+ @JsonView({ DetailedView.class, ExportView.class, WithoutOrganisationUnitsView.class })
+ @JacksonXmlProperty(namespace = DxfNamespaces.DXF_2_0)
private Object getValueFromPatient( String property, Patient patient )
throws Exception
{
@@ -420,8 +420,8 @@
}
@JsonProperty
- @JsonView( { DetailedView.class, ExportView.class } )
- @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
+ @JsonView({ DetailedView.class, ExportView.class, WithoutOrganisationUnitsView.class })
+ @JacksonXmlProperty(namespace = DxfNamespaces.DXF_2_0)
public Boolean getIgnoreOverdueEvents()
{
return ignoreOverdueEvents;
@@ -433,26 +433,26 @@
}
@JsonProperty
- @JsonView( { DetailedView.class, ExportView.class } )
- @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
+ @JsonView({ DetailedView.class, ExportView.class, WithoutOrganisationUnitsView.class })
+ @JacksonXmlProperty(namespace = DxfNamespaces.DXF_2_0)
public boolean isSingleEvent()
{
return type != null && (SINGLE_EVENT_WITH_REGISTRATION == type || SINGLE_EVENT_WITHOUT_REGISTRATION == type);
}
@JsonProperty
- @JsonView( { DetailedView.class, ExportView.class } )
- @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
+ @JsonView({ DetailedView.class, ExportView.class, WithoutOrganisationUnitsView.class })
+ @JacksonXmlProperty(namespace = DxfNamespaces.DXF_2_0)
public boolean isRegistration()
{
return type != null && (SINGLE_EVENT_WITH_REGISTRATION == type || MULTIPLE_EVENTS_WITH_REGISTRATION == type);
}
@JsonProperty
- @JsonSerialize( contentAs = BaseIdentifiableObject.class )
- @JsonView( { DetailedView.class, ExportView.class } )
- @JacksonXmlElementWrapper( localName = "userRoles", namespace = DxfNamespaces.DXF_2_0 )
- @JacksonXmlProperty( localName = "userRole", namespace = DxfNamespaces.DXF_2_0 )
+ @JsonSerialize(contentAs = BaseIdentifiableObject.class)
+ @JsonView({ DetailedView.class, ExportView.class, WithoutOrganisationUnitsView.class })
+ @JacksonXmlElementWrapper(localName = "userRoles", namespace = DxfNamespaces.DXF_2_0)
+ @JacksonXmlProperty(localName = "userRole", namespace = DxfNamespaces.DXF_2_0)
public Set<UserAuthorityGroup> getUserRoles()
{
return userRoles;
@@ -464,8 +464,8 @@
}
@JsonProperty
- @JsonView( { DetailedView.class, ExportView.class } )
- @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
+ @JsonView({ DetailedView.class, ExportView.class, WithoutOrganisationUnitsView.class })
+ @JacksonXmlProperty(namespace = DxfNamespaces.DXF_2_0)
public Boolean getOnlyEnrollOnce()
{
return onlyEnrollOnce;
@@ -477,8 +477,8 @@
}
@JsonProperty
- @JsonView( { DetailedView.class, ExportView.class } )
- @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
+ @JsonView({ DetailedView.class, ExportView.class, WithoutOrganisationUnitsView.class })
+ @JacksonXmlProperty(namespace = DxfNamespaces.DXF_2_0)
public Set<PatientReminder> getPatientReminders()
{
return patientReminders;
@@ -490,9 +490,10 @@
}
@JsonProperty
- @JsonSerialize( contentAs = BaseIdentifiableObject.class )
- @JacksonXmlElementWrapper( localName = "organisationUnitGroups", namespace = DxfNamespaces.DXF_2_0 )
- @JacksonXmlProperty( localName = "organisationUnitGroup", namespace = DxfNamespaces.DXF_2_0 )
+ @JsonSerialize(contentAs = BaseIdentifiableObject.class)
+ @JsonView({ DetailedView.class, ExportView.class, WithoutOrganisationUnitsView.class })
+ @JacksonXmlElementWrapper(localName = "organisationUnitGroups", namespace = DxfNamespaces.DXF_2_0)
+ @JacksonXmlProperty(localName = "organisationUnitGroup", namespace = DxfNamespaces.DXF_2_0)
public Set<OrganisationUnitGroup> getOrganisationUnitGroups()
{
return organisationUnitGroups;
@@ -504,8 +505,8 @@
}
@JsonProperty
- @JsonView( { DetailedView.class, ExportView.class } )
- @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
+ @JsonView({ DetailedView.class, ExportView.class, WithoutOrganisationUnitsView.class })
+ @JacksonXmlProperty(namespace = DxfNamespaces.DXF_2_0)
public Boolean getDisplayOnAllOrgunit()
{
return displayOnAllOrgunit;
@@ -517,8 +518,8 @@
}
@JsonProperty
- @JsonView( { DetailedView.class, ExportView.class } )
- @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
+ @JsonView({ DetailedView.class, ExportView.class, WithoutOrganisationUnitsView.class })
+ @JacksonXmlProperty(namespace = DxfNamespaces.DXF_2_0)
public Boolean getUseBirthDateAsIncidentDate()
{
return useBirthDateAsIncidentDate;
@@ -530,8 +531,8 @@
}
@JsonProperty
- @JsonView( { DetailedView.class, ExportView.class } )
- @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
+ @JsonView({ DetailedView.class, ExportView.class, WithoutOrganisationUnitsView.class })
+ @JacksonXmlProperty(namespace = DxfNamespaces.DXF_2_0)
public Boolean getUseBirthDateAsEnrollmentDate()
{
return useBirthDateAsEnrollmentDate;
@@ -543,8 +544,8 @@
}
@JsonProperty
- @JsonView( { DetailedView.class, ExportView.class } )
- @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
+ @JsonView({ DetailedView.class, ExportView.class, WithoutOrganisationUnitsView.class })
+ @JacksonXmlProperty(namespace = DxfNamespaces.DXF_2_0)
public Boolean getSelectEnrollmentDatesInFuture()
{
return selectEnrollmentDatesInFuture;
@@ -556,8 +557,8 @@
}
@JsonProperty
- @JsonView( { DetailedView.class, ExportView.class } )
- @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
+ @JsonView({ DetailedView.class, ExportView.class, WithoutOrganisationUnitsView.class })
+ @JacksonXmlProperty(namespace = DxfNamespaces.DXF_2_0)
public Boolean getSelectIncidentDatesInFuture()
{
return selectIncidentDatesInFuture;
@@ -569,8 +570,8 @@
}
@JsonProperty
- @JsonView( { DetailedView.class, ExportView.class } )
- @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
+ @JsonView({ DetailedView.class, ExportView.class, WithoutOrganisationUnitsView.class })
+ @JacksonXmlProperty(namespace = DxfNamespaces.DXF_2_0)
public String getRelationshipText()
{
return relationshipText;
@@ -582,8 +583,8 @@
}
@JsonProperty
- @JsonView( { DetailedView.class, ExportView.class } )
- @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
+ @JsonView({ DetailedView.class, ExportView.class, WithoutOrganisationUnitsView.class })
+ @JacksonXmlProperty(namespace = DxfNamespaces.DXF_2_0)
public RelationshipType getRelationshipType()
{
return relationshipType;
@@ -595,8 +596,8 @@
}
@JsonProperty
- @JsonView( { DetailedView.class, ExportView.class } )
- @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
+ @JsonView({ DetailedView.class, ExportView.class, WithoutOrganisationUnitsView.class })
+ @JacksonXmlProperty(namespace = DxfNamespaces.DXF_2_0)
public Program getRelatedProgram()
{
return relatedProgram;
@@ -608,8 +609,8 @@
}
@JsonProperty
- @JsonView( { DetailedView.class, ExportView.class } )
- @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
+ @JsonView({ DetailedView.class, ExportView.class, WithoutOrganisationUnitsView.class })
+ @JacksonXmlProperty(namespace = DxfNamespaces.DXF_2_0)
public Boolean getRelationshipFromA()
{
return relationshipFromA;
@@ -621,8 +622,8 @@
}
@JsonProperty
- @JsonView( { DetailedView.class, ExportView.class } )
- @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
+ @JsonView({ DetailedView.class, ExportView.class, WithoutOrganisationUnitsView.class })
+ @JacksonXmlProperty(namespace = DxfNamespaces.DXF_2_0)
public Boolean getDataEntryMethod()
{
return dataEntryMethod;
@@ -632,5 +633,4 @@
{
this.dataEntryMethod = dataEntryMethod;
}
-
}
=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/utils/JacksonUtils.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/utils/JacksonUtils.java 2013-10-15 07:40:07 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/utils/JacksonUtils.java 2013-12-10 19:08:51 +0000
@@ -45,6 +45,7 @@
import org.hisp.dhis.common.view.SharingExportView;
import org.hisp.dhis.common.view.ShortNameView;
import org.hisp.dhis.common.view.UuidView;
+import org.hisp.dhis.common.view.WithoutOrganisationUnitsView;
import java.io.IOException;
import java.io.InputStream;
@@ -104,6 +105,7 @@
viewClasses.put( "export", ExportView.class );
viewClasses.put( "sharingExport", SharingExportView.class );
viewClasses.put( "dimensional", DimensionalView.class );
+ viewClasses.put( "withoutOrganisationUnits", WithoutOrganisationUnitsView.class );
}
public static Class<?> getViewClass( Object viewName )
