=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramTrackedEntityAttribute.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramTrackedEntityAttribute.java 2014-03-20 05:43:18 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramTrackedEntityAttribute.java 2014-03-20 14:06:16 +0000
@@ -138,7 +138,7 @@
@JsonProperty
@JsonView( { DetailedView.class } )
@JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
- public Boolean getMandatory()
+ public Boolean isMandatory()
{
return mandatory;
}
=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/enrollment/AbstractEnrollmentService.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/enrollment/AbstractEnrollmentService.java 2014-03-20 05:43:18 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/enrollment/AbstractEnrollmentService.java 2014-03-20 14:06:16 +0000
@@ -431,8 +431,7 @@
for ( ProgramTrackedEntityAttribute programTrackedEntityAttribute : program.getAttributes() )
{
- // TODO this will be replaced with programTrackedEntityAttribute.isMandatory when added to the model
- mandatoryMap.put( programTrackedEntityAttribute.getAttribute(), programTrackedEntityAttribute.getMandatory() );
+ mandatoryMap.put( programTrackedEntityAttribute.getAttribute(), programTrackedEntityAttribute.isMandatory() );
}
for ( TrackedEntityAttributeValue value : trackedEntityInstance.getAttributeValues() )
=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/DefaultTrackedEntityFormService.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/DefaultTrackedEntityFormService.java 2014-03-20 05:43:18 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/DefaultTrackedEntityFormService.java 2014-03-20 14:06:16 +0000
@@ -284,7 +284,7 @@
if( program!= null)
{
- madatory = programAttributeService.getProgramTrackedEntityAttribute( program, attribute ).getMandatory();
+ madatory = programAttributeService.getProgramTrackedEntityAttribute( program, attribute ).isMandatory();
}
inputHtml = TAG_OPEN + "input id=\"attr" + attribute.getId() + "\" name=\"attr" + attribute.getId()
=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/main/resources/org/hisp/dhis/program/hibernate/ProgramTrackedEntityAttribute.hbm.xml'
--- dhis-2/dhis-services/dhis-service-tracker/src/main/resources/org/hisp/dhis/program/hibernate/ProgramTrackedEntityAttribute.hbm.xml 2014-03-20 05:43:18 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/main/resources/org/hisp/dhis/program/hibernate/ProgramTrackedEntityAttribute.hbm.xml 2014-03-20 14:06:16 +0000
@@ -19,7 +19,7 @@
-
+
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/trackedentity/GetTrackedEntityInstanceAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/trackedentity/GetTrackedEntityInstanceAction.java 2014-03-20 05:43:18 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/trackedentity/GetTrackedEntityInstanceAction.java 2014-03-20 14:06:16 +0000
@@ -257,7 +257,7 @@
{
attributes = program.getTrackedEntityAttributes();
for( ProgramTrackedEntityAttribute programAttribute : program.getAttributes() ){
- mandatoryMap.put( programAttribute.getAttribute().getId(), programAttribute.getMandatory() );
+ mandatoryMap.put( programAttribute.getAttribute().getId(), programAttribute.isMandatory() );
}
}
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/trackedentity/ShowAddTrackedEntityInstanceFormAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/trackedentity/ShowAddTrackedEntityInstanceFormAction.java 2014-03-20 05:43:18 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/trackedentity/ShowAddTrackedEntityInstanceFormAction.java 2014-03-20 14:06:16 +0000
@@ -370,7 +370,7 @@
attributes = program.getTrackedEntityAttributes();
for ( ProgramTrackedEntityAttribute programAttribute : program.getAttributes() )
{
- mandatoryMap.put( programAttribute.getAttribute().getId(), programAttribute.getMandatory() );
+ mandatoryMap.put( programAttribute.getAttribute().getId(), programAttribute.isMandatory() );
}
}