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

r2063 - trunk/wao-web/src/main/java/fr/ifremer/wao/web
by bleny＠users.forge.codelutin.com June 19, 2014

June 19, 2014

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

1 0

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

June 19, 2014

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

1 0

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

June 19, 2014

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

1 0

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

June 18, 2014

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

1 0

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