- Tutti-commits - mailman.cloud.codelutin.com

r1663 - in trunk/tutti-ui-swing/src/main: java/fr/ifremer/tutti/ui/swing/action resources/i18n
by tchemit＠users.forge.codelutin.com March 28, 2014

March 28, 2014

Author: tchemit Date: 2014-03-28 17:25:57 +0100 (Fri, 28 Mar 2014) New Revision: 1663 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1663 Log: fixes #4857: [EXPORT] Bien v?\195?\169rifi?\195?\169 qu'un protocol est pr?\195?\169senttutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportCruiseForSumatraV2Action.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportFishingOperationForSumatraV2Action.java trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportFishingOperationForSumatraV2Action.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportFishingOperationForSumatraV2Action.java 2014-03-28 14:39:14 UTC (rev 1662) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportFishingOperationForSumatraV2Action.java 2014-03-28 16:25:57 UTC (rev 1663) @@ -75,6 +75,17 @@ if (doAction) { + if (!getDataContext().isProtocolFilled()) { + displayWarningMessage( + t("tutti.exportFishingOperationForSumatraV2.title.required.protocol"), + t("tutti.exportFishingOperationForSumatraV2.message.required.protocol") + ); + doAction = false; + } + } + + if (doAction) { + FishingOperation fishingOperation = getModel().getFishingOperation(); String date = DateUtil.formatDate(new Date(), "dd-MM-yyyy"); Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2014-03-28 14:39:14 UTC (rev 1662) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2014-03-28 16:25:57 UTC (rev 1663) @@ -1133,7 +1133,9 @@ tutti.exportCruiseForSumatra.title.choose.exportFile= tutti.exportCruiseForSumatraV2.action.chooseFile= tutti.exportCruiseForSumatraV2.action.success= +tutti.exportCruiseForSumatraV2.message.required.protocol= tutti.exportCruiseForSumatraV2.title.choose.exportFile= +tutti.exportCruiseForSumatraV2.title.required.protocol= tutti.exportDb.step.closeDb= tutti.exportDb.step.createArchive= tutti.exportDb.step.openDb= @@ -1146,8 +1148,10 @@ tutti.exportFishingOperationForSumatraV2.action.chooseFile= tutti.exportFishingOperationForSumatraV2.action.success= tutti.exportFishingOperationForSumatraV2.message.model.modified= +tutti.exportFishingOperationForSumatraV2.message.required.protocol= tutti.exportFishingOperationForSumatraV2.title.choose.exportFile= tutti.exportFishingOperationForSumatraV2.title.model.modified= +tutti.exportFishingOperationForSumatraV2.title.required.protocol= tutti.exportFishingOperationReport.action.chooseFile= tutti.exportFishingOperationReport.action.success= tutti.exportFishingOperationReport.message.model.modified=Catch was modified, please save it before launching an export. Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2014-03-28 14:39:14 UTC (rev 1662) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2014-03-28 16:25:57 UTC (rev 1663) @@ -1120,7 +1120,9 @@ tutti.exportCruiseForSumatra.title.choose.exportFile=Exporter la campagne tutti.exportCruiseForSumatraV2.action.chooseFile=Choisir le fichier d'export tutti.exportCruiseForSumatraV2.action.success=La campagne sélectionnée a été exportée dans le fichier %s +tutti.exportCruiseForSumatraV2.message.required.protocol=Pour faire un export sumatra v2, un protocol est requis. De plus toutes les espèces de la captures doivent être renseignées dans le protocole. tutti.exportCruiseForSumatraV2.title.choose.exportFile=Exporter la campagne +tutti.exportCruiseForSumatraV2.title.required.protocol=Protocole requis pour export sumatra v2 tutti.exportDb.step.closeDb=Fermeture de la base courante tutti.exportDb.step.createArchive=Création de l'archive %s tutti.exportDb.step.openDb=Réouverture de la base courante @@ -1133,8 +1135,10 @@ tutti.exportFishingOperationForSumatraV2.action.chooseFile=Choisir le fichier d'export tutti.exportFishingOperationForSumatraV2.action.success=Le trait a été exporté dans le fichier %s tutti.exportFishingOperationForSumatraV2.message.model.modified=La capture a été modifiée, veuillez l'enregistrer avant de lancer un export. +tutti.exportFishingOperationForSumatraV2.message.required.protocol=Pour faire un export sumatra v2, un protocol est requis. De plus toutes les espèces de la captures doivent être renseignées dans le protocole. tutti.exportFishingOperationForSumatraV2.title.choose.exportFile=Exporter le trait de la campagne tutti.exportFishingOperationForSumatraV2.title.model.modified=Impossible d'exporter, capture modifiée +tutti.exportFishingOperationForSumatraV2.title.required.protocol=Protocole requis pour export sumatra v2 tutti.exportFishingOperationReport.action.chooseFile=Choisir le fichier de rapport tutti.exportFishingOperationReport.action.success=Le trait a été exporté dans le fichier %s tutti.exportFishingOperationReport.message.model.modified=La capture a été modifiée, veuillez l'enregistrer avant de lancer un export.

