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

r2043 - trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer
by bleny＠users.forge.codelutin.com June 17, 2014

June 17, 2014

Author: bleny Date: 2014-06-17 13:34:57 +0200 (Tue, 17 Jun 2014) New Revision: 2043 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2043 Log: indent jsp Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-sample-row-input.jsp Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-sample-row-input.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-sample-row-input.jsp 2014-06-17 10:40:03 UTC (rev 2042) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-sample-row-input.jsp 2014-06-17 11:34:57 UTC (rev 2043) @@ -100,14 +100,15 @@ <s:form> - <h1> - <s:if test="updateSampleRowCommand.creation"> - <s:text name="wao.ui.sampleRow.creation" /> - </s:if> - <s:else> - <s:property value="t('wao.ui.sampleRow.edition', updateSampleRowCommand.sampleRow.code)" /> - </s:else> - </h1> + <h1> + <s:if test="updateSampleRowCommand.creation"> + <s:text name="wao.ui.sampleRow.creation" /> + </s:if> + <s:else> + <s:property value="t('wao.ui.sampleRow.edition', updateSampleRowCommand.sampleRow.code)" /> + </s:else> + </h1> + <s:hidden name="sampleRowId" value="%{sampleRowId}" /> <fieldset>

1 0

r2042 - in trunk: wao-persistence/src/main/java/fr/ifremer/wao/entity wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer
by bleny＠users.forge.codelutin.com June 17, 2014

June 17, 2014

Author: bleny Date: 2014-06-17 12:40:03 +0200 (Tue, 17 Jun 2014) New Revision: 2042 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2042 Log: fixes #5216 sort observer names in select Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/WaoUsers.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/EditContactAction.java Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/WaoUsers.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/WaoUsers.java 2014-06-17 10:29:55 UTC (rev 2041) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/WaoUsers.java 2014-06-17 10:40:03 UTC (rev 2042) @@ -22,13 +22,24 @@ */ import com.google.common.base.Function; +import com.google.common.collect.Ordering; +import java.util.Comparator; + public class WaoUsers { public static Function<WaoUser, String> getLogin() { return new GetLogin(); } + public static Comparator<WaoUser> fullNameComparator() { + return Ordering.natural().onResultOf(getFullName()); + } + + public static Function<WaoUser, String> getFullName() { + return new GetFullName(); + } + protected static class GetLogin implements Function<WaoUser, String> { @Override @@ -36,4 +47,12 @@ return input.getLogin(); } } + + protected static class GetFullName implements Function<WaoUser, String> { + + @Override + public String apply(WaoUser input) { + return input.getFullName(); + } + } } Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/EditContactAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/EditContactAction.java 2014-06-17 10:29:55 UTC (rev 2041) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/EditContactAction.java 2014-06-17 10:40:03 UTC (rev 2042) @@ -23,6 +23,7 @@ import com.google.common.base.Optional; import com.google.common.base.Strings; +import com.google.common.collect.Sets; import com.opensymphony.xwork2.Preparable; import fr.ifremer.wao.WaoUtils; import fr.ifremer.wao.entity.ContactState; @@ -30,6 +31,7 @@ import fr.ifremer.wao.entity.DataReliability; import fr.ifremer.wao.entity.ObservedDataControl; import fr.ifremer.wao.entity.WaoUser; +import fr.ifremer.wao.entity.WaoUsers; import fr.ifremer.wao.services.AuthenticatedWaoUser; import fr.ifremer.wao.services.service.ContactDataInputDateAfterTodayException; import fr.ifremer.wao.services.service.ContactDataInputDateBeforeObservationEndDateException; @@ -64,8 +66,10 @@ import java.util.Date; import java.util.EnumMap; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import java.util.Set; import java.util.TreeMap; /** @@ -177,9 +181,11 @@ updateContactCommand = service.newUpdateContactCommand(getAuthenticatedWaoUser(), optionalContactId); - observers = new TreeMap<>(); List<WaoUser> waoUsers = waoUsersService.getActiveWaoUsers(Optional.of(updateContactCommand.getContact().getSampleRow().getCompany().getTopiaId())); - for (WaoUser waoUser : waoUsers) { + Set<WaoUser> sortedWaoUsers = Sets.newTreeSet(WaoUsers.fullNameComparator()); + sortedWaoUsers.addAll(waoUsers); + observers = new LinkedHashMap<>(); + for (WaoUser waoUser : sortedWaoUsers) { observers.put(waoUser.getTopiaId(), waoUser.getFullName()); } contactStates = new EnumMap<>(ContactState.class);

