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

r2279 - in trunk/wao-web/src/main: java/fr/ifremer/wao/web resources/fr/ifremer/wao/web webapp webapp/WEB-INF/decorators
by bleny＠users.forge.codelutin.com 07 Oct '14

07 Oct '14

Author: bleny Date: 2014-10-07 10:56:34 +0200 (Tue, 07 Oct 2014) New Revision: 2279 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2279 Log: R?\195?\169cup?\195?\169ration du cookie par d?\195?\169faut depuis struts (refs #5746) Added: trunk/wao-web/src/main/resources/fr/ifremer/wao/web/WaoJspActionSupport-conversion.properties Removed: trunk/wao-web/src/main/webapp/endpoints-js.jsp Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoJspActionSupport.java trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout-login.jsp trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp trunk/wao-web/src/main/webapp/wao.js 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-10-06 09:39:32 UTC (rev 2278) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoJspActionSupport.java 2014-10-07 08:56:34 UTC (rev 2279) @@ -21,6 +21,7 @@ * #L% */ +import com.google.common.collect.ImmutableMap; import fr.ifremer.wao.WaoUtils; import fr.ifremer.wao.entity.ObsProgram; import fr.ifremer.wao.services.AuthenticatedWaoUser; @@ -167,10 +168,16 @@ return WaoUtils.isFrench(getLocale()); } - public boolean isSamplingPlanFullView() { - // FIXME brendan 30/09/14 not used + protected boolean isSamplingPlanFullViewByDefault() { boolean fullView = getAuthenticatedWaoUser().isAdmin() || getAuthenticatedWaoUser().isProfessional(); return fullView; } + public ImmutableMap<String, Object> getDefaultCookie() { + return ImmutableMap.of( + "version", (Object) "4.2", + "samplingPlanFullView", isSamplingPlanFullViewByDefault() + ); + } + } Added: trunk/wao-web/src/main/resources/fr/ifremer/wao/web/WaoJspActionSupport-conversion.properties =================================================================== --- trunk/wao-web/src/main/resources/fr/ifremer/wao/web/WaoJspActionSupport-conversion.properties (rev 0) +++ trunk/wao-web/src/main/resources/fr/ifremer/wao/web/WaoJspActionSupport-conversion.properties 2014-10-07 08:56:34 UTC (rev 2279) @@ -0,0 +1 @@ +defaultCookie=org.nuiton.web.struts2.converters.JsonConverter Modified: trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout-login.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout-login.jsp 2014-10-06 09:39:32 UTC (rev 2278) +++ trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout-login.jsp 2014-10-07 08:56:34 UTC (rev 2279) @@ -30,8 +30,6 @@ <title><decorator:title default="Wao"/> - Wao</title> <sj:head locale="fr" jqueryui="true" loadAtOnce="true" jquerytheme="start" /> <sb:head /> - <script type="text/javascript" src="<s:url value='/wao.js'/>"></script> - <script type="text/javascript" src="<s:url value='/endpoints-js.jsp'/>"></script> <link rel="stylesheet" type="text/css" href="<s:url value='/wao.css'/>" media="all" /> <link rel="stylesheet" type="text/css" href="<s:url value='/wao-screen.css'/>" media="screen"> <decorator:head /> Modified: trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2014-10-06 09:39:32 UTC (rev 2278) +++ trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2014-10-07 08:56:34 UTC (rev 2279) @@ -50,7 +50,56 @@ </s:if> <script src="<s:url value="/jquery-cookie-1.4.1/jquery.cookie.js" />"></script> <script src="<s:url value="/wao.js" />"></script> - <script src="<s:url value='/endpoints-js.jsp'/>"></script> + <script> + + $(document).ready(function () { + + // si la lib est chargée, on la configure + if ($.cookie) { + // on sérialise/désérialise en JSON pour stocker le cookie + $.cookie.json = true; + } + + // $('a[data-toggle="popover"]').popover(); + $('span[data-toggle="tooltip"]').tooltip(); + + // FIXME brendan 07/04/14 cannot enable select2 because we can't bind blur event without driving the application crazy, see https://github.com/ivaynberg/select2/issues/2193 + //$('select').addClass('input-xlarge').select2(); + var $select2Inputs = $('select.select2'); + if ($select2Inputs.length > 0) { + $select2Inputs.select2(); + } + + var newWaoCookie = function () { + var newWaoCookie = <s:property value="defaultCookie" escapeHtml="false"/>; + return newWaoCookie; + }; + + WAO = new Wao(newWaoCookie); + + // on ajoute les endpoints + // json + WAO.SAMPLE_ROWS_FILTER_VALUES_JSON_URL = '<s:url namespace="/" action="sample-rows-filter-values-json"/>'; + + WAO.UPDATE_BOAT_INFOS_JSON_URL = '<s:url namespace="/" action="update-boat-infos-json"/>'; + WAO.BOATS_FILTER_VALUES_JSON_URL = '<s:url namespace="/" action="boats-filter-values-json"/>'; + WAO.GET_BOAT_CONTACTS_COUNT_JSON_URL = '<s:url namespace="/" action="get-boat-contacts-count-json"/>'; + WAO.SEARCH_BOAT_JSON_URL = '<s:url namespace="/" action="search-boat-json"/>'; + + WAO.CONTACTS_FILTER_VALUES_JSON_URL = '<s:url namespace="/" action="contacts-filter-values-json"/>'; + + // fragments + WAO.BOAT_DETAILS_URL = '<s:url namespace="/" action="boat-details"/>'; + + }); + + $(window).unload(function() { + + // en quittant la page, on sauvegarde le cookie + WAO.saveCookie(); + + }); + </script> <link rel="stylesheet" type="text/css" href="<s:url value="/select2-3.4.5/select2.css" />" /> <link rel="stylesheet" type="text/css" href="<s:url value="/select2-3.4.5/select2-bootstrap.css" />" /> <link rel="stylesheet" type="text/css" href="<s:url value="/wao.css" />" media="all" /> Deleted: trunk/wao-web/src/main/webapp/endpoints-js.jsp =================================================================== --- trunk/wao-web/src/main/webapp/endpoints-js.jsp 2014-10-06 09:39:32 UTC (rev 2278) +++ trunk/wao-web/src/main/webapp/endpoints-js.jsp 2014-10-07 08:56:34 UTC (rev 2279) @@ -1,39 +0,0 @@ -<%-- - #%L - Wao :: Web - %% - Copyright (C) 2009 - 2014 Ifremer - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. - #L% - --%> -<%@ page language="java" contentType="text/javascript; charset=utf-8" pageEncoding="utf-8"%> -<%@ taglib uri="/struts-tags" prefix="s" %> - -$(document).ready(function () { - - // json - WAO.SAMPLE_ROWS_FILTER_VALUES_JSON_URL = '<s:url namespace="/" action="sample-rows-filter-values-json"/>'; - - WAO.UPDATE_BOAT_INFOS_JSON_URL = '<s:url namespace="/" action="update-boat-infos-json"/>'; - WAO.BOATS_FILTER_VALUES_JSON_URL = '<s:url namespace="/" action="boats-filter-values-json"/>'; - WAO.GET_BOAT_CONTACTS_COUNT_JSON_URL = '<s:url namespace="/" action="get-boat-contacts-count-json"/>'; - WAO.SEARCH_BOAT_JSON_URL = '<s:url namespace="/" action="search-boat-json"/>'; - - WAO.CONTACTS_FILTER_VALUES_JSON_URL = '<s:url namespace="/" action="contacts-filter-values-json"/>'; - - // fragments - WAO.BOAT_DETAILS_URL = '<s:url namespace="/" action="boat-details"/>'; - -}); Modified: trunk/wao-web/src/main/webapp/wao.js =================================================================== --- trunk/wao-web/src/main/webapp/wao.js 2014-10-06 09:39:32 UTC (rev 2278) +++ trunk/wao-web/src/main/webapp/wao.js 2014-10-07 08:56:34 UTC (rev 2279) @@ -566,12 +566,13 @@ }; -var Wao = function () { +var Wao = function (newWaoCookie) { var self = this; this.notifications = new Notifications(); this.cookie = null; + this.newWaoCookie = newWaoCookie; this.getNestedPropertyValue = function(path, data) { return path.split('.').reduce(function(prev, prop){ @@ -618,14 +619,6 @@ return data; }; - this.newWaoCookie = function () { - var newWaoCookie = { - version: 1, - samplingPlanFullView: false - }; - return newWaoCookie; - }; - this.getCookie = function () { if (self.cookie === null) { // on charge le cookie, s'il n'est pas définit, on en crée un avec les valeur par défaut @@ -641,32 +634,3 @@ } }; - -$(document).ready(function () { - - // si la lib est chargée, on la configure - if ($.cookie) { - // on sérialise/désérialise en JSON pour stocker le cookie - $.cookie.json = true; - } - - // $('a[data-toggle="popover"]').popover(); - $('span[data-toggle="tooltip"]').tooltip(); - - // FIXME brendan 07/04/14 cannot enable select2 because we can't bind blur event without driving the application crazy, see https://github.com/ivaynberg/select2/issues/2193 - //$('select').addClass('input-xlarge').select2(); - var $select2Inputs = $('select.select2'); - if ($select2Inputs.length > 0) { - $select2Inputs.select2(); - } - - WAO = new Wao(); - -}); - -$(window).unload(function() { - - // en quittant la page, on sauvegarde le cookie - WAO.saveCookie(); - -});

1 0

r2278 - in trunk: . wao-persistence wao-services wao-web
by bleny＠users.forge.codelutin.com 06 Oct '14

06 Oct '14

Author: bleny Date: 2014-10-06 11:39:32 +0200 (Mon, 06 Oct 2014) New Revision: 2278 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2278 Log: Tronc en 4.2 conform?\195?\169ment ?\195?\160 la feuille de route Modified: trunk/pom.xml trunk/wao-persistence/pom.xml trunk/wao-services/pom.xml trunk/wao-web/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-10-06 09:10:49 UTC (rev 2277) +++ trunk/pom.xml 2014-10-06 09:39:32 UTC (rev 2278) @@ -10,7 +10,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.1-SNAPSHOT</version> + <version>4.2-SNAPSHOT</version> <packaging>pom</packaging> <name>Wao</name> Modified: trunk/wao-persistence/pom.xml =================================================================== --- trunk/wao-persistence/pom.xml 2014-10-06 09:10:49 UTC (rev 2277) +++ trunk/wao-persistence/pom.xml 2014-10-06 09:39:32 UTC (rev 2278) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.1-SNAPSHOT</version> + <version>4.2-SNAPSHOT</version> </parent> <artifactId>wao-persistence</artifactId> Modified: trunk/wao-services/pom.xml =================================================================== --- trunk/wao-services/pom.xml 2014-10-06 09:10:49 UTC (rev 2277) +++ trunk/wao-services/pom.xml 2014-10-06 09:39:32 UTC (rev 2278) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.1-SNAPSHOT</version> + <version>4.2-SNAPSHOT</version> </parent> <artifactId>wao-services</artifactId> Modified: trunk/wao-web/pom.xml =================================================================== --- trunk/wao-web/pom.xml 2014-10-06 09:10:49 UTC (rev 2277) +++ trunk/wao-web/pom.xml 2014-10-06 09:39:32 UTC (rev 2278) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.1-SNAPSHOT</version> + <version>4.2-SNAPSHOT</version> </parent> <artifactId>wao-web</artifactId>

1 0

[ANN] - Wao 4.1 released
by codelutin.com Release Notification 06 Oct '14

06 Oct '14

The Wao team is pleased to announce the wao-4.1 release! Application pour le suivi contractuels d'observations scientifiques de la pêche Documentation of the project can be found here: http://doc.codelutin.com/wao Changes ------- Changes in this version include: Changes: o Informer Brest d'un éventuel changement de modèle avant mise en production Issue: 5348. Thanks to Vincent BADTS. Resolved by bleny. o Mise à jour du modèle Issue: 4481. Thanks to Brendan Le Ny. Resolved by bleny. Downloads --------- For a manual installation, you can download files here: http://forge.codelutin.com/projects/wao/files * wao-4.1.war - http://forge.codelutin.com/attachments/download/2352 Maven artifacts --------------- Artifacts are deployed in nuiton maven repository http://maven.nuiton.org/other-releases/ Have fun! -Wao team

1 0

r2277 - in trunk: . wao-persistence/src/main/java/fr/ifremer/wao/entity wao-services/src/main/java/fr/ifremer/wao/services/service wao-services/src/main/java/fr/ifremer/wao/services/service/administration wao-web/src/main/java/fr/ifremer/wao/web/action wao-web/src/main/resources/i18n wao-web/src/main/webapp wao-web/src/main/webapp/WEB-INF/content
by bleny＠users.forge.codelutin.com 06 Oct '14

06 Oct '14

Author: bleny Date: 2014-10-06 11:10:49 +0200 (Mon, 06 Oct 2014) New Revision: 2277 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2277 Log: Fusion de la branche 4.1.x dans le tronc (4.2) Modified: trunk/ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/TerrestrialLocations.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlanService.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/UpdateSampleRowCommand.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/ReferentialService.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/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 trunk/wao-web/src/main/webapp/WEB-INF/content/edit-sample-row-input.jsp trunk/wao-web/src/main/webapp/wao.css Property changes on: trunk ___________________________________________________________________ Modified: svn:mergeinfo - /branches/wao-4.0-obsvente:2075-2085 /branches/wao-4.0.x:2169-2256 + /branches/wao-4.0-obsvente:2075-2085 /branches/wao-4.0.x:2169-2269 /branches/wao-4.1.x:2268-2273 Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/TerrestrialLocations.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/TerrestrialLocations.java 2014-10-06 09:08:36 UTC (rev 2276) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/TerrestrialLocations.java 2014-10-06 09:10:49 UTC (rev 2277) @@ -22,6 +22,7 @@ */ import com.google.common.base.Function; +import com.google.common.base.Predicate; import com.google.common.collect.Ordering; import java.util.Comparator; @@ -48,6 +49,10 @@ return new GetName(); } + public static Predicate<TerrestrialLocation> isDistrict() { + return new IsDistrict(); + } + protected static class GetDistrictCode implements Function<TerrestrialLocation, String> { @Override @@ -79,4 +84,12 @@ return input.getName(); } } + + protected static class IsDistrict implements Predicate<TerrestrialLocation> { + + @Override + public boolean apply(TerrestrialLocation input) { + return input.isDistrict(); + } + } } Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlanService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlanService.java 2014-10-06 09:08:36 UTC (rev 2276) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlanService.java 2014-10-06 09:10:49 UTC (rev 2277) @@ -356,6 +356,13 @@ ); updateSampleRowCommand.setAllDcf5Codes(allDcf5Codes); + ImmutableMap<String, TerrestrialLocation> allTerrestrialDistricts = + Maps.uniqueIndex( + getReferentialService().getAllTerrestrialDistricts(), + TopiaEntities.getTopiaIdFunction() + ); + updateSampleRowCommand.setAllTerrestrialDistricts(allTerrestrialDistricts); + return updateSampleRowCommand; } Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/UpdateSampleRowCommand.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/UpdateSampleRowCommand.java 2014-10-06 09:08:36 UTC (rev 2276) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/UpdateSampleRowCommand.java 2014-10-06 09:10:49 UTC (rev 2277) @@ -21,7 +21,9 @@ * #L% */ +import com.google.common.base.Functions; import com.google.common.base.Preconditions; +import com.google.common.collect.Collections2; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; import com.google.common.collect.Sets; @@ -31,6 +33,7 @@ import fr.ifremer.wao.entity.SampleMonth; import fr.ifremer.wao.entity.SampleRow; import fr.ifremer.wao.entity.SampleRowLog; +import fr.ifremer.wao.entity.TerrestrialLocation; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.nuiton.topia.persistence.TopiaEntities; @@ -39,6 +42,7 @@ import java.io.Serializable; import java.text.DateFormat; import java.text.SimpleDateFormat; +import java.util.Collection; import java.util.Date; import java.util.LinkedHashMap; import java.util.Map; @@ -66,6 +70,8 @@ protected String elligibleBoatRegistrationCodes; + protected ImmutableMap<String, TerrestrialLocation> allTerrestrialDistricts; + /** * La clé est un mois au format YYYY-MM */ @@ -120,6 +126,16 @@ } } + public Collection<String> getTerrestrialLocationIds() { + return sampleRow.getTerrestrialLocationsTopiaIds(); + } + + public void setTerrestrialLocationIds(Collection<String> terrestrialLocationIds) { + Collection<TerrestrialLocation> terrestrialLocations = + Collections2.transform(terrestrialLocationIds, Functions.forMap(allTerrestrialDistricts)); + sampleRow.setTerrestrialLocations(terrestrialLocations); + } + public void setCode(String code) { Preconditions.checkState(isCreation(), "cannot change code for sample row " + sampleRow); sampleRow.setCode(code); @@ -206,6 +222,14 @@ return elligibleBoatRegistrationCodes; } + public ImmutableMap<String, TerrestrialLocation> getAllTerrestrialDistricts() { + return allTerrestrialDistricts; + } + + public void setAllTerrestrialDistricts(ImmutableMap<String, TerrestrialLocation> allTerrestrialDistricts) { + this.allTerrestrialDistricts = allTerrestrialDistricts; + } + public void setElligibleBoatRegistrationCodes(String elligibleBoatRegistrationCodes) { this.elligibleBoatRegistrationCodes = elligibleBoatRegistrationCodes; } Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/ReferentialService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/ReferentialService.java 2014-10-06 09:08:36 UTC (rev 2276) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/ReferentialService.java 2014-10-06 09:10:49 UTC (rev 2277) @@ -27,8 +27,10 @@ import com.google.common.base.Optional; import com.google.common.base.Preconditions; import com.google.common.base.Splitter; +import com.google.common.collect.Collections2; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; +import com.google.common.collect.Iterables; import fr.ifremer.wao.WaoTechnicalException; import fr.ifremer.wao.entity.Boat; import fr.ifremer.wao.entity.BoatTopiaDao; @@ -55,6 +57,7 @@ import fr.ifremer.wao.entity.TerrestrialLocation; import fr.ifremer.wao.entity.TerrestrialLocationImpl; import fr.ifremer.wao.entity.TerrestrialLocationTopiaDao; +import fr.ifremer.wao.entity.TerrestrialLocations; import fr.ifremer.wao.services.service.ImportErrorException; import fr.ifremer.wao.services.service.WaoServiceSupport; import fr.ifremer.wao.services.service.csv.BoatImportExportModel; @@ -859,18 +862,29 @@ public List<TerrestrialLocation> getTerrestrialLocationInDistricts(Collection<TerrestrialLocation> terrestrialDistricts) { - Set districtCodes = new HashSet(); - for (TerrestrialLocation terrestrialDistrict : terrestrialDistricts) { - Preconditions.checkArgument(terrestrialDistrict.isDistrict()); - districtCodes.add(terrestrialDistrict.getDistrictCode()); - } + Preconditions.checkState( + Iterables.all(terrestrialDistricts, TerrestrialLocations.isDistrict()), + terrestrialDistricts + " must contains only districts" + ); + Collection<String> districtCodes = Collections2.transform(terrestrialDistricts, TerrestrialLocations.getDistrictCode()); + TerrestrialLocationTopiaDao dao = getTerrestrialLocationDao(); - List<TerrestrialLocation> locationsInDistricts = dao.forLocationTypeIn(ImmutableSet.of(LocationType.PORT, LocationType.AUCTION)).addIn(TerrestrialLocation.PROPERTY_DISTRICT_CODE, districtCodes).findAll(); + List<TerrestrialLocation> locationsInDistricts = dao + .forLocationTypeIn(ImmutableSet.of(LocationType.PORT, LocationType.AUCTION)) + .addIn(TerrestrialLocation.PROPERTY_DISTRICT_CODE, districtCodes) + .findAll(); return locationsInDistricts; } + public List<TerrestrialLocation> getAllTerrestrialDistricts() { + + List<TerrestrialLocation> allTerrestialDistricts = getTerrestrialLocationDao().forLocationTypeEquals(LocationType.DISTRICT).findAll(); + + return allTerrestialDistricts; + + } } Property changes on: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/ReferentialService.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/wao-1.5.x/wao-business/src/main/java/fr/ifremer/wao/service/ServiceReferentialImpl.java:679-733 /branches/wao-4.0-obsvente/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/ReferentialService.java:2075-2085 + /branches/wao-1.5.x/wao-business/src/main/java/fr/ifremer/wao/service/ServiceReferentialImpl.java:679-733 /branches/wao-4.0-obsvente/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/ReferentialService.java:2075-2085 /branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/ReferentialService.java:2169-2269 /branches/wao-4.1.x/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/ReferentialService.java:2268-2273 Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/EditContactAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/EditContactAction.java 2014-10-06 09:08:36 UTC (rev 2276) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/EditContactAction.java 2014-10-06 09:10:49 UTC (rev 2277) @@ -299,7 +299,7 @@ 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")); + addFieldError("updateContactCommand.contactStateMotifId", t("wao.ui.form.Contact.error.missingContactStateMotif")); } catch (MissingContactDataInputDateException e) { addFieldError("updateContactCommand.contact.dataInputDate", t("wao.ui.form.Contact.error.missingDataInputDate")); @@ -322,7 +322,8 @@ addFieldError("updateContactCommand.contact.mammalsInfo", t("wao.ui.form.Contact.error.missingMammalsInfo")); } catch (MissingContactTerrestrialLocationException e) { - throw new UnsupportedOperationException(); + addFieldError("updateContactCommand.terrestrialLocationId", t("wao.ui.form.Contact.error.missingTerrestrialLocation")); + } catch (IllegalAcceptationException e) { throw new IllegalStateException("should never occur", e); } 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-10-06 09:08:36 UTC (rev 2276) +++ trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-10-06 09:10:49 UTC (rev 2277) @@ -305,6 +305,7 @@ 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.missingTerrestrialLocation=The terrestrial location of observation 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 Property changes on: trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties ___________________________________________________________________ Modified: svn:mergeinfo - /branches/wao-1.5.x/wao-ui/src/main/resources/i18n/wao-ui_en_GB.properties:679-733 /branches/wao-4.0-obsvente/wao-web/src/main/resources/i18n/wao-web_en_GB.properties:2075-2085 /branches/wao-4.0.x/wao-web/src/main/resources/i18n/wao-web_en_GB.properties:2169-2227 + /branches/wao-1.5.x/wao-ui/src/main/resources/i18n/wao-ui_en_GB.properties:679-733 /branches/wao-4.0-obsvente/wao-web/src/main/resources/i18n/wao-web_en_GB.properties:2075-2085 /branches/wao-4.0.x/wao-web/src/main/resources/i18n/wao-web_en_GB.properties:2169-2269 /branches/wao-4.1.x/wao-web/src/main/resources/i18n/wao-web_en_GB.properties:2268-2273 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-10-06 09:08:36 UTC (rev 2276) +++ trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-10-06 09:10:49 UTC (rev 2277) @@ -306,6 +306,7 @@ wao.ui.form.Contact.error.missingObservedDataControl=Il faut préciser une valeur pour le contrôle des données observées wao.ui.form.Contact.error.missingObserver=Il ne peut y avoir aucun observateur pour l'état '%s' 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.missingTerrestrialLocation=Il faut préciser le lieu d'observation 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 Property changes on: trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties ___________________________________________________________________ Modified: svn:mergeinfo - /branches/wao-1.5.x/wao-ui/src/main/resources/i18n/wao-ui_fr_FR.properties:679-733 /branches/wao-4.0-obsvente/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties:2075-2085 /branches/wao-4.0.x/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties:2169-2227 + /branches/wao-1.5.x/wao-ui/src/main/resources/i18n/wao-ui_fr_FR.properties:679-733 /branches/wao-4.0-obsvente/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties:2075-2085 /branches/wao-4.0.x/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties:2169-2269 /branches/wao-4.1.x/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties:2268-2273 Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/edit-sample-row-input.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/edit-sample-row-input.jsp 2014-10-06 09:08:36 UTC (rev 2276) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/edit-sample-row-input.jsp 2014-10-06 09:10:49 UTC (rev 2277) @@ -242,6 +242,17 @@ <s:if test="updateSampleRowCommand.sampleRow.obsProgram.obsVente"> + <s:select name="updateSampleRowCommand.terrestrialLocationIds" + label="%{getText('wao.ui.field.SampleRow.terrestrialLocations')}" + disabled="updateSampleRowCommand.observationAlreadyStarted" + list="updateSampleRowCommand.allTerrestrialDistricts" + listValue="%{value.districtName}" + multiple="true" + cssClass="input-xxlarge" + /> + + <s:textfield name="updateSampleRowCommand.sampleRow.terrestrialLocationInfos" label="%{getText('wao.ui.field.SampleRow.terrestrialLocationInfos')}" cssClass="input-xxlarge" /> + <s:textfield type="number" name="updateSampleRowCommand.sampleRow.averageObservationsCount" label="%{getText('wao.ui.field.SampleRow.averageObservationsCount')}" inputAppend="%{getText('wao.ui.unit.observations')}" cssClass="input-small"/> </s:if> Modified: trunk/wao-web/src/main/webapp/wao.css =================================================================== --- trunk/wao-web/src/main/webapp/wao.css 2014-10-06 09:08:36 UTC (rev 2276) +++ trunk/wao-web/src/main/webapp/wao.css 2014-10-06 09:10:49 UTC (rev 2277) @@ -748,6 +748,10 @@ /** * Accueil */ +main.home { + padding-bottom: 50px; +} + main.home .news { background-color: #fff; padding: 20px 20px 10px 20px;

