Author: bleny Date: 2011-04-22 09:20:41 +0000 (Fri, 22 Apr 2011) New Revision: 1230 Log: add first validation for obsdeb contacts Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2011-04-22 09:18:17 UTC (rev 1229) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2011-04-22 09:20:41 UTC (rev 1230) @@ -277,8 +277,13 @@ if (contact.getObsProgram() == ObsProgram.OBSDEB) { + if (success && contact.getObservationType() == ObservationType.FIELD_WORK_OBSERVATION && + contact.getContactState() != ContactState.OBSERVATION_DONE) { + success = false; + message = "Pour le type d'observation '" + contact.getObservationType().toString() + + "', l'état est obligatoirement '" + ContactState.OBSERVATION_DONE.toString() + "."; + } - } else { // Validation for saving contact depends on contactState