branch develop updated (5c3e714 -> 67951c8)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository wao. See http://git.codelutin.com/wao.git from 5c3e714 Pour la scléro, ajout d'un filtre sur le code quartier de la zone de pêche (termine #6637) new c3c14f7 Correction du lien pour zoomer sur une ligne new c3a1723 Nom latin pour l'espece dans les filtres, détail de l'espèce dans le tableau (refs #6638) new 67951c8 Problème dans les synthèses : à la remise à zéro des filtres, on pouvait obtenir une synthèse qui ne tenait pas contre du filtre estimé/réalisé (testable-client #6642) The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 67951c8c2ced57caefa913d683a2b6857cc47d34 Author: Brendan Le Ny <bleny@codelutin.com> Date: Tue Feb 10 16:13:50 2015 +0100 Problème dans les synthèses : à la remise à zéro des filtres, on pouvait obtenir une synthèse qui ne tenait pas contre du filtre estimé/réalisé (testable-client #6642) commit c3a172370ac448162f8fbb1e6505a64114bcd68e Author: Brendan Le Ny <bleny@codelutin.com> Date: Tue Feb 10 15:41:47 2015 +0100 Nom latin pour l'espece dans les filtres, détail de l'espèce dans le tableau (refs #6638) commit c3c14f7948cf567d3894d96fa82f32fca231a6ed Author: Brendan Le Ny <bleny@codelutin.com> Date: Tue Feb 10 14:56:06 2015 +0100 Correction du lien pour zoomer sur une ligne Summary of changes: .../java/fr/ifremer/wao/entity/SpeciesImpl.java | 17 +++++++++++++++++ wao-persistence/src/main/xmi/wao-model.zargo | Bin 62318 -> 62375 bytes .../services/service/SampleRowsFilterValues.java | 2 +- .../service/SclerochronologySamplingPlan.java | 7 +++++++ .../wao/services/service/SynthesisService.java | 1 + .../WEB-INF/content/edit-sample-row-input.jsp | 2 +- .../content/sclerochronology/sampling-plan.jsp | 10 +++++++--- 7 files changed, 34 insertions(+), 5 deletions(-) create mode 100644 wao-persistence/src/main/java/fr/ifremer/wao/entity/SpeciesImpl.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository wao. See http://git.codelutin.com/wao.git commit c3c14f7948cf567d3894d96fa82f32fca231a6ed Author: Brendan Le Ny <bleny@codelutin.com> Date: Tue Feb 10 14:56:06 2015 +0100 Correction du lien pour zoomer sur une ligne --- .../main/webapp/WEB-INF/content/sclerochronology/sampling-plan.jsp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/wao-web/src/main/webapp/WEB-INF/content/sclerochronology/sampling-plan.jsp b/wao-web/src/main/webapp/WEB-INF/content/sclerochronology/sampling-plan.jsp index e62c6b9..784797d 100644 --- a/wao-web/src/main/webapp/WEB-INF/content/sclerochronology/sampling-plan.jsp +++ b/wao-web/src/main/webapp/WEB-INF/content/sclerochronology/sampling-plan.jsp @@ -377,8 +377,10 @@ <s:param name="filter.sampleRowCodes" value="%{filter.sampleRowCodes}"/> <s:param name="filter.fishingZoneFacadeNames" value="%{filter.targetSpeciesDcfIds}"/> <s:param name="filter.fishingZoneSectorNames" value="%{filter.targetSpeciesDcfIds}"/> - <s:param name="filter.fishingGearDcfIds" value="%{filter.targetSpeciesDcfIds}"/> - <s:param name="filter.targetSpeciesDcfIds" value="%{filter.targetSpeciesDcfIds}"/> + <s:param name="filter.fishingZoneDistrictCodes" value="%{filter.fishingZoneDistrictCodes}"/> + <s:param name="filter.sclerochronologySamplingContexts" value="%{filter.sclerochronologySamplingContexts}"/> + <s:param name="filter.individualMeasurementStrategies" value="%{filter.individualMeasurementStrategies}"/> + <s:param name="filter.species" value="%{filter.species}"/> </s:url> <s:a href="%{sampleRowZoomUrl}"> <i class="icon-filter"></i> <s:text name="wao.ui.action.zoomOnSampleRowPeriod" /> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository wao. See http://git.codelutin.com/wao.git commit c3a172370ac448162f8fbb1e6505a64114bcd68e Author: Brendan Le Ny <bleny@codelutin.com> Date: Tue Feb 10 15:41:47 2015 +0100 Nom latin pour l'espece dans les filtres, détail de l'espèce dans le tableau (refs #6638) --- .../java/fr/ifremer/wao/entity/SpeciesImpl.java | 17 +++++++++++++++++ wao-persistence/src/main/xmi/wao-model.zargo | Bin 62318 -> 62375 bytes .../services/service/SampleRowsFilterValues.java | 2 +- .../service/SclerochronologySamplingPlan.java | 7 +++++++ .../WEB-INF/content/edit-sample-row-input.jsp | 2 +- .../content/sclerochronology/sampling-plan.jsp | 4 +++- 6 files changed, 29 insertions(+), 3 deletions(-) diff --git a/wao-persistence/src/main/java/fr/ifremer/wao/entity/SpeciesImpl.java b/wao-persistence/src/main/java/fr/ifremer/wao/entity/SpeciesImpl.java new file mode 100644 index 0000000..4dff678 --- /dev/null +++ b/wao-persistence/src/main/java/fr/ifremer/wao/entity/SpeciesImpl.java @@ -0,0 +1,17 @@ +package fr.ifremer.wao.entity; + +/** + * Une espèce qu'il faut observer pour une ligne {@link fr.ifremer.wao.entity.ObsProgram#SCLEROCHRONOLOGY}. + * + * @since 5.0 + */ +public class SpeciesImpl extends SpeciesAbstract { + + public String getLabel() { + String label = getPermanentCode() + + ", " + getScientificName() + + ", " + getVernacularName() + + (getAphiaId() == null ? "" : ", " + getAphiaId()); + return label; + } +} diff --git a/wao-persistence/src/main/xmi/wao-model.zargo b/wao-persistence/src/main/xmi/wao-model.zargo index 69b2317..4b44361 100644 Binary files a/wao-persistence/src/main/xmi/wao-model.zargo and b/wao-persistence/src/main/xmi/wao-model.zargo differ diff --git a/wao-services/src/main/java/fr/ifremer/wao/services/service/SampleRowsFilterValues.java b/wao-services/src/main/java/fr/ifremer/wao/services/service/SampleRowsFilterValues.java index e9cbdc0..1c3cb1b 100644 --- a/wao-services/src/main/java/fr/ifremer/wao/services/service/SampleRowsFilterValues.java +++ b/wao-services/src/main/java/fr/ifremer/wao/services/service/SampleRowsFilterValues.java @@ -157,7 +157,7 @@ public class SampleRowsFilterValues extends AbstractFilterValues { sclerochronologySamplingContexts.add( FilterOption.forEnum(locale, sampleRow.getSclerochronologySamplingContext())); species.add( - FilterOption.forValueAndLabel(sampleRow.getSpecies().getTopiaId(), sampleRow.getSpecies().getVernacularName())); + FilterOption.forValueAndLabel(sampleRow.getSpecies().getTopiaId(), sampleRow.getSpecies().getScientificName())); } } } diff --git a/wao-services/src/main/java/fr/ifremer/wao/services/service/SclerochronologySamplingPlan.java b/wao-services/src/main/java/fr/ifremer/wao/services/service/SclerochronologySamplingPlan.java index a4cfd18..2a5414f 100644 --- a/wao-services/src/main/java/fr/ifremer/wao/services/service/SclerochronologySamplingPlan.java +++ b/wao-services/src/main/java/fr/ifremer/wao/services/service/SclerochronologySamplingPlan.java @@ -82,6 +82,8 @@ public class SclerochronologySamplingPlan extends SamplingPlan implements Iterab protected String species; + protected String speciesDetails; + protected Map<Date, Effort> effortInIndividualsPerMonths; protected Effort totalIndividuals; @@ -90,6 +92,7 @@ public class SclerochronologySamplingPlan extends SamplingPlan implements Iterab super(locale, Collections.<Date, Effort>emptyMap(), sampleRow, sampleRowContactCounts); this.effortInIndividualsPerMonths = effortInIndividualsPerMonths; species = sampleRow.getSpecies().getScientificName(); + speciesDetails = sampleRow.getSpecies().getLabel(); samplingContext = WaoUtils.l(locale, sampleRow.getSclerochronologySamplingContext()); samplingContextInfo = sampleRow.getSclerochronologySamplingContextInfo(); individualMeasurementStrategy = WaoUtils.l(locale, sampleRow.getIndividualMeasurementStrategy()); @@ -118,6 +121,10 @@ public class SclerochronologySamplingPlan extends SamplingPlan implements Iterab return species; } + public String getSpeciesDetails() { + return speciesDetails; + } + public String getSamplingContext() { return samplingContext; } diff --git a/wao-web/src/main/webapp/WEB-INF/content/edit-sample-row-input.jsp b/wao-web/src/main/webapp/WEB-INF/content/edit-sample-row-input.jsp index dde799d..c8740f1 100644 --- a/wao-web/src/main/webapp/WEB-INF/content/edit-sample-row-input.jsp +++ b/wao-web/src/main/webapp/WEB-INF/content/edit-sample-row-input.jsp @@ -190,7 +190,7 @@ label="%{getText('wao.ui.field.SampleRow.species')}" disabled="updateSampleRowCommand.observationAlreadyStarted" list="updateSampleRowCommand.allSpecies" - listValue="%{value.permanentCode + ', ' + value.scientificName + ', ' + value.vernacularName + (value.aphiaId == null ? '' : ', ' + value.aphiaId)}" + listValue="%{value.label}" cssClass="input-xxlarge select2" /> diff --git a/wao-web/src/main/webapp/WEB-INF/content/sclerochronology/sampling-plan.jsp b/wao-web/src/main/webapp/WEB-INF/content/sclerochronology/sampling-plan.jsp index 784797d..12f8c1c 100644 --- a/wao-web/src/main/webapp/WEB-INF/content/sclerochronology/sampling-plan.jsp +++ b/wao-web/src/main/webapp/WEB-INF/content/sclerochronology/sampling-plan.jsp @@ -318,7 +318,9 @@ <s:property value="individualMeasurementStrategy"/> </td> <td> - <s:property value="species"/> + <span data-original-title="<s:property value="speciesDetails" escapeHtml="false"/>" data-toggle="tooltip" data-placement="left"> + <s:property value="species"/> + </span> </td> <td class="only-in-full-view"><s:property value="%{formatMonth(periodBegin)}" /></td> <td class="only-in-full-view"><s:property value="%{formatMonth(periodEnd)}" /></td> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository wao. See http://git.codelutin.com/wao.git commit 67951c8c2ced57caefa913d683a2b6857cc47d34 Author: Brendan Le Ny <bleny@codelutin.com> Date: Tue Feb 10 16:13:50 2015 +0100 Problème dans les synthèses : à la remise à zéro des filtres, on pouvait obtenir une synthèse qui ne tenait pas contre du filtre estimé/réalisé (testable-client #6642) --- .../src/main/java/fr/ifremer/wao/services/service/SynthesisService.java | 1 + 1 file changed, 1 insertion(+) diff --git a/wao-services/src/main/java/fr/ifremer/wao/services/service/SynthesisService.java b/wao-services/src/main/java/fr/ifremer/wao/services/service/SynthesisService.java index 5b0c036..71fd2fe 100644 --- a/wao-services/src/main/java/fr/ifremer/wao/services/service/SynthesisService.java +++ b/wao-services/src/main/java/fr/ifremer/wao/services/service/SynthesisService.java @@ -72,6 +72,7 @@ public class SynthesisService extends WaoServiceSupport { ContactsFilter newFilter = contactsService.newContactFilter(authenticatedWaoUser); newFilter.setFilterOnObservationBeginDate(true); + newFilter.setRealVsEstimated(false); return newFilter; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm