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

[wao] branch master updated (9fc69ae -> c8785db)
by codelutin.com scm 08 Oct '14

08 Oct '14

This is an automated email from the git hooks/post-receive script. New change to branch master in repository wao. See http://git.codelutin.com/wao.git omits 9fc69ae Suppression de code mort omits ebfcdfe On redirige les mauvais appels HTTP vers la racine (fixes #5402) omits a7d97ea On évite de répéter plusieurs fois un même secteur dans le contenu du mail envoyé en cas de capture accidentelle (fixes #5922) omits 9e7d886 La durée moyenne d'une marée (ObsMer) passe en nombre entier (fixes #5117) omits c1e8d3f Ajout d'entêtes de licences manquants omits 0416288 À la sortie du formulaire de modification d'un contact, on retourne à la page sur laquelle on se trouvait (fixes #5746) omits 27fe8c4 Correction d'un message de log qui affichera toujours 'null' omits 666fb48 On utilise le cookie wao pour stocker le choix de la vue compacte/étendu dans le plan obsvente et dans les contacts (refs #5746) omits 5fa875c Récupération du cookie par défaut depuis struts (refs #5746) omits 6e1bacd Tronc en 4.2 conformément à la feuille de route omits f1c6717 Fusion de la branche 4.1.x dans le tronc (4.2) omits 2e98069 Prototype pour le plan d'échantillonnage ObsMer, on sauve dans un cookie le choix de mode compact/étendu, par contre on a perdu la valeur par défaut (refs #5746) adds 8d3a6ea Création d'une branche 4.1.x adds 927f079 Mise à jour du pom pour la branche 4.1.x adds 6509eef Fusion dans la branche 4.1.x des corrections effectuées en 4.0.x adds ce08564 [maven-release-plugin] prepare release wao-4.1 adds c8785db [maven-release-plugin] copy for tag wao-4.1 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (9fc69ae) \ N -- N -- N refs/heads/master (c8785db) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. No new revisions were added by this update. Summary of changes: pom.xml | 8 +-- wao-persistence/pom.xml | 2 +- .../migration/V4_2__average_tide_time_to_int.sql | 24 ------- wao-persistence/src/main/xmi/wao-model.properties | 2 +- wao-persistence/src/main/xmi/wao-model.zargo | Bin 59661 -> 59675 bytes .../fr/ifremer/wao/entity/ContactStateTest.java | 21 ------ .../ifremer/wao/entity/SampleRowLogImplTest.java | 2 +- wao-services/pom.xml | 2 +- .../wao/services/service/ObsMerSamplingPlan.java | 10 +-- .../service/ObsMerSamplingPlanBuilder.java | 4 +- .../service/ObsMerSamplingPlanService.java | 6 +- .../service/administration/ReferentialService.java | 75 ++++++++++++++++++++- ...bsMerObsVenteSamplingPlanImportExportModel.java | 2 +- .../service/mail/MammalsObservationEmail.java | 8 ++- wao-web/pom.xml | 2 +- .../wao/web/RedirectToContextPathRootFilter.java | 47 ------------- .../fr/ifremer/wao/web/WaoJspActionSupport.java | 19 ------ .../wao/web/action/AbstractSamplingPlanAction.java | 5 ++ .../fr/ifremer/wao/web/action/BoatsAction.java | 2 +- .../fr/ifremer/wao/web/action/ContactsAction.java | 8 ++- .../ifremer/wao/web/action/EditContactAction.java | 12 +--- .../web/WaoJspActionSupport-conversion.properties | 21 ------ .../src/main/webapp/WEB-INF/content/contacts.jsp | 17 ++--- .../webapp/WEB-INF/content/edit-contact-input.jsp | 6 +- .../WEB-INF/content/obsmer/sampling-plan.jsp | 18 +++-- .../WEB-INF/content/obsvente/sampling-plan.jsp | 12 ++-- .../webapp/WEB-INF/decorators/layout-login.jsp | 2 + .../src/main/webapp/WEB-INF/decorators/layout.jsp | 51 +------------- wao-web/src/main/webapp/WEB-INF/web.xml | 11 --- wao-web/src/main/webapp/endpoints-js.jsp | 39 +++++++++++ wao-web/src/main/webapp/wao.js | 51 +++++--------- 31 files changed, 188 insertions(+), 301 deletions(-) delete mode 100644 wao-persistence/src/main/resources/db/migration/V4_2__average_tide_time_to_int.sql delete mode 100644 wao-web/src/main/java/fr/ifremer/wao/web/RedirectToContextPathRootFilter.java delete mode 100644 wao-web/src/main/resources/fr/ifremer/wao/web/WaoJspActionSupport-conversion.properties create mode 100644 wao-web/src/main/webapp/endpoints-js.jsp -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