1 0

r2041 - in trunk: wao-services/src/main/java/fr/ifremer/wao/services wao-web/src/main/webapp/WEB-INF/content/obsmer
by bleny＠users.forge.codelutin.com June 17, 2014

June 17, 2014

Author: bleny Date: 2014-06-17 12:29:55 +0200 (Tue, 17 Jun 2014) New Revision: 2041 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2041 Log: fixes #5247 hide contacts comment for professional Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java 2014-06-17 10:26:54 UTC (rev 2040) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java 2014-06-17 10:29:55 UTC (rev 2041) @@ -189,6 +189,9 @@ public boolean isAuthorizedToExportContacts() { return userProfile.isAdmin() || userProfile.isCoordinatorOrObserver(); } + public boolean isAuthorizedToViewContactsComments() { + return ! userProfile.isProfessional(); + } public boolean isAuthorizedToEditSamplingPlan() { return userProfile.isAdmin() && isCanWrite(); Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp 2014-06-17 10:26:54 UTC (rev 2040) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp 2014-06-17 10:29:55 UTC (rev 2041) @@ -325,9 +325,11 @@ <th><s:text name="wao.ui.field.Contact.observedDataControl"/></th> <th class="date"><s:text name="wao.ui.field.Contact.restitution"/></th> <th><s:text name="wao.ui.contacts.observations"/></th> - <th><s:text name="wao.ui.field.Contact.comment"/></th> - <th><s:text name="wao.ui.field.Contact.commentCompany"/></th> - <th><s:text name="wao.ui.field.Contact.commentAdmin"/></th> + <s:if test="authenticatedWaoUser.authorizedToViewContactsComments"> + <th><s:text name="wao.ui.field.Contact.comment"/></th> + <th><s:text name="wao.ui.field.Contact.commentCompany"/></th> + <th><s:text name="wao.ui.field.Contact.commentAdmin"/></th> + </s:if> <th><s:text name="wao.ui.field.Contact.dataReliability"/></th> <th><s:text name="wao.ui.contacts.validation"/></th> <th><s:text name="wao.ui.actions"/></th> @@ -451,21 +453,23 @@ </s:if> </td> - <td class="align-center"> - <s:if test=" ! comment.empty"> - " class="fa fa-comment"> - </s:if> - </td> - <td class="align-center"> - <s:if test=" ! commentCoordinator.empty"> - " class="fa fa-comment"> - </s:if> - </td> - <td class="align-center"> - <s:if test=" ! commentAdmin.empty"> - " class="fa fa-comment"> - </s:if> - </td> + <s:if test="authenticatedWaoUser.authorizedToViewContactsComments"> + <td class="align-center"> + <s:if test=" ! comment.empty"> + " class="fa fa-comment"> + </s:if> + </td> + <td class="align-center"> + <s:if test=" ! commentCoordinator.empty"> + " class="fa fa-comment"> + </s:if> + </td> + <td class="align-center"> + <s:if test=" ! commentAdmin.empty"> + " class="fa fa-comment"> + </s:if> + </td> + </s:if> <td> <s:if test="isBoardingDone(#contact)"> <s:if test="validationCompany">

1 0

r2040 - in trunk: wao-services/src/main/java/fr/ifremer/wao/services wao-web/src/main/webapp/WEB-INF/content/obsmer
by bleny＠users.forge.codelutin.com June 17, 2014

June 17, 2014

