From scm@users.codelutin.com Tue Feb 10 15:16:23 2015
From: "codelutin.com scm" <scm@users.codelutin.com>
To: wao-commits@list.forge.codelutin.com
Subject: [Wao-commits] branch develop updated (5c3e714 -> 67951c8)
Date: Tue, 10 Feb 2015 15:16:22 +0000
Message-ID: <20150210151622.27685.55979@bihar.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1214327028686183786=="

--===============1214327028686183786==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

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=C3=A9ro, ajout d'un filtre sur le code quar=
tier de la zone de p=C3=AAche (termine #6637)
       new  c3c14f7   Correction du lien pour zoomer sur une ligne
       new  c3a1723   Nom latin pour l'espece dans les filtres, d=C3=A9tail d=
e l'esp=C3=A8ce dans le tableau (refs #6638)
       new  67951c8   Probl=C3=A8me dans les synth=C3=A8ses : =C3=A0 la remis=
e =C3=A0 z=C3=A9ro des filtres, on pouvait obtenir une synth=C3=A8se qui ne t=
enait pas contre du filtre estim=C3=A9/r=C3=A9alis=C3=A9 (testable-client #66=
42)

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=C3=A8me dans les synth=C3=A8ses : =C3=A0 la remise =C3=A0 z=C3=A9ro=
 des filtres, on pouvait obtenir une synth=C3=A8se qui ne tenait pas contre d=
u filtre estim=C3=A9/r=C3=A9alis=C3=A9 (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=C3=A9tail de l'esp=C3=A8ce da=
ns 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 byt=
es
 .../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/Speci=
esImpl.java

--=20
To stop receiving notification emails like this one, please contact
codelutin.com SCM administrator <admin+scm@codelutin.com>.

--===============1214327028686183786==--


From scm@users.codelutin.com Tue Feb 10 15:16:23 2015
From: "codelutin.com scm" <scm@users.codelutin.com>
To: wao-commits@list.forge.codelutin.com
Subject: [Wao-commits] 01/03: Correction du lien pour zoomer sur une ligne
Date: Tue, 10 Feb 2015 15:16:23 +0000
Message-ID: <20150210151623.A1FD15C431C@goh.codelutin.com>
In-Reply-To: <20150210151622.27685.55979@bihar.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7893187792453297551=="

--===============7893187792453297551==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

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/samplin=
g-plan.jsp b/wao-web/src/main/webapp/WEB-INF/content/sclerochronology/samplin=
g-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=3D"filter.sampleRowCodes" =
value=3D"%{filter.sampleRowCodes}"/>
                                     <s:param name=3D"filter.fishingZoneFacad=
eNames" value=3D"%{filter.targetSpeciesDcfIds}"/>
                                     <s:param name=3D"filter.fishingZoneSecto=
rNames" value=3D"%{filter.targetSpeciesDcfIds}"/>
-                                    <s:param name=3D"filter.fishingGearDcfId=
s" value=3D"%{filter.targetSpeciesDcfIds}"/>
-                                    <s:param name=3D"filter.targetSpeciesDcf=
Ids" value=3D"%{filter.targetSpeciesDcfIds}"/>
+                                    <s:param name=3D"filter.fishingZoneDistr=
ictCodes" value=3D"%{filter.fishingZoneDistrictCodes}"/>
+                                    <s:param name=3D"filter.sclerochronology=
SamplingContexts" value=3D"%{filter.sclerochronologySamplingContexts}"/>
+                                    <s:param name=3D"filter.individualMeasur=
ementStrategies" value=3D"%{filter.individualMeasurementStrategies}"/>
+                                    <s:param name=3D"filter.species" value=
=3D"%{filter.species}"/>
                                 </s:url>
                                 <s:a href=3D"%{sampleRowZoomUrl}">
                                     <i class=3D"icon-filter"></i> <s:text na=
me=3D"wao.ui.action.zoomOnSampleRowPeriod" />

--=20
To stop receiving notification emails like this one, please contact
codelutin.com SCM administrator <admin+scm@codelutin.com>.

--===============7893187792453297551==--


From scm@users.codelutin.com Tue Feb 10 15:16:24 2015
From: "codelutin.com scm" <scm@users.codelutin.com>
To: wao-commits@list.forge.codelutin.com
Subject: [Wao-commits]  02/03: Nom latin pour l'espece dans les filtres, 
 =?utf-8?q?d=C3=A9tail?= de =?utf-8?q?l=27esp=C3=A8ce?= dans le tableau (refs
 #6638)
Date: Tue, 10 Feb 2015 15:16:24 +0000
Message-ID: <20150210151623.D20745C431E@goh.codelutin.com>
In-Reply-To: <20150210151622.27685.55979@bihar.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2014673681480357010=="

--===============2014673681480357010==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

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=C3=A9tail de l'esp=C3=A8ce da=
ns le tableau (refs #6638)
---
 .../java/fr/ifremer/wao/entity/SpeciesImpl.java     |  17 +++++++++++++++++
 wao-persistence/src/main/xmi/wao-model.zargo        | Bin 62318 -> 62375 byt=
es
 .../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=C3=A8ce 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 =3D getPermanentCode()
+                + ", " + getScientificName()
+                + ", " + getVernacularName()
+                + (getAphiaId() =3D=3D null ? "" : ", " + getAphiaId());
+        return label;
+    }
+}
diff --git a/wao-persistence/src/main/xmi/wao-model.zargo b/wao-persistence/s=
rc/main/xmi/wao-model.zargo
index 69b2317..4b44361 100644
Binary files a/wao-persistence/src/main/xmi/wao-model.zargo and b/wao-persist=
ence/src/main/xmi/wao-model.zargo differ
diff --git a/wao-services/src/main/java/fr/ifremer/wao/services/service/Sampl=
eRowsFilterValues.java b/wao-services/src/main/java/fr/ifremer/wao/services/s=
ervice/SampleRowsFilterValues.java
index e9cbdc0..1c3cb1b 100644
--- a/wao-services/src/main/java/fr/ifremer/wao/services/service/SampleRowsFi=
lterValues.java
+++ b/wao-services/src/main/java/fr/ifremer/wao/services/service/SampleRowsFi=
lterValues.java
@@ -157,7 +157,7 @@ public class SampleRowsFilterValues extends AbstractFilte=
rValues {
                     sclerochronologySamplingContexts.add(
                             FilterOption.forEnum(locale, sampleRow.getSclero=
chronologySamplingContext()));
                     species.add(
-                            FilterOption.forValueAndLabel(sampleRow.getSpeci=
es().getTopiaId(), sampleRow.getSpecies().getVernacularName()));
+                            FilterOption.forValueAndLabel(sampleRow.getSpeci=
es().getTopiaId(), sampleRow.getSpecies().getScientificName()));
                 }
             }
         }