1 0

[ANN] - Tutti 3.2.2 released
by codelutin.com Release Notification March 28, 2014

March 28, 2014

The Tutti team is pleased to announce the tutti-3.2.2 release! Outil de saisie de données d'opérations et de captures au cours des campagnes halieutiques. Documentation of the project can be found here: https://doc.codelutin.com/projects/tutti Changes ------- Changes in this version include: New features: o [EXPORT GENERIQUE] divers modifications Issue: 4844. Thanks to Tony Chemit. Resolved by tchemit. o Evolution format export SUMATRA Issue: 4845. Thanks to Tony Chemit. Resolved by tchemit. o Renommer les actions d'export Issue: 4847. Thanks to Tony Chemit. Resolved by tchemit. Fixed Bugs: o [MENSURATION] Pas de la classe de taille non initialisé Issue: 4823. Thanks to Anne-Sophie Cornou. Resolved by tchemit. o [ELEVATIONS] problème d'élévation quand il y a un poids NONTRIE Issue: 4841. Thanks to Vincent BADTS. Resolved by tchemit. o [AIDE] corriger la définition et l ellibellé du champ Trémie dans l'onglet Résumé Issue: 4848. Thanks to Vincent BADTS. Resolved by tchemit. Downloads --------- For a manual installation, you can download files here: https://forge.codelutin.com/projects/tutti/files * tutti-ichtyometer-3.2.2-tools.zip - https://forge.codelutin.com/attachments/download/1647 Maven artifacts --------------- Artifacts are deployed in nuiton maven repository http://maven.nuiton.org/other-releases/ Have fun! -Tutti team

1 0

r1662 - in trunk: . tutti-ichtyometer tutti-persistence tutti-service tutti-ui-swing
by maven-release＠users.forge.codelutin.com March 28, 2014

March 28, 2014

Author: maven-release Date: 2014-03-28 15:39:14 +0100 (Fri, 28 Mar 2014) New Revision: 1662 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1662 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml trunk/tutti-ichtyometer/pom.xml trunk/tutti-persistence/pom.xml trunk/tutti-service/pom.xml trunk/tutti-ui-swing/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-03-28 14:39:07 UTC (rev 1661) +++ trunk/pom.xml 2014-03-28 14:39:14 UTC (rev 1662) @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.2.2</version> + <version>4.0-SNAPSHOT</version> <packaging>pom</packaging> <name>Tutti</name> @@ -99,13 +99,13 @@ <scm> <url> - https://forge.codelutin.com/projects/tutti/repository/tags/tutti-3.2.2 + https://forge.codelutin.com/projects/tutti/repository/trunk </url> <connection> - scm:svn:http://svn.codelutin.com/tutti/tags/tutti-3.2.2 + scm:svn:http://svn.codelutin.com/tutti/trunk </connection> <developerConnection> - scm:svn:https://svn.codelutin.com/tutti/tags/tutti-3.2.2 + scm:svn:https://svn.codelutin.com/tutti/trunk </developerConnection> </scm> <distributionManagement> Modified: trunk/tutti-ichtyometer/pom.xml =================================================================== --- trunk/tutti-ichtyometer/pom.xml 2014-03-28 14:39:07 UTC (rev 1661) +++ trunk/tutti-ichtyometer/pom.xml 2014-03-28 14:39:14 UTC (rev 1662) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.2.2</version> + <version>4.0-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-persistence/pom.xml =================================================================== --- trunk/tutti-persistence/pom.xml 2014-03-28 14:39:07 UTC (rev 1661) +++ trunk/tutti-persistence/pom.xml 2014-03-28 14:39:14 UTC (rev 1662) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.2.2</version> + <version>4.0-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-service/pom.xml =================================================================== --- trunk/tutti-service/pom.xml 2014-03-28 14:39:07 UTC (rev 1661) +++ trunk/tutti-service/pom.xml 2014-03-28 14:39:14 UTC (rev 1662) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.2.2</version> + <version>4.0-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2014-03-28 14:39:07 UTC (rev 1661) +++ trunk/tutti-ui-swing/pom.xml 2014-03-28 14:39:14 UTC (rev 1662) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.2.2</version> + <version>4.0-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId>