Author: bleny Date: 2014-06-17 12:26:54 +0200 (Tue, 17 Jun 2014) New Revision: 2040 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2040 Log: refs #5247 professional should not be able to export contacts Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java 2014-06-17 09:56:21 UTC (rev 2039) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java 2014-06-17 10:26:54 UTC (rev 2040) @@ -186,6 +186,10 @@ return userProfile.isAdmin() && isCanWrite(); } + public boolean isAuthorizedToExportContacts() { + return userProfile.isAdmin() || userProfile.isCoordinatorOrObserver(); + } + public boolean isAuthorizedToEditSamplingPlan() { return userProfile.isAdmin() && isCanWrite(); } Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp 2014-06-17 09:56:21 UTC (rev 2039) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp 2014-06-17 10:26:54 UTC (rev 2040) @@ -225,9 +225,11 @@ <s:text name="wao.ui.action.reset"/> </s:a> - <s:submit action="export-contacts" type="button" cssClass="btn"> - <s:text name="wao.ui.action.csvExport"/> - </s:submit> + <s:if test="authenticatedWaoUser.authorizedToExportContacts"> + <s:submit action="export-contacts" type="button" cssClass="btn"> + <s:text name="wao.ui.action.csvExport"/> + </s:submit> + </s:if> </div>

1 0

r2039 - trunk/wao-web/src/main/resources/i18n
by bleny＠users.forge.codelutin.com June 17, 2014

June 17, 2014

Author: bleny Date: 2014-06-17 11:56:21 +0200 (Tue, 17 Jun 2014) New Revision: 2039 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2039 Log: add missing i18n keys Modified: trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties Modified: trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties =================================================================== --- trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-06-17 09:49:07 UTC (rev 2038) +++ trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-06-17 09:56:21 UTC (rev 2039) @@ -279,27 +279,27 @@ wao.ui.form.Company.title.creation=Create a new company wao.ui.form.Company.title.edition=Edit company %s wao.ui.form.Contact.contactCreatedOn=Contact created on %s -wao.ui.form.Contact.error.dataInputDateAfterToday= -wao.ui.form.Contact.error.dataInputDateBeforeObservationEndDate= -wao.ui.form.Contact.error.duplicatedMainObserverInSecondaryObservers= -wao.ui.form.Contact.error.invalidObservationBeginDate= -wao.ui.form.Contact.error.mismatchCompanyForObserver= -wao.ui.form.Contact.error.missingComment= -wao.ui.form.Contact.error.missingCommentAdmin= -wao.ui.form.Contact.error.missingContactStateMotif= -wao.ui.form.Contact.error.missingDataInputDate= -wao.ui.form.Contact.error.missingDataReliability= -wao.ui.form.Contact.error.missingMainObserver= -wao.ui.form.Contact.error.missingObservationBeginDate= -wao.ui.form.Contact.error.missingObservationEndDate= -wao.ui.form.Contact.error.missingObservedDataControl= -wao.ui.form.Contact.error.missingObserver= -wao.ui.form.Contact.error.missingRestitution= -wao.ui.form.Contact.error.observationEndDateAfterToday= -wao.ui.form.Contact.error.observationEndDateBeforeBeginDate= -wao.ui.form.Contact.error.observedDataControlToCorrectionAsked= -wao.ui.form.Contact.error.transmissionDateBeforeDataInputDate= -wao.ui.form.Contact.error.unwantedContactStateMotif= +wao.ui.form.Contact.error.dataInputDateAfterToday=The data input date cannot be after tomorrow +wao.ui.form.Contact.error.dataInputDateBeforeObservationEndDate=The data input date cannot be before observation end date +wao.ui.form.Contact.error.duplicatedMainObserverInSecondaryObservers=The main observer cannot also be a secondary observer +wao.ui.form.Contact.error.invalidObservationBeginDate=The observation begin date must be a date in a month with an expected effort in the sampling plan +wao.ui.form.Contact.error.mismatchCompanyForObserver=Observers must belong to the company attached to the sample row +wao.ui.form.Contact.error.missingComment=The comment is mandatory +wao.ui.form.Contact.error.missingCommentAdmin=The admin comment is mandatory +wao.ui.form.Contact.error.missingContactStateMotif=The contact state motif must be provided +wao.ui.form.Contact.error.missingDataInputDate=The data input date must be provided +wao.ui.form.Contact.error.missingDataReliability=The data reliability must be provided +wao.ui.form.Contact.error.missingMainObserver=The main observer must be provided +wao.ui.form.Contact.error.missingObservationBeginDate=The observation begin date must be provided +wao.ui.form.Contact.error.missingObservationEndDate=The observation end date must be provided +wao.ui.form.Contact.error.missingObservedDataControl=The observed data control must be provided +wao.ui.form.Contact.error.missingObserver=The main observer must be provided +wao.ui.form.Contact.error.missingRestitution=The restitution date must be provided +wao.ui.form.Contact.error.observationEndDateAfterToday=Observation end date cannot be after today +wao.ui.form.Contact.error.observationEndDateBeforeBeginDate=Observation end date must be after observation begin date +wao.ui.form.Contact.error.observedDataControlToCorrectionAsked=Observed data control shows that a correction is asked +wao.ui.form.Contact.error.transmissionDateBeforeDataInputDate=Transmission date must be after data input date +wao.ui.form.Contact.error.unwantedContactStateMotif=Contact state motif should not be provided wao.ui.form.SampleRow.boatsDescription=This field contains registration numbers of the ships that areeligible for this ligne. You can use any separator to separate numbers (space, dot, line-return, comma) wao.ui.form.SampleRow.error.codeMustBeUnique=Sample row code must be unique wao.ui.form.SampleRow.error.missingDcf5Codes=You must provide at least one DCF5 code

