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

r1900 - trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer
by bleny＠users.forge.codelutin.com April 18, 2014

April 18, 2014

Author: bleny Date: 2014-04-18 12:21:19 +0200 (Fri, 18 Apr 2014) New Revision: 1900 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1900 Log: refs #4490 in boat contacts counts add label for since Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boat-details.jsp Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boat-details.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boat-details.jsp 2014-04-18 10:02:33 UTC (rev 1899) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boat-details.jsp 2014-04-18 10:21:19 UTC (rev 1900) @@ -303,7 +303,12 @@ <s:hidden name="boatId" value="%{boatDetails.boatInfos.boat.topiaId}" /> <s:hidden name="companyId" value="%{boatDetails.boatInfos.company.topiaId}" /> - <div class="input-append"> + <div class="input-prepend input-append"> + + <span class="add-on"> + <s:text name="wao.ui.boatDetails.boatContactsCounts.since"/> + </span> + <s:set name="sincePlaceholder" value="%{formatDate(new java.util.Date())}"/> <input name="since" type="text" placeholder="<s:property value="%{#sincePlaceholder}"/>"/>

1 0

r1899 - in trunk: wao-services/src/main/java/fr/ifremer/wao/services/service/administration wao-web/src/main/java/fr/ifremer/wao/web/action/administration wao-web/src/main/webapp/WEB-INF/content/administration
by bleny＠users.forge.codelutin.com April 18, 2014

April 18, 2014

Author: bleny Date: 2014-04-18 12:02:33 +0200 (Fri, 18 Apr 2014) New Revision: 1899 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1899 Log: refs #4560 remove KEEP_SAME_PASSWORD from available strategies for user creation Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/UpdateWaoUserCommand.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/UpdateWaoUserCommandPasswordStrategy.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/WaoUsersService.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/EditWaoUserAction.java trunk/wao-web/src/main/webapp/WEB-INF/content/administration/edit-wao-user.jsp Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/UpdateWaoUserCommand.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/UpdateWaoUserCommand.java 2014-04-18 09:52:55 UTC (rev 1898) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/UpdateWaoUserCommand.java 2014-04-18 10:02:33 UTC (rev 1899) @@ -22,6 +22,7 @@ */ import com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableSet; import fr.ifremer.wao.entity.Company; import fr.ifremer.wao.entity.ObsProgram; import fr.ifremer.wao.entity.UserProfile; @@ -55,6 +56,8 @@ */ protected String canReadBoats; + protected ImmutableSet<UpdateWaoUserCommandPasswordStrategy> passwordStrategies; + public String getCanReadBoats() { return canReadBoats; } @@ -215,6 +218,14 @@ this.passwordStrategy = passwordStrategy; } + public ImmutableSet<UpdateWaoUserCommandPasswordStrategy> getPasswordStrategies() { + return passwordStrategies; + } + + public void setPasswordStrategies(ImmutableSet<UpdateWaoUserCommandPasswordStrategy> passwordStrategies) { + this.passwordStrategies = passwordStrategies; + } + public String getClearPassword() { return clearPassword; } Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/UpdateWaoUserCommandPasswordStrategy.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/UpdateWaoUserCommandPasswordStrategy.java 2014-04-18 09:52:55 UTC (rev 1898) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/UpdateWaoUserCommandPasswordStrategy.java 2014-04-18 10:02:33 UTC (rev 1899) @@ -21,6 +21,7 @@ * #L% */ +import com.google.common.collect.ImmutableSet; import org.nuiton.i18n.I18n; public enum UpdateWaoUserCommandPasswordStrategy { @@ -31,6 +32,13 @@ DEFINE_PASSWORD(I18n.n("UpdateWaoUserCommandPasswordStrategy.DEFINE_PASSWORD")); + /** C'est une création donc on ne permet pas de « conserver le mot de passe ». */ + protected static final ImmutableSet<UpdateWaoUserCommandPasswordStrategy> PASSWORD_STRATEGIES_FOR_WAO_USER_CREATION = ImmutableSet.of( + UpdateWaoUserCommandPasswordStrategy.DEFINE_PASSWORD, + UpdateWaoUserCommandPasswordStrategy.GENERATE_NEW_PASSWORD); + + protected static final ImmutableSet<UpdateWaoUserCommandPasswordStrategy> PASSWORD_STRATEGIES_FOR_WAO_USER_UPDATE = ImmutableSet.copyOf(values()); + protected String i18nKey; UpdateWaoUserCommandPasswordStrategy(String i18nKey) { @@ -48,4 +56,12 @@ public boolean isGeneratePassword() { return this == GENERATE_NEW_PASSWORD; } + + public static ImmutableSet<UpdateWaoUserCommandPasswordStrategy> getPasswordStrategiesForWaoUserCreation() { + return PASSWORD_STRATEGIES_FOR_WAO_USER_CREATION; + } + + public static ImmutableSet<UpdateWaoUserCommandPasswordStrategy> getPasswordStrategiesForWaoUserUpdate() { + return PASSWORD_STRATEGIES_FOR_WAO_USER_UPDATE; + } } Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/WaoUsersService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/WaoUsersService.java 2014-04-18 09:52:55 UTC (rev 1898) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/WaoUsersService.java 2014-04-18 10:02:33 UTC (rev 1899) @@ -130,6 +130,8 @@ updateWaoUserCommand.setPasswordStrategy(UpdateWaoUserCommandPasswordStrategy.KEEP_SAME_PASSWORD); + updateWaoUserCommand.setPasswordStrategies(UpdateWaoUserCommandPasswordStrategy.getPasswordStrategiesForWaoUserUpdate()); + if (waoUser.isCanReadBoatsNotEmpty()) { String canReadBoats = Boats.toImmatriculations(waoUser.getCanReadBoats()); @@ -144,6 +146,8 @@ updateWaoUserCommand.setPasswordStrategy(UpdateWaoUserCommandPasswordStrategy.GENERATE_NEW_PASSWORD); + updateWaoUserCommand.setPasswordStrategies(UpdateWaoUserCommandPasswordStrategy.getPasswordStrategiesForWaoUserCreation()); + } return updateWaoUserCommand; Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/EditWaoUserAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/EditWaoUserAction.java 2014-04-18 09:52:55 UTC (rev 1898) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/EditWaoUserAction.java 2014-04-18 10:02:33 UTC (rev 1899) @@ -134,9 +134,4 @@ return updateWaoUserCommand; } - // FIXME brendan 17/04/14 création - public ImmutableSet<UpdateWaoUserCommandPasswordStrategy> getUpdateWaoUserCommandPasswordStrategies() { - return ImmutableSet.copyOf(UpdateWaoUserCommandPasswordStrategy.values()); - } - } Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/administration/edit-wao-user.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/administration/edit-wao-user.jsp 2014-04-18 09:52:55 UTC (rev 1898) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/administration/edit-wao-user.jsp 2014-04-18 10:02:33 UTC (rev 1899) @@ -116,7 +116,7 @@ <s:radio name="updateWaoUserCommand.passwordStrategy" label="%{getText('wao.ui.form.updateWaoUserCommand.passwordStrategy')}" listValue="%{getText(top.i18nKey)}" - list="updateWaoUserCommandPasswordStrategies" + list="updateWaoUserCommand.passwordStrategies" requiredLabel="true" /> <div id="definePassword">