1 0

r2276 - in branches/wao-4.1.x: . wao-persistence wao-services wao-web
by maven-release＠users.forge.codelutin.com 06 Oct '14

06 Oct '14

Author: maven-release Date: 2014-10-06 11:08:36 +0200 (Mon, 06 Oct 2014) New Revision: 2276 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2276 Log: [maven-release-plugin] prepare for next development iteration Modified: branches/wao-4.1.x/pom.xml branches/wao-4.1.x/wao-persistence/pom.xml branches/wao-4.1.x/wao-services/pom.xml branches/wao-4.1.x/wao-web/pom.xml Modified: branches/wao-4.1.x/pom.xml =================================================================== --- branches/wao-4.1.x/pom.xml 2014-10-06 09:08:32 UTC (rev 2275) +++ branches/wao-4.1.x/pom.xml 2014-10-06 09:08:36 UTC (rev 2276) @@ -10,7 +10,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.1</version> + <version>4.1.1-SNAPSHOT</version> <packaging>pom</packaging> <name>Wao</name> @@ -86,9 +86,9 @@ </modules> <scm> - <connection>scm:svn:http://svn.codelutin.com/wao/tags/wao-4.1</connection> - <developerConnection>scm:svn:https://svn.codelutin.com/wao/tags/wao-4.1</developerConnection> - <url>https://forge.codelutin.com/repositories/browse/wao/tags/wao-4.1</url> + <connection>scm:svn:http://svn.codelutin.com/wao/branches/wao-4.1.x</connection> + <developerConnection>scm:svn:https://svn.codelutin.com/wao/branches/wao-4.1.x</developerConnection> + <url>https://forge.codelutin.com/repositories/browse/wao/branches/wao-4.1.x</url> </scm> <properties> Modified: branches/wao-4.1.x/wao-persistence/pom.xml =================================================================== --- branches/wao-4.1.x/wao-persistence/pom.xml 2014-10-06 09:08:32 UTC (rev 2275) +++ branches/wao-4.1.x/wao-persistence/pom.xml 2014-10-06 09:08:36 UTC (rev 2276) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.1</version> + <version>4.1.1-SNAPSHOT</version> </parent> <artifactId>wao-persistence</artifactId> Modified: branches/wao-4.1.x/wao-services/pom.xml =================================================================== --- branches/wao-4.1.x/wao-services/pom.xml 2014-10-06 09:08:32 UTC (rev 2275) +++ branches/wao-4.1.x/wao-services/pom.xml 2014-10-06 09:08:36 UTC (rev 2276) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.1</version> + <version>4.1.1-SNAPSHOT</version> </parent> <artifactId>wao-services</artifactId> Modified: branches/wao-4.1.x/wao-web/pom.xml =================================================================== --- branches/wao-4.1.x/wao-web/pom.xml 2014-10-06 09:08:32 UTC (rev 2275) +++ branches/wao-4.1.x/wao-web/pom.xml 2014-10-06 09:08:36 UTC (rev 2276) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.1</version> + <version>4.1.1-SNAPSHOT</version> </parent> <artifactId>wao-web</artifactId>

