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

[Suiviobsmer-commits] r1070 - in trunk: . wao-business/src/main/java/fr/ifremer/wao/entity wao-business/src/main/java/fr/ifremer/wao/service
by bleny＠users.labs.libre-entreprise.org 17 Mar '11

17 Mar '11

Author: bleny Date: 2011-03-17 16:54:18 +0000 (Thu, 17 Mar 2011) New Revision: 1070 Log: fix unexpected validation error when contact observation begin date is a the end of the month Modified: trunk/pom.xml trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-03-17 15:16:54 UTC (rev 1069) +++ trunk/pom.xml 2011-03-17 16:54:18 UTC (rev 1070) @@ -312,7 +312,7 @@  <nuitonI18nVersion>2.3.1</nuitonI18nVersion> - <nuitonUtilsVersion>2.0</nuitonUtilsVersion> + <nuitonUtilsVersion>2.1-SNAPSHOT</nuitonUtilsVersion> <nuitonWebVersion>1.0</nuitonWebVersion> <topiaVersion>2.5.2</topiaVersion> <eugeneVersion>2.3.1</eugeneVersion> Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java 2011-03-17 15:16:54 UTC (rev 1069) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java 2011-03-17 16:54:18 UTC (rev 1070) @@ -79,37 +79,37 @@ */ @Override public SampleMonth getSampleMonth(Date date) { - if (getSampleMonth() == null) { - return null; - } -//// Calendar ref = new GregorianCalendar(); -//// ref.setTime(date); -// //log.info("Ref : " + date); -// for (SampleMonth curr : getSampleMonth()) { -// //log.info("Curr month : " + curr.getPeriodDate() + " : " + curr.getPeriodMonth() + " / " + curr.getPeriodYear()); -//// if (ref.get(Calendar.MONTH) == (curr.getPeriodMonth()-1) && ref.get(Calendar.YEAR) == curr.getPeriodYear()) { -//// return curr; -//// } -// Date min = DateUtil.setFirstDayOfMonth(curr.getPeriodDate()); -// Date max = DateUtil.setLastDayOfMonth(curr.getPeriodDate()); -// if (DateUtil.between(date, min, max)) { -// return curr; -// } -// } - if (sampleMonthMap != null) { - // Direct access if map is defined from prepareDataByMonth - String dateFormatted = monthFormat.format(date); - return sampleMonthMap.get(dateFormatted); - } else { - for (SampleMonth curr : getSampleMonth()) { - Date min = DateUtil.setFirstDayOfMonth(curr.getPeriodDate()); - Date max = DateUtil.setLastDayOfMonth(curr.getPeriodDate()); - if (DateUtil.between(date, min, max)) { - return curr; + // will be returned + SampleMonth sampleMonth = null; + + if (getSampleMonth() != null) { + if (sampleMonthMap == null) { + for (SampleMonth curr : getSampleMonth()) { + Date firstDayOfMonth = DateUtil.setFirstDayOfMonth(curr.getPeriodDate()); + Date lastDayOfMonth = DateUtil.setLastDayOfMonth(curr.getPeriodDate()); + + boolean dateIsInMonth = DateUtil.between(date, firstDayOfMonth, lastDayOfMonth); + if (dateIsInMonth) { + sampleMonth = curr; + } + + if (log.isDebugEnabled()) { + log.debug("date " + date + " is in month " + monthFormat.format(curr.getPeriodDate()) + + " [" + firstDayOfMonth + " ; " + lastDayOfMonth + "] : " + dateIsInMonth); + } } + } else { + // Direct access if map is defined from prepareDataByMonth + String dateFormatted = monthFormat.format(date); + return sampleMonthMap.get(dateFormatted); } } - return null; + + if (log.isDebugEnabled()) { + log.debug("sampleMonth for date " + date + " is " + (sampleMonth == null ? "null" : monthFormat.format(sampleMonth.getPeriodDate()))); + } + + return sampleMonth; } @Override Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2011-03-17 15:16:54 UTC (rev 1069) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2011-03-17 16:54:18 UTC (rev 1070) @@ -501,12 +501,18 @@ // Validation for saving contact depends on contactState ContactState contactState = contact.getContactState(); + Date observationBeginDate = contact.getObservationBeginDate(); if (log.isDebugEnabled()) { - log.debug("For state : " + contactState); + log.debug("For state : " + contactState + " and observation begin date " + observationBeginDate); } - Date observationBeginDate = contact.getObservationBeginDate(); - if (success && observationBeginDate != null && ! contact.getSampleRow().isValid(observationBeginDate)) { + boolean operationBeginDateIsValid = contact.getSampleRow().isValid(observationBeginDate); + + if (log.isDebugEnabled()) { + log.debug("operation begin data is valid : " + operationBeginDateIsValid); + } + + if (success && observationBeginDate != null && ! operationBeginDateIsValid) { success = false; message = "La date de début de la marée doit correspondre à un " + "mois valide (non vide) de la ligne " + contact.getSampleRow().getCode();

1 0

[Suiviobsmer-commits] r1069 - in trunk/wao-ui/src/main: java/fr/ifremer/wao/ui/base java/fr/ifremer/wao/ui/components java/fr/ifremer/wao/ui/data java/fr/ifremer/wao/ui/pages resources/fr/ifremer/wao/ui/components webapp
by sletellier＠users.labs.libre-entreprise.org 17 Mar '11

17 Mar '11

Author: sletellier Date: 2011-03-17 15:16:54 +0000 (Thu, 17 Mar 2011) New Revision: 1069 Log: Debug reset on samplingFilter Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/AbstractFilteredPage.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/ModelFactory.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/SamplingPlanModelFactory.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/SamplingFilterComponent.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/TapestryUtil.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/SamplingFilterComponent.tml trunk/wao-ui/src/main/webapp/Synthesis.tml Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/AbstractFilteredPage.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/AbstractFilteredPage.java 2011-03-17 13:15:58 UTC (rev 1068) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/AbstractFilteredPage.java 2011-03-17 15:16:54 UTC (rev 1069) @@ -109,12 +109,21 @@ @Persist private ModelFactory modelFactory; + @Persist + private boolean observerSelect; + + @Persist + private boolean programSelect; + + @Persist + private boolean edited = false; + public boolean isObserverSelect() { - return getModelFactory().isObserverSelect(); + return observerSelect; } public boolean isProgramSelect() { - return getModelFactory().isProgramSelect(); + return programSelect; } public String getSampleRowId() { @@ -217,12 +226,61 @@ } /** - * @see ModelFactory#initSelectFilters(boolean, boolean, boolean) + * Initialize all select for filters. By default, only facade, sector and + * sampleRow selects will be initialized. + * + * @param companySelect if true, company select will be initialized + * @param observerSelect if true, observer select will be initialized + * @param programSelect + * @throws WaoException */ - protected void initSelectFilters(boolean companySelect, - boolean observerSelect, boolean programSelect) throws WaoException { + public void initSelectFilters( + boolean companySelect, + boolean observerSelect, + boolean programSelect) throws WaoException { - getModelFactory().initSelectFilters(companySelect, observerSelect, programSelect); + this.observerSelect = observerSelect; + this.programSelect = programSelect; + + if (getFilter().getSampleRow() != null) { + if (log.isDebugEnabled()) { + log.debug("SampleRow filtered : " + getFilter().getSampleRow()); + } + setSampleRowId(getFilter().getSampleRow().getTopiaId()); + } + + if (user.isAdmin() && companySelect) { + getModelFactory().resetCompanySelectModel(); + if (getFilter().getCompany() != null) { + setCompanyId(getFilter().getCompany().getTopiaId()); + } + } +// else if (!user.isAdmin()) { +// if (log.isDebugEnabled()) { +// log.debug("Company filtered : " + user.getCompany()); +// } +// getFilter().setCompany(user.getCompany()); +// } + + if (observerSelect) { + getModelFactory().resetObserverSelectModel(); + getObserverSelectModel(); + + if (getFilter().getObserver() != null) { + setObserverId(getFilter().getObserver().getTopiaId()); + } + } + + if (programSelect) { + getModelFactory().resetProgramSelectModel(); + getProgramSelectModel(); + } + + getModelFactory().resetFacadeSelectModel(); + getModelFactory().resetSectorSelectModel(); + getModelFactory().resetSampleRowSelectModel(); + + getModelFactory().initCompagnyFilter(); } /** @@ -371,7 +429,7 @@ getModelFactory().resetProgramSelectModel(); getProgramSelectModel(); } - getModelFactory().setEdited(true); + edited = true; } /** @@ -421,7 +479,7 @@ // Reset sampleRows; getFilter().setSampleRow(null); getModelFactory().resetSampleRowSelectModel(); - getModelFactory().setEdited(true); + edited = true; } /** @@ -430,7 +488,7 @@ * @return true if the page filter is in edited state. */ protected boolean isEdited() { - return getModelFactory().isEdited(); + return edited; } /** Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/ModelFactory.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/ModelFactory.java 2011-03-17 13:15:58 UTC (rev 1068) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/ModelFactory.java 2011-03-17 15:16:54 UTC (rev 1069) @@ -26,6 +26,8 @@ import java.util.ArrayList; import java.util.List; +import static fr.ifremer.wao.ui.data.TapestryUtil.getEntityFromModel; + /** * @author sletellier <letellier at codelutin.com> */ @@ -38,10 +40,7 @@ protected PropertyAccess propertyAccess; - protected boolean observerSelect; - protected boolean programSelect; protected ConnectedUser user; - protected boolean edited = false; /** * Services @@ -101,28 +100,14 @@ return user; } - public boolean isEdited() { - return edited; - } - - public void setEdited(boolean edited) { - this.edited = edited; - } - - public boolean isObserverSelect() { - return observerSelect; - } - - public boolean isProgramSelect() { - return programSelect; - } - public String getSampleRowId() { return sampleRowId; } public void setSampleRowId(String sampleRowId) { this.sampleRowId = sampleRowId; + SampleRow sampleRow = getEntityFromModel(getSampleRowSelectModel(), sampleRowId); + getFilter().setSampleRow(sampleRow); } public String getCompanyId() { @@ -131,6 +116,8 @@ public void setCompanyId(String companyId) { this.companyId = companyId; + Company company = getEntityFromModel(getCompanySelectModel(), companyId); + getFilter().setCompany(company); } public String getObserverId() { @@ -139,6 +126,8 @@ public void setObserverId(String observerId) { this.observerId = observerId; + WaoUser observer = getEntityFromModel(getObserverSelectModel(), observerId); + getFilter().setObserver(observer); } public String getFishingGearDCFId() { @@ -147,6 +136,8 @@ public void setFishingGearDCFId(String fishingGearDCFId) { this.fishingGearDCFId = fishingGearDCFId; + FishingGearDCF fishingGearDCF = getEntityFromModel(getDcfGearSelectModel(), fishingGearDCFId); + getFilter().setFishingGearDCF(fishingGearDCF); } public String getTargetSpeciesDCFId() { @@ -155,6 +146,8 @@ public void setTargetSpeciesDCFId(String targetSpeciesDCFId) { this.targetSpeciesDCFId = targetSpeciesDCFId; + TargetSpeciesDCF targetSpeciesDCF = getEntityFromModel(getDcfSpeciesSelectModel(), targetSpeciesDCFId); + getFilter().setTargetSpeciesDCF(targetSpeciesDCF); } public String getTerrestrialDistrictId() { @@ -163,32 +156,48 @@ public void setTerrestrialDistrictId(String terrestrialDistrictId) { this.terrestrialDistrictId = terrestrialDistrictId; + TerrestrialLocation terrestrialDistrict = getEntityFromModel(getTerrestrialDistrictSelectModel(), terrestrialDistrictId); + getFilter().setTerrestrialDistrict(terrestrialDistrict); } public void resetCompanySelectModel() throws WaoException { companySelectModel = null; - getCompanySelectModel(); + companyId = null; } - public void resetFacadeSelectModel() throws WaoException { - facadeSelectModel = null; - getFacadeSelectModel(); - } - - public void resetSectorSelectModel() throws WaoException { - sectorSelectModel = null; - getSectorSelectModel(); - } - public void resetSampleRowSelectModel() throws WaoException { sampleRowSelectModel = null; - getSampleRowSelectModel(); + sampleRowId = null; } public void resetObserverSelectModel() { observerSelectModel = null; + observerId = null; } + public void resetTerrestrialDistrictModel() { + terrestrialLocationSelectModel = null; + terrestrialDistrictId = null; + } + + public void resetTargetSpeciesDCFModel() { + dcfSpeciesSelectModel = null; + targetSpeciesDCFId = null; + } + + public void resetFishingGearDCFModel() { + dcfGearSelectModel = null; + fishingGearDCFId = null; + } + + public void resetFacadeSelectModel() throws WaoException { + facadeSelectModel = null; + } + + public void resetSectorSelectModel() throws WaoException { + sectorSelectModel = null; + } + public void resetProgramSelectModel() { programSelectModel = null; } @@ -204,73 +213,26 @@ } } + public abstract E getFilter(); /** - * Initialize all select for filters. By default, only facade, sector and - * sampleRow selects will be initialized. - * - * @param companySelect if true, company select will be initialized - * @param observerSelect if true, observer select will be initialized - * @param programSelect - * @throws WaoException + * Method to initialize filter, is call on constructor */ - public void initSelectFilters( - boolean companySelect, - boolean observerSelect, - boolean programSelect) throws WaoException { + public abstract void resetFilter(); - this.observerSelect = observerSelect; - this.programSelect = programSelect; - - if (getFilter().getSampleRow() != null) { - if (log.isDebugEnabled()) { - log.debug("SampleRow filtered : " + getFilter().getSampleRow()); - } - setSampleRowId(getFilter().getSampleRow().getTopiaId()); - } - - if (user.isAdmin() && companySelect) { - resetCompanySelectModel(); - if (getFilter().getCompany() != null) { - setCompanyId(getFilter().getCompany().getTopiaId()); - } - } -// else if (!user.isAdmin()) { -// if (log.isDebugEnabled()) { -// log.debug("Company filtered : " + user.getCompany()); -// } -// getFilter().setCompany(user.getCompany()); -// } - - if (observerSelect) { - resetObserverSelectModel(); - getObserverSelectModel(); - - if (getFilter().getObserver() != null) { - setObserverId(getFilter().getObserver().getTopiaId()); - } - } - - if (programSelect) { - resetProgramSelectModel(); - getProgramSelectModel(); - } - + public void resetModels() { + resetCompanySelectModel(); resetFacadeSelectModel(); - resetSectorSelectModel(); + resetObserverSelectModel(); + resetProgramSelectModel(); resetSampleRowSelectModel(); - - initCompagnyFilter(); + resetSectorSelectModel(); + resetTerrestrialDistrictModel(); + resetTargetSpeciesDCFModel(); + resetFishingGearDCFModel(); } - public abstract E getFilter(); - /** - * Method to initialize filter, is call on constructor - */ - public abstract void resetFilter(); - - /** * Used to show only active company and observers. * * @return true if only active users will be showed, false otherwise @@ -308,15 +270,12 @@ if ( ! rows.contains(sampleRow)) { rows.add(sampleRow); } - - edited = true; } } public void removeSampleRowCode() { if (getSampleRowId() != null) { getFilter().getSampleRows().remove(getSampleRowSelectModel().findObject(getSampleRowId())); - edited = true; } } Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/SamplingPlanModelFactory.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/SamplingPlanModelFactory.java 2011-03-17 13:15:58 UTC (rev 1068) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/SamplingPlanModelFactory.java 2011-03-17 15:16:54 UTC (rev 1069) @@ -66,5 +66,7 @@ filter.setPeriod(period); filter.setObsProgram(user.getProfile().getObsProgram()); filter.setEstimatedTides(true); + + initCompagnyFilter(); } } Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/SamplingFilterComponent.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/SamplingFilterComponent.java 2011-03-17 13:15:58 UTC (rev 1068) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/SamplingFilterComponent.java 2011-03-17 15:16:54 UTC (rev 1069) @@ -3,6 +3,7 @@ import fr.ifremer.wao.bean.SamplingFilter; import fr.ifremer.wao.entity.SampleRow; import fr.ifremer.wao.ui.base.ModelFactory; +import org.apache.tapestry5.ComponentResources; import org.apache.tapestry5.annotations.InjectComponent; import org.apache.tapestry5.annotations.Parameter; import org.apache.tapestry5.annotations.Persist; @@ -23,6 +24,9 @@ @Inject private Logger log; + @Inject + private ComponentResources ressources; + @Parameter(required = true) private ModelFactory<? extends SamplingFilter> modelFactory; @@ -32,13 +36,13 @@ @Parameter(required = false) private Boolean visibleOnStartup; + @Parameter(required = false) + private Boolean showEstimatedTides; + @InjectComponent private Zone filtersZone; @Persist - private boolean reset; - - @Persist private Object owner; @Persist @@ -54,6 +58,14 @@ return legendMsg; } + // False by default + public Boolean getShowEstimatedTides() { + if (showEstimatedTides == null) { + showEstimatedTides = false; + } + return showEstimatedTides; + } + // True by default public Boolean getVisibleOnStartup() { if (visibleOnStartup == null) { @@ -100,6 +112,8 @@ /** * Activate reset filter */ + private boolean reset; + void onSelectedFromReset() { reset = true; } @@ -110,25 +124,16 @@ * @return owner (for refresh) if filter is edited */ Object onSuccessFromFiltersForm() { - if (getModelFactory().isEdited()) { - return filtersZone.getBody(); - } if (reset) { // Don't reset period in filters PeriodDates period = getFilter().getPeriod(); getModelFactory().resetFilter(); + getModelFactory().resetModels(); getFilter().setPeriod(period); } - return owner; - } - /** - * Register owner to refresh - * - * @param owner page to refresh on submit - */ - public void setOwner(Object owner) { - this.owner = owner; + // Return owner + return ressources.getContainer(); } } Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/TapestryUtil.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/TapestryUtil.java 2011-03-17 13:15:58 UTC (rev 1068) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/TapestryUtil.java 2011-03-17 15:16:54 UTC (rev 1069) @@ -20,6 +20,9 @@ */ package fr.ifremer.wao.ui.data; +import org.apache.commons.lang.StringUtils; +import org.nuiton.topia.persistence.TopiaEntity; + import java.util.Arrays; /** @@ -30,6 +33,13 @@ */ public class TapestryUtil { + public static <T> T getEntityFromModel(GenericSelectModel<T> model, String id) { + if (StringUtils.isEmpty(id)) { + return null; + } + return model.findObject(id); + } + public static String getFirstString(Object[] activationContext) { String firstString = null; if (activationContext.length > 0) { Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java 2011-03-17 13:15:58 UTC (rev 1068) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java 2011-03-17 15:16:54 UTC (rev 1069) @@ -45,6 +45,7 @@ import fr.ifremer.wao.ui.data.RequiresAuthentication; import fr.ifremer.wao.ui.services.WaoManager; import org.apache.commons.collections.CollectionUtils; +import org.apache.tapestry5.PersistenceConstants; import org.apache.tapestry5.StreamResponse; import org.apache.tapestry5.annotations.Import; import org.apache.tapestry5.annotations.InjectComponent; @@ -142,21 +143,10 @@ * Page initialization */ void setupRender() { - // Initialize filters - getModelFactory().initSelectFilters(true, false, true); - // Initialize fullView depends on user admin role if (fullView == null) { fullView = user.isAdmin(); } - - // Register this as owner to ollow component to refresh this - // TODO sletellier 20110316 : find a better way ? - filterComponent.setOwner(this); - - // The company of connected user will be contributed to abstractFilteredPage - // TODO sletellier remove it ? : up in initSelectFilters -// initCompanyFilter(); } public void onSelectedFromAddSampleRowCode() { @@ -196,9 +186,6 @@ filterComponent.switchFiltersVisible(); - // Initialize filters - modelFactory.initSelectFilters(true, false, true); - if (isFiltersVisible()) { return filterComponent.getFiltersZone().getBody(); } else { Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java 2011-03-17 13:15:58 UTC (rev 1068) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java 2011-03-17 15:16:54 UTC (rev 1069) @@ -166,19 +166,9 @@ } void setupRender() { - // make filters keep company between submissions - getModelFactory().initSelectFilters(true, false, true); - // add a special CSS to make global synthesis page printable without // menu, filters, etc. renderSupport.addStylesheetLink("css/synthesis-print.css", "print"); - - // Register this as owner to ollow component to refresh this - // TODO sletellier 20110316 : find a better way ? - filterComponent.setOwner(this); - - // TODO sletellier : other have this call to initCompanyFilter() here - // you forgot him ? The call is up in initSelectFilters... } public SynthesisId getActiveSynthesis() { Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/SamplingFilterComponent.tml =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/SamplingFilterComponent.tml 2011-03-17 13:15:58 UTC (rev 1068) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/SamplingFilterComponent.tml 2011-03-17 15:16:54 UTC (rev 1069) @@ -19,7 +19,7 @@ <div> <t:if t:test="modelFactory.user.admin"> <label for="company">${message:wao.ui.entity.Company} :</label> - <input t:type="select" t:id="company" t:model="modelFactory.companySelectModel" value="modelFactory.companyId"/>  + <input t:type="select" t:id="company" t:model="modelFactory.companySelectModel" t:value="modelFactory.companyId"/>    @@ -28,7 +28,7 @@ <select t:type="select" t:id="programName" t:model="modelFactory.programSelectModel" t:value="filter.programName"/>   </div> - <div> + <div class="filterRow" t:type="zone" t:id="sampleRowZone" t:update="show"> <label for="facadeName">${message:wao.ui.field.FishingZone.facadeName} :</label> <select t:type="select" t:id="facadeName" t:model="modelFactory.facadeSelectModel" t:value="filter.facadeName"/>  <!--input t:type="submit" class="ico22px refresh" t:id="modelFactory.refreshByFacade" value="Refresh" @@ -55,15 +55,20 @@ </div> <div> <label for="fishingGearDCF">${message:wao.ui.entity.fishingGearDCF} :</label> - <input t:type="select" t:id="fishingGearDCF" t:model="modelFactory.dcfGearSelectModel" value="modelFactory.fishingGearDCFId"/>  + <input t:type="select" t:id="fishingGearDCF" t:model="modelFactory.dcfGearSelectModel" t:value="modelFactory.fishingGearDCFId"/>  <label for="targetSpeciesDCF">${message:wao.ui.entity.targetSpeciesDCF} :</label> - <input t:type="select" t:id="targetSpeciesDCF" t:model="modelFactory.dcfSpeciesSelectModel" - value="modelFactory.targetSpeciesDCFId"/>  + <input t:type="select" t:id="targetSpeciesDCF" t:model="modelFactory.dcfSpeciesSelectModel" t:value="modelFactory.targetSpeciesDCFId"/>  <t:if test="modelFactory.user.obsVente"> <label t:for="samplingStrategy">${message:wao.ui.field.SampleRow.samplingStrategy} :</label> - <input t:type="select" t:id="samplingStrategy" value="filter.samplingStrategy"/> + <input t:type="select" t:id="samplingStrategy" t:value="filter.samplingStrategy"/> </t:if> </div> + <t:if test="showEstimatedTides"> + <div class="filterRow"> + <input t:type="checkbox" t:id="estimatedTides" t:value="filter.estimatedTides" /> + <label for="estimatedTides" title="${message:wao.ui.form.estimatedTides.description}">${message:wao.ui.form.estimatedTides}</label> + </div> + </t:if> <div class="t-beaneditor-row aright"> <input t:type="submit" class="ico search-32px" t:id="search" value="Search" title="Rechercher les lignes du plan correspondants aux filtres saisies"/>  Modified: trunk/wao-ui/src/main/webapp/Synthesis.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Synthesis.tml 2011-03-17 13:15:58 UTC (rev 1068) +++ trunk/wao-ui/src/main/webapp/Synthesis.tml 2011-03-17 15:16:54 UTC (rev 1069) @@ -105,6 +105,7 @@ <t:samplingFilterComponent t:id="filterComponent" t:modelFactory="modelFactory" + t:showEstimatedTides="true" t:legendMsg="${message:wao.ui.filters.filters}"/> <div class="mtop30"/>

1 0

[Suiviobsmer-commits] r1068 - trunk/wao-business/src/main/java/fr/ifremer/wao
by bleny＠users.labs.libre-entreprise.org 17 Mar '11

17 Mar '11

Author: bleny Date: 2011-03-17 13:15:58 +0000 (Thu, 17 Mar 2011) New Revision: 1068 Log: update migration for obsDeb samplingplan Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java 2011-03-17 13:15:23 UTC (rev 1067) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java 2011-03-17 13:15:58 UTC (rev 1068) @@ -794,7 +794,7 @@ @Override protected void addCreationDateToContacts_3_0(List<String> queries) { - queries.add("ALTER TABLE Contact ADD creationDate TIMESTAMP WITHOUT TIME ZONE NOT NULL"); + queries.add("ALTER TABLE Contact ADD creationDate TIMESTAMP WITHOUT TIME ZONE"); queries.add("UPDATE Contact SET creationDate=topiaCreateDate"); } @@ -824,6 +824,16 @@ queries.add("ALTER TABLE SampleRow ADD observationUnit CHARACTER VARYING(255);"); queries.add("ALTER TABLE SampleRow ADD CONSTRAINT observationUnit_fkey FOREIGN KEY (observationUnit) REFERENCES TerrestrialDivision(topiaId);"); + queries.add("CREATE TABLE SampleRow_Observers (" + + "sampleRow character varying(255) NOT NULL," + + "observers character varying(255) NOT NULL," + + "CONSTRAINT observers_fkey FOREIGN KEY (observers) " + + "REFERENCES WaoUser (topiaid) MATCH SIMPLE " + + "ON UPDATE NO ACTION ON DELETE NO ACTION," + + "CONSTRAINT SampleRow_fkey FOREIGN KEY (SampleRow) " + + "REFERENCES SampleRow (topiaid) MATCH SIMPLE " + + "ON UPDATE NO ACTION ON DELETE NO ACTION);"); + } @Override

1 0

[Suiviobsmer-commits] r1067 - trunk
by bleny＠users.labs.libre-entreprise.org 17 Mar '11

17 Mar '11

Author: bleny Date: 2011-03-17 13:15:23 +0000 (Thu, 17 Mar 2011) New Revision: 1067 Log: update eugene version Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-03-16 18:07:49 UTC (rev 1066) +++ trunk/pom.xml 2011-03-17 13:15:23 UTC (rev 1067) @@ -315,7 +315,7 @@ <nuitonUtilsVersion>2.0</nuitonUtilsVersion> <nuitonWebVersion>1.0</nuitonWebVersion> <topiaVersion>2.5.2</topiaVersion> - <eugeneVersion>2.3</eugeneVersion> + <eugeneVersion>2.3.1</eugeneVersion> <tapestryVersion>5.2.4</tapestryVersion> <hibernateVersion>3.3.2.GA</hibernateVersion> <jfreeVersion>1.0.12</jfreeVersion>

1 0

[Suiviobsmer-commits] r1066 - in trunk/wao-business/src/main: java/fr/ifremer/wao xmi
by bleny＠users.labs.libre-entreprise.org 16 Mar '11

16 Mar '11

Author: bleny Date: 2011-03-16 18:07:49 +0000 (Wed, 16 Mar 2011) New Revision: 1066 Log: #2614 model and migration Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java trunk/wao-business/src/main/xmi/wao.zargo Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java 2011-03-16 16:22:44 UTC (rev 1065) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java 2011-03-16 18:07:49 UTC (rev 1066) @@ -793,6 +793,12 @@ } @Override + protected void addCreationDateToContacts_3_0(List<String> queries) { + queries.add("ALTER TABLE Contact ADD creationDate TIMESTAMP WITHOUT TIME ZONE NOT NULL"); + queries.add("UPDATE Contact SET creationDate=topiaCreateDate"); + } + + @Override protected void addTerrestrialDivisions_3_0(List<String> queries) { queries.add("CREATE TABLE TerrestrialDivision (" + "topiaId CHARACTER VARYING(255) PRIMARY KEY," + Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java 2011-03-16 16:22:44 UTC (rev 1065) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java 2011-03-16 18:07:49 UTC (rev 1066) @@ -137,6 +137,8 @@ protected abstract void addAdminRolesToAdmin_3_0(TopiaContextImplementor tx, List<String> queries) throws TopiaException; + protected abstract void addCreationDateToContacts_3_0(List<String> queries); + protected static final Version[] VERSIONS = new Version[] { VersionUtil.valueOf("1.0"), VersionUtil.valueOf("1.1"), @@ -476,6 +478,8 @@ List<String> queries = new LinkedList<String>(); + addCreationDateToContacts_3_0(queries); + addAdminRolesToAdmin_3_0(tx, queries); addTerrestrialDivisions_3_0(queries); Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ)

1 0

[Suiviobsmer-commits] r1065 - in trunk/wao-ui/src/main: java/fr/ifremer/wao/ui/base java/fr/ifremer/wao/ui/components java/fr/ifremer/wao/ui/pages resources/fr/ifremer/wao/ui/components webapp
by sletellier＠users.labs.libre-entreprise.org 16 Mar '11

16 Mar '11

Author: sletellier Date: 2011-03-16 16:22:44 +0000 (Wed, 16 Mar 2011) New Revision: 1065 Log: [#2636] remaniement pour adapter wao ?\195?\160 ObsDeb Added: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/SamplingPlanModelFactory.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/SamplingFilterComponent.java trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/SamplingFilterComponent.tml Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/AbstractFilteredPage.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/ModelFactory.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Boats.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java trunk/wao-ui/src/main/webapp/SamplingPlan.tml trunk/wao-ui/src/main/webapp/Synthesis.tml Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/AbstractFilteredPage.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/AbstractFilteredPage.java 2011-03-15 17:26:14 UTC (rev 1064) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/AbstractFilteredPage.java 2011-03-16 16:22:44 UTC (rev 1065) @@ -46,7 +46,6 @@ import org.apache.tapestry5.ioc.services.PropertyAccess; import org.slf4j.Logger; -import java.util.ArrayList; import java.util.List; /** @@ -169,6 +168,7 @@ public ModelFactory getModelFactory() { if (modelFactory == null) { modelFactory = new ModelFactory<SamplingFilter>(propertyAccess, + user, serviceReferential, serviceSampling, serviceBoat, @@ -183,33 +183,22 @@ protected boolean isAvailableDataForFiltersOnly() { return AbstractFilteredPage.this.isAvailableDataForFiltersOnly(); } + + @Override + public void resetFilter() { + AbstractFilteredPage.this.resetFilter(); + } }; } return modelFactory; } public void onSelectedFromAddSampleRowCode() { - if (getSampleRowId() != null) { - - List<SampleRow> rows = getFilter().getSampleRows(); - if (rows == null) { - rows = new ArrayList<SampleRow>(); - getFilter().setSampleRows(rows); - } - SampleRow sampleRow = getSampleRowSelectModel().findObject(getSampleRowId()); - if ( ! rows.contains(sampleRow)) { - rows.add(sampleRow); - } - - edited = true; - } + getModelFactory().addSampleRowCode(); } public void onSelectedFromRemoveSampleRowCode() { - if (getSampleRowId() != null) { - getFilter().getSampleRows().remove(getSampleRowSelectModel().findObject(getSampleRowId())); - edited = true; - } + getModelFactory().removeSampleRowCode(); } /** @@ -228,12 +217,12 @@ } /** - * @see ModelFactory#initSelectFilters(fr.ifremer.wao.bean.ConnectedUser, boolean, boolean, boolean) + * @see ModelFactory#initSelectFilters(boolean, boolean, boolean) */ protected void initSelectFilters(boolean companySelect, boolean observerSelect, boolean programSelect) throws WaoException { - getModelFactory().initSelectFilters(user, companySelect, observerSelect, programSelect); + getModelFactory().initSelectFilters(companySelect, observerSelect, programSelect); } /** @@ -301,6 +290,8 @@ */ protected abstract boolean isAvailableDataForFiltersOnly(); + protected abstract void resetFilter(); + public String[] onProvideCompletionsFromBoatName(String input) throws WaoException { List<String> results = serviceBoat.getBoatNamesStartWith(input); return results.toArray(new String[results.size()]); @@ -357,8 +348,6 @@ getFilter().setTerrestrialDistrict(district); } - private boolean edited; - /** * EVENT :: selected on refreshByCompany submit button. Reset selects for * company selected : programs, facades, sectors, sampleRows and observers. @@ -382,7 +371,7 @@ getModelFactory().resetProgramSelectModel(); getProgramSelectModel(); } - edited = true; + getModelFactory().setEdited(true); } /** @@ -398,7 +387,7 @@ // Reset facades getFilter().setFacadeName(null); onSelectedFromRefreshByFacade(); - getModelFactory().resetFacadeSelect(); + getModelFactory().resetFacadeSelectModel(); } /** @@ -414,7 +403,7 @@ // Reset sectors getFilter().setSectorName(null); onSelectedFromRefreshBySector(); - getModelFactory().resetSectorSelect(); + getModelFactory().resetSectorSelectModel(); } /** @@ -431,8 +420,8 @@ onSelectedFromSearch(); // Reset sampleRows; getFilter().setSampleRow(null); - getModelFactory().resetSampleRowSelect(); - edited = true; + getModelFactory().resetSampleRowSelectModel(); + getModelFactory().setEdited(true); } /** @@ -441,7 +430,7 @@ * @return true if the page filter is in edited state. */ protected boolean isEdited() { - return edited; + return getModelFactory().isEdited(); } /** Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/ModelFactory.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/ModelFactory.java 2011-03-15 17:26:14 UTC (rev 1064) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/ModelFactory.java 2011-03-16 16:22:44 UTC (rev 1065) @@ -27,7 +27,7 @@ import java.util.List; /** - * @author sletellier + * @author sletellier <letellier at codelutin.com> */ public abstract class ModelFactory <E extends SamplingFilter> { @@ -38,8 +38,10 @@ protected PropertyAccess propertyAccess; - private boolean observerSelect; - private boolean programSelect; + protected boolean observerSelect; + protected boolean programSelect; + protected ConnectedUser user; + protected boolean edited = false; /** * Services @@ -76,15 +78,37 @@ protected String targetSpeciesDCFId; protected String terrestrialDistrictId; - public ModelFactory(PropertyAccess propertyAccess, ServiceReferential serviceReferential, ServiceSampling serviceSampling, ServiceBoat serviceBoat, ServiceUser serviceUser) { + public ModelFactory(PropertyAccess propertyAccess, + ConnectedUser user, + ServiceReferential serviceReferential, + ServiceSampling serviceSampling, + ServiceBoat serviceBoat, + ServiceUser serviceUser) { + + this.user = user; this.propertyAccess = propertyAccess; this.serviceReferential = serviceReferential; this.serviceSampling = serviceSampling; this.serviceBoat = serviceBoat; this.serviceUser = serviceUser; + + // Initialize filter + resetFilter(); } + public ConnectedUser getUser() { + return user; + } + + public boolean isEdited() { + return edited; + } + + public void setEdited(boolean edited) { + this.edited = edited; + } + public boolean isObserverSelect() { return observerSelect; } @@ -141,22 +165,22 @@ this.terrestrialDistrictId = terrestrialDistrictId; } - public void resetCompanySelect() throws WaoException { + public void resetCompanySelectModel() throws WaoException { companySelectModel = null; getCompanySelectModel(); } - public void resetFacadeSelect() throws WaoException { + public void resetFacadeSelectModel() throws WaoException { facadeSelectModel = null; getFacadeSelectModel(); } - public void resetSectorSelect() throws WaoException { + public void resetSectorSelectModel() throws WaoException { sectorSelectModel = null; getSectorSelectModel(); } - public void resetSampleRowSelect() throws WaoException { + public void resetSampleRowSelectModel() throws WaoException { sampleRowSelectModel = null; getSampleRowSelectModel(); } @@ -169,7 +193,18 @@ programSelectModel = null; } + public void initCompagnyFilter() { + // Very very important to do that at beginning + // Evo #2227 : Guest user has no default company filter + if (user.isCoordinatorOrObserver()) { + if (log.isDebugEnabled()) { + log.debug("Company filtered : " + user.getCompany().getName()); + } + getFilter().setCompany(user.getCompany()); + } + } + /** * Initialize all select for filters. By default, only facade, sector and * sampleRow selects will be initialized. @@ -179,8 +214,10 @@ * @param programSelect * @throws WaoException */ - public void initSelectFilters(ConnectedUser user, boolean companySelect, - boolean observerSelect, boolean programSelect) throws WaoException { + public void initSelectFilters( + boolean companySelect, + boolean observerSelect, + boolean programSelect) throws WaoException { this.observerSelect = observerSelect; this.programSelect = programSelect; @@ -193,7 +230,7 @@ } if (user.isAdmin() && companySelect) { - resetCompanySelect(); + resetCompanySelectModel(); if (getFilter().getCompany() != null) { setCompanyId(getFilter().getCompany().getTopiaId()); } @@ -219,14 +256,21 @@ getProgramSelectModel(); } - resetFacadeSelect(); - resetSectorSelect(); - resetSampleRowSelect(); + resetFacadeSelectModel(); + resetSectorSelectModel(); + resetSampleRowSelectModel(); + + initCompagnyFilter(); } public abstract E getFilter(); /** + * Method to initialize filter, is call on constructor + */ + public abstract void resetFilter(); + + /** * Used to show only active company and observers. * * @return true if only active users will be showed, false otherwise @@ -251,7 +295,36 @@ return facadeSelectModel; } + + public void addSampleRowCode() { + if (getSampleRowId() != null) { + + List<SampleRow> rows = getFilter().getSampleRows(); + if (rows == null) { + rows = new ArrayList<SampleRow>(); + getFilter().setSampleRows(rows); + } + SampleRow sampleRow = getSampleRowSelectModel().findObject(getSampleRowId()); + if ( ! rows.contains(sampleRow)) { + rows.add(sampleRow); + } + + edited = true; + } + } + + public void removeSampleRowCode() { + if (getSampleRowId() != null) { + getFilter().getSampleRows().remove(getSampleRowSelectModel().findObject(getSampleRowId())); + edited = true; + } + } + /** + * Models + */ + + /** * Get select model for fishingZone sector. Depends on facadeName and * company set in filter. * Added: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/SamplingPlanModelFactory.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/SamplingPlanModelFactory.java (rev 0) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/SamplingPlanModelFactory.java 2011-03-16 16:22:44 UTC (rev 1065) @@ -0,0 +1,70 @@ +package fr.ifremer.wao.ui.base; + +import fr.ifremer.wao.bean.ConnectedUser; +import fr.ifremer.wao.bean.SamplingFilter; +import fr.ifremer.wao.bean.SamplingFilterImpl; +import fr.ifremer.wao.service.ServiceBoat; +import fr.ifremer.wao.service.ServiceReferential; +import fr.ifremer.wao.service.ServiceSampling; +import fr.ifremer.wao.service.ServiceUser; +import org.apache.tapestry5.annotations.InjectComponent; +import org.apache.tapestry5.annotations.Persist; +import org.apache.tapestry5.corelib.components.Form; +import org.apache.tapestry5.ioc.services.PropertyAccess; +import org.nuiton.util.PeriodDates; + +import java.util.Calendar; +import java.util.GregorianCalendar; + +/** + * @author sletellier <letellier at codelutin.com> + */ +public class SamplingPlanModelFactory extends ModelFactory<SamplingFilter> { + + @Persist + protected SamplingFilter filter; + + @InjectComponent + private Form filtersForm; + + public SamplingPlanModelFactory(PropertyAccess propertyAccess, + ConnectedUser user, + ServiceReferential serviceReferential, + ServiceSampling serviceSampling, + ServiceBoat serviceBoat, + ServiceUser serviceUser) { + + super(propertyAccess, user, serviceReferential, serviceSampling, serviceBoat, serviceUser); + } + + @Override + public SamplingFilter getFilter() { + return filter; + } + + @Override + protected boolean isAvailableDataForFiltersOnly() { + return false; + } + + @Override + public void resetFilter() { + + filter = new SamplingFilterImpl(); + // Initialize period + PeriodDates period = PeriodDates.createMonthsPeriodFromToday(11); + + GregorianCalendar initialFromDate = new GregorianCalendar(); + // in the firsts months of a new year go from now to 6 months before + // in the rest of the year, just start at the beginning of the current year + if (initialFromDate.get(Calendar.MONTH) < 3) { + initialFromDate.add(Calendar.MONTH, -6); + } else { + initialFromDate.set(Calendar.DAY_OF_YEAR, 1); + } + period.setFromDate(initialFromDate.getTime()); + filter.setPeriod(period); + filter.setObsProgram(user.getProfile().getObsProgram()); + filter.setEstimatedTides(true); + } +} Added: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/SamplingFilterComponent.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/SamplingFilterComponent.java (rev 0) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/SamplingFilterComponent.java 2011-03-16 16:22:44 UTC (rev 1065) @@ -0,0 +1,134 @@ +package fr.ifremer.wao.ui.components; + +import fr.ifremer.wao.bean.SamplingFilter; +import fr.ifremer.wao.entity.SampleRow; +import fr.ifremer.wao.ui.base.ModelFactory; +import org.apache.tapestry5.annotations.InjectComponent; +import org.apache.tapestry5.annotations.Parameter; +import org.apache.tapestry5.annotations.Persist; +import org.apache.tapestry5.annotations.Property; +import org.apache.tapestry5.corelib.components.Zone; +import org.apache.tapestry5.ioc.annotations.Inject; +import org.nuiton.util.PeriodDates; +import org.slf4j.Logger; + +import java.text.DateFormat; +import java.text.SimpleDateFormat; + +/** + * @author sletellier <letellier at codelutin.com> + */ +public class SamplingFilterComponent { + + @Inject + private Logger log; + + @Parameter(required = true) + private ModelFactory<? extends SamplingFilter> modelFactory; + + @Parameter(required = true) + private String legendMsg; + + @Parameter(required = false) + private Boolean visibleOnStartup; + + @InjectComponent + private Zone filtersZone; + + @Persist + private boolean reset; + + @Persist + private Object owner; + + @Persist + private Boolean filtersVisible; + + /** + * Current SampleRow from loop + */ + @Property + private SampleRow row; + + public String getLegendMsg() { + return legendMsg; + } + + // True by default + public Boolean getVisibleOnStartup() { + if (visibleOnStartup == null) { + visibleOnStartup = true; + } + return visibleOnStartup; + } + + public Boolean getFiltersVisible() { + if (filtersVisible == null) { + filtersVisible = getVisibleOnStartup(); + } + return filtersVisible; + } + + public void setFiltersVisible(Boolean filtersVisible) { + this.filtersVisible = filtersVisible; + } + + public void switchFiltersVisible() { + filtersVisible = !filtersVisible; + } + + public Zone getFiltersZone() { + return filtersZone; + } + + public SamplingFilter getFilter() { + return modelFactory.getFilter(); + } + + public ModelFactory getModelFactory() { + return modelFactory; + } + + public void setModelFactory(ModelFactory<? extends SamplingFilter> modelFactory) { + this.modelFactory = modelFactory; + } + + public DateFormat getDateFormat() { + return new SimpleDateFormat("MM/yyyy"); + } + + /** + * Activate reset filter + */ + void onSelectedFromReset() { + reset = true; + } + + /** + * Do filtering + * + * @return owner (for refresh) if filter is edited + */ + Object onSuccessFromFiltersForm() { + if (getModelFactory().isEdited()) { + return filtersZone.getBody(); + } + if (reset) { + // Don't reset period in filters + PeriodDates period = getFilter().getPeriod(); + + getModelFactory().resetFilter(); + getFilter().setPeriod(period); + } + return owner; + } + + /** + * Register owner to refresh + * + * @param owner page to refresh on submit + */ + public void setOwner(Object owner) { + this.owner = owner; + } +} Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Boats.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Boats.java 2011-03-15 17:26:14 UTC (rev 1064) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Boats.java 2011-03-16 16:22:44 UTC (rev 1065) @@ -160,7 +160,8 @@ // Initialize filters using AbstractFilteredPage superclass initSelectFilters(false, false, false); // The company of connected user will be contributed to abstractFilteredPage - initCompanyFilter(); + // TODO sletellier remove it ? : up in initSelectFilters +// initCompanyFilter(); companyBoatInfos = null; } @@ -370,6 +371,11 @@ return true; } + @Override + protected void resetFilter() { + this.boatFilter = null; + } + /** * Retrieve sampleRow from business with id from url context. The sampleRowId from context is set by SamplingPlan page. * When the sampleRow is not null, the filters are disabled to optimize searching boats for this row. @@ -790,7 +796,7 @@ // WARNING :: Reset sampleRow select for edition mode, no limit for // showing sampleRows instead of filters getFilter().setNbMonthFinishedFromToday(null); - getModelFactory().resetSampleRowSelect(); + getModelFactory().resetSampleRowSelectModel(); getFilter().setNbMonthFinishedFromToday(-1); } return boatInfosZone.getBody(); Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java 2011-03-15 17:26:14 UTC (rev 1064) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java 2011-03-16 16:22:44 UTC (rev 1065) @@ -132,8 +132,10 @@ if (fullView == null) { fullView = user.isAdmin(); } + // The company of connected user will be contributed to abstractFilteredPage - initCompanyFilter(); + // TODO sletellier remove it ? : up in initSelectFilters +// initCompanyFilter(); } @Log @@ -197,6 +199,11 @@ return false; } + @Override + protected void resetFilter() { + this.contactFilter = null; + } + Object onActionFromShowFilters() { // Initialize filters initSelectFilters(true, true, true); Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java 2011-03-15 17:26:14 UTC (rev 1064) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java 2011-03-16 16:22:44 UTC (rev 1065) @@ -30,20 +30,21 @@ import fr.ifremer.wao.bean.FacadeRow; import fr.ifremer.wao.bean.ObsProgram; import fr.ifremer.wao.bean.SamplingFilter; -import fr.ifremer.wao.bean.SamplingFilterImpl; import fr.ifremer.wao.entity.DCF5Code; import fr.ifremer.wao.entity.FishingZone; import fr.ifremer.wao.entity.SampleMonth; import fr.ifremer.wao.entity.SampleRow; +import fr.ifremer.wao.service.ServiceBoat; import fr.ifremer.wao.service.ServiceReferential; import fr.ifremer.wao.service.ServiceSampling; -import fr.ifremer.wao.ui.base.AbstractFilteredPage; +import fr.ifremer.wao.service.ServiceUser; +import fr.ifremer.wao.ui.base.SamplingPlanModelFactory; import fr.ifremer.wao.ui.components.Layout; +import fr.ifremer.wao.ui.components.SamplingFilterComponent; import fr.ifremer.wao.ui.data.ExportStreamResponse; import fr.ifremer.wao.ui.data.RequiresAuthentication; import fr.ifremer.wao.ui.services.WaoManager; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang.BooleanUtils; import org.apache.tapestry5.StreamResponse; import org.apache.tapestry5.annotations.Import; import org.apache.tapestry5.annotations.InjectComponent; @@ -51,10 +52,9 @@ import org.apache.tapestry5.annotations.Persist; import org.apache.tapestry5.annotations.Property; import org.apache.tapestry5.annotations.SessionState; -import org.apache.tapestry5.corelib.components.Form; -import org.apache.tapestry5.corelib.components.Zone; import org.apache.tapestry5.ioc.Messages; import org.apache.tapestry5.ioc.annotations.Inject; +import org.apache.tapestry5.ioc.services.PropertyAccess; import org.nuiton.util.PeriodDates; import org.nuiton.util.StringUtil; import org.nuiton.util.StringUtil.ToString; @@ -65,9 +65,7 @@ import java.text.DateFormat; import java.text.NumberFormat; import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Date; -import java.util.GregorianCalendar; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -81,30 +79,45 @@ */ @RequiresAuthentication(allowedPrograms = {ObsProgram.OBSMER, ObsProgram.OBSVENTE}) @Import(stylesheet = "context:css/sampling.css") -public class SamplingPlan extends AbstractFilteredPage { +public class SamplingPlan { @Inject - private Logger logger; + private Logger log; @Inject - private WaoManager manager; + private PropertyAccess propertyAccess; @Inject - private Messages messages; + private ServiceReferential serviceReferential; @Inject private ServiceSampling serviceSampling; @Inject - private ServiceReferential serviceReferential; + private ServiceBoat serviceBoat; + @Inject + private ServiceUser serviceUser; + + @Inject + private WaoManager manager; + + @Inject + private Messages messages; + @InjectComponent + private SamplingFilterComponent filterComponent; + + @InjectComponent private Layout layout; @SessionState @Property private ConnectedUser user; + @Persist + private SamplingPlanModelFactory modelFactory; + private long nbTidesExpectedTime; private long nbTidesRealTime; @@ -113,22 +126,47 @@ private long totalTidesRealTime; + public SamplingPlanModelFactory getModelFactory() { + if (modelFactory == null) { + modelFactory = new SamplingPlanModelFactory(propertyAccess, + user, serviceReferential, serviceSampling, serviceBoat, serviceUser); + } + return modelFactory; + } + + public void setModelFactory(SamplingPlanModelFactory modelFactory) { + this.modelFactory = modelFactory; + } + /** * Page initialization */ void setupRender() { - if (isFiltersVisible()) { - // Initialize filters - initSelectFilters(true, false, true); - } + // Initialize filters + getModelFactory().initSelectFilters(true, false, true); + // Initialize fullView depends on user admin role if (fullView == null) { fullView = user.isAdmin(); } + + // Register this as owner to ollow component to refresh this + // TODO sletellier 20110316 : find a better way ? + filterComponent.setOwner(this); + // The company of connected user will be contributed to abstractFilteredPage - initCompanyFilter(); + // TODO sletellier remove it ? : up in initSelectFilters +// initCompanyFilter(); } - + + public void onSelectedFromAddSampleRowCode() { + getModelFactory().addSampleRowCode(); + } + + public void onSelectedFromRemoveSampleRowCode() { + getModelFactory().removeSampleRowCode(); + } + /**************************** EXPORT **************************************/ StreamResponse onActionFromExportSamplingPlan() { @@ -150,90 +188,33 @@ /**************************** FILTERS *************************************/ - @Persist - private SamplingFilter filter; - - @InjectComponent - private Zone filtersZone; - - @InjectComponent - private Form filtersForm; - - private boolean reset; - - public PeriodDates getPeriod() { - return getFilter().getPeriod(); - } - - @Override - public SamplingFilter getFilter() throws WaoException { - if (filter == null) { - filter = new SamplingFilterImpl(); - // Initialize period - PeriodDates period = PeriodDates.createMonthsPeriodFromToday(11); - - GregorianCalendar initialFromDate = new GregorianCalendar(); - // in the firsts months of a new year go from now to 6 months before - // in the rest of the year, just start at the beginning of the current year - if (initialFromDate.get(Calendar.MONTH) < 3) { - initialFromDate.add(Calendar.MONTH, -6); - } else { - initialFromDate.set(Calendar.DAY_OF_YEAR, 1); - } - period.setFromDate(initialFromDate.getTime()); - filter.setPeriod(period); - filter.setObsProgram(user.getProfile().getObsProgram()); - filter.setEstimatedTides(true); - } - return filter; - } - - @Override - protected boolean isAvailableDataForFiltersOnly() { - return false; - } - - @Persist - private Boolean showFilters; - public boolean isFiltersVisible() { - if (showFilters == null) { - showFilters = false; - } - return BooleanUtils.isTrue(showFilters); + return filterComponent.getFiltersVisible(); } Object onActionFromShowFilters() { - showFilters = ! showFilters; + filterComponent.switchFiltersVisible(); + // Initialize filters - initSelectFilters(true, false, true); + modelFactory.initSelectFilters(true, false, true); if (isFiltersVisible()) { - return filtersZone.getBody(); + return filterComponent.getFiltersZone().getBody(); } else { - return filtersZone; + return filterComponent.getFiltersZone(); } } - void onSelectedFromReset() { - reset = true; + public PeriodDates getPeriod() { + return getFilter().getPeriod(); } - - Object onSuccessFromFiltersForm() { - if (isEdited()) { - return filtersZone.getBody(); - } - if (reset) { - // Don't reset period in filters - PeriodDates period = getFilter().getPeriod(); - filter = null; - getFilter().setPeriod(period); - } - return this; + public SamplingFilter getFilter() { + return getModelFactory().getFilter(); } + /**************************** MAIN ACTIONS ********************************/ @Persist @@ -252,8 +233,8 @@ void onActionFromChangeFilterEstimatedTides() { boolean oldValue = getFilter().getEstimatedTides(); - if (logger.isDebugEnabled()) { - logger.debug("Change estimatedTides in filter to : " + !oldValue); + if (log.isDebugEnabled()) { + log.debug("Change estimatedTides in filter to : " + !oldValue); } getFilter().setEstimatedTides(!oldValue); } @@ -304,8 +285,8 @@ */ public List<SampleRow> getData() throws WaoException { if (data == null) { - if (logger.isDebugEnabled()) { - logger.debug("sampleRows filter sent to service : " + + if (log.isDebugEnabled()) { + log.debug("sampleRows filter sent to service : " + getFilter().getSampleRows()); } @@ -454,8 +435,8 @@ this.row = row; Integer expected = getNbTidesExpected(), real = getNbTidesReal(); - if (logger.isDebugEnabled()) { - logger.debug( String.format("for month %s and row %s : expected = %s, real = %s", + if (log.isDebugEnabled()) { + log.debug( String.format("for month %s and row %s : expected = %s, real = %s", getDateFormat().format(month), row.getCode(), expected, real)); } @@ -470,8 +451,8 @@ totalExpectedForMonths.put(month, totalExpected); totalRealForMonths.put(month, totalReal); - if (logger.isDebugEnabled()) { - logger.debug( String.format("totals for month %s : expected = %s, actual = %s", + if (log.isDebugEnabled()) { + log.debug( String.format("totals for month %s : expected = %s, actual = %s", getDateFormat().format(month), totalExpected, totalReal)); } @@ -480,9 +461,9 @@ } - if (logger.isDebugEnabled()) { + if (log.isDebugEnabled()) { for (Map.Entry<Date, Integer> expected : totalExpectedForMonths.entrySet()) { - logger.debug( String.format("totals for month %s : expected = %s, actual = %s", + log.debug( String.format("totals for month %s : expected = %s, actual = %s", getDateFormat().format(expected.getKey()), expected.getValue(), totalRealForMonths.get(expected.getKey()))); } @@ -497,8 +478,8 @@ setTotalsForMonths(); } Integer total = totalExpectedForMonths.get(month); - if (logger.isDebugEnabled()) { - logger.debug(String.format("total for month %s is %s", getDateFormat().format(month), total)); + if (log.isDebugEnabled()) { + log.debug(String.format("total for month %s is %s", getDateFormat().format(month), total)); } return total; } @@ -664,7 +645,7 @@ try { serviceSampling.deleteSampleRow(row); } catch (WaoBusinessException eee) { - String error = manager.getErrorMessage(eee, messages, logger); + String error = manager.getErrorMessage(eee, messages, log); layout.addError(error); } } Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java 2011-03-15 17:26:14 UTC (rev 1064) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java 2011-03-16 16:22:44 UTC (rev 1065) @@ -42,8 +42,14 @@ import fr.ifremer.wao.entity.Indicator; import fr.ifremer.wao.entity.IndicatorLevel; import fr.ifremer.wao.entity.SampleRow; +import fr.ifremer.wao.service.ServiceBoat; +import fr.ifremer.wao.service.ServiceReferential; +import fr.ifremer.wao.service.ServiceSampling; import fr.ifremer.wao.service.ServiceSynthesis; +import fr.ifremer.wao.service.ServiceUser; import fr.ifremer.wao.ui.base.AbstractFilteredPage; +import fr.ifremer.wao.ui.base.SamplingPlanModelFactory; +import fr.ifremer.wao.ui.components.SamplingFilterComponent; import fr.ifremer.wao.ui.data.ChartUtils; import fr.ifremer.wao.ui.data.ChartUtils.ChartType; import fr.ifremer.wao.ui.data.RequiresAuthentication; @@ -63,6 +69,7 @@ import org.apache.tapestry5.corelib.components.Zone; import org.apache.tapestry5.ioc.Messages; import org.apache.tapestry5.ioc.annotations.Inject; +import org.apache.tapestry5.ioc.services.PropertyAccess; import org.jfree.chart.JFreeChart; import org.nuiton.util.PeriodDates; import org.slf4j.Logger; @@ -89,12 +96,27 @@ */ @RequiresAuthentication(allowedRoles = {UserRole.ADMIN, UserRole.COORDINATOR, UserRole.OBSERVER, UserRole.PROFESSIONAL}) @Import(stylesheet = "context:css/synthesis.css") -public class Synthesis extends AbstractFilteredPage { +public class Synthesis { @Environmental private RenderSupport renderSupport; @Inject + private PropertyAccess propertyAccess; + + @Inject + private ServiceReferential serviceReferential; + + @Inject + private ServiceSampling serviceSampling; + + @Inject + private ServiceBoat serviceBoat; + + @Inject + private ServiceUser serviceUser; + + @Inject private WaoManager manager; @Inject @@ -103,6 +125,9 @@ @Inject private Logger log; + @InjectComponent + private SamplingFilterComponent filterComponent; + @SessionState @Property private ConnectedUser user; @@ -125,13 +150,35 @@ @Inject private Messages messages; + @Persist + private SamplingPlanModelFactory modelFactory; + + public SamplingPlanModelFactory getModelFactory() { + if (modelFactory == null) { + modelFactory = new SamplingPlanModelFactory(propertyAccess, + user, serviceReferential, serviceSampling, serviceBoat, serviceUser); + } + return modelFactory; + } + + public void setModelFactory(SamplingPlanModelFactory modelFactory) { + this.modelFactory = modelFactory; + } + void setupRender() { // make filters keep company between submissions - initSelectFilters(true, false, true); + getModelFactory().initSelectFilters(true, false, true); // add a special CSS to make global synthesis page printable without // menu, filters, etc. renderSupport.addStylesheetLink("css/synthesis-print.css", "print"); + + // Register this as owner to ollow component to refresh this + // TODO sletellier 20110316 : find a better way ? + filterComponent.setOwner(this); + + // TODO sletellier : other have this call to initCompanyFilter() here + // you forgot him ? The call is up in initSelectFilters... } public SynthesisId getActiveSynthesis() { @@ -255,20 +302,8 @@ /********************* FILTERS ********************************************/ - @Persist - private SamplingFilter dataSamplingFilter; - - @Override public SamplingFilter getFilter() throws WaoException { - if (dataSamplingFilter == null) { - dataSamplingFilter = new SamplingFilterImpl(); - if (user.isCoordinatorOrObserver()) { - dataSamplingFilter.setCompany(user.getCompany()); - } - dataSamplingFilter.setObsProgram(user.getProfile().getObsProgram()); - dataSamplingFilter.setEstimatedTides(true); - } - return dataSamplingFilter; + return getModelFactory().getFilter(); } public PeriodDates getPeriod() throws WaoException { @@ -282,35 +317,7 @@ return getFilter().getPeriod(); } - @Override - protected boolean isAvailableDataForFiltersOnly() { - return false; - } - - void onSelectedFromReset() { - reset = true; - } - - Object onSuccessFromFiltersForm() { - if (isEdited()) { - return filtersZone.getBody(); - } - if (reset) { - dataSamplingFilter = null; - } - return this; - } - - /** - * Current SampleRow from loop - */ - @Property - private SampleRow row; - /********************* DYNAMICAL GRAPH : DATA SAMPLING ********************/ - - @InjectComponent - private Zone filtersZone; @Persist private ChartType dataSamplingChartType; Added: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/SamplingFilterComponent.tml =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/SamplingFilterComponent.tml (rev 0) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/SamplingFilterComponent.tml 2011-03-16 16:22:44 UTC (rev 1065) @@ -0,0 +1,78 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" + xmlns:p="tapestry:parameter"> + <div t:type="zone" t:id="filtersZone" t:visible="prop:filtersVisible" id="so-sampling-filters"> + <fieldset> + <legend>${legendMsg}</legend> + <div class="so-filters-form"> + <form t:type="form" t:id="filtersForm" t:zone="so-sampling-filters" action="post"> + <t:errors/> + <div class="t-beaneditor"> + <div> + <label for="periodBegin">${message:wao.ui.form.periodFrom}</label> + <input t:type="datefield" class="width70" t:id="periodBegin" t:value="filter.period.fromDate" t:format="MM/yyyy" + t:validate="required"/>  + <label for="periodEnd">${message:wao.ui.form.period.to} </label> + <input t:type="datefield" class="width70" t:id="periodEnd" t:value="filter.period.thruDate" t:format="MM/yyyy" + t:validate="required"/>  + </div> + <div> + <t:if t:test="modelFactory.user.admin"> + <label for="company">${message:wao.ui.entity.Company} :</label> + <input t:type="select" t:id="company" t:model="modelFactory.companySelectModel" value="modelFactory.companyId"/>  +   + </t:if> + <label for="programName">${message:wao.ui.field.SampleRow.programName} :</label> + <select t:type="select" t:id="programName" t:model="modelFactory.programSelectModel" t:value="filter.programName"/> +   + </div> + <div> + <label for="facadeName">${message:wao.ui.field.FishingZone.facadeName} :</label> + <select t:type="select" t:id="facadeName" t:model="modelFactory.facadeSelectModel" t:value="filter.facadeName"/>  +   + <label for="sectorName">${message:wao.ui.field.FishingZone.sectorName} :</label> + <select t:type="select" t:id="sectorName" t:model="modelFactory.sectorSelectModel" t:value="filter.sectorName"/>  +   + <t:if test="modelFactory.user.obsVente"> + <label>${message:wao.ui.field.SampleRow.terrestrialLocation} :</label> + <input t:type="select" t:model="modelFactory.terrestrialDistrictSelectModel" t:value="modelFactory.terrestrialDistrictId"/> + </t:if> + <label for="sampleRowId">${message:wao.ui.field.SampleRow.code} :</label> + <select t:type="select" t:id="sampleRowId" t:model="modelFactory.sampleRowSelectModel" t:value="modelFactory.sampleRowId"/> + <input t:type="submit" class="ico22px add" t:id="addSampleRowCode" value="Add" + title="Ajouter un code de ligne"/>  + <input t:type="submit" class="ico22px remove" t:id="removeSampleRowCode" value="Remove" + title="Retirer un code de ligne"/>  + <ul> + <li style="display: inline;" t:type="loop" t:source="filter.sampleRows" t:value="row" t:volatile="true"> + ${row.code} + </li> + </ul> + </div> + <div> + <label for="fishingGearDCF">${message:wao.ui.entity.fishingGearDCF} :</label> + <input t:type="select" t:id="fishingGearDCF" t:model="modelFactory.dcfGearSelectModel" value="modelFactory.fishingGearDCFId"/>  + <label for="targetSpeciesDCF">${message:wao.ui.entity.targetSpeciesDCF} :</label> + <input t:type="select" t:id="targetSpeciesDCF" t:model="modelFactory.dcfSpeciesSelectModel" + value="modelFactory.targetSpeciesDCFId"/>  + <t:if test="modelFactory.user.obsVente"> + <label t:for="samplingStrategy">${message:wao.ui.field.SampleRow.samplingStrategy} :</label> + <input t:type="select" t:id="samplingStrategy" value="filter.samplingStrategy"/> + </t:if> + </div> + <div class="t-beaneditor-row aright"> + <input t:type="submit" class="ico search-32px" t:id="search" value="Search" + title="Rechercher les lignes du plan correspondants aux filtres saisies"/>  + <input t:type="submit" class="ico undo" t:id="reset" value="Reset" + title="Remettre les filtres par défaut"/> + </div> + </div> + </form> + </div> + </fieldset> + </div> +</html> \ No newline at end of file Modified: trunk/wao-ui/src/main/webapp/SamplingPlan.tml =================================================================== --- trunk/wao-ui/src/main/webapp/SamplingPlan.tml 2011-03-15 17:26:14 UTC (rev 1064) +++ trunk/wao-ui/src/main/webapp/SamplingPlan.tml 2011-03-16 16:22:44 UTC (rev 1065) @@ -77,74 +77,18 @@ </div> </div> <div> - ${format:wao.ui.form.periodFromTo=dateFormat.format(period.fromDate),dateFormat.format(period.thruDate)} -  <a t:type="actionlink" t:id="showFilters" t:zone="so-sampling-filters" class="display-form">${message:wao.ui.misc.advancedSearch}</a> + ${format:wao.ui.form.periodFromTo=dateFormat.format(period.fromDate),dateFormat.format(period.thruDate)} +   + <a t:type="actionlink" t:id="showFilters" t:zone="so-sampling-filters" class="display-form"> + ${message:wao.ui.misc.advancedSearch} + </a> </div> - <div t:type="zone" t:id="filtersZone" t:visible="prop:filtersVisible" id="so-sampling-filters"> - <fieldset> - <legend>${message:wao.ui.misc.advancedSearch}</legend> - <div class="so-filters-form"> - <form t:type="form" t:id="filtersForm" t:zone="so-sampling-filters" action="post"> - <t:errors /> - <div class="t-beaneditor"> - <div> - <label for="periodBegin">${message:wao.ui.form.periodFrom}</label> - <input t:type="datefield" class="width70" t:id="periodBegin" t:value="period.fromDate" t:format="MM/yyyy" t:validate="required"/>  - <label for="periodEnd"> ${message:wao.ui.form.period.to} </label> - <input t:type="datefield" class="width70" t:id="periodEnd" t:value="period.thruDate" t:format="MM/yyyy" t:validate="required" />  - </div> - <div> - <t:if t:test="user.admin"> - <label for="company">${message:wao.ui.entity.Company} :</label> - <input t:type="select" t:id="company" t:model="companySelectModel" value="companyId"/>  - <input t:type="submit" class="ico22px refresh" t:id="refreshByCompany" value="${message:wao.ui.filters.refresh}" - title="${message:wao.ui.filters.refresh}" />  - </t:if> - <label for="programName">${message:wao.ui.field.SampleRow.programName} :</label> - <select t:type="select" t:id="programName" t:model="programSelectModel" t:value="filter.programName" />  - </div> - <div> - <label for="facadeName">${message:wao.ui.field.FishingZone.facadeName} :</label> - <select t:type="select" t:id="facadeName" t:model="facadeSelectModel" t:value="filter.facadeName" />  - <input t:type="submit" class="ico22px refresh" t:id="refreshByFacade" value="Refresh" - title="${message:wao.ui.filters.refresh}"/>  - <label for="sectorName">${message:wao.ui.field.FishingZone.sectorName} :</label> - <select t:type="select" t:id="sectorName" t:model="sectorSelectModel" t:value="filter.sectorName" />  - <input t:type="submit" class="ico22px refresh" t:id="refreshBySector" value="Refresh" - title="${message:wao.ui.filters.refresh}"/>  - <t:if test="user.obsVente"> - <label>${message:wao.ui.field.SampleRow.terrestrialLocation} :</label> - <input t:type="select" t:model="terrestrialDistrictSelectModel" t:value="terrestrialDistrictId" /> - </t:if> - <label for="sampleRowId">${message:wao.ui.field.SampleRow.code} :</label> - <select t:type="select" t:id="sampleRowId" t:model="sampleRowSelectModel" t:value="sampleRowId" /> - <input t:type="submit" class="ico22px add" t:id="addSampleRowCode" value="Add" title="Ajouter un code de ligne"/>  - <input t:type="submit" class="ico22px remove" t:id="removeSampleRowCode" value="Remove" title="Retirer un code de ligne" />  - <ul> - <li style="display: inline;" t:type="loop" t:source="filter.sampleRows" t:value="row" t:volatile="true"> - ${row.code} - </li> - </ul> - </div> - <div> - <label for="fishingGearDCF">${message:wao.ui.entity.fishingGearDCF} :</label> - <input t:type="select" t:id="fishingGearDCF" t:model="dcfGearSelectModel" value="fishingGearDCFId"/>  - <label for="targetSpeciesDCF">${message:wao.ui.entity.targetSpeciesDCF} :</label> - <input t:type="select" t:id="targetSpeciesDCF" t:model="dcfSpeciesSelectModel" value="targetSpeciesDCFId"/>  - <t:if test="user.obsVente"> - <label t:for="samplingStrategy">${message:wao.ui.field.SampleRow.samplingStrategy} :</label> - <input t:type="select" t:id="samplingStrategy" value="filter.samplingStrategy" /> - </t:if> - </div> - <div class="t-beaneditor-row aright"> - <input t:type="submit" class="ico search-32px" t:id="search" value="Search" title="Rechercher les lignes du plan correspondants aux filtres saisies" />  - <input t:type="submit" class="ico undo" t:id="reset" value="Reset" title="Remettre les filtres par défaut" /> - </div> - </div> - </form> - </div> - </fieldset> - </div> + +  + <t:samplingFilterComponent t:id="filterComponent" + t:visibleOnStartup="false" + t:modelFactory="modelFactory" + t:legendMsg="${message:wao.ui.misc.advancedSearch}"/> </div> <t:zone t:id="samplingZone"> <table class="t-data-grid"> Modified: trunk/wao-ui/src/main/webapp/Synthesis.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Synthesis.tml 2011-03-15 17:26:14 UTC (rev 1064) +++ trunk/wao-ui/src/main/webapp/Synthesis.tml 2011-03-16 16:22:44 UTC (rev 1065) @@ -31,79 +31,84 @@ xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter"> - <fieldset> - <legend>${message:wao.ui.filters.filters}</legend> - <div t:type="zone" t:id="filtersZone" class="so-filters-form" id="so-datasampling-filters"> -  - <form t:type="form" t:id="filtersForm" t:zone="so-datasampling-filters"> - <t:errors /> - <div class="t-beaneditor"> - <div class="filterRow"> - <label for="periodBegin">${message:wao.ui.form.periodFrom} :</label> - <input t:type="datefield" class="width70" t:id="periodBegin" t:value="period.fromDate" t:format="MM/yyyy" t:validate="required"/>  - <label for="periodEnd">${message:wao.ui.form.period.to} :</label> - <input t:type="datefield" class="width70" t:id="periodEnd" t:value="period.thruDate" t:format="MM/yyyy" t:validate="required"/> - </div> - <div> - <t:if t:test="user.admin"> - <label t:for="company">${message:wao.ui.entity.Company} :</label> - <input t:type="select" t:id="company" t:model="companySelectModel" value="companyId"/>  - <input t:type="submit" class="ico22px refresh" t:id="refreshByCompany" value="${message:wao.ui.filters.refresh}" - title="${message:wao.ui.filters.refresh}"/>  - </t:if> - <label for="programName">${message:wao.ui.field.SampleRow.programName} :</label> - <select t:type="select" t:id="programName" t:model="programSelectModel" value="filter.programName" />  - <input t:type="submit" class="ico22px refresh" t:id="refreshByProgram" value="${message:wao.ui.filters.refresh}" - title="${message:wao.ui.filters.refresh}"/> - </div> - <div class="filterRow" t:type="zone" t:id="sampleRowZone" t:update="show"> - <label for="facadeName">${message:wao.ui.field.FishingZone.facadeName} :</label> - <select t:type="select" t:id="facadeName" t:model="facadeSelectModel" value="filter.facadeName" />  - <input t:type="submit" class="ico22px refresh" t:id="refreshByFacade" value="${message:wao.ui.filters.refresh}" - title="${message:wao.ui.filters.refresh}"/>  - <label for="sectorName">${message:wao.ui.field.FishingZone.sectorName} :</label> - <select t:type="select" t:id="sectorName" t:model="sectorSelectModel" value="filter.sectorName" />  - <input t:type="submit" class="ico22px refresh" t:id="refreshBySector" value="${message:wao.ui.filters.refresh}" - title="${message:wao.ui.filters.refresh}"/>  - <t:if test="user.obsVente"> - <label>${message:wao.ui.field.SampleRow.terrestrialLocation} :</label> - <input t:type="select" t:model="terrestrialDistrictSelectModel" t:value="terrestrialDistrictId" /> - </t:if> - <label for="sampleRowId">${message:wao.ui.field.SampleRow.code} :</label> - <select t:type="select" t:id="sampleRowId" t:model="sampleRowSelectModel" t:value="sampleRowId" /> - <input t:type="submit" class="ico22px add" t:id="addSampleRowCode" value="Add" title="Ajouter un code de ligne"/>  - <input t:type="submit" class="ico22px remove" t:id="removeSampleRowCode" value="Remove" title="Retirer un code de ligne" />  - <ul> - <li style="display: inline;" t:type="loop" t:source="filter.sampleRows" t:value="row" t:volatile="true"> - ${row.code} - </li> - </ul> +  - </div> - <div> - <label for="fishingGearDCF">${message:wao.ui.entity.fishingGearDCF} :</label> - <input t:type="select" t:id="fishingGearDCF" t:model="dcfGearSelectModel" value="fishingGearDCFId"/>  - <label for="targetSpeciesDCF">${message:wao.ui.entity.targetSpeciesDCF} :</label> - <input t:type="select" t:id="targetSpeciesDCF" t:model="dcfSpeciesSelectModel" value="targetSpeciesDCFId"/>  - </div> - <div class="filterRow"> - <input t:type="checkbox" t:id="estimatedTides" value="filter.estimatedTides" /> - <label for="estimatedTides" title="${message:wao.ui.form.estimatedTides.description}">${message:wao.ui.form.estimatedTides}</label> - </div> - <div class="t-beaneditor-row aright"> - <input t:type="submit" class="ico search-32px" t:id="search" value="${message:wao.ui.action.filter}" title="${message:wao.ui.action.filter}" />  - <input t:type="submit" class="ico undo" t:id="reset" value="${message:wao.ui.action.resetFields}" title="${message:wao.ui.action.resetFields}" /> - </div> - </div> - </form> -  - </div> - </fieldset> + <! - -<t:label t:for="program" />: + <input t:type="select" t:id="program" t:model="programSelectModel" value="programId" />- - > + </div> + <div> + <label for="fishingGearDCF">${message:wao.ui.entity.fishingGearDCF} :</label> + <input t:type="select" t:id="fishingGearDCF" t:model="dcfGearSelectModel" value="fishingGearDCFId"/>  + <label for="targetSpeciesDCF">${message:wao.ui.entity.targetSpeciesDCF} :</label> + <input t:type="select" t:id="targetSpeciesDCF" t:model="dcfSpeciesSelectModel" value="targetSpeciesDCFId"/>  + </div> + <div class="filterRow"> + <input t:type="checkbox" t:id="estimatedTides" value="filter.estimatedTides" /> + <label for="estimatedTides" title="${message:wao.ui.form.estimatedTides.description}">${message:wao.ui.form.estimatedTides}</label> + </div> + <div class="t-beaneditor-row aright"> + <input t:type="submit" class="ico search-32px" t:id="search" value="${message:wao.ui.action.filter}" title="${message:wao.ui.action.filter}" />  + <input t:type="submit" class="ico undo" t:id="reset" value="${message:wao.ui.action.resetFields}" title="${message:wao.ui.action.resetFields}" /> + </div> + </div> + </form> + <! - -</div> - -> + </div> + </fieldset--> - <div class="mtop30" /> + <t:samplingFilterComponent + t:id="filterComponent" + t:modelFactory="modelFactory" + t:legendMsg="${message:wao.ui.filters.filters}"/> + <div class="mtop30"/> +  <div class="clearfix"> <div class="fleft" id="so-synthesis-menu">

1 0

[Suiviobsmer-commits] r1064 - in trunk/wao-ui/src/main/java/fr/ifremer/wao/ui: base pages
by sletellier＠users.labs.libre-entreprise.org 15 Mar '11

15 Mar '11

Author: sletellier Date: 2011-03-15 17:26:14 +0000 (Tue, 15 Mar 2011) New Revision: 1064 Log: Introduce ModelFactory, deprectated AbstractFilteredPage delegate to this one Added: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/ModelFactory.java Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/AbstractFilteredPage.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Boats.java Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/AbstractFilteredPage.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/AbstractFilteredPage.java 2011-03-15 15:40:11 UTC (rev 1063) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/AbstractFilteredPage.java 2011-03-15 17:26:14 UTC (rev 1064) @@ -27,7 +27,6 @@ import fr.ifremer.wao.WaoException; import fr.ifremer.wao.bean.ConnectedUser; import fr.ifremer.wao.bean.SamplingFilter; -import fr.ifremer.wao.bean.SamplingFilterImpl; import fr.ifremer.wao.entity.Company; import fr.ifremer.wao.entity.FishingGearDCF; import fr.ifremer.wao.entity.SampleRow; @@ -40,13 +39,9 @@ import fr.ifremer.wao.service.ServiceUser; import fr.ifremer.wao.ui.data.FiltersModel; import fr.ifremer.wao.ui.data.GenericSelectModel; -import org.apache.tapestry5.OptionModel; import org.apache.tapestry5.SelectModel; import org.apache.tapestry5.annotations.Persist; -import org.apache.tapestry5.annotations.Property; import org.apache.tapestry5.annotations.SessionState; -import org.apache.tapestry5.internal.OptionModelImpl; -import org.apache.tapestry5.internal.SelectModelImpl; import org.apache.tapestry5.ioc.annotations.Inject; import org.apache.tapestry5.ioc.services.PropertyAccess; import org.slf4j.Logger; @@ -113,47 +108,95 @@ private ServiceUser serviceUser; @Persist - private GenericSelectModel<SampleRow> sampleRowSelectModel; + private ModelFactory modelFactory; - @Property - private String sampleRowId; - - @Persist - private SelectModel facadeSelectModel; + public boolean isObserverSelect() { + return getModelFactory().isObserverSelect(); + } - @Persist - private SelectModel sectorSelectModel; + public boolean isProgramSelect() { + return getModelFactory().isProgramSelect(); + } - @Persist - private GenericSelectModel<Company> companySelectModel; + public String getSampleRowId() { + return getModelFactory().getSampleRowId(); + } - @Property - private String companyId; + public void setSampleRowId(String sampleRowId) { + getModelFactory().setSampleRowId(sampleRowId); + } - @Persist - private GenericSelectModel<WaoUser> observerSelectModel; + public String getCompanyId() { + return getModelFactory().getCompanyId(); + } - @Property - private String observerId; + public void setCompanyId(String companyId) { + getModelFactory().setCompanyId(companyId); + } - @Persist - private SelectModel programSelectModel; + public String getObserverId() { + return getModelFactory().getObserverId(); + } - @Persist - private boolean observerSelect; + public void setObserverId(String observerId) { + getModelFactory().setObserverId(observerId); + } - @Persist - private boolean programSelect; + public String getFishingGearDCFId() { + return getModelFactory().getFishingGearDCFId(); + } + public void setFishingGearDCFId(String fishingGearDCFId) { + getModelFactory().setFishingGearDCFId(fishingGearDCFId); + } + + public String getTargetSpeciesDCFId() { + return getModelFactory().getTargetSpeciesDCFId(); + } + + public void setTargetSpeciesDCFId(String targetSpeciesDCFId) { + getModelFactory().setTargetSpeciesDCFId(targetSpeciesDCFId); + } + + public String getTerrestrialDistrictId() { + return getModelFactory().getTerrestrialDistrictId(); + } + + public void setTerrestrialDistrictId(String terrestrialDistrictId) { + getModelFactory().setTerrestrialDistrictId(terrestrialDistrictId); + } + + public ModelFactory getModelFactory() { + if (modelFactory == null) { + modelFactory = new ModelFactory<SamplingFilter>(propertyAccess, + serviceReferential, + serviceSampling, + serviceBoat, + serviceUser) { + + @Override + public SamplingFilter getFilter() { + return AbstractFilteredPage.this.getFilter(); + } + + @Override + protected boolean isAvailableDataForFiltersOnly() { + return AbstractFilteredPage.this.isAvailableDataForFiltersOnly(); + } + }; + } + return modelFactory; + } + public void onSelectedFromAddSampleRowCode() { - if (sampleRowId != null) { + if (getSampleRowId() != null) { List<SampleRow> rows = getFilter().getSampleRows(); if (rows == null) { rows = new ArrayList<SampleRow>(); getFilter().setSampleRows(rows); } - SampleRow sampleRow = getSampleRowSelectModel().findObject(sampleRowId); + SampleRow sampleRow = getSampleRowSelectModel().findObject(getSampleRowId()); if ( ! rows.contains(sampleRow)) { rows.add(sampleRow); } @@ -163,8 +206,8 @@ } public void onSelectedFromRemoveSampleRowCode() { - if (sampleRowId != null) { - getFilter().getSampleRows().remove(getSampleRowSelectModel().findObject(sampleRowId)); + if (getSampleRowId() != null) { + getFilter().getSampleRows().remove(getSampleRowSelectModel().findObject(getSampleRowId())); edited = true; } } @@ -185,229 +228,68 @@ } /** - * Initialize all select for filters. By default, only facade, sector and - * sampleRow selects will be initialized. - * - * @param companySelect if true, company select will be initialized - * @param observerSelect if true, observer select will be initialized - * @param programSelect - * @throws WaoException + * @see ModelFactory#initSelectFilters(fr.ifremer.wao.bean.ConnectedUser, boolean, boolean, boolean) */ protected void initSelectFilters(boolean companySelect, boolean observerSelect, boolean programSelect) throws WaoException { - this.observerSelect = observerSelect; - this.programSelect = programSelect; - if (getFilter().getSampleRow() != null) { - if (log.isDebugEnabled()) { - log.debug("SampleRow filtered : " + getFilter().getSampleRow()); - } - sampleRowId = getFilter().getSampleRow().getTopiaId(); - } - - if (user.isAdmin() && companySelect) { - resetCompanySelect(); - if (getFilter().getCompany() != null) { - companyId = getFilter().getCompany().getTopiaId(); - } - } -// else if (!user.isAdmin()) { -// if (log.isDebugEnabled()) { -// log.debug("Company filtered : " + user.getCompany()); -// } -// getFilter().setCompany(user.getCompany()); -// } - - if (observerSelect) { - observerSelectModel = null; - getObserverSelectModel(); - - if (getFilter().getObserver() != null) { - observerId = getFilter().getObserver().getTopiaId(); - } - } - - if (programSelect) { - programSelectModel = null; - getProgramSelectModel(); - } - - resetFacadeSelect(); - resetSectorSelect(); - resetSampleRowSelect(); + getModelFactory().initSelectFilters(user, companySelect, observerSelect, programSelect); } - protected void resetCompanySelect() throws WaoException { - companySelectModel = null; - getCompanySelectModel(); - } - - protected void resetFacadeSelect() throws WaoException { - facadeSelectModel = null; - getFacadeSelectModel(); - } - - protected void resetSectorSelect() throws WaoException { - sectorSelectModel = null; - getSectorSelectModel(); - } - - protected void resetSampleRowSelect() throws WaoException { - sampleRowSelectModel = null; - getSampleRowSelectModel(); - } - /** - * Get select model for fishingZone facade. Depends on company set in - * filter. - * - * @return the SelectModel for facade names - * @throws WaoException + * @see ModelFactory#getFacadeSelectModel() */ public SelectModel getFacadeSelectModel() throws WaoException { - if (facadeSelectModel == null) { - List<OptionModel> options = new ArrayList<OptionModel>(); - for (String facadeName : serviceReferential.getFacades(getFilter())) { - options.add(new OptionModelImpl(facadeName,facadeName)); - } - facadeSelectModel = new SelectModelImpl(null, options); - } - return facadeSelectModel; + return getModelFactory().getFacadeSelectModel(); } /** - * Get select model for fishingZone sector. Depends on facadeName and - * company set in filter. - * - * @return the SelectModel for sector names - * @throws WaoException + * @see ModelFactory#getSectorSelectModel() */ public SelectModel getSectorSelectModel() throws WaoException { - if (sectorSelectModel == null) { - List<OptionModel> options = new ArrayList<OptionModel>(); - for (String sectorName : serviceReferential.getSectors(getFilter())) { - options.add(new OptionModelImpl(sectorName,sectorName)); - } - sectorSelectModel = new SelectModelImpl(null, options); - } - return sectorSelectModel; + return getModelFactory().getSectorSelectModel(); } /** - * Get select model for sampleRows. Depends on filter (Sampling part only). - * The sampleRow set from filter is temporarly extracted to avoid returning - * only one element in the select. - * - * @return the GenericSelectModel<SampleRow> for sampleRows - * @throws WaoException + * @see ModelFactory#getSampleRowSelectModel() */ public GenericSelectModel<SampleRow> getSampleRowSelectModel() throws WaoException { - if (sampleRowSelectModel == null) { - // WARN : no use of sampleRow filter - - List<SampleRow> rowsFiltered = getFilter().getSampleRows(); - getFilter().setSampleRows(null); - List<SampleRow> sampleRows = serviceSampling.getSampleRowsByFilter(getFilter()); - getFilter().setSampleRows(rowsFiltered); - - sampleRowSelectModel = new GenericSelectModel<SampleRow>(sampleRows, SampleRow.class, - SampleRow.PROPERTY_CODE, SampleRow.TOPIA_ID, propertyAccess); - } - return sampleRowSelectModel; + return getModelFactory().getSampleRowSelectModel(); } /** - * Get select model for companies. Depends on - * {@link #isAvailableDataForFiltersOnly()} () } to return only activated - * companies. This select model is only used by admin users. - * - * @return the GenericSelectModel<Company> for companies - * @throws WaoException + * @see ModelFactory#getCompanySelectModel() */ public GenericSelectModel<Company> getCompanySelectModel() throws WaoException { - if (companySelectModel == null) { - List<Company> companies = serviceUser.getCompanies(isAvailableDataForFiltersOnly()); - companySelectModel = new GenericSelectModel<Company>(companies,Company.class, - Company.PROPERTY_NAME, Company.TOPIA_ID, propertyAccess); - } - return companySelectModel; + return getModelFactory().getCompanySelectModel(); } /** - * Get the select model for observers. Depends on - * {@link #isAvailableDataForFiltersOnly() } to return only activated - * companies. - * - * @return the GenericSelectModel<WaoUser> for observers - * @throws WaoException + * @see ModelFactory#getObserverSelectModel() */ public GenericSelectModel<WaoUser> getObserverSelectModel() throws WaoException { - if (observerSelectModel == null) { - List<WaoUser> observers = - serviceUser.getObservers(getFilter().getCompany(), - isAvailableDataForFiltersOnly()); - observerSelectModel = new GenericSelectModel<WaoUser>(observers,WaoUser.class, - "fullName", "topiaId", propertyAccess); - } - return observerSelectModel; + return getModelFactory().getObserverSelectModel(); } /** - * Get select model for sampleRow program. Depends on company set in - * filter. - * - * @return the SelectModel for program names - * @throws WaoException + * @see ModelFactory#getProgramSelectModel() */ public SelectModel getProgramSelectModel() throws WaoException { - if (programSelectModel == null) { - List<OptionModel> options = new ArrayList<OptionModel>(); - for (String programName : serviceSampling.getPrograms(getFilter().getCompany())) { - options.add(new OptionModelImpl(programName, programName)); - } - programSelectModel = new SelectModelImpl(null, options); - } - return programSelectModel; + return getModelFactory().getProgramSelectModel(); } - @Property - @Persist - private String fishingGearDCFId; - - private GenericSelectModel<FishingGearDCF> dcfGearSelectModel; - + /** + * @see ModelFactory#getDcfGearSelectModel() + */ public GenericSelectModel<FishingGearDCF> getDcfGearSelectModel() throws WaoException { - if (dcfGearSelectModel == null) { - // don't filter with already defined DCFs - FishingGearDCF keptFishingGearDCF = getFilter().getFishingGearDCF(); - getFilter().setFishingGearDCF(null); - List<FishingGearDCF> fishingGearDCFs = serviceSampling.getDCFGears(getFilter()); - getFilter().setFishingGearDCF(keptFishingGearDCF); - - dcfGearSelectModel = new GenericSelectModel<FishingGearDCF>(fishingGearDCFs, FishingGearDCF.class, - "fullDescription", FishingGearDCF.TOPIA_ID, propertyAccess); - } - return dcfGearSelectModel; + return getModelFactory().getDcfGearSelectModel(); } - @Property - @Persist - private String targetSpeciesDCFId; - - private GenericSelectModel<TargetSpeciesDCF> dcfSpeciesSelectModel; - + /** + * @see ModelFactory#getDcfSpeciesSelectModel() + */ public GenericSelectModel<TargetSpeciesDCF> getDcfSpeciesSelectModel() throws WaoException { - if (dcfSpeciesSelectModel == null) { - // don't filter with already defined DCFs - TargetSpeciesDCF keptTargetSpeciesDCF = getFilter().getTargetSpeciesDCF(); - getFilter().setTargetSpeciesDCF(null); - List<TargetSpeciesDCF> targetSpeciesDCFs = serviceSampling.getDCFSpecies(getFilter()); - getFilter().setTargetSpeciesDCF(keptTargetSpeciesDCF); - - dcfSpeciesSelectModel = new GenericSelectModel<TargetSpeciesDCF>(targetSpeciesDCFs, TargetSpeciesDCF.class, - "fullDescription", TargetSpeciesDCF.TOPIA_ID, propertyAccess); - } - return dcfSpeciesSelectModel; + return getModelFactory().getDcfSpeciesSelectModel(); } protected abstract SamplingFilter getFilter() throws WaoException; @@ -424,6 +306,7 @@ return results.toArray(new String[results.size()]); } + /** * Called when search submit button is pressed. This method is useful to * refresh all filters data from selects. @@ -433,19 +316,19 @@ public void onSelectedFromSearch() throws WaoException { if (log.isDebugEnabled()) { log.debug("REFRESH FILTERS DATA"); - log.debug("observerSelect : " + observerSelect); + log.debug("observerSelect : " + isObserverSelect()); } //SampleRow row = getSampleRowSelectModel().findObject(sampleRowId); // getFilter().setSampleRow(row); if (user.isAdmin()) { - Company company = getCompanySelectModel().findObject(companyId); + Company company = getCompanySelectModel().findObject(getCompanyId()); getFilter().setCompany(company); } else { getFilter().setCompany(user.getCompany()); } - if (observerSelect) { - WaoUser observer = getObserverSelectModel().findObject(observerId); + if (isObserverSelect()) { + WaoUser observer = getObserverSelectModel().findObject(getObserverId()); if (log.isDebugEnabled()) { log.debug("Observer selected : " + (observer != null ? observer.getFullName() : "null")); @@ -453,15 +336,17 @@ getFilter().setObserver(observer); } + String fishingGearDCFId = getFishingGearDCFId(); if (fishingGearDCFId != null) { FishingGearDCF fishingGearDCF = getDcfGearSelectModel().findObject(fishingGearDCFId); getFilter().setFishingGearDCF(fishingGearDCF); } + String targetSpeciesDCFId = getTargetSpeciesDCFId(); if (targetSpeciesDCFId != null) { TargetSpeciesDCF targetSpeciesDCF = getDcfSpeciesSelectModel().findObject(targetSpeciesDCFId); getFilter().setTargetSpeciesDCF(targetSpeciesDCF); } - updateLocation(terrestrialDistrictId); + updateLocation(getTerrestrialDistrictId()); } public void updateLocation(String terrestrialDistrictId) { @@ -487,14 +372,14 @@ // Reset programs (the behavior is needed even if programSelect is false) getFilter().setProgramName(null); onSelectedFromRefreshByProgram(); - if (observerSelect) { + if (isObserverSelect()) { // Reset observers getFilter().setObserver(null); - observerSelectModel = null; + getModelFactory().resetObserverSelectModel(); getObserverSelectModel(); } - if (programSelect) { - programSelectModel = null; + if (isProgramSelect()) { + getModelFactory().resetProgramSelectModel(); getProgramSelectModel(); } edited = true; @@ -513,7 +398,7 @@ // Reset facades getFilter().setFacadeName(null); onSelectedFromRefreshByFacade(); - resetFacadeSelect(); + getModelFactory().resetFacadeSelect(); } /** @@ -529,7 +414,7 @@ // Reset sectors getFilter().setSectorName(null); onSelectedFromRefreshBySector(); - resetSectorSelect(); + getModelFactory().resetSectorSelect(); } /** @@ -546,7 +431,7 @@ onSelectedFromSearch(); // Reset sampleRows; getFilter().setSampleRow(null); - resetSampleRowSelect(); + getModelFactory().resetSampleRowSelect(); edited = true; } @@ -559,18 +444,10 @@ return edited; } - @Property - @Persist - private String terrestrialDistrictId; - - private GenericSelectModel<TerrestrialLocation> terrestrialLocationSelectModel; - + /** + * @see ModelFactory#getTerrestrialDistrictSelectModel() + */ public GenericSelectModel<TerrestrialLocation> getTerrestrialDistrictSelectModel() throws WaoException { - if (terrestrialLocationSelectModel == null) { - List<TerrestrialLocation> districts = serviceReferential.getAllTerrestrialDistricts(new SamplingFilterImpl()); - terrestrialLocationSelectModel = new GenericSelectModel<TerrestrialLocation>(districts, TerrestrialLocation.class, - "description", SampleRow.TOPIA_ID, propertyAccess); - } - return terrestrialLocationSelectModel; + return getModelFactory().getTerrestrialDistrictSelectModel(); } } Added: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/ModelFactory.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/ModelFactory.java (rev 0) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/ModelFactory.java 2011-03-15 17:26:14 UTC (rev 1064) @@ -0,0 +1,385 @@ +package fr.ifremer.wao.ui.base; + +import fr.ifremer.wao.WaoException; +import fr.ifremer.wao.bean.ConnectedUser; +import fr.ifremer.wao.bean.SamplingFilter; +import fr.ifremer.wao.bean.SamplingFilterImpl; +import fr.ifremer.wao.entity.Company; +import fr.ifremer.wao.entity.FishingGearDCF; +import fr.ifremer.wao.entity.SampleRow; +import fr.ifremer.wao.entity.TargetSpeciesDCF; +import fr.ifremer.wao.entity.TerrestrialLocation; +import fr.ifremer.wao.entity.WaoUser; +import fr.ifremer.wao.service.ServiceBoat; +import fr.ifremer.wao.service.ServiceReferential; +import fr.ifremer.wao.service.ServiceSampling; +import fr.ifremer.wao.service.ServiceUser; +import fr.ifremer.wao.ui.data.GenericSelectModel; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.tapestry5.OptionModel; +import org.apache.tapestry5.SelectModel; +import org.apache.tapestry5.internal.OptionModelImpl; +import org.apache.tapestry5.internal.SelectModelImpl; +import org.apache.tapestry5.ioc.services.PropertyAccess; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author sletellier + */ +public abstract class ModelFactory <E extends SamplingFilter> { + + /** + * Logger. + */ + private static final Log log = LogFactory.getLog(ModelFactory.class); + + protected PropertyAccess propertyAccess; + + private boolean observerSelect; + private boolean programSelect; + + /** + * Services + */ + protected ServiceReferential serviceReferential; + protected ServiceSampling serviceSampling; + protected ServiceBoat serviceBoat; + protected ServiceUser serviceUser; + + /** + * Generic select models + */ + protected GenericSelectModel<SampleRow> sampleRowSelectModel; + protected GenericSelectModel<TerrestrialLocation> terrestrialLocationSelectModel; + protected GenericSelectModel<Company> companySelectModel; + protected GenericSelectModel<WaoUser> observerSelectModel; + protected GenericSelectModel<FishingGearDCF> dcfGearSelectModel; + protected GenericSelectModel<TargetSpeciesDCF> dcfSpeciesSelectModel; + + /** + * Select models + */ + protected SelectModel facadeSelectModel; + protected SelectModel sectorSelectModel; + protected SelectModel programSelectModel; + + /** + * Id + */ + protected String sampleRowId; + protected String companyId; + protected String observerId; + protected String fishingGearDCFId; + protected String targetSpeciesDCFId; + protected String terrestrialDistrictId; + + public ModelFactory(PropertyAccess propertyAccess, ServiceReferential serviceReferential, ServiceSampling serviceSampling, ServiceBoat serviceBoat, ServiceUser serviceUser) { + this.propertyAccess = propertyAccess; + + this.serviceReferential = serviceReferential; + this.serviceSampling = serviceSampling; + this.serviceBoat = serviceBoat; + this.serviceUser = serviceUser; + } + + public boolean isObserverSelect() { + return observerSelect; + } + + public boolean isProgramSelect() { + return programSelect; + } + + public String getSampleRowId() { + return sampleRowId; + } + + public void setSampleRowId(String sampleRowId) { + this.sampleRowId = sampleRowId; + } + + public String getCompanyId() { + return companyId; + } + + public void setCompanyId(String companyId) { + this.companyId = companyId; + } + + public String getObserverId() { + return observerId; + } + + public void setObserverId(String observerId) { + this.observerId = observerId; + } + + public String getFishingGearDCFId() { + return fishingGearDCFId; + } + + public void setFishingGearDCFId(String fishingGearDCFId) { + this.fishingGearDCFId = fishingGearDCFId; + } + + public String getTargetSpeciesDCFId() { + return targetSpeciesDCFId; + } + + public void setTargetSpeciesDCFId(String targetSpeciesDCFId) { + this.targetSpeciesDCFId = targetSpeciesDCFId; + } + + public String getTerrestrialDistrictId() { + return terrestrialDistrictId; + } + + public void setTerrestrialDistrictId(String terrestrialDistrictId) { + this.terrestrialDistrictId = terrestrialDistrictId; + } + + public void resetCompanySelect() throws WaoException { + companySelectModel = null; + getCompanySelectModel(); + } + + public void resetFacadeSelect() throws WaoException { + facadeSelectModel = null; + getFacadeSelectModel(); + } + + public void resetSectorSelect() throws WaoException { + sectorSelectModel = null; + getSectorSelectModel(); + } + + public void resetSampleRowSelect() throws WaoException { + sampleRowSelectModel = null; + getSampleRowSelectModel(); + } + + public void resetObserverSelectModel() { + observerSelectModel = null; + } + + public void resetProgramSelectModel() { + programSelectModel = null; + } + + + /** + * Initialize all select for filters. By default, only facade, sector and + * sampleRow selects will be initialized. + * + * @param companySelect if true, company select will be initialized + * @param observerSelect if true, observer select will be initialized + * @param programSelect + * @throws WaoException + */ + public void initSelectFilters(ConnectedUser user, boolean companySelect, + boolean observerSelect, boolean programSelect) throws WaoException { + + this.observerSelect = observerSelect; + this.programSelect = programSelect; + + if (getFilter().getSampleRow() != null) { + if (log.isDebugEnabled()) { + log.debug("SampleRow filtered : " + getFilter().getSampleRow()); + } + setSampleRowId(getFilter().getSampleRow().getTopiaId()); + } + + if (user.isAdmin() && companySelect) { + resetCompanySelect(); + if (getFilter().getCompany() != null) { + setCompanyId(getFilter().getCompany().getTopiaId()); + } + } +// else if (!user.isAdmin()) { +// if (log.isDebugEnabled()) { +// log.debug("Company filtered : " + user.getCompany()); +// } +// getFilter().setCompany(user.getCompany()); +// } + + if (observerSelect) { + resetObserverSelectModel(); + getObserverSelectModel(); + + if (getFilter().getObserver() != null) { + setObserverId(getFilter().getObserver().getTopiaId()); + } + } + + if (programSelect) { + resetProgramSelectModel(); + getProgramSelectModel(); + } + + resetFacadeSelect(); + resetSectorSelect(); + resetSampleRowSelect(); + } + + public abstract E getFilter(); + + /** + * Used to show only active company and observers. + * + * @return true if only active users will be showed, false otherwise + */ + protected abstract boolean isAvailableDataForFiltersOnly(); + + /** + * Get select model for fishingZone facade. Depends on company set in + * filter. + * + * @return the SelectModel for facade names + * @throws WaoException + */ + public SelectModel getFacadeSelectModel() throws WaoException { + if (facadeSelectModel == null) { + List<OptionModel> options = new ArrayList<OptionModel>(); + for (String facadeName : serviceReferential.getFacades(getFilter())) { + options.add(new OptionModelImpl(facadeName,facadeName)); + } + facadeSelectModel = new SelectModelImpl(null, options); + } + return facadeSelectModel; + } + + /** + * Get select model for fishingZone sector. Depends on facadeName and + * company set in filter. + * + * @return the SelectModel for sector names + * @throws WaoException + */ + public SelectModel getSectorSelectModel() throws WaoException { + if (sectorSelectModel == null) { + List<OptionModel> options = new ArrayList<OptionModel>(); + for (String sectorName : serviceReferential.getSectors(getFilter())) { + options.add(new OptionModelImpl(sectorName,sectorName)); + } + sectorSelectModel = new SelectModelImpl(null, options); + } + return sectorSelectModel; + } + + /** + * Get select model for sampleRows. Depends on filter (Sampling part only). + * The sampleRow set from filter is temporarly extracted to avoid returning + * only one element in the select. + * + * @return the GenericSelectModel<SampleRow> for sampleRows + * @throws WaoException + */ + public GenericSelectModel<SampleRow> getSampleRowSelectModel() throws WaoException { + if (sampleRowSelectModel == null) { + // WARN : no use of sampleRow filter + + List<SampleRow> rowsFiltered = getFilter().getSampleRows(); + getFilter().setSampleRows(null); + List<SampleRow> sampleRows = serviceSampling.getSampleRowsByFilter(getFilter()); + getFilter().setSampleRows(rowsFiltered); + + sampleRowSelectModel = new GenericSelectModel<SampleRow>(sampleRows, SampleRow.class, + SampleRow.PROPERTY_CODE, SampleRow.TOPIA_ID, propertyAccess); + } + return sampleRowSelectModel; + } + + /** + * Get select model for companies. Depends on + * {@link #isAvailableDataForFiltersOnly()} () } to return only activated + * companies. This select model is only used by admin users. + * + * @return the GenericSelectModel<Company> for companies + * @throws WaoException + */ + public GenericSelectModel<Company> getCompanySelectModel() throws WaoException { + if (companySelectModel == null) { + List<Company> companies = serviceUser.getCompanies(isAvailableDataForFiltersOnly()); + companySelectModel = new GenericSelectModel<Company>(companies,Company.class, + Company.PROPERTY_NAME, Company.TOPIA_ID, propertyAccess); + } + return companySelectModel; + } + + /** + * Get the select model for observers. Depends on + * {@link #isAvailableDataForFiltersOnly() } to return only activated + * companies. + * + * @return the GenericSelectModel<WaoUser> for observers + * @throws WaoException + */ + public GenericSelectModel<WaoUser> getObserverSelectModel() throws WaoException { + if (observerSelectModel == null) { + List<WaoUser> observers = + serviceUser.getObservers(getFilter().getCompany(), + isAvailableDataForFiltersOnly()); + observerSelectModel = new GenericSelectModel<WaoUser>(observers,WaoUser.class, + "fullName", "topiaId", propertyAccess); + } + return observerSelectModel; + } + + /** + * Get select model for sampleRow program. Depends on company set in + * filter. + * + * @return the SelectModel for program names + * @throws WaoException + */ + public SelectModel getProgramSelectModel() throws WaoException { + if (programSelectModel == null) { + List<OptionModel> options = new ArrayList<OptionModel>(); + for (String programName : serviceSampling.getPrograms(getFilter().getCompany())) { + options.add(new OptionModelImpl(programName, programName)); + } + programSelectModel = new SelectModelImpl(null, options); + } + return programSelectModel; + } + + public GenericSelectModel<FishingGearDCF> getDcfGearSelectModel() throws WaoException { + if (dcfGearSelectModel == null) { + // don't filter with already defined DCFs + FishingGearDCF keptFishingGearDCF = getFilter().getFishingGearDCF(); + getFilter().setFishingGearDCF(null); + List<FishingGearDCF> fishingGearDCFs = serviceSampling.getDCFGears(getFilter()); + getFilter().setFishingGearDCF(keptFishingGearDCF); + + dcfGearSelectModel = new GenericSelectModel<FishingGearDCF>(fishingGearDCFs, FishingGearDCF.class, + "fullDescription", FishingGearDCF.TOPIA_ID, propertyAccess); + } + return dcfGearSelectModel; + } + + public GenericSelectModel<TargetSpeciesDCF> getDcfSpeciesSelectModel() throws WaoException { + if (dcfSpeciesSelectModel == null) { + // don't filter with already defined DCFs + TargetSpeciesDCF keptTargetSpeciesDCF = getFilter().getTargetSpeciesDCF(); + getFilter().setTargetSpeciesDCF(null); + List<TargetSpeciesDCF> targetSpeciesDCFs = serviceSampling.getDCFSpecies(getFilter()); + getFilter().setTargetSpeciesDCF(keptTargetSpeciesDCF); + + dcfSpeciesSelectModel = new GenericSelectModel<TargetSpeciesDCF>(targetSpeciesDCFs, TargetSpeciesDCF.class, + "fullDescription", TargetSpeciesDCF.TOPIA_ID, propertyAccess); + } + return dcfSpeciesSelectModel; + } + + public GenericSelectModel<TerrestrialLocation> getTerrestrialDistrictSelectModel() throws WaoException { + if (terrestrialLocationSelectModel == null) { + List<TerrestrialLocation> districts = serviceReferential.getAllTerrestrialDistricts(new SamplingFilterImpl()); + terrestrialLocationSelectModel = new GenericSelectModel<TerrestrialLocation>(districts, TerrestrialLocation.class, + "description", SampleRow.TOPIA_ID, propertyAccess); + } + return terrestrialLocationSelectModel; + } +} Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Boats.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Boats.java 2011-03-15 15:40:11 UTC (rev 1063) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Boats.java 2011-03-15 17:26:14 UTC (rev 1064) @@ -790,7 +790,7 @@ // WARNING :: Reset sampleRow select for edition mode, no limit for // showing sampleRows instead of filters getFilter().setNbMonthFinishedFromToday(null); - resetSampleRowSelect(); + getModelFactory().resetSampleRowSelect(); getFilter().setNbMonthFinishedFromToday(-1); } return boatInfosZone.getBody();

1 0

[Suiviobsmer-commits] r1063 - in trunk: wao-business/src/main/java/fr/ifremer/wao/io/csv2/models wao-business/src/main/java/fr/ifremer/wao/service wao-business/src/main/xmi wao-business/src/test/java/fr/ifremer/wao/io/csv2 wao-ui/src/main/resources/i18n
by bleny＠users.labs.libre-entreprise.org 15 Mar '11

15 Mar '11

Author: bleny Date: 2011-03-15 15:40:11 +0000 (Tue, 15 Mar 2011) New Revision: 1063 Log: add observers to sampling plan in model Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/SamplingPlanImportExportModel.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java trunk/wao-business/src/main/xmi/wao.zargo trunk/wao-business/src/test/java/fr/ifremer/wao/io/csv2/ImportTest.java trunk/wao-ui/src/main/resources/i18n/wao-ui_fr_FR.properties Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/SamplingPlanImportExportModel.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/SamplingPlanImportExportModel.java 2011-03-14 17:19:34 UTC (rev 1062) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/SamplingPlanImportExportModel.java 2011-03-15 15:40:11 UTC (rev 1063) @@ -20,10 +20,13 @@ */ package fr.ifremer.wao.io.csv2.models; +import fr.ifremer.wao.WaoUtils; +import fr.ifremer.wao.bean.ConnectedUser; import fr.ifremer.wao.bean.ObsProgram; import fr.ifremer.wao.entity.SampleRow; import fr.ifremer.wao.entity.SampleRowImpl; import fr.ifremer.wao.entity.TerrestrialDivision; +import fr.ifremer.wao.entity.WaoUser; import fr.ifremer.wao.io.csv2.Common; import fr.ifremer.wao.io.csv2.ExportModel; import fr.ifremer.wao.io.csv2.ExportableColumn; @@ -32,14 +35,17 @@ import fr.ifremer.wao.io.csv2.ModelBuilder; import fr.ifremer.wao.io.csv2.ValueGetterSetter; import fr.ifremer.wao.io.csv2.ValueParserFormatter; +import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.text.ParseException; import java.util.Collection; import java.util.HashMap; +import java.util.LinkedList; import java.util.List; import java.util.Map; +import java.util.Set; /** * @@ -51,17 +57,44 @@ static class ObservationUnitParserFormatter implements ValueParserFormatter<TerrestrialDivision> { - protected Map<String, Map<String, TerrestrialDivision>> observationUnits; + protected Map<String, Map<String, TerrestrialDivision>> indexedObservationUnits; + protected List<TerrestrialDivision> observationUnits; + protected String currentRegionCode; - ObservationUnitParserFormatter(Map<String, Map<String, TerrestrialDivision>> observationUnits) { + ObservationUnitParserFormatter(List<TerrestrialDivision> observationUnits) { this.observationUnits = observationUnits; } + protected void indexObservationUnits(List<TerrestrialDivision> observationUnits) { + indexedObservationUnits = new HashMap<String, Map<String, TerrestrialDivision>>(); + for (TerrestrialDivision terrestrialDivision : observationUnits) { + String regionCode = terrestrialDivision.getRegionIfremerCode(); + Map<String, TerrestrialDivision> unitCodesToDivision = indexedObservationUnits.get(regionCode); + if (unitCodesToDivision == null) { + unitCodesToDivision = new HashMap<String, TerrestrialDivision>(); + } + unitCodesToDivision.put(terrestrialDivision.getObservationUnitCode(), terrestrialDivision); + indexedObservationUnits.put(regionCode, unitCodesToDivision); + } + + if (log.isDebugEnabled()) { + for (Map.Entry<String, Map<String, TerrestrialDivision>> entry : indexedObservationUnits.entrySet()) { + log.debug(entry.getKey()); + for (Map.Entry<String, TerrestrialDivision> unitCodesToDivision : entry.getValue().entrySet()) { + log.debug(" -> " + unitCodesToDivision.getKey() + " -> " + unitCodesToDivision.getValue()); + } + } + } + } + @Override public TerrestrialDivision parse(String observationUnitCode) throws ParseException { - Map<String, TerrestrialDivision> uos = observationUnits.get(currentRegionCode); + if (indexedObservationUnits == null) { + indexObservationUnits(observationUnits); + } + Map<String, TerrestrialDivision> uos = indexedObservationUnits.get(currentRegionCode); if (uos == null) { throw new IllegalArgumentException("Le code de région '" + currentRegionCode + "' n'est pas un code valide"); @@ -109,19 +142,55 @@ } } - /** region ifremer code -> UO code -> TerrestrialDivision */ - protected Map<String, Map<String, TerrestrialDivision>> indexedObservationUnits; + static class UsersParserFormatter implements ValueParserFormatter<List<WaoUser>> { + protected static final String SEPARATOR = ","; + + /** all waoUsers in the database when import was started, indexed by logins */ + protected Map<String, WaoUser> allWaoUsers; + + @Override + public String format(List<WaoUser> value) { + Set<String> usersLogin = WaoUtils.<String, WaoUser> projectPropertyUnique(value, WaoUser.PROPERTY_LOGIN).keySet(); + String commaSeparatedLogins = StringUtils.join(usersLogin, ", "); + return commaSeparatedLogins; + } + + @Override + public List<WaoUser> parse(String value) throws ParseException { + String[] logins = StringUtils.split(value, SEPARATOR); + List<WaoUser> users = new LinkedList<WaoUser>(); + for (String login : logins) { + String trimmedLogin = login.trim(); + WaoUser user = allWaoUsers.get(trimmedLogin); + if (user == null) { + throw new IllegalArgumentException("il n'y a pas d'utilisateur avec l'identifiant '" + login + "'"); + } + users.add(user); + } + return users; + } + } + + protected List<TerrestrialDivision> observationUnits; + + protected List<WaoUser> allWaoUsers; + + protected ConnectedUser connectedUser; + protected ModelBuilder<SampleRow> modelBuilder; - /** Constructor used for export */ - public SamplingPlanImportExportModel() { + /** Constructor used for import */ + public SamplingPlanImportExportModel(ConnectedUser connectedUser, + List<TerrestrialDivision> observationUnits, List<WaoUser> allWaoUsers) { + this.connectedUser = connectedUser; + this.allWaoUsers = allWaoUsers; + this.observationUnits = observationUnits; buildModel(); } - /** Constructor used for import */ - public SamplingPlanImportExportModel(List<TerrestrialDivision> observationUnits) { - indexObservationUnits(observationUnits); + /** Constructor used for export */ + public SamplingPlanImportExportModel() { buildModel(); } @@ -142,37 +211,18 @@ return newSampleRow; } - protected void indexObservationUnits(List<TerrestrialDivision> observationUnits) { - indexedObservationUnits = new HashMap<String, Map<String, TerrestrialDivision>>(); - for (TerrestrialDivision terrestrialDivision : observationUnits) { - String regionCode = terrestrialDivision.getRegionIfremerCode(); - Map<String, TerrestrialDivision> unitCodesToDivision = indexedObservationUnits.get(regionCode); - if (unitCodesToDivision == null) { - unitCodesToDivision = new HashMap<String, TerrestrialDivision>(); - } - unitCodesToDivision.put(terrestrialDivision.getObservationUnitCode(), terrestrialDivision); - indexedObservationUnits.put(regionCode, unitCodesToDivision); - } - - if (log.isDebugEnabled()) { - for (Map.Entry<String, Map<String, TerrestrialDivision>> entry : indexedObservationUnits.entrySet()) { - log.debug(entry.getKey()); - for (Map.Entry<String, TerrestrialDivision> unitCodesToDivision : entry.getValue().entrySet()) { - log.debug(" -> " + unitCodesToDivision.getKey() + " -> " + unitCodesToDivision.getValue()); - } - } - } - } - protected void buildModel() { modelBuilder = new ModelBuilder<SampleRow>(); modelBuilder.newColumnForImportExport("PLAN_CODE", SampleRow.PROPERTY_CODE); modelBuilder.newColumnForImportExport("OBSERVATEUR_COD", SampleRow.PROPERTY_GROUP_NAME); modelBuilder.newColumnForImportExport("OBSERVATION_DATE", SampleRow.PROPERTY_DAY, Common.DAY); - ObservationUnitParserFormatter observationUnitParser = new ObservationUnitParserFormatter(indexedObservationUnits); + ObservationUnitParserFormatter observationUnitParser = new ObservationUnitParserFormatter(observationUnits); ValueGetterSetter<SampleRow, String> regionCodeGetterSetter = new RegionCodeSetter(observationUnitParser); modelBuilder.newColumnForImportExport("REGION_IFREMER_COD", regionCodeGetterSetter); modelBuilder.newColumnForImportExport("UNITE_OBSERVATION_COD", SampleRow.PROPERTY_OBSERVATION_UNIT, observationUnitParser); +// if (connectedUser.isCoordinator()) { +// modelBuilder.newColumnForImportExport("OBSERVATEURS", SampleRow.PROPERTY_OBSERVERS, new UsersParserFormatter()); +// } } @Override Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2011-03-14 17:19:34 UTC (rev 1062) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2011-03-15 15:40:11 UTC (rev 1063) @@ -70,6 +70,7 @@ import fr.ifremer.wao.entity.TerrestrialDivisionDAO; import fr.ifremer.wao.entity.TerrestrialLocation; import fr.ifremer.wao.entity.WaoUser; +import fr.ifremer.wao.entity.WaoUserDAO; import fr.ifremer.wao.io.ImportRefusedException; import fr.ifremer.wao.io.ImportResults; import fr.ifremer.wao.io.ImportResultsImpl; @@ -80,6 +81,7 @@ import fr.ifremer.wao.io.csv2.Export; import fr.ifremer.wao.io.csv2.ExportModel; import fr.ifremer.wao.io.csv2.Import; +import fr.ifremer.wao.io.csv2.ImportModel; import fr.ifremer.wao.io.csv2.models.SamplingPlanImportExportModel; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.io.IOUtils; @@ -318,7 +320,9 @@ Binder<SampleRow, SampleRow> sampleRowBinder = BinderFactory.newBinder(SampleRow.class); sampleRowBinder.copyExcluding(row, oldRow, SampleRow.TOPIA_ID, SampleRow.TOPIA_VERSION, SampleRow.TOPIA_CREATE_DATE, // old logs (whole historic) is kept by not erasing this property - SampleRow.PROPERTY_SAMPLE_ROW_LOG); + SampleRow.PROPERTY_SAMPLE_ROW_LOG, + // FIXME bleny 20110315 should not be excluded + SampleRow.PROPERTY_OBSERVERS); if (rowLog.getTopiaId() == null) { context.prepareTopiaId(SampleRowLog.class, rowLog); @@ -1050,15 +1054,19 @@ ImportResults result = new ImportResultsImpl(); if (ObsProgram.OBSDEB.equals(obsProgram)) { + TerrestrialDivisionDAO terrestrialDivisionDAO = WaoDAOHelper.getTerrestrialDivisionDAO(transaction); - List<TerrestrialDivision> observationUnits = terrestrialDivisionDAO.findAllByPort(null); + WaoUserDAO waoUserDAO = WaoDAOHelper.getWaoUserDAO(transaction); + List<WaoUser> waoUsers = waoUserDAO.findAllByActive(true); + if (observationUnits.isEmpty()) { throw new IllegalStateException("Le référentiel de stratification n'a pas été importé"); } - SamplingPlanImportExportModel samplingPlanImportModel = new SamplingPlanImportExportModel(observationUnits); + ImportModel<SampleRow> samplingPlanImportModel = + new SamplingPlanImportExportModel(connectedUser, observationUnits, waoUsers); try { Import<SampleRow> samplingPlanImport = new Import<SampleRow>(samplingPlanImportModel, input); Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ) Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/io/csv2/ImportTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/io/csv2/ImportTest.java 2011-03-14 17:19:34 UTC (rev 1062) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/io/csv2/ImportTest.java 2011-03-15 15:40:11 UTC (rev 1063) @@ -29,6 +29,7 @@ import fr.ifremer.wao.io.csv2.models.TerrestrialLocationImportModel; import org.apache.commons.io.IOUtils; import org.junit.Assert; +import org.junit.Ignore; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -81,6 +82,7 @@ } @Test + @Ignore("not yet implemented") public void testImportSamplingPlan() throws IOException { TerrestrialDivision uo07 = new TerrestrialDivisionImpl(); @@ -94,7 +96,7 @@ terrestrialDivisions.add(uo07); terrestrialDivisions.add(uo87); - ImportModel<SampleRow> model = new SamplingPlanImportExportModel(terrestrialDivisions); + ImportModel<SampleRow> model = new SamplingPlanImportExportModel(null, terrestrialDivisions, null); InputStream input = null; try { input = getClass().getResourceAsStream("/import/samplingPlan-obsdeb.csv"); Modified: trunk/wao-ui/src/main/resources/i18n/wao-ui_fr_FR.properties =================================================================== --- trunk/wao-ui/src/main/resources/i18n/wao-ui_fr_FR.properties 2011-03-14 17:19:34 UTC (rev 1062) +++ trunk/wao-ui/src/main/resources/i18n/wao-ui_fr_FR.properties 2011-03-15 15:40:11 UTC (rev 1063) @@ -1,202 +1,202 @@ wao.ui.action.acceptContact=Valider le contact wao.ui.action.add=Ajouter -wao.ui.action.addNewContactFromBoat=Cr\u00e9er un nouveau contact pour ce navire et la ligne s\u00e9lectionn\u00e9e dans les filtres -wao.ui.action.back=Revenier \u00e0 l'\u00e9cran pr\u00e9c\u00e9dent +wao.ui.action.addNewContactFromBoat=Cr\u00E9er un nouveau contact pour ce navire et la ligne s\u00E9lectionn\u00E9e dans les filtres +wao.ui.action.back=Revenier \u00E0 l'\u00E9cran pr\u00E9c\u00E9dent wao.ui.action.cancel=Annuler wao.ui.action.changeLocale=Changer de langue wao.ui.action.contactAdmin=Contacter un responsable ObsMer -wao.ui.action.create=Cr\u00e9er -wao.ui.action.createCompany=Cr\u00e9er une soci\u00e9t\u00e9 -wao.ui.action.createUser=Cr\u00e9er un utilisateur +wao.ui.action.create=Cr\u00E9er +wao.ui.action.createCompany=Cr\u00E9er une soci\u00E9t\u00E9 +wao.ui.action.createUser=Cr\u00E9er un utilisateur wao.ui.action.delete=Supprimer -wao.ui.action.deleteCompany=Supprimer la soci\u00e9t\u00e9 -wao.ui.action.deleteCompany.confirm=\u00cates-vous s\u00fbr de vouloir supprimer la soci\u00e9t\u00e9 ? +wao.ui.action.deleteCompany=Supprimer la soci\u00E9t\u00E9 +wao.ui.action.deleteCompany.confirm=\u00CAtes-vous s\u00FBr de vouloir supprimer la soci\u00E9t\u00E9 ? wao.ui.action.deleteContact=Supprimer le contact -wao.ui.action.deleteContact.confirm=\u00cates-vous s\u00fbr de vouloir supprimer d\u00e9finitivement ce contact ? +wao.ui.action.deleteContact.confirm=\u00CAtes-vous s\u00FBr de vouloir supprimer d\u00E9finitivement ce contact ? wao.ui.action.deleteNews=Supprimer la nouvelle -wao.ui.action.deleteNews.confirm=\u00cates-vous s\u00fbr de vouloir supprimer d\u00e9finitivement cette nouvelle ? +wao.ui.action.deleteNews.confirm=\u00CAtes-vous s\u00FBr de vouloir supprimer d\u00E9finitivement cette nouvelle ? wao.ui.action.deleteSampleRow=Supprimer la ligne du plan -wao.ui.action.deleteSampleRow.confirm=\u00cates-vous s\u00fbr de vouloir supprimer la ligne %s du plan ? +wao.ui.action.deleteSampleRow.confirm=\u00CAtes-vous s\u00FBr de vouloir supprimer la ligne %s du plan ? wao.ui.action.deleteUser=Supprimer l'utilisateur -wao.ui.action.deleteUser.confirm=\u00cates-vous s\u00fbr de vouloir supprimer l'utilisateur ? +wao.ui.action.deleteUser.confirm=\u00CAtes-vous s\u00FBr de vouloir supprimer l'utilisateur ? wao.ui.action.edit=Modifier wao.ui.action.enlargeView=Agrandir la vue -wao.ui.action.exportBoats=Exporter les $s navires avec leurs informations priv\u00e9es +wao.ui.action.exportBoats=Exporter les $s navires avec leurs informations priv\u00E9es wao.ui.action.filter=Filtrer wao.ui.action.hideFilters=Masquer les filtres wao.ui.action.login=Connexion -wao.ui.action.logout=D\u00e9connexion -wao.ui.action.reduceView=R\u00e9duire la vue -wao.ui.action.refresh=Rafra\u00eechir +wao.ui.action.logout=D\u00E9connexion +wao.ui.action.reduceView=R\u00E9duire la vue +wao.ui.action.refresh=Rafra\u00EEchir wao.ui.action.refuseContact=Refuser le contact wao.ui.action.remove=Retirer -wao.ui.action.resetFields=Remettre le formulaire \u00e0 z\u00e9ro +wao.ui.action.resetFields=Remettre le formulaire \u00E0 z\u00E9ro wao.ui.action.revert=Annuler wao.ui.action.runExport=Lancer l'export wao.ui.action.runImport=Lancer l'import wao.ui.action.runSearch=Lancer la recherche wao.ui.action.save=Enregistrer -wao.ui.action.showDetails=Voir les d\u00e9tails +wao.ui.action.showDetails=Voir les d\u00E9tails wao.ui.action.showFilters=Afficher les filtres wao.ui.action.unvalidateContact=Invalider le contact wao.ui.action.viewIndicatorsHistory=Voir l'historique des modifications des indicateurs wao.ui.boatList=Liste de %s navires wao.ui.boatinfo.title=Informations sur %s -wao.ui.boats.associatedLine=Ligne(s) du plan associ\u00e9e(s) \u00e0 ce navire -wao.ui.boats.nbObservations=%s observation(s) dont %s avec votre soci\u00e9t\u00e9 -wao.ui.cartography.help=Cliquez sur les graphiques pour avoir le d\u00e9tail. -wao.ui.cartography.title=R\u00e9partition des contacts par quartier des navires -wao.ui.cartography.title.company=R\u00e9partition des contacts par quartier des navires pour la soci\u00e9t\u00e9 %s +wao.ui.boats.associatedLine=Ligne(s) du plan associ\u00E9e(s) \u00E0 ce navire +wao.ui.boats.nbObservations=%s observation(s) dont %s avec votre soci\u00E9t\u00E9 +wao.ui.cartography.help=Cliquez sur les graphiques pour avoir le d\u00E9tail. +wao.ui.cartography.title=R\u00E9partition des contacts par quartier des navires +wao.ui.cartography.title.company=R\u00E9partition des contacts par quartier des navires pour la soci\u00E9t\u00E9 %s wao.ui.chart.boardingsSince=Nombre de sollicitations depuis le %s wao.ui.chart.numberBoats=Nb navires wao.ui.chart.numberObservations=Nb observations wao.ui.chart.numberOfBoatsWithBoardings=Nombre de navires avec x embarquements -wao.ui.contact.lastContact=Derni\u00e8re observation concernant ce navire pour votre soci\u00e9t\u00e9 (tous programmes confondus) -wao.ui.contacts.createFromBoat=Cr\u00e9er un nouveau contact pour ce navire et cette ligne du plan -wao.ui.contacts.createFromBoat.fail=Cr\u00e9ation d'un nouveau contact impossible -wao.ui.contacts.createFromBoat.warn=Attention \: cette ligne du plan est arriv\u00e9e \u00e0 \u00e9ch\u00e9ance, \u00eates-vous s\u00fbr de vouloir cr\u00e9er un nouveau contact ? -wao.ui.disclaimer=Le site de \u00ab SUIVI DU REALISE DU PLAN D'ECHANTILLONNAGE DES OBSERVATIONS A LA MER \u00bb a fait l'objet d'une d\u00e9claration \u00e0 la CNIL sous le num\u00e9ro suivant \: 1414476 -wao.ui.disclaimer.boats=Les donn\u00e9es saisies dans cette page sont la propri\u00e9t\u00e9 exclusive de la soci\u00e9t\u00e9. En dehors de la soci\u00e9t\u00e9, seul l'administrateur peut les consulter pour des questions de maintenance sur le site. L'administrateur est une personne de l'Ifremer. +wao.ui.contact.lastContact=Derni\u00E8re observation concernant ce navire pour votre soci\u00E9t\u00E9 (tous programmes confondus) +wao.ui.contacts.createFromBoat=Cr\u00E9er un nouveau contact pour ce navire et cette ligne du plan +wao.ui.contacts.createFromBoat.fail=Cr\u00E9ation d'un nouveau contact impossible +wao.ui.contacts.createFromBoat.warn=Attention \: cette ligne du plan est arriv\u00E9e \u00E0 \u00E9ch\u00E9ance, \u00EAtes-vous s\u00FBr de vouloir cr\u00E9er un nouveau contact ? +wao.ui.disclaimer=Le site de \u00AB SUIVI DU REALISE DU PLAN D'ECHANTILLONNAGE DES OBSERVATIONS A LA MER \u00BB a fait l'objet d'une d\u00E9claration \u00E0 la CNIL sous le num\u00E9ro suivant \: 1414476 +wao.ui.disclaimer.boats=Les donn\u00E9es saisies dans cette page sont la propri\u00E9t\u00E9 exclusive de la soci\u00E9t\u00E9. En dehors de la soci\u00E9t\u00E9, seul l'administrateur peut les consulter pour des questions de maintenance sur le site. L'administrateur est une personne de l'Ifremer. wao.ui.email=Adresse e-mail wao.ui.entity.Boat=Navire wao.ui.entity.Boats=Navires -wao.ui.entity.Company=Soci\u00e9t\u00e9 +wao.ui.entity.Company=Soci\u00E9t\u00E9 wao.ui.entity.Contact=Contact -wao.ui.entity.FishingZone=Zones de p\u00eache -wao.ui.entity.SampleRow=Ligne du plan d'\u00e9chantillonnage +wao.ui.entity.FishingZone=Zones de p\u00EAche +wao.ui.entity.SampleRow=Ligne du plan d'\u00E9chantillonnage wao.ui.entity.TerrestrialLocation=Lieu wao.ui.entity.fishingGearDCF=Engin code DCF -wao.ui.entity.targetSpeciesDCF=Ensembles d'esp\u00e8ces-cible code DCF +wao.ui.entity.targetSpeciesDCF=Ensembles d'esp\u00E8ces-cible code DCF wao.ui.field.Boat.boatLength=Longueur -wao.ui.field.Boat.buildYear=Ann\u00e9e de construction +wao.ui.field.Boat.buildYear=Ann\u00E9e de construction wao.ui.field.Boat.districtCode=Quartier wao.ui.field.Boat.immatriculation=Immatriculation wao.ui.field.Boat.name=Nom wao.ui.field.Boat.shipOwner=Armateur wao.ui.field.BoatDistrict.code=Code quartier -wao.ui.field.BoatInfos.dup=Capacit\u00e9 d'accueil du navire en personnels sp\u00e9cialis\u00e9s +wao.ui.field.BoatInfos.dup=Capacit\u00E9 d'accueil du navire en personnels sp\u00E9cialis\u00E9s wao.ui.field.Company.active=Active wao.ui.field.Company.name=Nom -wao.ui.field.Contact.beginDate=D\u00e9but d'observation +wao.ui.field.Contact.beginDate=D\u00E9but d'observation wao.ui.field.Contact.comment=Commentaire observateur wao.ui.field.Contact.commentAdmin=Commentaire programme wao.ui.field.Contact.commentCoordinator=Commentaire coordinateur -wao.ui.field.Contact.completeSampling=\u00c9chantillonnage complet -wao.ui.field.Contact.contactState=\u00c9tat du contact +wao.ui.field.Contact.completeSampling=\u00C9chantillonnage complet +wao.ui.field.Contact.contactState=\u00C9tat du contact wao.ui.field.Contact.contactStateMotif=Motif du refus wao.ui.field.Contact.contactStateMotifs=Motifs de refus -wao.ui.field.Contact.creationDate=Date de cr\u00e9ation du contact -wao.ui.field.Contact.dataInputDate=Saisie des donn\u00e9es dans Allegro -wao.ui.field.Contact.dataReliability=Qualit\u00e9 des donn\u00e9es +wao.ui.field.Contact.creationDate=Date de cr\u00E9ation du contact +wao.ui.field.Contact.dataInputDate=Saisie des donn\u00E9es dans Allegro +wao.ui.field.Contact.dataReliability=Qualit\u00E9 des donn\u00E9es wao.ui.field.Contact.endDate=Fin d'observation -wao.ui.field.Contact.mainObserver=Observateur r\u00e9f\u00e9rent +wao.ui.field.Contact.mainObserver=Observateur r\u00E9f\u00E9rent wao.ui.field.Contact.mammalsCapture=Capture accidentelle -wao.ui.field.Contact.mammalsInfo=Noms scientifiques et nombres d'individus des esp\u00e8ces captur\u00e9es +wao.ui.field.Contact.mammalsInfo=Noms scientifiques et nombres d'individus des esp\u00E8ces captur\u00E9es wao.ui.field.Contact.mammalsObservation=Observation exceptionnelle wao.ui.field.Contact.nbObservants=Nombre d'observateurs -wao.ui.field.Contact.samplingStrategy=Strat\u00e9gie d'\u00e9chantillonnage suivie +wao.ui.field.Contact.samplingStrategy=Strat\u00E9gie d'\u00E9chantillonnage suivie wao.ui.field.Contact.secondaryObservers=Observateurs wao.ui.field.Contact.terrestrialLocation=Lieu d'observation -wao.ui.field.Contact.validationCompany=Validation soci\u00e9t\u00e9 +wao.ui.field.Contact.validationCompany=Validation soci\u00E9t\u00E9 wao.ui.field.Contact.validationProgram=Validation programme -wao.ui.field.FishingZone.facadeName=Fa\u00e7ade +wao.ui.field.FishingZone.facadeName=Fa\u00E7ade wao.ui.field.FishingZone.sectorName=Zone wao.ui.field.SampleRow.code=Code ligne wao.ui.field.SampleRow.comment=Commentaire wao.ui.field.SampleRow.dCF5Code=Codes wao.ui.field.SampleRow.day=Jour wao.ui.field.SampleRow.dcf5Code=Code DCF Niv. 5 -wao.ui.field.SampleRow.fishingZones=Zone(s) de p\u00eache -wao.ui.field.SampleRow.libelle=Libell\u00e9 +wao.ui.field.SampleRow.fishingZones=Zone(s) de p\u00EAche +wao.ui.field.SampleRow.libelle=Libell\u00E9 wao.ui.field.SampleRow.meshSize=Maillage -wao.ui.field.SampleRow.observationUnit=Unit\u00e9 d'observation +wao.ui.field.SampleRow.observationUnit=Unit\u00E9 d'observation wao.ui.field.SampleRow.other=Autre -wao.ui.field.SampleRow.periodBegin=D\u00e9but +wao.ui.field.SampleRow.periodBegin=D\u00E9but wao.ui.field.SampleRow.periodEnd=Fin -wao.ui.field.SampleRow.profession=M\u00e9tier -wao.ui.field.SampleRow.professionCode=Code m\u00e9tier +wao.ui.field.SampleRow.profession=M\u00E9tier +wao.ui.field.SampleRow.professionCode=Code m\u00E9tier wao.ui.field.SampleRow.programName=Programme -wao.ui.field.SampleRow.samplingStrategy=Strat\u00e9gie d'\u00e9chantillonnage +wao.ui.field.SampleRow.samplingStrategy=Strat\u00E9gie d'\u00E9chantillonnage wao.ui.field.SampleRow.size=Taille du navire -wao.ui.field.SampleRow.species=Esp\u00e8ces cibles +wao.ui.field.SampleRow.species=Esp\u00E8ces cibles wao.ui.field.SampleRow.terrestrialLocation=Quartier maritime wao.ui.field.SampleRow.terrestrialLocationInfos=Autre(s) info(s) -wao.ui.field.User.firstName=Pr\u00e9nom +wao.ui.field.User.firstName=Pr\u00E9nom wao.ui.field.User.lastName=Nom wao.ui.field.User.login=Identifiant -wao.ui.field.UserProfile.userRole=R\u00f4le +wao.ui.field.UserProfile.userRole=R\u00F4le wao.ui.field.WaoUser.login=Identifiant wao.ui.field.WaoUser.mammalsNotifications=Recevoir les notifications de captures accidentelles wao.ui.field.WaoUser.password=Mot de passe wao.ui.filters.filters=Filtres de recherche -wao.ui.filters.refresh=Rafra\u00eechir les champs du filtre -wao.ui.forgotPassword=Mot de passe oubli\u00e9 ? -wao.ui.form.SampleRow.boatsDescription=Ce champs correspond aux immatriculations des navires qui sont \u00e9ligibles pour cette ligne. Vous pouvez utiliser n'importe quel s\u00e9parateur pour s\u00e9parer les immatriculations (virgule, point, espace ou saut de ligne) -wao.ui.form.SampleRow.missingBeginDate=Date de d\u00e9but manquante pour g\u00e9n\u00e9rer le code de la ligne \! -wao.ui.form.SampleRow.others=Autres donn\u00e9es de la ligne d'\u00e9chantillonnage +wao.ui.filters.refresh=Rafra\u00EEchir les champs du filtre +wao.ui.forgotPassword=Mot de passe oubli\u00E9 ? +wao.ui.form.SampleRow.boatsDescription=Ce champs correspond aux immatriculations des navires qui sont \u00E9ligibles pour cette ligne. Vous pouvez utiliser n'importe quel s\u00E9parateur pour s\u00E9parer les immatriculations (virgule, point, espace ou saut de ligne) +wao.ui.form.SampleRow.missingBeginDate=Date de d\u00E9but manquante pour g\u00E9n\u00E9rer le code de la ligne \! +wao.ui.form.SampleRow.others=Autres donn\u00E9es de la ligne d'\u00E9chantillonnage wao.ui.form.SampleRow.program=Programme de rattachement et effort d'observation par mois wao.ui.form.addComment=Ajouter un commentaire -wao.ui.form.addRole=Ajouter ce r\u00f4le +wao.ui.form.addRole=Ajouter ce r\u00F4le wao.ui.form.boardingFrom=Sollicitations du navire depuis le wao.ui.form.contactsFile=Fichier des contacts -wao.ui.form.definePasswordManually=d\u00e9finir manuellement +wao.ui.form.definePasswordManually=d\u00E9finir manuellement wao.ui.form.editComment=Commentaire sur la modification wao.ui.form.editionAuthor=Auteur de la modification -wao.ui.form.estimatedTides=Voir l'effort d'observations estim\u00e9 -wao.ui.form.estimatedTides.description=L'effort d'observations estim\u00e9 \u00e9quivaut au nombre de contacts valid\u00e9s ou non par la soci\u00e9t\u00e9. Les contacts refus\u00e9s par le programme ne sont pas pris en compte. -wao.ui.form.generatePassword=G\u00e9n\u00e9rer le mot de passe +wao.ui.form.estimatedTides=Voir l'effort d'observations estim\u00E9 +wao.ui.form.estimatedTides.description=L'effort d'observations estim\u00E9 \u00E9quivaut au nombre de contacts valid\u00E9s ou non par la soci\u00E9t\u00E9. Les contacts refus\u00E9s par le programme ne sont pas pris en compte. +wao.ui.form.generatePassword=G\u00E9n\u00E9rer le mot de passe wao.ui.form.otherBoatInfos=Autres informations sur le navire -wao.ui.form.period=P\u00e9riode +wao.ui.form.period=P\u00E9riode wao.ui.form.period.from=du wao.ui.form.period.to=au -wao.ui.form.periodFrom=P\u00e9riode du -wao.ui.form.periodFromTo=P\u00e9riode du %s au %s +wao.ui.form.periodFrom=P\u00E9riode du +wao.ui.form.periodFromTo=P\u00E9riode du %s au %s wao.ui.form.program=Programme -wao.ui.form.programEvaluation=\u00c9valuation programme +wao.ui.form.programEvaluation=\u00C9valuation programme wao.ui.form.readOnly=lecture seule wao.ui.form.removeRole=retirer ce role -wao.ui.form.repeatPassword=R\u00e9p\u00e9ter le mot de passe -wao.ui.form.roles=R\u00f4les -wao.ui.form.sortByTideBegin=Trier par date de d\u00e9but d'observation (du plus r\u00e9cent au plus ancien) -wao.ui.import.activityCalendarImportLabel=de l'import des calendriers d'activit\u00e9 -wao.ui.import.activityCalendarImportRunning=Import des calendriers d'activit\u00e9 en cours. Vous pouvez continuer \u00e0 naviguer sur le site en attendant la fin du chargement. -wao.ui.import.activityCalendarLabel=des calendriers d'activit\u00e9 -wao.ui.import.activityCalendarUserAccessesLabel=des acc\u00e8s utilisateurs aux calendriers d'activit\u00e9 -wao.ui.import.boatDistrictLabel=des coordonn\u00e9es des quartiers des navires +wao.ui.form.repeatPassword=R\u00E9p\u00E9ter le mot de passe +wao.ui.form.roles=R\u00F4les +wao.ui.form.sortByTideBegin=Trier par date de d\u00E9but d'observation (du plus r\u00E9cent au plus ancien) +wao.ui.import.activityCalendarImportLabel=de l'import des calendriers d'activit\u00E9 +wao.ui.import.activityCalendarImportRunning=Import des calendriers d'activit\u00E9 en cours. Vous pouvez continuer \u00E0 naviguer sur le site en attendant la fin du chargement. +wao.ui.import.activityCalendarLabel=des calendriers d'activit\u00E9 +wao.ui.import.activityCalendarUserAccessesLabel=des acc\u00E8s utilisateurs aux calendriers d'activit\u00E9 +wao.ui.import.boatDistrictLabel=des coordonn\u00E9es des quartiers des navires wao.ui.import.boatsLabel=des navires wao.ui.import.description=Fichier %s %s \: -wao.ui.import.fishingZoneLabel=des zones de p\u00eaches +wao.ui.import.fishingZoneLabel=des zones de p\u00EAches wao.ui.import.fullDescription=Import %s (format %s avec encodage UTF-8) wao.ui.import.longTitle=Import/Export CSV (UTF-8) -wao.ui.import.samplingPlanLabel=du plan d'\u00e9chantillonnage -wao.ui.import.terrestrialDivisionsLabel=du r\u00e9f\u00e9rentiel de stratification spatiale (ObsDeb) +wao.ui.import.samplingPlanLabel=du plan d'\u00E9chantillonnage +wao.ui.import.terrestrialDivisionsLabel=du r\u00E9f\u00E9rentiel de stratification spatiale (ObsDeb) wao.ui.import.terrestrialLocationsLabel=des lieux terrestres wao.ui.import.title=Import %s wao.ui.indicator.andMore=%s et plus wao.ui.indicator.bounds=Bornes -wao.ui.indicator.coefficient=Pond\u00e9ration +wao.ui.indicator.coefficient=Pond\u00E9ration wao.ui.indicator.editions=Modifications wao.ui.indicator.indicator=Indicateur -wao.ui.indicator.legend=En jaune, la position actuelle de la soci\u00e9t\u00e9 selon cet indicateur. +wao.ui.indicator.legend=En jaune, la position actuelle de la soci\u00E9t\u00E9 selon cet indicateur. wao.ui.indicator.levels=Niveaux -wao.ui.indicator.useRightDecimalSymbol=Attention \u00e0 bien utiliser ',' et non '.' pour les d\u00e9cimales +wao.ui.indicator.useRightDecimalSymbol=Attention \u00E0 bien utiliser ',' et non '.' pour les d\u00E9cimales wao.ui.indicators.coefficientsSum=Total coefficient -wao.ui.indicators.title=Indicateurs qualit\u00e9s prestataires +wao.ui.indicators.title=Indicateurs qualit\u00E9s prestataires wao.ui.invalidLogin=Identifiant invalide -wao.ui.layout.userDescription=Vous \u00eates %s de la soci\u00e9t\u00e9 %s (%s) +wao.ui.layout.userDescription=Vous \u00EAtes %s de la soci\u00E9t\u00E9 %s (%s) wao.ui.message.chooseProfile=Choisissez dans la liste votre profil de connexion \: -wao.ui.misc.METIER=M\u00c9TIER -wao.ui.misc.N/A=non renseign\u00e9e -wao.ui.misc.accepted=Accept\u00e9 -wao.ui.misc.advancedSearch=Recherche avanc\u00e9e +wao.ui.misc.METIER=M\u00C9TIER +wao.ui.misc.N/A=non renseign\u00E9e +wao.ui.misc.accepted=Accept\u00E9 +wao.ui.misc.advancedSearch=Recherche avanc\u00E9e wao.ui.misc.by=par wao.ui.misc.changeOn=Modification du wao.ui.misc.comment=Commentaire -wao.ui.misc.commentAddedOn=Commentaire ajout\u00e9 le +wao.ui.misc.commentAddedOn=Commentaire ajout\u00E9 le wao.ui.misc.comments=Commentaires -wao.ui.misc.companies=Soci\u00e9t\u00e9s -wao.ui.misc.createdOnF=Cr\u00e9\u00e9e le -wao.ui.misc.creating=En cours de cr\u00e9ation +wao.ui.misc.companies=Soci\u00E9t\u00E9s +wao.ui.misc.createdOnF=Cr\u00E9\u00E9e le +wao.ui.misc.creating=En cours de cr\u00E9ation wao.ui.misc.export=Export wao.ui.misc.export.longTitle=Export CSV wao.ui.misc.import-export=Import/export @@ -206,7 +206,7 @@ wao.ui.misc.logFile.description=Afficher le fichier de log de %s wao.ui.misc.no=Non wao.ui.misc.noComment=aucun commentaire -wao.ui.misc.notValidated=Non valid\u00e9 +wao.ui.misc.notValidated=Non valid\u00E9 wao.ui.misc.observationReport=Compte-rendu d'observation wao.ui.misc.observations=Observations wao.ui.misc.observer=Observateur @@ -216,69 +216,69 @@ wao.ui.misc.other=Autre wao.ui.misc.otherInfos=Autre information wao.ui.misc.others=Autres -wao.ui.misc.refused=R\u00e9fus\u00e9 +wao.ui.misc.refused=R\u00E9fus\u00E9 wao.ui.misc.since=depuis le wao.ui.misc.total=Total -wao.ui.misc.undefined=Non-d\u00e9fini -wao.ui.misc.validated=Valid\u00e9 +wao.ui.misc.undefined=Non-d\u00E9fini +wao.ui.misc.validated=Valid\u00E9 wao.ui.misc.yes=Oui -wao.ui.nContactsFound=%s contacts trouv\u00e9s +wao.ui.nContactsFound=%s contacts trouv\u00E9s wao.ui.news.content=Texte wao.ui.news.title=Titre wao.ui.page.Administration.title=Administration wao.ui.page.Boats.title=Navires wao.ui.page.Cartography.title=Cartographie -wao.ui.page.ContactForm.mammalsInfo.disclaimer=Attention, toutes les informations saisies seront transmises \u00e0 des personnels ext\u00e9rieurs, soyez riguoureux dans la description de la capture accidentelle +wao.ui.page.ContactForm.mammalsInfo.disclaimer=Attention, toutes les informations saisies seront transmises \u00E0 des personnels ext\u00E9rieurs, soyez riguoureux dans la description de la capture accidentelle wao.ui.page.ContactForm.title=Modification d'un contact wao.ui.page.Contacts.title=Contacts wao.ui.page.Index.title=Accueil -wao.ui.page.SamplingPlan.title=Plan d'\u00e9chantillonnage -wao.ui.page.Synthesis.title=Synth\u00e8se +wao.ui.page.SamplingPlan.title=Plan d'\u00E9chantillonnage +wao.ui.page.Synthesis.title=Synth\u00E8se wao.ui.page.UserProfileForm.title=Gestion du profil -wao.ui.publishedByProgram=Publi\u00e9e par le programme -wao.ui.publishedByYourCompany=Publi\u00e9e par la soci\u00e9t\u00e9 -wao.ui.sampleRow.creation=Cr\u00e9ation d'une ligne du plan d'\u00e9chantillonnage +wao.ui.publishedByProgram=Publi\u00E9e par le programme +wao.ui.publishedByYourCompany=Publi\u00E9e par la soci\u00E9t\u00E9 +wao.ui.sampleRow.creation=Cr\u00E9ation d'une ligne du plan d'\u00E9chantillonnage wao.ui.sampleRow.edition=Modification de la ligne %s wao.ui.sampleRowLog.title=Historique de la ligne %s wao.ui.samplingPlan.actions=Actions -wao.ui.samplingPlan.actual=r\u00e9alis\u00e9 -wao.ui.samplingPlan.addSampleRow=Ajouter une ligne au plan d'\u00e9chantillonnage -wao.ui.samplingPlan.averageTideTime=Dur\u00e9e moyenne d'une mar\u00e9e (J.) -wao.ui.samplingPlan.effort=Effort d'observation en nombre de mar\u00e9es -wao.ui.samplingPlan.estimated=estim\u00e9 -wao.ui.samplingPlan.expected=planifi\u00e9 -wao.ui.samplingPlan.export=Exporter le plan d'\u00e9chantillonnage du %s au %s +wao.ui.samplingPlan.actual=r\u00E9alis\u00E9 +wao.ui.samplingPlan.addSampleRow=Ajouter une ligne au plan d'\u00E9chantillonnage +wao.ui.samplingPlan.averageTideTime=Dur\u00E9e moyenne d'une mar\u00E9e (J.) +wao.ui.samplingPlan.effort=Effort d'observation en nombre de mar\u00E9es +wao.ui.samplingPlan.estimated=estim\u00E9 +wao.ui.samplingPlan.expected=planifi\u00E9 +wao.ui.samplingPlan.export=Exporter le plan d'\u00E9chantillonnage du %s au %s wao.ui.samplingPlan.fishingZoneInfo=Zone autre(s) info(s) wao.ui.samplingPlan.months=Mois wao.ui.samplingPlan.nbObservants=Nb. d'observateurs -wao.ui.samplingPlan.program=Programme ou r\u00e8glement rattachement -wao.ui.samplingPlan.sampledProfessions=M\u00e9tiers \u00e9chantillonn\u00e9s -wao.ui.samplingPlan.showActual=Afficher l'effort d'observations r\u00e9alis\u00e9 pour les contacts valid\u00e9s seulement -wao.ui.samplingPlan.showExpected=Afficher l'effort d'observations estim\u00e9 pour les contacts valid\u00e9s ou non par la soci\u00e9t\u00e9 -wao.ui.samplingPlan.title=Plan d'\u00e9chantillonnage -wao.ui.synthesis.allegroReactivity.description=Ce r\u00e9sultat est une moyenne du nombre de jours entre la date de saisie des donn\u00e9es et la date de fin d'observation. -wao.ui.synthesis.allegroReactivity.title=R\u00e9activit\u00e9 quant \u00e0 la saisie des donn\u00e9es +wao.ui.samplingPlan.program=Programme ou r\u00E8glement rattachement +wao.ui.samplingPlan.sampledProfessions=M\u00E9tiers \u00E9chantillonn\u00E9s +wao.ui.samplingPlan.showActual=Afficher l'effort d'observations r\u00E9alis\u00E9 pour les contacts valid\u00E9s seulement +wao.ui.samplingPlan.showExpected=Afficher l'effort d'observations estim\u00E9 pour les contacts valid\u00E9s ou non par la soci\u00E9t\u00E9 +wao.ui.samplingPlan.title=Plan d'\u00E9chantillonnage +wao.ui.synthesis.allegroReactivity.description=Ce r\u00E9sultat est une moyenne du nombre de jours entre la date de saisie des donn\u00E9es et la date de fin d'observation. +wao.ui.synthesis.allegroReactivity.title=R\u00E9activit\u00E9 quant \u00E0 la saisie des donn\u00E9es wao.ui.synthesis.boarding.boardingCount=Au total, %s observations invalides sur %s observations. -wao.ui.synthesis.boarding.description=Ces r\u00e9sultats ne concernent que les lignes du plan d'\u00e9chantillonnage ayant une dur\u00e9e moyenne de mar\u00e9es inf\u00e9rieure ou \u00e9gale \u00e0 48h. -wao.ui.synthesis.boarding.mostUsedBoat=Navire le plus sollicit\u00e9 avec %s observations (tous programmes confondus) \: %s (%s) +wao.ui.synthesis.boarding.description=Ces r\u00E9sultats ne concernent que les lignes du plan d'\u00E9chantillonnage ayant une dur\u00E9e moyenne de mar\u00E9es inf\u00E9rieure ou \u00E9gale \u00E0 48h. +wao.ui.synthesis.boarding.mostUsedBoat=Navire le plus sollicit\u00E9 avec %s observations (tous programmes confondus) \: %s (%s) wao.ui.synthesis.boarding.title=Sollicitations des navires -wao.ui.synthesis.complianceBoarding.description=Respect du nombre pr\u00e9vu d'observateurs pour chaque mar\u00e9e r\u00e9alis\u00e9e. -wao.ui.synthesis.complianceBoarding.title=Respect du nombre d'observateurs embarqu\u00e9s -wao.ui.synthesis.contactsStates.description=Ces r\u00e9sultats concernent l'ensemble des \u00e9tats des contacts except\u00e9 ceux qui ont \u00e9t\u00e9 refus\u00e9s par le programme. -wao.ui.synthesis.contactsStates.title=\u00c9tats des contacts -wao.ui.synthesis.dataReliability.description=Pourcentage du nombre de mar\u00e9es exploitables par rapport nombre de mar\u00e9e r\u00e9alis\u00e9es. -wao.ui.synthesis.dataReliability.title=Qualit\u00e9 de la donn\u00e9e -wao.ui.synthesis.dataSampling.title=Donn\u00e9es des mar\u00e9es (r\u00e9alis\u00e9 / planifi\u00e9) -wao.ui.synthesis.globalSynthesis.globalResult=Bilan de la synth\u00e8se global -wao.ui.synthesis.globalSynthesis.title=Synth\u00e8se globale -wao.ui.synthesis.globalSynthesis.title.estimated=Synth\u00e8se globale (selon estimations) -wao.ui.synthesis.log.description=Cette page pr\u00e9sente toutes les modifications effectu\u00e9es depuis l'origine qui portent sur les bornes de chaque niveaux ainsi que les coefficients de chaque indicateurs. -wao.ui.synthesis.log.empty=Aucune modification n'a \u00e9t\u00e9 apport\u00e9e \u00e0 ce jour +wao.ui.synthesis.complianceBoarding.description=Respect du nombre pr\u00E9vu d'observateurs pour chaque mar\u00E9e r\u00E9alis\u00E9e. +wao.ui.synthesis.complianceBoarding.title=Respect du nombre d'observateurs embarqu\u00E9s +wao.ui.synthesis.contactsStates.description=Ces r\u00E9sultats concernent l'ensemble des \u00E9tats des contacts except\u00E9 ceux qui ont \u00E9t\u00E9 refus\u00E9s par le programme. +wao.ui.synthesis.contactsStates.title=\u00C9tats des contacts +wao.ui.synthesis.dataReliability.description=Pourcentage du nombre de mar\u00E9es exploitables par rapport nombre de mar\u00E9e r\u00E9alis\u00E9es. +wao.ui.synthesis.dataReliability.title=Qualit\u00E9 de la donn\u00E9e +wao.ui.synthesis.dataSampling.title=Donn\u00E9es des mar\u00E9es (r\u00E9alis\u00E9 / planifi\u00E9) +wao.ui.synthesis.globalSynthesis.globalResult=Bilan de la synth\u00E8se global +wao.ui.synthesis.globalSynthesis.title=Synth\u00E8se globale +wao.ui.synthesis.globalSynthesis.title.estimated=Synth\u00E8se globale (selon estimations) +wao.ui.synthesis.log.description=Cette page pr\u00E9sente toutes les modifications effectu\u00E9es depuis l'origine qui portent sur les bornes de chaque niveaux ainsi que les coefficients de chaque indicateurs. +wao.ui.synthesis.log.empty=Aucune modification n'a \u00E9t\u00E9 apport\u00E9e \u00E0 ce jour wao.ui.synthesis.log.entry.author=Auteur de la modification -wao.ui.synthesis.log.entry.comment=Commentaire associ\u00e9 +wao.ui.synthesis.log.entry.comment=Commentaire associ\u00E9 wao.ui.synthesis.log.entry.date=Date de la modification -wao.ui.synthesis.log.entry.summary=Modifications effectu\u00e9es -wao.ui.synthesis.log.title=Historique des modifications des param\u00e8tres de la synth\u00e8se globale -wao.ui.unavailableOperation=Op\u00e9ration non-disponible +wao.ui.synthesis.log.entry.summary=Modifications effectu\u00E9es +wao.ui.synthesis.log.title=Historique des modifications des param\u00E8tres de la synth\u00E8se globale +wao.ui.unavailableOperation=Op\u00E9ration non-disponible wao.ui.userList=Liste des utilisateurs wao.ui.validLogin=Identifiant valide

1 0

[Suiviobsmer-commits] r1062 - in trunk/wao-ui/src/main: java/fr/ifremer/wao/ui/pages resources/i18n
by bleny＠users.labs.libre-entreprise.org 14 Mar '11

14 Mar '11

Author: bleny Date: 2011-03-14 17:19:34 +0000 (Mon, 14 Mar 2011) New Revision: 1062 Log: fix missing i18n value Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java trunk/wao-ui/src/main/resources/i18n/wao-ui_en_GB.properties trunk/wao-ui/src/main/resources/i18n/wao-ui_fr_FR.properties Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java 2011-03-14 13:48:04 UTC (rev 1061) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java 2011-03-14 17:19:34 UTC (rev 1062) @@ -327,7 +327,7 @@ data.put(realText, res.get(1)); String title = manager.getDataSamplingTitle(getFilter()); return ChartUtils.createCategoryChart(title, messages.get(n_("wao.ui.chart.numberObservations")), - messages.get("wao.ui.samplingPlan.months"), getDataSamplingChartType(), data); + messages.get(n_("wao.ui.samplingPlan.months")), getDataSamplingChartType(), data); } public ChartType getDataSamplingChartType() { Modified: trunk/wao-ui/src/main/resources/i18n/wao-ui_en_GB.properties =================================================================== --- trunk/wao-ui/src/main/resources/i18n/wao-ui_en_GB.properties 2011-03-14 13:48:04 UTC (rev 1061) +++ trunk/wao-ui/src/main/resources/i18n/wao-ui_en_GB.properties 2011-03-14 17:19:34 UTC (rev 1062) @@ -249,6 +249,7 @@ wao.ui.samplingPlan.expected=expected wao.ui.samplingPlan.export=Export the sampling plan from %s to %s wao.ui.samplingPlan.fishingZoneInfo=Fishing Zone others infos +wao.ui.samplingPlan.months=Months wao.ui.samplingPlan.nbObservants=Nb. observers wao.ui.samplingPlan.program=program wao.ui.samplingPlan.sampledProfessions=Sampled professions Modified: trunk/wao-ui/src/main/resources/i18n/wao-ui_fr_FR.properties =================================================================== --- trunk/wao-ui/src/main/resources/i18n/wao-ui_fr_FR.properties 2011-03-14 13:48:04 UTC (rev 1061) +++ trunk/wao-ui/src/main/resources/i18n/wao-ui_fr_FR.properties 2011-03-14 17:19:34 UTC (rev 1062) @@ -1,202 +1,202 @@ wao.ui.action.acceptContact=Valider le contact wao.ui.action.add=Ajouter -wao.ui.action.addNewContactFromBoat=Cr\u00E9er un nouveau contact pour ce navire et la ligne s\u00E9lectionn\u00E9e dans les filtres -wao.ui.action.back=Revenier \u00E0 l'\u00E9cran pr\u00E9c\u00E9dent +wao.ui.action.addNewContactFromBoat=Cr\u00e9er un nouveau contact pour ce navire et la ligne s\u00e9lectionn\u00e9e dans les filtres +wao.ui.action.back=Revenier \u00e0 l'\u00e9cran pr\u00e9c\u00e9dent wao.ui.action.cancel=Annuler wao.ui.action.changeLocale=Changer de langue wao.ui.action.contactAdmin=Contacter un responsable ObsMer -wao.ui.action.create=Cr\u00E9er -wao.ui.action.createCompany=Cr\u00E9er une soci\u00E9t\u00E9 -wao.ui.action.createUser=Cr\u00E9er un utilisateur +wao.ui.action.create=Cr\u00e9er +wao.ui.action.createCompany=Cr\u00e9er une soci\u00e9t\u00e9 +wao.ui.action.createUser=Cr\u00e9er un utilisateur wao.ui.action.delete=Supprimer -wao.ui.action.deleteCompany=Supprimer la soci\u00E9t\u00E9 -wao.ui.action.deleteCompany.confirm=\u00CAtes-vous s\u00FBr de vouloir supprimer la soci\u00E9t\u00E9 ? +wao.ui.action.deleteCompany=Supprimer la soci\u00e9t\u00e9 +wao.ui.action.deleteCompany.confirm=\u00cates-vous s\u00fbr de vouloir supprimer la soci\u00e9t\u00e9 ? wao.ui.action.deleteContact=Supprimer le contact -wao.ui.action.deleteContact.confirm=\u00CAtes-vous s\u00FBr de vouloir supprimer d\u00E9finitivement ce contact ? +wao.ui.action.deleteContact.confirm=\u00cates-vous s\u00fbr de vouloir supprimer d\u00e9finitivement ce contact ? wao.ui.action.deleteNews=Supprimer la nouvelle -wao.ui.action.deleteNews.confirm=\u00CAtes-vous s\u00FBr de vouloir supprimer d\u00E9finitivement cette nouvelle ? +wao.ui.action.deleteNews.confirm=\u00cates-vous s\u00fbr de vouloir supprimer d\u00e9finitivement cette nouvelle ? wao.ui.action.deleteSampleRow=Supprimer la ligne du plan -wao.ui.action.deleteSampleRow.confirm=\u00CAtes-vous s\u00FBr de vouloir supprimer la ligne %s du plan ? +wao.ui.action.deleteSampleRow.confirm=\u00cates-vous s\u00fbr de vouloir supprimer la ligne %s du plan ? wao.ui.action.deleteUser=Supprimer l'utilisateur -wao.ui.action.deleteUser.confirm=\u00CAtes-vous s\u00FBr de vouloir supprimer l'utilisateur ? +wao.ui.action.deleteUser.confirm=\u00cates-vous s\u00fbr de vouloir supprimer l'utilisateur ? wao.ui.action.edit=Modifier wao.ui.action.enlargeView=Agrandir la vue -wao.ui.action.exportBoats=Exporter les $s navires avec leurs informations priv\u00E9es +wao.ui.action.exportBoats=Exporter les $s navires avec leurs informations priv\u00e9es wao.ui.action.filter=Filtrer wao.ui.action.hideFilters=Masquer les filtres wao.ui.action.login=Connexion -wao.ui.action.logout=D\u00E9connexion -wao.ui.action.reduceView=R\u00E9duire la vue -wao.ui.action.refresh=Rafra\u00EEchir +wao.ui.action.logout=D\u00e9connexion +wao.ui.action.reduceView=R\u00e9duire la vue +wao.ui.action.refresh=Rafra\u00eechir wao.ui.action.refuseContact=Refuser le contact wao.ui.action.remove=Retirer -wao.ui.action.resetFields=Remettre le formulaire \u00E0 z\u00E9ro +wao.ui.action.resetFields=Remettre le formulaire \u00e0 z\u00e9ro wao.ui.action.revert=Annuler wao.ui.action.runExport=Lancer l'export wao.ui.action.runImport=Lancer l'import wao.ui.action.runSearch=Lancer la recherche wao.ui.action.save=Enregistrer -wao.ui.action.showDetails=Voir les d\u00E9tails +wao.ui.action.showDetails=Voir les d\u00e9tails wao.ui.action.showFilters=Afficher les filtres wao.ui.action.unvalidateContact=Invalider le contact wao.ui.action.viewIndicatorsHistory=Voir l'historique des modifications des indicateurs wao.ui.boatList=Liste de %s navires wao.ui.boatinfo.title=Informations sur %s -wao.ui.boats.associatedLine=Ligne(s) du plan associ\u00E9e(s) \u00E0 ce navire -wao.ui.boats.nbObservations=%s observation(s) dont %s avec votre soci\u00E9t\u00E9 -wao.ui.cartography.help=Cliquez sur les graphiques pour avoir le d\u00E9tail. -wao.ui.cartography.title=R\u00E9partition des contacts par quartier des navires -wao.ui.cartography.title.company=R\u00E9partition des contacts par quartier des navires pour la soci\u00E9t\u00E9 %s +wao.ui.boats.associatedLine=Ligne(s) du plan associ\u00e9e(s) \u00e0 ce navire +wao.ui.boats.nbObservations=%s observation(s) dont %s avec votre soci\u00e9t\u00e9 +wao.ui.cartography.help=Cliquez sur les graphiques pour avoir le d\u00e9tail. +wao.ui.cartography.title=R\u00e9partition des contacts par quartier des navires +wao.ui.cartography.title.company=R\u00e9partition des contacts par quartier des navires pour la soci\u00e9t\u00e9 %s wao.ui.chart.boardingsSince=Nombre de sollicitations depuis le %s wao.ui.chart.numberBoats=Nb navires wao.ui.chart.numberObservations=Nb observations wao.ui.chart.numberOfBoatsWithBoardings=Nombre de navires avec x embarquements -wao.ui.contact.lastContact=Derni\u00E8re observation concernant ce navire pour votre soci\u00E9t\u00E9 (tous programmes confondus) -wao.ui.contacts.createFromBoat=Cr\u00E9er un nouveau contact pour ce navire et cette ligne du plan -wao.ui.contacts.createFromBoat.fail=Cr\u00E9ation d'un nouveau contact impossible -wao.ui.contacts.createFromBoat.warn=Attention \: cette ligne du plan est arriv\u00E9e \u00E0 \u00E9ch\u00E9ance, \u00EAtes-vous s\u00FBr de vouloir cr\u00E9er un nouveau contact ? -wao.ui.disclaimer=Le site de \u00AB SUIVI DU REALISE DU PLAN D'ECHANTILLONNAGE DES OBSERVATIONS A LA MER \u00BB a fait l'objet d'une d\u00E9claration \u00E0 la CNIL sous le num\u00E9ro suivant \: 1414476 -wao.ui.disclaimer.boats=Les donn\u00E9es saisies dans cette page sont la propri\u00E9t\u00E9 exclusive de la soci\u00E9t\u00E9. En dehors de la soci\u00E9t\u00E9, seul l'administrateur peut les consulter pour des questions de maintenance sur le site. L'administrateur est une personne de l'Ifremer. +wao.ui.contact.lastContact=Derni\u00e8re observation concernant ce navire pour votre soci\u00e9t\u00e9 (tous programmes confondus) +wao.ui.contacts.createFromBoat=Cr\u00e9er un nouveau contact pour ce navire et cette ligne du plan +wao.ui.contacts.createFromBoat.fail=Cr\u00e9ation d'un nouveau contact impossible +wao.ui.contacts.createFromBoat.warn=Attention \: cette ligne du plan est arriv\u00e9e \u00e0 \u00e9ch\u00e9ance, \u00eates-vous s\u00fbr de vouloir cr\u00e9er un nouveau contact ? +wao.ui.disclaimer=Le site de \u00ab SUIVI DU REALISE DU PLAN D'ECHANTILLONNAGE DES OBSERVATIONS A LA MER \u00bb a fait l'objet d'une d\u00e9claration \u00e0 la CNIL sous le num\u00e9ro suivant \: 1414476 +wao.ui.disclaimer.boats=Les donn\u00e9es saisies dans cette page sont la propri\u00e9t\u00e9 exclusive de la soci\u00e9t\u00e9. En dehors de la soci\u00e9t\u00e9, seul l'administrateur peut les consulter pour des questions de maintenance sur le site. L'administrateur est une personne de l'Ifremer. wao.ui.email=Adresse e-mail wao.ui.entity.Boat=Navire wao.ui.entity.Boats=Navires -wao.ui.entity.Company=Soci\u00E9t\u00E9 +wao.ui.entity.Company=Soci\u00e9t\u00e9 wao.ui.entity.Contact=Contact -wao.ui.entity.FishingZone=Zones de p\u00EAche -wao.ui.entity.SampleRow=Ligne du plan d'\u00E9chantillonnage +wao.ui.entity.FishingZone=Zones de p\u00eache +wao.ui.entity.SampleRow=Ligne du plan d'\u00e9chantillonnage wao.ui.entity.TerrestrialLocation=Lieu wao.ui.entity.fishingGearDCF=Engin code DCF -wao.ui.entity.targetSpeciesDCF=Ensembles d'esp\u00E8ces-cible code DCF +wao.ui.entity.targetSpeciesDCF=Ensembles d'esp\u00e8ces-cible code DCF wao.ui.field.Boat.boatLength=Longueur -wao.ui.field.Boat.buildYear=Ann\u00E9e de construction +wao.ui.field.Boat.buildYear=Ann\u00e9e de construction wao.ui.field.Boat.districtCode=Quartier wao.ui.field.Boat.immatriculation=Immatriculation wao.ui.field.Boat.name=Nom wao.ui.field.Boat.shipOwner=Armateur wao.ui.field.BoatDistrict.code=Code quartier -wao.ui.field.BoatInfos.dup=Capacit\u00E9 d'accueil du navire en personnels sp\u00E9cialis\u00E9s +wao.ui.field.BoatInfos.dup=Capacit\u00e9 d'accueil du navire en personnels sp\u00e9cialis\u00e9s wao.ui.field.Company.active=Active wao.ui.field.Company.name=Nom -wao.ui.field.Contact.beginDate=D\u00E9but d'observation +wao.ui.field.Contact.beginDate=D\u00e9but d'observation wao.ui.field.Contact.comment=Commentaire observateur wao.ui.field.Contact.commentAdmin=Commentaire programme wao.ui.field.Contact.commentCoordinator=Commentaire coordinateur -wao.ui.field.Contact.completeSampling=\u00C9chantillonnage complet -wao.ui.field.Contact.contactState=\u00C9tat du contact +wao.ui.field.Contact.completeSampling=\u00c9chantillonnage complet +wao.ui.field.Contact.contactState=\u00c9tat du contact wao.ui.field.Contact.contactStateMotif=Motif du refus wao.ui.field.Contact.contactStateMotifs=Motifs de refus -wao.ui.field.Contact.creationDate=Date de cr\u00E9ation du contact -wao.ui.field.Contact.dataInputDate=Saisie des donn\u00E9es dans Allegro -wao.ui.field.Contact.dataReliability=Qualit\u00E9 des donn\u00E9es +wao.ui.field.Contact.creationDate=Date de cr\u00e9ation du contact +wao.ui.field.Contact.dataInputDate=Saisie des donn\u00e9es dans Allegro +wao.ui.field.Contact.dataReliability=Qualit\u00e9 des donn\u00e9es wao.ui.field.Contact.endDate=Fin d'observation -wao.ui.field.Contact.mainObserver=Observateur r\u00E9f\u00E9rent +wao.ui.field.Contact.mainObserver=Observateur r\u00e9f\u00e9rent wao.ui.field.Contact.mammalsCapture=Capture accidentelle -wao.ui.field.Contact.mammalsInfo=Noms scientifiques et nombres d'individus des esp\u00E8ces captur\u00E9es +wao.ui.field.Contact.mammalsInfo=Noms scientifiques et nombres d'individus des esp\u00e8ces captur\u00e9es wao.ui.field.Contact.mammalsObservation=Observation exceptionnelle wao.ui.field.Contact.nbObservants=Nombre d'observateurs -wao.ui.field.Contact.samplingStrategy=Strat\u00E9gie d'\u00E9chantillonnage suivie +wao.ui.field.Contact.samplingStrategy=Strat\u00e9gie d'\u00e9chantillonnage suivie wao.ui.field.Contact.secondaryObservers=Observateurs wao.ui.field.Contact.terrestrialLocation=Lieu d'observation -wao.ui.field.Contact.validationCompany=Validation soci\u00E9t\u00E9 +wao.ui.field.Contact.validationCompany=Validation soci\u00e9t\u00e9 wao.ui.field.Contact.validationProgram=Validation programme -wao.ui.field.FishingZone.facadeName=Fa\u00E7ade +wao.ui.field.FishingZone.facadeName=Fa\u00e7ade wao.ui.field.FishingZone.sectorName=Zone wao.ui.field.SampleRow.code=Code ligne wao.ui.field.SampleRow.comment=Commentaire wao.ui.field.SampleRow.dCF5Code=Codes wao.ui.field.SampleRow.day=Jour wao.ui.field.SampleRow.dcf5Code=Code DCF Niv. 5 -wao.ui.field.SampleRow.fishingZones=Zone(s) de p\u00EAche -wao.ui.field.SampleRow.libelle=Libell\u00E9 +wao.ui.field.SampleRow.fishingZones=Zone(s) de p\u00eache +wao.ui.field.SampleRow.libelle=Libell\u00e9 wao.ui.field.SampleRow.meshSize=Maillage -wao.ui.field.SampleRow.observationUnit=Unit\u00E9 d'observation +wao.ui.field.SampleRow.observationUnit=Unit\u00e9 d'observation wao.ui.field.SampleRow.other=Autre -wao.ui.field.SampleRow.periodBegin=D\u00E9but +wao.ui.field.SampleRow.periodBegin=D\u00e9but wao.ui.field.SampleRow.periodEnd=Fin -wao.ui.field.SampleRow.profession=M\u00E9tier -wao.ui.field.SampleRow.professionCode=Code m\u00E9tier +wao.ui.field.SampleRow.profession=M\u00e9tier +wao.ui.field.SampleRow.professionCode=Code m\u00e9tier wao.ui.field.SampleRow.programName=Programme -wao.ui.field.SampleRow.samplingStrategy=Strat\u00E9gie d'\u00E9chantillonnage +wao.ui.field.SampleRow.samplingStrategy=Strat\u00e9gie d'\u00e9chantillonnage wao.ui.field.SampleRow.size=Taille du navire -wao.ui.field.SampleRow.species=Esp\u00E8ces cibles +wao.ui.field.SampleRow.species=Esp\u00e8ces cibles wao.ui.field.SampleRow.terrestrialLocation=Quartier maritime wao.ui.field.SampleRow.terrestrialLocationInfos=Autre(s) info(s) -wao.ui.field.User.firstName=Pr\u00E9nom +wao.ui.field.User.firstName=Pr\u00e9nom wao.ui.field.User.lastName=Nom wao.ui.field.User.login=Identifiant -wao.ui.field.UserProfile.userRole=R\u00F4le +wao.ui.field.UserProfile.userRole=R\u00f4le wao.ui.field.WaoUser.login=Identifiant wao.ui.field.WaoUser.mammalsNotifications=Recevoir les notifications de captures accidentelles wao.ui.field.WaoUser.password=Mot de passe wao.ui.filters.filters=Filtres de recherche -wao.ui.filters.refresh=Rafra\u00EEchir les champs du filtre -wao.ui.forgotPassword=Mot de passe oubli\u00E9 ? -wao.ui.form.SampleRow.boatsDescription=Ce champs correspond aux immatriculations des navires qui sont \u00E9ligibles pour cette ligne. Vous pouvez utiliser n'importe quel s\u00E9parateur pour s\u00E9parer les immatriculations (virgule, point, espace ou saut de ligne) -wao.ui.form.SampleRow.missingBeginDate=Date de d\u00E9but manquante pour g\u00E9n\u00E9rer le code de la ligne \! -wao.ui.form.SampleRow.others=Autres donn\u00E9es de la ligne d'\u00E9chantillonnage +wao.ui.filters.refresh=Rafra\u00eechir les champs du filtre +wao.ui.forgotPassword=Mot de passe oubli\u00e9 ? +wao.ui.form.SampleRow.boatsDescription=Ce champs correspond aux immatriculations des navires qui sont \u00e9ligibles pour cette ligne. Vous pouvez utiliser n'importe quel s\u00e9parateur pour s\u00e9parer les immatriculations (virgule, point, espace ou saut de ligne) +wao.ui.form.SampleRow.missingBeginDate=Date de d\u00e9but manquante pour g\u00e9n\u00e9rer le code de la ligne \! +wao.ui.form.SampleRow.others=Autres donn\u00e9es de la ligne d'\u00e9chantillonnage wao.ui.form.SampleRow.program=Programme de rattachement et effort d'observation par mois wao.ui.form.addComment=Ajouter un commentaire -wao.ui.form.addRole=Ajouter ce r\u00F4le +wao.ui.form.addRole=Ajouter ce r\u00f4le wao.ui.form.boardingFrom=Sollicitations du navire depuis le wao.ui.form.contactsFile=Fichier des contacts -wao.ui.form.definePasswordManually=d\u00E9finir manuellement +wao.ui.form.definePasswordManually=d\u00e9finir manuellement wao.ui.form.editComment=Commentaire sur la modification wao.ui.form.editionAuthor=Auteur de la modification -wao.ui.form.estimatedTides=Voir l'effort d'observations estim\u00E9 -wao.ui.form.estimatedTides.description=L'effort d'observations estim\u00E9 \u00E9quivaut au nombre de contacts valid\u00E9s ou non par la soci\u00E9t\u00E9. Les contacts refus\u00E9s par le programme ne sont pas pris en compte. -wao.ui.form.generatePassword=G\u00E9n\u00E9rer le mot de passe +wao.ui.form.estimatedTides=Voir l'effort d'observations estim\u00e9 +wao.ui.form.estimatedTides.description=L'effort d'observations estim\u00e9 \u00e9quivaut au nombre de contacts valid\u00e9s ou non par la soci\u00e9t\u00e9. Les contacts refus\u00e9s par le programme ne sont pas pris en compte. +wao.ui.form.generatePassword=G\u00e9n\u00e9rer le mot de passe wao.ui.form.otherBoatInfos=Autres informations sur le navire -wao.ui.form.period=P\u00E9riode +wao.ui.form.period=P\u00e9riode wao.ui.form.period.from=du wao.ui.form.period.to=au -wao.ui.form.periodFrom=P\u00E9riode du -wao.ui.form.periodFromTo=P\u00E9riode du %s au %s +wao.ui.form.periodFrom=P\u00e9riode du +wao.ui.form.periodFromTo=P\u00e9riode du %s au %s wao.ui.form.program=Programme -wao.ui.form.programEvaluation=\u00C9valuation programme +wao.ui.form.programEvaluation=\u00c9valuation programme wao.ui.form.readOnly=lecture seule wao.ui.form.removeRole=retirer ce role -wao.ui.form.repeatPassword=R\u00E9p\u00E9ter le mot de passe -wao.ui.form.roles=R\u00F4les -wao.ui.form.sortByTideBegin=Trier par date de d\u00E9but d'observation (du plus r\u00E9cent au plus ancien) -wao.ui.import.activityCalendarImportLabel=de l'import des calendriers d'activit\u00E9 -wao.ui.import.activityCalendarImportRunning=Import des calendriers d'activit\u00E9 en cours. Vous pouvez continuer \u00E0 naviguer sur le site en attendant la fin du chargement. -wao.ui.import.activityCalendarLabel=des calendriers d'activit\u00E9 -wao.ui.import.activityCalendarUserAccessesLabel=des acc\u00E8s utilisateurs aux calendriers d'activit\u00E9 -wao.ui.import.boatDistrictLabel=des coordonn\u00E9es des quartiers des navires +wao.ui.form.repeatPassword=R\u00e9p\u00e9ter le mot de passe +wao.ui.form.roles=R\u00f4les +wao.ui.form.sortByTideBegin=Trier par date de d\u00e9but d'observation (du plus r\u00e9cent au plus ancien) +wao.ui.import.activityCalendarImportLabel=de l'import des calendriers d'activit\u00e9 +wao.ui.import.activityCalendarImportRunning=Import des calendriers d'activit\u00e9 en cours. Vous pouvez continuer \u00e0 naviguer sur le site en attendant la fin du chargement. +wao.ui.import.activityCalendarLabel=des calendriers d'activit\u00e9 +wao.ui.import.activityCalendarUserAccessesLabel=des acc\u00e8s utilisateurs aux calendriers d'activit\u00e9 +wao.ui.import.boatDistrictLabel=des coordonn\u00e9es des quartiers des navires wao.ui.import.boatsLabel=des navires wao.ui.import.description=Fichier %s %s \: -wao.ui.import.fishingZoneLabel=des zones de p\u00EAches +wao.ui.import.fishingZoneLabel=des zones de p\u00eaches wao.ui.import.fullDescription=Import %s (format %s avec encodage UTF-8) wao.ui.import.longTitle=Import/Export CSV (UTF-8) -wao.ui.import.samplingPlanLabel=du plan d'\u00E9chantillonnage -wao.ui.import.terrestrialDivisionsLabel=du r\u00E9f\u00E9rentiel de stratification spatiale (ObsDeb) +wao.ui.import.samplingPlanLabel=du plan d'\u00e9chantillonnage +wao.ui.import.terrestrialDivisionsLabel=du r\u00e9f\u00e9rentiel de stratification spatiale (ObsDeb) wao.ui.import.terrestrialLocationsLabel=des lieux terrestres wao.ui.import.title=Import %s wao.ui.indicator.andMore=%s et plus wao.ui.indicator.bounds=Bornes -wao.ui.indicator.coefficient=Pond\u00E9ration +wao.ui.indicator.coefficient=Pond\u00e9ration wao.ui.indicator.editions=Modifications wao.ui.indicator.indicator=Indicateur -wao.ui.indicator.legend=En jaune, la position actuelle de la soci\u00E9t\u00E9 selon cet indicateur. +wao.ui.indicator.legend=En jaune, la position actuelle de la soci\u00e9t\u00e9 selon cet indicateur. wao.ui.indicator.levels=Niveaux -wao.ui.indicator.useRightDecimalSymbol=Attention \u00E0 bien utiliser ',' et non '.' pour les d\u00E9cimales +wao.ui.indicator.useRightDecimalSymbol=Attention \u00e0 bien utiliser ',' et non '.' pour les d\u00e9cimales wao.ui.indicators.coefficientsSum=Total coefficient -wao.ui.indicators.title=Indicateurs qualit\u00E9s prestataires +wao.ui.indicators.title=Indicateurs qualit\u00e9s prestataires wao.ui.invalidLogin=Identifiant invalide -wao.ui.layout.userDescription=Vous \u00EAtes %s de la soci\u00E9t\u00E9 %s (%s) +wao.ui.layout.userDescription=Vous \u00eates %s de la soci\u00e9t\u00e9 %s (%s) wao.ui.message.chooseProfile=Choisissez dans la liste votre profil de connexion \: -wao.ui.misc.METIER=M\u00C9TIER -wao.ui.misc.N/A=non renseign\u00E9e -wao.ui.misc.accepted=Accept\u00E9 -wao.ui.misc.advancedSearch=Recherche avanc\u00E9e +wao.ui.misc.METIER=M\u00c9TIER +wao.ui.misc.N/A=non renseign\u00e9e +wao.ui.misc.accepted=Accept\u00e9 +wao.ui.misc.advancedSearch=Recherche avanc\u00e9e wao.ui.misc.by=par wao.ui.misc.changeOn=Modification du wao.ui.misc.comment=Commentaire -wao.ui.misc.commentAddedOn=Commentaire ajout\u00E9 le +wao.ui.misc.commentAddedOn=Commentaire ajout\u00e9 le wao.ui.misc.comments=Commentaires -wao.ui.misc.companies=Soci\u00E9t\u00E9s -wao.ui.misc.createdOnF=Cr\u00E9\u00E9e le -wao.ui.misc.creating=En cours de cr\u00E9ation +wao.ui.misc.companies=Soci\u00e9t\u00e9s +wao.ui.misc.createdOnF=Cr\u00e9\u00e9e le +wao.ui.misc.creating=En cours de cr\u00e9ation wao.ui.misc.export=Export wao.ui.misc.export.longTitle=Export CSV wao.ui.misc.import-export=Import/export @@ -206,7 +206,7 @@ wao.ui.misc.logFile.description=Afficher le fichier de log de %s wao.ui.misc.no=Non wao.ui.misc.noComment=aucun commentaire -wao.ui.misc.notValidated=Non valid\u00E9 +wao.ui.misc.notValidated=Non valid\u00e9 wao.ui.misc.observationReport=Compte-rendu d'observation wao.ui.misc.observations=Observations wao.ui.misc.observer=Observateur @@ -216,68 +216,69 @@ wao.ui.misc.other=Autre wao.ui.misc.otherInfos=Autre information wao.ui.misc.others=Autres -wao.ui.misc.refused=R\u00E9fus\u00E9 +wao.ui.misc.refused=R\u00e9fus\u00e9 wao.ui.misc.since=depuis le wao.ui.misc.total=Total -wao.ui.misc.undefined=Non-d\u00E9fini -wao.ui.misc.validated=Valid\u00E9 +wao.ui.misc.undefined=Non-d\u00e9fini +wao.ui.misc.validated=Valid\u00e9 wao.ui.misc.yes=Oui -wao.ui.nContactsFound=%s contacts trouv\u00E9s +wao.ui.nContactsFound=%s contacts trouv\u00e9s wao.ui.news.content=Texte wao.ui.news.title=Titre wao.ui.page.Administration.title=Administration wao.ui.page.Boats.title=Navires wao.ui.page.Cartography.title=Cartographie -wao.ui.page.ContactForm.mammalsInfo.disclaimer=Attention, toutes les informations saisies seront transmises \u00E0 des personnels ext\u00E9rieurs, soyez riguoureux dans la description de la capture accidentelle +wao.ui.page.ContactForm.mammalsInfo.disclaimer=Attention, toutes les informations saisies seront transmises \u00e0 des personnels ext\u00e9rieurs, soyez riguoureux dans la description de la capture accidentelle wao.ui.page.ContactForm.title=Modification d'un contact wao.ui.page.Contacts.title=Contacts wao.ui.page.Index.title=Accueil -wao.ui.page.SamplingPlan.title=Plan d'\u00E9chantillonnage -wao.ui.page.Synthesis.title=Synth\u00E8se +wao.ui.page.SamplingPlan.title=Plan d'\u00e9chantillonnage +wao.ui.page.Synthesis.title=Synth\u00e8se wao.ui.page.UserProfileForm.title=Gestion du profil -wao.ui.publishedByProgram=Publi\u00E9e par le programme -wao.ui.publishedByYourCompany=Publi\u00E9e par la soci\u00E9t\u00E9 -wao.ui.sampleRow.creation=Cr\u00E9ation d'une ligne du plan d'\u00E9chantillonnage +wao.ui.publishedByProgram=Publi\u00e9e par le programme +wao.ui.publishedByYourCompany=Publi\u00e9e par la soci\u00e9t\u00e9 +wao.ui.sampleRow.creation=Cr\u00e9ation d'une ligne du plan d'\u00e9chantillonnage wao.ui.sampleRow.edition=Modification de la ligne %s wao.ui.sampleRowLog.title=Historique de la ligne %s wao.ui.samplingPlan.actions=Actions -wao.ui.samplingPlan.actual=r\u00E9alis\u00E9 -wao.ui.samplingPlan.addSampleRow=Ajouter une ligne au plan d'\u00E9chantillonnage -wao.ui.samplingPlan.averageTideTime=Dur\u00E9e moyenne d'une mar\u00E9e (J.) -wao.ui.samplingPlan.effort=Effort d'observation en nombre de mar\u00E9es -wao.ui.samplingPlan.estimated=estim\u00E9 -wao.ui.samplingPlan.expected=planifi\u00E9 -wao.ui.samplingPlan.export=Exporter le plan d'\u00E9chantillonnage du %s au %s +wao.ui.samplingPlan.actual=r\u00e9alis\u00e9 +wao.ui.samplingPlan.addSampleRow=Ajouter une ligne au plan d'\u00e9chantillonnage +wao.ui.samplingPlan.averageTideTime=Dur\u00e9e moyenne d'une mar\u00e9e (J.) +wao.ui.samplingPlan.effort=Effort d'observation en nombre de mar\u00e9es +wao.ui.samplingPlan.estimated=estim\u00e9 +wao.ui.samplingPlan.expected=planifi\u00e9 +wao.ui.samplingPlan.export=Exporter le plan d'\u00e9chantillonnage du %s au %s wao.ui.samplingPlan.fishingZoneInfo=Zone autre(s) info(s) +wao.ui.samplingPlan.months=Mois wao.ui.samplingPlan.nbObservants=Nb. d'observateurs -wao.ui.samplingPlan.program=Programme ou r\u00E8glement rattachement -wao.ui.samplingPlan.sampledProfessions=M\u00E9tiers \u00E9chantillonn\u00E9s -wao.ui.samplingPlan.showActual=Afficher l'effort d'observations r\u00E9alis\u00E9 pour les contacts valid\u00E9s seulement -wao.ui.samplingPlan.showExpected=Afficher l'effort d'observations estim\u00E9 pour les contacts valid\u00E9s ou non par la soci\u00E9t\u00E9 -wao.ui.samplingPlan.title=Plan d'\u00E9chantillonnage -wao.ui.synthesis.allegroReactivity.description=Ce r\u00E9sultat est une moyenne du nombre de jours entre la date de saisie des donn\u00E9es et la date de fin d'observation. -wao.ui.synthesis.allegroReactivity.title=R\u00E9activit\u00E9 quant \u00E0 la saisie des donn\u00E9es +wao.ui.samplingPlan.program=Programme ou r\u00e8glement rattachement +wao.ui.samplingPlan.sampledProfessions=M\u00e9tiers \u00e9chantillonn\u00e9s +wao.ui.samplingPlan.showActual=Afficher l'effort d'observations r\u00e9alis\u00e9 pour les contacts valid\u00e9s seulement +wao.ui.samplingPlan.showExpected=Afficher l'effort d'observations estim\u00e9 pour les contacts valid\u00e9s ou non par la soci\u00e9t\u00e9 +wao.ui.samplingPlan.title=Plan d'\u00e9chantillonnage +wao.ui.synthesis.allegroReactivity.description=Ce r\u00e9sultat est une moyenne du nombre de jours entre la date de saisie des donn\u00e9es et la date de fin d'observation. +wao.ui.synthesis.allegroReactivity.title=R\u00e9activit\u00e9 quant \u00e0 la saisie des donn\u00e9es wao.ui.synthesis.boarding.boardingCount=Au total, %s observations invalides sur %s observations. -wao.ui.synthesis.boarding.description=Ces r\u00E9sultats ne concernent que les lignes du plan d'\u00E9chantillonnage ayant une dur\u00E9e moyenne de mar\u00E9es inf\u00E9rieure ou \u00E9gale \u00E0 48h. -wao.ui.synthesis.boarding.mostUsedBoat=Navire le plus sollicit\u00E9 avec %s observations (tous programmes confondus) \: %s (%s) +wao.ui.synthesis.boarding.description=Ces r\u00e9sultats ne concernent que les lignes du plan d'\u00e9chantillonnage ayant une dur\u00e9e moyenne de mar\u00e9es inf\u00e9rieure ou \u00e9gale \u00e0 48h. +wao.ui.synthesis.boarding.mostUsedBoat=Navire le plus sollicit\u00e9 avec %s observations (tous programmes confondus) \: %s (%s) wao.ui.synthesis.boarding.title=Sollicitations des navires -wao.ui.synthesis.complianceBoarding.description=Respect du nombre pr\u00E9vu d'observateurs pour chaque mar\u00E9e r\u00E9alis\u00E9e. -wao.ui.synthesis.complianceBoarding.title=Respect du nombre d'observateurs embarqu\u00E9s -wao.ui.synthesis.contactsStates.description=Ces r\u00E9sultats concernent l'ensemble des \u00E9tats des contacts except\u00E9 ceux qui ont \u00E9t\u00E9 refus\u00E9s par le programme. -wao.ui.synthesis.contactsStates.title=\u00C9tats des contacts -wao.ui.synthesis.dataReliability.description=Pourcentage du nombre de mar\u00E9es exploitables par rapport nombre de mar\u00E9e r\u00E9alis\u00E9es. -wao.ui.synthesis.dataReliability.title=Qualit\u00E9 de la donn\u00E9e -wao.ui.synthesis.dataSampling.title=Donn\u00E9es des mar\u00E9es (r\u00E9alis\u00E9 / planifi\u00E9) -wao.ui.synthesis.globalSynthesis.globalResult=Bilan de la synth\u00E8se global -wao.ui.synthesis.globalSynthesis.title=Synth\u00E8se globale -wao.ui.synthesis.globalSynthesis.title.estimated=Synth\u00E8se globale (selon estimations) -wao.ui.synthesis.log.description=Cette page pr\u00E9sente toutes les modifications effectu\u00E9es depuis l'origine qui portent sur les bornes de chaque niveaux ainsi que les coefficients de chaque indicateurs. -wao.ui.synthesis.log.empty=Aucune modification n'a \u00E9t\u00E9 apport\u00E9e \u00E0 ce jour +wao.ui.synthesis.complianceBoarding.description=Respect du nombre pr\u00e9vu d'observateurs pour chaque mar\u00e9e r\u00e9alis\u00e9e. +wao.ui.synthesis.complianceBoarding.title=Respect du nombre d'observateurs embarqu\u00e9s +wao.ui.synthesis.contactsStates.description=Ces r\u00e9sultats concernent l'ensemble des \u00e9tats des contacts except\u00e9 ceux qui ont \u00e9t\u00e9 refus\u00e9s par le programme. +wao.ui.synthesis.contactsStates.title=\u00c9tats des contacts +wao.ui.synthesis.dataReliability.description=Pourcentage du nombre de mar\u00e9es exploitables par rapport nombre de mar\u00e9e r\u00e9alis\u00e9es. +wao.ui.synthesis.dataReliability.title=Qualit\u00e9 de la donn\u00e9e +wao.ui.synthesis.dataSampling.title=Donn\u00e9es des mar\u00e9es (r\u00e9alis\u00e9 / planifi\u00e9) +wao.ui.synthesis.globalSynthesis.globalResult=Bilan de la synth\u00e8se global +wao.ui.synthesis.globalSynthesis.title=Synth\u00e8se globale +wao.ui.synthesis.globalSynthesis.title.estimated=Synth\u00e8se globale (selon estimations) +wao.ui.synthesis.log.description=Cette page pr\u00e9sente toutes les modifications effectu\u00e9es depuis l'origine qui portent sur les bornes de chaque niveaux ainsi que les coefficients de chaque indicateurs. +wao.ui.synthesis.log.empty=Aucune modification n'a \u00e9t\u00e9 apport\u00e9e \u00e0 ce jour wao.ui.synthesis.log.entry.author=Auteur de la modification -wao.ui.synthesis.log.entry.comment=Commentaire associ\u00E9 +wao.ui.synthesis.log.entry.comment=Commentaire associ\u00e9 wao.ui.synthesis.log.entry.date=Date de la modification -wao.ui.synthesis.log.entry.summary=Modifications effectu\u00E9es -wao.ui.synthesis.log.title=Historique des modifications des param\u00E8tres de la synth\u00E8se globale -wao.ui.unavailableOperation=Op\u00E9ration non-disponible +wao.ui.synthesis.log.entry.summary=Modifications effectu\u00e9es +wao.ui.synthesis.log.title=Historique des modifications des param\u00e8tres de la synth\u00e8se globale +wao.ui.unavailableOperation=Op\u00e9ration non-disponible wao.ui.userList=Liste des utilisateurs wao.ui.validLogin=Identifiant valide

1 0

[Suiviobsmer-commits] r1061 - trunk/wao-business/src/main/java/fr/ifremer/wao/service
by bleny＠users.labs.libre-entreprise.org 14 Mar '11

14 Mar '11

Author: bleny Date: 2011-03-14 13:48:04 +0000 (Mon, 14 Mar 2011) New Revision: 1061 Log: refuse obsdeb sampling plan import for lines not associated with a terrestrial location Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2011-03-12 14:20:10 UTC (rev 1060) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2011-03-14 13:48:04 UTC (rev 1061) @@ -1290,9 +1290,12 @@ ServiceReferential serviceReferential = context.getServiceFactory().getServiceReferential(); if (StringUtils.isBlank(districtCode)) { String districtName = ImportHelper.read(reader, SAMPLING.PLAN_LIEU_NOM); - if (districtName != null && districtName.equals("Autre")) { + if ("Autre".equals(districtName)) { + // line is associated with a place out of france (with no districtCode) TerrestrialLocation district = serviceReferential.getTerrestrialDistrict(null); sampleRow.setTerrestrialLocation(district); + } else { + throw new WaoBusinessException("La ligne " + sampleRow.getCode() + " doit être associée à un lieu terrestre"); } } else { TerrestrialLocation district = serviceReferential.getTerrestrialDistrict(districtCode);

1 0