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

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

10 Jun '14

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

1 0

r2018 - trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer
by bleny＠users.forge.codelutin.com 10 Jun '14

10 Jun '14

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

1 0

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

10 Jun '14

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

1 0

r2016 - trunk/wao-web/src/main/resources/i18n
by bleny＠users.forge.codelutin.com 10 Jun '14

10 Jun '14

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

1 0

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

10 Jun '14

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

1 0

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

10 Jun '14

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

1 0

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

10 Jun '14

Author: bleny Date: 2014-06-10 14:11:12 +0200 (Tue, 10 Jun 2014) New Revision: 2013 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2013 Log: fixes #5098 update icons in contact lists Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactImpl.java trunk/wao-persistence/src/main/xmi/wao-model.zargo trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java trunk/wao-services/src/main/resources/i18n/wao-services_en_GB.properties trunk/wao-services/src/main/resources/i18n/wao-services_fr_FR.properties trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ContactsAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ValidateContactJsonAction.java trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp trunk/wao-web/src/main/webapp/wao.css Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactImpl.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactImpl.java 2014-06-06 13:09:47 UTC (rev 2012) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactImpl.java 2014-06-10 12:11:12 UTC (rev 2013) @@ -24,6 +24,9 @@ package fr.ifremer.wao.entity; +import org.apache.commons.lang3.BooleanUtils; +import org.apache.commons.lang3.StringUtils; + import java.util.Date; import java.util.LinkedList; import java.util.List; @@ -178,4 +181,49 @@ } return allObservers; } + + @Override + public boolean isAcceptableByCompany() { + boolean requiredDataAreFilled; + if (getObsProgram() == ObsProgram.OBSMER) { + requiredDataAreFilled = getRestitution() != null; + } else { + requiredDataAreFilled = getDataInputDate() != null; + } + ContactState state = getContactState(); + boolean observationDone = + state.equals(ContactState.OBSERVATION_DONE) && + requiredDataAreFilled; + boolean acceptable = getValidationCompany() == null && + (state.isUnfinishedState() || observationDone); + return acceptable; + } + + @Override + public boolean isRefusableByCompany() { + return getValidationCompany() == null && StringUtils.isNotBlank(commentCoordinator); + } + + @Override + public boolean isUnacceptableByCompany() { + return getValidationCompany() != null && getValidationProgram() == null; + } + + @Override + public boolean isAcceptableByProgram() { + boolean acceptable = BooleanUtils.isTrue(getValidationCompany()) + && getValidationProgram() == null; + return acceptable; + } + + @Override + public boolean isRefusableByProgram() { + return BooleanUtils.isTrue(getValidationCompany()) && StringUtils.isNotBlank(commentAdmin); + } + + @Override + public boolean isUnacceptableByProgram() { + return getValidationProgram() != null; + } + } Modified: trunk/wao-persistence/src/main/xmi/wao-model.zargo =================================================================== (Binary files differ) Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java 2014-06-06 13:09:47 UTC (rev 2012) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java 2014-06-10 12:11:12 UTC (rev 2013) @@ -24,7 +24,6 @@ import com.google.common.base.Preconditions; import fr.ifremer.wao.entity.Company; import fr.ifremer.wao.entity.Contact; -import fr.ifremer.wao.entity.ContactState; import fr.ifremer.wao.entity.News; import fr.ifremer.wao.entity.ObsProgram; import fr.ifremer.wao.entity.UserProfile; @@ -242,41 +241,18 @@ return noValidation && getCanWrite(); } - /** - * Display validation actions. Evo #2063 : only coordinator can validate - * for a company. - * - * @return true if the validation actions can be displayed - */ - public boolean isAuthorizedToValidateContacts() { - return (isAdmin() || isCoordinator()) && !isReadOnly(); + public boolean isAuthorizedToChangeValidationCompany() { + return userProfile.isCoordinator(); } - public boolean isAuthorizedToValidateContact(Contact contact) { - // Can't validate during edition of the contact row - switch (getUserRole()) { - case ADMIN: - return contact.getValidationProgram() == null && - BooleanUtils.isTrue(contact.getValidationCompany()); - // Evo #2063 : only coordinator can validate - case COORDINATOR: - boolean requiredDataAreFilled; - if (contact.getObsProgram() == ObsProgram.OBSMER) { - requiredDataAreFilled = contact.getRestitution() != null; - } else { - requiredDataAreFilled = contact.getDataInputDate() != null; - } - ContactState state = contact.getContactState(); - boolean observationDone = - state.equals(ContactState.OBSERVATION_DONE) && - requiredDataAreFilled; - return contact.getValidationCompany() == null && - (state.isUnfinishedState() || observationDone); - default: - return false; - } + public boolean isAuthorizedToChangeValidationProgram() { + return userProfile.isAdmin(); } + public boolean isAuthorizedToChangeContactValidation() { + return isAuthorizedToChangeValidationCompany() || isAuthorizedToChangeValidationProgram(); + } + public boolean isAuthorizedToUnvalidateContact(Contact contact) { switch (getUserRole()) { case ADMIN: Modified: trunk/wao-services/src/main/resources/i18n/wao-services_en_GB.properties =================================================================== --- trunk/wao-services/src/main/resources/i18n/wao-services_en_GB.properties 2014-06-06 13:09:47 UTC (rev 2012) +++ trunk/wao-services/src/main/resources/i18n/wao-services_en_GB.properties 2014-06-10 12:11:12 UTC (rev 2013) @@ -89,5 +89,6 @@ wao.synthesis.planned=Planned wao.ui.chart.numberBoats=Number of boats wao.ui.chart.numberOfBoatsWithBoardings=Number of boats with x boardings +wao.ui.samplingPlan.Actual= wao.validation.sampleRow.conflictOnObserver=Observer %s cannot be associated to the line %s because he has to observer, on the same day, for row %s wao.validation.sampleRow.observerNotInCompany=Observer %s doesn't work for company %s Modified: trunk/wao-services/src/main/resources/i18n/wao-services_fr_FR.properties =================================================================== --- trunk/wao-services/src/main/resources/i18n/wao-services_fr_FR.properties 2014-06-06 13:09:47 UTC (rev 2012) +++ trunk/wao-services/src/main/resources/i18n/wao-services_fr_FR.properties 2014-06-10 12:11:12 UTC (rev 2013) @@ -86,5 +86,6 @@ wao.synthesis.planned=Planifié wao.ui.chart.numberBoats=Nombre de navires wao.ui.chart.numberOfBoatsWithBoardings=Nombres de navires avec x embarquements +wao.ui.samplingPlan.Actual= wao.validation.sampleRow.conflictOnObserver=L'observateur %s ne peut être associé à la ligne %s car il doit observer, le même jour, pour la ligne %s wao.validation.sampleRow.observerNotInCompany=L'observateur %s ne fait pas parti de la société %s Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ContactsAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ContactsAction.java 2014-06-06 13:09:47 UTC (rev 2012) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ContactsAction.java 2014-06-10 12:11:12 UTC (rev 2013) @@ -182,4 +182,40 @@ return dcf5CodesAndDescriptions; } + public boolean isAcceptable(Contact contact) { + boolean acceptable; + if (getAuthenticatedWaoUser().isAuthorizedToChangeValidationCompany()) { + acceptable = contact.isAcceptableByCompany(); + } else if (getAuthenticatedWaoUser().isAuthorizedToChangeValidationProgram()) { + acceptable = contact.isAcceptableByProgram(); + } else { + throw new IllegalStateException(); + } + return acceptable; + } + + public boolean isRefusable(Contact contact) { + boolean refuseable; + if (getAuthenticatedWaoUser().isAuthorizedToChangeValidationCompany()) { + refuseable = contact.isRefusableByCompany(); + } else if (getAuthenticatedWaoUser().isAuthorizedToChangeValidationProgram()) { + refuseable = contact.isRefusableByProgram(); + } else { + throw new IllegalStateException(); + } + return refuseable; + } + + public boolean isUnacceptable(Contact contact) { + boolean unacceptable; + if (getAuthenticatedWaoUser().isAuthorizedToChangeValidationCompany()) { + unacceptable = contact.isUnacceptableByCompany(); + } else if (getAuthenticatedWaoUser().isAuthorizedToChangeValidationProgram()) { + unacceptable = contact.isUnacceptableByProgram(); + } else { + throw new IllegalStateException(); + } + return unacceptable; + } + } \ No newline at end of file Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ValidateContactJsonAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ValidateContactJsonAction.java 2014-06-06 13:09:47 UTC (rev 2012) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ValidateContactJsonAction.java 2014-06-10 12:11:12 UTC (rev 2013) @@ -25,6 +25,7 @@ import com.google.common.base.Preconditions; import com.opensymphony.xwork2.Preparable; import fr.ifremer.wao.WaoUtils; +import fr.ifremer.wao.entity.Contact; import fr.ifremer.wao.services.AuthenticatedWaoUser; import fr.ifremer.wao.services.service.ContactDataInputDateBeforeObservationEndDateException; import fr.ifremer.wao.services.service.ContactDataInputDateAfterTodayException; @@ -88,16 +89,6 @@ */ protected String errorMessage; - /** - * To update contact validation actions. - */ - protected boolean canValidateContact; - - /** - * To update contact validation actions. - */ - protected boolean canUnvalidateContact; - protected transient ObsMerContactsService service; protected UpdateContactCommand updateContactCommand; @@ -130,14 +121,6 @@ return errorMessage; } - public boolean isCanValidateContact() { - return canValidateContact; - } - - public boolean isCanUnvalidateContact() { - return canUnvalidateContact; - } - public boolean isSuccessful() { return errorMessage == null; } @@ -259,12 +242,53 @@ } else { successMessage = t("wao.ui.contacts.validation.to.reject.state.success"); } + } - canValidateContact = authenticatedWaoUser.isAuthorizedToValidateContact(updateContactCommand.getContact()); + return SUCCESS; + } - canUnvalidateContact = authenticatedWaoUser.isAuthorizedToUnvalidateContact(updateContactCommand.getContact()); + public boolean isAcceptable(Contact contact) { + boolean acceptable; + if (session.getAuthenticatedWaoUser().isAuthorizedToChangeValidationCompany()) { + acceptable = contact.isAcceptableByCompany(); + } else if (session.getAuthenticatedWaoUser().isAuthorizedToChangeValidationProgram()) { + acceptable = contact.isAcceptableByProgram(); + } else { + throw new IllegalStateException(); } + return acceptable; + } - return SUCCESS; + public boolean isRefusable(Contact contact) { + boolean refuseable; + if (session.getAuthenticatedWaoUser().isAuthorizedToChangeValidationCompany()) { + refuseable = contact.isRefusableByCompany(); + } else if (session.getAuthenticatedWaoUser().isAuthorizedToChangeValidationProgram()) { + refuseable = contact.isRefusableByProgram(); + } else { + throw new IllegalStateException(); + } + return refuseable; } + + public boolean isUnacceptable(Contact contact) { + boolean unacceptable; + if (session.getAuthenticatedWaoUser().isAuthorizedToChangeValidationCompany()) { + unacceptable = contact.isUnacceptableByCompany(); + } else if (session.getAuthenticatedWaoUser().isAuthorizedToChangeValidationProgram()) { + unacceptable = contact.isUnacceptableByProgram(); + } else { + throw new IllegalStateException(); + } + return unacceptable; + } + + public Boolean getValidationProgram() { + return updateContactCommand.getContact().getValidationProgram(); + } + + public Boolean getValidationCompany() { + return updateContactCommand.getContact().getValidationCompany(); + } + } Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp 2014-06-06 13:09:47 UTC (rev 2012) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp 2014-06-10 12:11:12 UTC (rev 2013) @@ -132,7 +132,18 @@ if (successful) { var success = data['successMessage']; WAO.notifications.success(success); - // TODO Update line and data actions + var $tr = $('#contacts-list').find('tr[data-contactId="' + data.contactId + '"]'); + $tr.removeClass('accepted-by-company refused-by-company accepted-by-program refused-by-program'); + if (data.validationCompany) { + $tr.addClass('accepted-by-company'); + } else if (data.validationCompany === false) { + $tr.addClass('refused-by-company'); + } + if (data.validationProgram) { + $tr.addClass('accepted-by-program'); + } else if (data.validationProgram === false) { + $tr.addClass('refused-by-program'); + } } else { var error = data['errorMessage']; WAO.notifications.error(error); @@ -320,7 +331,8 @@ <tbody> <s:iterator value="contacts" var="contact"> - <tr class="contact-row<s:if test="topiaId.equals(contactToHighlightId)"> highlight</s:if>"> + <s:set name="trCssClasses">contact-row<s:if test="topiaId.equals(contactToHighlightId)"> highlight</s:if><s:if test="validationCompany==null"></s:if><s:elseif test="validationCompany"> accepted-by-company</s:elseif><s:else> refused-by-company</s:else><s:if test="validationProgram==null"></s:if><s:elseif test="validationProgram"> accepted-by-program</s:elseif><s:else> refused-by-program</s:else></s:set> + <tr class="<s:property value="#trCssClasses"/>" data-contactId="<s:property value="topiaId"/>"> <td> <s:property value="creationDate"/> </td> @@ -458,39 +470,16 @@ </s:if> </td> <td> - <s:if test="validationCompany == null"> - "> - - - </s:if> - <s:elseif test="validationCompany"> - "> - - - - </s:elseif> - <s:else> - "> - - - - </s:else> - <s:if test="validationProgram == null"> - "> - - - </s:if> - <s:elseif test="validationProgram"> - "> - - - - </s:elseif> - <s:else>"> - - - - </s:else> + "> + + + + + "> + + + + </td> <td class="actions"> <div class="dropdown"> @@ -516,37 +505,34 @@ </s:a> </li> </s:if> - <s:if test="authenticatedWaoUser.authorizedToValidateContacts"> - <s:if test="authenticatedWaoUser.isAuthorizedToValidateContact(#contact)"> - <li> - <s:url action="validate-contact-json" id="acceptContactUrl" escapeAmp="false"> - <s:param name="contactId" value="topiaId"/> - <s:param name="validationState">true</s:param> - </s:url> - <s:a cssClass="validation-action" href="%{acceptContactUrl}"> - <s:text name="wao.ui.action.acceptContact"/> - </s:a> - </li> - <li> - <s:url action="validate-contact-json" id="refuseContactUrl" escapeAmp="false"> - <s:param name="contactId" value="topiaId"/> - <s:param name="validationState">false</s:param> - </s:url> - <s:a cssClass="validation-action" href="%{refuseContactUrl}"> - <s:text name="wao.ui.action.refuseContact"/> - </s:a> - </li> - </s:if> - <s:if test="authenticatedWaoUser.isAuthorizedToUnvalidateContact(#contact)"> - <li> - <s:url action="validate-contact-json" id="unvalidateContactUrl"> - <s:param name="contactId" value="topiaId"/> - </s:url> - <s:a cssClass="validation-action" href="%{unvalidateContactUrl}"> - <s:text name="wao.ui.action.unvalidateContact"/> - </s:a> - </li> - </s:if> + <s:if test="authenticatedWaoUser.authorizedToChangeContactValidation"> + <li> + <s:url action="validate-contact-json" id="acceptContactUrl" escapeAmp="false"> + <s:param name="contactId" value="topiaId"/> + <s:param name="validationState">true</s:param> + </s:url> + <s:set name="disabled"><s:if test="%{ ! isAcceptable(#contact)}">disabled</s:if></s:set> + <s:a cssClass="validation-action" href="%{acceptContactUrl}"> + <s:text name="wao.ui.action.acceptContact"/> + </s:a> + </li> + <li> + <s:url action="validate-contact-json" id="refuseContactUrl" escapeAmp="false"> + <s:param name="contactId" value="topiaId"/> + <s:param name="validationState">false</s:param> + </s:url> + <s:a cssClass="validation-action" href="%{refuseContactUrl}"> + <s:text name="wao.ui.action.refuseContact"/> + </s:a> + </li> + <li> + <s:url action="validate-contact-json" id="unvalidateContactUrl"> + <s:param name="contactId" value="topiaId"/> + </s:url> + <s:a cssClass="validation-action" href="%{unvalidateContactUrl}"> + <s:text name="wao.ui.action.unvalidateContact"/> + </s:a> + </li> </s:if> </ul> </div> Modified: trunk/wao-web/src/main/webapp/wao.css =================================================================== --- trunk/wao-web/src/main/webapp/wao.css 2014-06-06 13:09:47 UTC (rev 2012) +++ trunk/wao-web/src/main/webapp/wao.css 2014-06-10 12:11:12 UTC (rev 2013) @@ -708,6 +708,24 @@ } /** + * Contacts + */ + +#contacts-list .only-if-refused-by-company, +#contacts-list .only-if-accepted-by-company, +#contacts-list .only-if-refused-by-program, +#contacts-list .only-if-accepted-by-program { + display: none; +} + +#contacts-list tr.accepted-by-company .only-if-accepted-by-company, +#contacts-list tr.refused-by-company .only-if-refused-by-company, +#contacts-list tr.accepted-by-program .only-if-accepted-by-program, +#contacts-list tr.refused-by-program .only-if-refused-by-program { + display: block; +} + +/** * Accueil */ main.home .news {