r2288 - branches
by bleny＠users.forge.codelutin.com 08 Oct '14

08 Oct '14

Author: bleny Date: 2014-10-08 15:37:41 +0200 (Wed, 08 Oct 2014) New Revision: 2288 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2288 Log: Suppresion des branches abandonn?\195?\169es Removed: branches/suiviobsmer-0.4.1/ branches/wao-1.5.x/ branches/wao-4.0-jdk6/ branches/wao-4.0-obsvente/

1 0

r2287 - trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration
by bleny＠users.forge.codelutin.com 07 Oct '14

07 Oct '14

Author: bleny Date: 2014-10-07 18:11:42 +0200 (Tue, 07 Oct 2014) New Revision: 2287 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2287 Log: Suppression de code mort Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/ReferentialService.java 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-07 15:46:37 UTC (rev 2286) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/ReferentialService.java 2014-10-07 16:11:42 UTC (rev 2287) @@ -29,8 +29,8 @@ 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 com.google.common.collect.Sets; import fr.ifremer.wao.WaoTechnicalException; import fr.ifremer.wao.entity.Boat; import fr.ifremer.wao.entity.BoatTopiaDao; @@ -77,7 +77,6 @@ import org.nuiton.topia.persistence.TopiaDao; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.TopiaNoResultException; -import org.nuiton.topia.persistence.TopiaQueryBuilderAddCriteriaOrRunQueryStep; import org.nuiton.util.beans.Binder; import org.nuiton.util.beans.BinderFactory; @@ -364,49 +363,6 @@ } - /** Find ports and auctions in a given district */ - public List<TerrestrialLocation> getAllPortsAndAuctions(TerrestrialLocation district) { - - Preconditions.checkArgument(district.isDistrict(), "terrestrial location " + district + " is not district"); - - TerrestrialLocationTopiaDao dao = getPersistenceContext().getTerrestrialLocationDao(); - - TopiaQueryBuilderAddCriteriaOrRunQueryStep<TerrestrialLocation> query = dao.newQueryBuilder(); - - query.addIn(TerrestrialLocation.PROPERTY_LOCATION_TYPE, ImmutableSet.of(LocationType.PORT, LocationType.AUCTION)); - - query.addEquals(TerrestrialLocation.PROPERTY_DISTRICT_CODE, district.getDistrictCode()); - - List<TerrestrialLocation> result = query.findAll(); - - return result; - - } - - public List<TerrestrialLocation> executeGetAllRegionIfremers() { - - TerrestrialLocationTopiaDao dao = getPersistenceContext().getTerrestrialLocationDao(); - - List<TerrestrialLocation> allRegionIfremers = dao.forLocationTypeEquals(LocationType.REGION).findAll(); - - return allRegionIfremers; - - } - - public TerrestrialLocation getTerrestrialDistrict(String districtCode) { - - Preconditions.checkArgument(StringUtils.isNotBlank(districtCode)); - - TerrestrialLocationTopiaDao dao = getPersistenceContext().getTerrestrialLocationDao(); - - TerrestrialLocation terrestrialDistrict = dao.forProperties( - TerrestrialLocation.PROPERTY_LOCATION_TYPE, LocationType.DISTRICT, - TerrestrialLocation.PROPERTY_DISTRICT_CODE, districtCode).findUnique(); - - return terrestrialDistrict; - - } - /** * @param contactState if null, return motifs for all contact states */ @@ -458,31 +414,6 @@ } - /** - * @param region may be null, and all ports will be returned - * @return all the ports that are in a region - */ - public List<TerrestrialLocation> getAllPorts(TerrestrialLocation region) { - - Preconditions.checkArgument(region == null || region.isRegion(), region + " is not a region"); - - TerrestrialLocationTopiaDao dao = getPersistenceContext().getTerrestrialLocationDao(); - - Map<String, Object> properties = new HashMap<>(); - - // we are looking for ports only - properties.put(TerrestrialLocation.PROPERTY_LOCATION_TYPE, LocationType.PORT); - - // ports in a specific region - properties.put(TerrestrialLocation.PROPERTY_REGION_IFREMER_CODE, region.getRegionIfremerCode()); - - // run query - List<TerrestrialLocation> ports = dao.forProperties(properties).findAll(); - - return ports; - - } - protected void initialDcf5CodesImport() { FishingGearDcfTopiaDao fishingGearDcfDao = getPersistenceContext().getFishingGearDcfDao(); @@ -882,9 +813,9 @@ public List<TerrestrialLocation> getAllTerrestrialDistricts() { - List<TerrestrialLocation> allTerrestialDistricts = getTerrestrialLocationDao().forLocationTypeEquals(LocationType.DISTRICT).findAll(); + List<TerrestrialLocation> allTerrestrialDistricts = getTerrestrialLocationDao().forLocationTypeEquals(LocationType.DISTRICT).findAll(); - return allTerrestialDistricts; + return allTerrestrialDistricts; } }

1 0

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

07 Oct '14

Author: bleny Date: 2014-10-07 17:46:37 +0200 (Tue, 07 Oct 2014) New Revision: 2286 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2286 Log: On redirige les mauvais appels HTTP vers la racine (fixes #5402) Added: trunk/wao-web/src/main/java/fr/ifremer/wao/web/RedirectToContextPathRootFilter.java Modified: trunk/wao-web/src/main/webapp/WEB-INF/web.xml Added: trunk/wao-web/src/main/java/fr/ifremer/wao/web/RedirectToContextPathRootFilter.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/RedirectToContextPathRootFilter.java (rev 0) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/RedirectToContextPathRootFilter.java 2014-10-07 15:46:37 UTC (rev 2286) @@ -0,0 +1,47 @@ +package fr.ifremer.wao.web; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import javax.servlet.Filter; +import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; + +/** + * Redirige toutes les requêtes entrantes vers la racine du context-path (/wao) + * + * @since 4.2 + */ +public class RedirectToContextPathRootFilter implements Filter { + + private static final Log log = LogFactory.getLog(RedirectToContextPathRootFilter.class); + + @Override + public void init(FilterConfig filterConfig) { + // nothing to do + } + + @Override + public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException { + + String contextPath = ((HttpServletRequest) servletRequest).getContextPath(); + + if (log.isTraceEnabled()) { + log.trace("will redirect to " + contextPath); + } + + ((HttpServletResponse) servletResponse).sendRedirect(contextPath); + + } + + @Override + public void destroy() { + // nothing to do + } + +} Modified: trunk/wao-web/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/web.xml 2014-10-07 15:17:45 UTC (rev 2285) +++ trunk/wao-web/src/main/webapp/WEB-INF/web.xml 2014-10-07 15:46:37 UTC (rev 2286) @@ -65,7 +65,18 @@ <filter-class>org.apache.struts2.dispatcher.ng.filter.StrutsExecuteFilter</filter-class> </filter> + <filter> + <filter-name>RedirectToContextPathRootFilter</filter-name> + <filter-class>fr.ifremer.wao.web.RedirectToContextPathRootFilter</filter-class> + </filter> + +  <filter-mapping> + <filter-name>RedirectToContextPathRootFilter</filter-name> + <url-pattern>/connexion/$B</url-pattern> + </filter-mapping> + + <filter-mapping> <filter-name>struts-prepare</filter-name> <url-pattern>/*</url-pattern> </filter-mapping>

1 0

r2285 - trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/mail
by bleny＠users.forge.codelutin.com 07 Oct '14

07 Oct '14

Author: bleny Date: 2014-10-07 17:17:45 +0200 (Tue, 07 Oct 2014) New Revision: 2285 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2285 Log: On ?\195?\169vite de r?\195?\169p?\195?\169ter plusieurs fois un m?\195?\170me secteur dans le contenu du mail envoy?\195?\169 en cas de capture accidentelle (fixes #5922) Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/mail/MammalsObservationEmail.java Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/mail/MammalsObservationEmail.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/mail/MammalsObservationEmail.java 2014-10-07 14:28:19 UTC (rev 2284) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/mail/MammalsObservationEmail.java 2014-10-07 15:17:45 UTC (rev 2285) @@ -28,9 +28,9 @@ import org.nuiton.i18n.I18n; import org.nuiton.util.StringUtil; -import java.util.ArrayList; -import java.util.List; +import java.util.HashSet; import java.util.Locale; +import java.util.Set; /** * Courriel de notification qui est envoyé lorsqu'un utilisateur rapporte, à la saisie d'un @@ -78,12 +78,10 @@ } public String getFacadeNames() { - - List<String> facadesNames = new ArrayList<>(); + Set<String> facadesNames = new HashSet<>(); for (FishingZone fishingZone : getSampleRow().getFishingZone()) { facadesNames.add(fishingZone.getSectorName() + " (" + fishingZone.getFacadeName() + ")"); } - return StringUtil.join(facadesNames, ", ", true); } }

1 0

r2284 - in trunk: wao-persistence/src/main/resources/db/migration wao-persistence/src/main/xmi wao-persistence/src/test/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/csv wao-web/src/main/webapp/WEB-INF/content/obsmer
by bleny＠users.forge.codelutin.com 07 Oct '14

07 Oct '14

Author: bleny Date: 2014-10-07 16:28:19 +0200 (Tue, 07 Oct 2014) New Revision: 2284 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2284 Log: La dur?\195?\169e moyenne d'une mar?\195?\169e (ObsMer) passe en nombre entier (fixes #5117) Added: trunk/wao-persistence/src/main/resources/db/migration/V4_2__average_tide_time_to_int.sql Modified: trunk/wao-persistence/src/main/xmi/wao-model.properties trunk/wao-persistence/src/main/xmi/wao-model.zargo trunk/wao-persistence/src/test/java/fr/ifremer/wao/entity/SampleRowLogImplTest.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlan.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanBuilder.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanService.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ObsMerObsVenteSamplingPlanImportExportModel.java trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp Added: trunk/wao-persistence/src/main/resources/db/migration/V4_2__average_tide_time_to_int.sql =================================================================== --- trunk/wao-persistence/src/main/resources/db/migration/V4_2__average_tide_time_to_int.sql (rev 0) +++ trunk/wao-persistence/src/main/resources/db/migration/V4_2__average_tide_time_to_int.sql 2014-10-07 14:28:19 UTC (rev 2284) @@ -0,0 +1,24 @@ +--- +-- #%L +-- Wao :: Persistence +-- %% +-- 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% +--- + + +-- On change le type de la colonne pour entier en arrondissant à l'entier supérieur +ALTER TABLE SampleRow ALTER COLUMN averageTideTime TYPE integer USING ceiling(averageTideTime); Modified: trunk/wao-persistence/src/main/xmi/wao-model.properties =================================================================== --- trunk/wao-persistence/src/main/xmi/wao-model.properties 2014-10-07 13:01:25 UTC (rev 2283) +++ trunk/wao-persistence/src/main/xmi/wao-model.properties 2014-10-07 14:28:19 UTC (rev 2284) @@ -21,7 +21,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # #L% ### -model.tagValue.version=4.1 +model.tagValue.version=4.2 model.tagValue.useEnumerationName=true # orderBy tagValues Modified: trunk/wao-persistence/src/main/xmi/wao-model.zargo =================================================================== (Binary files differ) Modified: trunk/wao-persistence/src/test/java/fr/ifremer/wao/entity/SampleRowLogImplTest.java =================================================================== --- trunk/wao-persistence/src/test/java/fr/ifremer/wao/entity/SampleRowLogImplTest.java 2014-10-07 13:01:25 UTC (rev 2283) +++ trunk/wao-persistence/src/test/java/fr/ifremer/wao/entity/SampleRowLogImplTest.java 2014-10-07 14:28:19 UTC (rev 2284) @@ -102,7 +102,7 @@ SampleRow newSampleRow = newEmptySampleRow(); // do some modifications - newSampleRow.setAverageTideTime(1.0); + newSampleRow.setAverageTideTime(1); newSampleRow.setProgramName("programName"); FishingZone fishingZone = new FishingZoneImpl(); fishingZone.setDistrictCode("IV"); Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlan.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlan.java 2014-10-07 13:01:25 UTC (rev 2283) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlan.java 2014-10-07 14:28:19 UTC (rev 2284) @@ -117,7 +117,7 @@ * <p/> * <strong>Note:</strong> can be null. */ - protected Double observationTimesInDaysExpected; + protected Integer observationTimesInDaysExpected; /** * Real times of observation in days. @@ -139,14 +139,14 @@ protected int nbObservants; - protected double averageTideTime; + protected int averageTideTime; protected Double appliedCoverageRate; public ObsMerSamplingPlanSampleRowPart(Locale locale, Map<Date, SamplingPlanStatistics> nbTidesPerMonth, SampleRow sampleRow, - Double observationTimesInDaysExpected, + Integer observationTimesInDaysExpected, Long observationTimesInDaysReal, Long observationTimesInDaysEstimated, long sampleRowContactCounts) { @@ -172,7 +172,7 @@ } - public Double getObservationTimesInDaysExpected() { + public Integer getObservationTimesInDaysExpected() { return observationTimesInDaysExpected; } @@ -200,7 +200,7 @@ return nbObservants; } - public double getAverageTideTime() { + public int getAverageTideTime() { return averageTideTime; } } Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanBuilder.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanBuilder.java 2014-10-07 13:01:25 UTC (rev 2283) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanBuilder.java 2014-10-07 14:28:19 UTC (rev 2284) @@ -162,7 +162,7 @@ } public ObsMerSamplingPlanBuilder addSampleRow(SampleRow sampleRow, - Double observationTimesInDaysExpected, + Integer observationTimesInDaysExpected, Long observationTimesInDaysReal, Long observationTimesInDaysEstimated, long sampleRowContactCounts) { @@ -345,7 +345,7 @@ protected ObsMerSamplingPlan.SamplingPlanSampleRowPart addSampleRow(Locale locale, SampleRow row, Map<Date, ObsMerSamplingPlan.SamplingPlanStatistics> nbTidesPerMonth, - Double observationTimesInDaysExpected, + Integer observationTimesInDaysExpected, Long observationTimesInDaysReal, Long observationTimesInDaysEstimated, long sampleRowContactCounts) { Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanService.java 2014-10-07 13:01:25 UTC (rev 2283) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanService.java 2014-10-07 14:28:19 UTC (rev 2284) @@ -105,7 +105,7 @@ for (SampleRow sampleRow : sampleRows) { // calcul effort plannifie - Double observationTimesInDaysExpected = + Integer observationTimesInDaysExpected = getObservationTimesInDayExpected(periodFrom, periodTo, sampleRow); @@ -144,13 +144,13 @@ * @param sampleRow la ligne à filtrer * @return l'effort plannifié calculé */ - protected double getObservationTimesInDayExpected(Date periodFrom, + protected int getObservationTimesInDayExpected(Date periodFrom, Date periodTo, SampleRow sampleRow) { Range<Date> period = Range.closed(periodFrom, periodTo); - double expected; + int expected; // On prend le nombre d'observation prévue pour cette ligne du plan // c'est à dire la somme des nombres d'observations prévues pour Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ObsMerObsVenteSamplingPlanImportExportModel.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ObsMerObsVenteSamplingPlanImportExportModel.java 2014-10-07 13:01:25 UTC (rev 2283) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ObsMerObsVenteSamplingPlanImportExportModel.java 2014-10-07 14:28:19 UTC (rev 2284) @@ -222,7 +222,7 @@ } if (obsProgram == ObsProgram.OBSMER) { - modelBuilder.newColumnForImportExport("PLAN_DUREE_MOY", SampleRow.PROPERTY_AVERAGE_TIDE_TIME, Common.DOUBLE_PRIMITIVE); + modelBuilder.newColumnForImportExport("PLAN_DUREE_MOY", SampleRow.PROPERTY_AVERAGE_TIDE_TIME, Common.PRIMITIVE_INTEGER); modelBuilder.newColumnForImportExport("PLAN_NB_OBSERV", SampleRow.PROPERTY_NB_OBSERVANTS, Common.PRIMITIVE_INTEGER); modelBuilder.newColumnForImportExport("TAUX_COUVERTURE_APPLIQUE", SampleRow.PROPERTY_APPLIED_COVERAGE_RATE, Common.DOUBLE); } 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-10-07 13:01:25 UTC (rev 2283) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 2014-10-07 14:28:19 UTC (rev 2284) @@ -431,9 +431,9 @@ </s:if> </td> - <td><s:property value="averageTideTime" /></td> - <td><s:property value="nbObservants" /></td> - <td> + <td class="align-center"><s:property value="averageTideTime" /></td> + <td class="align-center"><s:property value="nbObservants" /></td> + <td class="align-center"> <s:if test="appliedCoverageRate"> <s:property value="appliedCoverageRate" />% </s:if>

1 0

r2283 - in trunk: wao-persistence/src/test/java/fr/ifremer/wao/entity wao-web/src/main/resources/fr/ifremer/wao/web
by bleny＠users.forge.codelutin.com 07 Oct '14

07 Oct '14

Author: bleny Date: 2014-10-07 15:01:25 +0200 (Tue, 07 Oct 2014) New Revision: 2283 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2283 Log: Ajout d'ent?\195?\170tes de licences manquants Modified: trunk/wao-persistence/src/test/java/fr/ifremer/wao/entity/ContactStateTest.java trunk/wao-web/src/main/resources/fr/ifremer/wao/web/WaoJspActionSupport-conversion.properties Modified: trunk/wao-persistence/src/test/java/fr/ifremer/wao/entity/ContactStateTest.java =================================================================== --- trunk/wao-persistence/src/test/java/fr/ifremer/wao/entity/ContactStateTest.java 2014-10-07 09:30:00 UTC (rev 2282) +++ trunk/wao-persistence/src/test/java/fr/ifremer/wao/entity/ContactStateTest.java 2014-10-07 13:01:25 UTC (rev 2283) @@ -1,5 +1,26 @@ package fr.ifremer.wao.entity; +/* + * #%L + * Wao :: Persistence + * %% + * 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% + */ + import org.junit.Assert; import org.junit.Test; Modified: 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 2014-10-07 09:30:00 UTC (rev 2282) +++ trunk/wao-web/src/main/resources/fr/ifremer/wao/web/WaoJspActionSupport-conversion.properties 2014-10-07 13:01:25 UTC (rev 2283) @@ -1 +1,21 @@ +### +# #%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% +### defaultCookie=org.nuiton.web.struts2.converters.JsonConverter

1 0

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

07 Oct '14

Author: bleny Date: 2014-10-07 11:30:00 +0200 (Tue, 07 Oct 2014) New Revision: 2282 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2282 Log: ?\195?\128 la sortie du formulaire de modification d'un contact, on retourne ?\195?\160 la page sur laquelle on se trouvait (fixes #5746) Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/ContactsAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/EditContactAction.java trunk/wao-web/src/main/webapp/WEB-INF/content/contacts.jsp trunk/wao-web/src/main/webapp/WEB-INF/content/edit-contact-input.jsp Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/ContactsAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/ContactsAction.java 2014-10-07 09:16:34 UTC (rev 2281) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/ContactsAction.java 2014-10-07 09:30:00 UTC (rev 2282) @@ -251,4 +251,7 @@ return unacceptable; } + public int getPageNumber() { + return pageNumber; + } } \ No newline at end of file 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-07 09:16:34 UTC (rev 2281) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/EditContactAction.java 2014-10-07 09:30:00 UTC (rev 2282) @@ -87,7 +87,7 @@ * @author Tony Chemit <chemit(a)codelutin.com> * @since 4.0 */ -@Results({@Result(name = "success", type = "redirectAction", params = {"actionName", "contacts"})}) +@Results({@Result(name = "success", type = "redirectAction", params = {"actionName", "contacts", "pageNumber", "%{returnToPageNumber}"})}) public class EditContactAction extends WaoJspActionSupport implements Preparable { private static final long serialVersionUID = 1L; @@ -121,6 +121,8 @@ protected UpdateContactCommand updateContactCommand; + protected int returnToPageNumber; + public void setService(ContactsService service) { this.service = service; } @@ -185,6 +187,10 @@ return formatDate(new Date()); } + public void setReturnToPageNumber(int returnToPageNumber) { + this.returnToPageNumber = returnToPageNumber; + } + @Override public void prepare() { @@ -346,4 +352,8 @@ } + public int getReturnToPageNumber() { + return returnToPageNumber; + } + } \ No newline at end of file Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/contacts.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/contacts.jsp 2014-10-07 09:16:34 UTC (rev 2281) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/contacts.jsp 2014-10-07 09:30:00 UTC (rev 2282) @@ -591,8 +591,9 @@ <s:else> <s:set name="focusAnchor">coordinatorOrObserverFocus</s:set> </s:else> - <s:url action="edit-contact!input" id="editContactUrl" anchor='%{focusAnchor}'> + <s:url action="edit-contact!input" id="editContactUrl" anchor="%{focusAnchor}"> <s:param name="contactId" value="topiaId"/> + <s:param name="returnToPageNumber" value="pageNumber"/> </s:url> <s:a href="%{editContactUrl}"> <i class="icon-edit"></i> <s:text name="wao.ui.action.editOrDeleteContact"/> Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/edit-contact-input.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/edit-contact-input.jsp 2014-10-07 09:16:34 UTC (rev 2281) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/edit-contact-input.jsp 2014-10-07 09:30:00 UTC (rev 2282) @@ -225,6 +225,8 @@ <s:hidden name="contactId" value="%{contactId}"/> + <s:hidden name="returnToPageNumber" value="%{returnToPageNumber}"/> + <%--Do not remove the id (use by contacts page)--%> <fieldset id="coordinatorOrObserverFocus"> <legend><s:text name="wao.ui.misc.observers"/></legend> @@ -379,7 +381,9 @@ </fieldset> <div class="form-actions"> - <s:url action="contacts" id="contactsUrl"/> + <s:url action="contacts" id="contactsUrl"> + <s:param name="pageNumber" value="returnToPageNumber"/> + </s:url> <s:a href="%{contactsUrl}" cssClass="btn"> <i class="icon-chevron-left"></i> <s:text name="wao.ui.action.cancel"/> </s:a>

1 0

r2281 - trunk/wao-web/src/main/java/fr/ifremer/wao/web/action
by bleny＠users.forge.codelutin.com 07 Oct '14

07 Oct '14

Author: bleny Date: 2014-10-07 11:16:34 +0200 (Tue, 07 Oct 2014) New Revision: 2281 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2281 Log: Correction d'un message de log qui affichera toujours 'null' Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/BoatsAction.java Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/BoatsAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/BoatsAction.java 2014-10-07 09:10:44 UTC (rev 2280) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/BoatsAction.java 2014-10-07 09:16:34 UTC (rev 2281) @@ -130,7 +130,7 @@ session.setStartBoatSelectionForSampleRowId(startBoatSelectionForSampleRowId); if (log.isInfoEnabled()) { - log.info("user " + getAuthenticatedWaoUser().getWaoUser() + " is starting to select a boat for sample row " + startBoatSelectionForSampleRow); + log.info("user " + getAuthenticatedWaoUser().getWaoUser() + " is starting to select a boat for sample row " + startBoatSelectionForSampleRowId); } }

1 0

r2280 - in trunk/wao-web/src/main: java/fr/ifremer/wao/web java/fr/ifremer/wao/web/action webapp/WEB-INF/content webapp/WEB-INF/content/obsvente
by bleny＠users.forge.codelutin.com 07 Oct '14

07 Oct '14

Author: bleny Date: 2014-10-07 11:10:44 +0200 (Tue, 07 Oct 2014) New Revision: 2280 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2280 Log: On utilise le cookie wao pour stocker le choix de la vue compacte/?\195?\169tendu dans le plan obsvente et dans les contacts (refs #5746) Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoJspActionSupport.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/ContactsAction.java trunk/wao-web/src/main/webapp/WEB-INF/content/contacts.jsp trunk/wao-web/src/main/webapp/WEB-INF/content/obsvente/sampling-plan.jsp 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-07 08:56:34 UTC (rev 2279) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoJspActionSupport.java 2014-10-07 09:10:44 UTC (rev 2280) @@ -173,10 +173,16 @@ return fullView; } + public boolean isContactsListFullViewByDefault() { + boolean fullView = getAuthenticatedWaoUser().isAdmin() || getAuthenticatedWaoUser().isProfessional(); + return fullView; + } + public ImmutableMap<String, Object> getDefaultCookie() { return ImmutableMap.of( "version", (Object) "4.2", - "samplingPlanFullView", isSamplingPlanFullViewByDefault() + "samplingPlanFullView", isSamplingPlanFullViewByDefault(), + "contactsListFullView", isContactsListFullViewByDefault() ); } Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/ContactsAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/ContactsAction.java 2014-10-07 08:56:34 UTC (rev 2279) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/ContactsAction.java 2014-10-07 09:10:44 UTC (rev 2280) @@ -168,11 +168,6 @@ return placeholder; } - public boolean isFullView() { - boolean fullView = getAuthenticatedWaoUser().isAdmin() || getAuthenticatedWaoUser().isProfessional(); - return fullView; - } - public String getMammalsInfo(Contact contact) { return escapeForToolTip(contact.getMammalsInfo()); } Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/contacts.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/contacts.jsp 2014-10-07 08:56:34 UTC (rev 2279) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/contacts.jsp 2014-10-07 09:10:44 UTC (rev 2280) @@ -156,6 +156,14 @@ $('table.contacts-list').toggleClass('full-view').toggleClass('compact-view'); }); + var $views = $('#switch-compact-full-view, table.contacts-list'); + $views.toggleCompactFullView(WAO.getCookie().contactsListFullView); + + $('#switch-compact-full-view').click(function () { + WAO.getCookie().contactsListFullView = ! WAO.getCookie().contactsListFullView; + $views.toggleCompactFullView(WAO.getCookie().contactsListFullView); + }); + $('.validation-action').click(function(e) { e.preventDefault(); var $action = $(this); @@ -322,10 +330,8 @@ </div> </s:set> -<s:set var="fullView" value="%{fullView}"/> - <div class="sticky-buttons"> - <button type="button" id="switch-compact-full-view" class="btn <s:if test="fullView">full-view</s:if><s:else>compact-view</s:else>"> + <button type="button" id="switch-compact-full-view" class="btn"> <span class="only-in-compact-view"> <i class="fa fa-expand"></i><span class="only-on-hover"> <s:text name="wao.ui.action.switchToFullView" /></span> </span> @@ -338,7 +344,7 @@ <s:property value="#pagination" escapeHtml="false"/> -<table id="contacts-list" class="contacts-list large-table table-striped <s:if test="fullView">full-view</s:if><s:else>compact-view</s:else>"> +<table id="contacts-list" class="contacts-list large-table table-striped"> <thead> <tr> <th><s:text name="wao.ui.field.Contact.creationDate"/></th> Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsvente/sampling-plan.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsvente/sampling-plan.jsp 2014-10-07 08:56:34 UTC (rev 2279) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsvente/sampling-plan.jsp 2014-10-07 09:10:44 UTC (rev 2280) @@ -96,9 +96,12 @@ $('.estimated-differ-from-real').effect( "highlight", "slow" ) }); + var $views = $('#switch-compact-full-view, table.sampling-plan'); + $views.toggleCompactFullView(WAO.getCookie().samplingPlanFullView); + $('#switch-compact-full-view').click(function () { - $('#switch-compact-full-view').toggleClass('full-view').toggleClass('compact-view'); - $('table.sampling-plan').toggleClass('full-view').toggleClass('compact-view'); + WAO.getCookie().samplingPlanFullView = ! WAO.getCookie().samplingPlanFullView; + $views.toggleCompactFullView(WAO.getCookie().samplingPlanFullView); }); }); @@ -162,7 +165,7 @@ </s:form> <div class="sticky-buttons"> - <button type="button" id="switch-compact-full-view" class="btn <s:if test="fullView">full-view</s:if><s:else>compact-view</s:else>"> + <button type="button" id="switch-compact-full-view" class="btn"> <span class="only-in-compact-view"> <i class="fa fa-expand"></i><span class="only-on-hover"> <s:text name="wao.ui.action.switchToFullView" /></span> </span> @@ -184,7 +187,6 @@ </div> <s:set var="estimatedTides" value="true" /> -<s:set var="fullView" value="%{fullView}" /> <s:set var="displayTidesReal" value="true" /> <s:if test="authenticatedWaoUser.authorizedToViewOtherCompanies"> @@ -199,7 +201,7 @@ <s:set var="nbColumnsTotalInFullView" value="%{#nbColumnsForProfessionInFullView + #nbColumnsForMonths + #nbColumnsForOther}" /> <s:set var="nbColumnsTotalInCompactView" value="%{#nbColumnsForProfessionInCompactView + #nbColumnsForMonths + #nbColumnsForOther}" /> - <table id="sampling-plan" class="large-table sampling-plan show-estimated <s:if test="fullView">full-view</s:if><s:else>compact-view</s:else>"> + <table id="sampling-plan" class="large-table sampling-plan show-estimated"> <thead> <tr> <th colspan="<s:property value="#nbColumnsForProfessionInFullView" />" class="only-in-full-view firstline">

1 0