From scm@users.codelutin.com Thu Mar  1 15:49:34 2018
From: "codelutin.com scm" <scm@users.codelutin.com>
To: echobase-commits@list.forge.codelutin.com
Subject: [Echobase-commits] 01/03: remove system.out
Date: Thu, 01 Mar 2018 15:49:35 +0100
Message-ID: <20180301144934.69BE95C06C9@goh.codelutin.com>
In-Reply-To: <20180301144934.18940.21591@bihar.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1939603422357943671=="

--===============1939603422357943671==
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 echobase.

See https://gitlab.nuiton.org/codelutin/echobase.git

commit ac96e1e56c7efc9b8d121c0cc316a36807f4965c
Author: Jean Couteau <jean.couteau@gmail.com>
Date:   Thu Mar 1 15:12:15 2018 +0100

    remove system.out
---
 .../echobase/services/service/atlantos/xml/XmlBioticExport.java     | 6 ----=
--
 1 file changed, 6 deletions(-)

diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/ser=
vice/atlantos/xml/XmlBioticExport.java b/echobase-services/src/main/java/fr/i=
fremer/echobase/services/service/atlantos/xml/XmlBioticExport.java
index de6c91f1..1cb14ba2 100644
--- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/at=
lantos/xml/XmlBioticExport.java
+++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/at=
lantos/xml/XmlBioticExport.java
@@ -93,12 +93,6 @@ public class XmlBioticExport implements EchoBaseService {
=20
             Collection<Sample> samples =3D operation.getSample();
=20
-            if (operation.getId().equals("T0211")){
-                //System.out.println("Code#Cat : " + codeCatKey);
-                //System.out.println("LengthClass : " + sampleDataValues.get=
("LengthClass"));
-                System.out.println(samples.size());
-            }
-
             for (Sample sample : samples) {
=20
                 String name =3D sample.getSampleType().getName();

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

--===============1939603422357943671==--


From scm@users.codelutin.com Thu Mar  1 15:49:34 2018
From: "codelutin.com scm" <scm@users.codelutin.com>
To: echobase-commits@list.forge.codelutin.com
Subject: [Echobase-commits] branch develop updated (edba46a7 -> 69901f81)
Date: Thu, 01 Mar 2018 15:49:34 +0100
Message-ID: <20180301144934.18940.21591@bihar.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2097321467468794301=="

--===============2097321467468794301==
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 echobase.

See https://gitlab.nuiton.org/codelutin/echobase.git

      from  edba46a7  [jgitflow-maven-plugin]Updating develop poms back to pr=
e merge state
       new  ac96e1e5  remove system.out
       new  9d328e22  fixes #9740 : "CalibrationID" non renseign=C3=A9 dans l=
e chapitre Samples" de l'export acoustic
       new  69901f81  Merge branch 'develop' of gitlab.nuiton.org:codelutin/e=
chobase into develop

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 69901f815adbb97a0cb8d0650fe085bbef1a2742
Merge: 9d328e22 edba46a7
Author: Jean Couteau <jean.couteau@gmail.com>
Date:   Thu Mar 1 15:48:09 2018 +0100

    Merge branch 'develop' of gitlab.nuiton.org:codelutin/echobase into devel=
op

commit 9d328e220289c40f0b5e48cf9fb7feb2135d317f
Author: Jean Couteau <jean.couteau@gmail.com>
Date:   Thu Mar 1 15:35:23 2018 +0100

    fixes #9740 : "CalibrationID" non renseign=C3=A9 dans le chapitre Samples=
" de l'export acoustic

commit ac96e1e56c7efc9b8d121c0cc316a36807f4965c
Author: Jean Couteau <jean.couteau@gmail.com>
Date:   Thu Mar 1 15:12:15 2018 +0100

    remove system.out

Summary of changes:
 .../services/service/atlantos/xml/XmlAccousticExport.java     | 11 +++++++++=
--
 .../services/service/atlantos/xml/XmlBioticExport.java        |  6 ------
 2 files changed, 9 insertions(+), 8 deletions(-)

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

--===============2097321467468794301==--


From scm@users.codelutin.com Thu Mar  1 15:49:34 2018
From: "codelutin.com scm" <scm@users.codelutin.com>
To: echobase-commits@list.forge.codelutin.com
Subject: [Echobase-commits]  02/03: fixes #9740 : "CalibrationID" non 
 =?utf-8?q?renseign=C3=A9?= dans le chapitre Samples" de l'export acoustic
Date: Thu, 01 Mar 2018 15:49:36 +0100
Message-ID: <20180301144934.C70A55CCD49@goh.codelutin.com>
In-Reply-To: <20180301144934.18940.21591@bihar.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8862892263576260234=="

--===============8862892263576260234==
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 echobase.

See https://gitlab.nuiton.org/codelutin/echobase.git

commit 9d328e220289c40f0b5e48cf9fb7feb2135d317f
Author: Jean Couteau <jean.couteau@gmail.com>
Date:   Thu Mar 1 15:35:23 2018 +0100

    fixes #9740 : "CalibrationID" non renseign=C3=A9 dans le chapitre Samples=
" de l'export acoustic
---
 .../services/service/atlantos/xml/XmlAccousticExport.java     | 11 +++++++++=
--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/ser=
vice/atlantos/xml/XmlAccousticExport.java b/echobase-services/src/main/java/f=
r/ifremer/echobase/services/service/atlantos/xml/XmlAccousticExport.java
index dd8204c0..afeb6213 100644
--- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/at=
lantos/xml/XmlAccousticExport.java
+++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/at=
lantos/xml/XmlAccousticExport.java
@@ -87,8 +87,14 @@ public class XmlAccousticExport implements EchoBaseService=
 {
=20
                         // EXPORT CALIBRATION
                         Collection<Calibration> calibrations =3D acousticIns=
trument.getCalibration();
+                        Date startDate =3D voyage.getStartDate();
+                        Date endDate =3D voyage.getEndDate();
                         for (Calibration calibration : calibrations) {
-                            this.exportCalibration(calibration, xmlHead);
+                            Date date =3D calibration.getDate();
+                            if (date !=3D null && date.after(startDate) && d=
ate.before(endDate)) {
+                                this.exportCalibration(calibration, xmlHead);
+                                break;
+                            }
                         }
=20
                         // EXPORT DATA ACQUISITION
@@ -374,10 +380,11 @@ public class XmlAccousticExport implements EchoBaseServ=
ice {
         // Utiliser la date de d=C3=A9but du voyage
         Collection<Calibration> calibrations =3D cell.getDataProcessing().ge=
tDataAcquisition().getAcousticInstrument().getCalibration();
         Date startDate =3D voyage.getStartDate();
+        Date endDate =3D voyage.getEndDate();
         Calibration calibrationFound =3D null;
         for (Calibration calibration : calibrations) {
             Date date =3D calibration.getDate();
-            if (date !=3D null && date.equals(startDate)) {
+            if (date !=3D null && date.after(startDate) && date.before(endDa=
te)) {
                 calibrationFound =3D calibration;
                 break;
             }

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

--===============8862892263576260234==--


From scm@users.codelutin.com Thu Mar  1 15:49:34 2018
From: "codelutin.com scm" <scm@users.codelutin.com>
To: echobase-commits@list.forge.codelutin.com
Subject: [Echobase-commits] 03/03: Merge branch 'develop' of
 gitlab.nuiton.org:codelutin/echobase into develop
Date: Thu, 01 Mar 2018 15:49:37 +0100
Message-ID: <20180301144934.D0B565C09C9@goh.codelutin.com>
In-Reply-To: <20180301144934.18940.21591@bihar.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4730428789177244555=="

--===============4730428789177244555==
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 echobase.

See https://gitlab.nuiton.org/codelutin/echobase.git

commit 69901f815adbb97a0cb8d0650fe085bbef1a2742
Merge: 9d328e22 edba46a7
Author: Jean Couteau <jean.couteau@gmail.com>
Date:   Thu Mar 1 15:48:09 2018 +0100

    Merge branch 'develop' of gitlab.nuiton.org:codelutin/echobase into devel=
op

 echobase-domain/pom.xml                            |  2 +-
 .../WorkingDbMigrationCallBackForVersion3_913.java | 23 ++++++++++++++++++++=
+-
 .../workingDb/3.913-0-atlantos-species.sql         | 22 ++++++++++++++++++++-
 .../workingDb/h2/3.913-0-atlantos-species.sql      | 22 ++++++++++++++++++++-
 .../workingDb/pg/3.913-0-atlantos-species.sql      | 22 ++++++++++++++++++++-
 echobase-services/pom.xml                          |  2 +-
 .../atlantos/ExportAtlantosServiceTest.java        |  3 ++-
 .../service/importdb/ImportDbServiceTest.java      |  3 ++-
 echobase-ui/pom.xml                                |  2 +-
 pom.xml                                            |  2 +-
 10 files changed, 93 insertions(+), 10 deletions(-)

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

--===============4730428789177244555==--


