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

r2103 - in trunk: wao-services/src/main/java/fr/ifremer/wao/services/service wao-web/src/main/webapp/WEB-INF/content/obsmer wao-web/src/main/webapp/WEB-INF/content/obsvente
by bleny＠users.forge.codelutin.com June 25, 2014

June 25, 2014

Author: bleny Date: 2014-06-25 15:56:42 +0200 (Wed, 25 Jun 2014) New Revision: 2103 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2103 Log: fixes #5321 hide links to contact if no contacts 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/ObsMerSamplingPlanBuilder.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanService.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsVenteSamplingPlan.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsVenteSamplingPlanBuilder.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsVenteSamplingPlanService.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlan.java trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp trunk/wao-web/src/main/webapp/WEB-INF/content/obsvente/sampling-plan.jsp 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-25 13:14:55 UTC (rev 2102) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlan.java 2014-06-25 13:56:42 UTC (rev 2103) @@ -128,8 +128,9 @@ SampleRow sampleRow, Double observationTimesInDaysExpected, Long observationTimesInDaysReal, - Long observationTimesInDaysEstimated) { - super(locale, nbTidesPerMonth, sampleRow); + Long observationTimesInDaysEstimated, + long sampleRowContactCounts) { + super(locale, nbTidesPerMonth, sampleRow, sampleRowContactCounts); this.observationTimesInDaysExpected = observationTimesInDaysExpected; this.observationTimesInDaysReal = observationTimesInDaysReal; this.observationTimesInDaysEstimated = observationTimesInDaysEstimated; Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanBuilder.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanBuilder.java 2014-06-25 13:14:55 UTC (rev 2102) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanBuilder.java 2014-06-25 13:56:42 UTC (rev 2103) @@ -164,7 +164,8 @@ public ObsMerSamplingPlanBuilder addSampleRow(SampleRow sampleRow, Double observationTimesInDaysExpected, Long observationTimesInDaysReal, - Long observationTimesInDaysEstimated) { + Long observationTimesInDaysEstimated, + long sampleRowContactCounts) { String facade = sampleRow.getFacade(); FacadeContext facadeContext = facadeMap.get(facade); @@ -190,7 +191,8 @@ nbTidesPerMonth, observationTimesInDaysExpected, observationTimesInDaysReal, - observationTimesInDaysEstimated); + observationTimesInDaysEstimated, + sampleRowContactCounts); // Sum total observation times in days observationTimesInDaysTotalExpected.add(observationTimesInDaysExpected); @@ -345,7 +347,8 @@ Map<Date, ObsMerSamplingPlan.SamplingPlanStatistics> nbTidesPerMonth, Double observationTimesInDaysExpected, Long observationTimesInDaysReal, - Long observationTimesInDaysEstimated) { + Long observationTimesInDaysEstimated, + long sampleRowContactCounts) { ObsMerSamplingPlan.ObsMerSamplingPlanSampleRowPart rowPart = new ObsMerSamplingPlan.ObsMerSamplingPlanSampleRowPart(locale, @@ -353,7 +356,8 @@ row, observationTimesInDaysExpected, observationTimesInDaysReal, - observationTimesInDaysEstimated); + observationTimesInDaysEstimated, + sampleRowContactCounts); rows.add(rowPart); return rowPart; 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-25 13:14:55 UTC (rev 2102) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanService.java 2014-06-25 13:56:42 UTC (rev 2103) @@ -31,6 +31,7 @@ import fr.ifremer.wao.WaoUtils; import fr.ifremer.wao.entity.Contact; import fr.ifremer.wao.entity.ContactState; +import fr.ifremer.wao.entity.ContactTopiaDao; import fr.ifremer.wao.entity.SampleMonth; import fr.ifremer.wao.entity.SampleRow; import fr.ifremer.wao.entity.SampleRowTopiaDao; @@ -71,6 +72,7 @@ if (result == null) { SampleRowTopiaDao dao = getSampleRowDao(); + ContactTopiaDao contactDao = getContactDao(); // recuperation des lignes du plan List<SampleRow> sampleRows = dao.findAll(sampleRowsFilter); @@ -100,11 +102,14 @@ Long observationTimesInDaysReal = realAndEstimated.getLeft(); Long observationTimesInDaysEstimated = realAndEstimated.getRight(); + long sampleRowContactCounts = contactDao.forSampleRowEquals(sampleRow).count(); + // ajout de la ligne au build de plan builder.addSampleRow(sampleRow, observationTimesInDaysExpected, observationTimesInDaysReal, - observationTimesInDaysEstimated); + observationTimesInDaysEstimated, + sampleRowContactCounts); } result = builder.toPlan(); Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsVenteSamplingPlan.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsVenteSamplingPlan.java 2014-06-25 13:14:55 UTC (rev 2102) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsVenteSamplingPlan.java 2014-06-25 13:56:42 UTC (rev 2103) @@ -47,8 +47,8 @@ protected int averageObservationsCount; - public ObsVenteSamplingPlanSampleRowPart(Locale locale, Map<Date, SamplingPlanStatistics> nbTidesPerMonth, SampleRow sampleRow) { - super(locale, nbTidesPerMonth, sampleRow); + public ObsVenteSamplingPlanSampleRowPart(Locale locale, Map<Date, SamplingPlanStatistics> nbTidesPerMonth, SampleRow sampleRow, long sampleRowContactCounts) { + super(locale, nbTidesPerMonth, sampleRow, sampleRowContactCounts); terrestrialLocationInfos = sampleRow.getTerrestrialLocationInfos(); terrestrialLocationNamesAndDescriptions = new LinkedHashMap<>(); if (CollectionUtils.isNotEmpty(sampleRow.getTerrestrialLocations())) { Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsVenteSamplingPlanBuilder.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsVenteSamplingPlanBuilder.java 2014-06-25 13:14:55 UTC (rev 2102) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsVenteSamplingPlanBuilder.java 2014-06-25 13:56:42 UTC (rev 2103) @@ -129,7 +129,7 @@ this.months = periodDates.getMonths(); } - public ObsVenteSamplingPlanBuilder addSampleRow(SampleRow sampleRow) { + public ObsVenteSamplingPlanBuilder addSampleRow(SampleRow sampleRow, long sampleRowContactCounts) { String facade = sampleRow.getFacade(); FacadeContext facadeContext = facadeMap.get(facade); @@ -152,7 +152,8 @@ // add sample row sectorPart.addSampleRow(sampleRowsFilterValues.getLocale(), sampleRow, - nbTidesPerMonth); + nbTidesPerMonth, + sampleRowContactCounts); sampleRowsFilterValues.addSampleRow(sampleRow); @@ -296,12 +297,15 @@ protected ObsMerSamplingPlan.SamplingPlanSampleRowPart addSampleRow(Locale locale, SampleRow row, - Map<Date, ObsMerSamplingPlan.SamplingPlanStatistics> nbTidesPerMonth) { + Map<Date, ObsMerSamplingPlan.SamplingPlanStatistics> nbTidesPerMonth, + long sampleRowContactCounts) { ObsVenteSamplingPlan.ObsVenteSamplingPlanSampleRowPart rowPart = - new ObsVenteSamplingPlan.ObsVenteSamplingPlanSampleRowPart(locale, - nbTidesPerMonth, - row); + new ObsVenteSamplingPlan.ObsVenteSamplingPlanSampleRowPart( + locale, + nbTidesPerMonth, + row, + sampleRowContactCounts); rows.add(rowPart); return rowPart; Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsVenteSamplingPlanService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsVenteSamplingPlanService.java 2014-06-25 13:14:55 UTC (rev 2102) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsVenteSamplingPlanService.java 2014-06-25 13:56:42 UTC (rev 2103) @@ -3,6 +3,7 @@ import com.google.common.base.Optional; import com.google.common.cache.Cache; import fr.ifremer.wao.SampleRowsFilter; +import fr.ifremer.wao.entity.ContactTopiaDao; import fr.ifremer.wao.entity.SampleRow; import fr.ifremer.wao.entity.SampleRowTopiaDao; import fr.ifremer.wao.services.AuthenticatedWaoUser; @@ -34,6 +35,7 @@ if (result == null) { SampleRowTopiaDao dao = getSampleRowDao(); + ContactTopiaDao contactDao = getContactDao(); // recuperation des lignes du plan List<SampleRow> sampleRows = dao.findAll(sampleRowsFilter); @@ -46,8 +48,10 @@ for (SampleRow sampleRow : sampleRows) { + long sampleRowContactCounts = contactDao.forSampleRowEquals(sampleRow).count(); + // ajout de la ligne au build de plan - builder.addSampleRow(sampleRow); + builder.addSampleRow(sampleRow, sampleRowContactCounts); } result = builder.toPlan(); Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlan.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlan.java 2014-06-25 13:14:55 UTC (rev 2102) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlan.java 2014-06-25 13:56:42 UTC (rev 2103) @@ -274,6 +274,8 @@ */ protected Map<Date, SamplingPlanStatistics> nbTidesPerMonth; + protected long sampleRowContactCounts; + /** * Total of tides. */ @@ -337,8 +339,10 @@ public SamplingPlanSampleRowPart(Locale locale, Map<Date, SamplingPlanStatistics> nbTidesPerMonth, - SampleRow sampleRow) { + SampleRow sampleRow, + long sampleRowContactCounts) { this.nbTidesPerMonth = nbTidesPerMonth; + this.sampleRowContactCounts = sampleRowContactCounts; // compute total tides int totalTidesExpected = 0; int totalTidesEstimated = 0; @@ -537,6 +541,10 @@ boolean isNewContactCreatable = new Date().before(lastSampleMonthEndOfMonth); return isNewContactCreatable; } + + public long getSampleRowContactCounts() { + return sampleRowContactCounts; + } } } 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-25 13:14:55 UTC (rev 2102) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 2014-06-25 13:56:42 UTC (rev 2103) @@ -489,7 +489,7 @@ </s:a> </li> </s:if> - <s:if test="authenticatedWaoUser.authorizedToViewContacts"> + <s:if test="authenticatedWaoUser.authorizedToViewContacts && sampleRowContactCounts > 0"> <li> <s:url action="contacts" id="viewAssociatedContactsUrl"> <s:param name="filter.sampleRowFilter.sampleRowCodes" value="code" /> Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsvente/sampling-plan.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsvente/sampling-plan.jsp 2014-06-25 13:14:55 UTC (rev 2102) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsvente/sampling-plan.jsp 2014-06-25 13:56:42 UTC (rev 2103) @@ -468,7 +468,7 @@ </s:a> </li> </s:if> - <s:if test="authenticatedWaoUser.authorizedToViewContacts"> + <s:if test="authenticatedWaoUser.authorizedToViewContacts && sampleRowContactCounts > 0"> <li> <s:url action="contacts" id="viewAssociatedContactsUrl"> <s:param name="filter.sampleRowFilter.sampleRowCodes" value="code" />