1 0

r1898 - in trunk/wao-web/src/main/webapp: . WEB-INF/decorators
by bleny＠users.forge.codelutin.com April 18, 2014

April 18, 2014

Author: bleny Date: 2014-04-18 11:52:55 +0200 (Fri, 18 Apr 2014) New Revision: 1898 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1898 Log: clean some js Added: trunk/wao-web/src/main/webapp/endpoints-js.jsp Removed: trunk/wao-web/src/main/webapp/enpoints-js.jsp Modified: trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout-login.jsp trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp trunk/wao-web/src/main/webapp/wao.js Modified: trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout-login.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout-login.jsp 2014-04-18 09:46:34 UTC (rev 1897) +++ trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout-login.jsp 2014-04-18 09:52:55 UTC (rev 1898) @@ -31,7 +31,7 @@ <sj:head locale="fr" jqueryui="true" loadAtOnce="true" jquerytheme="start" /> <sb:head /> <script type="text/javascript" src="<s:url value='/wao.js'/>"></script> - <script type="text/javascript" src="<s:url value='/enpoints-js.jsp'/>"></script> + <script type="text/javascript" src="<s:url value='/endpoints-js.jsp'/>"></script> <link rel="stylesheet" type="text/css" href="<s:url value='/wao.css'/>" media="all" /> <link rel="stylesheet" type="text/css" href="<s:url value='/wao-screen.css'/>" media="screen"> <decorator:head /> 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-18 09:46:34 UTC (rev 1897) +++ trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2014-04-18 09:52:55 UTC (rev 1898) @@ -38,7 +38,7 @@ <script type="text/javascript" src="<s:url value="/spin.js-2.0.0/spin.js" />"></script> <script type="text/javascript" src="<s:url value="/spin.js-2.0.0/jquery.spin.js" />"></script> <script type="text/javascript" src="<s:url value="/wao.js" />"></script> - <script type="text/javascript" src="<s:url value='/enpoints-js.jsp'/>"></script> + <script type="text/javascript" src="<s:url value='/endpoints-js.jsp'/>"></script> <link rel="stylesheet" type="text/css" href="<s:url value="/select2-3.4.5/select2.css" />" /> <link rel="stylesheet" type="text/css" href="<s:url value="/select2-3.4.5/select2-bootstrap.css" />" /> <link rel="stylesheet" type="text/css" href="<s:url value="/wao.css" />" media="all" /> Copied: trunk/wao-web/src/main/webapp/endpoints-js.jsp (from rev 1897, trunk/wao-web/src/main/webapp/enpoints-js.jsp) =================================================================== --- trunk/wao-web/src/main/webapp/endpoints-js.jsp (rev 0) +++ trunk/wao-web/src/main/webapp/endpoints-js.jsp 2014-04-18 09:52:55 UTC (rev 1898) @@ -0,0 +1,41 @@ +<%-- + #%L + Wao :: Web + %% + Copyright (C) 2009 - 2014 Ifremer + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% + --%> +<%@ page language="java" contentType="text/javascript; charset=utf-8" pageEncoding="utf-8"%><%@ taglib uri="/struts-tags" prefix="s" %> +<% + // allow this page to be cached by browser + response.setDateHeader("Expires", System.currentTimeMillis() + 3600000L); // 1 hour in future. +%> + +$(document).ready(function () { + + // json + WAO.OBSMER_SAMPLE_ROWS_FILTER_VALUES_JSON_URL = '<s:url namespace="/obsmer" action="sample-rows-filter-values-json"/>'; + WAO.OBSMER_BOATS_FILTER_VALUES_JSON_URL = '<s:url namespace="/obsmer" action="boats-filter-values-json"/>'; + WAO.OBSMER_CONTACTS_FILTER_VALUES_JSON_URL = '<s:url namespace="/obsmer" action="contacts-filter-values-json"/>'; + WAO.OBSMER_UPDATE_BOAT_INFOS_JSON_URL = '<s:url namespace="/obsmer" action="update-boat-infos-json"/>'; + WAO.OBSMER_GET_BOAT_CONTACTS_COUNT_JSON_URL = '<s:url namespace="/obsmer" action="get-boat-contacts-count-json"/>'; + + // fragments + WAO.OBSMER_BOAT_DETAILS_URL = '<s:url namespace="/obsmer" action="boat-details"/>'; + +}); + + Deleted: trunk/wao-web/src/main/webapp/enpoints-js.jsp =================================================================== --- trunk/wao-web/src/main/webapp/enpoints-js.jsp 2014-04-18 09:46:34 UTC (rev 1897) +++ trunk/wao-web/src/main/webapp/enpoints-js.jsp 2014-04-18 09:52:55 UTC (rev 1898) @@ -1,41 +0,0 @@ -<%-- - #%L - Wao :: Web - %% - Copyright (C) 2009 - 2014 Ifremer - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. - #L% - --%> -<%@ page language="java" contentType="text/javascript; charset=utf-8" pageEncoding="utf-8"%><%@ taglib uri="/struts-tags" prefix="s" %> -<% - // allow this page to be cached by browser - response.setDateHeader("Expires", System.currentTimeMillis() + 3600000L); // 1 hour in future. -%> - -$(document).ready(function () { - - // json - WAO.OBSMER_SAMPLE_ROWS_FILTER_VALUES_JSON_URL = '<s:url namespace="/obsmer" action="sample-rows-filter-values-json"/>'; - WAO.OBSMER_BOATS_FILTER_VALUES_JSON_URL = '<s:url namespace="/obsmer" action="boats-filter-values-json"/>'; - WAO.OBSMER_CONTACTS_FILTER_VALUES_JSON_URL = '<s:url namespace="/obsmer" action="contacts-filter-values-json"/>'; - WAO.OBSMER_UPDATE_BOAT_INFOS_JSON_URL = '<s:url namespace="/obsmer" action="update-boat-infos-json"/>'; - WAO.OBSMER_GET_BOAT_CONTACTS_COUNT_JSON_URL = '<s:url namespace="/obsmer" action="get-boat-contacts-count-json"/>'; - - // fragments - WAO.OBSMER_BOAT_DETAILS_URL = '<s:url namespace="/obsmer" action="boat-details"/>'; - -}); - - Modified: trunk/wao-web/src/main/webapp/wao.js =================================================================== --- trunk/wao-web/src/main/webapp/wao.js 2014-04-18 09:46:34 UTC (rev 1897) +++ trunk/wao-web/src/main/webapp/wao.js 2014-04-18 09:52:55 UTC (rev 1898) @@ -75,7 +75,7 @@ var $select = $(select).empty(); // FIXME brendan 26/03/14 should be data-binding but freemarker break the template :-( var binding = $select.attr('databinding'); - var options = WAO.getData(binding, filterValues); + var options = WAO.getNestedPropertyValue(binding, filterValues); $.each(options, function (index, option) { var optionHtml = '<option value="' + option.value + '">' + option.label + '</option>'; $select.append(optionHtml); @@ -208,7 +208,7 @@ this.$spinner.spin(false); }; - this.getData = function(path, data) { + this.getNestedPropertyValue = function(path, data) { return path.split('.').reduce(function(prev, prop){ return prev && prev[prop] }, data)