1 0

r2275 - in tags: . wao-4.1
by maven-release＠users.forge.codelutin.com 06 Oct '14

06 Oct '14

Author: maven-release Date: 2014-10-06 11:08:32 +0200 (Mon, 06 Oct 2014) New Revision: 2275 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2275 Log: [maven-release-plugin] copy for tag wao-4.1 Added: tags/wao-4.1/ Property changes on: tags/wao-4.1 ___________________________________________________________________ Added: svn:mergeinfo + /branches/wao-4.0-obsvente:2075-2085 /branches/wao-4.0.x:2169-2269 Added: svn:ignore + *.idea *.iml target atlassian-ide-plugin.xml

1 0

r2274 - in branches/wao-4.1.x: . wao-persistence wao-services wao-web
by maven-release＠users.forge.codelutin.com 06 Oct '14

06 Oct '14

Author: maven-release Date: 2014-10-06 11:08:27 +0200 (Mon, 06 Oct 2014) New Revision: 2274 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2274 Log: [maven-release-plugin] prepare release wao-4.1 Modified: branches/wao-4.1.x/pom.xml branches/wao-4.1.x/wao-persistence/pom.xml branches/wao-4.1.x/wao-services/pom.xml branches/wao-4.1.x/wao-web/pom.xml Modified: branches/wao-4.1.x/pom.xml =================================================================== --- branches/wao-4.1.x/pom.xml 2014-10-06 08:51:40 UTC (rev 2273) +++ branches/wao-4.1.x/pom.xml 2014-10-06 09:08:27 UTC (rev 2274) @@ -10,7 +10,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.1-SNAPSHOT</version> + <version>4.1</version> <packaging>pom</packaging> <name>Wao</name> @@ -86,9 +86,9 @@ </modules> <scm> - <connection>scm:svn:http://svn.codelutin.com/wao/branches/wao-4.1.x</connection> - <developerConnection>scm:svn:https://svn.codelutin.com/wao/branches/wao-4.1.x</developerConnection> - <url>https://forge.codelutin.com/repositories/browse/wao/branches/wao-4.1.x</url> + <connection>scm:svn:http://svn.codelutin.com/wao/tags/wao-4.1</connection> + <developerConnection>scm:svn:https://svn.codelutin.com/wao/tags/wao-4.1</developerConnection> + <url>https://forge.codelutin.com/repositories/browse/wao/tags/wao-4.1</url> </scm> <properties> Modified: branches/wao-4.1.x/wao-persistence/pom.xml =================================================================== --- branches/wao-4.1.x/wao-persistence/pom.xml 2014-10-06 08:51:40 UTC (rev 2273) +++ branches/wao-4.1.x/wao-persistence/pom.xml 2014-10-06 09:08:27 UTC (rev 2274) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.1-SNAPSHOT</version> + <version>4.1</version> </parent> <artifactId>wao-persistence</artifactId> Modified: branches/wao-4.1.x/wao-services/pom.xml =================================================================== --- branches/wao-4.1.x/wao-services/pom.xml 2014-10-06 08:51:40 UTC (rev 2273) +++ branches/wao-4.1.x/wao-services/pom.xml 2014-10-06 09:08:27 UTC (rev 2274) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.1-SNAPSHOT</version> + <version>4.1</version> </parent> <artifactId>wao-services</artifactId> Modified: branches/wao-4.1.x/wao-web/pom.xml =================================================================== --- branches/wao-4.1.x/wao-web/pom.xml 2014-10-06 08:51:40 UTC (rev 2273) +++ branches/wao-4.1.x/wao-web/pom.xml 2014-10-06 09:08:27 UTC (rev 2274) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.1-SNAPSHOT</version> + <version>4.1</version> </parent> <artifactId>wao-web</artifactId>

