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

r2023 - in trunk: . wao-web
by bleny＠users.forge.codelutin.com June 12, 2014

June 12, 2014

Author: bleny Date: 2014-06-12 09:21:00 +0200 (Thu, 12 Jun 2014) New Revision: 2023 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2023 Log: fix build Modified: trunk/pom.xml trunk/wao-web/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-06-11 17:28:47 UTC (rev 2022) +++ trunk/pom.xml 2014-06-12 07:21:00 UTC (rev 2023) @@ -371,12 +371,6 @@ <version>${jsoupVersion}</version> </dependency> - <dependency> - <groupId>net.sf.ehcache</groupId> - <artifactId>ehcache-core</artifactId> - <version>${ehCacheVersion}</version> - </dependency> - </dependencies> </dependencyManagement> Modified: trunk/wao-web/pom.xml =================================================================== --- trunk/wao-web/pom.xml 2014-06-11 17:28:47 UTC (rev 2022) +++ trunk/wao-web/pom.xml 2014-06-12 07:21:00 UTC (rev 2023) @@ -163,11 +163,6 @@ <artifactId>jsoup</artifactId> </dependency> - <dependency> - <groupId>net.sf.ehcache</groupId> - <artifactId>ehcache-core</artifactId> - </dependency> - </dependencies> <build>

1 0

r2022 - in trunk: . 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 wao-services/src/test/java/fr/ifremer/wao/services/service wao-web/src/main/java/fr/ifremer/wao/web wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer wao-web/src/main/webapp/WEB-INF/content/obsmer
by athimel＠users.forge.codelutin.com June 11, 2014

June 11, 2014