1 0

r2102 - trunk/wao-services/src/main/java/fr/ifremer/wao/services/service
by bleny＠users.forge.codelutin.com June 25, 2014

June 25, 2014

Author: bleny Date: 2014-06-25 15:14:55 +0200 (Wed, 25 Jun 2014) New Revision: 2102 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2102 Log: fix build Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsService.java Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsService.java 2014-06-25 10:41:38 UTC (rev 2101) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsService.java 2014-06-25 13:14:55 UTC (rev 2102) @@ -205,8 +205,6 @@ public UpdateContactCommand newUpdateContactCommandForCreation(AuthenticatedWaoUser authenticatedWaoUser) { - Preconditions.checkState(authenticatedWaoUser.isAuthorizedToCreateContact()); - Contact contact = new ContactImpl(); contact.setObsProgram(authenticatedWaoUser.getObsProgram());

1 0

r2101 - in trunk: wao-services/src/main/java/fr/ifremer/wao/services wao-services/src/main/java/fr/ifremer/wao/services/service wao-services/src/main/resources/i18n wao-web/src/main/java/fr/ifremer/wao/web/action wao-web/src/main/resources/i18n
by bleny＠users.forge.codelutin.com June 25, 2014

June 25, 2014

Author: bleny Date: 2014-06-25 12:41:38 +0200 (Wed, 25 Jun 2014) New Revision: 2101 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2101 Log: fixes #5315 deal with wrong contact id in import Added: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/UnknownContactIdException.java Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsService.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/DeleteContactAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/EditContactAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/ValidateContactJsonAction.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 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-23 22:11:57 UTC (rev 2100) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java 2014-06-25 10:41:38 UTC (rev 2101) @@ -206,6 +206,10 @@ return userProfile.isCoordinatorOrObserver() && isCanWrite(); } + public boolean isAuthorizedToUpdateContact() { + return (userProfile.isCoordinatorOrObserver() || userProfile.isAdmin()) && isCanWrite(); + } + public boolean isAuthorizedToViewSamplingPlanReal() { return ! userProfile.isGuest(); } Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsService.java 2014-06-23 22:11:57 UTC (rev 2100) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsService.java 2014-06-25 10:41:38 UTC (rev 2101) @@ -185,23 +185,60 @@ return result; } - public UpdateContactCommand newUpdateContactCommand(AuthenticatedWaoUser authenticatedWaoUser, Optional<String> optionalContactId) { + public UpdateContactCommand newUpdateContactCommand(AuthenticatedWaoUser authenticatedWaoUser, Optional<String> optionalContactId) throws UnknownContactIdException { - //FIXME Should we apply some security rules (can create, update, import) ? - //Preconditions.checkState(authenticatedWaoUser.isAuthorizedToCreateSampleRow()); + UpdateContactCommand updateContactCommand; + if (optionalContactId.isPresent()) { + + updateContactCommand = newUpdateContactCommand(authenticatedWaoUser, optionalContactId.get()); + + } else { + + updateContactCommand = newUpdateContactCommandForCreation(authenticatedWaoUser); + + } + + return updateContactCommand; + + } + + public UpdateContactCommand newUpdateContactCommandForCreation(AuthenticatedWaoUser authenticatedWaoUser) { + + Preconditions.checkState(authenticatedWaoUser.isAuthorizedToCreateContact()); + + Contact contact = new ContactImpl(); + + contact.setObsProgram(authenticatedWaoUser.getObsProgram()); + + contact.setCreationDate(getNow()); + UpdateContactCommand updateContactCommand = new UpdateContactCommand(); updateContactCommand.setAdmin(authenticatedWaoUser.isAdmin()); - Contact contact; + updateContactCommand.setContact(contact); - if (optionalContactId.isPresent()) { + updateContactCommand.setCreation(true); - String contactId = optionalContactId.get(); + return updateContactCommand; - contact = getContact(contactId); + } + public UpdateContactCommand newUpdateContactCommand(AuthenticatedWaoUser authenticatedWaoUser, String contactId) throws UnknownContactIdException { + + Preconditions.checkState(authenticatedWaoUser.isAuthorizedToUpdateContact()); + + UpdateContactCommand updateContactCommand = new UpdateContactCommand(); + + updateContactCommand.setAdmin(authenticatedWaoUser.isAdmin()); + + Optional<Contact> optionalContact = getContactDao().forTopiaIdEquals(contactId).tryFindUnique(); + + if (optionalContact.isPresent()) { + + Contact contact = optionalContact.get(); + updateContactCommand.setContact(contact); updateContactCommand.setCreation(false); @@ -218,24 +255,13 @@ } else { - contact = new ContactImpl(); + throw new UnknownContactIdException(contactId); - contact.setObsProgram(authenticatedWaoUser.getObsProgram()); - - contact.setCreationDate(getNow()); - - updateContactCommand.setContact(contact); - - updateContactCommand.setCreation(true); } return updateContactCommand; } - public Contact getContact(String contactId) { - return getContactDao().forTopiaIdEquals(contactId).findUnique(); - } - public InputStream exportContacts(ContactsFilter filter) { ContactTopiaDao dao = getContactDao(); @@ -308,8 +334,13 @@ } Optional<String> optionalContactId = Optional.fromNullable(contactId); - UpdateContactCommand updateContactCommand = newUpdateContactCommand(authenticatedWaoUser, - optionalContactId); + UpdateContactCommand updateContactCommand; + try { + updateContactCommand = newUpdateContactCommand(authenticatedWaoUser, optionalContactId); + } catch (UnknownContactIdException e) { + String message = l(l, "wao.import.contact.failure.unknownContactId", lineNumber); + throw new ImportErrorException(message); + } if (updateContactCommand.isCreation()) { @@ -773,11 +804,11 @@ public void delete(String contactId) throws IllegalDeletionException { - Contact contact = getContact(contactId); - // Execute delete ContactTopiaDao dao = getContactDao(); + Contact contact = dao.forTopiaIdEquals(contactId).findUnique(); + Map<Class<? extends TopiaEntity>, List<? extends TopiaEntity>> allUsages = dao.findAllUsages(contact); if (!allUsages.isEmpty()) { @@ -955,7 +986,7 @@ log.info(authenticatedWaoUser.getWaoUser() + " is creating a contact for " + sampleRowId + " and " + boatId); } - UpdateContactCommand updateContactCommand = newUpdateContactCommand(authenticatedWaoUser, Optional.<String>absent()); + UpdateContactCommand updateContactCommand = newUpdateContactCommandForCreation(authenticatedWaoUser); Boat boat = getBoatDao().findByTopiaId(boatId); Preconditions.checkState(boat.isActive(), "boat must be active"); Added: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/UnknownContactIdException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/UnknownContactIdException.java (rev 0) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/UnknownContactIdException.java 2014-06-25 10:41:38 UTC (rev 2101) @@ -0,0 +1,10 @@ +package fr.ifremer.wao.services.service; + +public class UnknownContactIdException extends Throwable { + + protected String contactId; + + public UnknownContactIdException(String contactId) { + this.contactId = contactId; + } +} 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-23 22:11:57 UTC (rev 2100) +++ trunk/wao-services/src/main/resources/i18n/wao-services_en_GB.properties 2014-06-25 10:41:38 UTC (rev 2101) @@ -65,7 +65,8 @@ wao.import.contact.failure.observedDataControlToCorrectionAsked=A contact cannot be accepted if observed data control shows that a correction is asked wao.import.contact.failure.sampleRowCodeMissing=The code of the sample row line is missing wao.import.contact.failure.terrestrialLocationMissing=The code of the terrestrial location is missing -wao.import.contact.failure.transmissionDateBeforeDataInputDate=Il faut que la date de transmission de la restitution soit après la date de saisie des données +wao.import.contact.failure.transmissionDateBeforeDataInputDate=Transmission date must be before data input date +wao.import.contact.failure.unknownContactId=Unknown contact id wao.import.contact.failure.unkwonCompany=Company named '%s' does not exist wao.import.contact.failure.unwantedContactStateMotif=You must not give a motif wao.import.contact.failure.wrongBoat=There is no boat with plate number '%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-23 22:11:57 UTC (rev 2100) +++ trunk/wao-services/src/main/resources/i18n/wao-services_fr_FR.properties 2014-06-25 10:41:38 UTC (rev 2101) @@ -63,6 +63,7 @@ wao.import.contact.failure.sampleRowCodeMissing=Il manque le code de la ligne de plan associée wao.import.contact.failure.terrestrialLocationMissing=Il manque le code du lieu wao.import.contact.failure.transmissionDateBeforeDataInputDate=Ligne %s \: La date de transmission de la restitution doit être postérieure à la date de saisie des données +wao.import.contact.failure.unknownContactId=Ligne %s \: l'identifiant du contact ne correspond à aucun contact connu en base wao.import.contact.failure.unkwonCompany=Il n'y a pas de société ayant pour nom '%s' wao.import.contact.failure.unwantedContactStateMotif=Ligne %s \: Il ne faut pas préciser de motif de refus wao.import.contact.failure.wrongBoat=Il n'y a pas de navire avec l'immatriculation '%s' Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/DeleteContactAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/DeleteContactAction.java 2014-06-23 22:11:57 UTC (rev 2100) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/DeleteContactAction.java 2014-06-25 10:41:38 UTC (rev 2101) @@ -21,7 +21,6 @@ * #L% */ -import fr.ifremer.wao.entity.Contact; import fr.ifremer.wao.services.service.ContactsService; import fr.ifremer.wao.services.service.IllegalDeletionException; import fr.ifremer.wao.web.WaoJspActionSupport; @@ -61,20 +60,17 @@ @Override public String execute() { - Contact contact = service.getContact(contactId); - String contactCode = contact.getMainObserver().getFullName(); - String result; try { service.delete(contactId); - session.addMessage(t("wao.ui.action.deleteContact.success", contactCode)); + session.addMessage(t("wao.ui.action.deleteContact.success")); result = SUCCESS; } catch (IllegalDeletionException e) { - session.addErrorMessages(t("wao.ui.action.deleteContact.failure", contactCode)); + session.addErrorMessages(t("wao.ui.action.deleteContact.failure")); session.addErrorMessages(e.getExplanation(getLocale())); result = ERROR; Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/EditContactAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/EditContactAction.java 2014-06-23 22:11:57 UTC (rev 2100) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/EditContactAction.java 2014-06-25 10:41:38 UTC (rev 2101) @@ -62,6 +62,7 @@ import fr.ifremer.wao.services.service.MissingContactRestitutionException; import fr.ifremer.wao.services.service.MissingContactStateMotifException; import fr.ifremer.wao.services.service.MissingContactTerrestrialLocationException; +import fr.ifremer.wao.services.service.UnknownContactIdException; import fr.ifremer.wao.services.service.UnwantedContactContactStateMotifException; import fr.ifremer.wao.services.service.UpdateContactCommand; import fr.ifremer.wao.services.service.administration.ReferentialService; @@ -204,7 +205,11 @@ @Override public void prepare() { - updateContactCommand = service.newUpdateContactCommand(getAuthenticatedWaoUser(), optionalContactId); + try { + updateContactCommand = service.newUpdateContactCommand(getAuthenticatedWaoUser(), optionalContactId); + } catch (UnknownContactIdException e) { + addActionError(t("wao.ui.error.unknownContactId")); + } List<WaoUser> waoUsers = waoUsersService.getActiveWaoUsers(Optional.of(updateContactCommand.getContact().getSampleRow().getCompany().getTopiaId())); Set<WaoUser> sortedWaoUsers = Sets.newTreeSet(WaoUsers.fullNameComparator()); Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/ValidateContactJsonAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/ValidateContactJsonAction.java 2014-06-23 22:11:57 UTC (rev 2100) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/ValidateContactJsonAction.java 2014-06-25 10:41:38 UTC (rev 2101) @@ -21,15 +21,14 @@ * #L% */ -import com.google.common.base.Optional; import com.google.common.base.Preconditions; import com.opensymphony.xwork2.Preparable; import fr.ifremer.wao.WaoTechnicalException; import fr.ifremer.wao.WaoUtils; import fr.ifremer.wao.entity.Contact; import fr.ifremer.wao.services.AuthenticatedWaoUser; +import fr.ifremer.wao.services.service.ContactDataInputDateAfterTodayException; import fr.ifremer.wao.services.service.ContactDataInputDateBeforeObservationEndDateException; -import fr.ifremer.wao.services.service.ContactDataInputDateAfterTodayException; import fr.ifremer.wao.services.service.ContactNotUpdatableException; import fr.ifremer.wao.services.service.ContactObservationEndDateAfterTodayException; import fr.ifremer.wao.services.service.ContactObservationEndDateBeforeBeginDateException; @@ -54,6 +53,7 @@ import fr.ifremer.wao.services.service.MissingContactRestitutionException; import fr.ifremer.wao.services.service.MissingContactStateMotifException; import fr.ifremer.wao.services.service.MissingContactTerrestrialLocationException; +import fr.ifremer.wao.services.service.UnknownContactIdException; import fr.ifremer.wao.services.service.UnwantedContactContactStateMotifException; import fr.ifremer.wao.services.service.UpdateContactCommand; import fr.ifremer.wao.web.WaoJsonActionSupport; @@ -137,9 +137,13 @@ AuthenticatedWaoUser authenticatedWaoUser = session.getAuthenticatedWaoUser(); - updateContactCommand = service.newUpdateContactCommand( - session.getAuthenticatedWaoUser(), - Optional.of(contactId)); + try { + updateContactCommand = service.newUpdateContactCommand( + session.getAuthenticatedWaoUser(), + contactId); + } catch (UnknownContactIdException e) { + addActionError(t("wao.ui.error.unknownContactId")); + } if (authenticatedWaoUser.isAdmin()) { updateContactCommand.setValidationProgram(validationState); 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-23 22:11:57 UTC (rev 2100) +++ trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-06-25 10:41:38 UTC (rev 2101) @@ -163,6 +163,7 @@ wao.ui.entity.TerrestrialLocation=Place wao.ui.entity.fishingGearDCF=Gear DCF code wao.ui.entity.targetSpeciesDCF=Target species DCF code +wao.ui.error.unknownContactId=This contact doesn't exist wao.ui.field.Boat.boatGroup=Boat group wao.ui.field.Boat.boatLength=Length wao.ui.field.Boat.buildYear=Build year 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-23 22:11:57 UTC (rev 2100) +++ trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-06-25 10:41:38 UTC (rev 2101) @@ -163,6 +163,7 @@ wao.ui.entity.TerrestrialLocation=Lieu wao.ui.entity.fishingGearDCF=Engin code DCF wao.ui.entity.targetSpeciesDCF=Ensembles d'espèces-cible code DCF +wao.ui.error.unknownContactId=Ce contact n'existe pas wao.ui.field.Boat.boatGroup=Strate wao.ui.field.Boat.boatLength=Longueur wao.ui.field.Boat.buildYear=Année de construction

1 0

r2100 - trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv
by bleny＠users.forge.codelutin.com June 23, 2014

June 23, 2014

Author: bleny Date: 2014-06-24 00:11:57 +0200 (Tue, 24 Jun 2014) New Revision: 2100 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2100 Log: fixes #4725 add observationTimeInDays in contacts export Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ContactImportExportModel.java Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ContactImportExportModel.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ContactImportExportModel.java 2014-06-23 21:59:05 UTC (rev 2099) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ContactImportExportModel.java 2014-06-23 22:11:57 UTC (rev 2100) @@ -219,6 +219,9 @@ I18nAbleParserFormatter<ObservedDataControl> valueParserFormatter = new I18nAbleParserFormatter<>(locale, observedDataControlsValues); valueParserFormatter.setAcceptNullValues(true); modelBuilder.newColumnForImportExport("CONTACT_DONNEES_ALLEGRO_VALIDEES", Contact.PROPERTY_OBSERVED_DATA_CONTROL, valueParserFormatter); + + modelBuilder.newIgnoredColumn("CONTACT_DUREE_OBSERVATION_EN_JOURS"); + modelBuilder.newColumnForExport("CONTACT_DUREE_OBSERVATION_EN_JOURS", "observationTimeInDays", Common.INTEGER); } if (obsProgram.isObsVente()) {

1 0

r2099 - in trunk: wao-services/src/main/java/fr/ifremer/wao/services wao-web/src/main/webapp/WEB-INF/content/obsmer wao-web/src/main/webapp/WEB-INF/content/obsvente
by bleny＠users.forge.codelutin.com June 23, 2014

June 23, 2014

Author: bleny Date: 2014-06-23 23:59:05 +0200 (Mon, 23 Jun 2014) New Revision: 2099 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2099 Log: hide some actions for guest Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp trunk/wao-web/src/main/webapp/WEB-INF/content/obsvente/sampling-plan.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-23 21:14:31 UTC (rev 2098) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java 2014-06-23 21:59:05 UTC (rev 2099) @@ -296,6 +296,10 @@ return ! userProfile.isGuest(); } + public boolean isAuthorizedToViewSampleRowLog() { + return ! userProfile.isGuest(); + } + public boolean isAuthorizedToViewSynthesis() { return ! userProfile.isGuest(); } 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-23 21:14:31 UTC (rev 2098) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 2014-06-23 21:59:05 UTC (rev 2099) @@ -453,15 +453,17 @@ </s:a> </li> </s:if> + <s:if test="authenticatedWaoUser.authorizedToViewSampleRowLog"> + <li> + <s:url action="sample-row-log" id="sampleRowLogUrl"> + <s:param name="sampleRowId" value="sampleRowId" /> + </s:url> + <s:a href="%{sampleRowLogUrl}"> + <s:text name="wao.ui.action.viewSampleRowLog" /> + </s:a> + </li> + </s:if> <li> - <s:url action="sample-row-log" id="sampleRowLogUrl"> - <s:param name="sampleRowId" value="sampleRowId" /> - </s:url> - <s:a href="%{sampleRowLogUrl}"> - <s:text name="wao.ui.action.viewSampleRowLog" /> - </s:a> - </li> - <li> <s:url action="sampling-plan" id="sampleRowZoomUrl"> <s:param name="filter.periodFrom" value="%{formatMonth(firstSampleMonthDate)}"/> <s:param name="filter.periodTo" value="%{formatMonth(lastSampleMonthDate)}"/> @@ -477,7 +479,7 @@ <s:text name="wao.ui.action.zoomOnSampleRowPeriod" /> </s:a> </li> - <s:if test="elligibleBoatsProvided"> + <s:if test="authenticatedWaoUser.authorizedToViewBoats && elligibleBoatsProvided"> <li> <s:url action="boats" id="viewElligibleBoatsUrl"> <s:param name="filter.elligibleForSampleRowsFilter.sampleRowCodes" value="code" /> @@ -487,16 +489,18 @@ </s:a> </li> </s:if> - <li> - <s:url action="contacts" id="viewAssociatedContactsUrl"> - <s:param name="filter.sampleRowFilter.sampleRowCodes" value="code" /> - <s:param name="filter.periodFrom" /> - <s:param name="filter.periodTo" /> - </s:url> - <s:a href="%{viewAssociatedContactsUrl}"> - <s:text name="wao.ui.action.viewAssociatedContacts" /> - </s:a> - </li> + <s:if test="authenticatedWaoUser.authorizedToViewContacts"> + <li> + <s:url action="contacts" id="viewAssociatedContactsUrl"> + <s:param name="filter.sampleRowFilter.sampleRowCodes" value="code" /> + <s:param name="filter.periodFrom" /> + <s:param name="filter.periodTo" /> + </s:url> + <s:a href="%{viewAssociatedContactsUrl}"> + <s:text name="wao.ui.action.viewAssociatedContacts" /> + </s:a> + </li> + </s:if> <s:if test="authenticatedWaoUser.authorizedToCreateContact && newContactCreatable"> <li> <s:url action="boats" id="createAssociatedContactUrl"> Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsvente/sampling-plan.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsvente/sampling-plan.jsp 2014-06-23 21:14:31 UTC (rev 2098) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsvente/sampling-plan.jsp 2014-06-23 21:59:05 UTC (rev 2099) @@ -432,15 +432,17 @@ </s:a> </li> </s:if> + <s:if test="authenticatedWaoUser.authorizedToViewSampleRowLog"> + <li> + <s:url action="sample-row-log" id="sampleRowLogUrl"> + <s:param name="sampleRowId" value="sampleRowId" /> + </s:url> + <s:a href="%{sampleRowLogUrl}"> + <s:text name="wao.ui.action.viewSampleRowLog" /> + </s:a> + </li> + </s:if> <li> - <s:url action="sample-row-log" id="sampleRowLogUrl"> - <s:param name="sampleRowId" value="sampleRowId" /> - </s:url> - <s:a href="%{sampleRowLogUrl}"> - <s:text name="wao.ui.action.viewSampleRowLog" /> - </s:a> - </li> - <li> <s:url action="sampling-plan" id="sampleRowZoomUrl"> <s:param name="filter.periodFrom" value="%{formatMonth(firstSampleMonthDate)}"/> <s:param name="filter.periodTo" value="%{formatMonth(lastSampleMonthDate)}"/> @@ -456,7 +458,7 @@ <s:text name="wao.ui.action.zoomOnSampleRowPeriod" /> </s:a> </li> - <s:if test="elligibleBoatsProvided"> + <s:if test="authenticatedWaoUser.authorizedToViewBoats && elligibleBoatsProvided"> <li> <s:url action="boats" id="viewElligibleBoatsUrl"> <s:param name="filter.elligibleForSampleRowsFilter.sampleRowCodes" value="code" /> @@ -466,16 +468,18 @@ </s:a> </li> </s:if> - <li> - <s:url action="contacts" id="viewAssociatedContactsUrl"> - <s:param name="filter.sampleRowFilter.sampleRowCodes" value="code" /> - <s:param name="filter.periodFrom" /> - <s:param name="filter.periodTo" /> - </s:url> - <s:a href="%{viewAssociatedContactsUrl}"> - <s:text name="wao.ui.action.viewAssociatedContacts" /> - </s:a> - </li> + <s:if test="authenticatedWaoUser.authorizedToViewContacts"> + <li> + <s:url action="contacts" id="viewAssociatedContactsUrl"> + <s:param name="filter.sampleRowFilter.sampleRowCodes" value="code" /> + <s:param name="filter.periodFrom" /> + <s:param name="filter.periodTo" /> + </s:url> + <s:a href="%{viewAssociatedContactsUrl}"> + <s:text name="wao.ui.action.viewAssociatedContacts" /> + </s:a> + </li> + </s:if> <s:if test="authenticatedWaoUser.authorizedToCreateContact && newContactCreatable"> <li> <s:url action="boats" id="createAssociatedContactUrl">

