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>.