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

r2069 - 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 19 Jun '14

19 Jun '14

Author: bleny Date: 2014-06-19 15:36:10 +0200 (Thu, 19 Jun 2014) New Revision: 2069 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2069 Log: fixes #5279 always show edit contact link 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 trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-contact-input.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-19 13:28:17 UTC (rev 2068) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java 2014-06-19 13:36:10 UTC (rev 2069) @@ -273,12 +273,6 @@ return result; } - public boolean isAuthorizedToEditContactObservers(Contact contact) { - return isCoordinatorOrObserver() && - contact.getValidationProgram() == null - && isCanWrite(); - } - public boolean isAuthorizedToEditObservationReport(Contact contact) { return isCoordinatorOrObserver() && contact.getValidationCompany() == null 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-19 13:28:17 UTC (rev 2068) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp 2014-06-19 13:36:10 UTC (rev 2069) @@ -496,23 +496,20 @@ </a> <ul class="dropdown-menu"> - <s:if test="authenticatedWaoUser.isAuthorizedToEditOrDeleteContact(#contact)"> - <li> - <s:if test="authenticatedWaoUser.admin"> - <s:set name="focusAnchor">adminFocus</s:set> - </s:if> - <s:else> - <s:set name="focusAnchor">coordinatorOrObserverFocus</s:set> - </s:else> - <s:url action="edit-contact!input" id="editContactUrl" anchor='%{focusAnchor}'> - <s:param name="contactId" value="topiaId"/> - - </s:url> - <s:a href="%{editContactUrl}"> - <s:text name="wao.ui.action.editOrDeleteContact"/> - </s:a> - </li> - </s:if> + <li> + <s:if test="authenticatedWaoUser.admin"> + <s:set name="focusAnchor">adminFocus</s:set> + </s:if> + <s:else> + <s:set name="focusAnchor">coordinatorOrObserverFocus</s:set> + </s:else> + <s:url action="edit-contact!input" id="editContactUrl" anchor='%{focusAnchor}'> + <s:param name="contactId" value="topiaId"/> + </s:url> + <s:a href="%{editContactUrl}"> + <s:text name="wao.ui.action.editOrDeleteContact"/> + </s:a> + </li> <s:if test="authenticatedWaoUser.authorizedToChangeContactValidation"> <li> <s:url action="validate-contact-json" id="acceptContactUrl" escapeAmp="false"> 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-19 13:28:17 UTC (rev 2068) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-contact-input.jsp 2014-06-19 13:36:10 UTC (rev 2069) @@ -184,6 +184,9 @@ <s:form> + <s:set name="editObservationReport" + value="%{authenticatedWaoUser.isAuthorizedToEditObservationReport(updateContactCommand.contact)}"/> + <s:hidden name="contactId" value="%{contactId}"/> <fieldset> @@ -197,7 +200,7 @@ label="%{getText('wao.ui.field.Contact.mainObserver')}" list="observers" emptyOption="true" - disabled="%{!#editObservers}" + disabled="%{!#editObservationReport}" cssClass="input-large" /> @@ -206,7 +209,7 @@ label="%{getText('wao.ui.field.Contact.secondaryObservers')}" list="observers" multiple="true" - disabled="%{!#editObservers}" + disabled="%{!#editObservationReport}" cssClass="input-xlarge" /> @@ -216,9 +219,6 @@ <fieldset id="coordinatorOrObserverFocus"> <legend><s:text name="wao.ui.misc.observationReport"/></legend> - <s:set name="editObservationReport" - value="%{authenticatedWaoUser.isAuthorizedToEditObservationReport(updateContactCommand.contact)}"/> - <s:textfield name="updateContactCommand.contact.observationBeginDate" label="%{getText('wao.ui.field.Contact.beginDate')}" placeholder="%{getDateTimePlaceholder()}"

1 0

r2068 - in trunk: wao-persistence/src/main/java/fr/ifremer/wao wao-persistence/src/test/java/fr/ifremer/wao wao-web/src/main/java/fr/ifremer/wao/web wao-web/src/main/resources/i18n
by bleny＠users.forge.codelutin.com 19 Jun '14

19 Jun '14

