August 2014 - Wao-commits - mailman.cloud.codelutin.com

r2201 - branches/wao-4.0.x/wao-web/src/main/java/fr/ifremer/wao/web/action/administration
by bleny＠users.forge.codelutin.com 06 Aug '14

06 Aug '14

Author: bleny Date: 2014-08-06 14:52:31 +0200 (Wed, 06 Aug 2014) New Revision: 2201 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2201 Log: fixes #5492 add validation to force presence of login Modified: branches/wao-4.0.x/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/EditWaoUserAction.java Modified: branches/wao-4.0.x/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/EditWaoUserAction.java =================================================================== --- branches/wao-4.0.x/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/EditWaoUserAction.java 2014-08-06 12:41:53 UTC (rev 2200) +++ branches/wao-4.0.x/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/EditWaoUserAction.java 2014-08-06 12:52:31 UTC (rev 2201) @@ -89,12 +89,12 @@ if ( ! updateWaoUserCommand.getClearPassword().equals(updateWaoUserCommand.getClearPasswordConfirmation())) { addFieldError("updateWaoUserCommand.clearPasswordConfirmation", t("wao.ui.form.updateWaoUserCommand.passwordMismatch")); } - } else if (updateWaoUserCommand.getPasswordStrategy().isGeneratePassword()) { - if ( ! StringUtil.isEmail(updateWaoUserCommand.getWaoUser().getLogin())) { - addFieldError("updateWaoUserCommand.waoUser.login", t("wao.ui.form.updateWaoUserCommand.loginMustBeEmail")); - } } + if ( ! StringUtil.isEmail(updateWaoUserCommand.getWaoUser().getLogin())) { + addFieldError("updateWaoUserCommand.waoUser.login", t("wao.ui.form.updateWaoUserCommand.loginMustBeEmail")); + } + if (updateWaoUserCommand.getCompanyId() == null) { addFieldError("updateWaoUserCommand.companyId", t("wao.ui.form.updateWaoUserCommand.requiredCompany")); }

1 0

r2200 - branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service
by bleny＠users.forge.codelutin.com 06 Aug '14

06 Aug '14

Author: bleny Date: 2014-08-06 14:41:53 +0200 (Wed, 06 Aug 2014) New Revision: 2200 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2200 Log: fixes #5585 fix npe when editing a contact without main observer Modified: branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsService.java Modified: branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsService.java =================================================================== --- branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsService.java 2014-08-06 12:33:12 UTC (rev 2199) +++ branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsService.java 2014-08-06 12:41:53 UTC (rev 2200) @@ -237,8 +237,11 @@ updateContactCommand.setCreation(false); - String mainObserverId = contact.getMainObserver().getTopiaId(); - updateContactCommand.setMainObserverId(mainObserverId); + if (contact.getMainObserver() != null) { + String mainObserverId = contact.getMainObserver().getTopiaId(); + updateContactCommand.setMainObserverId(mainObserverId); + } + Set<String> secondaryObserversTopiaIds = contact.getSecondaryObserversTopiaIds(); updateContactCommand.setSecondaryObserverIds(secondaryObserversTopiaIds);

1 0

r2199 - in branches/wao-4.0.x: wao-services/src/main/java/fr/ifremer/wao/services/service wao-services/src/main/resources/i18n wao-web/src/main/java/fr/ifremer/wao/web/action wao-web/src/main/resources/i18n
by bleny＠users.forge.codelutin.com 06 Aug '14

06 Aug '14