1 0

r1897 - in trunk: wao-persistence/src/main/java/fr/ifremer/wao/entity wao-services/src/main/java/fr/ifremer/wao/services/service wao-web/src/main/java/fr/ifremer/wao/web/action/administration wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer wao-web/src/main/resources/fr/ifremer/wao wao-web/src/main/resources/fr/ifremer/wao/web wao-web/src/main/resources/fr/ifremer/wao/web/action wao-web/src/main/resources/fr/ifremer/wao/web/action/obsmer wao-web/src/main/resources/i18n wao-web/src/main/w
by bleny＠users.forge.codelutin.com April 18, 2014

April 18, 2014

Author: bleny Date: 2014-04-18 11:46:34 +0200 (Fri, 18 Apr 2014) New Revision: 1897 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1897 Log: refs #4490 add boat contacts counts Added: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatContactsCounts.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/GetBoatContactsCountJsonAction.java trunk/wao-web/src/main/resources/fr/ifremer/wao/web/ trunk/wao-web/src/main/resources/fr/ifremer/wao/web/action/ trunk/wao-web/src/main/resources/fr/ifremer/wao/web/action/obsmer/ trunk/wao-web/src/main/resources/fr/ifremer/wao/web/action/obsmer/GetBoatContactsCountJsonAction-conversion.properties Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactTopiaDao.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerBoatsService.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/EditWaoUserAction.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/boat-details.jsp trunk/wao-web/src/main/webapp/enpoints-js.jsp trunk/wao-web/src/main/webapp/wao.js 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-04-17 13:02:44 UTC (rev 1896) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactTopiaDao.java 2014-04-18 09:46:34 UTC (rev 1897) @@ -68,6 +68,15 @@ return boats; } + public long count(ContactsFilter filter) { + + HqlAndParametersBuilder<Contact> query = toSampleRowHqlAndParametersBuilder(filter); + + long count = count("select count(topiaId) " + query.getHql(), query.getHqlParameters()); + + return count; + } + public TopiaPagerBean newPager(ContactsFilter filter, int pageSize, int pageIndex) { @@ -217,11 +226,4 @@ return query.findFirstOrNull(); } - public long countContacts(ObsProgram obsProgram, String boatId, String companyId) { - TopiaQueryBuilderAddCriteriaOrRunQueryStep<Contact> query = newQueryBuilder(); - query.addTopiaIdEquals(Contact.PROPERTY_BOAT, boatId); - query.addTopiaIdEquals(Contact.PROPERTY_SAMPLE_ROW + "." + SampleRow.PROPERTY_COMPANY, companyId); - query.addEquals(Contact.PROPERTY_SAMPLE_ROW + "." + SampleRow.PROPERTY_OBS_PROGRAM_ORDINAL, obsProgram.ordinal()); - return query.count(); - } } Added: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatContactsCounts.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatContactsCounts.java (rev 0) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatContactsCounts.java 2014-04-18 09:46:34 UTC (rev 1897) @@ -0,0 +1,21 @@ +package fr.ifremer.wao.services.service; + +public class BoatContactsCounts { + + protected long contactsCount; + + protected long contactsCompanyCount; + + public BoatContactsCounts(long contactsCount, long contactsCompanyCount) { + this.contactsCount = contactsCount; + this.contactsCompanyCount = contactsCompanyCount; + } + + public long getContactsCount() { + return contactsCount; + } + + public long getContactsCompanyCount() { + return contactsCompanyCount; + } +} 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-17 13:02:44 UTC (rev 1896) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerBoatsService.java 2014-04-18 09:46:34 UTC (rev 1897) @@ -23,7 +23,10 @@ import com.google.common.base.Charsets; import com.google.common.base.Optional; +import com.google.common.base.Preconditions; +import com.google.common.collect.ImmutableSet; import fr.ifremer.wao.BoatsFilter; +import fr.ifremer.wao.ContactsFilter; import fr.ifremer.wao.WaoTechnicalException; import fr.ifremer.wao.entity.Boat; import fr.ifremer.wao.entity.BoatInfos; @@ -32,6 +35,8 @@ import fr.ifremer.wao.entity.BoatTopiaDao; import fr.ifremer.wao.entity.Company; import fr.ifremer.wao.entity.Contact; +import fr.ifremer.wao.entity.ContactState; +import fr.ifremer.wao.entity.ContactTopiaDao; import fr.ifremer.wao.entity.ObsProgram; import fr.ifremer.wao.services.AuthenticatedWaoUser; import fr.ifremer.wao.services.service.csv.BoatImportExportModel; @@ -45,6 +50,7 @@ import java.io.InputStream; import java.util.Collection; +import java.util.Date; import java.util.HashSet; import java.util.List; @@ -167,7 +173,10 @@ Contact mostRecentContact = getContactDao().findMostRecentContactOrNull(obsProgram, boatId, companyId); - long contactsCount = getContactDao().countContacts(obsProgram, boatId, companyId); + ContactsFilter filter = new ContactsFilter(obsProgram); + filter.getBoatFilter().setBoatIds(ImmutableSet.of(boatId)); + filter.getSampleRowFilter().setCompanyIds(ImmutableSet.of(companyId)); + long contactsCount = getContactDao().count(filter); BoatDetails boatDetails = new BoatDetails(obsProgram, boatInfos, mostRecentContact, contactsCount); @@ -213,4 +222,26 @@ commit(); } + + public BoatContactsCounts getBoatContactsCounts(AuthenticatedWaoUser authenticatedWaoUser, String boatId, String companyId, Date since) { + + ContactsFilter filter = new ContactsFilter(authenticatedWaoUser.getObsProgram()); + + filter.setPeriodFrom(since); + filter.getBoatFilter().setBoatIds(ImmutableSet.of(boatId)); + filter.setContactStates(ImmutableSet.of(ContactState.OBSERVATION_DONE)); + filter.setFilterOnObservationBeginDate(true); + + ContactTopiaDao dao = getContactDao(); + long contactsCount = dao.count(filter); + + filter.getSampleRowFilter().setCompanyIds(ImmutableSet.of(companyId)); + long contactsCompanyCount = dao.count(filter); + + Preconditions.checkState(contactsCompanyCount <= contactsCount); + + return new BoatContactsCounts(contactsCount, contactsCompanyCount); + + } + } Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/EditWaoUserAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/EditWaoUserAction.java 2014-04-17 13:02:44 UTC (rev 1896) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/EditWaoUserAction.java 2014-04-18 09:46:34 UTC (rev 1897) @@ -134,6 +134,7 @@ return updateWaoUserCommand; } + // FIXME brendan 17/04/14 création public ImmutableSet<UpdateWaoUserCommandPasswordStrategy> getUpdateWaoUserCommandPasswordStrategies() { return ImmutableSet.copyOf(UpdateWaoUserCommandPasswordStrategy.values()); } Added: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/GetBoatContactsCountJsonAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/GetBoatContactsCountJsonAction.java (rev 0) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/GetBoatContactsCountJsonAction.java 2014-04-18 09:46:34 UTC (rev 1897) @@ -0,0 +1,50 @@ +package fr.ifremer.wao.web.action.obsmer; + +import fr.ifremer.wao.services.service.BoatContactsCounts; +import fr.ifremer.wao.services.service.ObsMerBoatsService; +import fr.ifremer.wao.web.WaoJsonActionSupport; + +import java.util.Date; + +public class GetBoatContactsCountJsonAction extends WaoJsonActionSupport { + + protected Date since; + + protected ObsMerBoatsService service; + + protected String boatId; + + protected String companyId; + + protected BoatContactsCounts boatContactsCounts; + + public void setSince(Date since) { + this.since = since; + } + + public void setService(ObsMerBoatsService service) { + this.service = service; + } + + public void setBoatId(String boatId) { + this.boatId = boatId; + } + + public void setCompanyId(String companyId) { + this.companyId = companyId; + } + + @Override + public String execute() { + + boatContactsCounts = service.getBoatContactsCounts(session.getAuthenticatedWaoUser(), boatId, companyId, since); + + return SUCCESS; + + } + + public BoatContactsCounts getBoatContactsCounts() { + return boatContactsCounts; + } + +} Added: trunk/wao-web/src/main/resources/fr/ifremer/wao/web/action/obsmer/GetBoatContactsCountJsonAction-conversion.properties =================================================================== --- trunk/wao-web/src/main/resources/fr/ifremer/wao/web/action/obsmer/GetBoatContactsCountJsonAction-conversion.properties (rev 0) +++ trunk/wao-web/src/main/resources/fr/ifremer/wao/web/action/obsmer/GetBoatContactsCountJsonAction-conversion.properties 2014-04-18 09:46:34 UTC (rev 1897) @@ -0,0 +1 @@ +since=fr.ifremer.wao.web.converter.DateConverter 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-04-17 13:02:44 UTC (rev 1896) +++ trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-04-18 09:46:34 UTC (rev 1897) @@ -91,6 +91,11 @@ wao.ui.action.viewShipOwnerBoats=View all boats for this shipowner wao.ui.action.zoomOnSampleRowPeriod=Use as filter dates the one of this sample row wao.ui.actions=Actions +wao.ui.boatDetails.boatContactsCounts.compute=Compute +wao.ui.boatDetails.boatContactsCounts.contactsCompanyCount=Observations done with the company +wao.ui.boatDetails.boatContactsCounts.contactsCount=Observations done (all companies) +wao.ui.boatDetails.boatContactsCounts.since=Since... +wao.ui.boatDetails.boatContactsCounts.title=Compute observations done wao.ui.boatList=List of %s boats wao.ui.boatinfo.title=Infos about %s wao.ui.boats.associatedLine=Sample row(s) associated with this boat 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-04-17 13:02:44 UTC (rev 1896) +++ trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-04-18 09:46:34 UTC (rev 1897) @@ -91,6 +91,11 @@ wao.ui.action.viewShipOwnerBoats=Voir tous les navires de cet armateur wao.ui.action.zoomOnSampleRowPeriod=Changer les dates de la période par rapport à celles de la ligne wao.ui.actions=Actions +wao.ui.boatDetails.boatContactsCounts.compute=Calculer +wao.ui.boatDetails.boatContactsCounts.contactsCompanyCount=Nombre d'observations réalisées par la société +wao.ui.boatDetails.boatContactsCounts.contactsCount=Nombre d'observations réalisées (toutes sociétés) +wao.ui.boatDetails.boatContactsCounts.since=Depuis le... +wao.ui.boatDetails.boatContactsCounts.title=Calculer le nombre de sollicitations du navire wao.ui.boatList=Liste de %s navires wao.ui.boatinfo.title=Informations sur %s wao.ui.boats.associatedLine=Ligne(s) du plan associée(s) à ce navire Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boat-details.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boat-details.jsp 2014-04-17 13:02:44 UTC (rev 1896) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boat-details.jsp 2014-04-18 09:46:34 UTC (rev 1897) @@ -33,21 +33,7 @@ $boatInfosForm = $('#boat-infos-form'); $('#save-boat-infos').click(function () { - var data = {}; - $boatInfosForm.find('input, textarea').each(function (index, input) { - var $input = $(input); - var parameterName = $input.prop('name'); - if (parameterName.indexOf('__') === 0) { - return; - } - var parameterValue; - if ($input.attr('type') === 'checkbox') { - parameterValue = $input.prop('checked'); - } else { - parameterValue = $input.prop('value'); - } - data[parameterName] = parameterValue; - }); + var data = WAO.toData($boatInfosForm); var successCallback = function () { WAO.notifications.success('<s:text name="wao.ui.form.BoatInfos.success"/>'); } @@ -58,6 +44,34 @@ $boatInfosForm.find('input[readonly], button, textarea').removeAttr('readonly').removeAttr('disabled'); $(this).attr('disabled', 'disabled'); }); + + $boatContactsCountForm = $('#boat-contacts-count-form'); + $boatContactsCountsTable = $('#boat-contacts-counts-table'); + $boatContactsCountsTable.hide(); + + var getBoatContactsCount = function () { + var data = WAO.toData($boatContactsCountForm); + var since = data.since; + var successCallback = function (data) { + var tr = '<tr>' + + ' <td>' + + since + + ' </td>' + + ' <td>' + + data.boatContactsCounts.contactsCompanyCount + + ' </td>' + + ' <td>' + + data.boatContactsCounts.contactsCount + + ' </td>' + + '</tr>'; + $boatContactsCountsTable.find('tbody').append(tr); + $boatContactsCountsTable.show(); + }; + WAO.get(WAO.OBSMER_GET_BOAT_CONTACTS_COUNT_JSON_URL, data, successCallback); + } + + $('#get-boat-contacts-count').click(getBoatContactsCount); + $boatContactsCountForm.enterKey(getBoatContactsCount); }); </script> @@ -141,9 +155,9 @@ <s:if test="boatDetails.contactsCount > 0"> - <h3> + <h4> <s:text name="wao.ui.contact.lastContact"/> - </h3> + </h4> <table class="table"> <tbody> @@ -184,6 +198,7 @@ <s:url action="contacts" id="viewAssociatedContactsForBoatUrl"> <s:param name="filter.boatFilter.registrationCode" value="boatDetails.boatInfos.boat.immatriculation"/> + <s:param name="filter.sampleRowFilter.companyIds" value="boatDetails.boatInfos.company.topiaId"/> <s:param name="filter.periodFrom"/> <s:param name="filter.periodTo"/> </s:url> @@ -261,3 +276,39 @@ <s:text name="wao.ui.tip.inactiveBoat"/> </div> </s:else> + +<h3> + <s:text name="wao.ui.boatDetails.boatContactsCounts.title"/> +</h3> + +<table id="boat-contacts-counts-table" class="table"> + <thead> + <tr> + <td> + <s:text name="wao.ui.boatDetails.boatContactsCounts.since"/> + </td> + <td> + <s:text name="wao.ui.boatDetails.boatContactsCounts.contactsCompanyCount"/> + </td> + <td> + <s:text name="wao.ui.boatDetails.boatContactsCounts.contactsCount"/> + </td> + </thead> + <tbody> + </tbody> +</table> + +<s:form id="boat-contacts-count-form"> + + <s:hidden name="boatId" value="%{boatDetails.boatInfos.boat.topiaId}" /> + <s:hidden name="companyId" value="%{boatDetails.boatInfos.company.topiaId}" /> + + <div class="input-append"> + <s:set name="sincePlaceholder" value="%{formatDate(new java.util.Date())}"/> + <input name="since" type="text" placeholder="<s:property value="%{#sincePlaceholder}"/>"/> + + <button type="button" id="get-boat-contacts-count" class="btn"> + <i class="icon-plus"></i> <s:text name="wao.ui.boatDetails.boatContactsCounts.compute" /> + </button> + </div> +</s:form> Modified: trunk/wao-web/src/main/webapp/enpoints-js.jsp =================================================================== --- trunk/wao-web/src/main/webapp/enpoints-js.jsp 2014-04-17 13:02:44 UTC (rev 1896) +++ trunk/wao-web/src/main/webapp/enpoints-js.jsp 2014-04-18 09:46:34 UTC (rev 1897) @@ -31,6 +31,7 @@ WAO.OBSMER_BOATS_FILTER_VALUES_JSON_URL = '<s:url namespace="/obsmer" action="boats-filter-values-json"/>'; WAO.OBSMER_CONTACTS_FILTER_VALUES_JSON_URL = '<s:url namespace="/obsmer" action="contacts-filter-values-json"/>'; WAO.OBSMER_UPDATE_BOAT_INFOS_JSON_URL = '<s:url namespace="/obsmer" action="update-boat-infos-json"/>'; + WAO.OBSMER_GET_BOAT_CONTACTS_COUNT_JSON_URL = '<s:url namespace="/obsmer" action="get-boat-contacts-count-json"/>'; // fragments WAO.OBSMER_BOAT_DETAILS_URL = '<s:url namespace="/obsmer" action="boat-details"/>'; Modified: trunk/wao-web/src/main/webapp/wao.js =================================================================== --- trunk/wao-web/src/main/webapp/wao.js 2014-04-17 13:02:44 UTC (rev 1896) +++ trunk/wao-web/src/main/webapp/wao.js 2014-04-18 09:46:34 UTC (rev 1897) @@ -19,6 +19,18 @@ * #L% */ +$.fn.enterKey = function (fnc) { + return this.each(function () { + $(this).keypress(function (e) { + var keycode = e.keyCode || e.which; + if (keycode === 13) { + e.preventDefault(); + fnc.call(this, arguments); + } + }) + }) +} + var FilterModel = function (filterValuesUrl) { var self = this; @@ -50,33 +62,7 @@ this.$inputs = $filtersForm.find('input'); this.getFilter = function () { - var filter = {}; - this.$selects.each(function (index, select) { - var $select = $(select); - var parameterName = $select.prop('name'); - if (parameterName.indexOf('__') === 0) { - return; - } - var parameterValues = []; - $select.find('option:selected').each(function (index, option) { - parameterValues.push($(option).prop('value')); - }); - filter[parameterName] = parameterValues; - }); - this.$inputs.each(function (index, input) { - var $input = $(input); - var parameterName = $input.prop('name'); - if (parameterName.indexOf('__') === 0) { - return; - } - var parameterValue; - if ($input.attr('type') === 'checkbox') { - parameterValue = $input.prop('checked'); - } else { - parameterValue = $input.prop('value'); - } - filter[parameterName] = parameterValue; - }); + var filter = WAO.toData(this.$filtersForm); return filter; }; @@ -236,7 +222,7 @@ return result; }; $.get(url, data, stopSpinningAfterCallingSuccessCallback); - } + }; this.post = function (url, data, successCallback) { this.startSpinner(); @@ -246,6 +232,37 @@ return result; }; $.post(url, data, stopSpinningAfterCallingSuccessCallback); + }; + + this.toData = function ($form) { + var data = {}; + $form.find('input, textarea').each(function (index, input) { + var $input = $(input); + var parameterName = $input.prop('name'); + if (parameterName.indexOf('__') === 0) { + return; + } + var parameterValue; + if ($input.attr('type') === 'checkbox') { + parameterValue = $input.prop('checked'); + } else { + parameterValue = $input.prop('value'); + } + data[parameterName] = parameterValue; + }); + $form.find('select').each(function (index, select) { + var $select = $(select); + var parameterName = $select.prop('name'); + if (parameterName.indexOf('__') === 0) { + return; + } + var parameterValues = []; + $select.find('option:selected').each(function (index, option) { + parameterValues.push($(option).prop('value')); + }); + data[parameterName] = parameterValues; + }); + return data; } };