Author: bleny Date: 2014-06-19 15:28:17 +0200 (Thu, 19 Jun 2014) New Revision: 2068 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2068 Log: fixes #5276, prevent formatting month when a date is given Added: trunk/wao-persistence/src/test/java/fr/ifremer/wao/WaoUtilsTest.java Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/WaoUtils.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoJspActionSupport.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 Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/WaoUtils.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/WaoUtils.java 2014-06-19 10:37:22 UTC (rev 2067) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/WaoUtils.java 2014-06-19 13:28:17 UTC (rev 2068) @@ -109,6 +109,9 @@ public static Date parseMonth(Locale locale, String monthYear) throws ParseException { String pattern = I18n.l(locale, "wao.month.parser"); + if (monthYear.length() != pattern.length()) { + throw new ParseException(monthYear, 0); + } DateFormat dateFormat = new SimpleDateFormat(pattern); return dateFormat.parse(monthYear); } Added: trunk/wao-persistence/src/test/java/fr/ifremer/wao/WaoUtilsTest.java =================================================================== --- trunk/wao-persistence/src/test/java/fr/ifremer/wao/WaoUtilsTest.java (rev 0) +++ trunk/wao-persistence/src/test/java/fr/ifremer/wao/WaoUtilsTest.java 2014-06-19 13:28:17 UTC (rev 2068) @@ -0,0 +1,34 @@ +package fr.ifremer.wao; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.junit.Assert; +import org.junit.Test; + +import java.text.ParseException; +import java.util.Locale; + +public class WaoUtilsTest { + + private static final Log log = LogFactory.getLog(WaoUtilsTest.class); + + @Test + public void testParseMonth() { + + try { + WaoUtils.parseMonth(Locale.FRANCE, "12/2014"); + } catch (ParseException e) { + Assert.fail(); + } + + try { + WaoUtils.parseMonth(Locale.FRANCE, "01/12/2014"); + Assert.fail(); + } catch (ParseException e) { + if (log.isDebugEnabled()) { + log.debug("exception raised", e); + } + } + + } +} \ No newline at end of file Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoJspActionSupport.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoJspActionSupport.java 2014-06-19 10:37:22 UTC (rev 2067) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoJspActionSupport.java 2014-06-19 13:28:17 UTC (rev 2068) @@ -21,15 +21,15 @@ * #L% */ -import java.util.Date; - -import org.apache.commons.lang3.time.DateUtils; -import org.nuiton.util.pagination.PaginationResult; - import fr.ifremer.wao.WaoUtils; import fr.ifremer.wao.entity.ObsProgram; import fr.ifremer.wao.services.AuthenticatedWaoUser; +import fr.ifremer.wao.web.action.obsmer.SamplingPlanAction; +import org.apache.commons.lang3.time.DateUtils; +import org.nuiton.util.pagination.PaginationResult; +import java.util.Date; + public class WaoJspActionSupport extends WaoActionSupport { private static final long serialVersionUID = 1L; @@ -66,6 +66,19 @@ return getText(enumeration.getClass().getSimpleName() + "." + enumeration.name()); } + @Override + public String getText(String aTextName, String defaultValue) { + String text = super.getText(aTextName, defaultValue); + if ("invalid.fieldvalue.filter.periodFrom".equals(aTextName)) { + if (this instanceof SamplingPlanAction) { + text = getText("wao.ui.invalidMonthFormat"); + } else { + text = getText("wao.ui.invalidDateFormat"); + } + } + return text; + } + public String formatMonth(Date date) { return date == null ? "" : WaoUtils.formatMonth(getLocale(), date); } 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-19 10:37:22 UTC (rev 2067) +++ trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-06-19 13:28:17 UTC (rev 2068) @@ -415,7 +415,9 @@ wao.ui.indicator.useRightDecimalSymbol=Use '.' for non-round values wao.ui.indicators.coefficientsSum=Coefficients sum wao.ui.indicators.title=Providers quality indicators +wao.ui.invalidDateFormat=Expected format is yyyy-mm-dd wao.ui.invalidLogin=Invalid identifier +wao.ui.invalidMonthFormat=Expected format is yyyy-mm wao.ui.layout.userDescription=You are %s of company %s (%s) wao.ui.message.chooseProfile=Choose your profile \: wao.ui.misc.METIER=METIER 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-19 10:37:22 UTC (rev 2067) +++ trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-06-19 13:28:17 UTC (rev 2068) @@ -415,7 +415,9 @@ wao.ui.indicator.useRightDecimalSymbol=Attention à bien utiliser ',' et non '.' pour les décimales wao.ui.indicators.coefficientsSum=Total coefficient wao.ui.indicators.title=Indicateurs qualités prestataires +wao.ui.invalidDateFormat=Le format attendu est jj/mm/aaaa wao.ui.invalidLogin=Identifiant invalide +wao.ui.invalidMonthFormat=Le format attendu est mm/aaaa wao.ui.layout.userDescription=Vous êtes %s de la société %s (%s) wao.ui.message.chooseProfile=Choisissez dans la liste votre profil de connexion \: wao.ui.misc.METIER=MÉTIER

