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

r1922 - trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer
by lkaufmann＠users.forge.codelutin.com May 7, 2014

May 7, 2014

Author: lkaufmann Date: 2014-05-07 10:58:32 +0200 (Wed, 07 May 2014) New Revision: 1922 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1922 Log: Refs #4997 add icon in dropdown menu Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 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-05-07 08:31:44 UTC (rev 1921) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 2014-05-07 08:58:32 UTC (rev 1922) @@ -464,7 +464,7 @@ <s:param name="filter.targetSpeciesDcfIds" value="%{filter.targetSpeciesDcfIds}"/> </s:url> <s:a href="%{sampleRowZoomUrl}"> -  <s:text name="wao.ui.action.zoomOnSampleRowPeriod" /> + <s:text name="wao.ui.action.zoomOnSampleRowPeriod" /> </s:a> </li> <s:if test="elligibleBoatsProvided"> @@ -473,7 +473,7 @@ <s:param name="filter.elligibleForSampleRowsFilter.sampleRowCodes" value="code" /> </s:url> <s:a href="%{viewElligibleBoatsUrl}"> - <s:text name="wao.ui.action.viewElligibleBoats" /> + <s:text name="wao.ui.action.viewElligibleBoats" /> </s:a> </li> </s:if> @@ -484,7 +484,7 @@ <s:param name="filter.periodTo" /> </s:url> <s:a href="%{viewAssociatedContactsUrl}"> - <s:text name="wao.ui.action.viewAssociatedContacts" /> + <s:text name="wao.ui.action.viewAssociatedContacts" /> </s:a> </li> <s:if test="authenticatedWaoUser.authorizedToCreateContact && newContactCreatable">

1 0

r1921 - in trunk/wao-web/src/main/webapp: . WEB-INF/content/obsmer WEB-INF/decorators fonts
by lkaufmann＠users.forge.codelutin.com May 7, 2014

May 7, 2014

Author: lkaufmann Date: 2014-05-07 10:31:44 +0200 (Wed, 07 May 2014) New Revision: 1921 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1921 Log: Refs #4997 Adds Roboto font and update news display Added: trunk/wao-web/src/main/webapp/fonts/Roboto-Black.ttf trunk/wao-web/src/main/webapp/fonts/Roboto-Bold.ttf trunk/wao-web/src/main/webapp/fonts/Roboto-Regular.ttf Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/news.jsp trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp trunk/wao-web/src/main/webapp/wao.css Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/news.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/news.jsp 2014-04-30 16:36:52 UTC (rev 1920) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/news.jsp 2014-05-07 08:31:44 UTC (rev 1921) @@ -64,15 +64,15 @@ <s:url action="delete-news" id="deleteNewsUrl"> <s:param name="newsId" value="topiaId" /> </s:url> - <s:a href="%{deleteNewsUrl}"> - <s:text name="wao.ui.action.delete" /> + <s:a href="%{deleteNewsUrl}" cssClass="btn-delete" title="%{getText('wao.ui.action.delete')}" > + </s:a> <s:url action="edit-news!input" id="editNewsUrl"> <s:param name="newsId" value="topiaId" /> </s:url> - <s:a href="%{editNewsUrl}"> - <s:text name="wao.ui.action.edit" /> + <s:a href="%{editNewsUrl}" cssClass="btn-edit" title="%{getText('wao.ui.action.edit')}"> + </s:a> </s:if> Modified: trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2014-04-30 16:36:52 UTC (rev 1920) +++ trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2014-05-07 08:31:44 UTC (rev 1921) @@ -52,7 +52,7 @@ <div class="navbar"> <div class="navbar-inner"> - <a class="brand" href="#">Wao <s:text name="%{obsProgram.getI18nKey()}"/></a> + <a class="brand" href="#">WAO <s:text name="%{obsProgram.getI18nKey()}"/></a> <%--<a class="brand" href="#">Wao <s:property value="%{getText(#obsProgram.getI18nKey())}" /></a>--%> <ul class="nav"> Added: trunk/wao-web/src/main/webapp/fonts/Roboto-Black.ttf =================================================================== (Binary files differ) Property changes on: trunk/wao-web/src/main/webapp/fonts/Roboto-Black.ttf ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/wao-web/src/main/webapp/fonts/Roboto-Bold.ttf =================================================================== (Binary files differ) Property changes on: trunk/wao-web/src/main/webapp/fonts/Roboto-Bold.ttf ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/wao-web/src/main/webapp/fonts/Roboto-Regular.ttf =================================================================== (Binary files differ) Property changes on: trunk/wao-web/src/main/webapp/fonts/Roboto-Regular.ttf ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/wao-web/src/main/webapp/wao.css =================================================================== --- trunk/wao-web/src/main/webapp/wao.css 2014-04-30 16:36:52 UTC (rev 1920) +++ trunk/wao-web/src/main/webapp/wao.css 2014-05-07 08:31:44 UTC (rev 1921) @@ -38,6 +38,24 @@ } /****************************************************************************** + * Fonts + *****************************************************************************/ +@font-face { + font-family: "Roboto"; + src: url('fonts/Roboto-Regular.ttf'); +} +@font-face { + font-family: "Roboto"; + font-weight: bold; + src: url('fonts/Roboto-Bold.ttf'); +} +@font-face { + font-family: "Roboto"; + font-weight: 900; + src: url('fonts/Roboto-Black.ttf'); +} + +/****************************************************************************** * Des classes à usage transverse *****************************************************************************/ @@ -259,7 +277,7 @@ } .large-table tbody th, .large-table td { - border: solid 1px #aaaaaa; + border: none !important; border-left-style: dashed; border-right-style: dashed; padding: 2px; @@ -356,13 +374,13 @@ } .btn-primary { - background-color: #2f4f4f; - background-image: linear-gradient(to bottom, #446f6f, #2f4f4f); + background-color: #008A8A; + background-image: linear-gradient(to bottom, #008A8A, #007070); color: #FFF !important; text-decoration: none !important; } .btn-primary:hover { - background-color: #2f4f4f; + background-color: #007070; } /****************************************************************************** @@ -517,6 +535,19 @@ color: #434343; } +main.home .news a { + color: #0d9898; +} +main.home .news a:hover, +main.home .news a:active { + color: #2f4f4f; +} + +/* Fix a 1px gap between icons in fontawesome */ +main.home .news a.btn-edit { + padding-top: 1px; +} + main.home .news p.publication { color: #cdcdcd; font-size: 14px; @@ -527,6 +558,8 @@ margin-left: 10px; text-decoration: none; color: #2f4f4f; + font-weight: bold; + font-size: 15px; } main.home .news p.publication > a i.fa { color: #2f4f4f;

1 0

r1920 - trunk/wao-persistence/src/main/resources
by bleny＠users.forge.codelutin.com April 30, 2014

April 30, 2014

