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

r2129 - in trunk: . wao-persistence wao-services wao-web
by maven-release＠users.forge.codelutin.com 07 Jul '14

07 Jul '14

Author: maven-release Date: 2014-07-07 17:47:58 +0200 (Mon, 07 Jul 2014) New Revision: 2129 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2129 Log: [maven-release-plugin] prepare release wao-4.0.1 Modified: trunk/pom.xml trunk/wao-persistence/pom.xml trunk/wao-services/pom.xml trunk/wao-web/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-07-07 15:30:39 UTC (rev 2128) +++ trunk/pom.xml 2014-07-07 15:47:58 UTC (rev 2129) @@ -10,7 +10,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.1-SNAPSHOT</version> + <version>4.0.1</version> <packaging>pom</packaging> <name>Wao</name> @@ -86,9 +86,9 @@ </modules> <scm> - <connection>scm:svn:http://svn.codelutin.com/wao/trunk</connection> - <developerConnection>scm:svn:https://svn.codelutin.com/wao/trunk</developerConnection> - <url>https://forge.codelutin.com/repositories/browse/wao/trunk</url> + <connection>scm:svn:http://svn.codelutin.com/wao/tags/wao-4.0.1</connection> + <developerConnection>scm:svn:https://svn.codelutin.com/wao/tags/wao-4.0.1</developerConnection> + <url>https://forge.codelutin.com/repositories/browse/wao/tags/wao-4.0.1</url> </scm> <properties> Modified: trunk/wao-persistence/pom.xml =================================================================== --- trunk/wao-persistence/pom.xml 2014-07-07 15:30:39 UTC (rev 2128) +++ trunk/wao-persistence/pom.xml 2014-07-07 15:47:58 UTC (rev 2129) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.1-SNAPSHOT</version> + <version>4.0.1</version> </parent> <artifactId>wao-persistence</artifactId> Modified: trunk/wao-services/pom.xml =================================================================== --- trunk/wao-services/pom.xml 2014-07-07 15:30:39 UTC (rev 2128) +++ trunk/wao-services/pom.xml 2014-07-07 15:47:58 UTC (rev 2129) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.1-SNAPSHOT</version> + <version>4.0.1</version> </parent> <artifactId>wao-services</artifactId> Modified: trunk/wao-web/pom.xml =================================================================== --- trunk/wao-web/pom.xml 2014-07-07 15:30:39 UTC (rev 2128) +++ trunk/wao-web/pom.xml 2014-07-07 15:47:58 UTC (rev 2129) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.1-SNAPSHOT</version> + <version>4.0.1</version> </parent> <artifactId>wao-web</artifactId>

1 0

r2128 - 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/webapp
by bleny＠users.forge.codelutin.com 07 Jul '14

07 Jul '14

