=== modified file 'local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/impl/DefaultPartnerService.java' --- local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/impl/DefaultPartnerService.java 2014-11-15 09:02:15 +0000 +++ local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/impl/DefaultPartnerService.java 2014-11-17 05:54:11 +0000 @@ -70,15 +70,16 @@ return partnerStore.getPartner( organisationUnit, dataSet ); } - @Override - public Collection getPartner( OrganisationUnit organisationUnit, DataElement dataElement ) - { - return partnerStore.getPartner( organisationUnit, dataElement ); - } - + public Map getOrgUnitCountFromPartner( Integer dataSetId, Integer dataElementId, Integer optionId, String startDate, String endDate ) { return partnerStore.getOrgUnitCountFromPartner( dataSetId, dataElementId, optionId, startDate, endDate ); } + public Collection getStartAndEndDate( Integer dataSetId, Integer dataElementId, Integer optionId ) + { + return partnerStore.getStartAndEndDate( dataSetId, dataElementId, optionId ); + } + + } === modified file 'local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/loadDataEntryForm.vm' --- local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/loadDataEntryForm.vm 2014-11-12 09:32:10 +0000 +++ local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/loadDataEntryForm.vm 2014-11-17 05:54:11 +0000 @@ -133,8 +133,13 @@ #set( $count = 0) #set( $pbfDataValue = $!pbfDataValueMap.get( $dataElement ) ) - - + + + #if( $pbfDataValue.getOption().getDisplayName() && $!pbfDataValue.getOption().getDisplayName() != "" ) + + #else + + #end ##if( $auth.hasAccess( "dhis-web-maintenance-rbf", "pbfAdminDataEntry" ) )