From tchemit@users.forge.codelutin.com Tue Nov  5 14:18:40 2013
From: tchemit@users.forge.codelutin.com
To: tutti-commits@list.forge.codelutin.com
Subject: [Tutti-commits] r1329 - in trunk/tutti-ui-swing/src/main:	
 =?utf-8?q?java/fr/ifremer/tutti/ui/swing/content/operation/catches/individu?=
 =?utf-8?q?alobservation?=	resources/i18n
Date: Tue, 05 Nov 2013 14:18:40 +0100
Message-ID: <20131105131840.090A51801CE@nuiton.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2448635033560860360=="

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

Author: tchemit
Date: 2013-11-05 14:18:39 +0100 (Tue, 05 Nov 2013)
New Revision: 1329

Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1329

Log:
fixes #3676: [DONNEES INDIVIDUELLES] pouvoir copier les mensurations depuis l=
a page ESPECES

Modified:
   trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/opera=
tion/catches/individualobservation/IndividualObservationBatchUIHandler.java
   trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properti=
es

Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/conten=
t/operation/catches/individualobservation/IndividualObservationBatchUIHandler=
.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/oper=
ation/catches/individualobservation/IndividualObservationBatchUIHandler.java	=
2013-11-05 09:51:46 UTC (rev 1328)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/oper=
ation/catches/individualobservation/IndividualObservationBatchUIHandler.java	=
2013-11-05 13:18:39 UTC (rev 1329)
@@ -637,7 +637,6 @@
                     }
                 }
=20
-
                 int nbRowsToCreate =3D rowsToCreate.size();
=20
                 boolean create;
@@ -645,32 +644,13 @@
                 int maxIndividualObservationRowsToCreate =3D
                         getConfig().getMaxIndividualObservationRowsToCreate(=
);
=20
-                StringBuilder sb =3D new StringBuilder("<table>");
-
-                sb.append("<tr>");
-                sb.append("<th>").append(_("tutti.createIndividualObservatio=
nBatch.field.individualObservationSpecies")).append("</th>");
-                sb.append("<th>").append(_("tutti.createIndividualObservatio=
nBatch.field.individualObservationWeight")).append("</th>");
-                sb.append("<th>").append(_("tutti.createIndividualObservatio=
nBatch.field.individualObservationSize")).append("</th>");
-                sb.append("<th>").append(_("tutti.createIndividualObservatio=
nBatch.field.individualObservationLengthStepCaracteristic")).append("</th>");
-                sb.append("</tr>");
-
-                for (IndividualObservationBatchRowModel rowModel : rowsToCre=
ate) {
-                    sb.append("<tr>");
-                    sb.append("<td>").append(speciesStr).append("</td>");
-                    sb.append("<td>").append(rowModel.getWeight()).append("<=
/td>");
-                    sb.append("<td>").append(rowModel.getSize()).append("</t=
d>");
-                    sb.append("<td>").append(decorate(rowModel.getLengthStep=
Caracteristic(), DecoratorService.CARACTERISTIC_WITH_UNIT)).append("</td>");
-                    sb.append("</tr>");
-                }
-                sb.append("</table>");
-
                 if (maxIndividualObservationRowsToCreate < nbRowsToCreate) {
=20
                     // ask confirmation
=20
                     String htmlMessage =3D String.format(
                             CONFIRMATION_FORMAT,
-                            _("tutti.createIndividualObservationBatch.confir=
m.message", speciesStr, nbRowsToCreate, sb.toString()),
+                            _("tutti.createIndividualObservationBatch.confir=
m.message", speciesStr, nbRowsToCreate),
                             _("tutti.createIndividualObservationBatch.confir=
m.help"));
                     int response =3D JOptionPane.showConfirmDialog(
                             getTopestUI(),

Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.p=
roperties
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.propert=
ies	2013-11-05 09:51:46 UTC (rev 1328)
+++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.propert=
ies	2013-11-05 13:18:39 UTC (rev 1329)
@@ -245,7 +245,7 @@
 tutti.createIndividualObservationBatch.confirm.alreadyUsedSpecies.message=3D=
Il existe d=C3=A9j=C3=A0 des donn=C3=A9es individuelles pour l'esp=C3=A8ce <s=
trong>%s</strong><br/>=C3=8Ates-vous s=C3=BBr de vouloir r=C3=A9cup=C3=A9rer =
les donn=C3=A9es depuis l'onglet <strong>Esp=C3=A8ces</strong>?
 tutti.createIndividualObservationBatch.confirm.alreadyUsedSpecies.title=3DCo=
nfirmer la cr=C3=A9ation des donn=C3=A9es individuelles sur une esp=C3=A8ce d=
=C3=A9j=C3=A0 utilis=C3=A9e
 tutti.createIndividualObservationBatch.confirm.help=3DQue voulez-vous faire?=
<ul><li><strong>Annuler</strong> pour ne pas cr=C3=A9er les donn=C3=A9es indi=
viduelles</li><li><strong>Ok</strong> pour confirmer la cr=C3=A9ation des don=
n=C3=A9es individuellesd</li></ul>
-tutti.createIndividualObservationBatch.confirm.message=3DVous avez demand=C3=
=A9 la cr=C3=A9ation des donn=C3=A9es individuelles pour l'esp=C3=A8ce %s dep=
uis les captures saisies.<br/>%s donn=C3=A9es vont =C3=AAtre cr=C3=A9=C3=A9es=
 \: %s
+tutti.createIndividualObservationBatch.confirm.message=3DVous avez demand=C3=
=A9 la cr=C3=A9ation des donn=C3=A9es individuelles pour l'esp=C3=A8ce <stron=
g>%s</strong> depuis les captures saisies.<br/><strong>%s donn=C3=A9es vont =
=C3=AAtre cr=C3=A9=C3=A9es</strong>.
 tutti.createIndividualObservationBatch.confirm.title=3DConfirmer la cr=C3=A9=
ation des donn=C3=A9es individuelles
 tutti.createIndividualObservationBatch.field.createFromBatch=3DCr=C3=A9er le=
s donn=C3=A9es depuis les captures
 tutti.createIndividualObservationBatch.field.createFromBatch.tip=3DUtiliser =
les donn=C3=A9es saisies dans les captures pour cr=C3=A9er les donn=C3=A9es i=
ndividuelles


--===============2448635033560860360==--