Author: bleny Date: 2014-04-30 18:36:52 +0200 (Wed, 30 Apr 2014) New Revision: 1920 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1920 Log: do NOT update via hibernate since flyway deal with it Modified: trunk/wao-persistence/src/main/resources/wao.properties Modified: trunk/wao-persistence/src/main/resources/wao.properties =================================================================== --- trunk/wao-persistence/src/main/resources/wao.properties 2014-04-30 14:25:45 UTC (rev 1919) +++ trunk/wao-persistence/src/main/resources/wao.properties 2014-04-30 16:36:52 UTC (rev 1920) @@ -24,7 +24,6 @@ hibernate.connection.password= hibernate.dialect=org.hibernate.dialect.H2Dialect -hibernate.hbm2ddl.auto=update hibernate.show_sql=false hibernate.format_sql=true hibernate.ejb.naming_strategy=org.hibernate.cfg.ImprovedNamingStrategy

1 0

r1919 - trunk/wao-persistence/src/main/resources/db/migration
by bleny＠users.forge.codelutin.com April 30, 2014

April 30, 2014

Author: bleny Date: 2014-04-30 16:25:45 +0200 (Wed, 30 Apr 2014) New Revision: 1919 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1919 Log: fixes #4920 remove duplicate entry from DB Modified: trunk/wao-persistence/src/main/resources/db/migration/V4_0__clean-database.sql Modified: trunk/wao-persistence/src/main/resources/db/migration/V4_0__clean-database.sql =================================================================== --- trunk/wao-persistence/src/main/resources/db/migration/V4_0__clean-database.sql 2014-04-30 14:03:16 UTC (rev 1918) +++ trunk/wao-persistence/src/main/resources/db/migration/V4_0__clean-database.sql 2014-04-30 14:25:45 UTC (rev 1919) @@ -2,3 +2,17 @@ -- we no longer user topia migration service drop table tms_version; +-- Il y a des doublons dans la table qui stocke les informations sur le lien entre ligne du plan et navires éligibles. +-- Un même navire peut être associé en tant qu'éligible plusieurs fois. +-- On rectifie le tir en supprimant les doublons et en ajoutant une contrainte d'unicité + +delete from elligibleboat +where topiaId in ( select eb.topiaId + from elligibleboat eb + where eb.sampleRow in (select eb2.samplerow from elligibleboat eb2 group by samplerow, boat having count(topiaId) > 1) + and eb.boat in (select eb2.boat from elligibleboat eb2 group by samplerow, boat having count(topiaId) > 1) + and eb.topiaId not in (select eb2.topiaId from elligibleboat eb2 where eb2.boat = eb.boat and eb2.sampleRow = eb.sampleRow order by topiacreatedate desc limit 1)); + +alter table elligibleboat add constraint samplerow_boat_uniqueness unique (boat, samplerow); + +

1 0

r1918 - in trunk: . wao-persistence wao-persistence/src/main/resources wao-persistence/src/main/resources/db wao-persistence/src/main/resources/db/migration wao-web/src/main/resources
by bleny＠users.forge.codelutin.com April 30, 2014

April 30, 2014

Author: bleny Date: 2014-04-30 16:03:16 +0200 (Wed, 30 Apr 2014) New Revision: 1918 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1918 Log: use topia-service-flyway Added: trunk/wao-persistence/src/main/resources/db/ trunk/wao-persistence/src/main/resources/db/migration/ trunk/wao-persistence/src/main/resources/db/migration/V4_0__clean-database.sql Modified: trunk/pom.xml trunk/wao-persistence/pom.xml trunk/wao-persistence/src/main/resources/wao.properties trunk/wao-web/src/main/resources/log4j.properties Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-04-30 09:05:26 UTC (rev 1917) +++ trunk/pom.xml 2014-04-30 14:03:16 UTC (rev 1918) @@ -244,6 +244,13 @@ <scope>runtime</scope> </dependency> + <dependency> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-service-flyway</artifactId> + <version>${topiaVersion}</version> + <scope>runtime</scope> + </dependency> +  <dependency> Modified: trunk/wao-persistence/pom.xml =================================================================== --- trunk/wao-persistence/pom.xml 2014-04-30 09:05:26 UTC (rev 1917) +++ trunk/wao-persistence/pom.xml 2014-04-30 14:03:16 UTC (rev 1918) @@ -21,6 +21,11 @@ </dependency> <dependency> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-service-flyway</artifactId> + </dependency> + + <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-core</artifactId> </dependency> Added: trunk/wao-persistence/src/main/resources/db/migration/V4_0__clean-database.sql =================================================================== --- trunk/wao-persistence/src/main/resources/db/migration/V4_0__clean-database.sql (rev 0) +++ trunk/wao-persistence/src/main/resources/db/migration/V4_0__clean-database.sql 2014-04-30 14:03:16 UTC (rev 1918) @@ -0,0 +1,4 @@ + +-- we no longer user topia migration service +drop table tms_version; + Modified: trunk/wao-persistence/src/main/resources/wao.properties =================================================================== --- trunk/wao-persistence/src/main/resources/wao.properties 2014-04-30 09:05:26 UTC (rev 1917) +++ trunk/wao-persistence/src/main/resources/wao.properties 2014-04-30 14:03:16 UTC (rev 1918) @@ -37,3 +37,6 @@ # hibernate.connection.provider_class=org.nuiton.topia.framework.TopiaConnectionProvider topia.persistence.topiaIdFactoryClassName=org.nuiton.topia.persistence.internal.LegacyTopiaIdFactory + +topia.service.migration=org.nuiton.topia.flyway.TopiaFlywayServiceImpl +topia.service.migration.flyway.initVersion=3.4.1 Modified: trunk/wao-web/src/main/resources/log4j.properties =================================================================== --- trunk/wao-web/src/main/resources/log4j.properties 2014-04-30 09:05:26 UTC (rev 1917) +++ trunk/wao-web/src/main/resources/log4j.properties 2014-04-30 14:03:16 UTC (rev 1918) @@ -26,6 +26,8 @@ # global level log4j.logger.fr.ifremer.wao=TRACE +log4j.logger.org.nuiton.topia.flyway=TRACE +log4j.logger.com.googlecode.flyway=TRACE ### persistence level # log4j.logger.org.nuiton.topia=TRACE

1 0

r1917 - in trunk: wao-persistence/src/main/java/fr/ifremer/wao wao-persistence/src/main/java/fr/ifremer/wao/entity wao-services/src/main/java/fr/ifremer/wao/services/service wao-services/src/test/java/fr/ifremer/wao/services/service wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer
by bleny＠users.forge.codelutin.com April 30, 2014

April 30, 2014