1 0

r2067 - trunk/wao-web/src/main/java/fr/ifremer/wao/web
by bleny＠users.forge.codelutin.com 19 Jun '14

19 Jun '14

Author: bleny Date: 2014-06-19 12:37:22 +0200 (Thu, 19 Jun 2014) New Revision: 2067 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2067 Log: reset synthesis filter on logout Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoSession.java Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoSession.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoSession.java 2014-06-19 09:27:09 UTC (rev 2066) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoSession.java 2014-06-19 10:37:22 UTC (rev 2067) @@ -81,13 +81,14 @@ public void logout() { messages = null; errorMessages = null; - authenticatedWaoUser= null; - sampleRowToHighlightId= null; - contactToHighlightId= null; - startBoatSelectionForSampleRowId= null; - sampleRowsFilter= null; - boatsFilter= null; - contactsFilter= null; + authenticatedWaoUser = null; + sampleRowToHighlightId = null; + contactToHighlightId = null; + startBoatSelectionForSampleRowId = null; + sampleRowsFilter = null; + boatsFilter = null; + contactsFilter = null; + synthesisFilter = null; } public AuthenticatedWaoUser getAuthenticatedWaoUser() {

1 0

r2066 - trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer
by bleny＠users.forge.codelutin.com 19 Jun '14

19 Jun '14

Author: bleny Date: 2014-06-19 11:27:09 +0200 (Thu, 19 Jun 2014) New Revision: 2066 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2066 Log: refs #4493 add a unit in synthesis Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/synthesis.jsp Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/synthesis.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/synthesis.jsp 2014-06-19 09:18:44 UTC (rev 2065) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/synthesis.jsp 2014-06-19 09:27:09 UTC (rev 2066) @@ -309,6 +309,7 @@ </td> <td<s:if test="dataInputDateReactivityHigh"> class="lower-than-expected"</s:if>> <s:property value="dataInputDateReactivity"/> + <s:text name="wao.ui.unit.days"/> </td> </tr> </s:iterator>

1 0

r2065 - 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 19 Jun '14

19 Jun '14

Author: bleny Date: 2014-06-19 11:18:44 +0200 (Thu, 19 Jun 2014) New Revision: 2065 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2065 Log: fixes #5253 add validation rule for mammals info Added: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactMammalsInfoException.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/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/MissingContactMammalsInfoException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactMammalsInfoException.java (rev 0) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactMammalsInfoException.java 2014-06-19 09:18:44 UTC (rev 2065) @@ -0,0 +1,10 @@ +package fr.ifremer.wao.services.service; + +import fr.ifremer.wao.entity.Contact; + +public class MissingContactMammalsInfoException extends WaoContactValidationException { + + public MissingContactMammalsInfoException(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-19 09:14:57 UTC (rev 2064) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerContactsService.java 2014-06-19 09:18:44 UTC (rev 2065) @@ -424,6 +424,9 @@ String state = WaoUtils.l(l, e.getContact().getContactState()); String message = l(l, "wao.import.contact.failure.missingObservationBeginDate", lineNumber, state); throw new ImportErrorException(message); + } catch (MissingContactMammalsInfoException e) { + String message = l(l, "wao.import.contact.failure.missingContactMammalsInfo", lineNumber); + throw new ImportErrorException(message); } save0(updateContactCommand); @@ -464,6 +467,7 @@ MissingContactStateMotifException, UnwantedContactContactStateMotifException, MissingContactObservedDataControlException, + MissingContactMammalsInfoException, ContactWithObservedDataControlToCorrectionAskedException, MissingContactRestitutionException, MissingContactDataInputDateException, @@ -644,6 +648,10 @@ throw new UnwantedContactContactStateMotifException(contact); } + if (contact.isMammalsCapture() && StringUtils.isBlank(contact.getMammalsInfo())) { + throw new MissingContactMammalsInfoException(contact); + } + if (BooleanUtils.isTrue(contact.getValidationCompany())) { //--- 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-19 09:14:57 UTC (rev 2064) +++ trunk/wao-services/src/main/resources/i18n/wao-services_en_GB.properties 2014-06-19 09:18:44 UTC (rev 2065) @@ -45,6 +45,7 @@ wao.import.contact.failure.mismatchCompanyForObserver=L'observateur %s n'est pas membre de la société %s wao.import.contact.failure.missingComment=You must give a comment for state '%s' wao.import.contact.failure.missingCommentAdmin=You must precise in admin comment why data reliability is '%s' +wao.import.contact.failure.missingContactMammalsInfo=You must provide information about capture wao.import.contact.failure.missingContactStateMotif=You must precise a motif for the refusal wao.import.contact.failure.missingDataInputDate=Il faut préciser une date de saisie des données en plus de la date de transmission de la restitution wao.import.contact.failure.missingDataReliability=You must provide data reliability before validating 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-19 09:14:57 UTC (rev 2064) +++ trunk/wao-services/src/main/resources/i18n/wao-services_fr_FR.properties 2014-06-19 09:18:44 UTC (rev 2065) @@ -42,6 +42,7 @@ wao.import.contact.failure.mismatchCompanyForObserver=Ligne %s \: L'observateur %s n'est pas membre de la société %s wao.import.contact.failure.missingComment=Ligne %s \: Il faut préciser un commentaire pour l'état '%s' wao.import.contact.failure.missingCommentAdmin=Ligne %s \: Il faut préciser dans le commentaire administrateur pourquoi la donnée est '%s' +wao.import.contact.failure.missingContactMammalsInfo=Ligne %s \: Il faut préciser le détail des espèces capturées wao.import.contact.failure.missingContactStateMotif=Ligne %s \: Il faut préciser un motif de refus wao.import.contact.failure.missingDataInputDate=Ligne %s \: Il faut préciser une date de saisie des données en plus de la date de transmission de la restitution wao.import.contact.failure.missingDataReliability=Ligne %s \: Il faut préciser la qualité de la donnée avant de valider 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-19 09:14:57 UTC (rev 2064) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/EditContactAction.java 2014-06-19 09:18:44 UTC (rev 2065) @@ -49,6 +49,7 @@ import fr.ifremer.wao.services.service.MissingContactDataInputDateException; import fr.ifremer.wao.services.service.MissingContactDataReliabilityException; import fr.ifremer.wao.services.service.MissingContactMainObserverException; +import fr.ifremer.wao.services.service.MissingContactMammalsInfoException; import fr.ifremer.wao.services.service.MissingContactNbObservantsException; import fr.ifremer.wao.services.service.MissingContactObservationBeginDateException; import fr.ifremer.wao.services.service.MissingContactObservationEndDateException; @@ -296,6 +297,9 @@ String state = WaoUtils.l(getLocale(), e.getContact().getContactState()); addFieldError("updateContactCommand.contact.observationBeginDate", t("wao.ui.form.Contact.error.missingObservationBeginDate", state)); + } catch (MissingContactMammalsInfoException e) { + addFieldError("updateContactCommand.contact.mammalsInfo", t("wao.ui.form.Contact.error.missingMammalsInfo")); + } } 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-19 09:14:57 UTC (rev 2064) +++ trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-06-19 09:18:44 UTC (rev 2065) @@ -294,6 +294,7 @@ 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.missingMammalsInfo=You must precise information about capture 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 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-19 09:14:57 UTC (rev 2064) +++ trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-06-19 09:18:44 UTC (rev 2065) @@ -294,6 +294,7 @@ wao.ui.form.Contact.error.missingDataInputDate=Il faut préciser une date de saisie des données en plus de la date de transmission de la restitution wao.ui.form.Contact.error.missingDataReliability=Il faut préciser la qualité de la donnée avant de valider wao.ui.form.Contact.error.missingMainObserver=Il faut au moins un observateur référant +wao.ui.form.Contact.error.missingMammalsInfo=Il faut préciser le détail des espèces capturées wao.ui.form.Contact.error.missingObservationBeginDate=La date de début de marée est obligatoire pour l'état '%s' wao.ui.form.Contact.error.missingObservationEndDate=La date de fin d'observation est obligatoire pour l'état '%s' wao.ui.form.Contact.error.missingObservedDataControl=Il faut préciser une valeur pour le contrôle des données observées @@ -468,7 +469,7 @@ wao.ui.page.Administration.title=Administration wao.ui.page.Boats.title=Navires wao.ui.page.Cartography.title=Cartographie -wao.ui.page.ContactForm.mammalsInfo.disclaimer=Attention, toutes les informations saisies seront transmises à des personnels extérieurs, soyez riguoureux dans la description de la capture accidentelle +wao.ui.page.ContactForm.mammalsInfo.disclaimer=Noms scientifiques, nombre d'individus, longueur (mesurée ou estimée), sexe, numéro OP de la marée, rejeté à l'eau mort ou vivant. Attention, toutes les informations saisies seront transmises à des personnels extérieurs, soyez riguoureux dans la description de la capture accidentelle. wao.ui.page.ContactForm.title=Modification d'un contact wao.ui.page.Contacts.title=Contacts wao.ui.page.Index.title=Accueil

1 0

r2064 - trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer
by bleny＠users.forge.codelutin.com 19 Jun '14

19 Jun '14

Author: bleny Date: 2014-06-19 11:14:57 +0200 (Thu, 19 Jun 2014) New Revision: 2064 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2064 Log: fixes #5214 change mammals capture icon tooltip implementation Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.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-19 08:56:45 UTC (rev 2063) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp 2014-06-19 09:14:57 UTC (rev 2064) @@ -448,10 +448,9 @@ title="<s:text name="wao.ui.field.Contact.mammalsObservation"/>">  </s:if> <s:if test="mammalsCapture"> - " data-toggle="tooltip" data-placement="left"> - <img src="<s:url value="/img/hook-22px.png"/>" - alt="<s:text name="wao.ui.field.Contact.mammalsCapture"/>"/> - + <img src="<s:url value="/img/hook-22px.png"/>" + alt="<s:text name="wao.ui.field.Contact.mammalsCapture"/>" + title="<s:property value="mammalsInfo" escapeHtml="false"/>"/> </s:if> </td> <s:if test="authenticatedWaoUser.authorizedToViewContactsComments">

1 0

r2063 - trunk/wao-web/src/main/java/fr/ifremer/wao/web
by bleny＠users.forge.codelutin.com 19 Jun '14

19 Jun '14

Author: bleny Date: 2014-06-19 10:56:45 +0200 (Thu, 19 Jun 2014) New Revision: 2063 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2063 Log: when caching is disabled do not add listerners Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/DefaultWaoApplicationContext.java Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/DefaultWaoApplicationContext.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/DefaultWaoApplicationContext.java 2014-06-19 08:45:05 UTC (rev 2062) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/DefaultWaoApplicationContext.java 2014-06-19 08:56:45 UTC (rev 2063) @@ -153,15 +153,19 @@ WaoTopiaPersistenceContext persistenceContext = getTopiaApplicationContext().newPersistenceContext(); - CacheInvalidationTopiaEntityListener cacheInvalidationTopiaEntityListener = - new CacheInvalidationTopiaEntityListener( - getSamplingPlansCache(), - getBoatsFilterValuesCache(), - getSynthesesCache()); + if (applicationConfig.isCachingEnabled()) { - persistenceContext.getTopiaFiresSupport().addTopiaEntityListener(cacheInvalidationTopiaEntityListener); - persistenceContext.getTopiaFiresSupport().addTopiaTransactionListener(cacheInvalidationTopiaEntityListener); + CacheInvalidationTopiaEntityListener cacheInvalidationTopiaEntityListener = + new CacheInvalidationTopiaEntityListener( + getSamplingPlansCache(), + getBoatsFilterValuesCache(), + getSynthesesCache()); + persistenceContext.getTopiaFiresSupport().addTopiaEntityListener(cacheInvalidationTopiaEntityListener); + persistenceContext.getTopiaFiresSupport().addTopiaTransactionListener(cacheInvalidationTopiaEntityListener); + + } + return persistenceContext; }