diff --git a/wao-services/src/main/java/fr/ifremer/wao/services/service/Scler=
ochronologySamplingPlan.java b/wao-services/src/main/java/fr/ifremer/wao/serv=
ices/service/SclerochronologySamplingPlan.java
index a4cfd18..2a5414f 100644
--- a/wao-services/src/main/java/fr/ifremer/wao/services/service/Sclerochrono=
logySamplingPlan.java
+++ b/wao-services/src/main/java/fr/ifremer/wao/services/service/Sclerochrono=
logySamplingPlan.java
@@ -82,6 +82,8 @@ public class SclerochronologySamplingPlan extends SamplingP=
lan implements Iterab
=20
         protected String species;
=20
+        protected String speciesDetails;
+
         protected Map<Date, Effort> effortInIndividualsPerMonths;
=20
         protected Effort totalIndividuals;
@@ -90,6 +92,7 @@ public class SclerochronologySamplingPlan extends SamplingP=
lan implements Iterab
             super(locale, Collections.<Date, Effort>emptyMap(), sampleRow, s=
ampleRowContactCounts);
             this.effortInIndividualsPerMonths =3D effortInIndividualsPerMont=
hs;
             species =3D sampleRow.getSpecies().getScientificName();
+            speciesDetails =3D sampleRow.getSpecies().getLabel();
             samplingContext =3D WaoUtils.l(locale, sampleRow.getSclerochrono=
logySamplingContext());
             samplingContextInfo =3D sampleRow.getSclerochronologySamplingCon=
