From scm@users.codelutin.com Thu Mar 31 16:47:23 2016
From: "codelutin.com scm" <scm@users.codelutin.com>
To: tutti-commits@list.forge.codelutin.com
Subject: [Tutti-commits] branch feature/8198 updated (02a8941 -> 35ae2c4)
Date: Thu, 31 Mar 2016 16:47:22 +0200
Message-ID: <20160331144722.15385.55665@bihar.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1233735503825060547=="

--===============1233735503825060547==
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 feature/8198 in repository tutti.

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

     omits  02a8941   recopie de la maturit=C3=A9 et du sexe de la derni=C3=
=A8re ligne cr=C3=A9=C3=A9e quand on ajoute une ligne d'observations (fixes #=
8198)
      adds  379048b   correction de la conversion gramme -> unit=C3=A9 de la =
conf (fixes #8189)
      adds  eacf9aa   Am=C3=A9lioration javadoc
      adds  3051429   Ajout d'une nouvelle m=C3=A9thode de conversion qui sem=
ble fonctionner
      adds  563c3b6   Am=C3=A9lioration de la m=C3=A9thode de convertion
      adds  68fe8e2   Merge branch 'feature/8189' into 'develop'
      adds  bfbdf45   suppression du separateur de la conf, sinon on ne peut =
pas r=C3=A9cup=C3=A9rer les ids des pr=C3=A9c=C3=A9dents code si le s=C3=A9pa=
rateur change (enfin on pourrait mais c'est plus compliqu=C3=A9) (refs #8192)
      adds  dadc607   utilisation d'un objet pour g=C3=A9rer le code de pr=C3=
=A9l=C3=A8vement (fixes #8192)
      adds  9e9dbf7   livrable #8192 Merge branch 'feature/8192' into develop
      adds  189803c   l'arrondi du poids rendait le poids n=C3=A9gatif positi=
f... d'o=C3=B9 le poids total qui ne faisait qu'augmenter (fixes #8146)
      adds  c03c492   fix merge
      adds  8edb8bd   livrable #8146 Merge branch 'feature/8146' into develop
      adds  ffb26da   ajout des colonnes de code campagne et de nom scientifi=
que (fixes #8164)
      adds  3e74e9f   livrable #8164 Merge branch 'feature/8164' into develop
      adds  26554ce   ajout de la colonen sexe, m=C3=AAme si elle n'est pas d=
ans le protocole (fixes #8191)
      adds  ff2ad98   livrable #8191 Merge branch 'feature/8191' into develop
      adds  9fb2cd5   on increment et decremente l'algo =C3=A0 partir du mome=
nt o=C3=B9 il y a une taille (fixes #8194)
      adds  dbaf1ea   livrable #8194 Merge branch 'feature/8194' into develop
      adds  8246fab   on d=C3=A9clenche un =C3=A9v=C3=A8nement quand le r=C3=
=A9sum=C3=A9 est mis =C3=A0 jour (refs #8152)
      adds  cff4876   on ajoute le nombre de pr=C3=A9l=C3=A8vement par cl=C3=
=A9 (espece/taille/maturit=C3=A9/sexe) (refs #8152)
      adds  179a761   gestion des pr=C3=A9l=C3=A8vements dans le cache (refs =
#8152 refs #8177)
      adds  3e3c3fa   gestion des pr=C3=A9l=C3=A8vements + affichage des pr=
=C3=A9l=C3=A8vements r=C3=A9els (refs #8177 refs #8152)
      adds  6611c70   d=C3=A9coration pour le r=C3=A9sum=C3=A9 (refs #8152)
      adds  10d8c6a   augmentation de la taille des messages de pr=C3=A9l=C3=
=A8vement + limite infinie au lieu de nulle (fixes #8152)
      adds  3be764d   fix merge
      adds  4ae7280   livrable #8177 #8179 #8152 Merge branch 'feature/8177' =
into develop
       new  35ae2c4   recopie de la maturit=C3=A9 et du sexe de la derni=C3=
=A8re ligne cr=C3=A9=C3=A9e quand on ajoute une ligne d'observations (fixes #=
8198)

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (02a8941)
            \
             N -- N -- N   refs/heads/feature/8198 (35ae2c4)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omits" are not gone; other references still
refer to them.  Any revisions marked "discards" are gone forever.

The 1 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 35ae2c446227b301098b2c93c7ae80c61850dcc1
Author: Kevin Morin <morin@codelutin.com>
Date:   Thu Mar 31 10:19:57 2016 +0200

    recopie de la maturit=C3=A9 et du sexe de la derni=C3=A8re ligne cr=C3=A9=
=C3=A9e quand on ajoute une ligne d'observations (fixes #8198)

Summary of changes:
 .../java/fr/ifremer/tutti/TuttiConfiguration.java  |   4 -
 .../fr/ifremer/tutti/TuttiConfigurationOption.java |   8 -
 .../java/fr/ifremer/tutti/type/WeightUnit.java     |   6 -
 .../main/java/fr/ifremer/tutti/util/Weights.java   |  72 +++++-
 .../fr/ifremer/tutti/service/DecoratorService.java |   2 +
 .../ifremer/tutti/service/PersistenceService.java  |   4 +-
 .../fr/ifremer/tutti/service/TuttiDataContext.java |   4 +-
 .../protocol/CalcifiedPiecesSamplingRow.java       |   6 +
 .../protocol/CalcifiedPiecesSamplingRowModel.java  |  29 ++-
 .../CruiseSamplingCache.java                       | 258 ++++++++++++++++++-=
--
 .../CruiseSamplingCacheLoader.java                 |   2 +-
 .../CruiseSamplingInternalCache.java               | 100 ++++++--
 .../tutti/service/sampling/SamplingCodePrefix.java |  54 +++++
 .../{samplingCache =3D> sampling}/SamplingEvent.java |  37 +--
 .../SamplingListener.java                          |   3 +-
 .../content/actions/EditCatchesSupportAction.java  |   2 +-
 .../swing/content/config/TuttiConfigUIHandler.java |   3 -
 .../IndividualObservationBatchRowModel.java        |  43 +---
 .../IndividualObservationBatchTableModel.java      |  22 +-
 .../SampleCodeEditionPopupUI.jaxx                  |   4 +-
 .../SampleCodeEditionPopupUI.jcss                  |   2 +-
 .../SampleCodeEditionPopupUIHandler.java           |   3 +-
 .../SampleCodeEditionPopupUIModel.java             |   7 +-
 .../SamplingCodeCellEditor.java                    |   4 +-
 .../frequency/IndividualObservationUICache.java    | 179 +++++++++++---
 .../frequency/SpeciesFrequencyRowModel.java        |  23 +-
 .../frequency/SpeciesFrequencyTableModel.java      |  40 ++--
 .../species/frequency/SpeciesFrequencyUI.jcss      |   7 +-
 .../frequency/SpeciesFrequencyUIHandler.java       | 166 +++++++------
 .../species/frequency/SpeciesFrequencyUIModel.java |   7 +-
 .../frequency/actions/DeleteSampleCodeAction.java  |   2 +-
 .../frequency/actions/EditSampleCodeAction.java    |   6 +-
 .../resources/i18n/tutti-ui-swing_en_GB.properties |   1 +
 .../resources/i18n/tutti-ui-swing_fr_FR.properties |   3 +-
 34 files changed, 810 insertions(+), 303 deletions(-)
 rename tutti-service/src/main/java/fr/ifremer/tutti/service/{samplingCache =
=3D> sampling}/CruiseSamplingCache.java (67%)
 rename tutti-service/src/main/java/fr/ifremer/tutti/service/{samplingCache =
=3D> sampling}/CruiseSamplingCacheLoader.java (99%)
 rename tutti-service/src/main/java/fr/ifremer/tutti/service/{samplingCache =
=3D> sampling}/CruiseSamplingInternalCache.java (58%)
 create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/samp=
ling/SamplingCodePrefix.java
 rename tutti-service/src/main/java/fr/ifremer/tutti/service/{samplingCache =
=3D> sampling}/SamplingEvent.java (69%)
 rename tutti-service/src/main/java/fr/ifremer/tutti/service/{samplingCache =
=3D> sampling}/SamplingListener.java (91%)

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

--===============1233735503825060547==--


From scm@users.codelutin.com Thu Mar 31 16:47:23 2016
From: "codelutin.com scm" <scm@users.codelutin.com>
To: tutti-commits@list.forge.codelutin.com
Subject: [Tutti-commits]  01/01: recopie de la =?utf-8?q?maturit=C3=A9?= et du
 sexe de la =?utf-8?q?derni=C3=A8re_ligne_cr=C3=A9=C3=A9e?= quand on ajoute
 une ligne d'observations (fixes #8198)
Date: Thu, 31 Mar 2016 16:47:23 +0200
Message-ID: <20160331144723.06FAA5C23AE@goh.codelutin.com>
In-Reply-To: <20160331144722.15385.55665@bihar.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0328876071136352453=="

--===============0328876071136352453==
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 feature/8198 in repository tutti.

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

commit 35ae2c446227b301098b2c93c7ae80c61850dcc1
Author: Kevin Morin <morin@codelutin.com>
Date:   Thu Mar 31 10:19:57 2016 +0200

    recopie de la maturit=C3=A9 et du sexe de la derni=C3=A8re ligne cr=C3=A9=
=C3=A9e quand on ajoute une ligne d'observations (fixes #8198)
---
 .../IndividualObservationBatchTableModel.java           | 17 +++++++++++++++=
++
 .../species/frequency/SpeciesFrequencyUIHandler.java    |  1 +
 2 files changed, 18 insertions(+)

diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/o=
peration/catches/individualobservation/IndividualObservationBatchTableModel.j=
ava b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operatio=
n/catches/individualobservation/IndividualObservationBatchTableModel.java
index 5c18896..b6577c8 100644
--- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operatio=
n/catches/individualobservation/IndividualObservationBatchTableModel.java
+++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operatio=
n/catches/individualobservation/IndividualObservationBatchTableModel.java
@@ -24,6 +24,7 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches=
.individualobservatio
=20
 import fr.ifremer.tutti.persistence.entities.CaracteristicMap;
 import fr.ifremer.tutti.persistence.entities.referential.Caracteristic;
+import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualit=
ativeValue;
 import fr.ifremer.tutti.persistence.entities.referential.Species;
 import fr.ifremer.tutti.service.sampling.SamplingCodePrefix;
 import fr.ifremer.tutti.type.WeightUnit;
@@ -104,12 +105,16 @@ public class IndividualObservationBatchTableModel exten=
ds AbstractApplicationTab
=20
     protected Optional<Caracteristic> maturityCaracteristic;
=20
+    protected Caracteristic sexCaracteristic;
+
     public IndividualObservationBatchTableModel(WeightUnit weightUnit,
                                                 Collection<Caracteristic> de=
faultCaracteristicsSet,
+                                                Caracteristic sexCaracterist=
ic,
                                                 TableColumnModelExt columnMo=
del) {
         super(columnModel, true, false);
         this.weightUnit =3D weightUnit;
         this.defaultCaracteristicsMap =3D CaracteristicMap.fromCollection(de=
faultCaracteristicsSet);
+        this.sexCaracteristic =3D sexCaracteristic;
=20
         columnModel.addColumnModelListener(new TableColumnModelListener() {
=20
@@ -187,6 +192,18 @@ public class IndividualObservationBatchTableModel extend=
s AbstractApplicationTab
         result.setLengthStepCaracteristic(lengthstepCaracteristic);
         result.setMaturityCaracteristic(maturityCaracteristic);
=20
+        if (getRowCount() > 0) {
+            IndividualObservationBatchRowModel lastRow =3D getRows().get(get=
RowCount() - 1);
+
+            CaracteristicQualitativeValue gender =3D lastRow.getGender(sexCa=
racteristic);
+            result.getDefaultCaracteristics().put(sexCaracteristic, gender);
+
+            Optional<CaracteristicQualitativeValue> maturityState =3D lastRo=
w.getMaturityState();
+            if (maturityCaracteristic.isPresent() && maturityState.isPresent=
()) {
+                result.getDefaultCaracteristics().put(maturityCaracteristic.=
get(), maturityState.get());
+            }
+        }
+
         // quand l'utilisateur change le prefix dans la conf, si la ligne a =
deja un code pr=C3=A9l=C3=A8vement,
         // le prefix reste le m=C3=AAme, m=C3=AAme si l'utilisateur supprime=
 le code et en reg=C3=A9n=C3=A8re un
         // il faut pousser le nouveau prefix si l'utilisateur supprime le co=
de
diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/o=
peration/catches/species/frequency/SpeciesFrequencyUIHandler.java b/tutti-ui-=
swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/speci=
es/frequency/SpeciesFrequencyUIHandler.java
index 0999b24..6d6158b 100644
--- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operatio=
n/catches/species/frequency/SpeciesFrequencyUIHandler.java
+++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operatio=
n/catches/species/frequency/SpeciesFrequencyUIHandler.java
@@ -1552,6 +1552,7 @@ public class SpeciesFrequencyUIHandler extends Abstract=
TuttiTableUIHandler<Speci
         IndividualObservationBatchTableModel tableModel =3D
                 new IndividualObservationBatchTableModel(individualObservati=
onWeightUnit,
                                                          defaultCaracteristi=
c,
+                                                         sexCaracteristic,
                                                          columnModel);
=20
         obsTable.setModel(tableModel);

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

--===============0328876071136352453==--