1 0

r2098 - in trunk: wao-services/src/main/java/fr/ifremer/wao/services wao-web/src/main/webapp/WEB-INF/content/obsmer wao-web/src/main/webapp/WEB-INF/content/obsvente
by bleny＠users.forge.codelutin.com June 23, 2014

June 23, 2014

Author: bleny Date: 2014-06-23 23:14:31 +0200 (Mon, 23 Jun 2014) New Revision: 2098 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2098 Log: fixes #5208 review rights for guest Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp trunk/wao-web/src/main/webapp/WEB-INF/content/obsvente/sampling-plan.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-23 20:59:08 UTC (rev 2097) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java 2014-06-23 21:14:31 UTC (rev 2098) @@ -189,6 +189,11 @@ public boolean isAuthorizedToExportContacts() { return userProfile.isAdmin() || userProfile.isCoordinatorOrObserver(); } + + public boolean isAuthorizedToExportSamplingPlan() { + return userProfile.isAdmin() || userProfile.isCoordinatorOrObserver(); + } + public boolean isAuthorizedToViewContactsComments() { return ! userProfile.isProfessional(); } @@ -206,7 +211,7 @@ } public boolean isAuthorizedToViewOtherCompanies() { - return ! userProfile.isCoordinatorOrObserver(); + return ! (userProfile.isCoordinatorOrObserver() || userProfile.isGuest()); } public boolean isAuthorizedToViewBoatDetails() { 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-23 20:59:08 UTC (rev 2097) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 2014-06-23 21:14:31 UTC (rev 2098) @@ -141,9 +141,11 @@ <s:text name="wao.ui.action.reset"/> </s:submit> - <s:submit action="export-sampling-plan" type="button" cssClass="btn"> - <s:text name="wao.ui.action.csvExport" /> - </s:submit> + <s:if test="authenticatedWaoUser.authorizedToExportSamplingPlan"> + <s:submit action="export-sampling-plan" type="button" cssClass="btn"> + <s:text name="wao.ui.action.csvExport" /> + </s:submit> + </s:if> </div> Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsvente/sampling-plan.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsvente/sampling-plan.jsp 2014-06-23 20:59:08 UTC (rev 2097) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsvente/sampling-plan.jsp 2014-06-23 21:14:31 UTC (rev 2098) @@ -151,9 +151,11 @@ <s:text name="wao.ui.action.reset"/> </s:submit> - <s:submit action="export-sampling-plan" type="button" cssClass="btn"> - <s:text name="wao.ui.action.csvExport" /> - </s:submit> + <s:if test="authenticatedWaoUser.authorizedToExportSamplingPlan"> + <s:submit action="export-sampling-plan" type="button" cssClass="btn"> + <s:text name="wao.ui.action.csvExport" /> + </s:submit> + </s:if> </div>