1 0

r2038 - in trunk: 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/obsmer wao-web/src/main/resources/i18n
by bleny＠users.forge.codelutin.com June 17, 2014

June 17, 2014

Author: bleny Date: 2014-06-17 11:49:07 +0200 (Tue, 17 Jun 2014) New Revision: 2038 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2038 Log: fixes #5218 add a validation rule Added: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactWithObservedDataControlToCorrectionAskedException.java Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerContactsService.java trunk/wao-services/src/main/resources/i18n/wao-services_en_GB.properties trunk/wao-services/src/main/resources/i18n/wao-services_fr_FR.properties trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/EditContactAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ValidateContactJsonAction.java trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties Added: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactWithObservedDataControlToCorrectionAskedException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactWithObservedDataControlToCorrectionAskedException.java (rev 0) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactWithObservedDataControlToCorrectionAskedException.java 2014-06-17 09:49:07 UTC (rev 2038) @@ -0,0 +1,15 @@ +package fr.ifremer.wao.services.service; + +import fr.ifremer.wao.entity.Contact; + +/** + * Un contact en correction demandée ne peut pas être accepté par la société. + */ +public class ContactWithObservedDataControlToCorrectionAskedException extends WaoContactValidationException { + + private static final long serialVersionUID = 1L; + + public ContactWithObservedDataControlToCorrectionAskedException(Contact contact) { + super(contact); + } +} Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerContactsService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerContactsService.java 2014-06-17 09:05:43 UTC (rev 2037) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerContactsService.java 2014-06-17 09:49:07 UTC (rev 2038) @@ -383,6 +383,9 @@ } catch (MissingContactObservedDataControlException e) { String message = l(l, "wao.import.contact.failure.missingObservedDataControl", lineNumber); throw new ImportErrorException(message); + } catch (ContactWithObservedDataControlToCorrectionAskedException e) { + String message = l(l, "wao.import.contact.failure.observedDataControlToCorrectionAsked", lineNumber); + throw new ImportErrorException(message); } catch (MissingContactStateMotifException e) { String message = l(l, "wao.import.contact.failure.missingContactStateMotif", lineNumber); throw new ImportErrorException(message); @@ -443,6 +446,7 @@ MissingContactStateMotifException, UnwantedContactContactStateMotifException, MissingContactObservedDataControlException, + ContactWithObservedDataControlToCorrectionAskedException, MissingContactRestitutionException, MissingContactDataInputDateException, ContactRestitutionDateBeforeDataInputDateException, @@ -628,12 +632,16 @@ // validationCompany //--- + if (ContactState.OBSERVATION_DONE == contactState) { + if (contact.getObservedDataControl() == null) { + throw new MissingContactObservedDataControlException(contact); + } else if (contact.getObservedDataControl().equals(ObservedDataControl.CORRECTION_ASKED)) { + throw new ContactWithObservedDataControlToCorrectionAskedException(contact); + } + } + // Pour valider un contact société, il faut que le contact aie une date de transmission - if (ContactState.OBSERVATION_DONE == contactState && contact.getObservedDataControl() == null) { - throw new MissingContactObservedDataControlException(contact); - } Date restitution = contact.getRestitution(); - if (ObservedDataControl.ACCEPTED == contact.getObservedDataControl() && restitution == null) { throw new MissingContactRestitutionException(contact); } Modified: trunk/wao-services/src/main/resources/i18n/wao-services_en_GB.properties =================================================================== --- trunk/wao-services/src/main/resources/i18n/wao-services_en_GB.properties 2014-06-17 09:05:43 UTC (rev 2037) +++ trunk/wao-services/src/main/resources/i18n/wao-services_en_GB.properties 2014-06-17 09:49:07 UTC (rev 2038) @@ -59,6 +59,7 @@ wao.import.contact.failure.not.updatable=Insufficient credentials to update contact wao.import.contact.failure.observationEndDateAfterToday=La date de fin de la marée ne peut pas être postérieure à la date du jour wao.import.contact.failure.observationEndDateBeforeBeginDate=La date de fin d'observation ne peut pas être antérieure à celle du début +wao.import.contact.failure.observedDataControlToCorrectionAsked=A contact cannot be accepted if observed data control shows that a correction is asked wao.import.contact.failure.sampleRowCodeMissing=The code of the sample row line is missing wao.import.contact.failure.terrestrialLocationMissing=The code of the terrestrial location is missing wao.import.contact.failure.transmissionDateBeforeDataInputDate=Il faut que la date de transmission de la restitution soit après la date de saisie des données Modified: trunk/wao-services/src/main/resources/i18n/wao-services_fr_FR.properties =================================================================== --- trunk/wao-services/src/main/resources/i18n/wao-services_fr_FR.properties 2014-06-17 09:05:43 UTC (rev 2037) +++ trunk/wao-services/src/main/resources/i18n/wao-services_fr_FR.properties 2014-06-17 09:49:07 UTC (rev 2038) @@ -56,6 +56,7 @@ wao.import.contact.failure.not.updatable=Ligne %s \: Vous n'avez pas les droits suffisants pour modifier le contact wao.import.contact.failure.observationEndDateAfterToday=Ligne %s \: La date de fin de la marée doit être antérieure à la date du jour wao.import.contact.failure.observationEndDateBeforeBeginDate=Ligne %s \: La date de fin d'observation doit être postérieure à celle du début +wao.import.contact.failure.observedDataControlToCorrectionAsked=Un contact ne peut être accepté si le contrôle des données observées indique qu'une correction est demandée wao.import.contact.failure.sampleRowCodeMissing=Il manque le code de la ligne de plan associée wao.import.contact.failure.terrestrialLocationMissing=Il manque le code du lieu wao.import.contact.failure.transmissionDateBeforeDataInputDate=Ligne %s \: La date de transmission de la restitution doit être postérieure à la date de saisie des données Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/EditContactAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/EditContactAction.java 2014-06-17 09:05:43 UTC (rev 2037) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/EditContactAction.java 2014-06-17 09:49:07 UTC (rev 2038) @@ -37,6 +37,7 @@ import fr.ifremer.wao.services.service.ContactObservationEndDateAfterTodayException; import fr.ifremer.wao.services.service.ContactObservationEndDateBeforeBeginDateException; import fr.ifremer.wao.services.service.ContactRestitutionDateBeforeDataInputDateException; +import fr.ifremer.wao.services.service.ContactWithObservedDataControlToCorrectionAskedException; import fr.ifremer.wao.services.service.DuplicatedContactMainObserverInSecondaryObserversException; import fr.ifremer.wao.services.service.InvalidContactObservationBeginDateException; import fr.ifremer.wao.services.service.MismatchContactMainObserverCompanyException; @@ -266,6 +267,9 @@ } catch (MissingContactObservedDataControlException e) { addFieldError("updateContactCommand.contact.observedDataControl", t("wao.ui.form.Contact.error.missingObservedDataControl")); + } catch (ContactWithObservedDataControlToCorrectionAskedException e) { + addFieldError("updateContactCommand.contact.observedDataControl", t("wao.ui.form.Contact.error.observedDataControlToCorrectionAsked")); + } catch (MissingContactStateMotifException e) { addFieldError("updateContactCommand.contact.contactStateMotif", t("wao.ui.form.Contact.error.missingContactStateMotif")); Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ValidateContactJsonAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ValidateContactJsonAction.java 2014-06-17 09:05:43 UTC (rev 2037) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ValidateContactJsonAction.java 2014-06-17 09:49:07 UTC (rev 2038) @@ -24,6 +24,7 @@ import com.google.common.base.Optional; import com.google.common.base.Preconditions; import com.opensymphony.xwork2.Preparable; +import fr.ifremer.wao.WaoTechnicalException; import fr.ifremer.wao.WaoUtils; import fr.ifremer.wao.entity.Contact; import fr.ifremer.wao.services.AuthenticatedWaoUser; @@ -33,6 +34,7 @@ import fr.ifremer.wao.services.service.ContactObservationEndDateAfterTodayException; import fr.ifremer.wao.services.service.ContactObservationEndDateBeforeBeginDateException; import fr.ifremer.wao.services.service.ContactRestitutionDateBeforeDataInputDateException; +import fr.ifremer.wao.services.service.ContactWithObservedDataControlToCorrectionAskedException; import fr.ifremer.wao.services.service.DuplicatedContactMainObserverInSecondaryObserversException; import fr.ifremer.wao.services.service.InvalidContactObservationBeginDateException; import fr.ifremer.wao.services.service.MismatchContactMainObserverCompanyException; @@ -144,7 +146,7 @@ } @Override - public String execute() throws Exception { + public String execute() { AuthenticatedWaoUser authenticatedWaoUser = session.getAuthenticatedWaoUser(); @@ -205,6 +207,9 @@ } catch (MissingContactObservedDataControlException e) { errorMessage = t("wao.ui.form.Contact.error.missingObservedDataControl"); + } catch (ContactWithObservedDataControlToCorrectionAskedException e) { + errorMessage = t("wao.ui.form.Contact.error.observedDataControlToCorrectionAsked"); + } catch (MissingContactStateMotifException e) { errorMessage = t("wao.ui.form.Contact.error.missingContactStateMotif"); @@ -234,7 +239,11 @@ if (isSuccessful()) { - service.save(updateContactCommand, true); + try { + service.save(updateContactCommand, true); + } catch (ContactNotUpdatableException e) { + throw new WaoTechnicalException("should never occur", e); + } if (validationState == null) { successMessage = t("wao.ui.contacts.validation.to.unvalidate.state.success"); } else if (validationState) { Modified: trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties =================================================================== --- trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-06-17 09:05:43 UTC (rev 2037) +++ trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-06-17 09:49:07 UTC (rev 2038) @@ -297,6 +297,7 @@ wao.ui.form.Contact.error.missingRestitution= wao.ui.form.Contact.error.observationEndDateAfterToday= wao.ui.form.Contact.error.observationEndDateBeforeBeginDate= +wao.ui.form.Contact.error.observedDataControlToCorrectionAsked= wao.ui.form.Contact.error.transmissionDateBeforeDataInputDate= wao.ui.form.Contact.error.unwantedContactStateMotif= wao.ui.form.SampleRow.boatsDescription=This field contains registration numbers of the ships that areeligible for this ligne. You can use any separator to separate numbers (space, dot, line-return, comma) Modified: trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties =================================================================== --- trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-06-17 09:05:43 UTC (rev 2037) +++ trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-06-17 09:49:07 UTC (rev 2038) @@ -297,6 +297,7 @@ wao.ui.form.Contact.error.missingRestitution=Il faut préciser une date de transmission de la restitution de la donnée avant de valider wao.ui.form.Contact.error.observationEndDateAfterToday=La date de fin de la marée ne peut pas être postérieure à la date du jour wao.ui.form.Contact.error.observationEndDateBeforeBeginDate=La date de fin d'observation ne peut pas être antérieure à celle du début +wao.ui.form.Contact.error.observedDataControlToCorrectionAsked=Un contact ne peut être accepté si le contrôle des données observées indique qu'une correction est demandée wao.ui.form.Contact.error.transmissionDateBeforeDataInputDate=Il faut que la date de transmission de la restitution soit après la date de saisie des données wao.ui.form.Contact.error.unwantedContactStateMotif=Il ne faut pas préciser de motif de refus wao.ui.form.SampleRow.boatsDescription=Ce champs correspond aux immatriculations des navires qui sont éligibles pour cette ligne. Vous pouvez utiliser n'importe quel séparateur pour séparer les immatriculations (virgule, point, espace ou saut de ligne)

