=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramInstanceService.java' --- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramInstanceService.java 2014-02-07 20:25:49 +0000 +++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramInstanceService.java 2014-02-08 15:19:56 +0000 @@ -263,10 +263,6 @@ Grid attrGrid = new ListGrid(); - attrGrid.addHeader( new GridHeader( i18n.getString( "name" ), false, true ) ); - attrGrid.addHeader( new GridHeader( i18n.getString( "value" ), false, true ) ); - attrGrid.addHeader( new GridHeader( "", true, false ) ); - // --------------------------------------------------------------------- // Add dynamic attribues // --------------------------------------------------------------------- === 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-02-07 20:25:49 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/trackedentity/ShowAddTrackedEntityInstanceFormAction.java 2014-02-08 15:19:56 +0000 @@ -49,8 +49,10 @@ import org.hisp.dhis.trackedentity.TrackedEntityAttributeService; import org.hisp.dhis.trackedentity.TrackedEntityForm; import org.hisp.dhis.trackedentity.TrackedEntityFormService; +import org.hisp.dhis.trackedentity.TrackedEntityInstanceService; import org.hisp.dhis.trackedentity.comparator.TrackedEntityAttributeGroupSortOrderComparator; import org.hisp.dhis.user.User; +import org.springframework.beans.factory.annotation.Autowired; import com.opensymphony.xwork2.Action; @@ -65,6 +67,9 @@ // Dependencies // ------------------------------------------------------------------------- + @Autowired + private TrackedEntityInstanceService entityInstanceService; + private OrganisationUnitSelectionManager selectionManager; public void setSelectionManager( OrganisationUnitSelectionManager selectionManager ) @@ -133,28 +138,23 @@ this.programId = programId; } - private Integer entityInstancesId; + private Integer entityInstanceId; - public void setEntityInstanceId( Integer entityInstancesId ) + public void setEntityInstanceId( Integer entityInstanceId ) { - this.entityInstancesId = entityInstancesId; + this.entityInstanceId = entityInstanceId; } public Integer getEntityInstanceId() { - return entityInstancesId; - } - - private String entityInstancesUid; - - public void setEntityInstanceUid( String entityInstancesUid ) - { - this.entityInstancesUid = entityInstancesUid; - } + return entityInstanceId; + } + + private String entityInstanceUid; public String getEntityInstanceUid() { - return entityInstancesUid; + return entityInstanceUid; } private Integer relatedProgramId; @@ -261,6 +261,11 @@ public String execute() { + if( entityInstanceId!=null) + { + entityInstanceUid = entityInstanceService.getTrackedEntityInstance( entityInstanceId ).getUid(); + } + organisationUnit = selectionManager.getSelectedOrganisationUnit(); healthWorkers = organisationUnit.getUsers(); === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addRelationshipForm.vm' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addRelationshipForm.vm 2014-02-07 20:25:49 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addRelationshipForm.vm 2014-02-08 15:19:56 +0000 @@ -12,7 +12,7 @@