1 0

[ANN] - Wao 4.0.13 released
by codelutin.com Release Notification 06 Oct '14

06 Oct '14

The Wao team is pleased to announce the wao-4.0.13 release! Application pour le suivi contractuels d'observations scientifiques de la pêche Documentation of the project can be found here: http://doc.codelutin.com/wao Changes ------- Changes in this version include: Fixed Bugs: o Lenteur de chargement des pages Navires et contacts Issue: 5392. Thanks to Anne-Sophie Cornou. Resolved by ascornou. o Il n'est pas possible de saisir les lieux d'observations dans le formulaire de modification d'une ligne du plan ObsVente Issue: 5832. Thanks to Vincent BADTS. Resolved by bleny. o Manque un espacement entre les news et le bas de page Issue: 5864. Thanks to Anne-Sophie Cornou. Resolved by bleny. o Lorsqu'on ne précise pas le lieu d'observation, on devrait avoir une erreur de validation et non un problème technique Issue: 5871. Thanks to Vincent BADTS. Resolved by bleny. Changes: o La 1er ouverture de la page navire est longue : est il possible d'améliorer cela ? Issue: 5288. Thanks to Vincent BADTS. Resolved by bleny. Downloads --------- For a manual installation, you can download files here: http://forge.codelutin.com/projects/wao/files * wao-4.0.13.war - http://forge.codelutin.com/attachments/download/2351 Maven artifacts --------------- Artifacts are deployed in nuiton maven repository http://maven.nuiton.org/other-releases/ Have fun! -Wao team