1 0

Build failed in Jenkins: wao-nightly #36
by admin+ci-codelutin.com＠codelutin.com April 17, 2014

April 17, 2014

See <http://ci.codelutin.com/jenkins/job/wao-nightly/36/changes> Changes: [bleny] refs #4490 make boatName filter case-incensitive [bleny] remove padding-left: 5px for form-horizontal [bleny] change label for filter action and show button as btn-primary [bleny] refs #4490 add a link to contacts for boat ------------------------------------------ Started by an SCM change Building in workspace <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/> Reverting <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk> to depth infinity with ignoreExternals: false Updating https://svn.codelutin.com/wao/trunk at revision '2014-04-17T00:07:01.958 +0200' U wao-web/src/main/resources/i18n/wao-web_en_GB.properties U wao-web/src/main/resources/i18n/wao-web_fr_FR.properties U wao-web/src/main/webapp/WEB-INF/content/obsmer/boat-details.jsp U wao-web/src/main/webapp/WEB-INF/content/obsmer/boats.jsp U wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp U wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp U wao-web/src/main/webapp/wao.css U wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerBoatsService.java U wao-services/src/main/java/fr/ifremer/wao/services/service/BoatDetails.java U wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactTopiaDao.java U wao-persistence/src/main/java/fr/ifremer/wao/entity/BoatTopiaDao.java At revision 1895 Parsing POMs [trunk] $ /opt/jdk7/bin/java -Dsettings.security=/var/local/forge/data/codelutin.com/maven/settings-security.xml -Djava.awt.headless=true -cp /var/local/forge/data/codelutin.com/jenkins/plugins/maven-plugin/WEB-INF/lib/maven31-agent-1.5.jar:/opt/maven3/boot/plexus-classworlds-2.5.1.jar:/opt/maven3/conf/logging jenkins.maven3.agent.Maven31Main /opt/maven3 /var/local/forge/exec/tomcat-codelutin.com/webapps/jenkins/WEB-INF/lib/remoting-2.36.jar /var/local/forge/data/codelutin.com/jenkins/plugins/maven-plugin/WEB-INF/lib/maven31-interceptor-1.5.jar /var/local/forge/data/codelutin.com/jenkins/plugins/maven-plugin/WEB-INF/lib/maven3-interceptor-commons-1.5.jar 43062 ERROR: Failed to parse POMs java.io.IOException: Cannot run program "/opt/jdk7/bin/java" (in directory "<http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk")>: error=2, No such file or directory at java.lang.ProcessBuilder.start(ProcessBuilder.java:1041) at hudson.Proc$LocalProc.<init>(Proc.java:244) at hudson.Proc$LocalProc.<init>(Proc.java:216) at hudson.Launcher$LocalLauncher.launch(Launcher.java:773) at hudson.Launcher$ProcStarter.start(Launcher.java:353) at hudson.maven.AbstractMavenProcessFactory.newProcess(AbstractMavenProcessFactory.java:266) at hudson.maven.ProcessCache.get(ProcessCache.java:235) at hudson.maven.MavenModuleSetBuild$MavenModuleSetBuildExecution.doRun(MavenModuleSetBuild.java:755) at hudson.model.AbstractBuild$AbstractBuildExecution.run(AbstractBuild.java:523) at hudson.model.Run.execute(Run.java:1689) at hudson.maven.MavenModuleSetBuild.run(MavenModuleSetBuild.java:525) at hudson.model.ResourceController.execute(ResourceController.java:88) at hudson.model.Executor.run(Executor.java:231) Caused by: java.io.IOException: error=2, No such file or directory at java.lang.UNIXProcess.forkAndExec(Native Method) at java.lang.UNIXProcess.<init>(UNIXProcess.java:186) at java.lang.ProcessImpl.start(ProcessImpl.java:130) at java.lang.ProcessBuilder.start(ProcessBuilder.java:1022) ... 12 more Skipping sonar analysis due to bad build status FAILURE