Author: athimel Date: 2014-06-11 19:28:47 +0200 (Wed, 11 Jun 2014) New Revision: 2022 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2022 Log: refs #4490 use new pagination beans Removed: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/PaginationBean.java Modified: trunk/pom.xml trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/BoatTopiaDao.java trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactTopiaDao.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerBoatsList.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/ObsMerContactsList.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerContactsService.java trunk/wao-services/src/test/java/fr/ifremer/wao/services/FakeWaoApplicationContext.java trunk/wao-services/src/test/java/fr/ifremer/wao/services/service/ObsMerBoatsServiceTest.java trunk/wao-services/src/test/java/fr/ifremer/wao/services/service/ObsMerContactsServiceTest.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/DefaultWaoApplicationContext.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoInterceptor.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoJspActionSupport.java 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/webapp/WEB-INF/content/obsmer/boats.jsp trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-06-10 16:02:27 UTC (rev 2021) +++ trunk/pom.xml 2014-06-11 17:28:47 UTC (rev 2022) @@ -100,7 +100,7 @@ <projectId>wao</projectId>  - <h2Version>1.4.178</h2Version> + <h2Version>1.3.176</h2Version> <struts2Version>2.3.16.3</struts2Version> <jqueryPluginVersion>3.7.1</jqueryPluginVersion> <bootstrapPluginVersion>1.7.0</bootstrapPluginVersion> @@ -119,8 +119,8 @@ <nuitonCsvVersion>3.0-rc-2</nuitonCsvVersion> <nuitonValidatorVersion>3.0-rc-1</nuitonValidatorVersion> <nuitonUtilsVersion>3.0-SNAPSHOT</nuitonUtilsVersion> - <eugeneVersion>2.9</eugeneVersion> - <topiaVersion>3.0-beta-4</topiaVersion> + <eugeneVersion>2.10</eugeneVersion> + <topiaVersion>3.0-beta-5</topiaVersion>  <locales>fr</locales> Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/BoatTopiaDao.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/BoatTopiaDao.java 2014-06-10 16:02:27 UTC (rev 2021) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/BoatTopiaDao.java 2014-06-11 17:28:47 UTC (rev 2022) @@ -30,8 +30,8 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.HqlAndParametersBuilder; import org.nuiton.topia.persistence.TopiaEntity; -import org.nuiton.topia.persistence.pager.TopiaPagerBean; -import org.nuiton.util.PagerBeanUtil; +import org.nuiton.util.pagination.PaginationParameter; +import org.nuiton.util.pagination.PaginationResult; import java.util.List; @@ -40,22 +40,6 @@ /** Logger. */ private static final Log log = LogFactory.getLog(BoatTopiaDao.class); - public TopiaPagerBean newPager(BoatsFilter filter, - int pageSize, - int pageIndex, - String sortProperty, - boolean sortAscendant) { - - HqlAndParametersBuilder<Boat> query = toBoatHqlAndParametersBuilder(filter); - - TopiaPagerBean pager = newPager(query.getHql(), query.getHqlParameters(), pageSize); - pager.setPageIndex(pageIndex); - PagerBeanUtil.computeRecordIndexesAndPagesNumber(pager); - pager.setSortColumn(sortProperty); - pager.setSortAscendant(sortAscendant); - return pager; - } - public List<Boat> findAll(BoatsFilter filter) { HqlAndParametersBuilder<Boat> query = toBoatHqlAndParametersBuilder(filter); @@ -65,11 +49,11 @@ return boats; } - public List<Boat> find(BoatsFilter filter, TopiaPagerBean pager) { + public PaginationResult<Boat> find(BoatsFilter filter, PaginationParameter pager) { HqlAndParametersBuilder<Boat> query = toBoatHqlAndParametersBuilder(filter); - List<Boat> boats = find(query.getHql(), query.getHqlParameters(), pager); + PaginationResult<Boat> boats = forHql(query.getHql(), query.getHqlParameters()).findPage(pager); return boats; } Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactTopiaDao.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactTopiaDao.java 2014-06-10 16:02:27 UTC (rev 2021) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactTopiaDao.java 2014-06-11 17:28:47 UTC (rev 2022) @@ -38,8 +38,6 @@ import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.TopiaQueryBuilderAddCriteriaOrRunQueryStep; import org.nuiton.topia.persistence.TopiaQueryBuilderRunQueryStep; -import org.nuiton.topia.persistence.pager.TopiaPagerBean; -import org.nuiton.util.PagerBeanUtil; import java.util.Arrays; import java.util.Calendar; @@ -84,25 +82,6 @@ return sampleRowIds; } - public TopiaPagerBean newPager(ContactsFilter filter, - int pageSize, - int pageIndex) { - - HqlAndParametersBuilder<Contact> query = toContactHqlAndParametersBuilder(filter); - - TopiaPagerBean pager = newPager(query.getHql(), query.getHqlParameters(), pageSize); - pager.setPageIndex(pageIndex); - PagerBeanUtil.computeRecordIndexesAndPagesNumber(pager); - - if (filter.isSortedByBoardingDate()) { - pager.setSortColumn(Contact.PROPERTY_OBSERVATION_BEGIN_DATE); - } else { - pager.setSortColumn(Contact.PROPERTY_CREATION_DATE); - } - pager.setSortAscendant(false); - return pager; - } - protected HqlAndParametersBuilder<Contact> toContactHqlAndParametersBuilder(ContactsFilter filter) { HqlAndParametersBuilder<Contact> query = newHqlAndParametersBuilder(); Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerBoatsList.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerBoatsList.java 2014-06-10 16:02:27 UTC (rev 2021) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerBoatsList.java 2014-06-11 17:28:47 UTC (rev 2022) @@ -26,6 +26,8 @@ import java.io.Serializable; import java.util.List; +import org.nuiton.util.pagination.PaginationResult; + /** * Created on 4/1/14. * @@ -36,25 +38,15 @@ private static final long serialVersionUID = 1L; - protected PaginationBean pagination; + protected PaginationResult<Boat> boats; - protected List<Boat> boats; - protected BoatsFilterValues filterValues; - public PaginationBean getPagination() { - return pagination; - } - - public void setPagination(PaginationBean pagination) { - this.pagination = pagination; - } - - public List<Boat> getBoats() { + public PaginationResult<Boat> getBoats() { return boats; } - public void setBoats(List<Boat> boats) { + public void setBoats(PaginationResult<Boat> boats) { this.boats = boats; } 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-10 16:02:27 UTC (rev 2021) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerBoatsService.java 2014-06-11 17:28:47 UTC (rev 2022) @@ -47,7 +47,8 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.csv.Export; import org.nuiton.csv.ExportModel; -import org.nuiton.topia.persistence.pager.TopiaPagerBean; +import org.nuiton.util.pagination.PaginationParameter; +import org.nuiton.util.pagination.PaginationResult; import java.io.InputStream; import java.util.Collection; @@ -105,36 +106,23 @@ public ObsMerBoatsList getBoatsList(AuthenticatedWaoUser authenticatedWaoUser, BoatsFilter filter, - TopiaPagerBean queryPager) { + PaginationParameter pager) { BoatTopiaDao dao = getBoatDao(); - TopiaPagerBean pager = dao.newPager(filter, - queryPager.getPageSize(), - queryPager.getPageIndex(), - queryPager.getSortColumn(), - queryPager.isSortAscendant()); + PaginationResult<Boat> boats = dao.find(filter, pager); - List<Boat> boats = dao.find(filter, pager); - - PaginationBean paginationBean = new PaginationBean(pager, 10); - BoatsFilterValues boatsFilterValues = getBoatsFilterValues(authenticatedWaoUser, filter); ObsMerBoatsList obsMerBoatsList = new ObsMerBoatsList(); obsMerBoatsList.setBoats(boats); - obsMerBoatsList.setPagination(paginationBean); obsMerBoatsList.setFilterValues(boatsFilterValues); return obsMerBoatsList; } - public TopiaPagerBean newBoatsPager(int pageSize) { - TopiaPagerBean queryPager = new TopiaPagerBean(); - queryPager.setPageSize(pageSize); - queryPager.setPageIndex(1); - queryPager.setSortColumn(Boat.PROPERTY_NAME); - queryPager.setSortAscendant(true); - return queryPager; + public PaginationParameter newBoatsPaginationParameter(int pageNumber, int pageSize) { + PaginationParameter result = PaginationParameter.of(pageNumber, pageSize, Boat.PROPERTY_NAME, false); + return result; } public BoatsFilter newBoatsFilter(AuthenticatedWaoUser authenticatedWaoUser) { @@ -274,11 +262,11 @@ public Collection<Boat> getBoats(BoatsFilter boatsFilter, int pageSize) { - TopiaPagerBean pager = newBoatsPager(pageSize); + PaginationParameter pager = newBoatsPaginationParameter(0, pageSize); - List<Boat> boats = getBoatDao().find(boatsFilter, pager); + PaginationResult<Boat> boats = getBoatDao().find(boatsFilter, pager); - return boats; + return boats.getElements(); } } Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerContactsList.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerContactsList.java 2014-06-10 16:02:27 UTC (rev 2021) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerContactsList.java 2014-06-11 17:28:47 UTC (rev 2022) @@ -26,6 +26,8 @@ import java.io.Serializable; import java.util.List; +import org.nuiton.util.pagination.PaginationResult; + /** * Created on 4/3/14. * @@ -36,25 +38,15 @@ private static final long serialVersionUID = 1L; - protected PaginationBean pagination; + protected PaginationResult<Contact> contacts; - protected List<Contact> contacts; - protected ContactsFilterValues filterValues; - public PaginationBean getPagination() { - return pagination; - } - - public void setPagination(PaginationBean pagination) { - this.pagination = pagination; - } - - public List<Contact> getContacts() { + public PaginationResult<Contact> getContacts() { return contacts; } - public void setContacts(List<Contact> contacts) { + public void setContacts(PaginationResult<Contact> contacts) { this.contacts = contacts; } 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-10 16:02:27 UTC (rev 2021) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerContactsService.java 2014-06-11 17:28:47 UTC (rev 2022) @@ -65,11 +65,12 @@ import org.nuiton.csv.ImportRow; import org.nuiton.i18n.I18n; import org.nuiton.topia.persistence.TopiaEntity; -import org.nuiton.topia.persistence.pager.TopiaPagerBean; import org.nuiton.util.DateUtil; import org.nuiton.util.StringUtil; import org.nuiton.util.beans.Binder; import org.nuiton.util.beans.BinderFactory; +import org.nuiton.util.pagination.PaginationParameter; +import org.nuiton.util.pagination.PaginationResult; import java.io.InputStream; import java.util.Calendar; @@ -108,32 +109,32 @@ public ObsMerContactsList getContactsList(AuthenticatedWaoUser authenticatedWaoUser, ContactsFilter filter, - TopiaPagerBean queryPager) { + PaginationParameter queryPager) { ContactTopiaDao dao = getContactDao(); - TopiaPagerBean pager = dao.newPager(filter, - queryPager.getPageSize(), - queryPager.getPageIndex()); + // Need to copy to add sort attributes + PaginationParameter.PaginationParameterBuilder builder = PaginationParameter.builder(queryPager.getPageNumber(), queryPager.getPageSize()); + if (filter.isSortedByBoardingDate()) { + builder.addOrder(Contact.PROPERTY_OBSERVATION_BEGIN_DATE, true); + } else { + builder.addOrder(Contact.PROPERTY_CREATION_DATE, true); + } + PaginationParameter pager = builder.build(); - List<Contact> contacts = dao.forFilter(filter, false).find(pager); + PaginationResult<Contact> contacts = dao.forFilter(filter, false).findPage(pager); - PaginationBean paginationBean = new PaginationBean(pager, 10); - ContactsFilterValues filterValues = getContactsFilterValues(authenticatedWaoUser, filter); ObsMerContactsList contactsList = new ObsMerContactsList(); contactsList.setContacts(contacts); - contactsList.setPagination(paginationBean); contactsList.setFilterValues(filterValues); return contactsList; } - public TopiaPagerBean newContactsPager(int pageSize) { - TopiaPagerBean queryPager = new TopiaPagerBean(); - queryPager.setPageSize(pageSize); - queryPager.setPageIndex(1); - return queryPager; + public PaginationParameter newContactsPaginationParameter(int pageNumber, int pageSize) { + PaginationParameter result = PaginationParameter.of(pageNumber, pageSize); + return result; } public ContactsFilter newContactFilter(AuthenticatedWaoUser authenticatedWaoUser) { Deleted: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/PaginationBean.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/PaginationBean.java 2014-06-10 16:02:27 UTC (rev 2021) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/PaginationBean.java 2014-06-11 17:28:47 UTC (rev 2022) @@ -1,103 +0,0 @@ -package fr.ifremer.wao.services.service; - -/* - * #%L - * Wao :: Services - * %% - * Copyright (C) 2009 - 2014 Ifremer - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ - -import org.nuiton.topia.persistence.pager.TopiaPagerBean; - -import java.io.Serializable; - -/** - * Created on 4/3/14. - * - * @author Tony Chemit <chemit(a)codelutin.com> - * @since 4.0 - */ -public class PaginationBean implements Serializable { - - private static final long serialVersionUID = 1L; - - protected TopiaPagerBean pagerBean; - - protected long firstPage; - - protected long lastPage; - - public PaginationBean(TopiaPagerBean pagerBean, int rangeSize) { - this.pagerBean = pagerBean; - this.firstPage = getPaginationFirstPage(rangeSize); - this.lastPage = getPaginationLastPage(rangeSize, firstPage); - } - - public long getFirstPage() { - return firstPage; - } - - public long getLastPage() { - return lastPage; - } - - public int getCurrentPage() { - return pagerBean.getPageIndex(); - } - - public long getNbPages() { - return pagerBean.getPagesNumber(); - } - - public long getNbRecords() { - return pagerBean.getRecords(); - } - - protected long getPaginationFirstPage(int rangeSize) { - int pageIndex = pagerBean.getPageIndex(); - long result = pageIndex; - long pagesNumber = pagerBean.getPagesNumber(); - if (pagesNumber <= rangeSize || pageIndex < rangeSize) { - // stick to begin - return 1; - } - if (pagesNumber - pageIndex < rangeSize) { - - // just center - result = pagesNumber - rangeSize; - if (result < 1) { - result = 1; - } - return result; - } - - if (pageIndex >= rangeSize) { - - // center - result = pageIndex - (rangeSize / 2); - } - return result; - } - - protected long getPaginationLastPage(int rangeSize, long firstPagination) { - long result = firstPagination + rangeSize; - if (result > pagerBean.getPagesNumber()) { - result = pagerBean.getPagesNumber(); - } - return result; - } -} 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-10 16:02:27 UTC (rev 2021) +++ trunk/wao-services/src/test/java/fr/ifremer/wao/services/FakeWaoApplicationContext.java 2014-06-11 17:28:47 UTC (rev 2022) @@ -99,13 +99,13 @@ log.trace("closing persistence context " + persistenceContext); } - persistenceContext.closeContext(); + persistenceContext.close(); if (log.isTraceEnabled()) { log.trace("closing application context " + applicationContext); } - applicationContext.closeContext(); + applicationContext.close(); File lockFile = new File(databaseRefFile, "h2data.lock.db"); @@ -162,6 +162,7 @@ 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); @@ -180,7 +181,8 @@ log.debug("jdbc url is\n" + jdbcUrl); } - return new WaoTopiaApplicationContext(hibernateH2Config); + WaoTopiaApplicationContext result = new WaoTopiaApplicationContext(hibernateH2Config); + return result; } @@ -239,7 +241,7 @@ @Override public void close() { if (topiaApplicationContext != null) { - topiaApplicationContext.closeContext(); + topiaApplicationContext.close(); } } Modified: trunk/wao-services/src/test/java/fr/ifremer/wao/services/service/ObsMerBoatsServiceTest.java =================================================================== --- trunk/wao-services/src/test/java/fr/ifremer/wao/services/service/ObsMerBoatsServiceTest.java 2014-06-10 16:02:27 UTC (rev 2021) +++ trunk/wao-services/src/test/java/fr/ifremer/wao/services/service/ObsMerBoatsServiceTest.java 2014-06-11 17:28:47 UTC (rev 2022) @@ -27,6 +27,7 @@ import org.junit.Before; import org.junit.Test; import org.nuiton.topia.persistence.pager.TopiaPagerBean; +import org.nuiton.util.pagination.PaginationParameter; /** * Created on 4/1/14. @@ -64,7 +65,7 @@ BoatsFilter filter = service.newBoatsFilter(fixtures.admin()); - TopiaPagerBean pager = service.newBoatsPager(50); + PaginationParameter pager = service.newBoatsPaginationParameter(0, 50); ObsMerBoatsList boatsList = service.getBoatsList(fixtures.admin(), filter, pager); 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-06-10 16:02:27 UTC (rev 2021) +++ trunk/wao-services/src/test/java/fr/ifremer/wao/services/service/ObsMerContactsServiceTest.java 2014-06-11 17:28:47 UTC (rev 2022) @@ -30,8 +30,8 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import org.nuiton.topia.persistence.pager.TopiaPagerBean; import org.nuiton.util.DateUtil; +import org.nuiton.util.pagination.PaginationParameter; import java.io.InputStream; @@ -67,7 +67,7 @@ ContactsFilter filter = service.newContactFilter(fixtures.admin()); - TopiaPagerBean pager = service.newContactsPager(50); + PaginationParameter pager = service.newContactsPaginationParameter(0, 50); ObsMerContactsList contactsList = service.getContactsList(fixtures.admin(), filter, pager); } 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-10 16:02:27 UTC (rev 2021) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/DefaultWaoApplicationContext.java 2014-06-11 17:28:47 UTC (rev 2022) @@ -186,7 +186,7 @@ if (topiaApplicationContext != null) { - topiaApplicationContext.closeContext(); + topiaApplicationContext.close(); } @@ -241,7 +241,7 @@ initWaoService.init(); - persistenceContext.closeContext(); + persistenceContext.close(); } 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-10 16:02:27 UTC (rev 2021) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoInterceptor.java 2014-06-11 17:28:47 UTC (rev 2022) @@ -169,7 +169,7 @@ } finally { - serviceContext.getPersistenceContext().closeContext(); + serviceContext.getPersistenceContext().close(); } Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoJspActionSupport.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoJspActionSupport.java 2014-06-10 16:02:27 UTC (rev 2021) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoJspActionSupport.java 2014-06-11 17:28:47 UTC (rev 2022) @@ -21,13 +21,15 @@ * #L% */ +import java.util.Date; + +import org.apache.commons.lang3.time.DateUtils; +import org.nuiton.util.pagination.PaginationResult; + import fr.ifremer.wao.WaoUtils; import fr.ifremer.wao.entity.ObsProgram; import fr.ifremer.wao.services.AuthenticatedWaoUser; -import org.apache.commons.lang3.time.DateUtils; -import java.util.Date; - public class WaoJspActionSupport extends WaoActionSupport { private static final long serialVersionUID = 1L; @@ -75,11 +77,11 @@ public String formatDateMonth(Date date) { return date == null ? "" : WaoUtils.formatDateMonth(getLocale(), date); } - + public String formatDateYear(Date date) { return date == null ? "" : WaoUtils.formatDateYear(getLocale(), date); } - + public String formatDateTime(Date date) { return date == null ? "" : WaoUtils.formatDateTime(getLocale(), date); } @@ -97,7 +99,7 @@ */ public String getPaginationUrl(String fullUrl) { // remove pageIndex parameter - String paginationUrl = fullUrl.replaceAll("pager\\.pageIndex=([^&])+[&]*", ""); + String paginationUrl = fullUrl.replaceAll("pageNumber=([^&])+[&]*", ""); // clean & paginationUrl = paginationUrl.replaceAll("&&", "&"); // add [?|&]pageIndex= @@ -106,7 +108,7 @@ } else if (!paginationUrl.endsWith("?")) { paginationUrl += "&"; } - paginationUrl += "pager.pageIndex="; + paginationUrl += "pageNumber="; return paginationUrl; } @@ -118,4 +120,38 @@ return new Date(); } + protected long getPaginationFirstPage(PaginationResult<?> paginationResult, int rangeSize) { + int pageIndex = paginationResult.getCurrentPage().getPageNumber(); + long result = pageIndex; + long pagesNumber = paginationResult.getPageCount(); + if (pagesNumber <= rangeSize || pageIndex < rangeSize) { + // stick to begin + return 1; + } + if (pagesNumber - pageIndex < rangeSize) { + + // just center + result = pagesNumber - rangeSize; + if (result < 1) { + result = 1; + } + return result; + } + + if (pageIndex >= rangeSize) { + + // center + result = pageIndex - (rangeSize / 2); + } + return result; + } + + protected long getPaginationLastPage(PaginationResult<?> paginationResult, int rangeSize, long firstPagination) { + long result = firstPagination + rangeSize; + if (result > paginationResult.getPageCount()) { + result = paginationResult.getPageCount(); + } + return result; + } + } 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-10 16:02:27 UTC (rev 2021) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/BoatsAction.java 2014-06-11 17:28:47 UTC (rev 2022) @@ -30,13 +30,13 @@ import fr.ifremer.wao.services.service.ObsMerBoatsList; import fr.ifremer.wao.services.service.ObsMerBoatsService; import fr.ifremer.wao.services.service.ObsMerSamplingPlanService; -import fr.ifremer.wao.services.service.PaginationBean; import fr.ifremer.wao.services.service.administration.CompaniesService; import fr.ifremer.wao.web.WaoJspActionSupport; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.topia.persistence.pager.TopiaPagerBean; +import org.nuiton.util.pagination.PaginationParameter; +import org.nuiton.util.pagination.PaginationResult; import java.util.List; @@ -58,11 +58,12 @@ protected transient ObsMerSamplingPlanService obsMerSamplingPlanService; - /** - * Input pager. - */ - protected TopiaPagerBean pager; + protected int pageNumber; // 1-based page number + protected long firstRangePage; + + protected long lastRangePage; + /** * Boats filter. */ @@ -81,13 +82,6 @@ this.service = service; } - public TopiaPagerBean getPager() { - if (pager == null) { - pager = service.newBoatsPager(25); - } - return pager; - } - public BoatsFilter getFilter() { if (filter == null) { prepare(); @@ -96,15 +90,15 @@ } public List<Boat> getBoats() { - return boatList.getBoats(); + return boatList.getBoats().getElements(); } public BoatsFilterValues getFilterValues() { return boatList.getFilterValues(); } - public PaginationBean getPagination() { - return boatList.getPagination(); + public PaginationResult<Boat> getPagination() { + return boatList.getBoats(); } public void setStartBoatSelectionForSampleRowId(String startBoatSelectionForSampleRowId) { @@ -119,6 +113,10 @@ this.companiesService = companiesService; } + public void setPageNumber(int pageNumber) { + this.pageNumber = pageNumber; + } + @Override public void prepare() { @@ -150,8 +148,12 @@ @Override public String execute() { - boatList = service.getBoatsList(getAuthenticatedWaoUser(), filter, getPager()); + PaginationParameter pager = service.newBoatsPaginationParameter(pageNumber, 25); + boatList = service.getBoatsList(getAuthenticatedWaoUser(), filter, pager); + firstRangePage = getPaginationFirstPage(boatList.getBoats(), 10); + lastRangePage = getPaginationLastPage(boatList.getBoats(), 10, firstRangePage); + return SUCCESS; } @@ -163,4 +165,11 @@ return companiesService.getAllCompanies(); } + public long getFirstRangePage() { + return firstRangePage; + } + + public long getLastRangePage() { + return lastRangePage; + } } 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-10 16:02:27 UTC (rev 2021) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ContactsAction.java 2014-06-11 17:28:47 UTC (rev 2022) @@ -32,10 +32,10 @@ import fr.ifremer.wao.services.service.ContactsFilterValues; import fr.ifremer.wao.services.service.ObsMerContactsList; import fr.ifremer.wao.services.service.ObsMerContactsService; -import fr.ifremer.wao.services.service.PaginationBean; import fr.ifremer.wao.web.WaoJspActionSupport; import org.apache.commons.lang3.time.DateUtils; -import org.nuiton.topia.persistence.pager.TopiaPagerBean; +import org.nuiton.util.pagination.PaginationParameter; +import org.nuiton.util.pagination.PaginationResult; import java.util.Date; import java.util.LinkedHashMap; @@ -54,11 +54,12 @@ protected transient ObsMerContactsService service; - /** - * Input pager. - */ - protected TopiaPagerBean pager; + protected int pageNumber; + protected long firstRangePage; + + protected long lastRangePage; + /** * Contacts filter. */ @@ -73,13 +74,18 @@ this.service = service; } - public TopiaPagerBean getPager() { - if (pager == null) { - pager = service.newContactsPager(50); - } - return pager; + public void setPageNumber(int pageNumber) { + this.pageNumber = pageNumber; } + public long getFirstRangePage() { + return firstRangePage; + } + + public long getLastRangePage() { + return lastRangePage; + } + public ContactsFilter getFilter() { if (filter == null) { prepare(); @@ -88,15 +94,15 @@ } public List<Contact> getContacts() { - return contactsList.getContacts(); + return contactsList.getContacts().getElements(); } public ContactsFilterValues getFilterValues() { return contactsList.getFilterValues(); } - public PaginationBean getPagination() { - return contactsList.getPagination(); + public PaginationResult<Contact> getPagination() { + return contactsList.getContacts(); } @Override @@ -113,8 +119,12 @@ @Override public String execute() { - contactsList = service.getContactsList(getAuthenticatedWaoUser(), filter, getPager()); + PaginationParameter pager = service.newContactsPaginationParameter(pageNumber, 25); + contactsList = service.getContactsList(getAuthenticatedWaoUser(), filter, pager); + firstRangePage = getPaginationFirstPage(contactsList.getContacts(), 10); + lastRangePage = getPaginationLastPage(contactsList.getContacts(), 10, firstRangePage); + return SUCCESS; } 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-10 16:02:27 UTC (rev 2021) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boats.jsp 2014-06-11 17:28:47 UTC (rev 2022) @@ -167,7 +167,7 @@ <div class="arrow-right"></div> <h2> <s:text name="wao.ui.boats.title"> - <s:param value="%{pagination.nbRecords}"/> + <s:param value="%{pagination.count}"/> </s:text> </h2> @@ -250,38 +250,38 @@ <ul> <s:url var="fullUrl" includeParams="get"/> <s:set var="paginationUrl" value="%{getPaginationUrl(#fullUrl)}"/> - <s:if test="pagination.firstPage > 2"> + <s:if test="firstRangePage > 2"> <li> - <a href="${paginationUrl}1">1</a> + <a href="${paginationUrl}0">1</a> </li> <li> - <a href="${paginationUrl}2">2</a> + <a href="${paginationUrl}1">2</a> </li> <li> <span>...</span> </li> </s:if> - <s:iterator var="currentPage" begin="pagination.firstPage" end="pagination.lastPage"> - <li class="<s:if test="#currentPage == pagination.currentPage">active</s:if>"> - <a href="${paginationUrl}${currentPage}"> + <s:iterator var="currentPage" begin="firstRangePage" end="lastRangePage"> + <li class="<s:if test="#currentPage - 1 == pagination.currentPage.pageNumber">active</s:if>"> + <a href="${paginationUrl}${currentPage - 1}"> <s:property/> </a> </li> </s:iterator> - <s:if test="pagination.lastPage < pagination.nbPages - 1"> + <s:if test="lastRangePage < pagination.pageCount - 1"> <li> <span>...</span> </li> <li> - <a href="${paginationUrl}${pagination.nbPages - 1}"> - <s:property value="pagination.nbPages - 1"/> + <a href="${paginationUrl}${pagination.pageCount - 2}"> + <s:property value="pagination.pageCount - 1"/> </a> </li> <li> - <a href="${paginationUrl}${pagination.nbPages}"> - <s:property value="pagination.nbPages"/> + <a href="${paginationUrl}${pagination.pageCount - 1}"> + <s:property value="pagination.pageCount"/> </a> </li> </s:if> 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-10 16:02:27 UTC (rev 2021) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp 2014-06-11 17:28:47 UTC (rev 2022) @@ -233,7 +233,7 @@ <h3> <s:text name="wao.ui.contacts.title"> - <s:param value="%{pagination.nbRecords}"/> + <s:param value="%{pagination.count}"/> </s:text> </h3> @@ -243,38 +243,38 @@ <ul> <s:url var="fullUrl" includeParams="get"/> <s:set var="paginationUrl" value="%{getPaginationUrl(#fullUrl)}"/> - <s:if test="pagination.firstPage > 2"> + <s:if test="firstRangePage > 2"> <li> - <a href="${paginationUrl}1">1</a> + <a href="${paginationUrl}0">1</a> </li> <li> - <a href="${paginationUrl}2">2</a> + <a href="${paginationUrl}1">2</a> </li> <li> <span>...</span> </li> </s:if> - <s:iterator var="currentPage" begin="pagination.firstPage" end="pagination.lastPage"> - <li class="<s:if test="#currentPage == pagination.currentPage">active</s:if>"> - <a href="${paginationUrl}${currentPage}"> + <s:iterator var="currentPage" begin="firstRangePage" end="lastRangePage"> + <li class="<s:if test="#currentPage - 1 == pagination.currentPage.pageNumber">active</s:if>"> + <a href="${paginationUrl}${currentPage - 1}"> <s:property/> </a> </li> </s:iterator> - <s:if test="pagination.lastPage < pagination.nbPages - 1"> + <s:if test="lastRangePage < pagination.pageCount - 1"> <li> <span>...</span> </li> <li> - <a href="${paginationUrl}${pagination.nbPages - 1}"> - <s:property value="pagination.nbPages - 1"/> + <a href="${paginationUrl}${pagination.pageCount - 2}"> + <s:property value="pagination.pageCount - 1"/> </a> </li> <li> - <a href="${paginationUrl}${pagination.nbPages}"> - <s:property value="pagination.nbPages"/> + <a href="${paginationUrl}${pagination.pageCount - 1}"> + <s:property value="pagination.pageCount"/> </a> </li> </s:if>