1 0

r2037 - trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer
by bleny＠users.forge.codelutin.com June 17, 2014

June 17, 2014

Author: bleny Date: 2014-06-17 11:05:43 +0200 (Tue, 17 Jun 2014) New Revision: 2037 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2037 Log: fixes #5217 add confirm on delete contact link Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-contact-input.jsp Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-contact-input.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-contact-input.jsp 2014-06-17 08:56:16 UTC (rev 2036) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-contact-input.jsp 2014-06-17 09:05:43 UTC (rev 2037) @@ -64,6 +64,12 @@ $contactStateSelect.change(showHideContactStateMotif); showHideContactStateMotif(); + $('#delete-contact-link').click(function (e) { + if ( ! confirm("<s:text name="wao.ui.action.deleteContact.confirm"/>")) { + e.preventDefault(); + } + }) + }); </script> @@ -313,12 +319,11 @@ </s:submit> </s:if> - <s:if - test=" ! updateContactCommand.creation && authenticatedWaoUser.isAuthorizedToDeleteContact(updateContactCommand.contact)"> + <s:if test=" ! updateContactCommand.creation && authenticatedWaoUser.isAuthorizedToDeleteContact(updateContactCommand.contact)"> <s:url action="delete-contact" id="deleteContactUrl"> <s:param name="contactId" value="contactId"/> </s:url> - <s:a href="%{deleteContactUrl}" cssClass="btn pull-right"> + <s:a href="%{deleteContactUrl}" cssClass="btn pull-right" id="delete-contact-link"> <s:text name="wao.ui.action.deleteContact"/> </s:a> </s:if>