1 0

r2273 - in branches/wao-4.0.x: . wao-persistence wao-services wao-web
by maven-release＠users.forge.codelutin.com 06 Oct '14

06 Oct '14

Author: maven-release Date: 2014-10-06 10:51:40 +0200 (Mon, 06 Oct 2014) New Revision: 2273 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2273 Log: [maven-release-plugin] prepare for next development iteration Modified: branches/wao-4.0.x/pom.xml branches/wao-4.0.x/wao-persistence/pom.xml branches/wao-4.0.x/wao-services/pom.xml branches/wao-4.0.x/wao-web/pom.xml Modified: branches/wao-4.0.x/pom.xml =================================================================== --- branches/wao-4.0.x/pom.xml 2014-10-06 08:51:34 UTC (rev 2272) +++ branches/wao-4.0.x/pom.xml 2014-10-06 08:51:40 UTC (rev 2273) @@ -10,7 +10,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.0.13</version> + <version>4.0.14-SNAPSHOT</version> <packaging>pom</packaging> <name>Wao</name> @@ -86,9 +86,9 @@ </modules> <scm> - <connection>scm:svn:http://svn.codelutin.com/wao/tags/wao-4.0.13</connection> - <developerConnection>scm:svn:https://svn.codelutin.com/wao/tags/wao-4.0.13</developerConnection> - <url>https://forge.codelutin.com/repositories/browse/wao/tags/wao-4.0.13</url> + <connection>scm:svn:http://svn.codelutin.com/wao/branches/wao-4.0.x</connection> + <developerConnection>scm:svn:https://svn.codelutin.com/wao/branches/wao-4.0.x</developerConnection> + <url>https://forge.codelutin.com/repositories/browse/wao/branches/wao-4.0.x</url> </scm> <properties> Modified: branches/wao-4.0.x/wao-persistence/pom.xml =================================================================== --- branches/wao-4.0.x/wao-persistence/pom.xml 2014-10-06 08:51:34 UTC (rev 2272) +++ branches/wao-4.0.x/wao-persistence/pom.xml 2014-10-06 08:51:40 UTC (rev 2273) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.0.13</version> + <version>4.0.14-SNAPSHOT</version> </parent> <artifactId>wao-persistence</artifactId> Modified: branches/wao-4.0.x/wao-services/pom.xml =================================================================== --- branches/wao-4.0.x/wao-services/pom.xml 2014-10-06 08:51:34 UTC (rev 2272) +++ branches/wao-4.0.x/wao-services/pom.xml 2014-10-06 08:51:40 UTC (rev 2273) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.0.13</version> + <version>4.0.14-SNAPSHOT</version> </parent> <artifactId>wao-services</artifactId> Modified: branches/wao-4.0.x/wao-web/pom.xml =================================================================== --- branches/wao-4.0.x/wao-web/pom.xml 2014-10-06 08:51:34 UTC (rev 2272) +++ branches/wao-4.0.x/wao-web/pom.xml 2014-10-06 08:51:40 UTC (rev 2273) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.0.13</version> + <version>4.0.14-SNAPSHOT</version> </parent> <artifactId>wao-web</artifactId>

1 0

r2272 - in tags: . wao-4.0.13
by maven-release＠users.forge.codelutin.com 06 Oct '14

06 Oct '14

Author: maven-release Date: 2014-10-06 10:51:34 +0200 (Mon, 06 Oct 2014) New Revision: 2272 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2272 Log: [maven-release-plugin] copy for tag wao-4.0.13 Added: tags/wao-4.0.13/ Property changes on: tags/wao-4.0.13 ___________________________________________________________________ Added: svn:mergeinfo + /branches/wao-4.0-obsvente:2075-2085 Added: svn:ignore + *.idea *.iml target atlassian-ide-plugin.xml

1 0