1 0

r2021 - trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer
by bleny＠users.forge.codelutin.com June 10, 2014

June 10, 2014

Author: bleny Date: 2014-06-10 18:02:27 +0200 (Tue, 10 Jun 2014) New Revision: 2021 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2021 Log: reduce duplication by reusing getNow() Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/SamplingPlanAction.java 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-10 15:10:23 UTC (rev 2020) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/SamplingPlanAction.java 2014-06-10 16:02:27 UTC (rev 2021) @@ -42,8 +42,6 @@ protected ObsMerSamplingPlan samplingPlan; - private Date now; - public void setService(ObsMerSamplingPlanService service) { this.service = service; } @@ -58,8 +56,6 @@ @Override public void prepare() { - now = new Date(); - filter = getSession().getSampleRowsFilter(); if (filter == null) { @@ -99,18 +95,18 @@ public boolean isCurrentMonth(Date month) { - String currentStr = dateFormat.format(now); + String currentStr = dateFormat.format(getNow()); String monthStr = dateFormat.format(month); return currentStr.equals(monthStr); } public String getFilterPeriodFromPlaceholder() { - String placeholder = formatMonth(DateUtils.addMonths(now, 1)); + String placeholder = formatMonth(DateUtils.addMonths(getNow(), 1)); return placeholder; } public String getFilterPeriodToPlaceholder() { - String placeholder = formatMonth(DateUtils.addYears(now, 1)); + String placeholder = formatMonth(DateUtils.addYears(getNow(), 1)); return placeholder; } }

1 0

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

June 10, 2014

Author: bleny Date: 2014-06-10 17:10:23 +0200 (Tue, 10 Jun 2014) New Revision: 2020 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2020 Log: prevent editing multiple fields at the same time in filters 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-10 14:31:39 UTC (rev 2019) +++ trunk/wao-web/src/main/webapp/wao.js 2014-06-10 15:10:23 UTC (rev 2020) @@ -281,6 +281,7 @@ this.model = new FilterModel2(filterMappings, filter, filterValuesUrl); this.view = new FilterView2(this.model, $filtersForm); + this.oneFilterControllers = []; this.init = function () { @@ -289,8 +290,9 @@ $.each(this.model.filterMappings, function (index, filterMapping) { - var oneFilterController = new OneFilterController(filterMapping, self.model); + var oneFilterController = new OneFilterController(filterMapping, self.model, self); oneFilterController.init(); + self.oneFilterControllers.push(oneFilterController); self.view.$filtersForm.append(oneFilterController.view.$container); @@ -308,6 +310,14 @@ }; + this.onOpen = function (openedOneFilterController) { + $.each(this.oneFilterControllers, function (index, oneFilterController) { + if (oneFilterController != openedOneFilterController) { + oneFilterController.close(); + } + }); + } + }; var OneFilterModel = function (filterMapping, filterModel) { @@ -480,12 +490,13 @@ }; -var OneFilterController = function (filterMapping, filterModel) { +var OneFilterController = function (filterMapping, filterModel, filterController) { var self = this; this.model = new OneFilterModel(filterMapping, filterModel); this.view = new OneFilterView(this.model); + this.filterController = filterController; this.init = function () { @@ -514,10 +525,11 @@ }; this.open = function () { + this.filterController.onOpen(this); this.model.updateOptions(); this.view.show(); this.view.lockSelection(); - } + }; this.close = function () { this.view.updateSelectedOptions();

1 0

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

June 10, 2014

Author: bleny Date: 2014-06-10 16:31:39 +0200 (Tue, 10 Jun 2014) New Revision: 2019 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2019 Log: fixes #5049 fixes #5188 add observation time in days in plan and contacts Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactImpl.java trunk/wao-persistence/src/main/xmi/wao-model.zargo trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlan.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanService.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/sampling-plan.jsp 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-10 13:46:37 UTC (rev 2018) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactImpl.java 2014-06-10 14:31:39 UTC (rev 2019) @@ -26,6 +26,7 @@ import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.StringUtils; +import org.nuiton.util.DateUtil; import java.util.Date; import java.util.LinkedList; @@ -226,4 +227,13 @@ return getValidationProgram() != null; } + @Override + public Integer getObservationTimeInDays() { + Integer observationTimeInDays = null; + if (getObservationBeginDate() != null && getObservationEndDate() != null) { + // +1 car demandé par le métier + observationTimeInDays = DateUtil.getDifferenceInDays(getObservationBeginDate(), getObservationEndDate()) + 1; + } + return observationTimeInDays; + } } Modified: trunk/wao-persistence/src/main/xmi/wao-model.zargo =================================================================== (Binary files differ) Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlan.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlan.java 2014-06-10 13:46:37 UTC (rev 2018) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlan.java 2014-06-10 14:31:39 UTC (rev 2019) @@ -298,6 +298,10 @@ */ protected Long observationTimesInDaysEstimated; + protected Integer observationTimesInDaysEstimatedPercentage; + + protected Integer observationTimesInDaysRealPercentage; + protected String fishingZones; protected int nbObservants; @@ -400,6 +404,14 @@ } } + if (observationTimesInDaysExpected != null && observationTimesInDaysExpected > 0) { + if (observationTimesInDaysEstimated != null) { + observationTimesInDaysEstimatedPercentage = (int) Math.round((observationTimesInDaysEstimated / observationTimesInDaysExpected) * 100); + } + if (observationTimesInDaysReal != null) { + observationTimesInDaysRealPercentage = (int) Math.round((observationTimesInDaysReal / observationTimesInDaysExpected) * 100); + } + } totalTides = new ObsMerSamplingPlanStatistics(totalTidesExpected, totalTidesReal, totalTidesEstimated); fishingZones = ""; @@ -626,6 +638,14 @@ return observationTimesInDaysEstimated; } + public Integer getObservationTimesInDaysRealPercentage() { + return observationTimesInDaysRealPercentage; + } + + public Integer getObservationTimesInDaysEstimatedPercentage() { + return observationTimesInDaysEstimatedPercentage; + } + public boolean isElligibleBoatsProvided() { return elligibleBoatsProvided; } 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-06-10 13:46:37 UTC (rev 2018) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanService.java 2014-06-10 14:31:39 UTC (rev 2019) @@ -689,20 +689,22 @@ long real = 0; long estimated = 0; for (Contact contact : contacts) { - double actualInMinutes = DateUtil.getDifferenceInMinutes( - contact.getObservationBeginDate(), - contact.getObservationEndDate()); - Boolean validationCompany = contact.getValidationCompany(); - double contactInDays = Math.ceil(actualInMinutes / minutesPerDay); + Integer observationTimeInDays = contact.getObservationTimeInDays(); - if (BooleanUtils.isTrue(validationCompany)) { - // real observation - real += contactInDays; + if (observationTimeInDays != null) { + + if (BooleanUtils.isTrue(contact.getValidationCompany())) { + // real observation + real += observationTimeInDays; + } + // estimated observation + estimated += observationTimeInDays; + } - // estimated observation - estimated += contactInDays; + } + return Pair.of(real, estimated); } 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-10 13:46:37 UTC (rev 2018) +++ trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-06-10 14:31:39 UTC (rev 2019) @@ -209,6 +209,7 @@ wao.ui.field.Contact.mammalsObservation=Exceptional observation wao.ui.field.Contact.nbObservants=Nb Observants wao.ui.field.Contact.obsDebCode=Profession +wao.ui.field.Contact.observationTimeInDays=Observation time in days wao.ui.field.Contact.observationType=Observation type wao.ui.field.Contact.observedDataControl=Observed Data control wao.ui.field.Contact.restitution=Restitution 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-10 13:46:37 UTC (rev 2018) +++ trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-06-10 14:31:39 UTC (rev 2019) @@ -209,6 +209,7 @@ wao.ui.field.Contact.mammalsObservation=Observation exceptionnelle wao.ui.field.Contact.nbObservants=Nb obs. wao.ui.field.Contact.obsDebCode=Métier +wao.ui.field.Contact.observationTimeInDays=Jours d'observation wao.ui.field.Contact.observationType=Type d'observation wao.ui.field.Contact.observedDataControl=Contrôle des données observées wao.ui.field.Contact.restitution=Transmission de la restitution 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-10 13:46:37 UTC (rev 2018) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp 2014-06-10 14:31:39 UTC (rev 2019) @@ -316,6 +316,7 @@ <th><s:text name="wao.ui.field.Contact.contactState"/> (<s:text name="wao.ui.field.Contact.contactStateMotif"/>)</th> <th class="date-time"><s:text name="wao.ui.field.Contact.beginDate"/></th> <th class="date-time"><s:text name="wao.ui.field.Contact.endDate"/></th> + <th class="date-time"><s:text name="wao.ui.field.Contact.observationTimeInDays"/></th> <th class="date"><s:text name="wao.ui.field.Contact.dataInputDate"/></th> <th><s:text name="wao.ui.field.Contact.observedDataControl"/></th> <th class="date"><s:text name="wao.ui.field.Contact.restitution"/></th> @@ -414,6 +415,11 @@ <s:property value="observationEndDate"/> </s:if> </td> + <td> + <s:if test="observationTimeInDays != null"> + <s:property value="observationTimeInDays"/> + </s:if> + </td> <td class="date"> <s:if test="dataInputDate != null"> <s:property value="dataInputDate"/> 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-10 13:46:37 UTC (rev 2018) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 2014-06-10 14:31:39 UTC (rev 2019) @@ -396,7 +396,6 @@ <span class="real"> (<s:property value="totalRealPercentage" />) </span> - </s:if> </td> <td class="effort"> @@ -413,6 +412,15 @@ <s:property value="observationTimesInDaysExpected" /> <s:text name="wao.ui.misc.day"/> + <s:if test="authenticatedWaoUser.authorizedToViewSamplingPlanReal"> + <span class="estimated<s:if test="observationTimesInDaysEstimated < observationTimesInDaysExpected"> lower-than-expected</s:if><s:if test="observationTimesInDaysEstimated > observationTimesInDaysExpected"> higher-than-expected</s:if>"> + <s:property value="observationTimesInDaysEstimatedPercentage" /> % + </span> + <span class="real<s:if test="observationTimesInDaysReal < observationTimesInDaysExpected"> lower-than-expected</s:if><s:if test="observationTimesInDaysReal > observationTimesInDaysExpected"> higher-than-expected</s:if>"> + <s:property value="observationTimesInDaysRealPercentage" /> % + </span> + </s:if> + </td> <td><s:property value="averageTideTime" /></td> <td><s:property value="nbObservants" /></td>

1 0

r2018 - trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer
by bleny＠users.forge.codelutin.com June 10, 2014

June 10, 2014

Author: bleny Date: 2014-06-10 15:46:37 +0200 (Tue, 10 Jun 2014) New Revision: 2018 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2018 Log: refs #4483 better th for observationTimesInDays 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-06-10 13:34:51 UTC (rev 2017) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 2014-06-10 13:46:37 UTC (rev 2018) @@ -248,7 +248,18 @@  <th> <s:text name="wao.ui.samplingPlan.observationTimesInDays"/> - [ <s:text name="wao.ui.samplingPlan.expected"/><em>(<s:text name="wao.ui.samplingPlan.actual"/><s:if test="estimatedTides"> + <s:text name="wao.ui.samplingPlan.estimated"/></s:if>)</em> ] + <s:if test="authenticatedWaoUser.authorizedToViewSamplingPlanReal"> + [ + <span class="estimated"> + (<s:text name="wao.ui.samplingPlan.actual" /> + <s:text name="wao.ui.samplingPlan.estimated" />) + </span> + <span class="real"> + <s:text name="wao.ui.samplingPlan.actual" /> + </span> + / + <s:text name="wao.ui.samplingPlan.expected"/> + ] + </s:if> </th> <th> <s:text name="wao.ui.samplingPlan.averageTideTime"/>

1 0

r2017 - in trunk: wao-persistence/src/main/java/fr/ifremer/wao/entity wao-persistence/src/main/xmi wao-services/src/main/java/fr/ifremer/wao/services
by bleny＠users.forge.codelutin.com June 10, 2014

June 10, 2014

Author: bleny Date: 2014-06-10 15:34:51 +0200 (Tue, 10 Jun 2014) New Revision: 2017 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2017 Log: fixes #5068 Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/UserProfileImpl.java trunk/wao-persistence/src/main/xmi/wao-model.zargo trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/UserProfileImpl.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/UserProfileImpl.java 2014-06-10 13:17:12 UTC (rev 2016) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/UserProfileImpl.java 2014-06-10 13:34:51 UTC (rev 2017) @@ -80,7 +80,7 @@ @Override public boolean isReadOnly() { - return ! getCanWrite(); + return ! isCanWrite(); } @Override Modified: trunk/wao-persistence/src/main/xmi/wao-model.zargo =================================================================== (Binary files differ) 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-06-10 13:17:12 UTC (rev 2016) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java 2014-06-10 13:34:51 UTC (rev 2017) @@ -90,8 +90,8 @@ return userProfile.getObsProgram(); } - public Boolean getCanWrite() { - return userProfile.getCanWrite(); + public boolean isCanWrite() { + return userProfile.isCanWrite(); } public UserRole getUserRole() { @@ -108,41 +108,41 @@ || isAuthorizedToSetObserver() || isAuthorizedToSetGuest() || isAuthorizedToSetProfessional(); - return authorizedToChangeUserRights; + return authorizedToChangeUserRights && isCanWrite(); } public boolean isAuthorizedToActiveUser() { - return userProfile.isAdmin(); + return userProfile.isAdmin() && isCanWrite(); } public boolean isAuthorizedToChangeUserCompany() { - return userProfile.isAdmin(); + return userProfile.isAdmin() && isCanWrite(); } public boolean isAuthorizedToSetAdmin() { - return userProfile.isAdmin(); + return userProfile.isAdmin() && isCanWrite(); } public boolean isAuthorizedToSetCoordinator() { - return userProfile.isAdmin(); + return userProfile.isAdmin() && isCanWrite(); } public boolean isAuthorizedToSetObserver() { boolean authorizedToSetObserver = userProfile.isAdmin() || userProfile.isCoordinator(); - return authorizedToSetObserver; + return authorizedToSetObserver && isCanWrite(); } public boolean isAuthorizedToSetGuest() { - return userProfile.isAdmin(); + return userProfile.isAdmin() && isCanWrite(); } public boolean isAuthorizedToSetProfessional() { - return userProfile.isAdmin(); + return userProfile.isAdmin() && isCanWrite(); } public boolean isAuthorizedToUpdateReferential() { - return userProfile.isAdmin(); + return userProfile.isAdmin() && isCanWrite(); } public boolean isAuthorizedToViewCompanies() { @@ -154,7 +154,7 @@ } public boolean isAuthorizedToCreateNews() { - return userProfile.isAdmin() || userProfile.isCoordinator(); + return (userProfile.isAdmin() || userProfile.isCoordinator()) && isCanWrite(); } public boolean isAuthorizedToEditOrDeleteNews(News news) { @@ -167,31 +167,31 @@ } else { authorizedToEditOrDeleteNews = false; } - return authorizedToEditOrDeleteNews; + return authorizedToEditOrDeleteNews && isCanWrite(); } public boolean isAuthorizedToCreateSampleRow() { - return userProfile.isAdmin(); + return userProfile.isAdmin() && isCanWrite(); } public boolean isAuthorizedToCommentSampleRow() { - return userProfile.isCoordinator(); + return userProfile.isCoordinator() && isCanWrite(); } public boolean isAuthorizedToImportSamplingPlan() { - return userProfile.isAdmin(); + return userProfile.isAdmin() && isCanWrite(); } public boolean isAuthorizedToImportContacts() { - return userProfile.isAdmin(); + return userProfile.isAdmin() && isCanWrite(); } public boolean isAuthorizedToEditSamplingPlan() { - return userProfile.isAdmin(); + return userProfile.isAdmin() && isCanWrite(); } public boolean isAuthorizedToCreateContact() { - return userProfile.isCoordinatorOrObserver(); + return userProfile.isCoordinatorOrObserver() && isCanWrite(); } public boolean isAuthorizedToViewSamplingPlanReal() { @@ -220,11 +220,12 @@ } public boolean isAuthorizedToEditOrDeleteContact(Contact contact) { - return isAuthorizedToEditContact(contact) || isAuthorizedToDeleteContact(contact); + boolean authorizedToEditOrDeleteContact = (isAuthorizedToEditContact(contact) || isAuthorizedToDeleteContact(contact)) && isCanWrite(); + return authorizedToEditOrDeleteContact; } public boolean isAuthorizedToEditContact(Contact contact) { - boolean canEdit = getCanWrite() && + boolean canEdit = isCanWrite() && // user is admin and no validation program (!isReadOnly() && isAdmin() && contact.getValidationProgram() == null @@ -238,43 +239,21 @@ public boolean isAuthorizedToDeleteContact(Contact contact) { boolean noValidation = contact.getValidationProgram() == null && contact.getValidationCompany() == null; - return noValidation && getCanWrite(); + return noValidation && isCanWrite(); } public boolean isAuthorizedToChangeValidationCompany() { - return userProfile.isCoordinator(); + return userProfile.isCoordinator() && isCanWrite(); } public boolean isAuthorizedToChangeValidationProgram() { - return userProfile.isAdmin(); + return userProfile.isAdmin() && isCanWrite(); } public boolean isAuthorizedToChangeContactValidation() { return isAuthorizedToChangeValidationCompany() || isAuthorizedToChangeValidationProgram(); } - public boolean isAuthorizedToUnvalidateContact(Contact contact) { - switch (getUserRole()) { - case ADMIN: - return contact.getValidationProgram() != null; - // Evo #2063 : only coordinator can unvalidate - case COORDINATOR: - return contact.getValidationCompany() != null && - contact.getValidationProgram() == null; - default: - return false; - } - } - - public boolean isAuthorizedToDisplayContactSecondaryObservers(Contact contact) { - boolean showSecondaryObservers = true; - if (contact.getSampleRow().isPhoneCall()) { - // when phoning, we are always single - showSecondaryObservers = false; - } - return showSecondaryObservers; - } - public boolean isAuthorizedToDisplayContactDataReliability() { return isAdmin() || isCoordinator(); } @@ -282,22 +261,25 @@ public boolean isAuthorizedToEditContactDataReliability(Contact contact) { boolean result = isAdmin() // coordinator can see the value && BooleanUtils.isTrue(contact.getValidationCompany()) - && contact.getValidationProgram() == null; + && contact.getValidationProgram() == null + && isCanWrite(); return result; } public boolean isAuthorizedToEditContactObservers(Contact contact) { return isCoordinatorOrObserver() && - contact.getValidationProgram() == null; + contact.getValidationProgram() == null + && isCanWrite(); } public boolean isAuthorizedToEditObservationReport(Contact contact) { return isCoordinatorOrObserver() && - contact.getValidationCompany() == null; + contact.getValidationCompany() == null + && isCanWrite(); } public boolean isAuthorizedToAllowUsersToSubscribeToMammalsNotifications() { - return isAdmin(); + return isAdmin() && isCanWrite(); } public boolean isAuthorizedToViewContacts() {

1 0

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

June 10, 2014

Author: bleny Date: 2014-06-10 15:17:12 +0200 (Tue, 10 Jun 2014) New Revision: 2016 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2016 Log: refs #4493 add missing 'n' 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-10 13:14:28 UTC (rev 2015) +++ trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-06-10 13:17:12 UTC (rev 2016) @@ -331,7 +331,7 @@ wao.ui.form.boardingFrom=Boardings since wao.ui.form.boatName.placeholder=Name of boat wao.ui.form.contact.boat.information=Informations sur le bateau -wao.ui.form.contact.sampleRow.information=Informations sur la ligne du plan d'échantillonage +wao.ui.form.contact.sampleRow.information=Informations sur la ligne du plan d'échantillonnage wao.ui.form.contactsFile=Contacts file wao.ui.form.definePasswordManually=Define password manually wao.ui.form.editComment=Edit comment 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-10 13:14:28 UTC (rev 2015) +++ trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-06-10 13:17:12 UTC (rev 2016) @@ -331,7 +331,7 @@ wao.ui.form.boardingFrom=Sollicitations du navire depuis le wao.ui.form.boatName.placeholder=Nom du bateau wao.ui.form.contact.boat.information=Informations sur le bateau -wao.ui.form.contact.sampleRow.information=Informations sur la ligne du plan d'échantillonage +wao.ui.form.contact.sampleRow.information=Informations sur la ligne du plan d'échantillonnage wao.ui.form.contactsFile=Fichier des contacts wao.ui.form.definePasswordManually=définir manuellement wao.ui.form.editComment=Commentaire sur la modification

1 0

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

June 10, 2014

Author: bleny Date: 2014-06-10 15:14:28 +0200 (Tue, 10 Jun 2014) New Revision: 2015 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2015 Log: refs #4493 add checkbox for estimated vs real Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/ContactsFilter.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanService.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/synthesis.jsp Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/ContactsFilter.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/ContactsFilter.java 2014-06-10 12:22:19 UTC (rev 2014) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/ContactsFilter.java 2014-06-10 13:14:28 UTC (rev 2015) @@ -21,6 +21,7 @@ * #L% */ +import com.google.common.collect.Sets; import fr.ifremer.wao.entity.ContactState; import fr.ifremer.wao.entity.DataReliability; import fr.ifremer.wao.entity.ObservationType; @@ -36,6 +37,12 @@ private static final long serialVersionUID = 1L; + protected static final Set<Boolean> PROGRAM_ACCEPTATIONS_FOR_REAL_AND_ESTIMATED = Sets.newHashSet(true, null); + + protected static final Set<Boolean> COMPANY_ACCEPTATIONS_FOR_REAL = Sets.newHashSet(true); + + protected static final Set<Boolean> COMPANY_ACCEPTATIONS_FOR_ESTIMATED = Sets.newHashSet(true, null); + protected SampleRowsFilter sampleRowFilter; protected BoatsFilter boatFilter; @@ -369,4 +376,34 @@ return hashCode; } + public void setRealVsEstimated(boolean realVsEstimated) { + setProgramAcceptations(PROGRAM_ACCEPTATIONS_FOR_REAL_AND_ESTIMATED); + if (realVsEstimated) { + setCompanyAcceptations(COMPANY_ACCEPTATIONS_FOR_REAL); + } else { + setCompanyAcceptations(COMPANY_ACCEPTATIONS_FOR_ESTIMATED); + } + } + + public boolean isRealVsEstimated() { + boolean realVsEstimated; + if (WaoUtils.isEqualCollection(PROGRAM_ACCEPTATIONS_FOR_REAL_AND_ESTIMATED, getProgramAcceptations())) { + if (WaoUtils.isEqualCollection(COMPANY_ACCEPTATIONS_FOR_REAL, getCompanyAcceptations())) { + realVsEstimated = true; + } else if (WaoUtils.isEqualCollection(COMPANY_ACCEPTATIONS_FOR_ESTIMATED, getCompanyAcceptations())) { + realVsEstimated = false; + } else { + throw new IllegalStateException(); + } + } else { + if (CollectionUtils.isEmpty(getCompanyAcceptations()) && CollectionUtils.isEmpty(getCompanyAcceptations())) { + // return default value + realVsEstimated = false; + } else { + throw new IllegalArgumentException(); + } + } + return realVsEstimated; + } + } 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-06-10 12:22:19 UTC (rev 2014) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanService.java 2014-06-10 13:14:28 UTC (rev 2015) @@ -696,7 +696,7 @@ double contactInDays = Math.ceil(actualInMinutes / minutesPerDay); - if (validationCompany != null) { + if (BooleanUtils.isTrue(validationCompany)) { // real observation real += contactInDays; } @@ -784,20 +784,16 @@ for (Contact contact : contacts) { - Boolean validationProgram = contact.getValidationProgram(); - Boolean validationCompany = contact.getValidationCompany(); - - boolean accepted = validationCompany != null || validationProgram != null; - Date observationBeginDate = contact.getObservationBeginDate(); SampleMonth month = sampleRow.getSampleMonth(observationBeginDate); - if (accepted) { + month.setEstimatedTidesValue(month.getEstimatedTidesValue() + 1); + + if (BooleanUtils.isTrue(contact.getValidationCompany())) { month.setRealTidesValue(month.getRealTidesValue() + 1); - } else { - month.setEstimatedTidesValue(month.getEstimatedTidesValue() + 1); } + } } 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-10 12:22:19 UTC (rev 2014) +++ trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-06-10 13:14:28 UTC (rev 2015) @@ -350,6 +350,7 @@ wao.ui.form.program=Program wao.ui.form.programEvaluation=Program evaluation wao.ui.form.readOnly=read-only +wao.ui.form.realTides.description=See the real (not the estimated) wao.ui.form.registrationCode.placeholder=Registration number wao.ui.form.removeRole=remove this role wao.ui.form.repeatPassword=Repeat password 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-10 12:22:19 UTC (rev 2014) +++ trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-06-10 13:14:28 UTC (rev 2015) @@ -350,6 +350,7 @@ wao.ui.form.program=Programme wao.ui.form.programEvaluation=Évaluation programme wao.ui.form.readOnly=lecture seule +wao.ui.form.realTides.description=Voir le réel (et non l'estimé) wao.ui.form.registrationCode.placeholder=Immatriculation wao.ui.form.removeRole=retirer ce role wao.ui.form.repeatPassword=Répéter le mot de passe 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-10 12:22:19 UTC (rev 2014) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/synthesis.jsp 2014-06-10 13:14:28 UTC (rev 2015) @@ -98,16 +98,6 @@ filterName: 'observerIds', filterLabel: "<s:text name="wao.ui.misc.observer"/>", filterValuesField: 'observers' - }, - { - filterName: 'companyAcceptations', - filterLabel: "<s:text name="wao.ui.field.Contact.validationCompany"/>", - filterValuesField: 'companyAcceptations' - }, - { - filterName: 'programAcceptations', - filterLabel: "<s:text name="wao.ui.field.Contact.validationProgram"/>", - filterValuesField: 'programAcceptations' } ]; @@ -166,6 +156,9 @@ <s:checkbox name="filter.commentAdminDefinedOnly" label="%{getText('wao.ui.field.Contact.commentAdmin')}"/> + <s:checkbox name="filter.realVsEstimated" + label="%{getText('wao.ui.form.realTides.description')}"/> + </fieldset> <div class="form-actions">

1 0

r2014 - in trunk: wao-services/src/main/java/fr/ifremer/wao/services wao-web/src/main/webapp/WEB-INF/decorators
by bleny＠users.forge.codelutin.com June 10, 2014

June 10, 2014

Author: bleny Date: 2014-06-10 14:22:19 +0200 (Tue, 10 Jun 2014) New Revision: 2014 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2014 Log: fixes #5116 prevent displaying data to guest Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp 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-06-10 12:11:12 UTC (rev 2013) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java 2014-06-10 12:22:19 UTC (rev 2014) @@ -299,4 +299,17 @@ public boolean isAuthorizedToAllowUsersToSubscribeToMammalsNotifications() { return isAdmin(); } + + public boolean isAuthorizedToViewContacts() { + return ! userProfile.isGuest(); + } + + public boolean isAuthorizedToViewBoats() { + return ! userProfile.isGuest(); + } + + public boolean isAuthorizedToViewSynthesis() { + return ! userProfile.isGuest(); + } + } Modified: trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2014-06-10 12:11:12 UTC (rev 2013) +++ trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2014-06-10 12:22:19 UTC (rev 2014) @@ -68,24 +68,30 @@ <i class="fa fa-calendar"></i> <s:text name="wao.ui.page.SamplingPlan.title" /> </s:a> </li> - <li class="<decorator:getProperty property="page.boatsMenuItemClass"/>"> - <s:url namespace="/%{obsProgram.name().toLowerCase()}" action="boats" id="boatsUrl" /> - <s:a href="%{boatsUrl}"> - <i class="fa fa-anchor"></i> <s:text name="wao.ui.page.Boats.title" /> - </s:a> - </li> - <li class="<decorator:getProperty property="page.contactsMenuItemClass"/>"> - <s:url namespace="/%{obsProgram.name().toLowerCase()}" action="contacts" id="contactsUrl" /> - <s:a href="%{contactsUrl}"> - <i class="fa fa-stack-exchange"></i> <s:text name="wao.ui.page.Contacts.title" /> - </s:a> - </li> - <li class="<decorator:getProperty property="page.synthesisMenuItemClass"/>"> - <s:url namespace="/%{obsProgram.name().toLowerCase()}" action="synthesis" id="synthesisUrl" /> - <s:a href="%{synthesisUrl}"> - <i class="fa fa-bar-chart-o"></i> <s:text name="wao.ui.page.Synthesis.title" /> - </s:a> - </li> + <s:if test="authenticatedWaoUser.authorizedToViewBoats"> + <li class="<decorator:getProperty property="page.boatsMenuItemClass"/>"> + <s:url namespace="/%{obsProgram.name().toLowerCase()}" action="boats" id="boatsUrl" /> + <s:a href="%{boatsUrl}"> + <i class="fa fa-anchor"></i> <s:text name="wao.ui.page.Boats.title" /> + </s:a> + </li> + </s:if> + <s:if test="authenticatedWaoUser.authorizedToViewContacts"> + <li class="<decorator:getProperty property="page.contactsMenuItemClass"/>"> + <s:url namespace="/%{obsProgram.name().toLowerCase()}" action="contacts" id="contactsUrl" /> + <s:a href="%{contactsUrl}"> + <i class="fa fa-stack-exchange"></i> <s:text name="wao.ui.page.Contacts.title" /> + </s:a> + </li> + </s:if> + <s:if test="authenticatedWaoUser.authorizedToViewSynthesis"> + <li class="<decorator:getProperty property="page.synthesisMenuItemClass"/>"> + <s:url namespace="/%{obsProgram.name().toLowerCase()}" action="synthesis" id="synthesisUrl" /> + <s:a href="%{synthesisUrl}"> + <i class="fa fa-bar-chart-o"></i> <s:text name="wao.ui.page.Synthesis.title" /> + </s:a> + </li> + </s:if> </ul> <ul class="nav pull-right"> <li class="dropdown">

1 0