1 0

r1661 - tags
by maven-release＠users.forge.codelutin.com March 28, 2014

March 28, 2014

Author: maven-release Date: 2014-03-28 15:39:07 +0100 (Fri, 28 Mar 2014) New Revision: 1661 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1661 Log: [maven-release-plugin] copy for tag tutti-3.2.2 Added: tags/tutti-3.2.2/

1 0

r1660 - in trunk: . tutti-ichtyometer tutti-persistence tutti-service tutti-ui-swing
by maven-release＠users.forge.codelutin.com March 28, 2014

March 28, 2014

Author: maven-release Date: 2014-03-28 15:38:59 +0100 (Fri, 28 Mar 2014) New Revision: 1660 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1660 Log: [maven-release-plugin] prepare release tutti-3.2.2 Modified: trunk/pom.xml trunk/tutti-ichtyometer/pom.xml trunk/tutti-persistence/pom.xml trunk/tutti-service/pom.xml trunk/tutti-ui-swing/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-03-28 14:34:28 UTC (rev 1659) +++ trunk/pom.xml 2014-03-28 14:38:59 UTC (rev 1660) @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.3-SNAPSHOT</version> + <version>3.2.2</version> <packaging>pom</packaging> <name>Tutti</name> @@ -99,13 +99,13 @@ <scm> <url> - https://forge.codelutin.com/projects/tutti/repository/trunk + https://forge.codelutin.com/projects/tutti/repository/tags/tutti-3.2.2 </url> <connection> - scm:svn:http://svn.codelutin.com/tutti/trunk + scm:svn:http://svn.codelutin.com/tutti/tags/tutti-3.2.2 </connection> <developerConnection> - scm:svn:https://svn.codelutin.com/tutti/trunk + scm:svn:https://svn.codelutin.com/tutti/tags/tutti-3.2.2 </developerConnection> </scm> <distributionManagement> Modified: trunk/tutti-ichtyometer/pom.xml =================================================================== --- trunk/tutti-ichtyometer/pom.xml 2014-03-28 14:34:28 UTC (rev 1659) +++ trunk/tutti-ichtyometer/pom.xml 2014-03-28 14:38:59 UTC (rev 1660) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.3-SNAPSHOT</version> + <version>3.2.2</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-persistence/pom.xml =================================================================== --- trunk/tutti-persistence/pom.xml 2014-03-28 14:34:28 UTC (rev 1659) +++ trunk/tutti-persistence/pom.xml 2014-03-28 14:38:59 UTC (rev 1660) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.3-SNAPSHOT</version> + <version>3.2.2</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-service/pom.xml =================================================================== --- trunk/tutti-service/pom.xml 2014-03-28 14:34:28 UTC (rev 1659) +++ trunk/tutti-service/pom.xml 2014-03-28 14:38:59 UTC (rev 1660) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.3-SNAPSHOT</version> + <version>3.2.2</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2014-03-28 14:34:28 UTC (rev 1659) +++ trunk/tutti-ui-swing/pom.xml 2014-03-28 14:38:59 UTC (rev 1660) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.3-SNAPSHOT</version> + <version>3.2.2</version> </parent> <groupId>fr.ifremer.tutti</groupId>

1 0

r1659 - in trunk/tutti-ui-swing/src/main: help/fr resources/i18n
by tchemit＠users.forge.codelutin.com March 28, 2014

March 28, 2014

Author: tchemit Date: 2014-03-28 15:34:28 +0100 (Fri, 28 Mar 2014) New Revision: 1659 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1659 Log: fixes #4848: [AIDE] corriger la d?\195?\169finition et l ellibell?\195?\169 du champ Tr?\195?\169mie dans l'onglet R?\195?\169sum?\195?\169 Modified: trunk/tutti-ui-swing/src/main/help/fr/editFishingOperation.html trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties Modified: trunk/tutti-ui-swing/src/main/help/fr/editFishingOperation.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/fr/editFishingOperation.html 2014-03-28 14:26:58 UTC (rev 1658) +++ trunk/tutti-ui-swing/src/main/help/fr/editFishingOperation.html 2014-03-28 14:34:28 UTC (rev 1659) @@ -261,7 +261,7 @@ </dd> <dt>Trémie</dt> <dd> - sur la Thalassa, poids total de la capture sans le HORS VRAC. + sur la Thalassa, poids total de la capture sans le HORS VRAC envoyé vers la chaine de tri. </dd> <dt>Poids total HORS VRAC</dt> <dd> Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2014-03-28 14:26:58 UTC (rev 1658) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2014-03-28 14:34:28 UTC (rev 1659) @@ -560,7 +560,7 @@ tutti.editCatchBatch.field.catchTotalRejectedWeight.tip=Poids de la fraction non triée à bord tutti.editCatchBatch.field.catchTotalSortedCarousselWeight=Carrousel observé tutti.editCatchBatch.field.catchTotalSortedCarousselWeight.tip=Sur Thalassa, poids total de la capture pesé sur la balance carrousel -tutti.editCatchBatch.field.catchTotalSortedTremisWeight=Trémie +tutti.editCatchBatch.field.catchTotalSortedTremisWeight=Trémie vers carrousel tutti.editCatchBatch.field.catchTotalSortedTremisWeight.tip=Sur Thalassa, poids total de la capture pesé sur la balance trémie et envoyée sur la chaîne de tri tutti.editCatchBatch.field.catchTotalSortedWeight=Poids total VRAC tutti.editCatchBatch.field.catchTotalSortedWeight.tip=Poids total VRAC des espèces dans la capture (sans les captures accidentelles)