1 0

r2036 - trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer
by bleny＠users.forge.codelutin.com June 17, 2014

June 17, 2014

Author: bleny Date: 2014-06-17 10:56:16 +0200 (Tue, 17 Jun 2014) New Revision: 2036 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2036 Log: refs #5214 use title instead of tooltips Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp 2014-06-17 08:17:57 UTC (rev 2035) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp 2014-06-17 08:56:16 UTC (rev 2036) @@ -451,23 +451,17 @@ </td> <td class="align-center"> <s:if test=" ! comment.empty"> - " data-toggle="tooltip" data-placement="left"> - - + " class="fa fa-comment"> </s:if> </td> - <td> + <td class="align-center"> <s:if test=" ! commentCoordinator.empty"> - " data-toggle="tooltip" data-placement="left"> - - + " class="fa fa-comment"> </s:if> </td> - <td> + <td class="align-center"> <s:if test=" ! commentAdmin.empty"> - " data-toggle="tooltip" data-placement="left"> - - + " class="fa fa-comment"> </s:if> </td> <td> Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 2014-06-17 08:17:57 UTC (rev 2035) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 2014-06-17 08:56:16 UTC (rev 2036) @@ -431,9 +431,7 @@ </td> <td> <s:if test=" ! comment.empty"> - " data-toggle="tooltip" data-placement="left"> - - + " class="fa fa-comment"> </s:if> </td>

