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

r1814 - trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity
by tchemit＠users.forge.codelutin.com 03 Apr '14

03 Apr '14

Author: tchemit Date: 2014-04-03 11:12:52 +0200 (Thu, 03 Apr 2014) New Revision: 1814 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1814 Log: add I18nAble on Enums Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactState.java trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/DataReliability.java trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/LocationType.java trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ObsProgram.java trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ObservationType.java trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ObservedDataControl.java trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SynthesisId.java trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/UserRole.java Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactState.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactState.java 2014-04-03 09:06:53 UTC (rev 1813) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactState.java 2014-04-03 09:12:52 UTC (rev 1814) @@ -47,7 +47,7 @@ * * @author fdesbois <fdesbois(a)codelutin.com> */ -public enum ContactState { +public enum ContactState implements I18nAble{ /** Usually, the first step, observer just contacted someone */ CONTACT_START(n("ContactState.CONTACT_START"), false, false, false, true), @@ -84,8 +84,6 @@ /** true if this value can be used for a contact of program {@link fr.ifremer.wao.entity.ObsProgram#OBSDEB} */ protected boolean allowedForObsDeb; - /** @deprecated I18N should be done properly by tapestry */ - @Deprecated ContactState(String i18nKey, boolean finalState, boolean unfinishedState, boolean allowedForObsVente, boolean allowedForObsDeb) { this.i18nKey = i18nKey; @@ -95,6 +93,11 @@ this.allowedForObsDeb = allowedForObsDeb; } + @Override + public String getI18nKey() { + return i18nKey; + } + public boolean isFinalState() { return this.finalState; } Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/DataReliability.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/DataReliability.java 2014-04-03 09:06:53 UTC (rev 1813) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/DataReliability.java 2014-04-03 09:12:52 UTC (rev 1814) @@ -31,7 +31,7 @@ * * @author bleny */ -public enum DataReliability { +public enum DataReliability implements I18nAble{ /** Data are trustworthy (100% trust). */ RELIABLE(n("DataReliability.RELIABLE")), @@ -67,4 +67,9 @@ return null; } + + @Override + public String getI18nKey() { + return i18nKey; + } } Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/LocationType.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/LocationType.java 2014-04-03 09:06:53 UTC (rev 1813) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/LocationType.java 2014-04-03 09:12:52 UTC (rev 1814) @@ -22,7 +22,7 @@ import static org.nuiton.i18n.I18n.n; -public enum LocationType { +public enum LocationType implements I18nAble{ PORT(n("LocationType.PORT")), AUCTION(n("LocationType.AUCTION")), @@ -35,6 +35,11 @@ this.i18nKey = i18nKey; } + @Override + public String getI18nKey() { + return i18nKey; + } + public static LocationType valueOf(Integer locationTypeOrdinal) { if (locationTypeOrdinal != null) { for (LocationType locationType : LocationType.values()) { Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ObsProgram.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ObsProgram.java 2014-04-03 09:06:53 UTC (rev 1813) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ObsProgram.java 2014-04-03 09:12:52 UTC (rev 1814) @@ -22,7 +22,7 @@ import static org.nuiton.i18n.I18n.n; -public enum ObsProgram implements I18nAble{ +public enum ObsProgram implements I18nAble { OBSMER("M", n("ObsProgram.OBSMER")), OBSVENTE("V", n("ObsProgram.OBSVENTE")), Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ObservationType.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ObservationType.java 2014-04-03 09:06:53 UTC (rev 1813) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ObservationType.java 2014-04-03 09:12:52 UTC (rev 1814) @@ -31,7 +31,7 @@ * * @author bleny */ -public enum ObservationType { +public enum ObservationType implements I18nAble{ /** Information obtained by observation on the field work */ FIELD_WORK_OBSERVATION(n("ObservationType.FIELD_WORK_OBSERVATION")), @@ -60,4 +60,9 @@ public boolean isFieldWorkObservation() { return this == ObservationType.FIELD_WORK_OBSERVATION; } + + @Override + public String getI18nKey() { + return i18nKey; + } } Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ObservedDataControl.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ObservedDataControl.java 2014-04-03 09:06:53 UTC (rev 1813) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ObservedDataControl.java 2014-04-03 09:12:52 UTC (rev 1814) @@ -28,7 +28,7 @@ /** * Pour ObsMer indique si les données saisies dans Allegro sont valides. */ -public enum ObservedDataControl { +public enum ObservedDataControl implements I18nAble{ CORRECTION_ASKED(n("ObservedDataControl.CORRECTION_ASKED")), @@ -41,4 +41,8 @@ this.i18nKey = i18nKey; } + @Override + public String getI18nKey() { + return i18nKey; + } } Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SynthesisId.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SynthesisId.java 2014-04-03 09:06:53 UTC (rev 1813) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SynthesisId.java 2014-04-03 09:12:52 UTC (rev 1814) @@ -32,7 +32,7 @@ * * @author fdesbois <fdesbois(a)codelutin.com> */ -public enum SynthesisId { +public enum SynthesisId implements I18nAble { /** */ GRAPH_SAMPLING(n("SynthesisId.GRAPH_SAMPLING")), @@ -65,6 +65,11 @@ this.i18nKey = i18nKey; } + @Override + public String getI18nKey() { + return i18nKey; + } + public static SynthesisId valueOf(int ordinal) { for (SynthesisId synthesisId : SynthesisId.values()) { if (synthesisId.ordinal() == ordinal) { Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/UserRole.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/UserRole.java 2014-04-03 09:06:53 UTC (rev 1813) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/UserRole.java 2014-04-03 09:12:52 UTC (rev 1814) @@ -39,7 +39,7 @@ * @author tchemit <tchemit(a)codelutin.com> * @version $Id$ */ -public enum UserRole { +public enum UserRole implements I18nAble { /** Admin role **/ ADMIN(n("UserRole.ADMIN")), /** User/observer role **/ @@ -66,6 +66,7 @@ throw new IllegalArgumentException("ordinal " + userRoleOrdinal); } + @Override public String getI18nKey() { return i18nKey; }

1 0

r1813 - trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer
by bleny＠users.forge.codelutin.com 03 Apr '14

03 Apr '14

Author: bleny Date: 2014-04-03 11:06:53 +0200 (Thu, 03 Apr 2014) New Revision: 1813 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1813 Log: refs #4490 fix wrong ognl expression, some style 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-03 08:49:06 UTC (rev 1812) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boat-details.jsp 2014-04-03 09:06:53 UTC (rev 1813) @@ -1,7 +1,7 @@ <%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8" %> <%@taglib uri="/struts-tags" prefix="s" %> -<table> +<table class="table"> <caption> <s:text name="wao.ui.contact.lastContact"/> </caption> @@ -39,7 +39,7 @@ </table> <s:if test="boatDetails.mostRecentContact != null"> - <table> + <table class="table"> <caption> <s:text name="wao.ui.contact.lastContact"/> </caption> @@ -85,7 +85,7 @@ <s:iterator value="boatDetails.boatInfos.boat.elligibleBoat"> <li> <s:property value="sampleRow.code"/> - <s:if test="boatDetails.isNewContactCreatable && authenticatedWaoUser.authorizedToCreateContact"> + <s:if test="boatDetails.newContactCreatable && authenticatedWaoUser.authorizedToCreateContact"> <s:text name="wao.ui.contacts.createFromBoat"/> </s:if> </li>

1 0

r1812 - trunk/wao-web/src/main/resources/i18n
by bleny＠users.forge.codelutin.com 03 Apr '14

03 Apr '14

Author: bleny Date: 2014-04-03 10:49:06 +0200 (Thu, 03 Apr 2014) New Revision: 1812 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1812 Log: add missing i18n values 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-04-03 08:46:37 UTC (rev 1811) +++ trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-04-03 08:49:06 UTC (rev 1812) @@ -168,7 +168,7 @@ wao.ui.field.Contact.observationType=Observation type wao.ui.field.Contact.observedDataControl=Observed data control wao.ui.field.Contact.restitution=Restitution forwarding date -wao.ui.field.Contact.sampleRow= +wao.ui.field.Contact.sampleRow=Sample row wao.ui.field.Contact.samplingStrategy=Sampling strategy followed wao.ui.field.Contact.secondaryObservers=Observers wao.ui.field.Contact.terrestrialLocation=Observation's place @@ -254,9 +254,9 @@ wao.ui.form.addComment=Add a comment wao.ui.form.addComment.success=Comment saved wao.ui.form.addRole=Add this ru00F4le -wao.ui.form.authentication.acceptCgu= +wao.ui.form.authentication.acceptCgu=You accept the EUA wao.ui.form.authentication.action.submit=Login -wao.ui.form.authentication.chooseUserProfile= +wao.ui.form.authentication.chooseUserProfile=Role wao.ui.form.authentication.error.inactiveWaoUser=This wao user is not active. Please, contact an administrator wao.ui.form.authentication.error.noRoleAttributed=This wao user has no role affected. Please, contact an administrator wao.ui.form.authentication.error.userMustAcceptCgu=You must accept the end-user agreement 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-03 08:46:37 UTC (rev 1811) +++ trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-04-03 08:49:06 UTC (rev 1812) @@ -168,7 +168,7 @@ 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 -wao.ui.field.Contact.sampleRow= +wao.ui.field.Contact.sampleRow=Ligne du plan wao.ui.field.Contact.samplingStrategy=Stratégie d'échantillonnage suivie wao.ui.field.Contact.secondaryObservers=Observateurs wao.ui.field.Contact.terrestrialLocation=Lieu d'observation @@ -233,7 +233,7 @@ wao.ui.form.Company.title.creation=Création d'une société wao.ui.form.Company.title.edition=Modification de la société %s wao.ui.form.SampleRow.boatsDescription=Ce champs correspond aux immatriculations des navires qui sont éligibles pour cette ligne. Vous pouvez utiliser n'importe quel séparateur pour séparer les immatriculations (virgule, point, espace ou saut de ligne) -wao.ui.form.SampleRow.error.codeMustBeUnique= +wao.ui.form.SampleRow.error.codeMustBeUnique=Le code de la ligne doit être unique wao.ui.form.SampleRow.error.missingDcf5Codes=Il faut préciser au moins un code DCF5 wao.ui.form.SampleRow.error.missingFishingZones=Il faut préciser au moins une zone de pêche wao.ui.form.SampleRow.error.missingLogComment=Vous devez préciser la raison de vos modifications

1 0

r1811 - in trunk: wao-persistence/src/main/java/fr/ifremer/wao/entity wao-services/src/main/java/fr/ifremer/wao/services wao-services/src/main/java/fr/ifremer/wao/services/service wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer wao-web/src/main/resources/i18n wao-web/src/main/webapp wao-web/src/main/webapp/WEB-INF wao-web/src/main/webapp/WEB-INF/content/obsmer
by bleny＠users.forge.codelutin.com 03 Apr '14

03 Apr '14

Author: bleny Date: 2014-04-03 10:46:37 +0200 (Thu, 03 Apr 2014) New Revision: 1811 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1811 Log: refs #4490 start displaying boat details Added: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatDetails.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/BoatDetailsAction.java trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boat-details.jsp Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactTopiaDao.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerBoatsService.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/boats.jsp trunk/wao-web/src/main/webapp/WEB-INF/decorators.xml trunk/wao-web/src/main/webapp/wao.css 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-03 08:27:31 UTC (rev 1810) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactTopiaDao.java 2014-04-03 08:46:37 UTC (rev 1811) @@ -9,6 +9,7 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.HqlAndParametersBuilder; import org.nuiton.topia.persistence.TopiaEntity; +import org.nuiton.topia.persistence.TopiaQueryBuilderAddCriteriaOrRunQueryStep; import java.util.Collection; import java.util.List; @@ -140,4 +141,13 @@ } + public Contact findMostRecentContactOrNull(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()); + query.setOrderByArguments(Contact.PROPERTY_CREATION_DATE + " desc"); + return query.findFirstOrNull(); + } + } Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java 2014-04-03 08:27:31 UTC (rev 1810) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java 2014-04-03 08:46:37 UTC (rev 1811) @@ -200,4 +200,9 @@ return ! userProfile.isCoordinatorOrObserver(); } + public boolean isAuthorizedToViewBoatDetails(String companyId) { + boolean authorizedToViewBoatDetails = userProfile.isAdmin() + || userProfile.isCoordinatorOrObserver() && waoUser.getCompany().getTopiaId().equals(companyId); + return authorizedToViewBoatDetails; + } } Added: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatDetails.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatDetails.java (rev 0) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatDetails.java 2014-04-03 08:46:37 UTC (rev 1811) @@ -0,0 +1,30 @@ +package fr.ifremer.wao.services.service; + +import fr.ifremer.wao.entity.BoatInfos; +import fr.ifremer.wao.entity.Contact; + +public class BoatDetails { + + protected BoatInfos boatInfos; + + protected Contact mostRecentContact; + + public BoatDetails(BoatInfos boatInfos, Contact mostRecentContact) { + this.boatInfos = boatInfos; + this.mostRecentContact = mostRecentContact; + } + + public BoatInfos getBoatInfos() { + return boatInfos; + } + + public Contact getMostRecentContact() { + return mostRecentContact; + } + + public boolean isNewContactCreatable() { + boolean newContactCreatable = mostRecentContact != null + && mostRecentContact.getContactState().isFinalState(); + return newContactCreatable; + } +} 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-03 08:27:31 UTC (rev 1810) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerBoatsService.java 2014-04-03 08:46:37 UTC (rev 1811) @@ -1,12 +1,18 @@ package fr.ifremer.wao.services.service; import com.google.common.base.Charsets; +import com.google.common.base.Optional; import com.google.common.collect.Sets; import fr.ifremer.wao.BoatsFilter; import fr.ifremer.wao.SampleRowsFilter; import fr.ifremer.wao.WaoTechnicalException; import fr.ifremer.wao.entity.Boat; +import fr.ifremer.wao.entity.BoatInfos; +import fr.ifremer.wao.entity.BoatInfosTopiaDao; import fr.ifremer.wao.entity.BoatTopiaDao; +import fr.ifremer.wao.entity.Company; +import fr.ifremer.wao.entity.Contact; +import fr.ifremer.wao.entity.ObsProgram; import fr.ifremer.wao.services.AuthenticatedWaoUser; import fr.ifremer.wao.services.service.csv.BoatImportExportModel; import org.apache.commons.collections4.CollectionUtils; @@ -132,4 +138,33 @@ throw new WaoTechnicalException(e); } } + + public BoatDetails getBoatDetails(ObsProgram obsProgram, String boatId, String companyId) { + + BoatInfosTopiaDao dao = getBoatInfosDao(); + + Optional<BoatInfos> optionalBoatInfos = + dao.newQueryBuilder() + .addTopiaIdEquals(BoatInfos.PROPERTY_BOAT, boatId) + .addTopiaIdEquals(BoatInfos.PROPERTY_COMPANY, companyId) + .tryFindUnique(); + + BoatInfos boatInfos; + if (optionalBoatInfos.isPresent()) { + boatInfos = optionalBoatInfos.get(); + } else { + Boat boat = getBoatDao().findByTopiaId(boatId); + Company company = getCompanyDao().findByTopiaId(companyId); + boatInfos = dao.create(BoatInfos.PROPERTY_BOAT, boat, + BoatInfos.PROPERTY_COMPANY, company); + } + + Contact mostRecentContact = getContactDao().findMostRecentContactOrNull(obsProgram, boatId, companyId); + + BoatDetails boatDetails = new BoatDetails(boatInfos, mostRecentContact); + + return boatDetails; + + } + } Added: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/BoatDetailsAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/BoatDetailsAction.java (rev 0) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/BoatDetailsAction.java 2014-04-03 08:46:37 UTC (rev 1811) @@ -0,0 +1,47 @@ +package fr.ifremer.wao.web.action.obsmer; + +import com.google.common.base.Preconditions; +import fr.ifremer.wao.services.service.BoatDetails; +import fr.ifremer.wao.services.service.ObsMerBoatsService; +import fr.ifremer.wao.web.WaoJspActionSupport; + +public class BoatDetailsAction extends WaoJspActionSupport { + + private static final long serialVersionUID = 1L; + + protected transient ObsMerBoatsService service; + + protected String companyId; + + protected String boatId; + + protected BoatDetails boatDetails; + + public void setService(ObsMerBoatsService service) { + this.service = service; + } + + public void setCompanyId(String companyId) { + this.companyId = companyId; + } + + public void setBoatId(String boatId) { + this.boatId = boatId; + } + + @Override + public String execute() { + + Preconditions.checkState(getAuthenticatedWaoUser().isAuthorizedToViewBoatDetails(companyId)); + + boatDetails = service.getBoatDetails(getObsProgram(), boatId, companyId); + + return SUCCESS; + + } + + public BoatDetails getBoatDetails() { + return boatDetails; + } + +} 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-03 08:27:31 UTC (rev 1810) +++ trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-04-03 08:46:37 UTC (rev 1811) @@ -83,6 +83,7 @@ wao.ui.action.viewIndicatorsHistory=View indicators historic wao.ui.action.viewReal=View real observation effort wao.ui.action.viewSampleRowLog=View sample row log +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.boatList=List of %s boats @@ -167,6 +168,7 @@ wao.ui.field.Contact.observationType=Observation type wao.ui.field.Contact.observedDataControl=Observed data control wao.ui.field.Contact.restitution=Restitution forwarding date +wao.ui.field.Contact.sampleRow= wao.ui.field.Contact.samplingStrategy=Sampling strategy followed wao.ui.field.Contact.secondaryObservers=Observers wao.ui.field.Contact.terrestrialLocation=Observation's place 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-03 08:27:31 UTC (rev 1810) +++ trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-04-03 08:46:37 UTC (rev 1811) @@ -83,6 +83,7 @@ wao.ui.action.viewIndicatorsHistory=Voir l'historique des modifications des indicateurs wao.ui.action.viewReal=Voir l'effort d'observation réalisé wao.ui.action.viewSampleRowLog=Consulter l'historique de cette ligne +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.boatList=Liste de %s navires @@ -167,6 +168,7 @@ 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 +wao.ui.field.Contact.sampleRow= wao.ui.field.Contact.samplingStrategy=Stratégie d'échantillonnage suivie wao.ui.field.Contact.secondaryObservers=Observateurs wao.ui.field.Contact.terrestrialLocation=Lieu d'observation Added: 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 (rev 0) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boat-details.jsp 2014-04-03 08:46:37 UTC (rev 1811) @@ -0,0 +1,93 @@ +<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8" %> +<%@taglib uri="/struts-tags" prefix="s" %> + +<table> + <caption> + <s:text name="wao.ui.contact.lastContact"/> + </caption> + <tbody> + <tr> + <th> + <s:text name="wao.ui.field.Boat.shipOwner"/> + </th> + <td> + <s:property value="boatDetails.boatInfos.boat.shipOwner.firstName"/> + <s:property value="boatDetails.boatInfos.boat.shipOwner.lastName"/> + + <s:url action="boats" id="shipOwnerBoatsUrl"> + <s:param name="filter.shipOwnerIds" value="boatDetails.boatInfos.boat.shipOwner.topiaId"/> + </s:url> + <s:a href="%{shipOwnerBoatsUrl}"> + <s:text name="wao.ui.action.viewShipOwnerBoats"/> + </s:a> + </td> + </tr> + <tr> + <th> + <s:text name="wao.ui.field.Boat.boatGroup"/> + </th> + <td> + <s:if test="boatDetails.boatInfos.boat.boatGroup == null"> + <s:text name="wao.ui.misc.N/A"/> + </s:if> + <s:else> + <s:property value="boatDetails.boatInfos.boat.boatGroup.description"/> + </s:else> + </td> + </tr> + </tbody> +</table> + +<s:if test="boatDetails.mostRecentContact != null"> + <table> + <caption> + <s:text name="wao.ui.contact.lastContact"/> + </caption> + <tbody> + <tr> + <th> + <s:text name="wao.ui.field.Contact.creationDate"/> + </th> + <td> + <s:property value="boatDetails.mostRecentContact.creationDate"/> + </td> + </tr> + <tr> + <th> + <s:text name="wao.ui.field.Contact.mainObserver"/> + </th> + <td> + <s:property value="boatDetails.mostRecentContact.mainObserver.fullName"/> + </td> + </tr> + <tr> + <th> + <s:text name="wao.ui.field.Contact.contactState"/> + </th> + <td> + <s:property value="%{getText(boatDetails.mostRecentContact.contactState)}"/> + </td> + </tr> + <tr> + <th> + <s:text name="wao.ui.field.Contact.sampleRow"/> + </th> + <td> + <s:property value="boatDetails.mostRecentContact.sampleRow.code"/> + </td> + </tr> + </tbody> + </table> +</s:if> + +<s:text name="wao.ui.boats.associatedLine"/> +<ul> + <s:iterator value="boatDetails.boatInfos.boat.elligibleBoat"> + <li> + <s:property value="sampleRow.code"/> + <s:if test="boatDetails.isNewContactCreatable && authenticatedWaoUser.authorizedToCreateContact"> + <s:text name="wao.ui.contacts.createFromBoat"/> + </s:if> + </li> + </s:iterator> +</ul> 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-04-03 08:27:31 UTC (rev 1810) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boats.jsp 2014-04-03 08:46:37 UTC (rev 1811) @@ -34,6 +34,16 @@ var boatsFilterController = new FilterController(WAO.OBSMER_BOATS_FILTER_VALUES_JSON_URL, $('#boats-filters-form')); boatsFilterController.init(); + + $('a.boat-details-action').click(function (e) { + e.preventDefault(); + var url = $(this).prop('href'); + var successCallback = function (data) { + $('#boat-details').html(data); + } + WAO.get(url, {}, successCallback); + }); + }); </script> @@ -206,9 +216,16 @@ <tbody> <s:iterator value="boats" var="boat"> - <tr class="boat-row<s:if test="!active"> inactive-boat-row</s:if>"> + <tr class="boat-row<s:if test="!active"> inactive</s:if>"> <td> - <s:property value="name"/> + <s:url action="boat-details" id="boatDetailsUrl"> + <s:param name="companyId" value="authenticatedWaoUser.waoUser.company.topiaId" /> + <s:param name="boatId" value="topiaId" /> + <s:param name="fragment" value="true" /> + </s:url> + <s:a href="%{boatDetailsUrl}" cssClass="boat-details-action"> + <s:property value="name"/> + </s:a> </td> <td><s:property value="%{'' + immatriculation}"/></td> <td><s:property value="boatLength"/> m</td> @@ -225,4 +242,8 @@ </todby> </table> +<div id="boat-details"></div> + +<div style="clear: both;"/> + </html> Modified: trunk/wao-web/src/main/webapp/WEB-INF/decorators.xml =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/decorators.xml 2014-04-03 08:27:31 UTC (rev 1810) +++ trunk/wao-web/src/main/webapp/WEB-INF/decorators.xml 2014-04-03 08:46:37 UTC (rev 1811) @@ -22,6 +22,7 @@ <excludes> <pattern>/css/*</pattern> <pattern>/img/*</pattern> + <pattern>*?*fragment=true*</pattern> </excludes> <decorator name="layout-login" page="layout-login.jsp"> Modified: trunk/wao-web/src/main/webapp/wao.css =================================================================== --- trunk/wao-web/src/main/webapp/wao.css 2014-04-03 08:27:31 UTC (rev 1810) +++ trunk/wao-web/src/main/webapp/wao.css 2014-04-03 08:46:37 UTC (rev 1811) @@ -264,7 +264,7 @@ left: -200px } -table.boats-list tbody tr.inactive-boat-row { - background-color: #ffaaaa; +#boats-list, #boat-details { + float: left; }

1 0

r1810 - in trunk: wao-services/src/main/java/fr/ifremer/wao/services/service wao-services/src/test/java/fr/ifremer/wao/services/service wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer wao-web/src/main/webapp/WEB-INF/content/obsmer
by tchemit＠users.forge.codelutin.com 03 Apr '14

03 Apr '14

Author: tchemit Date: 2014-04-03 10:27:31 +0200 (Thu, 03 Apr 2014) New Revision: 1810 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1810 Log: refs #4490 improve pagination api Added: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/PaginationBean.java 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/ObsMerBoatsService.java trunk/wao-services/src/test/java/fr/ifremer/wao/services/service/ObsMerBoatsServiceTest.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/BoatsAction.java trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boats.jsp 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-04-03 07:10:17 UTC (rev 1809) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerBoatsList.java 2014-04-03 08:27:31 UTC (rev 1810) @@ -1,7 +1,6 @@ package fr.ifremer.wao.services.service; import fr.ifremer.wao.entity.Boat; -import org.nuiton.topia.persistence.pager.TopiaPagerBean; import java.io.Serializable; import java.util.List; @@ -16,18 +15,18 @@ private static final long serialVersionUID = 1L; - protected TopiaPagerBean pager; + protected PaginationBean pagination; protected List<Boat> boats; protected BoatsFilterValues filterValues; - public TopiaPagerBean getPager() { - return pager; + public PaginationBean getPagination() { + return pagination; } - public void setPager(TopiaPagerBean pager) { - this.pager = pager; + public void setPagination(PaginationBean pagination) { + this.pagination = pagination; } public List<Boat> getBoats() { 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-03 07:10:17 UTC (rev 1809) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerBoatsService.java 2014-04-03 08:27:31 UTC (rev 1810) @@ -48,30 +48,38 @@ } public ObsMerBoatsList getBoatsList(BoatsFilter filter, - int pageSize, - int pageIndex, - String sortProperty, - boolean sortAscendant) { + TopiaPagerBean queryPager) { BoatTopiaDao dao = getBoatDao(); TopiaPagerBean pager = dao.newPager(filter, - pageSize, - pageIndex, - sortProperty, - sortAscendant); + queryPager.getPageSize(), + queryPager.getPageIndex(), + queryPager.getSortColumn(), + queryPager.isSortAscendant()); List<Boat> boats = dao.find(filter, pager); + PaginationBean paginationBean = new PaginationBean(pager, 10); + BoatsFilterValues boatsFilterValues = getBoatsFilterValues(filter); ObsMerBoatsList obsMerBoatsList = new ObsMerBoatsList(); obsMerBoatsList.setBoats(boats); - obsMerBoatsList.setPager(pager); + 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 BoatsFilter newBoatsFilter(AuthenticatedWaoUser authenticatedWaoUser) { SampleRowsFilter sampleRowsFilter = new SampleRowsFilter(); Added: 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 (rev 0) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/PaginationBean.java 2014-04-03 08:27:31 UTC (rev 1810) @@ -0,0 +1,82 @@ +package fr.ifremer.wao.services.service; + +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; + } +} Property changes on: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/PaginationBean.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native 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-04-03 07:10:17 UTC (rev 1809) +++ trunk/wao-services/src/test/java/fr/ifremer/wao/services/service/ObsMerBoatsServiceTest.java 2014-04-03 08:27:31 UTC (rev 1810) @@ -5,6 +5,7 @@ import fr.ifremer.wao.services.ObsMerFixtures; import org.junit.Before; import org.junit.Test; +import org.nuiton.topia.persistence.pager.TopiaPagerBean; /** * Created on 4/1/14. @@ -42,8 +43,10 @@ BoatsFilter filter = service.newBoatsFilter(fixtures.admin()); - ObsMerBoatsList boatsList = service.getBoatsList(filter, 50, 0, null, false); + TopiaPagerBean pager = service.newBoatsPager(50); + ObsMerBoatsList boatsList = service.getBoatsList(filter, pager); + } } \ No newline at end of file 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-04-03 07:10:17 UTC (rev 1809) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/BoatsAction.java 2014-04-03 08:27:31 UTC (rev 1810) @@ -6,6 +6,7 @@ import fr.ifremer.wao.services.service.BoatsFilterValues; import fr.ifremer.wao.services.service.ObsMerBoatsList; import fr.ifremer.wao.services.service.ObsMerBoatsService; +import fr.ifremer.wao.services.service.PaginationBean; import fr.ifremer.wao.web.WaoJspActionSupport; import org.nuiton.topia.persistence.pager.TopiaPagerBean; @@ -23,38 +24,32 @@ protected transient ObsMerBoatsService service; + /** + * Input pager. + */ + protected TopiaPagerBean pager; + + /** + * Boats filter. + */ protected BoatsFilter filter; - protected int pageIndex = 1; - - protected int pageSize = 50; - - protected String sortProperty = "name"; - - protected boolean sortAscendant = true; - + /** + * List of boats according to the input pager and filter. + */ protected ObsMerBoatsList boatList; - public void setPageIndex(int pageIndex) { - this.pageIndex = pageIndex; - } - - public void setPageSize(int pageSize) { - this.pageSize = pageSize; - } - - public void setSortProperty(String sortProperty) { - this.sortProperty = sortProperty; - } - - public void setSortAscendant(boolean sortAscendant) { - this.sortAscendant = sortAscendant; - } - public void setService(ObsMerBoatsService service) { this.service = service; } + public TopiaPagerBean getPager() { + if (pager == null) { + pager = service.newBoatsPager(50); + } + return pager; + } + public BoatsFilter getFilter() { if (filter == null) { prepare(); @@ -66,14 +61,14 @@ return boatList.getBoats(); } - public TopiaPagerBean getPager() { - return boatList.getPager(); - } - public BoatsFilterValues getFilterValues() { return boatList.getFilterValues(); } + public PaginationBean getPagination() { + return boatList.getPagination(); + } + @Override public void prepare() { @@ -83,52 +78,14 @@ @Override public String execute() { - boatList = service.getBoatsList(filter, - pageSize, - pageIndex, - sortProperty, - sortAscendant); + boatList = service.getBoatsList(filter, getPager()); return SUCCESS; } - public long getFirstPageIndex() { - int pageIndex = getPager().getPageIndex(); - long result = pageIndex; - long pagesNumber = getPager().getPagesNumber(); - if (pagesNumber <= 10 || pageIndex < 10) { - // stick to begin - return 1; - } - if (pagesNumber - pageIndex < 10) { - - // just center - result = pagesNumber - 10; - if (result < 1) { - result = 1; - } - return result; - } - - if (pageIndex >= 10) { - - // center - result = pageIndex - 5; - } - return result; - } - - public long getLastPageIndex() { - long result = getFirstPageIndex() + 10; - if (result > getPager().getPagesNumber()) { - result = getPager().getPagesNumber(); - } - return result; - } - public String getPaginationUrl(String fullUrl) { - // remove pageIndex params - String paginationUrl = fullUrl.replaceAll("pageIndex=\\d+", ""); + // remove pageIndex parameter + String paginationUrl = fullUrl.replaceAll("pager\\.pageIndex=([^&])+[&]", ""); // clean & paginationUrl = paginationUrl.replaceAll("&&", "&"); // add [?|&]pageIndex= @@ -137,9 +94,7 @@ } else if (!paginationUrl.endsWith("?")) { paginationUrl += "&"; } - paginationUrl += "pageIndex="; + paginationUrl += "pager.pageIndex="; return paginationUrl; } - - } 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-04-03 07:10:17 UTC (rev 1809) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boats.jsp 2014-04-03 08:27:31 UTC (rev 1810) @@ -134,7 +134,7 @@ <h3> <s:text name="wao.ui.boats.title"> - <s:param value="%{pager.records}"/> + <s:param value="%{pagination.nbRecords}"/> </s:text> </h3> @@ -143,7 +143,7 @@ <ul> <s:url var="fullUrl" includeParams="get"/> <s:set var="paginationUrl" value="%{getPaginationUrl(#fullUrl)}"/> - <s:if test="firstPageIndex > 2"> + <s:if test="pagination.firstPageIndex > 2"> <li> <a href="${paginationUrl}1">1</a> </li> @@ -155,26 +155,26 @@ </li> </s:if> - <s:iterator var="currentPageIndex" begin="firstPageIndex" end="lastPageIndex"> - <li class="<s:if test="#currentPageIndex == pager.pageIndex">active</s:if>"> + <s:iterator var="currentPageIndex" begin="pagination.firstPage" end="pagination.lastPage"> + <li class="<s:if test="#currentPageIndex == pagination.currentPage">active</s:if>"> <a href="${paginationUrl}${currentPageIndex}"> <s:property/> </a> </li> </s:iterator> - <s:if test="lastPageIndex < pager.pagesNumber - 1"> + <s:if test="pagination.lastPage < pagination.nbPages - 1"> <li> <span>...</span> </li> <li> - <a href="${paginationUrl}${pager.pagesNumber - 1}"> - <s:property value="pager.pagesNumber - 1"/> + <a href="${paginationUrl}${pagination.nbPages - 1}"> + <s:property value="pagination.nbPages - 1"/> </a> </li> <li> - <a href="${paginationUrl}${pager.pagesNumber}"> - <s:property value="pager.pagesNumber"/> + <a href="${paginationUrl}${pagination.nbPages}"> + <s:property value="pagination.nbPages"/> </a> </li> </s:if>

1 0

r1809 - trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer
by tchemit＠users.forge.codelutin.com 03 Apr '14

03 Apr '14

Author: tchemit Date: 2014-04-03 09:10:17 +0200 (Thu, 03 Apr 2014) New Revision: 1809 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1809 Log: refs #4490 fix pagination url Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/BoatsAction.java 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-04-02 17:26:57 UTC (rev 1808) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/BoatsAction.java 2014-04-03 07:10:17 UTC (rev 1809) @@ -129,11 +129,13 @@ public String getPaginationUrl(String fullUrl) { // remove pageIndex params String paginationUrl = fullUrl.replaceAll("pageIndex=\\d+", ""); + // clean & paginationUrl = paginationUrl.replaceAll("&&", "&"); + // add [?|&]pageIndex= if (!paginationUrl.contains("?")) { - paginationUrl += "?pageIndex="; + paginationUrl += "?"; } else if (!paginationUrl.endsWith("?")) { - paginationUrl += "&pageIndex="; + paginationUrl += "&"; } paginationUrl += "pageIndex="; return paginationUrl;

1 0

r1808 - in trunk/wao-web/src/main: java/fr/ifremer/wao/web/action/obsmer resources/i18n webapp webapp/WEB-INF/content/obsmer
by tchemit＠users.forge.codelutin.com 02 Apr '14

02 Apr '14

Author: tchemit Date: 2014-04-02 19:26:57 +0200 (Wed, 02 Apr 2014) New Revision: 1808 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1808 Log: refs #4490 improve pagination + add boat tips + inactive row style Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/BoatsAction.java trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boats.jsp trunk/wao-web/src/main/webapp/wao.css 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-04-02 16:12:23 UTC (rev 1807) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/BoatsAction.java 2014-04-02 17:26:57 UTC (rev 1808) @@ -92,18 +92,29 @@ return SUCCESS; } - public int getFirstPageIndex() { + public long getFirstPageIndex() { int pageIndex = getPager().getPageIndex(); - int result = pageIndex; - if (getPager().getPagesNumber() <= 10 || pageIndex < 10) { - result = 1; + long result = pageIndex; + long pagesNumber = getPager().getPagesNumber(); + if (pagesNumber <= 10 || pageIndex < 10) { + // stick to begin + return 1; } + if (pagesNumber - pageIndex < 10) { + + // just center + result = pagesNumber - 10; + if (result < 1) { + result = 1; + } + return result; + } + if (pageIndex >= 10) { - // on centre sur pageIndex + // center result = pageIndex - 5; } - return result; } @@ -120,8 +131,11 @@ String paginationUrl = fullUrl.replaceAll("pageIndex=\\d+", ""); paginationUrl = paginationUrl.replaceAll("&&", "&"); if (!paginationUrl.contains("?")) { - paginationUrl += "?"; + paginationUrl += "?pageIndex="; + } else if (!paginationUrl.endsWith("?")) { + paginationUrl += "&pageIndex="; } + paginationUrl += "pageIndex="; return paginationUrl; } 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-02 16:12:23 UTC (rev 1807) +++ trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-04-02 17:26:57 UTC (rev 1808) @@ -89,7 +89,7 @@ wao.ui.boatinfo.title=Informations sur %s wao.ui.boats.associatedLine=Ligne(s) du plan associée(s) à ce navire wao.ui.boats.boatLength=Longueur -wao.ui.boats.boatName=nom +wao.ui.boats.boatName=Nom wao.ui.boats.buildYear=Année de construction wao.ui.boats.district=Quatier maritime wao.ui.boats.nbObservations=%s observation(s) dont %s avec votre société 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-04-02 16:12:23 UTC (rev 1807) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boats.jsp 2014-04-02 17:26:57 UTC (rev 1808) @@ -143,37 +143,44 @@ <ul> <s:url var="fullUrl" includeParams="get"/> <s:set var="paginationUrl" value="%{getPaginationUrl(#fullUrl)}"/> - <s:if test="firstPageIndex > 1"> + <s:if test="firstPageIndex > 2"> <li> - <a href="${paginationUrl}&pageIndex=1">1</a> + <a href="${paginationUrl}1">1</a> </li> <li> + <a href="${paginationUrl}2">2</a> + </li> + <li> <span>...</span> </li> </s:if> <s:iterator var="currentPageIndex" begin="firstPageIndex" end="lastPageIndex"> <li class="<s:if test="#currentPageIndex == pager.pageIndex">active</s:if>"> - <a href="${paginationUrl}&pageIndex=${currentPageIndex}"> + <a href="${paginationUrl}${currentPageIndex}"> <s:property/> </a> </li> </s:iterator> - <s:if test="lastPageIndex < pager.pagesNumber"> + <s:if test="lastPageIndex < pager.pagesNumber - 1"> <li> <span>...</span> </li> <li> - <%--<s:set var="endPageIndex" value="pager.pagesNumber - 1"/>--%> - <a href="${paginationUrl}&pageIndex=${pager.pagesNumber}"> + <a href="${paginationUrl}${pager.pagesNumber - 1}"> + <s:property value="pager.pagesNumber - 1"/> + </a> + </li> + <li> + <a href="${paginationUrl}${pager.pagesNumber}"> <s:property value="pager.pagesNumber"/> </a> </li> </s:if> </ul> </div> -<table id="boat-list" class="large-table boat-list"> +<table id="boats-list" class="large-table boats-list"> <thead> <tr> <th> @@ -192,20 +199,27 @@ <s:text name="wao.ui.boats.district"/> </th> <th> - <s:text name="wao.ui.boats.portOfRegistry"/> + <s:text name="wao.ui.boats.portOfRegistry"/>(<s:text name="wao.ui.boats.portOfRegistry.description"/>) </th> </tr> </thead> <tbody> <s:iterator value="boats" var="boat"> - <tr class="boat-row"> - <td><s:property value="name"/></td> - <td><s:property value="%{''+immatriculation}"/></td> - <td><s:property value="boatLength"/></td> - <td><s:property value="%{''+buildYear}"/></td> + <tr class="boat-row<s:if test="!active"> inactive-boat-row</s:if>"> + <td> + <s:property value="name"/> + </td> + <td><s:property value="%{'' + immatriculation}"/></td> + <td><s:property value="boatLength"/> m</td> + <td><s:property value="%{'' + buildYear}"/></td> <td><s:property value="district.districtCode"/></td> - <td><s:property value="portOfRegistry.portCode"/></td> + <td> + <s:if test="portOfRegistry != null"> + <s:property value="portOfRegistry.portCode"/> + (<s:property value="portOfRegistry.description"/>) + </s:if> + </td> </tr> </s:iterator> </todby> Modified: trunk/wao-web/src/main/webapp/wao.css =================================================================== --- trunk/wao-web/src/main/webapp/wao.css 2014-04-02 16:12:23 UTC (rev 1807) +++ trunk/wao-web/src/main/webapp/wao.css 2014-04-02 17:26:57 UTC (rev 1808) @@ -264,3 +264,7 @@ left: -200px } +table.boats-list tbody tr.inactive-boat-row { + background-color: #ffaaaa; +} +

1 0

r1807 - in trunk: wao-persistence/src/main/java/fr/ifremer/wao/entity wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer wao-web/src/main/webapp/WEB-INF/content/obsmer
by tchemit＠users.forge.codelutin.com 02 Apr '14

02 Apr '14

Author: tchemit Date: 2014-04-02 18:12:23 +0200 (Wed, 02 Apr 2014) New Revision: 1807 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1807 Log: refs #4490 add pagination Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/BoatTopiaDao.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/BoatsAction.java trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boats.jsp 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-02 15:34:58 UTC (rev 1806) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/BoatTopiaDao.java 2014-04-02 16:12:23 UTC (rev 1807) @@ -10,6 +10,7 @@ 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 java.util.List; @@ -28,6 +29,7 @@ TopiaPagerBean pager = newPager(query.getHql(), query.getHqlParameters(), pageSize); pager.setPageIndex(pageIndex); + PagerBeanUtil.computeRecordIndexesAndPagesNumber(pager); pager.setSortColumn(sortProperty); pager.setSortAscendant(sortAscendant); return pager; 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-04-02 15:34:58 UTC (rev 1806) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/BoatsAction.java 2014-04-02 16:12:23 UTC (rev 1807) @@ -25,13 +25,13 @@ protected BoatsFilter filter; - protected int pageIndex = 0; + protected int pageIndex = 1; protected int pageSize = 50; - protected String sortProperty; + protected String sortProperty = "name"; - protected boolean sortAscendant; + protected boolean sortAscendant = true; protected ObsMerBoatsList boatList; @@ -92,4 +92,38 @@ return SUCCESS; } + public int getFirstPageIndex() { + int pageIndex = getPager().getPageIndex(); + int result = pageIndex; + if (getPager().getPagesNumber() <= 10 || pageIndex < 10) { + result = 1; + } + if (pageIndex >= 10) { + + // on centre sur pageIndex + result = pageIndex - 5; + } + + return result; + } + + public long getLastPageIndex() { + long result = getFirstPageIndex() + 10; + if (result > getPager().getPagesNumber()) { + result = getPager().getPagesNumber(); + } + return result; + } + + public String getPaginationUrl(String fullUrl) { + // remove pageIndex params + String paginationUrl = fullUrl.replaceAll("pageIndex=\\d+", ""); + paginationUrl = paginationUrl.replaceAll("&&", "&"); + if (!paginationUrl.contains("?")) { + paginationUrl += "?"; + } + return paginationUrl; + } + + } 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-04-02 15:34:58 UTC (rev 1806) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boats.jsp 2014-04-02 16:12:23 UTC (rev 1807) @@ -138,7 +138,41 @@ </s:text> </h3> -<%--TODO Pagination--%> +<%-- Pagination --%> +<div class="pagination"> + <ul> + <s:url var="fullUrl" includeParams="get"/> + <s:set var="paginationUrl" value="%{getPaginationUrl(#fullUrl)}"/> + <s:if test="firstPageIndex > 1"> + <li> + <a href="${paginationUrl}&pageIndex=1">1</a> + </li> + <li> + <span>...</span> + </li> + </s:if> + + <s:iterator var="currentPageIndex" begin="firstPageIndex" end="lastPageIndex"> + <li class="<s:if test="#currentPageIndex == pager.pageIndex">active</s:if>"> + <a href="${paginationUrl}&pageIndex=${currentPageIndex}"> + <s:property/> + </a> + </li> + </s:iterator> + + <s:if test="lastPageIndex < pager.pagesNumber"> + <li> + <span>...</span> + </li> + <li> + <%--<s:set var="endPageIndex" value="pager.pagesNumber - 1"/>--%> + <a href="${paginationUrl}&pageIndex=${pager.pagesNumber}"> + <s:property value="pager.pagesNumber"/> + </a> + </li> + </s:if> + </ul> +</div> <table id="boat-list" class="large-table boat-list"> <thead> <tr> @@ -167,11 +201,11 @@ <s:iterator value="boats" var="boat"> <tr class="boat-row"> <td><s:property value="name"/></td> - <td><s:property value="immatriculation"/></td> + <td><s:property value="%{''+immatriculation}"/></td> <td><s:property value="boatLength"/></td> - <td><s:property value="year"/></td> - <td><s:property value="district.code"/></td> - <td><s:property value="portOfRegistry.code"/></td> + <td><s:property value="%{''+buildYear}"/></td> + <td><s:property value="district.districtCode"/></td> + <td><s:property value="portOfRegistry.portCode"/></td> </tr> </s:iterator> </todby>

1 0

r1806 - trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity
by bleny＠users.forge.codelutin.com 02 Apr '14

02 Apr '14

Author: bleny Date: 2014-04-02 17:34:58 +0200 (Wed, 02 Apr 2014) New Revision: 1806 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1806 Log: refs #4490 fix filter on ship-owner query generation Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/BoatTopiaDao.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-04-02 14:23:34 UTC (rev 1805) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/BoatTopiaDao.java 2014-04-02 15:34:58 UTC (rev 1806) @@ -78,7 +78,7 @@ } if (CollectionUtils.isNotEmpty(filter.getShipOwnerIds())) { query.addWhereClause( - "b.topiaId IN (SELECT b2.topiaId FROM fr.ifremer.wao.entity.BoatImpl AS b2 JOIN b2.shipOwner AS district WHERE shipOwner.topiaId IN (:shipOwnerIds))", + "b.topiaId IN (SELECT b2.topiaId FROM fr.ifremer.wao.entity.BoatImpl AS b2 JOIN b2.shipOwner AS shipOwner WHERE shipOwner.topiaId IN (:shipOwnerIds))", ImmutableMap.of("shipOwnerIds", (Object) filter.getShipOwnerIds())); }

1 0

r1805 - in trunk/wao-web/src/main: resources webapp/WEB-INF/content/obsmer
by tchemit＠users.forge.codelutin.com 02 Apr '14

02 Apr '14

Author: tchemit Date: 2014-04-02 16:23:34 +0200 (Wed, 02 Apr 2014) New Revision: 1805 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1805 Log: remove struts.el.throwExceptionOnFailure configuration for the moment + fix a possible NPE Modified: trunk/wao-web/src/main/resources/struts.xml trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp Modified: trunk/wao-web/src/main/resources/struts.xml =================================================================== --- trunk/wao-web/src/main/resources/struts.xml 2014-04-02 14:06:41 UTC (rev 1804) +++ trunk/wao-web/src/main/resources/struts.xml 2014-04-02 14:23:34 UTC (rev 1805) @@ -29,7 +29,7 @@  <constant name="struts.devMode" value="${devMode}"/> <constant name="struts.ognl.logMissingProperties" value="${devMode}"/> -  +  <constant name="struts.el.throwExceptionOnFailure" value="false"/> <constant name="struts.i18n.reload" value="${devMode}"/> <constant name="struts.custom.i18n.resources" value="resources"/> 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-04-02 14:06:41 UTC (rev 1804) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 2014-04-02 14:23:34 UTC (rev 1805) @@ -248,7 +248,7 @@  <s:iterator value="samplingPlan.months" var="month"> - <th class="effort <s:if test="%{isCurrentMonth(#month)}"> now</s:if>"> + <th class="effort <s:if test="isCurrentMonth(#month)"> now</s:if>"> <s:property value="%{formatMonth(#month)}"/> </th> </s:iterator> @@ -315,7 +315,7 @@ <td class="only-in-full-view"><s:property value="fishingZones" /></td> <td class="only-in-compact-view"> <s:property value="fishingZones" /> - <s:if test=" ! fishingZonesInfos.empty"> + <s:if test=" fishingZonesInfos != null"> (<s:property value="fishingZonesInfos" />) </s:if> </td>

1 0