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

r2059 - trunk/wao-services/src/main/java/fr/ifremer/wao/services/service
by bleny＠users.forge.codelutin.com June 17, 2014

June 17, 2014

Author: bleny Date: 2014-06-17 19:14:49 +0200 (Tue, 17 Jun 2014) New Revision: 2059 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2059 Log: fixes #5227 filter on contact creation date Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerBoatsService.java Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerBoatsService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerBoatsService.java 2014-06-17 17:10:10 UTC (rev 2058) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerBoatsService.java 2014-06-17 17:14:49 UTC (rev 2059) @@ -237,7 +237,7 @@ filter.getSampleRowFilter().setObsProgram(authenticatedWaoUser.getObsProgram()); filter.setPeriodFrom(since); filter.getBoatFilter().setBoatIds(ImmutableSet.of(boatId)); - filter.setFilterOnObservationBeginDate(true); + filter.setFilterOnObservationBeginDate(false); ContactTopiaDao dao = getContactDao();

1 0

r2058 - trunk/wao-web/src/main/webapp
by bleny＠users.forge.codelutin.com June 17, 2014

June 17, 2014

Author: bleny Date: 2014-06-17 19:10:10 +0200 (Tue, 17 Jun 2014) New Revision: 2058 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2058 Log: fix js error 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-06-17 17:09:33 UTC (rev 2057) +++ trunk/wao-web/src/main/webapp/wao.js 2014-06-17 17:10:10 UTC (rev 2058) @@ -454,7 +454,9 @@ }; this.unlockSelection = function () { - this.$spinner.spin(false); + if (this.$spinner) { + this.$spinner.spin(false); + } if (this.useSelect2) { this.$select.select2('readonly', false); this.$select.select2('open');

1 0

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

June 17, 2014

Author: bleny Date: 2014-06-17 19:09:33 +0200 (Tue, 17 Jun 2014) New Revision: 2057 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2057 Log: fixes #5213 allow remove elligibility Added: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/UpdateBoatElligibilityJsonAction.java Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ElligibleBoatTopiaDao.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerBoatsService.java trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boat-details.jsp Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ElligibleBoatTopiaDao.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ElligibleBoatTopiaDao.java 2014-06-17 16:01:52 UTC (rev 2056) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ElligibleBoatTopiaDao.java 2014-06-17 17:09:33 UTC (rev 2057) @@ -21,6 +21,8 @@ * #L% */ +import org.nuiton.topia.persistence.TopiaQueryBuilderRunQueryWithUniqueResultStep; + public class ElligibleBoatTopiaDao extends AbstractElligibleBoatTopiaDao<ElligibleBoat> { public ElligibleBoat findUniqueOrNull(Contact contact) { @@ -37,4 +39,9 @@ ElligibleBoat.PROPERTY_SAMPLE_ROW, contact.getSampleRow()); return elligibleBoat; } + + public TopiaQueryBuilderRunQueryWithUniqueResultStep<ElligibleBoat> forBoatIdAndSampleRowId(String boatId, String sampleRowId) { + return newQueryBuilder().addTopiaIdEquals(ElligibleBoat.PROPERTY_BOAT, boatId) + .addTopiaIdEquals(ElligibleBoat.PROPERTY_SAMPLE_ROW, sampleRowId); + } } Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerBoatsService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerBoatsService.java 2014-06-17 16:01:52 UTC (rev 2056) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerBoatsService.java 2014-06-17 17:09:33 UTC (rev 2057) @@ -38,6 +38,8 @@ import fr.ifremer.wao.entity.Contact; import fr.ifremer.wao.entity.ContactState; import fr.ifremer.wao.entity.ContactTopiaDao; +import fr.ifremer.wao.entity.ElligibleBoat; +import fr.ifremer.wao.entity.ElligibleBoatTopiaDao; import fr.ifremer.wao.entity.ObsProgram; import fr.ifremer.wao.services.AuthenticatedWaoUser; import fr.ifremer.wao.services.service.csv.BoatImportExportModel; @@ -269,4 +271,21 @@ return boats.getElements(); } + + public void changeBoatElligibility(AuthenticatedWaoUser authenticatedWaoUser, String boatId, String sampleRowId, boolean active) { + + ElligibleBoatTopiaDao dao = getElligibleBoatDao(); + + ElligibleBoat elligibleBoat = dao.forBoatIdAndSampleRowId(boatId, sampleRowId).findUnique(); + + if (authenticatedWaoUser.isAdmin()) { + elligibleBoat.setGlobalActive(active); + } else if (authenticatedWaoUser.isCoordinatorOrObserver()) { + elligibleBoat.setCompanyActive(active); + } else { + throw new IllegalStateException(authenticatedWaoUser.getWaoUser().toString()); + } + + commit(); + } } Added: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/UpdateBoatElligibilityJsonAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/UpdateBoatElligibilityJsonAction.java (rev 0) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/UpdateBoatElligibilityJsonAction.java 2014-06-17 17:09:33 UTC (rev 2057) @@ -0,0 +1,39 @@ +package fr.ifremer.wao.web.action.obsmer; + +import fr.ifremer.wao.services.service.ObsMerBoatsService; +import fr.ifremer.wao.web.WaoJsonActionSupport; + +public class UpdateBoatElligibilityJsonAction extends WaoJsonActionSupport { + + protected ObsMerBoatsService service; + + protected String boatId; + + protected String sampleRowId; + + protected boolean active; + + public void setService(ObsMerBoatsService service) { + this.service = service; + } + + public void setActive(boolean active) { + this.active = active; + } + + public void setBoatId(String boatId) { + this.boatId = boatId; + } + + public void setSampleRowId(String sampleRowId) { + this.sampleRowId = sampleRowId; + } + + @Override + public String execute() { + + service.changeBoatElligibility(session.getAuthenticatedWaoUser(), boatId, sampleRowId, active); + + return SUCCESS; + } +} Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boat-details.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boat-details.jsp 2014-06-17 16:01:52 UTC (rev 2056) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boat-details.jsp 2014-06-17 17:09:33 UTC (rev 2057) @@ -96,6 +96,19 @@ } }); + // suppresssion d'une éligibilité + $('.remove-boat-eligibility').click(function (e) { + e.preventDefault(); + if (confirm("<s:text name="wao.ui.removeBoatEligibility.confirm"/>")) { + var url = $(this).attr('href'); + var $toRemove = $(this).parents('li, div') + var successCallback = function (data) { + $toRemove.remove(); + }; + WAO.post(url, {}, successCallback); + } + }); + }); </script> @@ -185,8 +198,32 @@ <s:hidden name="boatId" value="%{boatDetails.boatInfos.boat.topiaId}"/> - <s:radio name="sampleRowId" list="boatDetails.elligibleForSampleRows" listKey="topiaId" listValue="code" /> + <div class="control-group"> + <div class="controls"> + <s:iterator value="boatDetails.elligibleForSampleRows" status="status"> + <div> + <s:set name="radioId">radio-<s:property value="#status.index"/></s:set> + <input type="radio" name="sampleRowId" id="<s:property value="#radioId"/>" value="<s:property value="topiaId"/>"/> + <%-- + <label for="<s:property value="%{#radioId}"/>" class="radio"> + <s:property value="code"/> + </label> + --%> + <s:property value="code"/> + <s:url action="update-boat-elligibility-json" id="updateBoatElligibilityUrl"> + <s:param name="boatId" value="boatDetails.boatInfos.boat.topiaId"/> + <s:param name="sampleRowId" value="topiaId"/> + <s:param name="active" value="false"/> + </s:url> + <s:a href="%{updateBoatElligibilityUrl}" cssClass="btn btn-link remove-boat-eligibility"> + <i class="icon-remove"></i> + </s:a> + </div> + </s:iterator> + </div> + </div> + <s:submit id="createContactFromBoatButton" type="button" cssClass="btn btn-success" disabled="true"> <i class="icon-plus"></i> <s:text name="wao.ui.contacts.createFromBoat"/> @@ -198,6 +235,14 @@ <s:iterator value="boatDetails.elligibleForSampleRows"> <li> <s:property value="code"/> + <s:url action="update-boat-elligibility-json" id="updateBoatElligibilityUrl"> + <s:param name="boatId" value="boatDetails.boatInfos.boat.topiaId"/> + <s:param name="sampleRowId" value="topiaId"/> + <s:param name="active" value="false"/> + </s:url> + <s:a href="%{updateBoatElligibilityUrl}" cssClass="btn btn-link remove-boat-eligibility"> + <i class="icon-remove"></i> + </s:a> </li> </s:iterator> </ul>

1 0

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

June 17, 2014

Author: bleny Date: 2014-06-17 18:01:52 +0200 (Tue, 17 Jun 2014) New Revision: 2056 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2056 Log: fixes #5188 review observationTimeInDays Added: trunk/wao-persistence/src/test/java/fr/ifremer/wao/entity/ContactImplTest.java Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactImpl.java Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactImpl.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactImpl.java 2014-06-17 15:33:09 UTC (rev 2055) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactImpl.java 2014-06-17 16:01:52 UTC (rev 2056) @@ -26,8 +26,10 @@ import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.time.DateUtils; import org.nuiton.util.DateUtil; +import java.util.Calendar; import java.util.Date; import java.util.LinkedList; import java.util.List; @@ -232,7 +234,9 @@ Integer observationTimeInDays = null; if (getObservationBeginDate() != null && getObservationEndDate() != null) { // +1 car demandé par le métier - observationTimeInDays = DateUtil.getDifferenceInDays(getObservationBeginDate(), getObservationEndDate()) + 1; + observationTimeInDays = DateUtil.getDifferenceInDays( + DateUtils.truncate(getObservationBeginDate(), Calendar.DAY_OF_MONTH), + DateUtils.truncate(getObservationEndDate(), Calendar.DAY_OF_MONTH)) + 1; } return observationTimeInDays; } Added: trunk/wao-persistence/src/test/java/fr/ifremer/wao/entity/ContactImplTest.java =================================================================== --- trunk/wao-persistence/src/test/java/fr/ifremer/wao/entity/ContactImplTest.java (rev 0) +++ trunk/wao-persistence/src/test/java/fr/ifremer/wao/entity/ContactImplTest.java 2014-06-17 16:01:52 UTC (rev 2056) @@ -0,0 +1,31 @@ +package fr.ifremer.wao.entity; + +import org.junit.Assert; +import org.junit.Test; +import org.nuiton.util.DateUtil; + +import java.util.Date; + +public class ContactImplTest { + + @Test + public void testGetObservationTimeInDays() { + + checkObservationTimeInDays(DateUtil.createDate(0, 0, 8, 19, 05, 2014), DateUtil.createDate(0, 0, 18, 19, 05, 2014), 1); + checkObservationTimeInDays(DateUtil.createDate(0, 0, 18, 19, 05, 2014), DateUtil.createDate(0, 0, 6, 20, 05, 2014), 2); + checkObservationTimeInDays(DateUtil.createDate(0, 0, 1, 19, 05, 2014), DateUtil.createDate(0, 0, 23, 20, 05, 2014), 2); + + } + + public void checkObservationTimeInDays(Date observationBeginDate, Date observationEndDate, int expectedObservationTimeInDays) { + + ContactImpl contact = new ContactImpl(); + contact.setObservationBeginDate(observationBeginDate); + contact.setObservationEndDate(observationEndDate); + + Integer actualObservationTimeInDays = contact.getObservationTimeInDays(); + Assert.assertEquals((Integer) expectedObservationTimeInDays, actualObservationTimeInDays); + + } + +} \ No newline at end of file

1 0

r2055 - trunk/wao-services/src/test/java/fr/ifremer/wao/services
by bleny＠users.forge.codelutin.com June 17, 2014

June 17, 2014

Author: bleny Date: 2014-06-17 17:33:09 +0200 (Tue, 17 Jun 2014) New Revision: 2055 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2055 Log: fix build Modified: trunk/wao-services/src/test/java/fr/ifremer/wao/services/FakeWaoApplicationContext.java Modified: trunk/wao-services/src/test/java/fr/ifremer/wao/services/FakeWaoApplicationContext.java =================================================================== --- trunk/wao-services/src/test/java/fr/ifremer/wao/services/FakeWaoApplicationContext.java 2014-06-17 15:18:33 UTC (rev 2054) +++ trunk/wao-services/src/test/java/fr/ifremer/wao/services/FakeWaoApplicationContext.java 2014-06-17 15:33:09 UTC (rev 2055) @@ -162,7 +162,6 @@ hibernateH2Config.put(Environment.DIALECT, org.hibernate.dialect.H2Dialect.class.getName()); hibernateH2Config.put(Environment.USER, "sa"); hibernateH2Config.put(Environment.PASS, ""); - hibernateH2Config.put(Environment.HBM2DDL_AUTO, "update"); // TODO BLeNy 11/06/14 Remove when supported by ToPIA File databaseFile = getDatabaseFile(context);

1 0

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

June 17, 2014

Author: bleny Date: 2014-06-17 17:18:33 +0200 (Tue, 17 Jun 2014) New Revision: 2054 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2054 Log: fixes #5254 add tooltip Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoInterceptor.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/obsmer/contacts.jsp trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/synthesis.jsp Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoInterceptor.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoInterceptor.java 2014-06-17 14:17:56 UTC (rev 2053) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoInterceptor.java 2014-06-17 15:18:33 UTC (rev 2054) @@ -167,6 +167,13 @@ return invocation.invoke(); + } catch (java.lang.OutOfMemoryError e) { + + if (log.isErrorEnabled()) { + log.error("", e); + } + throw e; + } finally { serviceContext.getPersistenceContext().close(); Modified: trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties =================================================================== --- trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-06-17 14:17:56 UTC (rev 2053) +++ trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-06-17 15:18:33 UTC (rev 2054) @@ -345,6 +345,7 @@ wao.ui.form.estimatedTides=View estimated effort wao.ui.form.estimatedTides.description=The estimated observation effort is the number of contact that are validated by the company or not. Contacts refused by program are ignored. wao.ui.form.filterOnObservationBeginDate=Filter contacts on the observation begin date +wao.ui.form.filterOnObservationBeginDate.tooltip=By default, the application filter on the date of the contact creation. By checking this box, the filter will apply on observation begin date. Thus, only contacts with an observation begin date will be considered. wao.ui.form.generatePassword=Generate password wao.ui.form.mapType=Map wao.ui.form.otherBoatInfos=Other boat infos Modified: trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties =================================================================== --- trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-06-17 14:17:56 UTC (rev 2053) +++ trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-06-17 15:18:33 UTC (rev 2054) @@ -345,6 +345,7 @@ wao.ui.form.estimatedTides=Voir l'effort d'observations estimé wao.ui.form.estimatedTides.description=L'effort d'observations estimé équivaut au nombre de contacts validés ou non par la société. Les contacts refusés par le programme ne sont pas pris en compte. wao.ui.form.filterOnObservationBeginDate=Filtrer selon la date de début d'observation +wao.ui.form.filterOnObservationBeginDate.tooltip=Par défaut, l'application filtre selon les dates de création des contacts en cochant cette option l'application va filtrer sur la date de début d'observation, de fait seuls les contacts dans l'état Observation réalisée sont pris en compte. wao.ui.form.generatePassword=Générer le mot de passe wao.ui.form.mapType=Carte wao.ui.form.otherBoatInfos=Autres informations sur le navire Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp 2014-06-17 14:17:56 UTC (rev 2053) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp 2014-06-17 15:18:33 UTC (rev 2054) @@ -179,8 +179,10 @@ placeholder="%{getFilterPeriodToPlaceholder()}" cssClass="input-small"/> - <s:checkbox name="filter.filterOnObservationBeginDate" - label="%{getText('wao.ui.form.filterOnObservationBeginDate')}"/> + <div title="<s:text name="wao.ui.form.filterOnObservationBeginDate.tooltip"/>"> + <s:checkbox name="filter.filterOnObservationBeginDate" + label="%{getText('wao.ui.form.filterOnObservationBeginDate')}"/> + </div> </fieldset> Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/synthesis.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/synthesis.jsp 2014-06-17 14:17:56 UTC (rev 2053) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/synthesis.jsp 2014-06-17 15:18:33 UTC (rev 2054) @@ -118,8 +118,10 @@ placeholder="%{getFilterPeriodToPlaceholder()}" cssClass="input-small"/> - <s:checkbox name="filter.filterOnObservationBeginDate" - label="%{getText('wao.ui.form.filterOnObservationBeginDate')}"/> + <div title="<s:text name="wao.ui.form.filterOnObservationBeginDate.tooltip"/>"> + <s:checkbox name="filter.filterOnObservationBeginDate" + label="%{getText('wao.ui.form.filterOnObservationBeginDate')}"/> + </div> </fieldset>

1 0

r2053 - trunk/wao-web/src/main/webapp
by bleny＠users.forge.codelutin.com June 17, 2014

June 17, 2014

Author: bleny Date: 2014-06-17 16:17:56 +0200 (Tue, 17 Jun 2014) New Revision: 2053 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2053 Log: fixes #5215 show active filters with a color Modified: trunk/wao-web/src/main/webapp/wao.css trunk/wao-web/src/main/webapp/wao.js Modified: trunk/wao-web/src/main/webapp/wao.css =================================================================== --- trunk/wao-web/src/main/webapp/wao.css 2014-06-17 14:04:52 UTC (rev 2052) +++ trunk/wao-web/src/main/webapp/wao.css 2014-06-17 14:17:56 UTC (rev 2053) @@ -423,6 +423,10 @@ padding: 0 5px; } +.active-filter label { + font-weight: bold; + color: #008a8a; +} /** * Les boutons Modified: trunk/wao-web/src/main/webapp/wao.js =================================================================== --- trunk/wao-web/src/main/webapp/wao.js 2014-06-17 14:04:52 UTC (rev 2052) +++ trunk/wao-web/src/main/webapp/wao.js 2014-06-17 14:17:56 UTC (rev 2053) @@ -485,7 +485,9 @@ self.$selectedOptionsContainer.empty(); if (selectedOptions.length === 0) { self.$selectedOptionsContainer.append("Pas de filtrage"); + self.$container.removeClass("active-filter"); } else { + self.$container.addClass("active-filter"); var $ul = $('<ul></ul>'); $.each(selectedOptions, function (index, selectedOption) { $ul.append('<li>' + selectedOption.label + '</li>');

1 0

r2052 - trunk/wao-web/src/main/webapp
by bleny＠users.forge.codelutin.com June 17, 2014

June 17, 2014

Author: bleny Date: 2014-06-17 16:04:52 +0200 (Tue, 17 Jun 2014) New Revision: 2052 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2052 Log: fixes #5229 add spinner 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-06-17 13:56:52 UTC (rev 2051) +++ trunk/wao-web/src/main/webapp/wao.js 2014-06-17 14:04:52 UTC (rev 2052) @@ -441,6 +441,11 @@ }; this.lockSelection = function () { + if ( ! this.$spinner) { + this.$spinner = this.$container.spin(); + } else { + this.$spinner.spin(); + } if (this.useSelect2) { this.$select.select2('readonly', true); } else { @@ -449,6 +454,7 @@ }; this.unlockSelection = function () { + this.$spinner.spin(false); if (this.useSelect2) { this.$select.select2('readonly', false); this.$select.select2('open');

1 0

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

June 17, 2014

Author: bleny Date: 2014-06-17 15:56:52 +0200 (Tue, 17 Jun 2014) New Revision: 2051 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2051 Log: fixes #5240 Modified: trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties Modified: trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties =================================================================== --- trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-06-17 13:29:17 UTC (rev 2050) +++ trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-06-17 13:56:52 UTC (rev 2051) @@ -1,6 +1,10 @@ fr.ifremer.wao.services.service.ReferentialState.lastUpdate=Last update fr.ifremer.wao.services.service.ReferentialState.referentialName=Referential fr.ifremer.wao.services.service.ReferentialState.size=Lines count +invalid.fieldvalue.updateContactCommand.contact.dataInputDate=Expected date format is dd-MM-yyyy +invalid.fieldvalue.updateContactCommand.contact.observationBeginDate=Expected date format is dd-MM-yyyy HH\:mm +invalid.fieldvalue.updateContactCommand.contact.observationEndDate=Expected date format is dd-MM-yyyy HH\:mm +invalid.fieldvalue.updateContactCommand.contact.restitution=Expected date format is dd-MM-yyyy wao.import.boatGroups.prompt=Import boats wao.import.boatGroups.success=Import boats successful wao.import.boats.prompt=Import boat groups Modified: trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties =================================================================== --- trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-06-17 13:29:17 UTC (rev 2050) +++ trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-06-17 13:56:52 UTC (rev 2051) @@ -1,6 +1,10 @@ fr.ifremer.wao.services.service.administration.ReferentialState.lastUpdate=Date de dernière mise à jour fr.ifremer.wao.services.service.administration.ReferentialState.referentialName=Référentiel fr.ifremer.wao.services.service.administration.ReferentialState.size=Nombre de lignes en base +invalid.fieldvalue.updateContactCommand.contact.dataInputDate=Le format attendu de la date est jj/mm/aaaa +invalid.fieldvalue.updateContactCommand.contact.observationBeginDate=Le format attendu de la date est jj/mm/aaaa hh\:mm +invalid.fieldvalue.updateContactCommand.contact.observationEndDate=Le format attendu de la date est jj/mm/aaaa hh\:mm +invalid.fieldvalue.updateContactCommand.contact.restitution=Le format attendu de la date est jj/mm/aaaa wao.import.boatGroups.prompt=Import des flotilles wao.import.boatGroups.success=Import des flotilles réalisé avec succès wao.import.boats.prompt=Import des navires

1 0

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

June 17, 2014

Author: bleny Date: 2014-06-17 15:29:17 +0200 (Tue, 17 Jun 2014) New Revision: 2050 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2050 Log: fixes #5252 review filter reseting Removed: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ResetBoatsFilterAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ResetContactsFilterAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ResetSampleRowsFilterAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ResetSynthesisFilterAction.java Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/BoatsAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ContactsAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/SamplingPlanAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/SynthesisAction.java trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boats.jsp trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/synthesis.jsp Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/BoatsAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/BoatsAction.java 2014-06-17 13:01:12 UTC (rev 2049) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/BoatsAction.java 2014-06-17 13:29:17 UTC (rev 2050) @@ -120,13 +120,11 @@ @Override public void prepare() { - filter = getSession().getBoatsFilter(); if (filter == null) { filter = service.newBoatsFilter(getAuthenticatedWaoUser()); getSession().setBoatsFilter(filter); } - if (StringUtils.isNotBlank(startBoatSelectionForSampleRowId)) { session.setStartBoatSelectionForSampleRowId(startBoatSelectionForSampleRowId); @@ -148,6 +146,23 @@ @Override public String execute() { + filter = getSession().getBoatsFilter(); + + return applyFilter(); + + } + + public String resetFilter() { + + filter = service.newBoatsFilter(getAuthenticatedWaoUser()); + getSession().setBoatsFilter(filter); + + return applyFilter(); + + } + + public String applyFilter() { + PaginationParameter pager = service.newBoatsPaginationParameter(pageNumber, 25); boatList = service.getBoatsList(getAuthenticatedWaoUser(), filter, pager); @@ -155,6 +170,7 @@ lastRangePage = getPaginationLastPage(boatList.getBoats(), 10, firstRangePage); return SUCCESS; + } public SampleRow getStartBoatSelectionForSampleRow() { Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ContactsAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ContactsAction.java 2014-06-17 13:01:12 UTC (rev 2049) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ContactsAction.java 2014-06-17 13:29:17 UTC (rev 2050) @@ -108,7 +108,6 @@ @Override public void prepare() { - filter = getSession().getContactsFilter(); if (filter == null) { filter = service.newContactFilter(getAuthenticatedWaoUser()); getSession().setContactsFilter(filter); @@ -119,6 +118,22 @@ @Override public String execute() { + filter = getSession().getContactsFilter(); + + return applyFilter(); + + } + + public String resetFilter() { + + filter = service.newContactFilter(getAuthenticatedWaoUser()); + getSession().setContactsFilter(filter); + + return applyFilter(); + + } + + public String applyFilter() { PaginationParameter pager = service.newContactsPaginationParameter(pageNumber, 25); contactsList = service.getContactsList(getAuthenticatedWaoUser(), filter, pager); Deleted: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ResetBoatsFilterAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ResetBoatsFilterAction.java 2014-06-17 13:01:12 UTC (rev 2049) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ResetBoatsFilterAction.java 2014-06-17 13:29:17 UTC (rev 2050) @@ -1,46 +0,0 @@ -package fr.ifremer.wao.web.action.obsmer; - -/* - * #%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% - */ - -import fr.ifremer.wao.web.WaoJspActionSupport; -import org.apache.struts2.convention.annotation.Result; -import org.apache.struts2.convention.annotation.Results; - -/** - * Created on 4/15/14. - * - * @author Tony Chemit <chemit(a)codelutin.com> - * @since 4.0 - */ -@Results({@Result(name = WaoJspActionSupport.SUCCESS, type = "redirectAction", params = {"actionName", "boats"})}) -public class ResetBoatsFilterAction extends WaoJspActionSupport { - - private static final long serialVersionUID = 1L; - - @Override - public String execute() { - - // clean boats filter from session - getSession().setBoatsFilter(null); - return SUCCESS; - } -} Deleted: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ResetContactsFilterAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ResetContactsFilterAction.java 2014-06-17 13:01:12 UTC (rev 2049) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ResetContactsFilterAction.java 2014-06-17 13:29:17 UTC (rev 2050) @@ -1,46 +0,0 @@ -package fr.ifremer.wao.web.action.obsmer; - -/* - * #%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% - */ - -import fr.ifremer.wao.web.WaoJspActionSupport; -import org.apache.struts2.convention.annotation.Result; -import org.apache.struts2.convention.annotation.Results; - -/** - * Created on 4/15/14. - * - * @author Tony Chemit <chemit(a)codelutin.com> - * @since 4.0 - */ -@Results({@Result(name = WaoJspActionSupport.SUCCESS, type = "redirectAction", params = {"actionName", "contacts"})}) -public class ResetContactsFilterAction extends WaoJspActionSupport { - - private static final long serialVersionUID = 1L; - - @Override - public String execute() { - - // clean contacts filter from session - getSession().setContactsFilter(null); - return SUCCESS; - } -} Deleted: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ResetSampleRowsFilterAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ResetSampleRowsFilterAction.java 2014-06-17 13:01:12 UTC (rev 2049) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ResetSampleRowsFilterAction.java 2014-06-17 13:29:17 UTC (rev 2050) @@ -1,46 +0,0 @@ -package fr.ifremer.wao.web.action.obsmer; - -/* - * #%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% - */ - -import fr.ifremer.wao.web.WaoJspActionSupport; -import org.apache.struts2.convention.annotation.Result; -import org.apache.struts2.convention.annotation.Results; - -/** - * Created on 4/15/14. - * - * @author Tony Chemit <chemit(a)codelutin.com> - * @since 4.0 - */ -@Results({@Result(name = WaoJspActionSupport.SUCCESS, type = "redirectAction", params = {"actionName", "sampling-plan"})}) -public class ResetSampleRowsFilterAction extends WaoJspActionSupport { - - private static final long serialVersionUID = 1L; - - @Override - public String execute() { - - // clean sampling plan filter from session - getSession().setSampleRowsFilter(null); - return SUCCESS; - } -} Deleted: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ResetSynthesisFilterAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ResetSynthesisFilterAction.java 2014-06-17 13:01:12 UTC (rev 2049) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ResetSynthesisFilterAction.java 2014-06-17 13:29:17 UTC (rev 2050) @@ -1,40 +0,0 @@ -package fr.ifremer.wao.web.action.obsmer; - -/* - * #%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% - */ - -import fr.ifremer.wao.web.WaoJspActionSupport; -import org.apache.struts2.convention.annotation.Result; -import org.apache.struts2.convention.annotation.Results; - -@Results({@Result(name = WaoJspActionSupport.SUCCESS, type = "redirectAction", params = {"actionName", "synthesis"})}) -public class ResetSynthesisFilterAction extends WaoJspActionSupport { - - private static final long serialVersionUID = 1L; - - @Override - public String execute() { - - // clean sampling plan filter from session - getSession().setSynthesisFilter(null); - return SUCCESS; - } -} Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/SamplingPlanAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/SamplingPlanAction.java 2014-06-17 13:01:12 UTC (rev 2049) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/SamplingPlanAction.java 2014-06-17 13:29:17 UTC (rev 2050) @@ -56,9 +56,7 @@ @Override public void prepare() { - filter = getSession().getSampleRowsFilter(); if (filter == null) { - filter = service.newSampleRowsFilter(getAuthenticatedWaoUser()); getSession().setSampleRowsFilter(filter); } @@ -68,9 +66,28 @@ @Override public String execute() { + filter = getSession().getSampleRowsFilter(); + + return applyFilter(); + + } + + public String resetFilter() { + + filter = service.newSampleRowsFilter(getAuthenticatedWaoUser()); + + getSession().setSampleRowsFilter(filter); + + return applyFilter(); + + } + + public String applyFilter() { + samplingPlan = service.getSamplingPlan(getAuthenticatedWaoUser(), filter); return SUCCESS; + } public ObsMerSamplingPlan getSamplingPlan() { Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/SynthesisAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/SynthesisAction.java 2014-06-17 13:01:12 UTC (rev 2049) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/SynthesisAction.java 2014-06-17 13:29:17 UTC (rev 2050) @@ -28,7 +28,6 @@ @Override public void prepare() { - filter = getSession().getSynthesisFilter(); if (filter == null) { filter = service.newFilter(getAuthenticatedWaoUser()); getSession().setSynthesisFilter(filter); @@ -39,10 +38,25 @@ @Override public String execute() { + filter = getSession().getSynthesisFilter(); + + return applyFilter(); + + } + + public String resetFilter() { + + filter = service.newFilter(getAuthenticatedWaoUser()); + getSession().setSynthesisFilter(filter); + + return applyFilter(); + + } + + public String applyFilter() { synthesis = service.getObsMerSynthesis(filter); return SUCCESS; - } public ObsMerSynthesis getSynthesis() { Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boats.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boats.jsp 2014-06-17 13:01:12 UTC (rev 2049) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boats.jsp 2014-06-17 13:29:17 UTC (rev 2050) @@ -147,14 +147,13 @@ <div class="form-actions"> - <s:submit type="button" cssClass="btn btn-primary"> + <s:submit type="button" action="boats!applyFilter" cssClass="btn btn-primary"> <i class="icon-filter"></i> <s:text name="wao.ui.action.filter"/> </s:submit> - <s:url action="reset-boats-filter" id="resetFilterUrl" /> - <s:a href="%{resetFilterUrl}" cssClass="btn"> + <s:submit type="button" action="boats!resetFilter" cssClass="btn"> <i class="icon-trash"></i> <s:text name="wao.ui.action.reset"/> - </s:a> + </s:submit> <s:submit action="export-boats" type="button" cssClass="btn"> <i class="icon-download"></i> <s:text name="wao.ui.action.csvExport"/> Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp 2014-06-17 13:01:12 UTC (rev 2049) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp 2014-06-17 13:29:17 UTC (rev 2050) @@ -216,14 +216,13 @@ <div class="form-actions"> - <s:submit type="button" cssClass="btn btn-primary"> + <s:submit type="button" action="contacts!applyFilter" cssClass="btn btn-primary"> <i class="icon-filter"></i> <s:text name="wao.ui.action.filter"/> </s:submit> - <s:url action="reset-contacts-filter" id="resetFilterUrl" /> - <s:a href="%{resetFilterUrl}" cssClass="btn"> + <s:submit type="button" action="contacts!resetFilter" cssClass="btn"> <i class="icon-trash"></i> <s:text name="wao.ui.action.reset"/> - </s:a> + </s:submit> <s:if test="authenticatedWaoUser.authorizedToExportContacts"> <s:submit action="export-contacts" type="button" cssClass="btn"> Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 2014-06-17 13:01:12 UTC (rev 2049) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 2014-06-17 13:29:17 UTC (rev 2050) @@ -133,14 +133,13 @@ <div class="form-actions"> - <s:submit type="button" cssClass="btn btn-primary"> + <s:submit type="button" action="sampling-plan!applyFilter" cssClass="btn btn-primary"> <i class="icon-filter"></i> <s:text name="wao.ui.action.filter" /> </s:submit> - <s:url action="reset-sample-rows-filter" id="resetFilterUrl" /> - <s:a href="%{resetFilterUrl}" cssClass="btn"> + <s:submit type="button" action="sampling-plan!resetFilter" cssClass="btn"> <i class="icon-trash"></i> <s:text name="wao.ui.action.reset"/> - </s:a> + </s:submit> <s:submit action="export-sampling-plan" type="button" cssClass="btn"> <i class="icon-download"></i> <s:text name="wao.ui.action.csvExport" /> Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/synthesis.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/synthesis.jsp 2014-06-17 13:01:12 UTC (rev 2049) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/synthesis.jsp 2014-06-17 13:29:17 UTC (rev 2050) @@ -151,14 +151,13 @@ <div class="form-actions"> - <s:submit type="button" cssClass="btn btn-primary"> + <s:submit type="button" action="synthesis!applyFilter" cssClass="btn btn-primary"> <i class="icon-filter"></i> <s:text name="wao.ui.action.filter"/> </s:submit> - <s:url action="reset-synthesis-filter" id="resetFilterUrl" /> - <s:a href="%{resetFilterUrl}" cssClass="btn"> + <s:submit type="button" action="synthesis!resetFilter" cssClass="btn"> <i class="icon-trash"></i> <s:text name="wao.ui.action.reset"/> - </s:a> + </s:submit> </div>

1 0