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

r2269 - branches/wao-4.1.x
by bleny＠users.forge.codelutin.com 06 Oct '14

06 Oct '14

Author: bleny Date: 2014-10-06 10:40:48 +0200 (Mon, 06 Oct 2014) New Revision: 2269 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2269 Log: Mise ?\195?\160 jour du pom pour la branche 4.1.x Modified: branches/wao-4.1.x/pom.xml Modified: branches/wao-4.1.x/pom.xml =================================================================== --- branches/wao-4.1.x/pom.xml 2014-10-06 08:33:42 UTC (rev 2268) +++ branches/wao-4.1.x/pom.xml 2014-10-06 08:40:48 UTC (rev 2269) @@ -86,9 +86,9 @@ </modules> <scm> - <connection>scm:svn:http://svn.codelutin.com/wao/trunk</connection> - <developerConnection>scm:svn:https://svn.codelutin.com/wao/trunk</developerConnection> - <url>https://forge.codelutin.com/repositories/browse/wao/trunk</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>

1 0

r2268 - in branches: . wao-4.1.x
by bleny＠users.forge.codelutin.com 06 Oct '14

06 Oct '14

Author: bleny Date: 2014-10-06 10:33:42 +0200 (Mon, 06 Oct 2014) New Revision: 2268 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2268 Log: Cr?\195?\169ation d'une branche 4.1.x Added: branches/wao-4.1.x/ Property changes on: branches/wao-4.1.x ___________________________________________________________________ Added: svn:mergeinfo + /branches/wao-4.0-obsvente:2075-2085 /branches/wao-4.0.x:2169-2256 Added: svn:ignore + *.idea *.iml target atlassian-ide-plugin.xml

1 0

r2267 - in branches/wao-4.0.x: 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/webapp/WEB-INF/content
by bleny＠users.forge.codelutin.com 02 Oct '14

02 Oct '14