1 0

r2097 - in trunk/wao-web/src/main: resources/i18n webapp/WEB-INF/content
by bleny＠users.forge.codelutin.com June 23, 2014

June 23, 2014

Author: bleny Date: 2014-06-23 22:59:08 +0200 (Mon, 23 Jun 2014) New Revision: 2097 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2097 Log: fixes #5319 confirm before sample row deletion Modified: trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties trunk/wao-web/src/main/webapp/WEB-INF/content/edit-contact-input.jsp trunk/wao-web/src/main/webapp/WEB-INF/content/edit-sample-row-input.jsp 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-23 20:52:12 UTC (rev 2096) +++ trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-06-23 20:59:08 UTC (rev 2097) @@ -49,7 +49,7 @@ wao.ui.action.deleteNews=Supprimer la nouvelle wao.ui.action.deleteNews.confirm=Êtes-vous sûr de vouloir supprimer définitivement cette nouvelle ? wao.ui.action.deleteSampleRow=Supprimer la ligne du plan -wao.ui.action.deleteSampleRow.confirm=Êtes-vous sûr de vouloir supprimer la ligne %s du plan ? +wao.ui.action.deleteSampleRow.confirm=Êtes-vous sûr de vouloir supprimer cette ligne du plan ? wao.ui.action.deleteSampleRow.failure=Impossible de supprimer la ligne %s wao.ui.action.deleteSampleRow.success=La ligne %s a bien été supprimée wao.ui.action.deleteUser=Supprimer l'utilisateur Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/edit-contact-input.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/edit-contact-input.jsp 2014-06-23 20:52:12 UTC (rev 2096) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/edit-contact-input.jsp 2014-06-23 20:59:08 UTC (rev 2097) @@ -71,7 +71,7 @@ if ( ! confirm("<s:text name="wao.ui.action.deleteContact.confirm"/>")) { e.preventDefault(); } - }) + }); }); Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/edit-sample-row-input.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/edit-sample-row-input.jsp 2014-06-23 20:52:12 UTC (rev 2096) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/edit-sample-row-input.jsp 2014-06-23 20:59:08 UTC (rev 2097) @@ -84,6 +84,13 @@ $periodBeginInput.change(updateExpectedObservationsByMonthsTable); $periodEndInput.change(updateExpectedObservationsByMonthsTable); + + $('#delete-sample-row-link').click(function (e) { + if ( ! confirm("<s:text name="wao.ui.action.deleteSampleRow.confirm"/>")) { + e.preventDefault(); + } + }); + }); </script> @@ -269,7 +276,7 @@ <s:url action="delete-sample-row" id="deleteSampleRowUrl"> <s:param name="sampleRowId" value="sampleRowId" /> </s:url> - <s:a href="%{deleteSampleRowUrl}" cssClass="btn pull-right"> + <s:a href="%{deleteSampleRowUrl}" cssClass="btn pull-right" id="delete-sample-row-link"> <s:text name="wao.ui.action.deleteSampleRow" /> </s:a> </s:if>