Author: bleny Date: 2014-08-06 14:33:12 +0200 (Wed, 06 Aug 2014) New Revision: 2199 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2199 Log: add validation rule to prevent sample rows without efforts Added: branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/NoEffortDefinedException.java Modified: branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlanService.java branches/wao-4.0.x/wao-services/src/main/resources/i18n/wao-services_en_GB.properties branches/wao-4.0.x/wao-services/src/main/resources/i18n/wao-services_fr_FR.properties branches/wao-4.0.x/wao-web/src/main/java/fr/ifremer/wao/web/action/EditSampleRowAction.java branches/wao-4.0.x/wao-web/src/main/resources/i18n/wao-web_en_GB.properties branches/wao-4.0.x/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties Added: branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/NoEffortDefinedException.java =================================================================== --- branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/NoEffortDefinedException.java (rev 0) +++ branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/NoEffortDefinedException.java 2014-08-06 12:33:12 UTC (rev 2199) @@ -0,0 +1,10 @@ +package fr.ifremer.wao.services.service; + +import fr.ifremer.wao.entity.SampleRow; + +public class NoEffortDefinedException extends SampleRowValidationException { + + public NoEffortDefinedException(SampleRow sampleRow) { + super(sampleRow); + } +} Modified: branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlanService.java =================================================================== --- branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlanService.java 2014-08-06 12:30:30 UTC (rev 2198) +++ branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlanService.java 2014-08-06 12:33:12 UTC (rev 2199) @@ -600,6 +600,9 @@ } catch (MissingDcf5CodesException e) { String message = I18n.l(getLocale(), "wao.import.sampleRow.failure.missingDcf5Codes", lineNumber); throw new ImportErrorException(message); + } catch (NoEffortDefinedException e) { + String message = I18n.l(getLocale(), "wao.import.sampleRow.failure.noEffortDefined", lineNumber); + throw new ImportErrorException(message); } save0(updateSampleRowCommand); @@ -705,7 +708,8 @@ MissingProfessionSpeciesException, SampleMonthWithIllegalExpectedTidesValueException, MissingDcf5CodesException, - SampleRowCodeMustBeUniqueException { + SampleRowCodeMustBeUniqueException, + NoEffortDefinedException { SampleRow sampleRow = updateSampleRowCommand.getSampleRow(); @@ -747,6 +751,10 @@ throw new MissingProfessionSpeciesException(sampleRow); } + if (sampleRow.isSampleMonthEmpty()) { + throw new NoEffortDefinedException(sampleRow); + } + for (SampleMonth sampleMonth : sampleRow.getSampleMonth()) { if (sampleMonth.getExpectedTidesValue() < 0) { throw new SampleMonthWithIllegalExpectedTidesValueException(sampleRow, sampleMonth); Modified: branches/wao-4.0.x/wao-services/src/main/resources/i18n/wao-services_en_GB.properties =================================================================== --- branches/wao-4.0.x/wao-services/src/main/resources/i18n/wao-services_en_GB.properties 2014-08-06 12:30:30 UTC (rev 2198) +++ branches/wao-4.0.x/wao-services/src/main/resources/i18n/wao-services_en_GB.properties 2014-08-06 12:33:12 UTC (rev 2199) @@ -92,6 +92,7 @@ wao.import.sampleRow.failure.missingProfessionSpecies=Line %s\: For this sampling strategy, you must provide the species wao.import.sampleRow.failure.missingProgramName=Line %s\: You must precise the program name wao.import.sampleRow.failure.missingSampleRowCode=Line %s\: You must precise a code for the sample row +wao.import.sampleRow.failure.noEffortDefined=Line %s\: You must precise effort wao.import.sampleRow.failure.sampleMonthWithIllegalExpectedTidesValue=Line %s\: Effort must be positive for month %s wao.import.sampleRow.failure.unknownFishingGearDcfCode=Unknown fishing gear code\: %s wao.import.sampleRow.failure.unknownTargetSpeciesDcfCode=Unknown target species code\: %s Modified: branches/wao-4.0.x/wao-services/src/main/resources/i18n/wao-services_fr_FR.properties =================================================================== --- branches/wao-4.0.x/wao-services/src/main/resources/i18n/wao-services_fr_FR.properties 2014-08-06 12:30:30 UTC (rev 2198) +++ branches/wao-4.0.x/wao-services/src/main/resources/i18n/wao-services_fr_FR.properties 2014-08-06 12:33:12 UTC (rev 2199) @@ -89,6 +89,7 @@ wao.import.sampleRow.failure.missingProfessionSpecies=Ligne %s \: Il faut préciser les espèces cibles pour cette stratégie d'échantillonage wao.import.sampleRow.failure.missingProgramName=Ligne %s \: Il faut préciser le programme wao.import.sampleRow.failure.missingSampleRowCode=Ligne %s \: Il faut préciser un code pour a ligne du plan +wao.import.sampleRow.failure.noEffortDefined=Ligne %s \: Il faut préciser un effort sur au moins un mois wao.import.sampleRow.failure.sampleMonthWithIllegalExpectedTidesValue=Ligne %s \: l'effort d'observation doit être positif pour le mois %s wao.import.sampleRow.failure.unknownFishingGearDcfCode=Le code engin %s est inconnu du référentiel wao.import.sampleRow.failure.unknownTargetSpeciesDcfCode=Le code espèce cible %s est inconnu du référentiel Modified: branches/wao-4.0.x/wao-web/src/main/java/fr/ifremer/wao/web/action/EditSampleRowAction.java =================================================================== --- branches/wao-4.0.x/wao-web/src/main/java/fr/ifremer/wao/web/action/EditSampleRowAction.java 2014-08-06 12:30:30 UTC (rev 2198) +++ branches/wao-4.0.x/wao-web/src/main/java/fr/ifremer/wao/web/action/EditSampleRowAction.java 2014-08-06 12:33:12 UTC (rev 2199) @@ -34,6 +34,7 @@ import fr.ifremer.wao.services.service.MissingProfessionSpeciesException; import fr.ifremer.wao.services.service.MissingProgramNameException; import fr.ifremer.wao.services.service.MissingSampleRowLogCommentException; +import fr.ifremer.wao.services.service.NoEffortDefinedException; import fr.ifremer.wao.services.service.ObsMerSamplingPlanService; import fr.ifremer.wao.services.service.SampleMonthWithIllegalExpectedTidesValueException; import fr.ifremer.wao.services.service.SampleRowCodeMustBeUniqueException; @@ -122,6 +123,8 @@ addFieldError("updateSampleRowCommand.sampleRow.programName", t("wao.ui.form.SampleRow.error.missingProgramName")); } catch (MissingDcf5CodesException e) { addFieldError("updateSampleRowCommand.dcf5Codes", t("wao.ui.form.SampleRow.error.missingDcf5Codes")); + } catch (NoEffortDefinedException e) { + addFieldError("updateSampleRowCommand.dcf5Codes", t("wao.ui.form.SampleRow.error.noEffortDefined")); } } Modified: branches/wao-4.0.x/wao-web/src/main/resources/i18n/wao-web_en_GB.properties =================================================================== --- branches/wao-4.0.x/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-08-06 12:30:30 UTC (rev 2198) +++ branches/wao-4.0.x/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-08-06 12:33:12 UTC (rev 2199) @@ -323,6 +323,7 @@ wao.ui.form.SampleRow.error.missingPeriodEnd=You must define the month when the observations ends wao.ui.form.SampleRow.error.missingProfessionSpecies=You must define the target species wao.ui.form.SampleRow.error.missingProgramName=You must provide the program name +wao.ui.form.SampleRow.error.noEffortDefined=You must provide the effort wao.ui.form.SampleRow.error.sampleMonthWithIllegalExpectedTidesValue=Effort for month %s must be positive wao.ui.form.SampleRow.error.unknownFishingGearDcfCode=Unknown fishing gear code\: %s wao.ui.form.SampleRow.error.unknownTargetSpeciesDcfCode=Unknown target species code\: %s Modified: branches/wao-4.0.x/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties =================================================================== --- branches/wao-4.0.x/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-08-06 12:30:30 UTC (rev 2198) +++ branches/wao-4.0.x/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-08-06 12:33:12 UTC (rev 2199) @@ -323,6 +323,7 @@ wao.ui.form.SampleRow.error.missingPeriodEnd=Il faut préciser le mois auquel se termine la période d'observation wao.ui.form.SampleRow.error.missingProfessionSpecies=Il faut préciser les espèces cibles wao.ui.form.SampleRow.error.missingProgramName=Il faut préciser le nom du programme +wao.ui.form.SampleRow.error.noEffortDefined=Il faut préciser un effort sur un moins un mois wao.ui.form.SampleRow.error.sampleMonthWithIllegalExpectedTidesValue=Il faut donner un effort positif pour le mois %s wao.ui.form.SampleRow.error.unknownFishingGearDcfCode=Le code engin %s est inconnu du référentiel wao.ui.form.SampleRow.error.unknownTargetSpeciesDcfCode=Le code espèce cible %s est inconnu du référentiel

1 0

r2198 - branches/wao-4.0.x/wao-web/src/main/webapp/WEB-INF/content
by bleny＠users.forge.codelutin.com 06 Aug '14

06 Aug '14

Author: bleny Date: 2014-08-06 14:30:30 +0200 (Wed, 06 Aug 2014) New Revision: 2198 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2198 Log: refs #5603 input value must be '0' and not '' if effort is 0 Modified: branches/wao-4.0.x/wao-web/src/main/webapp/WEB-INF/content/edit-sample-row-input.jsp Modified: branches/wao-4.0.x/wao-web/src/main/webapp/WEB-INF/content/edit-sample-row-input.jsp =================================================================== --- branches/wao-4.0.x/wao-web/src/main/webapp/WEB-INF/content/edit-sample-row-input.jsp 2014-08-06 11:44:53 UTC (rev 2197) +++ branches/wao-4.0.x/wao-web/src/main/webapp/WEB-INF/content/edit-sample-row-input.jsp 2014-08-06 12:30:30 UTC (rev 2198) @@ -68,7 +68,7 @@ }); $(months).each(function (index, month) { var value = ""; - if (expectedObservationsByMonths[month]) { + if (expectedObservationsByMonths[month] != null) { value = expectedObservationsByMonths[month]; } var newInput = ' <td>'

1 0

r2197 - in branches/wao-4.0.x: wao-persistence/src/main/java/fr/ifremer/wao wao-services/src/main/java/fr/ifremer/wao/services/service wao-web/src/main/java/fr/ifremer/wao/web/action
by bleny＠users.forge.codelutin.com 06 Aug '14

06 Aug '14

Author: bleny Date: 2014-08-06 13:44:53 +0200 (Wed, 06 Aug 2014) New Revision: 2197 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2197 Log: add some logs ; fixes #5397 (prevent exception while json serialization) ; refs #5603 review security of contact edition Modified: branches/wao-4.0.x/wao-persistence/src/main/java/fr/ifremer/wao/ContactsFilter.java branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsService.java branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/SynthesisService.java branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/UpdateContactCommand.java branches/wao-4.0.x/wao-web/src/main/java/fr/ifremer/wao/web/action/EditContactAction.java branches/wao-4.0.x/wao-web/src/main/java/fr/ifremer/wao/web/action/ValidateContactJsonAction.java Modified: branches/wao-4.0.x/wao-persistence/src/main/java/fr/ifremer/wao/ContactsFilter.java =================================================================== --- branches/wao-4.0.x/wao-persistence/src/main/java/fr/ifremer/wao/ContactsFilter.java 2014-08-06 10:03:23 UTC (rev 2196) +++ branches/wao-4.0.x/wao-persistence/src/main/java/fr/ifremer/wao/ContactsFilter.java 2014-08-06 11:44:53 UTC (rev 2197) @@ -385,22 +385,25 @@ } } - public boolean isRealVsEstimated() { - boolean realVsEstimated; + /** + * will return null for contacts filter (this field is only for synthesis) + */ + public Boolean getRealVsEstimated() { + Boolean realVsEstimated; if (WaoUtils.isEqualCollection(PROGRAM_ACCEPTATIONS_FOR_REAL_AND_ESTIMATED, getProgramAcceptations())) { if (WaoUtils.isEqualCollection(COMPANY_ACCEPTATIONS_FOR_REAL, getCompanyAcceptations())) { realVsEstimated = true; } else if (WaoUtils.isEqualCollection(COMPANY_ACCEPTATIONS_FOR_ESTIMATED, getCompanyAcceptations())) { realVsEstimated = false; } else { - throw new IllegalStateException(); + realVsEstimated = null; } } else { if (CollectionUtils.isEmpty(getCompanyAcceptations()) && CollectionUtils.isEmpty(getCompanyAcceptations())) { // return default value realVsEstimated = false; } else { - throw new IllegalArgumentException(); + realVsEstimated = null; } } return realVsEstimated; Modified: branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsService.java =================================================================== --- branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsService.java 2014-08-06 10:03:23 UTC (rev 2196) +++ branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsService.java 2014-08-06 11:44:53 UTC (rev 2197) @@ -357,23 +357,23 @@ Contact contactToUpdate = updateContactCommand.getContact(); - // TODO brendan 20/06/14 create to binders - Binder<Contact, Contact> binder = BinderFactory.newBinder(Contact.class); - binder.copyExcluding(contact, contactToUpdate, TopiaEntity.PROPERTY_TOPIA_ID, TopiaEntity.PROPERTY_TOPIA_VERSION, - TopiaEntity.PROPERTY_TOPIA_CREATE_DATE, Contact.PROPERTY_SAMPLE_ROW); - // Prevent that someone who is not admin change data that only admin // must be able to modify if ( ! authenticatedWaoUser.isAdmin()) { - contactToUpdate.setCommentAdmin(contact.getCommentAdmin()); - contactToUpdate.setValidationProgram(contact.getValidationProgram()); - contactToUpdate.setDataReliability(contact.getDataReliability()); + contact.setCommentAdmin(contactToUpdate.getCommentAdmin()); + contact.setValidationProgram(contactToUpdate.getValidationProgram()); + contact.setDataReliability(contactToUpdate.getDataReliability()); } + // TODO brendan 20/06/14 create to binders + Binder<Contact, Contact> binder = BinderFactory.newBinder(Contact.class); + binder.copyExcluding(contact, contactToUpdate, TopiaEntity.PROPERTY_TOPIA_ID, TopiaEntity.PROPERTY_TOPIA_VERSION, + TopiaEntity.PROPERTY_TOPIA_CREATE_DATE, Contact.PROPERTY_SAMPLE_ROW); + } try { - validate(authenticatedWaoUser, updateContactCommand, false); + validate(authenticatedWaoUser, updateContactCommand); } catch (ContactNotUpdatableException e) { String message = l(l, "wao.import.contact.failure.not.updatable", lineNumber); throw new ImportErrorException(message); @@ -504,8 +504,7 @@ } public void validate(AuthenticatedWaoUser authenticatedWaoUser, - UpdateContactCommand updateContactCommand, - boolean needUpdate) throws + UpdateContactCommand updateContactCommand) throws ContactNotUpdatableException, MissingContactMainObserverException, MismatchContactMainObserverCompanyException, @@ -531,247 +530,232 @@ MissingContactDataReliabilityException, MissingContactCommentAdminException, MissingContactTerrestrialLocationException, IllegalAcceptationException { - if (needUpdate) { - Preconditions.checkState(!updateContactCommand.isCreation()); - } - - //FIXME Do some security checks about authenticatedWaoUser - // Check if contact can be updated - boolean canUpdateContact = updateContactCommand.canUpdateContact(authenticatedWaoUser); - if (!canUpdateContact) { + boolean canUpdateContact = authenticatedWaoUser.isAuthorizedToEditContact(updateContactCommand.getContact()) + || authenticatedWaoUser.isAuthorizedToChangeContactValidation(); + + if ( ! canUpdateContact) { throw new ContactNotUpdatableException(); } - // Check if a validation controls are required - boolean mustValidateContact = updateContactCommand.mustValidateContact(); + // Pass validation controls + Contact contact = updateContactCommand.getContact(); - if (mustValidateContact) { + Company company = contact.getSampleRow().getCompany(); - // Pass validation controls - Contact contact = updateContactCommand.getContact(); + WaoUser mainObserver = contact.getMainObserver(); - Company company = contact.getSampleRow().getCompany(); + { + //--- + // mainObserver + //--- - WaoUser mainObserver = contact.getMainObserver(); + if (mainObserver == null) { + throw new MissingContactMainObserverException(contact); + } - { - //--- - // mainObserver - //--- + boolean observerWorksForCompanyInSampleRow = mainObserver.getCompany().equals(company); + if (!observerWorksForCompanyInSampleRow) { + throw new MismatchContactMainObserverCompanyException(contact, mainObserver, company); + } + } - if (mainObserver == null) { - throw new MissingContactMainObserverException(contact); - } + if (contact.isSecondaryObserversNotEmpty()) { - boolean observerWorksForCompanyInSampleRow = mainObserver.getCompany().equals(company); + //--- + // secondaryObservers + //--- + + if (contact.getSecondaryObservers().contains(mainObserver)) { + throw new DuplicatedContactMainObserverInSecondaryObserversException(contact); + } + + for (WaoUser observer : contact.getSecondaryObservers()) { + boolean observerWorksForCompanyInSampleRow = observer.getCompany().equals(company); if (!observerWorksForCompanyInSampleRow) { - throw new MismatchContactMainObserverCompanyException(contact, mainObserver, company); + throw new MismatchContactSecondaryObserverCompanyException(contact, observer, company); } } + } - if (contact.isSecondaryObserversNotEmpty()) { + Date observationBeginDate = contact.getObservationBeginDate(); + Date observationEndDate = contact.getObservationEndDate(); + Date dataInputDate = contact.getDataInputDate(); - //--- - // secondaryObservers - //--- + SampleRow sampleRow = contact.getSampleRow(); - if (contact.getSecondaryObservers().contains(mainObserver)) { - throw new DuplicatedContactMainObserverInSecondaryObserversException(contact); - } + if (observationBeginDate != null) { - for (WaoUser observer : contact.getSecondaryObservers()) { - boolean observerWorksForCompanyInSampleRow = observer.getCompany().equals(company); - if (!observerWorksForCompanyInSampleRow) { - throw new MismatchContactSecondaryObserverCompanyException(contact, observer, company); - } - } - } + //--- + // observationBeginDate + //--- - Date observationBeginDate = contact.getObservationBeginDate(); - Date observationEndDate = contact.getObservationEndDate(); - Date dataInputDate = contact.getDataInputDate(); + SampleMonth month = sampleRow.getSampleMonth(observationBeginDate); + boolean operationBeginDateIsValid = month != null; - SampleRow sampleRow = contact.getSampleRow(); + if (!operationBeginDateIsValid) { + throw new InvalidContactObservationBeginDateException(contact); + } + } - if (observationBeginDate != null) { + Date currentDate = serviceContext.getNow(); - //--- - // observationBeginDate - //--- + if (observationEndDate != null) { - SampleMonth month = sampleRow.getSampleMonth(observationBeginDate); - boolean operationBeginDateIsValid = month != null; + //--- + // observationEndDate + //--- - if (!operationBeginDateIsValid) { - throw new InvalidContactObservationBeginDateException(contact); - } + if (observationBeginDate != null + && observationEndDate.before(observationBeginDate)) { + throw new ContactObservationEndDateBeforeBeginDateException(contact); } - Date currentDate = serviceContext.getNow(); + if (observationEndDate.after(currentDate)) { + throw new ContactObservationEndDateAfterTodayException(contact, currentDate); + } + } + + if (dataInputDate != null) { + + //--- + // dataInputDate + //--- + if (observationEndDate != null) { - //--- - // observationEndDate - //--- + // Here, we check that the date input date is after the end of the + // observation. Since the first is a day (at 00:00) and the second + // is date-time, there may be a bug if the data input day is the same + // as the end of observation + boolean dataInputDateAfterObservationEndDate = + observationEndDate.after(DateUtil.setMaxTimeOfDay(dataInputDate)); - if (observationBeginDate != null - && observationEndDate.before(observationBeginDate)) { - throw new ContactObservationEndDateBeforeBeginDateException(contact); + if (dataInputDateAfterObservationEndDate) { + throw new ContactDataInputDateBeforeObservationEndDateException(contact); } + } - if (observationEndDate.after(currentDate)) { - throw new ContactObservationEndDateAfterTodayException(contact, currentDate); - } - + if (dataInputDate.after(currentDate)) { + throw new ContactDataInputDateAfterTodayException(contact, currentDate); } + } - if (dataInputDate != null) { + //--- + // contactState + //--- - //--- - // dataInputDate - //--- + ContactState contactState = contact.getContactState(); - if (observationEndDate != null) { + boolean contactMustHaveAMotif = false; + switch (contactState) { + case OBSERVATION_CANCELLED: - // Here, we check that the date input date is after the end of the - // observation. Since the first is a day (at 00:00) and the second - // is date-time, there may be a bug if the data input day is the same - // as the end of observation - boolean dataInputDateAfterObservationEndDate = - observationEndDate.after(DateUtil.setMaxTimeOfDay(dataInputDate)); + // Non abouti - if (dataInputDateAfterObservationEndDate) { - throw new ContactDataInputDateBeforeObservationEndDateException(contact); - } + if (StringUtils.isBlank(contact.getComment())) { + throw new MissingContactCommentException(contact); } + break; + case OBSERVATION_DONE: - if (dataInputDate.after(currentDate)) { - throw new ContactDataInputDateAfterTodayException(contact, currentDate); + // Observation réalisée + + if (observationBeginDate == null) { + throw new MissingContactObservationBeginDateException(contact); } - } + if (observationEndDate == null) { + throw new MissingContactObservationEndDateException(contact); + } + if (contact.getNbObservants() == 0) { + throw new MissingContactNbObservantsException(contact); + } + if (contact.getObsProgram().isObsVente() && contact.getTerrestrialLocation() == null) { + throw new MissingContactTerrestrialLocationException(contact); + } + break; - //--- - // contactState - //--- + case CONTACT_REFUSED: + contactMustHaveAMotif = true; + break; + case CONTACT_DEFINITELY_REFUSED: + contactMustHaveAMotif = true; + break; - ContactState contactState = contact.getContactState(); + } - boolean contactMustHaveAMotif = false; - switch (contactState) { - case OBSERVATION_CANCELLED: + //--- + // contactStateMotif + //--- - // Non abouti + if (contactMustHaveAMotif && contact.getContactStateMotif() == null) { + throw new MissingContactStateMotifException(contact); + } - if (StringUtils.isBlank(contact.getComment())) { - throw new MissingContactCommentException(contact); - } - break; - case OBSERVATION_DONE: + if (!contactMustHaveAMotif && contact.getContactStateMotif() != null) { + throw new UnwantedContactContactStateMotifException(contact); + } - // Observation réalisée + if (contact.isMammalsCapture() && StringUtils.isBlank(contact.getMammalsInfo())) { + throw new MissingContactMammalsInfoException(contact); + } - if (observationBeginDate == null) { - throw new MissingContactObservationBeginDateException(contact); - } - if (observationEndDate == null) { - throw new MissingContactObservationEndDateException(contact); - } - if (contact.getNbObservants() == 0) { - throw new MissingContactNbObservantsException(contact); - } - if (contact.getObsProgram().isObsVente() && contact.getTerrestrialLocation() == null) { - throw new MissingContactTerrestrialLocationException(contact); - } - break; + if (BooleanUtils.isTrue(contact.getValidationCompany())) { - case CONTACT_REFUSED: - contactMustHaveAMotif = true; - break; - case CONTACT_DEFINITELY_REFUSED: - contactMustHaveAMotif = true; - break; - - } - //--- - // contactStateMotif + // validationCompany //--- - if (contactMustHaveAMotif && contact.getContactStateMotif() == null) { - throw new MissingContactStateMotifException(contact); + if (ContactState.OBSERVATION_DONE == contactState) { + if (contact.getObsProgram().isObsMer() && contact.getObservedDataControl() == null) { + throw new MissingContactObservedDataControlException(contact); + } else if (ObservedDataControl.CORRECTION_ASKED.equals(contact.getObservedDataControl())) { + throw new ContactWithObservedDataControlToCorrectionAskedException(contact); + } } - if (!contactMustHaveAMotif && contact.getContactStateMotif() != null) { - throw new UnwantedContactContactStateMotifException(contact); + // Pour valider un contact société, il faut que le contact aie une date de transmission + Date restitution = contact.getRestitution(); + if (ObservedDataControl.ACCEPTED.equals(contact.getObservedDataControl()) && restitution == null) { + throw new MissingContactRestitutionException(contact); } - - if (contact.isMammalsCapture() && StringUtils.isBlank(contact.getMammalsInfo())) { - throw new MissingContactMammalsInfoException(contact); + if (dataInputDate == null && restitution != null) { + throw new MissingContactDataInputDateException(contact); } - - if (BooleanUtils.isTrue(contact.getValidationCompany())) { - - //--- - // validationCompany - //--- - - if (ContactState.OBSERVATION_DONE == contactState) { - if (contact.getObsProgram().isObsMer() && contact.getObservedDataControl() == null) { - throw new MissingContactObservedDataControlException(contact); - } else if (ObservedDataControl.CORRECTION_ASKED.equals(contact.getObservedDataControl())) { - throw new ContactWithObservedDataControlToCorrectionAskedException(contact); - } - } - - // Pour valider un contact société, il faut que le contact aie une date de transmission - Date restitution = contact.getRestitution(); - if (ObservedDataControl.ACCEPTED.equals(contact.getObservedDataControl()) && restitution == null) { - throw new MissingContactRestitutionException(contact); - } - if (dataInputDate == null && restitution != null) { - throw new MissingContactDataInputDateException(contact); - } - if (dataInputDate != null && restitution != null && restitution.before(dataInputDate)) { - throw new ContactRestitutionDateBeforeDataInputDateException(contact); - } + if (dataInputDate != null && restitution != null && restitution.before(dataInputDate)) { + throw new ContactRestitutionDateBeforeDataInputDateException(contact); } + } - if (contact.getValidationProgram() != null && contact.getValidationCompany() == null) { + if (contact.getValidationProgram() != null && contact.getValidationCompany() == null) { - throw new IllegalAcceptationException(contact); - } + throw new IllegalAcceptationException(contact); + } - DataReliability dataReliability = contact.getDataReliability(); + DataReliability dataReliability = contact.getDataReliability(); - if (dataReliability != null && dataReliability.isCommentRequired() && StringUtils.isBlank(contact.getCommentAdmin())) { - throw new MissingContactCommentAdminException(contact); - } + if (dataReliability != null && dataReliability.isCommentRequired() && StringUtils.isBlank(contact.getCommentAdmin())) { + throw new MissingContactCommentAdminException(contact); + } - if (BooleanUtils.isTrue(contact.getValidationProgram())) { + if (BooleanUtils.isTrue(contact.getValidationProgram())) { - //--- - // validationProgram - //--- - if (contact.getObsProgram().isObsMer()) { + //--- + // validationProgram + //--- + if (contact.getObsProgram().isObsMer()) { - // it's an admin validation, data-reliability field must be filled - if (dataReliability == null || DataReliability.UNKNOWN == dataReliability) { - throw new MissingContactDataReliabilityException(contact); - } + // it's an admin validation, data-reliability field must be filled + if (dataReliability == null || DataReliability.UNKNOWN == dataReliability) { + throw new MissingContactDataReliabilityException(contact); } } } } - public void save(UpdateContactCommand updateContactCommand, - boolean needUpdate) throws ContactNotUpdatableException { + public void save(UpdateContactCommand updateContactCommand) throws ContactNotUpdatableException { - if (needUpdate) { - Preconditions.checkState(!updateContactCommand.isCreation()); - } - save0(updateContactCommand); commit(); Modified: branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/SynthesisService.java =================================================================== --- branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/SynthesisService.java 2014-08-06 10:03:23 UTC (rev 2196) +++ branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/SynthesisService.java 2014-08-06 11:44:53 UTC (rev 2197) @@ -235,7 +235,7 @@ dataset.setValue(expected, I18n.l(locale, "wao.synthesis.planned"), WaoUtils.formatMonth(locale, month)); } String rowKey; - if (filter.isRealVsEstimated()) { + if (filter.getRealVsEstimated()) { rowKey = I18n.l(locale, "wao.ui.samplingPlan.Actual"); } else { rowKey = I18n.l(locale, "wao.synthesis.estimated"); Modified: branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/UpdateContactCommand.java =================================================================== --- branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/UpdateContactCommand.java 2014-08-06 10:03:23 UTC (rev 2196) +++ branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/UpdateContactCommand.java 2014-08-06 11:44:53 UTC (rev 2197) @@ -24,7 +24,6 @@ import com.google.common.base.Preconditions; import fr.ifremer.wao.entity.Contact; import fr.ifremer.wao.entity.DataReliability; -import fr.ifremer.wao.services.AuthenticatedWaoUser; import org.apache.commons.lang3.ObjectUtils; import java.io.Serializable; @@ -120,32 +119,6 @@ } /** - * Check if the contact can be updated by the given connected user. - * - * @param authenticatedWaoUser the user who want to update the contact - * @return {@code true} if contact can be updated - */ - public boolean canUpdateContact(AuthenticatedWaoUser authenticatedWaoUser) { - boolean contactCanBeUpdated = true; - if (!isCreation() && authenticatedWaoUser.isCoordinatorOrObserver()) { - contactCanBeUpdated = oldValidationProgram == null; - } - return contactCanBeUpdated; - } - - /** - * Check if the contact need to pass validation controls. - * - * @return {@code true} if the contact must be validated - */ - public boolean mustValidateContact() { - boolean needValidation = isCreation() || // new contact - oldValidationProgram == null || // want to validate a contact - getValidationProgram() != null; // want to validate a contact - return needValidation; - } - - /** * Check if mammals informations has changed. * * @return {@code true} if mammal informations changed Modified: branches/wao-4.0.x/wao-web/src/main/java/fr/ifremer/wao/web/action/EditContactAction.java =================================================================== --- branches/wao-4.0.x/wao-web/src/main/java/fr/ifremer/wao/web/action/EditContactAction.java 2014-08-06 10:03:23 UTC (rev 2196) +++ branches/wao-4.0.x/wao-web/src/main/java/fr/ifremer/wao/web/action/EditContactAction.java 2014-08-06 11:44:53 UTC (rev 2197) @@ -260,7 +260,7 @@ AuthenticatedWaoUser authenticatedWaoUser = session.getAuthenticatedWaoUser(); try { - service.validate(authenticatedWaoUser, updateContactCommand, true); + service.validate(authenticatedWaoUser, updateContactCommand); } catch (ContactNotUpdatableException e) { session.addErrorMessages(t("wao.ui.contacts.validation.failure.not.updatable")); @@ -352,7 +352,7 @@ @Override public String execute() throws Exception { - service.save(updateContactCommand, false); + service.save(updateContactCommand); session.addMessage(t("wao.ui.form.updateContactCommand.success")); Modified: branches/wao-4.0.x/wao-web/src/main/java/fr/ifremer/wao/web/action/ValidateContactJsonAction.java =================================================================== --- branches/wao-4.0.x/wao-web/src/main/java/fr/ifremer/wao/web/action/ValidateContactJsonAction.java 2014-08-06 10:03:23 UTC (rev 2196) +++ branches/wao-4.0.x/wao-web/src/main/java/fr/ifremer/wao/web/action/ValidateContactJsonAction.java 2014-08-06 11:44:53 UTC (rev 2197) @@ -135,8 +135,6 @@ Preconditions.checkState(StringUtils.isNotEmpty(contactId)); - AuthenticatedWaoUser authenticatedWaoUser = session.getAuthenticatedWaoUser(); - try { updateContactCommand = service.newUpdateContactCommand( session.getAuthenticatedWaoUser(), @@ -144,21 +142,31 @@ } catch (UnknownContactIdException e) { addActionError(t("wao.ui.error.unknownContactId")); } + } + @Override + public String execute() { + + AuthenticatedWaoUser authenticatedWaoUser = session.getAuthenticatedWaoUser(); + + if (log.isInfoEnabled()) { + log.info("user " + authenticatedWaoUser + " wants to change validation for contact " + contactId); + } + if (authenticatedWaoUser.isAdmin()) { updateContactCommand.setValidationProgram(validationState); + if (log.isInfoEnabled()) { + log.info("setting contact validation program to " + validationState); + } } else { updateContactCommand.setValidationCompany(validationState); + if (log.isInfoEnabled()) { + log.info("setting contact validation company to " + validationState); + } } - } - @Override - public String execute() { - - AuthenticatedWaoUser authenticatedWaoUser = session.getAuthenticatedWaoUser(); - try { - service.validate(authenticatedWaoUser, updateContactCommand, true); + service.validate(authenticatedWaoUser, updateContactCommand); } catch (ContactNotUpdatableException e) { session.addErrorMessages(t("wao.ui.contacts.validation.failure.not.updatable")); @@ -251,10 +259,15 @@ if (isSuccessful()) { try { - service.save(updateContactCommand, true); + service.save(updateContactCommand); } catch (ContactNotUpdatableException e) { throw new WaoTechnicalException("should never occur", e); } + + if (log.isInfoEnabled()) { + log.info("changing validation state successful"); + } + if (validationState == null) { successMessage = t("wao.ui.contacts.validation.to.unvalidate.state.success"); } else if (validationState) { @@ -262,6 +275,11 @@ } else { successMessage = t("wao.ui.contacts.validation.to.reject.state.success"); } + + } else { + if (log.isInfoEnabled()) { + log.info("changing validation state failed for reason " + errorMessage); + } } return SUCCESS;

1 0

r2196 - branches/wao-4.0.x/wao-web/src/main/webapp/WEB-INF/content
by bleny＠users.forge.codelutin.com 06 Aug '14

06 Aug '14

Author: bleny Date: 2014-08-06 12:03:23 +0200 (Wed, 06 Aug 2014) New Revision: 2196 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2196 Log: add some information about sample row in edit-contact form Modified: branches/wao-4.0.x/wao-web/src/main/webapp/WEB-INF/content/edit-contact-input.jsp Modified: branches/wao-4.0.x/wao-web/src/main/webapp/WEB-INF/content/edit-contact-input.jsp =================================================================== --- branches/wao-4.0.x/wao-web/src/main/webapp/WEB-INF/content/edit-contact-input.jsp 2014-08-04 15:26:22 UTC (rev 2195) +++ branches/wao-4.0.x/wao-web/src/main/webapp/WEB-INF/content/edit-contact-input.jsp 2014-08-06 10:03:23 UTC (rev 2196) @@ -155,7 +155,7 @@ <s:text name="wao.ui.field.Boat.boatLength"/> </th> <td> - <s:property value="%{'' + updateContactCommand.contact.boat.boatLength}"/> + <s:property value="%{'' + updateContactCommand.contact.boat.boatLength}"/> cm. </td> </tr> <tr> @@ -175,6 +175,14 @@ <tbody> <tr> <th> + <s:text name="wao.ui.field.SampleRow.code"/> + </th> + <td> + <s:property value="updateContactCommand.contact.sampleRow.code"/> + </td> + </tr> + <tr> + <th> <s:text name="wao.ui.field.SampleRow.profession"/> </th> <td>

1 0

r2195 - branches/wao-4.0.x/wao-web/src/main/java/fr/ifremer/wao/web
by bleny＠users.forge.codelutin.com 04 Aug '14

04 Aug '14

Author: bleny Date: 2014-08-04 17:26:22 +0200 (Mon, 04 Aug 2014) New Revision: 2195 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2195 Log: do not hide exception Modified: branches/wao-4.0.x/wao-web/src/main/java/fr/ifremer/wao/web/WaoInterceptor.java Modified: branches/wao-4.0.x/wao-web/src/main/java/fr/ifremer/wao/web/WaoInterceptor.java =================================================================== --- branches/wao-4.0.x/wao-web/src/main/java/fr/ifremer/wao/web/WaoInterceptor.java 2014-08-04 10:23:44 UTC (rev 2194) +++ branches/wao-4.0.x/wao-web/src/main/java/fr/ifremer/wao/web/WaoInterceptor.java 2014-08-04 15:26:22 UTC (rev 2195) @@ -153,6 +153,8 @@ serviceContext.getPersistenceContext().rollback(); } + throw t; + } finally { // TODO brendan 21/07/14 use try with resources

1 0

r2194 - branches/wao-4.0.x/wao-web/src/main/java/fr/ifremer/wao/web
by bleny＠users.forge.codelutin.com 04 Aug '14

04 Aug '14

Author: bleny Date: 2014-08-04 12:23:44 +0200 (Mon, 04 Aug 2014) New Revision: 2194 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2194 Log: rollback on error in interceptor Modified: branches/wao-4.0.x/wao-web/src/main/java/fr/ifremer/wao/web/WaoInterceptor.java Modified: branches/wao-4.0.x/wao-web/src/main/java/fr/ifremer/wao/web/WaoInterceptor.java =================================================================== --- branches/wao-4.0.x/wao-web/src/main/java/fr/ifremer/wao/web/WaoInterceptor.java 2014-07-30 16:16:43 UTC (rev 2193) +++ branches/wao-4.0.x/wao-web/src/main/java/fr/ifremer/wao/web/WaoInterceptor.java 2014-08-04 10:23:44 UTC (rev 2194) @@ -146,6 +146,13 @@ return invocation.invoke(); + } catch (Throwable t) { + + // TODO brendan 21/07/14 use try with resources + if (serviceContext != null) { + serviceContext.getPersistenceContext().rollback(); + } + } finally { // TODO brendan 21/07/14 use try with resources

1 0