1 0

r2035 - trunk/wao-web/src/main/webapp/WEB-INF/content/administration
by bleny＠users.forge.codelutin.com June 17, 2014

June 17, 2014

Author: bleny Date: 2014-06-17 10:17:57 +0200 (Tue, 17 Jun 2014) New Revision: 2035 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2035 Log: fixes #5212 Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/administration/edit-wao-user.jsp Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/administration/edit-wao-user.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/administration/edit-wao-user.jsp 2014-06-17 08:11:44 UTC (rev 2034) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/administration/edit-wao-user.jsp 2014-06-17 08:17:57 UTC (rev 2035) @@ -167,10 +167,15 @@ </s:if> <div class="form-actions"> - <s:url action="wao-users" id="waoUsersUrl"> - <s:param name="companyId" value="updateWaoUserCommand.companyId" /> - </s:url> - <s:a href="%{waoUsersUrl}" cssClass="btn"> + <s:if test="authenticatedWaoUser.authorizedToViewCompanyUsers"> + <s:url action="wao-users" id="cancelUrl"> + <s:param name="companyId" value="updateWaoUserCommand.companyId" /> + </s:url> + </s:if> + <s:else> + <s:url namespace="/%{obsProgram.name().toLowerCase()}" action="news" id="cancelUrl" /> + </s:else> + <s:a href="%{cancelUrl}" cssClass="btn"> <s:text name="wao.ui.action.cancel" /> </s:a>