1 1

Jenkins build is back to normal : wao-nightly » Wao :: Services #37
by admin+ci-codelutin.com＠codelutin.com April 17, 2014

April 17, 2014

See <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/37/…>

1 0

Jenkins build is back to normal : wao-nightly » Wao :: Persistence #37
by admin+ci-codelutin.com＠codelutin.com April 17, 2014

April 17, 2014

See <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-persistence/…>

1 0

Jenkins build is back to normal : wao-nightly » Wao :: Web #37
by admin+ci-codelutin.com＠codelutin.com April 17, 2014

April 17, 2014

See <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-web/37/>

1 0

Jenkins build is back to normal : wao-nightly » Wao #37
by admin+ci-codelutin.com＠codelutin.com April 17, 2014

April 17, 2014

See <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao/37/>

1 0

r1896 - 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
by bleny＠users.forge.codelutin.com April 17, 2014

April 17, 2014

Author: bleny Date: 2014-04-17 15:02:44 +0200 (Thu, 17 Apr 2014) New Revision: 1896 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1896 Log: still trying to find a way to prevent user to view others company sample rows in boat filter values Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/SampleRowsFilter.java trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/BoatTopiaDao.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/SampleRowsFilterValues.java 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-16 12:08:40 UTC (rev 1895) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/SampleRowsFilter.java 2014-04-17 13:02:44 UTC (rev 1896) @@ -177,7 +177,6 @@ @Override public boolean isFilled() { - // volontairement, on ne considère pas ObsProgram car ce n'est pas un critère de sélection en lui-même boolean filled = obsProgram != null || periodFrom != null || periodTo != null 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-04-16 12:08:40 UTC (rev 1895) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/BoatTopiaDao.java 2014-04-17 13:02:44 UTC (rev 1896) @@ -80,7 +80,7 @@ query.setAlias("b"); - if (filter.getElligibleForSampleRowsFilter().isFilled()) { + if (isFilled(filter)) { SampleRowTopiaDao sampleRowTopiaDao = topiaDaoSupplier.getDao(SampleRow.class, SampleRowTopiaDao.class); HqlAndParametersBuilder<SampleRow> sampleRowsQuery = @@ -133,4 +133,21 @@ return query; } + + protected boolean isFilled(BoatsFilter filter) { + // volontairement, on ne considère pas ObsProgram car ce n'est pas un critère de sélection en lui-même + boolean filled = filter.getElligibleForSampleRowsFilter().getPeriodFrom() != null + || filter.getElligibleForSampleRowsFilter().getPeriodTo() != null + || CollectionUtils.isNotEmpty(filter.getElligibleForSampleRowsFilter().getSampleRowIds()) + || CollectionUtils.isNotEmpty(filter.getElligibleForSampleRowsFilter().getFishingZoneFacadeNames()) + || CollectionUtils.isNotEmpty(filter.getElligibleForSampleRowsFilter().getFishingZoneSectorNames()) + || CollectionUtils.isNotEmpty(filter.getElligibleForSampleRowsFilter().getSampleRowCodes()) + || CollectionUtils.isNotEmpty(filter.getElligibleForSampleRowsFilter().getProgramNames()) + || CollectionUtils.isNotEmpty(filter.getElligibleForSampleRowsFilter().getFishingGearDcfIds()) + || CollectionUtils.isNotEmpty(filter.getElligibleForSampleRowsFilter().getTargetSpeciesDcfIds()) + || CollectionUtils.isNotEmpty(filter.getElligibleForSampleRowsFilter().getSamplingStrategies()) + || CollectionUtils.isNotEmpty(filter.getElligibleForSampleRowsFilter().getTerrestrialDistrictIds()) + || CollectionUtils.isNotEmpty(filter.getElligibleForSampleRowsFilter().getCompanyIds()); + return filled; + } } 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-16 12:08:40 UTC (rev 1895) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerBoatsService.java 2014-04-17 13:02:44 UTC (rev 1896) @@ -23,7 +23,6 @@ import com.google.common.base.Charsets; import com.google.common.base.Optional; -import com.google.common.collect.ImmutableSet; import fr.ifremer.wao.BoatsFilter; import fr.ifremer.wao.WaoTechnicalException; import fr.ifremer.wao.entity.Boat; @@ -48,7 +47,6 @@ import java.util.Collection; import java.util.HashSet; import java.util.List; -import java.util.Set; /** * Created on 4/1/14. @@ -66,15 +64,15 @@ BoatTopiaDao dao = getBoatDao(); // XXX brendan 07/04/14 ne pas inclure les lignes qui ne sont pas associées à un autre société que celle du coordinateur - Set<String> companyIds = null; - if (authenticatedWaoUser.isCoordinatorOrObserver()) { - companyIds = filter.getElligibleForSampleRowsFilter().getCompanyIds(); - filter.getElligibleForSampleRowsFilter().setCompanyIds(ImmutableSet.of(authenticatedWaoUser.getCompany().getTopiaId())); - } +// Set<String> companyIds = null; +// if (authenticatedWaoUser.isCoordinatorOrObserver()) { +// companyIds = filter.getElligibleForSampleRowsFilter().getCompanyIds(); +// filter.getElligibleForSampleRowsFilter().setCompanyIds(ImmutableSet.of(authenticatedWaoUser.getCompany().getTopiaId())); +// } List<Boat> boats = dao.findAll(filter); - if (authenticatedWaoUser.isCoordinatorOrObserver()) { - filter.getElligibleForSampleRowsFilter().setCompanyIds(companyIds); - } +// if (authenticatedWaoUser.isCoordinatorOrObserver()) { +// filter.getElligibleForSampleRowsFilter().setCompanyIds(companyIds); +// } BoatsFilterValues boatsFilterValues = new BoatsFilterValues(serviceContext.getLocale(), filter.getObsProgram()); 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-16 12:08:40 UTC (rev 1895) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SampleRowsFilterValues.java 2014-04-17 13:02:44 UTC (rev 1896) @@ -74,7 +74,8 @@ fishingZoneFacadeNames.add(FilterOption.forString(fishingZone.getFacadeName())); fishingZoneSectorNames.add(FilterOption.forString(fishingZone.getSectorName())); } - sampleRowCodes.add(FilterOption.forString(sampleRow.getCode())); + //sampleRowCodes.add(FilterOption.forString(sampleRow.getCode())); + sampleRowCodes.add(FilterOption.forValueAndLabel(sampleRow.getCode(), sampleRow.getCode() + " " + (sampleRow.getCompany() == null ? "" : sampleRow.getCompany().getName()))); programNames.add(FilterOption.forString(sampleRow.getProgramName())); Company company = sampleRow.getCompany();

1 0