=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/SaveProgramStageFormAction.java' --- dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/SaveProgramStageFormAction.java 2013-02-01 07:09:23 +0000 +++ dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/SaveProgramStageFormAction.java 2013-02-10 13:06:34 +0000 @@ -39,7 +39,6 @@ import org.apache.struts2.ServletActionContext; import org.hisp.dhis.dataelement.DataElementCategoryService; import org.hisp.dhis.dataelement.DataElementService; -import org.hisp.dhis.i18n.I18nFormat; import org.hisp.dhis.light.utils.NamebasedUtils; import org.hisp.dhis.patient.Patient; import org.hisp.dhis.patient.PatientService; @@ -401,8 +400,6 @@ return validated; } - private I18nFormat format; - private List programValidationResults; public List getProgramValidationResults() @@ -567,11 +564,11 @@ if ( validations != null ) { - for ( ProgramValidation validation : validations ) + Collection validationResults = programValidationService.validate( validations, + programStageInstance ); + + for ( ProgramValidationResult validationResult : validationResults ) { - ProgramValidationResult validationResult = programValidationService.validate( validation, - programStageInstance, format ); - if ( validationResult != null ) { programValidationResults.add( validationResult );