Author: bleny Date: 2014-04-30 11:05:26 +0200 (Wed, 30 Apr 2014) New Revision: 1917 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1917 Log: refactor and clean up filters Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/AbstractWaoFilter.java trunk/wao-persistence/src/main/java/fr/ifremer/wao/BoatsFilter.java trunk/wao-persistence/src/main/java/fr/ifremer/wao/ContactsFilter.java trunk/wao-persistence/src/main/java/fr/ifremer/wao/SampleRowsFilter.java trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleRowTopiaDao.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/AbstractFilterValues.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatsFilterValues.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsFilterValues.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerBoatsService.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerContactsService.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanBuilder.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanService.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SampleRowsFilterValues.java trunk/wao-services/src/test/java/fr/ifremer/wao/services/service/ObsMerContactsServiceTest.java trunk/wao-services/src/test/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanServiceTest.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/ContactsFilterValuesJsonAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/SampleRowsFilterValuesJsonAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/SamplingPlanAction.java Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/AbstractWaoFilter.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/AbstractWaoFilter.java 2014-04-29 15:07:42 UTC (rev 1916) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/AbstractWaoFilter.java 2014-04-30 09:05:26 UTC (rev 1917) @@ -1,22 +1,11 @@ package fr.ifremer.wao; -import fr.ifremer.wao.entity.ObsProgram; import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import java.io.Serializable; public abstract class AbstractWaoFilter implements Serializable { - protected ObsProgram obsProgram; - - public AbstractWaoFilter(ObsProgram obsProgram) { - this.obsProgram = obsProgram; - } - - public ObsProgram getObsProgram() { - return obsProgram; - } - /** Predicate to tell if user actually gave a criteria to filter entities. */ public abstract boolean isFilled(); Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/BoatsFilter.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/BoatsFilter.java 2014-04-29 15:07:42 UTC (rev 1916) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/BoatsFilter.java 2014-04-30 09:05:26 UTC (rev 1917) @@ -21,7 +21,6 @@ * #L% */ -import fr.ifremer.wao.entity.ObsProgram; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -83,9 +82,8 @@ */ protected Set<String> fleetIds; - public BoatsFilter(ObsProgram obsProgram) { - super(obsProgram); - elligibleForSampleRowsFilter = new SampleRowsFilter(obsProgram); + public BoatsFilter() { + elligibleForSampleRowsFilter = new SampleRowsFilter(); } public SampleRowsFilter getElligibleForSampleRowsFilter() { Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/ContactsFilter.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/ContactsFilter.java 2014-04-29 15:07:42 UTC (rev 1916) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/ContactsFilter.java 2014-04-30 09:05:26 UTC (rev 1917) @@ -23,7 +23,6 @@ import fr.ifremer.wao.entity.ContactState; import fr.ifremer.wao.entity.DataReliability; -import fr.ifremer.wao.entity.ObsProgram; import fr.ifremer.wao.entity.ObservationType; import fr.ifremer.wao.entity.ObservedDataControl; import fr.ifremer.wao.entity.SamplingStrategy; @@ -93,10 +92,9 @@ protected boolean sortedByBoardingDate; - public ContactsFilter(ObsProgram obsProgram) { - super(obsProgram); - sampleRowFilter = new SampleRowsFilter(obsProgram); - boatFilter = new BoatsFilter(obsProgram); + public ContactsFilter() { + sampleRowFilter = new SampleRowsFilter(); + boatFilter = new BoatsFilter(); } public SampleRowsFilter getSampleRowFilter() { Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/SampleRowsFilter.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/SampleRowsFilter.java 2014-04-29 15:07:42 UTC (rev 1916) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/SampleRowsFilter.java 2014-04-30 09:05:26 UTC (rev 1917) @@ -33,6 +33,8 @@ private static final long serialVersionUID = 1L; + protected ObsProgram obsProgram; + protected Set<String> sampleRowIds; /** Filter sample rows on sample month. @@ -67,10 +69,14 @@ protected Set<String> orderByArguments; - public SampleRowsFilter(ObsProgram obsProgram) { - super(obsProgram); + public ObsProgram getObsProgram() { + return obsProgram; } + public void setObsProgram(ObsProgram obsProgram) { + this.obsProgram = obsProgram; + } + public Date getPeriodFrom() { return periodFrom; } Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleRowTopiaDao.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleRowTopiaDao.java 2014-04-29 15:07:42 UTC (rev 1916) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleRowTopiaDao.java 2014-04-30 09:05:26 UTC (rev 1917) @@ -22,7 +22,6 @@ */ import com.google.common.base.Optional; -import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; import fr.ifremer.wao.SampleRowsFilter; import fr.ifremer.wao.WaoUtils; @@ -67,36 +66,26 @@ protected HqlAndParametersBuilder<SampleRow> toSampleRowHqlAndParametersBuilder(SampleRowsFilter filter) { - ObsProgram obsProgram = filter.getObsProgram(); - - Preconditions.checkNotNull(obsProgram, "ObsProgram cannot be null"); - HqlAndParametersBuilder<SampleRow> query = newHqlAndParametersBuilder(); query.setAlias("sr"); - query.addEquals(SampleRow.PROPERTY_OBS_PROGRAM_ORDINAL, obsProgram.ordinal()); + if (filter.getObsProgram() != null) { + query.addEquals(SampleRow.PROPERTY_OBS_PROGRAM_ORDINAL, filter.getObsProgram().ordinal()); + } if (CollectionUtils.isNotEmpty(filter.getSampleRowIds())) { query.addIn(TopiaEntity.PROPERTY_TOPIA_ID, filter.getSampleRowIds()); } if (filter.getPeriodFrom() != null) { - if (obsProgram.isObsDeb()) { - query.addWhereClause("sr." + SampleRow.PROPERTY_EXPECTED_DATE + " >= :periodFrom", ImmutableMap.of("periodTo", (Object) filter.getPeriodFrom())); - } else { - Date periodFromMonth = DateUtils.truncate(filter.getPeriodFrom(), Calendar.MONTH); - query.addWhereClause("sr." + SampleRow.PROPERTY_PERIOD_END + " >= :periodFromMonth", ImmutableMap.of("periodFromMonth", (Object) periodFromMonth)); - } + Date periodFromMonth = DateUtils.truncate(filter.getPeriodFrom(), Calendar.MONTH); + query.addWhereClause("sr." + SampleRow.PROPERTY_PERIOD_END + " >= :periodFromMonth", ImmutableMap.of("periodFromMonth", (Object) periodFromMonth)); } if (filter.getPeriodTo() != null) { - if (obsProgram.isObsDeb()) { - query.addWhereClause("sr." + SampleRow.PROPERTY_EXPECTED_DATE + " <= :periodTo", ImmutableMap.of("periodTo", (Object) filter.getPeriodTo())); - } else { - Date periodToMonth = DateUtils.truncate(filter.getPeriodTo(), Calendar.MONTH); - query.addWhereClause("sr." + SampleRow.PROPERTY_PERIOD_BEGIN + " <= :periodToMonth", ImmutableMap.of("periodToMonth", (Object) periodToMonth)); - } + Date periodToMonth = DateUtils.truncate(filter.getPeriodTo(), Calendar.MONTH); + query.addWhereClause("sr." + SampleRow.PROPERTY_PERIOD_BEGIN + " <= :periodToMonth", ImmutableMap.of("periodToMonth", (Object) periodToMonth)); } if (CollectionUtils.isNotEmpty(filter.getSampleRowCodes())) { Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/AbstractFilterValues.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/AbstractFilterValues.java 2014-04-29 15:07:42 UTC (rev 1916) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/AbstractFilterValues.java 2014-04-30 09:05:26 UTC (rev 1917) @@ -1,7 +1,5 @@ package fr.ifremer.wao.services.service; -import fr.ifremer.wao.entity.ObsProgram; - import java.io.Serializable; import java.util.Locale; @@ -9,17 +7,10 @@ protected Locale locale; - protected ObsProgram obsProgram; - - public AbstractFilterValues(Locale locale, ObsProgram obsProgram) { + public AbstractFilterValues(Locale locale) { this.locale = locale; - this.obsProgram = obsProgram; } - public ObsProgram getObsProgram() { - return obsProgram; - } - public Locale getLocale() { return locale; } Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatsFilterValues.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatsFilterValues.java 2014-04-29 15:07:42 UTC (rev 1916) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatsFilterValues.java 2014-04-30 09:05:26 UTC (rev 1917) @@ -30,7 +30,6 @@ import fr.ifremer.wao.entity.SampleRow; import fr.ifremer.wao.entity.ShipOwner; import fr.ifremer.wao.entity.TerrestrialLocation; -import org.apache.commons.lang3.BooleanUtils; import java.util.HashSet; import java.util.Locale; @@ -49,8 +48,6 @@ private static final long serialVersionUID = 1L; - protected Optional<String> optionalCompanyId; - protected SampleRowsFilterValues elligibleForSampleRowsFilterValues; protected SortedSet<FilterOption> shipOwners = new TreeSet<>(); @@ -62,9 +59,8 @@ protected SortedSet<FilterOption> fleets = new TreeSet<>(); public BoatsFilterValues(Locale locale, ObsProgram obsProgram, Optional<String> optionalCompanyId) { - super(locale, obsProgram); - this.optionalCompanyId = optionalCompanyId; - this.elligibleForSampleRowsFilterValues = new SampleRowsFilterValues(locale, obsProgram); + super(locale); + this.elligibleForSampleRowsFilterValues = new SampleRowsFilterValues(locale, obsProgram, optionalCompanyId); } public void addBoat(Boat boat) { @@ -104,17 +100,7 @@ for (ElligibleBoat elligibleBoat : boat.getElligibleBoat()) { SampleRow sampleRow = elligibleBoat.getSampleRow(); - boolean sampleRowMatchesObsProgram = obsProgram.equals(sampleRow.getObsProgram()); - boolean sampleRowMatchesCompany = true; - if (optionalCompanyId.isPresent()) { - String sampleRowCompanyId = null; - if (sampleRow.getCompany() != null) { - sampleRowCompanyId = sampleRow.getCompany().getTopiaId(); - } - sampleRowMatchesCompany = optionalCompanyId.get().equals(sampleRowCompanyId); - } - boolean boatIsElligible = elligibleBoat.isGlobalActive() || BooleanUtils.isNotFalse(elligibleBoat.getCompanyActive()); - if (sampleRowMatchesObsProgram && sampleRowMatchesCompany && boatIsElligible) { + if (elligibleBoat.isBoatElligible()) { elligibleForSampleRowsFilterValues.addSampleRow(sampleRow); } } Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsFilterValues.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsFilterValues.java 2014-04-29 15:07:42 UTC (rev 1916) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsFilterValues.java 2014-04-30 09:05:26 UTC (rev 1917) @@ -84,10 +84,10 @@ protected SortedSet<FilterOption> completeSamplings = new TreeSet<>(); - public ContactsFilterValues(Locale locale, ObsProgram obsProgram) { - super(locale, obsProgram); - this.boatsFilterValues = new BoatsFilterValues(locale, obsProgram, Optional.<String>absent()); - this.sampleRowsFilterValues = new SampleRowsFilterValues(locale, obsProgram); + public ContactsFilterValues(Locale locale, ObsProgram obsProgram, Optional<String> optionalCompanyId) { + super(locale); + this.boatsFilterValues = new BoatsFilterValues(locale, obsProgram, optionalCompanyId); + this.sampleRowsFilterValues = new SampleRowsFilterValues(locale, obsProgram, optionalCompanyId); } public void addContact(Contact contact) { 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-04-29 15:07:42 UTC (rev 1916) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerBoatsService.java 2014-04-30 09:05:26 UTC (rev 1917) @@ -76,7 +76,7 @@ optionalCompanyId = Optional.of(authenticatedWaoUser.getCompany().getTopiaId()); } - BoatsFilterValues boatsFilterValues = new BoatsFilterValues(serviceContext.getLocale(), filter.getObsProgram(), optionalCompanyId); + BoatsFilterValues boatsFilterValues = new BoatsFilterValues(serviceContext.getLocale(), authenticatedWaoUser.getObsProgram(), optionalCompanyId); for (Boat boat : boats) { boatsFilterValues.addBoat(boat); @@ -121,7 +121,7 @@ public BoatsFilter newBoatsFilter(AuthenticatedWaoUser authenticatedWaoUser) { - BoatsFilter boatsFilter = new BoatsFilter(authenticatedWaoUser.getObsProgram()); + BoatsFilter boatsFilter = new BoatsFilter(); if (authenticatedWaoUser.isProfessional()) { // Pour le profesionnel, on restreint d'office à la liste des bateaux qu'il peut voir @@ -169,7 +169,8 @@ Contact mostRecentContact = getContactDao().findMostRecentContactOrNull(obsProgram, boatId, companyId); - ContactsFilter filter = new ContactsFilter(obsProgram); + ContactsFilter filter = new ContactsFilter(); + filter.getSampleRowFilter().setObsProgram(obsProgram); filter.getBoatFilter().setBoatIds(ImmutableSet.of(boatId)); filter.getSampleRowFilter().setCompanyIds(ImmutableSet.of(companyId)); long contactsCount = getContactDao().count(filter); @@ -221,8 +222,9 @@ public BoatContactsCounts getBoatContactsCounts(AuthenticatedWaoUser authenticatedWaoUser, String boatId, String companyId, Date since) { - ContactsFilter filter = new ContactsFilter(authenticatedWaoUser.getObsProgram()); + ContactsFilter filter = new ContactsFilter(); + filter.getSampleRowFilter().setObsProgram(authenticatedWaoUser.getObsProgram()); filter.setPeriodFrom(since); filter.getBoatFilter().setBoatIds(ImmutableSet.of(boatId)); filter.setContactStates(ImmutableSet.of(ContactState.OBSERVATION_DONE)); 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-04-29 15:07:42 UTC (rev 1916) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerContactsService.java 2014-04-30 09:05:26 UTC (rev 1917) @@ -84,12 +84,16 @@ private static final Log log = LogFactory.getLog(ObsMerContactsService.class); - public ContactsFilterValues getContactsFilterValues(ContactsFilter filter) { + public ContactsFilterValues getContactsFilterValues(AuthenticatedWaoUser authenticatedWaoUser, ContactsFilter filter) { ContactTopiaDao dao = getContactDao(); List<Contact> contacts = dao.findAll(filter, false); - ContactsFilterValues contactsFilterValues = new ContactsFilterValues(serviceContext.getLocale(), filter.getObsProgram()); + Optional<String> optionalCompanyId = Optional.absent(); + if (authenticatedWaoUser.isCoordinatorOrObserver()) { + optionalCompanyId = Optional.of(authenticatedWaoUser.getCompany().getTopiaId()); + } + ContactsFilterValues contactsFilterValues = new ContactsFilterValues(serviceContext.getLocale(), authenticatedWaoUser.getObsProgram(), optionalCompanyId); for (Contact contact : contacts) { contactsFilterValues.addContact(contact); @@ -98,7 +102,8 @@ return contactsFilterValues; } - public ObsMerContactsList getContactsList(ContactsFilter filter, + public ObsMerContactsList getContactsList(AuthenticatedWaoUser authenticatedWaoUser, + ContactsFilter filter, TopiaPagerBean queryPager) { ContactTopiaDao dao = getContactDao(); @@ -111,7 +116,7 @@ PaginationBean paginationBean = new PaginationBean(pager, 10); - ContactsFilterValues filterValues = getContactsFilterValues(filter); + ContactsFilterValues filterValues = getContactsFilterValues(authenticatedWaoUser, filter); ObsMerContactsList contactsList = new ObsMerContactsList(); contactsList.setContacts(contacts); @@ -129,8 +134,10 @@ public ContactsFilter newContactFilter(AuthenticatedWaoUser authenticatedWaoUser) { - ContactsFilter newContactsFilter = new ContactsFilter(authenticatedWaoUser.getObsProgram()); + ContactsFilter newContactsFilter = new ContactsFilter(); + newContactsFilter.getSampleRowFilter().setObsProgram(authenticatedWaoUser.getObsProgram()); + // DO NOT REMOVE THIS if (authenticatedWaoUser.isCoordinatorOrObserver()) { String authenticatedWaoUserCompanyTopiaId = authenticatedWaoUser.getWaoUser().getCompany().getTopiaId(); Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanBuilder.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanBuilder.java 2014-04-29 15:07:42 UTC (rev 1916) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanBuilder.java 2014-04-30 09:05:26 UTC (rev 1917) @@ -22,8 +22,10 @@ */ import com.google.common.base.Function; +import com.google.common.base.Optional; import com.google.common.collect.Ordering; import fr.ifremer.wao.SampleRowsFilter; +import fr.ifremer.wao.entity.ObsProgram; import fr.ifremer.wao.entity.SampleRow; import fr.ifremer.wao.entity.SampleRows; import org.apache.commons.lang3.mutable.MutableDouble; @@ -134,9 +136,10 @@ protected Map<Date, MutableInt> totalRealForMonths; public ObsMerSamplingPlanBuilder(Locale locale, + Optional<String> optionalCompanyId, SampleRowsFilter sampleRowsFilter) { this.sampleRowsFilter = sampleRowsFilter; - this.sampleRowsFilterValues = new SampleRowsFilterValues(locale, sampleRowsFilter.getObsProgram()); + this.sampleRowsFilterValues = new SampleRowsFilterValues(locale, ObsProgram.OBSMER, optionalCompanyId); this.facadeMap = new TreeMap<>(); this.observationTimesInDaysTotalExpected = new MutableDouble(); this.observationTimesInDaysTotalReal = new MutableLong(); Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanService.java 2014-04-29 15:07:42 UTC (rev 1916) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanService.java 2014-04-30 09:05:26 UTC (rev 1917) @@ -396,7 +396,9 @@ } - public ObsMerSamplingPlan getSamplingPlan(SampleRowsFilter sampleRowsFilter) { + public ObsMerSamplingPlan getSamplingPlan( + AuthenticatedWaoUser authenticatedWaoUser, + SampleRowsFilter sampleRowsFilter) { SampleRowTopiaDao dao = getSampleRowDao(); @@ -404,7 +406,12 @@ List<SampleRow> sampleRows = dao.findAll(sampleRowsFilter); // creation du plan d'echantillonnage + Optional<String> optionalCompanyId = Optional.absent(); + if (authenticatedWaoUser.isCoordinatorOrObserver()) { + optionalCompanyId = Optional.of(authenticatedWaoUser.getCompany().getTopiaId()); + } ObsMerSamplingPlanBuilder builder = new ObsMerSamplingPlanBuilder(serviceContext.getLocale(), + optionalCompanyId, sampleRowsFilter); // begin of month @@ -421,7 +428,7 @@ sampleRow); // calcul effort réalisé et estimé - SampleRowsFilter sampleRowsFilter1 = new SampleRowsFilter(sampleRowsFilter.getObsProgram()); + SampleRowsFilter sampleRowsFilter1 = new SampleRowsFilter(); sampleRowsFilter1.setPeriodFrom(periodFrom); sampleRowsFilter1.setPeriodTo(periodTo); sampleRowsFilter1.setSampleRowIds(ImmutableSet.of(sampleRow.getTopiaId())); @@ -446,7 +453,8 @@ public SampleRowsFilter newSampleRowsFilter(AuthenticatedWaoUser authenticatedWaoUser) { // all users can see only rows for the program they are logged for - SampleRowsFilter newFilter = new SampleRowsFilter(authenticatedWaoUser.getObsProgram()); + SampleRowsFilter newFilter = new SampleRowsFilter(); + newFilter.setObsProgram(authenticatedWaoUser.getObsProgram()); // We don't want to see all rows but the ones important for today Date fromDate = serviceContext.getNow(); @@ -638,7 +646,7 @@ // D'abord, on a besoin de récupérer toutes les observations réalisées // pour cette ligne du plan - ContactsFilter contactFilter = new ContactsFilter(sampleRowsFilter.getObsProgram()); + ContactsFilter contactFilter = new ContactsFilter(); contactFilter.setFilterOnObservationBeginDate(true); contactFilter.setPeriodFrom(sampleRowsFilter.getPeriodFrom()); @@ -738,7 +746,7 @@ // Recuperation de tous les contacts de la ligne //---- - ContactsFilter contactFilter = new ContactsFilter(sampleRow.getObsProgram()); + ContactsFilter contactFilter = new ContactsFilter(); contactFilter.setFilterOnObservationBeginDate(true); contactFilter.getSampleRowFilter().setSampleRowIds(Sets.newHashSet(sampleRow.getTopiaId())); Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SampleRowsFilterValues.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SampleRowsFilterValues.java 2014-04-29 15:07:42 UTC (rev 1916) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SampleRowsFilterValues.java 2014-04-30 09:05:26 UTC (rev 1917) @@ -21,7 +21,7 @@ * #L% */ -import com.google.common.base.Preconditions; +import com.google.common.base.Optional; import fr.ifremer.wao.entity.Company; import fr.ifremer.wao.entity.DCF5Code; import fr.ifremer.wao.entity.FishingGearDCF; @@ -44,6 +44,10 @@ private static final long serialVersionUID = 1L; + protected ObsProgram obsProgram; + + protected Optional<String> optionalCompanyId; + protected SortedSet<FilterOption> fishingZoneFacadeNames = new TreeSet<>(); protected SortedSet<FilterOption> fishingZoneSectorNames = new TreeSet<>(); @@ -64,48 +68,62 @@ /** Values are the code and the label i18n key. */ protected SortedSet<FilterOption> targetSpeciesDcfs = new TreeSet<>(); - public SampleRowsFilterValues(Locale locale, ObsProgram obsProgram) { - super(locale, obsProgram); + public SampleRowsFilterValues(Locale locale, ObsProgram obsProgram, Optional<String> optionalCompanyId) { + super(locale); + this.obsProgram = obsProgram; + this.optionalCompanyId = optionalCompanyId; } public void addSampleRow(SampleRow sampleRow) { - Preconditions.checkArgument(obsProgram.equals(sampleRow.getObsProgram())); - for (FishingZone fishingZone : sampleRow.getFishingZone()) { - fishingZoneFacadeNames.add(FilterOption.forString(fishingZone.getFacadeName())); - fishingZoneSectorNames.add(FilterOption.forString(fishingZone.getSectorName())); + boolean sampleRowMatchesObsProgram = obsProgram.equals(sampleRow.getObsProgram()); + boolean sampleRowMatchesCompany = true; + if (optionalCompanyId.isPresent()) { + String sampleRowCompanyId = null; + if (sampleRow.getCompany() != null) { + sampleRowCompanyId = sampleRow.getCompany().getTopiaId(); + } + sampleRowMatchesCompany = optionalCompanyId.get().equals(sampleRowCompanyId); } - sampleRowCodes.add(FilterOption.forString(sampleRow.getCode())); - programNames.add(FilterOption.forString(sampleRow.getProgramName())); - Company company = sampleRow.getCompany(); - if (company != null) { - companies.add(FilterOption.forValueAndLabel(company.getTopiaId(), company.getName())); - } - samplingStrategies.add(FilterOption.forEnum(locale, sampleRow.getSamplingStrategy())); - if (sampleRow.getObsProgram().isObsVente()) { - TerrestrialLocation terrestrialDistrict = sampleRow.getTerrestrialLocation(); - terrestrialDistricts.add( - FilterOption.forValueAndLabel( - terrestrialDistrict.getTopiaId(), - terrestrialDistrict.getDescription())); - } - for (DCF5Code dcf5Code : sampleRow.getdCF5Code()) { - FishingGearDCF fishingGearDCF = dcf5Code.getFishingGearDCF(); - String fishingGearLabel = fishingGearDCF.getCode() + " - " + l(locale, fishingGearDCF.getI18nKey()); - fishingGearDcfs.add( - FilterOption.forValueAndLabel( - fishingGearDCF.getTopiaId(), - fishingGearLabel) - ); - TargetSpeciesDCF targetSpeciesDCF = dcf5Code.getTargetSpeciesDCF(); - if (targetSpeciesDCF != null) { - String targetspeciesLabel = targetSpeciesDCF.getCode() + " - " + l(locale, targetSpeciesDCF.getI18nKey()); - targetSpeciesDcfs.add( + if (sampleRowMatchesObsProgram && sampleRowMatchesCompany) { + for (FishingZone fishingZone : sampleRow.getFishingZone()) { + fishingZoneFacadeNames.add(FilterOption.forString(fishingZone.getFacadeName())); + fishingZoneSectorNames.add(FilterOption.forString(fishingZone.getSectorName())); + } + sampleRowCodes.add(FilterOption.forString(sampleRow.getCode())); + programNames.add(FilterOption.forString(sampleRow.getProgramName())); + + Company company = sampleRow.getCompany(); + if (company != null) { + companies.add(FilterOption.forValueAndLabel(company.getTopiaId(), company.getName())); + } + samplingStrategies.add(FilterOption.forEnum(locale, sampleRow.getSamplingStrategy())); + if (sampleRow.getObsProgram().isObsVente()) { + TerrestrialLocation terrestrialDistrict = sampleRow.getTerrestrialLocation(); + terrestrialDistricts.add( FilterOption.forValueAndLabel( - targetSpeciesDCF.getTopiaId(), - targetspeciesLabel) + terrestrialDistrict.getTopiaId(), + terrestrialDistrict.getDescription()) ); } + for (DCF5Code dcf5Code : sampleRow.getdCF5Code()) { + FishingGearDCF fishingGearDCF = dcf5Code.getFishingGearDCF(); + String fishingGearLabel = fishingGearDCF.getCode() + " - " + l(locale, fishingGearDCF.getI18nKey()); + fishingGearDcfs.add( + FilterOption.forValueAndLabel( + fishingGearDCF.getTopiaId(), + fishingGearLabel) + ); + TargetSpeciesDCF targetSpeciesDCF = dcf5Code.getTargetSpeciesDCF(); + if (targetSpeciesDCF != null) { + String targetspeciesLabel = targetSpeciesDCF.getCode() + " - " + l(locale, targetSpeciesDCF.getI18nKey()); + targetSpeciesDcfs.add( + FilterOption.forValueAndLabel( + targetSpeciesDCF.getTopiaId(), + targetspeciesLabel) + ); + } + } } } Modified: trunk/wao-services/src/test/java/fr/ifremer/wao/services/service/ObsMerContactsServiceTest.java =================================================================== --- trunk/wao-services/src/test/java/fr/ifremer/wao/services/service/ObsMerContactsServiceTest.java 2014-04-29 15:07:42 UTC (rev 1916) +++ trunk/wao-services/src/test/java/fr/ifremer/wao/services/service/ObsMerContactsServiceTest.java 2014-04-30 09:05:26 UTC (rev 1917) @@ -59,7 +59,7 @@ ContactsFilter filter = service.newContactFilter(fixtures.admin()); - ContactsFilterValues filterValues = service.getContactsFilterValues(filter); + ContactsFilterValues filterValues = service.getContactsFilterValues(fixtures.admin(), filter); } @Test @@ -69,7 +69,7 @@ TopiaPagerBean pager = service.newContactsPager(50); - ObsMerContactsList contactsList = service.getContactsList(filter, pager); + ObsMerContactsList contactsList = service.getContactsList(fixtures.admin(), filter, pager); } @Test Modified: trunk/wao-services/src/test/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanServiceTest.java =================================================================== --- trunk/wao-services/src/test/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanServiceTest.java 2014-04-29 15:07:42 UTC (rev 1916) +++ trunk/wao-services/src/test/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanServiceTest.java 2014-04-30 09:05:26 UTC (rev 1917) @@ -91,23 +91,23 @@ serviceContext.setDate(DateUtil.createDate(15, 5, 2010)); SampleRowsFilter filter = service.newSampleRowsFilter(fixtures.admin()); - ObsMerSamplingPlan samplingPlan = service.getSamplingPlan(filter); + ObsMerSamplingPlan samplingPlan = service.getSamplingPlan(fixtures.admin(), filter); assertSamplePlanRowsNumber(12, samplingPlan); filter = service.newSampleRowsFilter(fixtures.admin()); filter.setFishingGearDcfIds(ImmutableSet.of(fixtures.ptb().getTopiaId())); - samplingPlan = service.getSamplingPlan(filter); + samplingPlan = service.getSamplingPlan(fixtures.admin(), filter); assertSamplePlanRowsNumber(3, samplingPlan); filter = service.newSampleRowsFilter(fixtures.admin()); filter.setTargetSpeciesDcfIds(ImmutableSet.of(fixtures.def().getTopiaId())); - samplingPlan = service.getSamplingPlan(filter); + samplingPlan = service.getSamplingPlan(fixtures.admin(), filter); assertSamplePlanRowsNumber(4, samplingPlan); filter = service.newSampleRowsFilter(fixtures.admin()); filter.setFishingGearDcfIds(ImmutableSet.of(fixtures.ptb().getTopiaId())); filter.setTargetSpeciesDcfIds(ImmutableSet.of(fixtures.def().getTopiaId())); - samplingPlan = service.getSamplingPlan(filter); + samplingPlan = service.getSamplingPlan(fixtures.admin(), filter); assertSamplePlanRowsNumber(1, samplingPlan); } 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-04-29 15:07:42 UTC (rev 1916) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ContactsAction.java 2014-04-30 09:05:26 UTC (rev 1917) @@ -114,7 +114,7 @@ @Override public String execute() { - contactsList = service.getContactsList(filter, getPager()); + contactsList = service.getContactsList(getAuthenticatedWaoUser(), filter, getPager()); return SUCCESS; } Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ContactsFilterValuesJsonAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ContactsFilterValuesJsonAction.java 2014-04-29 15:07:42 UTC (rev 1916) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ContactsFilterValuesJsonAction.java 2014-04-30 09:05:26 UTC (rev 1917) @@ -68,8 +68,10 @@ @Override public String execute() { - filterValues = service.getContactsFilterValues(filter); + filterValues = service.getContactsFilterValues(session.getAuthenticatedWaoUser(), filter); + return SUCCESS; + } } \ No newline at end of file Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/SampleRowsFilterValuesJsonAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/SampleRowsFilterValuesJsonAction.java 2014-04-29 15:07:42 UTC (rev 1916) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/SampleRowsFilterValuesJsonAction.java 2014-04-30 09:05:26 UTC (rev 1917) @@ -59,7 +59,7 @@ @Override public String execute() { - ObsMerSamplingPlan samplingPlan = service.getSamplingPlan(filter); + ObsMerSamplingPlan samplingPlan = service.getSamplingPlan(session.getAuthenticatedWaoUser(), filter); filterValues = samplingPlan.getFilterValues(); 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-04-29 15:07:42 UTC (rev 1916) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/SamplingPlanAction.java 2014-04-30 09:05:26 UTC (rev 1917) @@ -72,7 +72,7 @@ @Override public String execute() { - samplingPlan = service.getSamplingPlan(filter); + samplingPlan = service.getSamplingPlan(getAuthenticatedWaoUser(), filter); return SUCCESS; }

1 0

r1916 - trunk/wao-web/src/main/webapp
by bleny＠users.forge.codelutin.com April 29, 2014

April 29, 2014

Author: bleny Date: 2014-04-29 17:07:42 +0200 (Tue, 29 Apr 2014) New Revision: 1916 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1916 Log: css conventions Modified: trunk/wao-web/src/main/webapp/wao.css Modified: trunk/wao-web/src/main/webapp/wao.css =================================================================== --- trunk/wao-web/src/main/webapp/wao.css 2014-04-29 13:38:22 UTC (rev 1915) +++ trunk/wao-web/src/main/webapp/wao.css 2014-04-29 15:07:42 UTC (rev 1916) @@ -492,35 +492,36 @@ /** * Accueil */ -main.home .news{ - background-color:#FFF; - padding:20px 20px 10px 20px; +main.home .news { + background-color: #fff; + padding: 20px 20px 10px 20px; margin: 0 auto 30px auto; - box-shadow:1px 1px 2px #CCC; - -moz-box-shadow:1px 1px 2px #CCC; - -webkit-box-shadow:1px 1px 2px #CCC; + box-shadow: 1px 1px 2px #ccc; + -moz-box-shadow: 1px 1px 2px #ccc; + -webkit-box-shadow: 1px 1px 2px #ccc; width: 660px; } -main.home .news.first h2{ - font-size:30px; -} -main.home .news h2{ + +main.home .news h2 { font-family: 'Roboto', sans-serif; - font-weight:900; - color:#008a8a; - font-size:24px; - text-transform:uppercase; - border-bottom:1px solid #8fbc8f; - margin-bottom:20px; + font-weight: 900; + color: #008a8a; + font-size: 24px; + text-transform: uppercase; + border-bottom: 1px solid #8fbc8f; + margin-bottom: 20px; } + main.home .news p { - font-size:17px; - color:#434343; + font-size: 17px; + color: #434343; } + main.home .news p.publication { - color:#cdcdcd; - font-size:14px; + color: #cdcdcd; + font-size: 14px; } + main.home .news p.publication > a { float: right; margin-left: 10px; @@ -541,6 +542,7 @@ width: 700px; padding: 20px 0; } + main.home .buttons-area a { float: right; }

1 0

r1915 - trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity
by bleny＠users.forge.codelutin.com April 29, 2014

April 29, 2014

Author: bleny Date: 2014-04-29 15:38:22 +0200 (Tue, 29 Apr 2014) New Revision: 1915 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1915 Log: add a TODO Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleRowLogImpl.java Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleRowLogImpl.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleRowLogImpl.java 2014-04-29 13:37:37 UTC (rev 1914) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleRowLogImpl.java 2014-04-29 13:38:22 UTC (rev 1915) @@ -50,6 +50,7 @@ */ public class SampleRowLogImpl extends SampleRowLogAbstract { + // TODO brendan 29/04/14 i18n, i18n everywhere ! protected void addChange(String text) { String log = getLogText(); if (!StringUtils.isEmpty(log)) {

1 0

r1914 - in trunk: wao-persistence/src/main/java/fr/ifremer/wao/entity wao-services/src/main/java/fr/ifremer/wao/services/service
by bleny＠users.forge.codelutin.com April 29, 2014

April 29, 2014

Author: bleny Date: 2014-04-29 15:37:37 +0200 (Tue, 29 Apr 2014) New Revision: 1914 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1914 Log: refs #4483 compute log text Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ElligibleBoatImpl.java trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleRowLogImpl.java trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleRowTopiaDao.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanService.java Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ElligibleBoatImpl.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ElligibleBoatImpl.java 2014-04-29 12:43:33 UTC (rev 1913) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ElligibleBoatImpl.java 2014-04-29 13:37:37 UTC (rev 1914) @@ -1,10 +1,13 @@ package fr.ifremer.wao.entity; +import org.apache.commons.lang3.BooleanUtils; + public class ElligibleBoatImpl extends ElligibleBoatAbstract { @Override public boolean isBoatElligible() { - boolean boatElligible = getCompanyActive() == null && isGlobalActive() || getCompanyActive(); + boolean boatElligible = getCompanyActive() == null && isGlobalActive() + || BooleanUtils.isTrue(getCompanyActive()); return boatElligible; } } Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleRowLogImpl.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleRowLogImpl.java 2014-04-29 12:43:33 UTC (rev 1913) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleRowLogImpl.java 2014-04-29 13:37:37 UTC (rev 1914) @@ -315,23 +315,28 @@ Collection<ElligibleBoat> newEligibleBoats = newRow.getElligibleBoat(); // Lists for boats by status - List<Integer> noLongerEligibleBoats = new ArrayList<>(); - List<Integer> stillEligibleBoats = new ArrayList<>(); - List<Integer> newlyEligibleBoats = new ArrayList<>(); + List<String> noLongerEligibleBoats = new ArrayList<>(); + List<String> stillEligibleBoats = new ArrayList<>(); + List<String> newlyEligibleBoats = new ArrayList<>(); // filling the three lists - for (ElligibleBoat oldEligibleBoat : oldEligibleBoats) { - if ( ! newEligibleBoats.contains(oldEligibleBoat)) { - Boat boat = oldEligibleBoat.getBoat(); - int plateNumber = boat.getImmatriculation(); - noLongerEligibleBoats.add(plateNumber); - } - } - for (ElligibleBoat newEligibleBoat : newEligibleBoats) { - if (oldEligibleBoats.contains(newEligibleBoat)) { - stillEligibleBoats.add(newEligibleBoat.getBoat().getImmatriculation()); + for (ElligibleBoat eligibleBoat : newEligibleBoats) { + boolean boatIsElligible = eligibleBoat.isGlobalActive(); + boolean boatWasElligible = oldRow != null + && oldRow.getElligibleBoatByBoat(eligibleBoat.getBoat()).isGlobalActive(); + String registrationCode = String.valueOf(eligibleBoat.getBoat().getImmatriculation()); + if (boatWasElligible) { + if (boatIsElligible) { + stillEligibleBoats.add(registrationCode); + } else { + noLongerEligibleBoats.add(registrationCode); + } } else { - newlyEligibleBoats.add(newEligibleBoat.getBoat().getImmatriculation()); + if (boatIsElligible) { + newlyEligibleBoats.add(registrationCode); + } else { + throw new IllegalStateException("boat " + registrationCode + " was not and is not elligible for row " + newRow); + } } } @@ -340,10 +345,10 @@ addChange("Les navires suivants ne sont plus éligibles : " + StringUtils.join(noLongerEligibleBoats, ", ")); } -// if ( ! stillEligibleBoats.isEmpty()) { -// addChange("Les navires suivants sont toujours éligibles ; " + -// StringUtils.join(stillEligibleBoats, ", ")); -// } + if ( ! stillEligibleBoats.isEmpty()) { + addChange("Les navires suivants sont toujours éligibles : " + + StringUtils.join(stillEligibleBoats, ", ")); + } if ( ! newlyEligibleBoats.isEmpty()) { addChange("Les navires suivants deviennent éligibles : " + StringUtils.join(newlyEligibleBoats, ", ")); Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleRowTopiaDao.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleRowTopiaDao.java 2014-04-29 12:43:33 UTC (rev 1913) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleRowTopiaDao.java 2014-04-29 13:37:37 UTC (rev 1914) @@ -153,4 +153,14 @@ } + public void detach(SampleRow sampleRow) { + sampleRow.sizedCF5Code(); + sampleRow.sizeElligibleBoat(); + sampleRow.sizeFishingZone(); + sampleRow.sizeObservers(); + sampleRow.sizeSampleMonth(); + sampleRow.sizeTerrestrialLocations(); + topiaHibernateSupport.getHibernateSession().evict(sampleRow); + } + } Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanService.java 2014-04-29 12:43:33 UTC (rev 1913) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanService.java 2014-04-29 13:37:37 UTC (rev 1914) @@ -104,15 +104,19 @@ Preconditions.checkState(authenticatedWaoUser.isAuthorizedToCreateSampleRow()); - UpdateSampleRowCommand updateSampleRowCommand = - new UpdateSampleRowCommand(); + UpdateSampleRowCommand updateSampleRowCommand = new UpdateSampleRowCommand(); if (optionalSampleRowId.isPresent()) { String sampleRowId = optionalSampleRowId.get(); - SampleRow sampleRow = getSampleRow(sampleRowId); + SampleRowTopiaDao sampleRowDao = getSampleRowDao(); + SampleRow sampleRowMemento = sampleRowDao.findByTopiaId(sampleRowId); + sampleRowDao.detach(sampleRowMemento); + updateSampleRowCommand.setSampleRowMemento(sampleRowMemento); + + SampleRow sampleRow = sampleRowDao.findByTopiaId(sampleRowId); updateSampleRowCommand.setSampleRow(sampleRow); updateSampleRowCommand.setCreation(false); @@ -329,6 +333,7 @@ if (!updateSampleRowCommand.isCreation()) { SampleRowLog sampleRowLog = updateSampleRowCommand.getSampleRowLog(); getSampleRowLogDao().create(sampleRowLog); + sampleRowLog.setLogText(updateSampleRowCommand.getSampleRowMemento(), sampleRow); } ElligibleBoatTopiaDao elligibleBoatDao = getElligibleBoatDao();

1 0

r1913 - in trunk: wao-services/src/main/java/fr/ifremer/wao/services wao-web/src/main/java/fr/ifremer/wao/web
by bleny＠users.forge.codelutin.com April 29, 2014

April 29, 2014

Author: bleny Date: 2014-04-29 14:43:33 +0200 (Tue, 29 Apr 2014) New Revision: 1913 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1913 Log: refs #4496 reset session on logout Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoSession.java Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java 2014-04-29 12:30:46 UTC (rev 1912) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java 2014-04-29 12:43:33 UTC (rev 1913) @@ -51,10 +51,6 @@ return waoUser; } - public void logout() { - - } - public boolean isAdmin() { return userProfile.isAdmin(); } Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoSession.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoSession.java 2014-04-29 12:30:46 UTC (rev 1912) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoSession.java 2014-04-29 12:43:33 UTC (rev 1913) @@ -77,8 +77,15 @@ } public void logout() { - authenticatedWaoUser.logout(); - authenticatedWaoUser = null; + messages = null; + errorMessages = null; + authenticatedWaoUser= null; + sampleRowToHighlightId= null; + contactToHighlightId= null; + startBoatSelectionForSampleRowId= null; + sampleRowsFilter= null; + boatsFilter= null; + contactsFilter= null; } public AuthenticatedWaoUser getAuthenticatedWaoUser() {

1 0