1 0

r2062 - trunk/wao-services/src/main/java/fr/ifremer/wao/services/service
by bleny＠users.forge.codelutin.com 19 Jun '14

19 Jun '14

Author: bleny Date: 2014-06-19 10:45:05 +0200 (Thu, 19 Jun 2014) New Revision: 2062 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2062 Log: prevent coordinator to update admin data via import Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerContactsService.java 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-19 08:30:31 UTC (rev 2061) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerContactsService.java 2014-06-19 08:45:05 UTC (rev 2062) @@ -299,6 +299,15 @@ if (updateContactCommand.isCreation()) { updateContactCommand.setContact(contact); + + // Prevent that someone who is not admin change data that only admin + // must be able to modify + if ( ! authenticatedWaoUser.isAdmin()) { + contact.setCommentAdmin(null); + contact.setValidationProgram(null); + contact.setDataReliability(DataReliability.UNKNOWN); + } + } else { Contact contactToUpdate = updateContactCommand.getContact(); @@ -324,6 +333,15 @@ Contact.PROPERTY_CONTACT_STATE_MOTIF, Contact.PROPERTY_RESTITUTION, Contact.PROPERTY_OBSERVED_DATA_CONTROL); + + // 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()); + } + } try {

1 0

r2061 - in trunk: . wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer
by bleny＠users.forge.codelutin.com 19 Jun '14

19 Jun '14

Author: bleny Date: 2014-06-19 10:30:31 +0200 (Thu, 19 Jun 2014) New Revision: 2061 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2061 Log: fixes #5277 Modified: trunk/pom.xml trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/BoatsAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ContactsAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/SamplingPlanAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/SynthesisAction.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-06-18 09:23:04 UTC (rev 2060) +++ trunk/pom.xml 2014-06-19 08:30:31 UTC (rev 2061) @@ -120,7 +120,7 @@ <nuitonCsvVersion>3.0-rc-2</nuitonCsvVersion> <nuitonValidatorVersion>3.0-rc-1</nuitonValidatorVersion> <nuitonUtilsVersion>3.0-rc-3</nuitonUtilsVersion> - <eugeneVersion>2.10</eugeneVersion> + <eugeneVersion>2.11-SNAPSHOT</eugeneVersion> <topiaVersion>3.0-SNAPSHOT</topiaVersion>  Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/BoatsAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/BoatsAction.java 2014-06-18 09:23:04 UTC (rev 2060) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/BoatsAction.java 2014-06-19 08:30:31 UTC (rev 2061) @@ -21,6 +21,7 @@ * #L% */ +import com.google.common.base.Objects; import com.opensymphony.xwork2.Preparable; import fr.ifremer.wao.BoatsFilter; import fr.ifremer.wao.entity.Boat; @@ -122,7 +123,6 @@ if (filter == null) { filter = service.newBoatsFilter(getAuthenticatedWaoUser()); - getSession().setBoatsFilter(filter); } if (StringUtils.isNotBlank(startBoatSelectionForSampleRowId)) { @@ -146,7 +146,7 @@ @Override public String execute() { - filter = getSession().getBoatsFilter(); + filter = Objects.firstNonNull(session.getBoatsFilter(), filter); return applyFilter(); @@ -155,7 +155,6 @@ public String resetFilter() { filter = service.newBoatsFilter(getAuthenticatedWaoUser()); - getSession().setBoatsFilter(filter); return applyFilter(); @@ -163,6 +162,8 @@ public String applyFilter() { + getSession().setBoatsFilter(filter); + PaginationParameter pager = service.newBoatsPaginationParameter(pageNumber, 25); boatList = service.getBoatsList(getAuthenticatedWaoUser(), filter, pager); Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ContactsAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ContactsAction.java 2014-06-18 09:23:04 UTC (rev 2060) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ContactsAction.java 2014-06-19 08:30:31 UTC (rev 2061) @@ -21,6 +21,7 @@ * #L% */ +import com.google.common.base.Objects; import com.opensymphony.xwork2.Preparable; import fr.ifremer.wao.ContactsFilter; import fr.ifremer.wao.WaoUtils; @@ -110,7 +111,6 @@ if (filter == null) { filter = service.newContactFilter(getAuthenticatedWaoUser()); - getSession().setContactsFilter(filter); } } @@ -118,7 +118,7 @@ @Override public String execute() { - filter = getSession().getContactsFilter(); + filter = Objects.firstNonNull(session.getContactsFilter(), filter); return applyFilter(); @@ -127,13 +127,15 @@ public String resetFilter() { filter = service.newContactFilter(getAuthenticatedWaoUser()); - getSession().setContactsFilter(filter); return applyFilter(); } public String applyFilter() { + + getSession().setContactsFilter(filter); + PaginationParameter pager = service.newContactsPaginationParameter(pageNumber, 25); contactsList = service.getContactsList(getAuthenticatedWaoUser(), filter, pager); @@ -141,6 +143,7 @@ lastRangePage = getPaginationLastPage(contactsList.getContacts(), 10, firstRangePage); return SUCCESS; + } protected Date now = new Date(); Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/SamplingPlanAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/SamplingPlanAction.java 2014-06-18 09:23:04 UTC (rev 2060) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/SamplingPlanAction.java 2014-06-19 08:30:31 UTC (rev 2061) @@ -21,6 +21,7 @@ * #L% */ +import com.google.common.base.Objects; import com.opensymphony.xwork2.Preparable; import fr.ifremer.wao.SampleRowsFilter; import fr.ifremer.wao.services.service.ObsMerSamplingPlan; @@ -58,7 +59,6 @@ if (filter == null) { filter = service.newSampleRowsFilter(getAuthenticatedWaoUser()); - getSession().setSampleRowsFilter(filter); } } @@ -66,7 +66,7 @@ @Override public String execute() { - filter = getSession().getSampleRowsFilter(); + filter = Objects.firstNonNull(session.getSampleRowsFilter(), filter); return applyFilter(); @@ -76,14 +76,14 @@ filter = service.newSampleRowsFilter(getAuthenticatedWaoUser()); - getSession().setSampleRowsFilter(filter); - return applyFilter(); } public String applyFilter() { + getSession().setSampleRowsFilter(filter); + samplingPlan = service.getSamplingPlan(getAuthenticatedWaoUser(), filter); return SUCCESS; Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/SynthesisAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/SynthesisAction.java 2014-06-18 09:23:04 UTC (rev 2060) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/SynthesisAction.java 2014-06-19 08:30:31 UTC (rev 2061) @@ -1,5 +1,6 @@ package fr.ifremer.wao.web.action.obsmer; +import com.google.common.base.Objects; import com.opensymphony.xwork2.Preparable; import fr.ifremer.wao.ContactsFilter; import fr.ifremer.wao.services.service.ObsMerSynthesis; @@ -30,7 +31,6 @@ if (filter == null) { filter = service.newFilter(getAuthenticatedWaoUser()); - getSession().setSynthesisFilter(filter); } } @@ -38,7 +38,7 @@ @Override public String execute() { - filter = getSession().getSynthesisFilter(); + filter = Objects.firstNonNull(session.getSynthesisFilter(), filter); return applyFilter(); @@ -47,13 +47,15 @@ public String resetFilter() { filter = service.newFilter(getAuthenticatedWaoUser()); - getSession().setSynthesisFilter(filter); return applyFilter(); } public String applyFilter() { + + getSession().setSynthesisFilter(filter); + synthesis = service.getObsMerSynthesis(filter); return SUCCESS;

1 0

r2060 - trunk/wao-web/src/main/resources/i18n
by bleny＠users.forge.codelutin.com 18 Jun '14

18 Jun '14

Author: bleny Date: 2014-06-18 11:23:04 +0200 (Wed, 18 Jun 2014) New Revision: 2060 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2060 Log: refs #5213 add missing i18n keys Modified: trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.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 17:14:49 UTC (rev 2059) +++ trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-06-18 09:23:04 UTC (rev 2060) @@ -481,6 +481,7 @@ wao.ui.page.waoUsers.titleForCompany=Users for company %s wao.ui.publishedByProgram=Pusblished by program wao.ui.publishedByYourCompany=Published by company +wao.ui.removeBoatEligibility.confirm=Êtes-vous sûr de vouloir rendre le navire inéligible pour cette ligne ? wao.ui.sampleRow.creation=Creation of a sample row wao.ui.sampleRow.edition=Edition of line %s wao.ui.sampleRowLog.title=%s line historic 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 17:14:49 UTC (rev 2059) +++ trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-06-18 09:23:04 UTC (rev 2060) @@ -481,6 +481,7 @@ wao.ui.page.waoUsers.titleForCompany=Utilisateurs de la société %s wao.ui.publishedByProgram=Publiée par le programme wao.ui.publishedByYourCompany=Publiée par la société +wao.ui.removeBoatEligibility.confirm=Are you sure you want to make this boat ineligible for sample row ? wao.ui.sampleRow.creation=Création d'une ligne du plan d'échantillonnage wao.ui.sampleRow.edition=Modification de la ligne %s wao.ui.sampleRowLog.title=Historique de la ligne %s

1 0