1 0

r2012 - trunk/wao-web/src/main/webapp
by lkaufmann＠users.forge.codelutin.com 06 Jun '14

06 Jun '14

Author: lkaufmann Date: 2014-06-06 15:09:47 +0200 (Fri, 06 Jun 2014) New Revision: 2012 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2012 Log: Update Synthetis display Modified: trunk/wao-web/src/main/webapp/wao.css Modified: trunk/wao-web/src/main/webapp/wao.css =================================================================== --- trunk/wao-web/src/main/webapp/wao.css 2014-06-06 12:50:34 UTC (rev 2011) +++ trunk/wao-web/src/main/webapp/wao.css 2014-06-06 13:09:47 UTC (rev 2012) @@ -838,6 +838,35 @@ * Synthèse */ +.syntheses { + background: #EFEFEF; +} + +.syntheses #synthesis-filters-form { + margin-bottom: 0; +} + +.syntheses article { + max-width: 968px; + margin: 0 auto; + background-color: #FFF; + border-left: 1px solid #BBB; + border-right: 1px solid #BBB; + border-bottom: 1px solid #EEE; + margin: 0 auto; + max-width: 968px; + padding: 10px 20px 20px 20px; +} + +.syntheses .table { + background-color: #FAFAFA; + margin: 0 auto; + max-width: 968px; +} +.syntheses .table thead tr th { + background-color: #F0F0F0; +} + .syntheses th, .syntheses td { text-align: right;

1 0

r2011 - trunk/wao-web/src/main/webapp
by lkaufmann＠users.forge.codelutin.com 06 Jun '14

06 Jun '14

Author: lkaufmann Date: 2014-06-06 14:50:34 +0200 (Fri, 06 Jun 2014) New Revision: 2011 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2011 Log: Refs #4997 Change filter display & Tooltip correction Modified: trunk/wao-web/src/main/webapp/wao.css Modified: trunk/wao-web/src/main/webapp/wao.css =================================================================== --- trunk/wao-web/src/main/webapp/wao.css 2014-06-05 15:46:38 UTC (rev 2010) +++ trunk/wao-web/src/main/webapp/wao.css 2014-06-06 12:50:34 UTC (rev 2011) @@ -398,6 +398,32 @@ margin: 0; } +.extra-filters .control-group { + background-color: #EEE; + padding: 0; + border: 1px solid #DADADA; +} + +.extra-filters .control-group .control-label { + background-color: #E5E5E5; + border-bottom: 1px solid #AAA; + padding: 0 5px; + margin: 0; +} +.extra-filters .control-group .control-label button.open-button { + float: right; + padding: 0 0 0 10px; +} + +.extra-filters .control-group .control-label:hover { + background-color: #E0E0E0; +} +.extra-filters .control-group .controls { + border-top: 1px solid #FFF; + padding: 0 5px; +} + + /** * Les boutons */ @@ -501,7 +527,11 @@ .fa-comment { font-size: 1.5em; color: #2F4F4F; + padding: 5px; } +.fa-comment:hover { + cursor: pointer; +} .chart { height: 400px; @@ -596,14 +626,30 @@ #boats-filters-form .control-group { clear: left; + width: 90%; } -#boats-filters-form button { - margin-top: 5px; +#boats-filters-form .form-actions button, +#boats-filters-form .form-actions a.btn { + margin: 5px 0; + padding: 0 10px 0 5px; clear: left; float: left; } +#boats-filters-form .extra-filters .control-group{ + background-color: #F3F3F3; + border: 1px solid #CCC; +} +#boats-filters-form .extra-filters .control-group .control-label { + background-color: #DADADA; +} +#boats-filters-form .extra-filters .control-group .controls { + border-top: 1px solid #DDD; + min-height: 20px; +} + + #boats-filters-list-details-layout { display: flex; justify-content: space-around;

1 0

Build failed in Jenkins: wao-nightly #56
by admin+ci-codelutin.com＠codelutin.com 05 Jun '14

05 Jun '14

See <http://ci.codelutin.com/jenkins/job/wao-nightly/56/changes> Changes: [bleny] refs #4490 just put the link on the name [bleny] fix NPE [bleny] refs #4490 introduce cache for boats [bleny] refs #4490 too many shipowners, ask user to type 3 caracters before searching [bleny] fixes #4483 cache for sampling plan [bleny] refactor to allow caching ------------------------------------------ [...truncated 256 lines...] [JENKINS] Recording test results log4j:WARN No appenders could be found for logger (org.apache.commons.beanutils.converters.BooleanConverter). log4j:WARN Please initialize the log4j system properly. [INFO] [INFO] --- maven-jar-plugin:2.4:jar (default-jar) @ wao-persistence --- [INFO] Building jar: <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-persistence/ta…> [INFO] [INFO] >>> maven-source-plugin:2.2.1:jar (attach-sources) @ wao-persistence >>> [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (ensure-no-container-api) @ wao-persistence --- [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ wao-persistence --- [INFO] [INFO] --- helper-maven-plugin:2.1:share-server-secret (get-redmine-login) @ wao-persistence --- [INFO] Skipping goal (runOnce flag is on and goal was already executed). [INFO] [INFO] --- eugene-maven-plugin:2.9:generate (generate-entities) @ wao-persistence --- [INFO] Process phase [zargo] [INFO] No file generated. [INFO] Process phase [xmi] [INFO] No file generated. [INFO] Process phase [model] [INFO] Process phase [generator] [INFO] Apply generator TopiaMetaTransformer [INFO] No file generated. [WARNING] Failed to getClass for org.apache.maven.plugin.source.SourceJarMojo [INFO] [INFO] <<< maven-source-plugin:2.2.1:jar (attach-sources) @ wao-persistence <<< [INFO] [INFO] --- maven-source-plugin:2.2.1:jar (attach-sources) @ wao-persistence --- [INFO] Building jar: <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-persistence/ta…> [INFO] [INFO] --- maven-javadoc-plugin:2.9.1:jar (attach-javadocs) @ wao-persistence --- [INFO] Building jar: <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-persistence/ta…> [INFO] [INFO] --- maven-site-plugin:3.3:attach-descriptor (attach-descriptor) @ wao-persistence --- [INFO] [INFO] --- helper-maven-plugin:2.1:share-server-secret (get-pgp-passphrase) @ wao-persistence --- [INFO] Exporting server [gpg-signer] username in ${gpg.keyname} [INFO] Exporting server [gpg-signer] password in ${gpg.passphrase} [INFO] [INFO] --- helper-maven-plugin:2.1:collect-files (collect-build-artifacts) @ wao-persistence --- [INFO] Loaded <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/target/collect-art…> [INFO] Copying wao-persistence-4.0-SNAPSHOT.jar to <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/target/collect/fr.…> [INFO] Copying THIRD-PARTY.properties to <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/target/collect/fr.…> [INFO] Copying wao-persistence-4.0-SNAPSHOT-sources.jar to <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/target/collect/fr.…> [INFO] Copying wao-persistence-4.0-SNAPSHOT-javadoc.jar to <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/target/collect/fr.…> [INFO] [INFO] --- helper-maven-plugin:2.1:collect-files (collect-build-attachements) @ wao-persistence --- [WARNING] Skipping goal (No file to collect). [INFO] [INFO] --- maven-gpg-plugin:1.5:sign (sign-artifacts) @ wao-persistence --- [INFO] [INFO] --- maven-dependency-plugin:2.8:analyze-only (analyze) @ wao-persistence --- [INFO] Used declared dependencies found: [INFO] org.nuiton.topia:topia-persistence:jar:3.0-beta-4:compile [INFO] org.hibernate:hibernate-core:jar:4.3.5.Final:compile [INFO] org.nuiton:nuiton-utils:jar:3.0-SNAPSHOT:compile [INFO] org.nuiton:nuiton-config:jar:3.0-alpha-2:compile [INFO] org.nuiton.i18n:nuiton-i18n:jar:3.1:compile [INFO] org.apache.commons:commons-lang3:jar:3.3.2:compile [INFO] commons-logging:commons-logging:jar:1.1.3:compile [INFO] org.apache.commons:commons-collections4:jar:4.0:compile [INFO] com.google.guava:guava:jar:17.0:compile [INFO] junit:junit:jar:4.11:test [INFO] [INFO] --- maven-install-plugin:2.5.1:install (default-install) @ wao-persistence --- [INFO] Installing <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-persistence/ta…> to /var/local/forge/data/codelutin.com/maven/repository/fr/ifremer/wao-persistence/4.0-SNAPSHOT/wao-persistence-4.0-SNAPSHOT.jar [INFO] Installing <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-persistence/po…> to /var/local/forge/data/codelutin.com/maven/repository/fr/ifremer/wao-persistence/4.0-SNAPSHOT/wao-persistence-4.0-SNAPSHOT.pom [INFO] Installing <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-persistence/sr…> to /var/local/forge/data/codelutin.com/maven/repository/fr/ifremer/wao-persistence/4.0-SNAPSHOT/wao-persistence-4.0-SNAPSHOT-third-party.properties [INFO] Installing <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-persistence/ta…> to /var/local/forge/data/codelutin.com/maven/repository/fr/ifremer/wao-persistence/4.0-SNAPSHOT/wao-persistence-4.0-SNAPSHOT-sources.jar [INFO] Installing <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-persistence/ta…> to /var/local/forge/data/codelutin.com/maven/repository/fr/ifremer/wao-persistence/4.0-SNAPSHOT/wao-persistence-4.0-SNAPSHOT-javadoc.jar [INFO] Installing <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-persistence/ta…> to /var/local/forge/data/codelutin.com/maven/repository/fr/ifremer/wao-persistence/4.0-SNAPSHOT/wao-persistence-4.0-SNAPSHOT.jar.asc [INFO] Installing <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-persistence/ta…> to /var/local/forge/data/codelutin.com/maven/repository/fr/ifremer/wao-persistence/4.0-SNAPSHOT/wao-persistence-4.0-SNAPSHOT.pom.asc [INFO] Installing <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-persistence/ta…> to /var/local/forge/data/codelutin.com/maven/repository/fr/ifremer/wao-persistence/4.0-SNAPSHOT/wao-persistence-4.0-SNAPSHOT-third-party.properties.asc [INFO] Installing <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-persistence/ta…> to /var/local/forge/data/codelutin.com/maven/repository/fr/ifremer/wao-persistence/4.0-SNAPSHOT/wao-persistence-4.0-SNAPSHOT-sources.jar.asc [INFO] Installing <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-persistence/ta…> to /var/local/forge/data/codelutin.com/maven/repository/fr/ifremer/wao-persistence/4.0-SNAPSHOT/wao-persistence-4.0-SNAPSHOT-javadoc.jar.asc [JENKINS] Archiving disabled [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building Wao :: Services 4.0-SNAPSHOT [INFO] ------------------------------------------------------------------------ [INFO] [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ wao-services --- [INFO] Deleting <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-services/target> [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (ensure-no-container-api) @ wao-services --- [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ wao-services --- [INFO] [INFO] --- helper-maven-plugin:2.1:share-server-secret (get-redmine-login) @ wao-services --- [INFO] Exporting server [redmine-forge.codelutin.com] privateKey in ${redmine.apiKey} [INFO] [INFO] --- license-maven-plugin:1.7:update-project-license (attach-licenses) @ wao-services --- [INFO] [INFO] --- license-maven-plugin:1.7:add-third-party (attach-licenses) @ wao-services --- [INFO] Load missing file <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-services/src/l…> [INFO] Missing file <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-services/src/l…> is up-to-date. [INFO] Writing third-party file to <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-services/targe…> [INFO] Will attach third party file from <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-services/src/l…> [INFO] [INFO] --- i18n-maven-plugin:3.1:parserJava (parseOthersAndGen) @ wao-services --- [INFO] start entry basedir:<http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-services/src/m…,> includes:[**/*.java] [INFO] 112 file(s) to process (among 112 files) [INFO] Parsing is done. [treated file(s) : 32/112](total time:278.65ms) ( ~ 2.488ms / file) [INFO] [INFO] >>> i18n-maven-plugin:3.1:gen (parseOthersAndGen) @ wao-services >>> [INFO] [INFO] --- i18n-maven-plugin:3.1:get (get) @ wao-services --- [INFO] config - basedir : <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-services/targe…> [INFO] config - locales : [fr_FR, en_GB] [INFO] import getter java.getter in 200703ns [INFO] Copying wao-services.properties to <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-services/targe…> [INFO] Copying wao-services.properties to <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-services/targe…> [INFO] [INFO] <<< i18n-maven-plugin:3.1:gen (parseOthersAndGen) @ wao-services <<< [INFO] [INFO] --- i18n-maven-plugin:3.1:gen (parseOthersAndGen) @ wao-services --- [INFO] config - src basedir : <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-services/src/m…> [INFO] config - out basedir : <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-services/targe…> [INFO] config - locales : [fr_FR, en_GB] [INFO] prepare bundle for locale fr_FR [INFO] merge bundle fr_FR to out [INFO] copy bundle fr_FR to src [INFO] prepare bundle for locale en_GB [INFO] merge bundle en_GB to out [WARNING] bundle en_GB contains 2/93 empty entries! (use -Di18n.showEmpty to see these entries) [INFO] copy bundle en_GB to src [INFO] [INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ wao-services --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 8 resources [INFO] Copying 2 resources [INFO] [INFO] --- license-maven-plugin:1.7:update-file-header (update-file-header) @ wao-services --- [INFO] Will search files to update from root <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-services/src> [INFO] Will search files to update from root <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-services/targe…> [INFO] Scan 124 files header done in 201.017ms. [INFO] * uptodate header on 98 files. * add header on 26 files. [INFO] [INFO] --- maven-compiler-plugin:3.1:compile (default-compile) @ wao-services --- [INFO] Compiling 112 source files to <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-services/targe…> [WARNING] <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-services/src/m…>: Some input files use unchecked or unsafe operations. [WARNING] <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-services/src/m…>: Recompile with -Xlint:unchecked for details. [INFO] [INFO] --- animal-sniffer-maven-plugin:1.11:check (default) @ wao-services --- [INFO] Checking unresolved references to org.codehaus.mojo.signature:java17:1.0 [INFO] [INFO] --- jredmine-maven-plugin:1.8.2:generate-changes (jredmine-generate-changes) @ wao-services --- [INFO] Skipping goal (skipGenerateChanges flag is on). [INFO] [INFO] --- maven-antrun-plugin:1.7:run (generate-surefire-workdir) @ wao-services --- [INFO] Executing tasks main: [mkdir] Created dir: <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-services/targe…> [INFO] Executed tasks [INFO] [INFO] --- maven-resources-plugin:2.6:testResources (default-testResources) @ wao-services --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 9 resources [INFO] [INFO] --- maven-compiler-plugin:3.1:testCompile (default-testCompile) @ wao-services --- [INFO] Compiling 11 source files to <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-services/targe…> [INFO] ------------------------------------------------------------- [ERROR] COMPILATION ERROR : [INFO] ------------------------------------------------------------- [ERROR] <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-services/src/t…>:[50,8] fr.ifremer.wao.services.FakeWaoApplicationContext is not abstract and does not override abstract method getBoatsFilterValuesCache() in fr.ifremer.wao.services.WaoApplicationContext [INFO] 1 error [INFO] ------------------------------------------------------------- [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [INFO] ------------------------------------------------------------------------ [INFO] Reactor Summary: [INFO] [INFO] Wao ............................................... SUCCESS [ 7.775 s] [INFO] Wao :: Persistence ................................ SUCCESS [ 26.243 s] [INFO] Wao :: Services ................................... FAILURE [ 3.558 s] [INFO] Wao :: Web ........................................ SKIPPED [INFO] ------------------------------------------------------------------------ [INFO] BUILD FAILURE [INFO] ------------------------------------------------------------------------ [INFO] Total time: 39.174 s [INFO] Finished at: 2014-06-04T00:06:58+01:00 [INFO] Final Memory: 105M/966M [INFO] ------------------------------------------------------------------------ Waiting for Jenkins to finish collecting data [ERROR] Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:3.1:testCompile (default-testCompile) on project wao-services: Compilation failure [ERROR] <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-services/src/t…>:[50,8] fr.ifremer.wao.services.FakeWaoApplicationContext is not abstract and does not override abstract method getBoatsFilterValuesCache() in fr.ifremer.wao.services.WaoApplicationContext [ERROR] -> [Help 1] org.apache.maven.lifecycle.LifecycleExecutionException: Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:3.1:testCompile (default-testCompile) on project wao-services: Compilation failure <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-services/src/t…>:[50,8] fr.ifremer.wao.services.FakeWaoApplicationContext is not abstract and does not override abstract method getBoatsFilterValuesCache() in fr.ifremer.wao.services.WaoApplicationContext at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:212) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:153) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:145) at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:108) at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:76) at org.apache.maven.lifecycle.internal.builder.singlethreaded.SingleThreadedBuilder.build(SingleThreadedBuilder.java:51) at org.apache.maven.lifecycle.internal.LifecycleStarter.execute(LifecycleStarter.java:116) at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:361) at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:155) at org.jvnet.hudson.maven3.launcher.Maven31Launcher.main(Maven31Launcher.java:132) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:606) at org.codehaus.plexus.classworlds.launcher.Launcher.launchStandard(Launcher.java:330) at org.codehaus.plexus.classworlds.launcher.Launcher.launch(Launcher.java:238) at jenkins.maven3.agent.Maven31Main.launch(Maven31Main.java:181) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:606) at hudson.maven.Maven3Builder.call(Maven3Builder.java:134) at hudson.maven.Maven3Builder.call(Maven3Builder.java:69) at hudson.remoting.UserRequest.perform(UserRequest.java:118) at hudson.remoting.UserRequest.perform(UserRequest.java:48) at hudson.remoting.Request$2.run(Request.java:328) at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72) at java.util.concurrent.FutureTask.run(FutureTask.java:262) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615) at java.lang.Thread.run(Thread.java:745) Caused by: org.apache.maven.plugin.compiler.CompilationFailureException: Compilation failure <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-services/src/t…>:[50,8] fr.ifremer.wao.services.FakeWaoApplicationContext is not abstract and does not override abstract method getBoatsFilterValuesCache() in fr.ifremer.wao.services.WaoApplicationContext at org.apache.maven.plugin.compiler.AbstractCompilerMojo.execute(AbstractCompilerMojo.java:858) at org.apache.maven.plugin.compiler.TestCompilerMojo.execute(TestCompilerMojo.java:152) at org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo(DefaultBuildPluginManager.java:133) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:208) ... 30 more [ERROR] [ERROR] Re-run Maven using the -X switch to enable full debug logging. [ERROR] [ERROR] For more information about the errors and possible solutions, please read the following articles: [ERROR] [Help 1] http://cwiki.apache.org/confluence/display/MAVEN/MojoFailureException [ERROR] [ERROR] After correcting the problems, you can resume the build with the command [ERROR] mvn <goals> -rf :wao-services Sending e-mails to: wao-commits(a)list.forge.codelutin.com leny(a)codelutin.com channel stopped Skipping sonar analysis due to bad build status FAILURE

1 2