1 0

r1658 - tags
by maven-release＠users.forge.codelutin.com March 28, 2014

March 28, 2014

Author: maven-release Date: 2014-03-28 15:26:58 +0100 (Fri, 28 Mar 2014) New Revision: 1658 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1658 Log: bad release Removed: tags/tutti-3.2.2/

1 0

r1657 - in trunk: . tutti-ichtyometer tutti-persistence tutti-service tutti-ui-swing
by maven-release＠users.forge.codelutin.com March 28, 2014

March 28, 2014

Author: maven-release Date: 2014-03-28 15:24:26 +0100 (Fri, 28 Mar 2014) New Revision: 1657 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1657 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml trunk/tutti-ichtyometer/pom.xml trunk/tutti-persistence/pom.xml trunk/tutti-service/pom.xml trunk/tutti-ui-swing/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-03-28 14:24:20 UTC (rev 1656) +++ trunk/pom.xml 2014-03-28 14:24:26 UTC (rev 1657) @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>3.3-SNAPSHOT</version> <packaging>pom</packaging> <name>Tutti</name> Modified: trunk/tutti-ichtyometer/pom.xml =================================================================== --- trunk/tutti-ichtyometer/pom.xml 2014-03-28 14:24:20 UTC (rev 1656) +++ trunk/tutti-ichtyometer/pom.xml 2014-03-28 14:24:26 UTC (rev 1657) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>3.3-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-persistence/pom.xml =================================================================== --- trunk/tutti-persistence/pom.xml 2014-03-28 14:24:20 UTC (rev 1656) +++ trunk/tutti-persistence/pom.xml 2014-03-28 14:24:26 UTC (rev 1657) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>3.3-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-service/pom.xml =================================================================== --- trunk/tutti-service/pom.xml 2014-03-28 14:24:20 UTC (rev 1656) +++ trunk/tutti-service/pom.xml 2014-03-28 14:24:26 UTC (rev 1657) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>3.3-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2014-03-28 14:24:20 UTC (rev 1656) +++ trunk/tutti-ui-swing/pom.xml 2014-03-28 14:24:26 UTC (rev 1657) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.2.2-SNAPSHOT</version> + <version>3.3-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId>

1 0

r1656 - tags
by maven-release＠users.forge.codelutin.com March 28, 2014

March 28, 2014

Author: maven-release Date: 2014-03-28 15:24:20 +0100 (Fri, 28 Mar 2014) New Revision: 1656 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1656 Log: [maven-release-plugin] copy for tag tutti-3.2.2 Added: tags/tutti-3.2.2/

1 0

r1655 - trunk
by maven-release＠users.forge.codelutin.com March 28, 2014

March 28, 2014

Author: maven-release Date: 2014-03-28 15:23:54 +0100 (Fri, 28 Mar 2014) New Revision: 1655 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1655 Log: fix scm Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-03-28 14:09:52 UTC (rev 1654) +++ trunk/pom.xml 2014-03-28 14:23:54 UTC (rev 1655) @@ -99,13 +99,13 @@ <scm> <url> - https://forge.codelutin.com/projects/tutti/repository/tags/tutti-3.2.2 + https://forge.codelutin.com/projects/tutti/repository/trunk </url> <connection> - scm:svn:http://svn.codelutin.com/tutti/tags/tutti-3.2.2 + scm:svn:http://svn.codelutin.com/tutti/trunk </connection> <developerConnection> - scm:svn:https://svn.codelutin.com/tutti/tags/tutti-3.2.2 + scm:svn:https://svn.codelutin.com/tutti/trunk </developerConnection> </scm> <distributionManagement>

1 0