This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit cb7b706139a1450fd6e74d26f7d6eeb1cf8f1b4e Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Nov 24 11:24:26 2014 +0100 fixes #6152: [CAPTURE] le nom du fichier resume .csv n'est pas explicite --- .../tutti/ui/swing/action/ExportCruiseForSumatraAction.java | 6 +++++- .../swing/action/ExportFishingOperationForSumatraAction.java | 12 ++++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportCruiseForSumatraAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportCruiseForSumatraAction.java index 8c2ac16..2b2d7d0 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportCruiseForSumatraAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportCruiseForSumatraAction.java @@ -49,6 +49,8 @@ public class ExportCruiseForSumatraAction extends AbstractMainUITuttiAction { private static final Log log = LogFactory.getLog(ExportCruiseForSumatraAction.class); + private static final String EXPORT_FILE_NAME = "sumatra_%s_%s"; // sumatra_nom campagne - date du jour + protected File file; protected SumatraExportResult sumatraExportResult; @@ -75,9 +77,11 @@ public class ExportCruiseForSumatraAction extends AbstractMainUITuttiAction { if (doAction) { String date = DateUtil.formatDate(new Date(), "dd-MM-yyyy"); + String exportFilename = String.format(EXPORT_FILE_NAME, getDataContext().getCruise().getName(), date); + // choose file to export file = saveFile( - String.format("sumatra_%s_%s", getDataContext().getCruise().getName(), date), + exportFilename, "csv", t("tutti.exportCruiseCsv.title.choose.exportFile"), t("tutti.exportCruiseCsv.action.chooseFile"), diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportFishingOperationForSumatraAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportFishingOperationForSumatraAction.java index 3ae4c1d..db426a1 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportFishingOperationForSumatraAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportFishingOperationForSumatraAction.java @@ -52,6 +52,8 @@ public class ExportFishingOperationForSumatraAction extends AbstractTuttiAction< private static final Log log = LogFactory.getLog(ExportFishingOperationForSumatraAction.class); + private static final String EXPORT_FILE_NAME = "sumatra_%s_%s_%s_%s"; // sumatra_nom campagne_n° station_n° trait_date début trait.csv + protected File file; protected SumatraExportResult sumatraExportResult; @@ -88,10 +90,16 @@ public class ExportFishingOperationForSumatraAction extends AbstractTuttiAction< FishingOperation fishingOperation = getModel().getFishingOperation(); - String date = DateUtil.formatDate(new Date(), "dd-MM-yyyy"); + String date = DateUtil.formatDate(fishingOperation.getGearShootingStartDate(), "dd-MM-yyyy"); + String exportFilename = String.format(EXPORT_FILE_NAME, + getDataContext().getCruise().getName(), + fishingOperation.getStationNumber(), + fishingOperation.getFishingOperationNumber(), + date); + // choose file to export file = saveFile( - String.format("sumatra_%s_%s_%s", getDataContext().getCruise().getName(), fishingOperation.getId(), date), + exportFilename, "csv", t("tutti.exportFishingOperationCsv.title.choose.exportFile"), t("tutti.exportFishingOperationCsv.action.chooseFile"), -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.