1 0

r2034 - in trunk: wao-services/src/main/java/fr/ifremer/wao/services wao-web/src/main/webapp/WEB-INF/content/obsmer
by bleny＠users.forge.codelutin.com June 17, 2014

June 17, 2014

Author: bleny Date: 2014-06-17 10:11:44 +0200 (Tue, 17 Jun 2014) New Revision: 2034 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2034 Log: fixes #5211 Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boats.jsp trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java 2014-06-13 09:33:43 UTC (rev 2033) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java 2014-06-17 08:11:44 UTC (rev 2034) @@ -294,4 +294,8 @@ return ! userProfile.isGuest(); } + public boolean isAuthorizedToFilterOnBoats() { + return ! userProfile.isGuest() && ! userProfile.isProfessional(); + } + } Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boats.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boats.jsp 2014-06-13 09:33:43 UTC (rev 2033) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boats.jsp 2014-06-17 08:11:44 UTC (rev 2034) @@ -33,13 +33,16 @@ $(document).ready(function () { var boatFilterMappings = [ + + <s:if test="authenticatedWaoUser.authorizedToFilterOnBoats"> + { + filterName: 'boatIds', + filterLabel: "<s:text name="wao.ui.entity.Boat"/>", + filterValuesField: 'boats', + minimumInputLength: 3 + }, + </s:if> { - filterName: 'boatIds', - filterLabel: "<s:text name="wao.ui.entity.Boat"/>", - filterValuesField: 'boats', - minimumInputLength: 3 - }, - { filterName: 'elligibleForSampleRowsFilter.fishingZoneFacadeNames', filterLabel: "<s:text name="wao.ui.field.FishingZone.facadeName"/>", filterValuesField: 'elligibleForSampleRowsFilterValues.fishingZoneFacadeNames' Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp 2014-06-13 09:33:43 UTC (rev 2033) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp 2014-06-17 08:11:44 UTC (rev 2034) @@ -70,13 +70,15 @@ filterLabel: "<s:text name="wao.ui.entity.targetSpeciesDCF"/>", filterValuesField: 'sampleRowsFilterValues.targetSpeciesDcfs', }, + <s:if test="authenticatedWaoUser.authorizedToFilterOnBoats"> + { + filterName: 'boatFilter.boatIds', + filterLabel: "<s:text name="wao.ui.entity.Boat"/>", + filterValuesField: 'boatsFilterValues.boats', + minimumInputLength: 3 + }, + </s:if> { - filterName: 'boatFilter.boatIds', - filterLabel: "<s:text name="wao.ui.entity.Boat"/>", - filterValuesField: 'boatsFilterValues.boats', - minimumInputLength: 3 - }, - { filterName: 'boatFilter.districtIds', filterLabel: "<s:text name="wao.ui.field.Boat.district"/>", filterValuesField: 'boatsFilterValues.districts'

1 0