1 0

r2096 - in trunk/wao-web/src/main: java/fr/ifremer/wao/web/action resources/i18n
by bleny＠users.forge.codelutin.com June 23, 2014

June 23, 2014

Author: bleny Date: 2014-06-23 22:52:12 +0200 (Mon, 23 Jun 2014) New Revision: 2096 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2096 Log: fixes #5318 prevent negative effort in sample row form Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/EditSampleRowAction.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 Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/EditSampleRowAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/EditSampleRowAction.java 2014-06-23 20:41:01 UTC (rev 2095) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/EditSampleRowAction.java 2014-06-23 20:52:12 UTC (rev 2096) @@ -26,6 +26,7 @@ import com.google.common.base.Strings; import com.opensymphony.xwork2.Preparable; import fr.ifremer.wao.WaoUtils; +import fr.ifremer.wao.entity.SampleMonth; import fr.ifremer.wao.entity.SampleRow; import fr.ifremer.wao.services.service.ObsMerSamplingPlanService; import fr.ifremer.wao.services.service.SampleRowCodeMustBeUniqueException; @@ -125,6 +126,13 @@ addFieldError("updateSampleRowCommand.sampleRow.samplingStrategy", t("wao.ui.form.SampleRow.error.missingProfessionSpecies")); } + for (SampleMonth sampleMonth : sampleRow.getSampleMonth()) { + if (sampleMonth.getExpectedTidesValue() < 0) { + addActionError(t("wao.ui.form.SampleRow.error.sampleMonthWithIllegalExpectedTidesValue", + formatMonth(sampleMonth.getPeriodDate()))); + } + } + } @Override 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-23 20:41:01 UTC (rev 2095) +++ trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-06-23 20:52:12 UTC (rev 2096) @@ -319,6 +319,7 @@ wao.ui.form.SampleRow.error.missingPeriodEnd=You must define the month when the observations ends wao.ui.form.SampleRow.error.missingProfessionSpecies=You must define the target species wao.ui.form.SampleRow.error.missingProgramName=You must provide the program name +wao.ui.form.SampleRow.error.sampleMonthWithIllegalExpectedTidesValue=Effort for month %s must be positive wao.ui.form.SampleRow.error.unknownFishingGearDcfCode=Unknown fishing gear code\: %s wao.ui.form.SampleRow.error.unknownTargetSpeciesDcfCode=Unknown target species code\: %s wao.ui.form.SampleRow.missingBeginDate=Begin date missing to generate line code 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-23 20:41:01 UTC (rev 2095) +++ trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-06-23 20:52:12 UTC (rev 2096) @@ -319,6 +319,7 @@ wao.ui.form.SampleRow.error.missingPeriodEnd=Il faut préciser le mois auquel se termine la période d'observation wao.ui.form.SampleRow.error.missingProfessionSpecies=Il faut préciser les espèces cibles wao.ui.form.SampleRow.error.missingProgramName=Il faut préciser le nom du programme +wao.ui.form.SampleRow.error.sampleMonthWithIllegalExpectedTidesValue=Il faut donner un effort positif pour le mois %s wao.ui.form.SampleRow.error.unknownFishingGearDcfCode=Le code engin %s est inconnu du référentiel wao.ui.form.SampleRow.error.unknownTargetSpeciesDcfCode=Le code espèce cible %s est inconnu du référentiel wao.ui.form.SampleRow.missingBeginDate=Date de début manquante pour générer le code de la ligne \!