textInfo();
             individualMeasurementStrategy =3D WaoUtils.l(locale, sampleRow.g=
etIndividualMeasurementStrategy());
@@ -118,6 +121,10 @@ public class SclerochronologySamplingPlan extends Sampli=
ngPlan implements Iterab
             return species;
         }
=20
+        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.js=
p 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=3D"%{getText('wao.ui.field.SampleRow.species=
')}"
                           disabled=3D"updateSampleRowCommand.observationAlre=
adyStarted"
                           list=3D"updateSampleRowCommand.allSpecies"
-                          listValue=3D"%{value.permanentCode + ', ' + value.=
scientificName + ', ' + value.vernacularName + (value.aphiaId =3D=3D null ? '=
' : ', ' + value.aphiaId)}"
+                          listValue=3D"%{value.label}"
                           cssClass=3D"input-xxlarge select2"
                           />
=20
diff --git a/wao-web/src/main/webapp/WEB-INF/content/sclerochronology/samplin=
g-plan.jsp b/wao-web/src/main/webapp/WEB-INF/content/sclerochronology/samplin=
g-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=3D"individualMeasurementStrategy"/>
                 </td>
                 <td>
-                    <s:property value=3D"species"/>
+                    <span data-original-title=3D"<s:property value=3D"specie=
sDetails" escapeHtml=3D"false"/>" data-toggle=3D"tooltip" data-placement=3D"l=
eft">
+                        <s:property value=3D"species"/>
+                    </span>
                 </td>
                 <td class=3D"only-in-full-view"><s:property value=3D"%{forma=
tMonth(periodBegin)}" /></td>
                 <td class=3D"only-in-full-view"><s:property value=3D"%{forma=
tMonth(periodEnd)}" /></td>

--=20
To stop receiving notification emails like this one, please contact
codelutin.com SCM administrator <admin+scm@codelutin.com>.

--===============2014673681480357010==--


From scm@users.codelutin.com Tue Feb 10 15:16:24 2015
From: "codelutin.com scm" <scm@users.codelutin.com>
To: wao-commits@list.forge.codelutin.com
Subject: [Wao-commits]  03/03: =?utf-8?q?Probl=C3=A8me_dans_les_synth=C3=A8s?=
 =?utf-8?q?es_=3A_=C3=A0_la_remise_=C3=A0_z=C3=A9ro?= des filtres, on pouvait
 obtenir une =?utf-8?q?synth=C3=A8se_qui_ne_tenait_pas_contre_du_filtre_esti?=
 =?utf-8?b?bcOpL3LDqWFsaXPDqQ==?= (testable-client #6642)
Date: Tue, 10 Feb 2015 15:16:25 +0000
Message-ID: <20150210151624.0BCDB5C4320@goh.codelutin.com>
In-Reply-To: <20150210151622.27685.55979@bihar.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4700248529567336535=="

--===============4700248529567336535==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

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=C3=A8me dans les synth=C3=A8ses : =C3=A0 la remise =C3=A0 z=C3=A9ro=
 des filtres, on pouvait obtenir une synth=C3=A8se qui ne tenait pas contre d=
u filtre estim=C3=A9/r=C3=A9alis=C3=A9 (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/Synth=
esisService.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/SynthesisSer=
vice.java
+++ b/wao-services/src/main/java/fr/ifremer/wao/services/service/SynthesisSer=
vice.java
@@ -72,6 +72,7 @@ public class SynthesisService extends WaoServiceSupport {
         ContactsFilter newFilter =3D contactsService.newContactFilter(authen=
ticatedWaoUser);
=20
         newFilter.setFilterOnObservationBeginDate(true);
+        newFilter.setRealVsEstimated(false);
=20
         return newFilter;
=20

--=20
To stop receiving notification emails like this one, please contact
codelutin.com SCM administrator <admin+scm@codelutin.com>.

--===============4700248529567336535==--


