Author: tchemit Date: 2014-03-27 17:38:37 +0100 (Thu, 27 Mar 2014) New Revision: 1648 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1648 Log: fixes #4841: [ELEVATIONS] probl?\195?\168me d'?\195?\169l?\195?\169vation quand il y a un poids NONTRIE Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/ExportCatchContext.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportFishingOperationForSumatraAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportFishingOperationReportAction.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-service/src/main/java/fr/ifremer/tutti/service/export/ExportCatchContext.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/ExportCatchContext.java 2014-03-27 14:49:15 UTC (rev 1647) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/ExportCatchContext.java 2014-03-27 16:38:37 UTC (rev 1648) @@ -128,7 +128,9 @@ public float getCatchTotalSortedWeight() { return catchBatch.getSpeciesTotalSampleSortedComputedWeight() + - catchBatch.getBenthosTotalSampleSortedComputedWeight(); + catchBatch.getBenthosTotalSampleSortedComputedWeight() + + catchBatch.getSpeciesTotalUnsortedComputedWeight() + + catchBatch.getBenthosTotalUnsortedComputedWeight(); } public boolean withSpeciesBatches() { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportFishingOperationForSumatraAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportFishingOperationForSumatraAction.java 2014-03-27 14:49:15 UTC (rev 1647) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportFishingOperationForSumatraAction.java 2014-03-27 16:38:37 UTC (rev 1648) @@ -64,6 +64,15 @@ boolean doAction = super.prepareAction(); + if (getModel().isModify()) { + + displayWarningMessage( + t("tutti.exportFishingOperationForSumatra.title.model.modified"), + t("tutti.exportFishingOperationForSumatra.message.model.modified") + ); + doAction = false; + } + if (doAction) { FishingOperation fishingOperation = getModel().getFishingOperation(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportFishingOperationReportAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportFishingOperationReportAction.java 2014-03-27 14:49:15 UTC (rev 1647) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportFishingOperationReportAction.java 2014-03-27 16:38:37 UTC (rev 1648) @@ -61,6 +61,15 @@ boolean doAction = super.prepareAction(); + if (getModel().isModify()) { + + displayWarningMessage( + t("tutti.exportFishingOperationReport.title.model.modified"), + t("tutti.exportFishingOperationReport.message.model.modified") + ); + doAction = false; + } + if (doAction) { Cruise cruise = getDataContext().getCruise(); 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-27 14:49:15 UTC (rev 1647) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2014-03-27 16:38:37 UTC (rev 1648) @@ -1134,10 +1134,14 @@ tutti.exportDb.step.reloadApplication= tutti.exportFishingOperationForSumatra.action.chooseFile= tutti.exportFishingOperationForSumatra.action.success= +tutti.exportFishingOperationForSumatra.message.model.modified=Catch was modified, please save it before launching an export. tutti.exportFishingOperationForSumatra.title.choose.exportFile= +tutti.exportFishingOperationForSumatra.title.model.modified=Can't export, catch is modified tutti.exportFishingOperationReport.action.chooseFile= tutti.exportFishingOperationReport.action.success= +tutti.exportFishingOperationReport.message.model.modified=Catch was modified, please save it before launching an export. tutti.exportFishingOperationReport.title.choose.exportFile= +tutti.exportFishingOperationReport.title.model.modified=Can't export, catch is modified tutti.exportProgram.action.exportErrors= tutti.exportProgram.action.success= tutti.exportProtocol.action.success= 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-27 14:49:15 UTC (rev 1647) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2014-03-27 16:38:37 UTC (rev 1648) @@ -1121,10 +1121,14 @@ tutti.exportDb.step.reloadApplication=Redémarrage de l'application tutti.exportFishingOperationForSumatra.action.chooseFile=Choisir le fichier d'export tutti.exportFishingOperationForSumatra.action.success=Le trait a été exporté dans le fichier <strong>%s</strong> +tutti.exportFishingOperationForSumatra.message.model.modified=La capture a été modifié, veuillez l'enregistrer avant de lancer un export. tutti.exportFishingOperationForSumatra.title.choose.exportFile=Exporter le trait de la campagne +tutti.exportFishingOperationForSumatra.title.model.modified=Impossible d'exporter, capture modifiée tutti.exportFishingOperationReport.action.chooseFile=Choisir le fichier de rapport tutti.exportFishingOperationReport.action.success=Le trait a été exporté dans le fichier <strong>%s</strong> +tutti.exportFishingOperationReport.message.model.modified=La capture a été modifié, veuillez l'enregistrer avant de lancer un export. tutti.exportFishingOperationReport.title.choose.exportFile=Exporter le trait de la campagne +tutti.exportFishingOperationReport.title.model.modified=Impossible d'exporter, capture modifiée tutti.exportProgram.action.exportErrors=Des erreurs sont apparues pendant l'élévation des poids d'une campagne de la série <strong>%s</strong>.<br/>L'export a cependant été réalisé.<hr/>Erreur(s) rencontrée(s) \: <br/>%s tutti.exportProgram.action.success=La série de campagne <strong>%s</strong> a été exportée dans le fichier <strong>%s</strong>. tutti.exportProtocol.action.success=Protocole [%1s] exporté dans le fichier <strong>%2s</strong>.