Author: bleny Date: 2014-10-02 15:29:03 +0200 (Thu, 02 Oct 2014) New Revision: 2267 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2267 Log: On permet de modifier le lieu d'observation dans le formulaire de modification d'une du plan ObsVente (fixes #5832) Modified: branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlanService.java branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/UpdateSampleRowCommand.java branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/ReferentialService.java branches/wao-4.0.x/wao-web/src/main/webapp/WEB-INF/content/edit-sample-row-input.jsp Modified: branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlanService.java =================================================================== --- branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlanService.java 2014-10-02 12:36:59 UTC (rev 2266) +++ branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlanService.java 2014-10-02 13:29:03 UTC (rev 2267) @@ -360,6 +360,13 @@ ); updateSampleRowCommand.setAllDcf5Codes(allDcf5Codes); + ImmutableMap<String, TerrestrialLocation> allTerrestrialDistricts = + Maps.uniqueIndex( + getReferentialService().getAllTerrestrialDistricts(), + TopiaEntities.getTopiaIdFunction() + ); + updateSampleRowCommand.setAllTerrestrialDistricts(allTerrestrialDistricts); + return updateSampleRowCommand; } Modified: branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/UpdateSampleRowCommand.java =================================================================== --- branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/UpdateSampleRowCommand.java 2014-10-02 12:36:59 UTC (rev 2266) +++ branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/UpdateSampleRowCommand.java 2014-10-02 13:29:03 UTC (rev 2267) @@ -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; @@ -64,6 +68,8 @@ protected ImmutableMap<String, DCF5Code> allDcf5Codes; + protected ImmutableMap<String, TerrestrialLocation> allTerrestrialDistricts; + protected String elligibleBoatImmatriculations; /** @@ -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); @@ -202,6 +218,14 @@ this.allDcf5Codes = allDcf5Codes; } + public ImmutableMap<String, TerrestrialLocation> getAllTerrestrialDistricts() { + return allTerrestrialDistricts; + } + + public void setAllTerrestrialDistricts(ImmutableMap<String, TerrestrialLocation> allTerrestrialDistricts) { + this.allTerrestrialDistricts = allTerrestrialDistricts; + } + public String getElligibleBoatImmatriculations() { return elligibleBoatImmatriculations; } Modified: branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/ReferentialService.java =================================================================== --- branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/ReferentialService.java 2014-10-02 12:36:59 UTC (rev 2266) +++ branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/ReferentialService.java 2014-10-02 13:29:03 UTC (rev 2267) @@ -1155,4 +1155,11 @@ } + public List<TerrestrialLocation> getAllTerrestrialDistricts() { + + List<TerrestrialLocation> allTerrestialDistricts = getTerrestrialLocationDao().forLocationTypeEquals(LocationType.DISTRICT).findAll(); + + return allTerrestialDistricts; + + } } Modified: branches/wao-4.0.x/wao-web/src/main/webapp/WEB-INF/content/edit-sample-row-input.jsp =================================================================== --- branches/wao-4.0.x/wao-web/src/main/webapp/WEB-INF/content/edit-sample-row-input.jsp 2014-10-02 12:36:59 UTC (rev 2266) +++ branches/wao-4.0.x/wao-web/src/main/webapp/WEB-INF/content/edit-sample-row-input.jsp 2014-10-02 13:29:03 UTC (rev 2267) @@ -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>

1 0

r2266 - in branches/wao-4.0.x: wao-persistence/src/main/java/fr/ifremer/wao/entity wao-services/src/main/java/fr/ifremer/wao/services/service/administration
by bleny＠users.forge.codelutin.com 02 Oct '14

02 Oct '14

Author: bleny Date: 2014-10-02 14:36:59 +0200 (Thu, 02 Oct 2014) New Revision: 2266 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2266 Log: am?\195?\169lioration de ReferentialService#getTerrestrialLocationInDistricts Modified: branches/wao-4.0.x/wao-persistence/src/main/java/fr/ifremer/wao/entity/TerrestrialLocations.java branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/ReferentialService.java Modified: branches/wao-4.0.x/wao-persistence/src/main/java/fr/ifremer/wao/entity/TerrestrialLocations.java =================================================================== --- branches/wao-4.0.x/wao-persistence/src/main/java/fr/ifremer/wao/entity/TerrestrialLocations.java 2014-10-01 09:14:11 UTC (rev 2265) +++ branches/wao-4.0.x/wao-persistence/src/main/java/fr/ifremer/wao/entity/TerrestrialLocations.java 2014-10-02 12:36:59 UTC (rev 2266) @@ -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: branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/ReferentialService.java =================================================================== --- branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/ReferentialService.java 2014-10-01 09:14:11 UTC (rev 2265) +++ branches/wao-4.0.x/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/ReferentialService.java 2014-10-02 12:36:59 UTC (rev 2266) @@ -27,7 +27,9 @@ 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.Iterables; import fr.ifremer.wao.WaoTechnicalException; import fr.ifremer.wao.entity.Boat; import fr.ifremer.wao.entity.BoatGroup; @@ -67,6 +69,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.BoatGroupImportModel; @@ -1134,15 +1137,19 @@ 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;

1 0

r2265 - branches/wao-4.0.x/wao-web/src/main/webapp
by bleny＠users.forge.codelutin.com 01 Oct '14

01 Oct '14

Author: bleny Date: 2014-10-01 11:14:11 +0200 (Wed, 01 Oct 2014) New Revision: 2265 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2265 Log: Ajout d'un peu d'espace ?\195?\170tre la derni?\195?\168re news et le pied de page (fixes #5864) Modified: branches/wao-4.0.x/wao-web/src/main/webapp/wao.css Modified: branches/wao-4.0.x/wao-web/src/main/webapp/wao.css =================================================================== --- branches/wao-4.0.x/wao-web/src/main/webapp/wao.css 2014-09-30 17:01:19 UTC (rev 2264) +++ branches/wao-4.0.x/wao-web/src/main/webapp/wao.css 2014-10-01 09:14:11 UTC (rev 2265) @@ -748,6 +748,10 @@ /** * Accueil */ +main.home { + padding-bottom: 50px; +} + main.home .news { background-color: #fff; padding: 20px 20px 10px 20px;

1 0

r2264 - branches/wao-4.0.x/wao-web/src/main/java/fr/ifremer/wao/web/action
by bleny＠users.forge.codelutin.com 30 Sep '14

30 Sep '14

Author: bleny Date: 2014-09-30 19:01:19 +0200 (Tue, 30 Sep 2014) New Revision: 2264 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2264 Log: Correction du nom du champ en cas de message d'erreur dans le formulaire de contact Modified: branches/wao-4.0.x/wao-web/src/main/java/fr/ifremer/wao/web/action/EditContactAction.java Modified: branches/wao-4.0.x/wao-web/src/main/java/fr/ifremer/wao/web/action/EditContactAction.java =================================================================== --- branches/wao-4.0.x/wao-web/src/main/java/fr/ifremer/wao/web/action/EditContactAction.java 2014-09-30 17:00:41 UTC (rev 2263) +++ branches/wao-4.0.x/wao-web/src/main/java/fr/ifremer/wao/web/action/EditContactAction.java 2014-09-30 17:01:19 UTC (rev 2264) @@ -304,7 +304,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"));

1 0

r2263 - in branches/wao-4.0.x/wao-web/src/main: java/fr/ifremer/wao/web/action resources/i18n
by bleny＠users.forge.codelutin.com 30 Sep '14

30 Sep '14

Author: bleny Date: 2014-09-30 19:00:41 +0200 (Tue, 30 Sep 2014) New Revision: 2263 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2263 Log: On traite l'exception remont?\195?\169e en cas de lieu d'observation manquant par un message d'erreur (fixes #5871) Modified: branches/wao-4.0.x/wao-web/src/main/java/fr/ifremer/wao/web/action/EditContactAction.java branches/wao-4.0.x/wao-web/src/main/resources/i18n/wao-web_en_GB.properties branches/wao-4.0.x/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties Modified: branches/wao-4.0.x/wao-web/src/main/java/fr/ifremer/wao/web/action/EditContactAction.java =================================================================== --- branches/wao-4.0.x/wao-web/src/main/java/fr/ifremer/wao/web/action/EditContactAction.java 2014-09-30 15:59:39 UTC (rev 2262) +++ branches/wao-4.0.x/wao-web/src/main/java/fr/ifremer/wao/web/action/EditContactAction.java 2014-09-30 17:00:41 UTC (rev 2263) @@ -327,7 +327,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: branches/wao-4.0.x/wao-web/src/main/resources/i18n/wao-web_en_GB.properties =================================================================== --- branches/wao-4.0.x/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-09-30 15:59:39 UTC (rev 2262) +++ branches/wao-4.0.x/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-09-30 17:00:41 UTC (rev 2263) @@ -309,6 +309,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 Modified: branches/wao-4.0.x/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties =================================================================== --- branches/wao-4.0.x/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-09-30 15:59:39 UTC (rev 2262) +++ branches/wao-4.0.x/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-09-30 17:00:41 UTC (rev 2263) @@ -309,6 +309,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

1 0

r2262 - in trunk/wao-web/src/main: java/fr/ifremer/wao/web java/fr/ifremer/wao/web/action webapp webapp/WEB-INF/content/obsmer
by bleny＠users.forge.codelutin.com 30 Sep '14

30 Sep '14

Author: bleny Date: 2014-09-30 17:59:39 +0200 (Tue, 30 Sep 2014) New Revision: 2262 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2262 Log: Prototype pour le plan d'?\195?\169chantillonnage ObsMer, on sauve dans un cookie le choix de mode compact/?\195?\169tendu, par contre on a perdu la valeur par d?\195?\169faut (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/AbstractSamplingPlanAction.java trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.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-09-30 08:41:01 UTC (rev 2261) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoJspActionSupport.java 2014-09-30 15:59:39 UTC (rev 2262) @@ -167,4 +167,10 @@ return WaoUtils.isFrench(getLocale()); } + public boolean isSamplingPlanFullView() { + // FIXME brendan 30/09/14 not used + boolean fullView = getAuthenticatedWaoUser().isAdmin() || getAuthenticatedWaoUser().isProfessional(); + return fullView; + } + } Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/AbstractSamplingPlanAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/AbstractSamplingPlanAction.java 2014-09-30 08:41:01 UTC (rev 2261) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/AbstractSamplingPlanAction.java 2014-09-30 15:59:39 UTC (rev 2262) @@ -115,11 +115,6 @@ return filterValues; } - public boolean isFullView() { - boolean fullView = getAuthenticatedWaoUser().isAdmin() || getAuthenticatedWaoUser().isProfessional(); - return fullView; - } - protected SimpleDateFormat dateFormat = new SimpleDateFormat("MM/yyyy"); public boolean isCurrentMonth(Date month) { 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-09-30 08:41:01 UTC (rev 2261) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 2014-09-30 15:59:39 UTC (rev 2262) @@ -86,9 +86,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); }); }); @@ -158,7 +161,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> @@ -180,7 +183,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"> @@ -195,7 +197,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"> Modified: trunk/wao-web/src/main/webapp/wao.js =================================================================== --- trunk/wao-web/src/main/webapp/wao.js 2014-09-30 08:41:01 UTC (rev 2261) +++ trunk/wao-web/src/main/webapp/wao.js 2014-09-30 15:59:39 UTC (rev 2262) @@ -19,6 +19,9 @@ * #L% */ +/* + * Permet d'attacher un évènement à l'appui sur la touche entrée + */ $.fn.enterKey = function (fnc) { return this.each(function () { $(this).keypress(function (e) { @@ -31,6 +34,20 @@ }) } +/* + * Sur un élément permet d'ajouter et de retirer full-view et compact-view + * ou l'inverse selon la valeur de l'argument. + */ +$.fn.toggleCompactFullView = function (fullView) { + return this.each(function () { + if (fullView) { + $(this).addClass('full-view').removeClass('compact-view'); + } else { + $(this).addClass('compact-view').removeClass('full-view'); + } + }) +} + var FilterModel = function (filterValuesUrl) { var self = this; @@ -554,6 +571,7 @@ var self = this; this.notifications = new Notifications(); + this.cookie = null; this.getNestedPropertyValue = function(path, data) { return path.split('.').reduce(function(prev, prop){ @@ -598,13 +616,39 @@ data[parameterName] = parameterValues; }); 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 + self.cookie = $.cookie('wao') || this.newWaoCookie(); + } + return self.cookie; + }; + + this.saveCookie = function () { + if (self.cookie !== null) { + $.cookie('wao', self.cookie); + } } }; $(document).ready(function () { - $.cookie.json = true; + // 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(); @@ -618,4 +662,11 @@ WAO = new Wao(); -}); \ No newline at end of file +}); + +$(window).unload(function() { + + // en quittant la page, on sauvegarde le cookie + WAO.saveCookie(); + +});

1 0

r2261 - trunk/wao-web/src/main/webapp
by bleny＠users.forge.codelutin.com 30 Sep '14

30 Sep '14

Author: bleny Date: 2014-09-30 10:41:01 +0200 (Tue, 30 Sep 2014) New Revision: 2261 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2261 Log: Stockage du cookie en JSON (refs #5746) Modified: trunk/wao-web/src/main/webapp/wao.js Modified: trunk/wao-web/src/main/webapp/wao.js =================================================================== --- trunk/wao-web/src/main/webapp/wao.js 2014-09-15 13:16:37 UTC (rev 2260) +++ trunk/wao-web/src/main/webapp/wao.js 2014-09-30 08:41:01 UTC (rev 2261) @@ -604,7 +604,7 @@ $(document).ready(function () { - // $('select').select2(); + $.cookie.json = true; // $('a[data-toggle="popover"]').popover(); $('span[data-toggle="tooltip"]').tooltip();

1 0

[ANN] - Wao 4.0.12 released
by codelutin.com Release Notification 15 Sep '14

15 Sep '14

The Wao team is pleased to announce the wao-4.0.12 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 News : ne pas afficher les news "société" quand on est connecté en Admin Issue: 5778. Thanks to Vincent BADTS. Resolved by bleny. o Problème d'encodage des caractères dans les emails envoyés suite à une capture accientelles Issue: 5774. Thanks to Vincent BADTS. Resolved by bleny. o Fermeture instantannée du navigateur en cliquant sur « Actions » Issue: 5586. Thanks to Anne-Sophie Cornou. Resolved by ascornou. Changes: o Guide observateur : rédaction Issue: 5777. Thanks to Vincent BADTS. Resolved by vbadts. Downloads --------- For a manual installation, you can download files here: http://forge.codelutin.com/projects/wao/files * wao-4.0.12.war - http://forge.codelutin.com/attachments/download/2279 Maven artifacts --------------- Artifacts are deployed in nuiton maven repository http://maven.nuiton.org/other-releases/ Have fun! -Wao team

1 0