1 0

r2095 - in trunk/wao-web/src/main/webapp: . WEB-INF/content
by bleny＠users.forge.codelutin.com June 23, 2014

June 23, 2014

Author: bleny Date: 2014-06-23 22:41:01 +0200 (Mon, 23 Jun 2014) New Revision: 2095 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2095 Log: fixes #5317 remove hardcoded namespace in s:url Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/sample-row-log.jsp trunk/wao-web/src/main/webapp/endpoints-js.jsp Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/sample-row-log.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/sample-row-log.jsp 2014-06-23 20:38:28 UTC (rev 2094) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/sample-row-log.jsp 2014-06-23 20:41:01 UTC (rev 2095) @@ -68,7 +68,7 @@ <s:textarea name="comment" label="%{getText('wao.ui.misc.comment')}" /> <div class="form-actions"> - <s:url namespace="/obsmer" action="sampling-plan" id="samplingPlanUrl" /> + <s:url action="sampling-plan" id="samplingPlanUrl" /> <s:a href="%{samplingPlanUrl}" cssClass="btn"> <s:text name="wao.ui.action.goBackToSamplingPlan" /> </s:a> @@ -87,7 +87,7 @@ <s:else> <div class="form-actions"> - <s:url namespace="/obsmer" action="sampling-plan" id="samplingPlanUrl" /> + <s:url action="sampling-plan" id="samplingPlanUrl" /> <s:a href="%{samplingPlanUrl}" cssClass="btn"> <s:text name="wao.ui.action.goBackToSamplingPlan" /> </s:a> Modified: trunk/wao-web/src/main/webapp/endpoints-js.jsp =================================================================== --- trunk/wao-web/src/main/webapp/endpoints-js.jsp 2014-06-23 20:38:28 UTC (rev 2094) +++ trunk/wao-web/src/main/webapp/endpoints-js.jsp 2014-06-23 20:41:01 UTC (rev 2095) @@ -34,7 +34,7 @@ WAO.GET_BOAT_CONTACTS_COUNT_JSON_URL = '<s:url namespace="/" action="get-boat-contacts-count-json"/>'; WAO.SEARCH_BOAT_JSON_URL = '<s:url namespace="/" action="search-boat-json"/>'; - WAO.CONTACTS_FILTER_VALUES_JSON_URL = '<s:url namespace="/obsmer" action="contacts-filter-values-json"/>'; + WAO.CONTACTS_FILTER_VALUES_JSON_URL = '<s:url namespace="/" action="contacts-filter-values-json"/>'; // fragments WAO.BOAT_DETAILS_URL = '<s:url namespace="/" action="boat-details"/>';

1 0

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

June 23, 2014

Author: bleny Date: 2014-06-23 22:38:28 +0200 (Mon, 23 Jun 2014) New Revision: 2094 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2094 Log: fixes #5316 remove hardcoded namespace in s:url Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/edit-sample-row-input.jsp Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/edit-sample-row-input.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/edit-sample-row-input.jsp 2014-06-23 20:29:40 UTC (rev 2093) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/edit-sample-row-input.jsp 2014-06-23 20:38:28 UTC (rev 2094) @@ -258,7 +258,7 @@ </s:if> <div class="form-actions"> - <s:url namespace="/obsmer" action="sampling-plan" id="samplingPlanUrl" /> + <s:url action="sampling-plan" id="samplingPlanUrl" /> <s:a href="%{samplingPlanUrl}" cssClass="btn"> <s:text name="wao.ui.action.cancel" /> </s:a>

1 0