Author: bleny Date: 2014-07-07 17:30:39 +0200 (Mon, 07 Jul 2014) New Revision: 2128 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2128 Log: improve contacts filter values query to prevent N+1 Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactTopiaDao.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatsFilterValues.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsFilterValues.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsService.java trunk/wao-web/src/main/webapp/endpoints-js.jsp 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-07-07 13:26:22 UTC (rev 2127) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactTopiaDao.java 2014-07-07 15:30:39 UTC (rev 2128) @@ -30,6 +30,7 @@ import fr.ifremer.wao.WaoUtils; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.Range; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.time.DateUtils; import org.apache.commons.lang3.tuple.Pair; import org.apache.commons.logging.Log; @@ -433,4 +434,33 @@ } + public List<Contact> findAllForFilterValues(ContactsFilter filter) { + + HqlAndParametersBuilder<Contact> query = toContactHqlAndParametersBuilder(filter); + + String hql = query.getHql(); + + hql = StringUtils.replace( + hql, + "from fr.ifremer.wao.entity.Contact " + ALIAS, + "from fr.ifremer.wao.entity.ContactImpl " + ALIAS + + " left join fetch " + ALIAS + "." + Contact.PROPERTY_SAMPLE_ROW + " sr" + + " left join fetch sr." + SampleRow.PROPERTY_COMPANY + + " left join fetch sr." + SampleRow.PROPERTY_FISHING_ZONE + + " left join fetch sr." + SampleRow.PROPERTY_PROFESSION + + " left join fetch sr." + SampleRow.PROPERTY_D_CF5_CODE + " dcf" + + " left outer join fetch dcf." + DCF5Code.PROPERTY_FISHING_GEAR_DCF + + " left outer join fetch dcf." + DCF5Code.PROPERTY_TARGET_SPECIES_DCF + + " left join fetch " + ALIAS + "." + Contact.PROPERTY_BOAT + " b" + + " left join fetch b." + Boat.PROPERTY_DISTRICT + + " left join fetch " + ALIAS + "." + Contact.PROPERTY_MAIN_OBSERVER + + " left join fetch " + ALIAS + "." + Contact.PROPERTY_SECONDARY_OBSERVERS + + " left outer join fetch " + ALIAS + "." + Contact.PROPERTY_CONTACT_STATE_MOTIF + ); + + List<Contact> contacts = findAll(hql, query.getHqlParameters()); + + return contacts; + + } } Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatsFilterValues.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatsFilterValues.java 2014-07-07 13:26:22 UTC (rev 2127) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatsFilterValues.java 2014-07-07 15:30:39 UTC (rev 2128) @@ -67,13 +67,18 @@ this.elligibleForSampleRowsFilterValues = new SampleRowsFilterValues(locale, obsProgram, optionalCompanyId); } + public void addBoatFromContacts(Boat boat) { + addBoat(boat, true); + } + public void addBoat(Boat boat) { + addBoat(boat, false); + } - ShipOwner shipOwner = boat.getShipOwner(); - shipOwners.add(FilterOption.forValueAndLabel( - shipOwner.getTopiaId(), - shipOwner.getFirstName() + " - " + shipOwner.getLastName())); + public void addBoat(Boat boat, boolean fromContacts) { + boatIds.add(boat.getTopiaId()); + TerrestrialLocation district = boat.getDistrict(); if (district != null) { districts.add(FilterOption.forValueAndLabel( @@ -81,31 +86,37 @@ district.getDescription())); } - TerrestrialLocation portOfRegistry = boat.getPortOfRegistry(); - if (portOfRegistry != null) { - portsOfRegistry.add(FilterOption.forValueAndLabel( - portOfRegistry.getTopiaId(), - portOfRegistry.getDescription()) - ); - } + if ( ! fromContacts) { - Fleet fleet = boat.getFleet(); - if (fleet != null) { - fleets.add(FilterOption.forValueAndLabel( - fleet.getTopiaId(), - fleet.getDescription())); - } + ShipOwner shipOwner = boat.getShipOwner(); + shipOwners.add(FilterOption.forValueAndLabel( + shipOwner.getTopiaId(), + shipOwner.getFirstName() + " - " + shipOwner.getLastName())); - boats.add(FilterOption.forValueAndLabel(boat.getTopiaId(), boat.getDescription())); + TerrestrialLocation portOfRegistry = boat.getPortOfRegistry(); + if (portOfRegistry != null) { + portsOfRegistry.add(FilterOption.forValueAndLabel( + portOfRegistry.getTopiaId(), + portOfRegistry.getDescription()) + ); + } - for (ElligibleBoat elligibleBoat : boat.getElligibleBoat()) { - SampleRow sampleRow = elligibleBoat.getSampleRow(); - if (elligibleBoat.isBoatElligible()) { - elligibleForSampleRowsFilterValues.addSampleRowForBoatFilter(sampleRow); + Fleet fleet = boat.getFleet(); + if (fleet != null) { + fleets.add(FilterOption.forValueAndLabel( + fleet.getTopiaId(), + fleet.getDescription())); } + + boats.add(FilterOption.forValueAndLabel(boat.getTopiaId(), boat.getDescription())); + + for (ElligibleBoat elligibleBoat : boat.getElligibleBoat()) { + SampleRow sampleRow = elligibleBoat.getSampleRow(); + if (elligibleBoat.isBoatElligible()) { + elligibleForSampleRowsFilterValues.addSampleRowForBoatFilter(sampleRow); + } + } } - - boatIds.add(boat.getTopiaId()); } public SampleRowsFilterValues getElligibleForSampleRowsFilterValues() { Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsFilterValues.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsFilterValues.java 2014-07-07 13:26:22 UTC (rev 2127) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsFilterValues.java 2014-07-07 15:30:39 UTC (rev 2128) @@ -91,7 +91,7 @@ public void addContact(Contact contact) { Boat boat = contact.getBoat(); - boatsFilterValues.addBoat(boat); + boatsFilterValues.addBoatFromContacts(boat); boatRegistrationCodes.add(FilterOption.forValueAndLabel(String.valueOf(boat.getImmatriculation()), boat.getDescription())); SampleRow sampleRow = contact.getSampleRow(); Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsService.java 2014-07-07 13:26:22 UTC (rev 2127) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsService.java 2014-07-07 15:30:39 UTC (rev 2128) @@ -136,7 +136,7 @@ public ContactsFilterValues getContactsFilterValues(AuthenticatedWaoUser authenticatedWaoUser, ContactsFilter filter) { ContactTopiaDao dao = getContactDao(); - List<Contact> contacts = dao.forFilter(filter, false).findAll(); + List<Contact> contacts = dao.findAllForFilterValues(filter); Optional<String> optionalCompanyId = Optional.absent(); if (authenticatedWaoUser.isCoordinatorOrObserver()) { Modified: trunk/wao-web/src/main/webapp/endpoints-js.jsp =================================================================== --- trunk/wao-web/src/main/webapp/endpoints-js.jsp 2014-07-07 13:26:22 UTC (rev 2127) +++ trunk/wao-web/src/main/webapp/endpoints-js.jsp 2014-07-07 15:30:39 UTC (rev 2128) @@ -18,11 +18,8 @@ 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. -%> +<%@ page language="java" contentType="text/javascript; charset=utf-8" pageEncoding="utf-8"%> +<%@ taglib uri="/struts-tags" prefix="s" %> $(document).ready(function () { @@ -40,5 +37,3 @@ WAO.BOAT_DETAILS_URL = '<s:url namespace="/" action="boat-details"/>'; }); - -

1 0

r2127 - trunk/wao-services/src/main/java/fr/ifremer/wao/services/service
by bleny＠users.forge.codelutin.com 07 Jul '14

07 Jul '14

Author: bleny Date: 2014-07-07 15:26:22 +0200 (Mon, 07 Jul 2014) New Revision: 2127 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2127 Log: remove warn, this state is normal Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatsService.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsService.java Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatsService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatsService.java 2014-07-07 13:24:56 UTC (rev 2126) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatsService.java 2014-07-07 13:26:22 UTC (rev 2127) @@ -134,11 +134,7 @@ if (authenticatedWaoUser.isProfessional()) { // Pour le profesionnel, on restreint d'office à la liste des bateaux qu'il peut voir Collection<String> canReadBoatsTopiaIds = authenticatedWaoUser.getWaoUser().getCanReadBoatsTopiaIds(); - if (CollectionUtils.isEmpty(canReadBoatsTopiaIds)) { - if (log.isWarnEnabled()) { - log.warn("user " + authenticatedWaoUser.getWaoUser() + " is professional but can't read any boat"); - } - } else { + if (CollectionUtils.isNotEmpty(canReadBoatsTopiaIds)) { boatsFilter.setBoatIds(new HashSet<>(canReadBoatsTopiaIds)); } } Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsService.java 2014-07-07 13:24:56 UTC (rev 2126) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsService.java 2014-07-07 13:26:22 UTC (rev 2127) @@ -124,11 +124,7 @@ if (authenticatedWaoUser.isProfessional()) { // Pour le profesionnel, on restreint d'office à la liste des contacts portant sur les bateaux qu'il peut voir Collection<String> canReadBoatsTopiaIds = authenticatedWaoUser.getWaoUser().getCanReadBoatsTopiaIds(); - if (CollectionUtils.isEmpty(canReadBoatsTopiaIds)) { - if (log.isWarnEnabled()) { - log.warn("user " + authenticatedWaoUser.getWaoUser() + " is professional but can't read any boat"); - } - } else { + if (CollectionUtils.isNotEmpty(canReadBoatsTopiaIds)) { newContactsFilter.getBoatFilter().setBoatIds(new HashSet<>(canReadBoatsTopiaIds)); } }

1 0

r2126 - in trunk: wao-services/src/main/java/fr/ifremer/wao/services/service wao-web/src/main/webapp/WEB-INF/content
by bleny＠users.forge.codelutin.com 07 Jul '14

07 Jul '14

Author: bleny Date: 2014-07-07 15:24:56 +0200 (Mon, 07 Jul 2014) New Revision: 2126 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2126 Log: fixes #5388 fixe contact form for refusal state Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsService.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/UpdateContactCommand.java trunk/wao-web/src/main/webapp/WEB-INF/content/edit-contact-input.jsp Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsService.java 2014-07-07 12:42:39 UTC (rev 2125) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsService.java 2014-07-07 13:24:56 UTC (rev 2126) @@ -251,6 +251,11 @@ updateContactCommand.setTerrestrialLocationId(terrestrialLocationId); } + if (contact.getContactStateMotif() != null) { + String contactStateMotifId = contact.getContactStateMotif().getTopiaId(); + updateContactCommand.setContactStateMotifId(contactStateMotifId); + } + } else { throw new UnknownContactIdException(contactId); @@ -489,6 +494,14 @@ updateContactCommand.getContact().setTerrestrialLocation(terrestrialLocation); } + String contactStateMotifId = updateContactCommand.getContactStateMotifId(); + if (StringUtils.isBlank(contactStateMotifId)) { + updateContactCommand.getContact().setContactStateMotif(null); + } else { + ContactStateMotif contactStateMotif = getContactStateMotifDao().forTopiaIdEquals(contactStateMotifId).findUnique(); + updateContactCommand.getContact().setContactStateMotif(contactStateMotif); + } + } public void validate(AuthenticatedWaoUser authenticatedWaoUser, Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/UpdateContactCommand.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/UpdateContactCommand.java 2014-07-07 12:42:39 UTC (rev 2125) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/UpdateContactCommand.java 2014-07-07 13:24:56 UTC (rev 2126) @@ -57,8 +57,10 @@ protected Set<String> secondaryObserverIds = new HashSet<>(); - private String terrestrialLocationId; + protected String terrestrialLocationId; + protected String contactStateMotifId; + public boolean isCreation() { return creation; } @@ -190,4 +192,12 @@ public void setTerrestrialLocationId(String terrestrialLocationId) { this.terrestrialLocationId = terrestrialLocationId; } + + public String getContactStateMotifId() { + return contactStateMotifId; + } + + public void setContactStateMotifId(String contactStateMotifId) { + this.contactStateMotifId = contactStateMotifId; + } } Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/edit-contact-input.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/edit-contact-input.jsp 2014-07-07 12:42:39 UTC (rev 2125) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/edit-contact-input.jsp 2014-07-07 13:24:56 UTC (rev 2126) @@ -35,7 +35,7 @@ $(document).ready(function () { - <s:if test="contact.obsProgram.obsMer"> + <s:if test="updateContactCommand.contact.obsProgram.obsMer"> var $mammalsCaptureCheckbox = $('#mammalsCaptureCheckbox'); var $mammalsInfo = $('#mammalsInfo'); @@ -52,12 +52,14 @@ var $contactStateMotif = $('#contactStateMotif'); var $contactStateSelect = $('select[name="updateContactCommand.contact.contactState"]'); + var $contactStateMotifSelect = $('select[name="updateContactCommand.contactStateMotifId"]'); var showHideContactStateMotif = function () { var contactState = $contactStateSelect.val(); if (contactState === 'CONTACT_REFUSED' || contactState === 'CONTACT_DEFINITELY_REFUSED') { $contactStateMotif.show(); } else { + $contactStateMotifSelect.val(''); $contactStateMotif.hide(); } }; @@ -261,8 +263,8 @@ <s:if test="updateContactCommand.contact.obsProgram.obsMer"> <div id="contactStateMotif"> - <s:select name="updateContactCommand.contact.contactStateMotif" - value="%{updateContactCommand.contact.contactState.topiaId}" + <s:select name="updateContactCommand.contactStateMotifId" + value="%{updateContactCommand.contactStateMotifId}" label="%{getText('wao.ui.field.Contact.contactStateMotif')}" list="contactStateMotives" emptyOption="true"

1 0

r2125 - in trunk/wao-services/src/main/java/fr/ifremer/wao/services/service: . mail
by bleny＠users.forge.codelutin.com 07 Jul '14

07 Jul '14

Author: bleny Date: 2014-07-07 14:42:39 +0200 (Mon, 07 Jul 2014) New Revision: 2125 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2125 Log: fixes #5378 change from header for harmonie mail Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsService.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/mail/EmailService.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/mail/WaoMail.java Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsService.java 2014-07-07 10:52:51 UTC (rev 2124) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsService.java 2014-07-07 12:42:39 UTC (rev 2125) @@ -962,6 +962,8 @@ } } else { + email.setFrom(observer); + email.addBcc(observer); email.addTo(emailToUpdateAllegroWallets); Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/mail/EmailService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/mail/EmailService.java 2014-07-07 10:52:51 UTC (rev 2124) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/mail/EmailService.java 2014-07-07 12:42:39 UTC (rev 2125) @@ -25,6 +25,7 @@ import com.github.mustachejava.Mustache; import com.github.mustachejava.MustacheFactory; import com.google.common.base.Charsets; +import com.google.common.base.Objects; import fr.ifremer.wao.WaoApplicationConfig; import fr.ifremer.wao.WaoTechnicalException; import fr.ifremer.wao.services.service.WaoServiceSupport; @@ -54,8 +55,8 @@ if (getApplicationConfig().isDevMode()) { if (log.isInfoEnabled()) { - log.info("an email should have been sent if not in devMode: tos = " + - mail.getTos() + ". subject = '" + mail.getSubject() + "'. body = \n" + getBody(mail)); + log.info("an email should have been sent if not in devMode: from = " + mail.getFrom() + ", tos = " + + mail.getTos() + ", subject = '" + mail.getSubject() + "', body = \n" + getBody(mail)); } if (log.isWarnEnabled()) { @@ -92,8 +93,13 @@ try { - newEmail.setFrom(applicationConfig.getSmtpFrom()); + String from = + Objects.firstNonNull( + mail.getFrom(), + applicationConfig.getSmtpFrom()); + newEmail.setFrom(from); + for (String to : mail.getTos()) { newEmail.addTo(to); } Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/mail/WaoMail.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/mail/WaoMail.java 2014-07-07 10:52:51 UTC (rev 2124) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/mail/WaoMail.java 2014-07-07 12:42:39 UTC (rev 2125) @@ -38,6 +38,8 @@ protected Set<String> bccs; + protected String from; + public WaoMail(Locale locale) { this.locale = locale; } @@ -91,4 +93,16 @@ return isRecipientProvided; } + public String getFrom() { + return from; + } + + public void setFrom(String from) { + this.from = from; + } + + public void setFrom(WaoUser waoUser) { + Preconditions.checkArgument(waoUser.isActive()); + setFrom(waoUser.getLogin()); + } }

1 0

r2124 - in trunk: wao-persistence/src/main/java/fr/ifremer/wao/entity wao-services/src/main/java/fr/ifremer/wao/services/service
by bleny＠users.forge.codelutin.com 07 Jul '14

07 Jul '14

Author: bleny Date: 2014-07-07 12:52:51 +0200 (Mon, 07 Jul 2014) New Revision: 2124 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2124 Log: refs #5288 improve boat filter values search Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/BoatTopiaDao.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatsFilterValues.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SampleRowsFilterValues.java 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-07-04 14:49:50 UTC (rev 2123) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/BoatTopiaDao.java 2014-07-07 10:52:51 UTC (rev 2124) @@ -44,8 +44,15 @@ HqlAndParametersBuilder<Boat> query = toBoatHqlAndParametersBuilder(filter); - List<Boat> boats = findAll(query.getHql(), query.getHqlParameters()); + String hql = query.getHql(); + hql = StringUtils.replace( + hql, + "from fr.ifremer.wao.entity.Boat b", + "from fr.ifremer.wao.entity.BoatImpl b left outer join fetch b." + Boat.PROPERTY_DISTRICT + " left outer join fetch b." + Boat.PROPERTY_PORT_OF_REGISTRY + " left outer join fetch b." + Boat.PROPERTY_SHIP_OWNER + " so left outer join fetch b." + Boat.PROPERTY_ELLIGIBLE_BOAT + " eb left join fetch eb." + ElligibleBoat.PROPERTY_SAMPLE_ROW + " sr left join fetch sr." + SampleRow.PROPERTY_FISHING_ZONE); + + List<Boat> boats = findAll(hql, query.getHqlParameters()); + return boats; } Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatsFilterValues.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatsFilterValues.java 2014-07-04 14:49:50 UTC (rev 2123) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatsFilterValues.java 2014-07-07 10:52:51 UTC (rev 2124) @@ -101,7 +101,7 @@ for (ElligibleBoat elligibleBoat : boat.getElligibleBoat()) { SampleRow sampleRow = elligibleBoat.getSampleRow(); if (elligibleBoat.isBoatElligible()) { - elligibleForSampleRowsFilterValues.addSampleRow(sampleRow); + elligibleForSampleRowsFilterValues.addSampleRowForBoatFilter(sampleRow); } } 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-07-04 14:49:50 UTC (rev 2123) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SampleRowsFilterValues.java 2014-07-07 10:52:51 UTC (rev 2124) @@ -83,6 +83,14 @@ } public void addSampleRow(SampleRow sampleRow) { + addSampleRow(sampleRow, false); + } + + public void addSampleRowForBoatFilter(SampleRow sampleRow) { + addSampleRow(sampleRow, true); + } + + protected void addSampleRow(SampleRow sampleRow, boolean fromBoatFilter) { boolean sampleRowMatchesObsProgram = obsProgram.equals(sampleRow.getObsProgram()); boolean sampleRowMatchesCompany = true; if (optionalCompanyId.isPresent()) { @@ -94,43 +102,48 @@ } if (sampleRowMatchesObsProgram && sampleRowMatchesCompany) { + for (FishingZone fishingZone : sampleRow.getFishingZone()) { fishingZoneFacadeNames.add(FilterOption.forString(fishingZone.getFacadeName())); fishingZoneSectorNames.add(FilterOption.forString(fishingZone.getSectorName())); } sampleRowCodes.add(FilterOption.forString(sampleRow.getCode())); - programNames.add(FilterOption.forString(sampleRow.getProgramName())); - Company company = sampleRow.getCompany(); - if (company != null) { - companies.add(FilterOption.forValueAndLabel(company.getTopiaId(), company.getName())); - } - samplingStrategies.add(FilterOption.forEnum(locale, sampleRow.getSamplingStrategy())); - if (sampleRow.getObsProgram().isObsVente()) { - TerrestrialLocation terrestrialDistrict = sampleRow.getTerrestrialLocation(); - terrestrialDistricts.add( - FilterOption.forValueAndLabel( - terrestrialDistrict.getTopiaId(), - terrestrialDistrict.getDescription()) - ); - } - for (DCF5Code dcf5Code : sampleRow.getdCF5Code()) { - FishingGearDCF fishingGearDCF = dcf5Code.getFishingGearDCF(); - String fishingGearLabel = fishingGearDCF.getCode() + " - " + l(locale, fishingGearDCF.getI18nKey()); - fishingGearDcfs.add( - FilterOption.forValueAndLabel( - fishingGearDCF.getTopiaId(), - fishingGearLabel) - ); - TargetSpeciesDCF targetSpeciesDCF = dcf5Code.getTargetSpeciesDCF(); - if (targetSpeciesDCF != null) { - String targetspeciesLabel = targetSpeciesDCF.getCode() + " - " + l(locale, targetSpeciesDCF.getI18nKey()); - targetSpeciesDcfs.add( + if ( ! fromBoatFilter) { + // XXX brendan 07/07/14 dans le calcul des filter values, on évite tout ça pour les perfs + programNames.add(FilterOption.forString(sampleRow.getProgramName())); + + Company company = sampleRow.getCompany(); + if (company != null) { + companies.add(FilterOption.forValueAndLabel(company.getTopiaId(), company.getName())); + } + samplingStrategies.add(FilterOption.forEnum(locale, sampleRow.getSamplingStrategy())); + if (sampleRow.getObsProgram().isObsVente()) { + TerrestrialLocation terrestrialDistrict = sampleRow.getTerrestrialLocation(); + terrestrialDistricts.add( FilterOption.forValueAndLabel( - targetSpeciesDCF.getTopiaId(), - targetspeciesLabel) + terrestrialDistrict.getTopiaId(), + terrestrialDistrict.getDescription()) ); } + for (DCF5Code dcf5Code : sampleRow.getdCF5Code()) { + FishingGearDCF fishingGearDCF = dcf5Code.getFishingGearDCF(); + String fishingGearLabel = fishingGearDCF.getCode() + " - " + l(locale, fishingGearDCF.getI18nKey()); + fishingGearDcfs.add( + FilterOption.forValueAndLabel( + fishingGearDCF.getTopiaId(), + fishingGearLabel) + ); + TargetSpeciesDCF targetSpeciesDCF = dcf5Code.getTargetSpeciesDCF(); + if (targetSpeciesDCF != null) { + String targetspeciesLabel = targetSpeciesDCF.getCode() + " - " + l(locale, targetSpeciesDCF.getI18nKey()); + targetSpeciesDcfs.add( + FilterOption.forValueAndLabel( + targetSpeciesDCF.getTopiaId(), + targetspeciesLabel) + ); + } + } } } }

1 0

r2123 - in branches: . wao-lucene
by bleny＠users.forge.codelutin.com 04 Jul '14

04 Jul '14

Author: bleny Date: 2014-07-04 16:49:50 +0200 (Fri, 04 Jul 2014) New Revision: 2123 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2123 Log: create branch for lucene Added: branches/wao-lucene/ Property changes on: branches/wao-lucene ___________________________________________________________________ Added: svn:ignore + *.idea *.iml target atlassian-ide-plugin.xml Added: svn:mergeinfo + /branches/wao-4.0-obsvente:2075-2085

1 0

[ANN] - Wao 4.0 released
by codelutin.com Release Notification 02 Jul '14

02 Jul '14

The Wao team is pleased to announce the wao-4.0 release! Application pour le suivi contractuels d'observations scientifiques de la pêche Documentation of the project can be found here: http://doc.codelutin.com/wao Changes ------- Changes in this version include: New features: o Demande de devis pour évolutions : Filtre et extraction Issue: 4586. Thanks to Anne-Sophie Cornou. Resolved by bleny. o Plan d'échantillonnage ObsMer Issue: 4483. Thanks to Brendan Le Ny. Resolved by bleny. o Gestion des navires Obsmer Issue: 4490. Thanks to Brendan Le Ny. Resolved by bleny. o Synthèses pour ObsMer Issue: 4493. Thanks to Brendan Le Ny. Resolved by bleny. o Authentification des utilisateurs Issue: 4496. Thanks to Brendan Le Ny. Resolved by bleny. o Gestion des référentiels Issue: 4482. Thanks to Brendan Le Ny. Resolved by bleny. o Gestion des contacts ObsVente Issue: 4488. Thanks to Brendan Le Ny. Resolved by bleny. o Ajouter CEP au référentiel des code DCF des espèces cibles Issue: 5083. Thanks to Brendan Le Ny. Resolved by bleny. o Enregistrer la taille des navires en cm Issue: 4983. Thanks to Vincent BADTS. Resolved by bleny. o Plan et contact : affichage des jours de mer Issue: 5049. Thanks to Vincent BADTS. Resolved by bleny. o Administration des utilisateurs et des sociétés Issue: 4560. Thanks to Brendan Le Ny. Resolved by bleny. o Page d'accueil Issue: 4553. Thanks to Brendan Le Ny. Resolved by bleny. o Ajouter le programme et la durée en nombre de jours de chaque marée dans l'export CSV des contacts Issue: 4725. Thanks to Brendan Le Ny. Resolved by bleny. o Charte graphique Issue: 4997. Thanks to Brendan Le Ny. Resolved by bleny. o Calcul du réalisé en jours de mer : nouvelle formule (modifie le ticket #5049) Issue: 5188. Thanks to Vincent BADTS. Resolved by bleny. o Gestion des contacts ObsMer Issue: 4487. Thanks to Brendan Le Ny. Resolved by bleny. o Plan d'échantillonnage ObsVente Issue: 4484. Thanks to Brendan Le Ny. Resolved by bleny. o Gestion des navires ObsVente Issue: 4491. Thanks to Brendan Le Ny. Resolved by bleny. o Synthèses pour ObsVente Issue: 4494. Thanks to Brendan Le Ny. Resolved by bleny. o Permettre l'extraction d'informations sur le réalisé depuis le plan d'échantillonnage Issue: 4726. Thanks to Brendan Le Ny. Resolved by ascornou. o Filtres à sélection multiples dans tous les écrans et pour tous les programmes Issue: 1690. Thanks to Vincent BADTS. Resolved by bleny. Fixed Bugs: o Problème dans la base de données sur les navires éligibles Issue: 4920. Thanks to Brendan Le Ny. Resolved by bleny. o Améliorer le message d'erreur dans l'import navire Issue: 4922. Thanks to Vincent BADTS. Resolved by bleny. o Problème d'intégrité dans la base de données : logins en doubles Issue: 5106. Thanks to Brendan Le Ny. Resolved by bleny. Downloads --------- For a manual installation, you can download files here: http://forge.codelutin.com/projects/wao/files * wao-4.0.war - http://forge.codelutin.com/attachments/download/2010 Maven artifacts --------------- Artifacts are deployed in nuiton maven repository http://maven.nuiton.org/other-releases/ Have fun! -Wao team

1 0

r2122 - in trunk: . wao-persistence wao-services wao-web
by maven-release＠users.forge.codelutin.com 02 Jul '14

02 Jul '14

Author: maven-release Date: 2014-07-02 14:38:14 +0200 (Wed, 02 Jul 2014) New Revision: 2122 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2122 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml trunk/wao-persistence/pom.xml trunk/wao-services/pom.xml trunk/wao-web/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-07-02 12:38:09 UTC (rev 2121) +++ trunk/pom.xml 2014-07-02 12:38:14 UTC (rev 2122) @@ -10,7 +10,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.0</version> + <version>4.1-SNAPSHOT</version> <packaging>pom</packaging> <name>Wao</name> @@ -86,9 +86,9 @@ </modules> <scm> - <connection>scm:svn:http://svn.codelutin.com/wao/tags/wao-4.0</connection> - <developerConnection>scm:svn:https://svn.codelutin.com/wao/tags/wao-4.0</developerConnection> - <url>https://forge.codelutin.com/repositories/browse/wao/tags/wao-4.0</url> + <connection>scm:svn:http://svn.codelutin.com/wao/trunk</connection> + <developerConnection>scm:svn:https://svn.codelutin.com/wao/trunk</developerConnection> + <url>https://forge.codelutin.com/repositories/browse/wao/trunk</url> </scm> <properties> Modified: trunk/wao-persistence/pom.xml =================================================================== --- trunk/wao-persistence/pom.xml 2014-07-02 12:38:09 UTC (rev 2121) +++ trunk/wao-persistence/pom.xml 2014-07-02 12:38:14 UTC (rev 2122) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.0</version> + <version>4.1-SNAPSHOT</version> </parent> <artifactId>wao-persistence</artifactId> Modified: trunk/wao-services/pom.xml =================================================================== --- trunk/wao-services/pom.xml 2014-07-02 12:38:09 UTC (rev 2121) +++ trunk/wao-services/pom.xml 2014-07-02 12:38:14 UTC (rev 2122) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.0</version> + <version>4.1-SNAPSHOT</version> </parent> <artifactId>wao-services</artifactId> Modified: trunk/wao-web/pom.xml =================================================================== --- trunk/wao-web/pom.xml 2014-07-02 12:38:09 UTC (rev 2121) +++ trunk/wao-web/pom.xml 2014-07-02 12:38:14 UTC (rev 2122) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.0</version> + <version>4.1-SNAPSHOT</version> </parent> <artifactId>wao-web</artifactId>

1 0

r2121 - in tags: . wao-4.0
by maven-release＠users.forge.codelutin.com 02 Jul '14

02 Jul '14

Author: maven-release Date: 2014-07-02 14:38:09 +0200 (Wed, 02 Jul 2014) New Revision: 2121 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2121 Log: [maven-release-plugin] copy for tag wao-4.0 Added: tags/wao-4.0/ Property changes on: tags/wao-4.0 ___________________________________________________________________ Added: svn:mergeinfo + /branches/wao-4.0-obsvente:2075-2085 Added: svn:ignore + *.idea *.iml target atlassian-ide-plugin.xml

1 0