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

03/03: Propose a l'utilisateur de consulter le rapport pupitri genere
by codelutin.com scm 22 Nov '14

22 Nov '14

This is an automated email from the git hooks/post-receive script. New commit to branch feature/6150 in repository tutti. See http://git.codelutin.com/tutti.git commit 1f0b7a10317739248f03f9739e9a4762c0959252 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Nov 22 15:51:08 2014 +0100 Propose a l'utilisateur de consulter le rapport pupitri genere --- .../tutti/service/pupitri/PupitriImportResult.java | 30 ++++++++++++++++ .../service/pupitri/PupitriImportService.java | 40 ++++++++++++++++------ .../resources/i18n/tutti-service_en_GB.properties | 3 ++ .../resources/i18n/tutti-service_fr_FR.properties | 6 ++-- .../tutti/ui/swing/action/ImportPupitriAction.java | 37 ++++++++++++++++++++ .../ifremer/tutti/ui/swing/util/TuttiUIUtil.java | 14 ++++++++ .../util/attachment/AttachmentEditorUIHandler.java | 10 +----- .../resources/i18n/tutti-ui-swing_en_GB.properties | 4 +++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 4 +++ 9 files changed, 126 insertions(+), 22 deletions(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriImportResult.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriImportResult.java index 320c99a..3045791 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriImportResult.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriImportResult.java @@ -122,6 +122,20 @@ public class PupitriImportResult { */ private String melagComment; + /** + * L'identifiant de la pièce-jointe du rapport généré suite à l'import. + * + * @since 3.11 + */ + private String reportAttachmentId; + + /** + * Le nom du rapport généré suite à l'import. + * + * @since 3.11 + */ + private String reportAttachmentFilename; + public PupitriImportResult() { this.catches = new ArrayList<>(); this.notImportedSpeciesIds = new LinkedHashSet<>(); @@ -183,6 +197,14 @@ public class PupitriImportResult { return ImmutableSet.copyOf(notImportedSpeciesIds); } + public String getReportAttachmentId() { + return reportAttachmentId; + } + + public String getReportAttachmentFilename() { + return reportAttachmentFilename; + } + /** * @return {@code true} if there is a total melag weight defined (at least one species MELA-GNE found). * @since 3.4.2 @@ -215,6 +237,14 @@ public class PupitriImportResult { this.rejectedWeight = rejectedWeight; } + void setReportAttachmentId(String reportAttachmentId) { + this.reportAttachmentId = reportAttachmentId; + } + + void setReportAttachmentFilename(String reportAttachmentFilename) { + this.reportAttachmentFilename = reportAttachmentFilename; + } + void flushCarrouselResult(CarrouselImportRequestResult carrouselImportRequestResult) { // set carrousel sorted weight diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriImportService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriImportService.java index 2f40334..b06b349 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriImportService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriImportService.java @@ -67,6 +67,7 @@ import java.io.IOException; import java.io.Reader; import java.io.Serializable; import java.text.DateFormat; +import java.text.SimpleDateFormat; import java.util.Collections; import java.util.List; import java.util.Locale; @@ -159,13 +160,27 @@ public class PupitriImportService extends AbstractTuttiService { // generation du rapport File reportFile = generatePupitriReport(operation, result); - // persistence des lots - savePupitriImportResult(result, operation, catchBatch); + try { - // ajout des pièces-jointes - addFileAsAttachment(trunkFile, catchBatch); - addFileAsAttachment(carrouselFile, catchBatch); - addFileAsAttachment(reportFile, catchBatch); + // persistence des lots + savePupitriImportResult(result, operation, catchBatch); + + // ajout des pièces-jointes + addFileAsAttachment(trunkFile, catchBatch); + addFileAsAttachment(carrouselFile, catchBatch); + + DateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd__HH_mm"); + String reportAttachmentFilename = "rapport-pupitri-" + simpleDateFormat.format(context.currentDate()) + ".pdf"; + if (log.isInfoEnabled()) { + log.info("Save report with attachment filename: " + reportAttachmentFilename); + } + String reportId = addFileAsAttachment(reportFile, reportAttachmentFilename, catchBatch); + result.setReportAttachmentId(reportId); + result.setReportAttachmentFilename(reportAttachmentFilename); + + } finally { + FileUtils.deleteQuietly(reportFile); + } } @@ -194,7 +209,7 @@ public class PupitriImportService extends AbstractTuttiService { persistenceService.getSpeciesByReferenceTaxonIdWithVernacularCode(species.getReferenceTaxonId()); String code; - + // if the protocol is set and the species is in the protocol if (protocolFilled && speciesProtocolMap.containsKey(species.getReferenceTaxonId())) { @@ -239,15 +254,20 @@ public class PupitriImportService extends AbstractTuttiService { } - protected void addFileAsAttachment(File f, CatchBatch catchBatch) { + protected String addFileAsAttachment(File f, CatchBatch catchBatch) { + return addFileAsAttachment(f, f.getName(), catchBatch); + } + + protected String addFileAsAttachment(File f, String attachmentName, CatchBatch catchBatch) { Attachment attachment = Attachments.newAttachment(); attachment.setObjectType(ObjectTypeCode.CATCH_BATCH); attachment.setObjectId(Integer.valueOf(catchBatch.getId())); - attachment.setName(f.getName()); + attachment.setName(attachmentName); String date = DateFormat.getDateTimeInstance().format(context.currentDate()); String comment = t("tutti.service.pupitri.import.attachment.comment", date); attachment.setComment(comment); - persistenceService.createAttachment(attachment, f); + Attachment savedAttachment = persistenceService.createAttachment(attachment, f); + return savedAttachment.getId(); } protected void importPupitriTrunk(PupitriImportResult result, File file, FishingOperation operation) { diff --git a/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties b/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties index d985a05..929293e 100644 --- a/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties +++ b/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties @@ -211,6 +211,9 @@ tutti.service.psionimport.error.unkonwSampleCategory.message= tutti.service.pupitri.export.species.error= tutti.service.pupitri.import.attachment.comment= tutti.service.pupitri.import.carrousel.error= +tutti.service.pupitri.import.createMelag.comment.part1= +tutti.service.pupitri.import.createMelag.comment.part2= +tutti.service.pupitri.import.createMelag.comment.part3= tutti.service.pupitri.import.trunk.error= tutti.service.referential.export.gear.error= tutti.service.referential.export.person.error= diff --git a/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties b/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties index 1e4416b..dd6d0ad 100644 --- a/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties +++ b/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties @@ -191,15 +191,15 @@ tutti.service.psionimport.error.unkonwSampleCategory.message=Pour l'espèce '<st tutti.service.pupitri.export.species.error=Erreur lors de l'export des espèces pour Pupitri dans le fichier %s tutti.service.pupitri.import.attachment.comment=Import Pupitri du %s tutti.service.pupitri.import.carrousel.error=Erreur lors de l'import du fichier de carrousel %2s pour le trait %1s +tutti.service.pupitri.import.createMelag.comment.part1=Traitement issu d'un mélange composé de \: +tutti.service.pupitri.import.createMelag.comment.part2=- %s%s de %s +tutti.service.pupitri.import.createMelag.comment.part3=avec un poids d'élévation de %s%s tutti.service.pupitri.import.trunk.error=Erreur lors de l'import du fichier de trémie %2s pour le trait %1s tutti.service.referential.export.gear.error=Erreur lors de l'export des engins dans le fichier %s tutti.service.referential.export.person.error=Erreur lors de l'export des personnes dans le fichier %s tutti.service.referential.export.species.error=Erreur lors de l'export des espèces dans le fichier %s tutti.service.referential.export.vessel.error=Erreur lors de l'export des navires dans le fichier %s tutti.service.referential.import.gear.add.noName.error=Le nom de l'engin est obligatoire -tutti.service.pupitri.import.createMelag.comment.part1=Traitement issu d'un mélange composé de \: -tutti.service.pupitri.import.createMelag.comment.part2=- %s%s de %s -tutti.service.pupitri.import.createMelag.comment.part3=avec un poids d'élévation de %s%s tutti.service.referential.import.gear.cannotDeleteNotExisting.error=L'engin temporaire d'identifiant %s n'extsite pas, impossible de la supprimer tutti.service.referential.import.gear.cannotDeleteWithoutId.error=L'identifiant est obligatoire pour la suppression tutti.service.referential.import.gear.existingName.error=L'engin '%s' n'a pas été ajouté au référentiel car il est déjà présent diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportPupitriAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportPupitriAction.java index 5937bd3..b9242c7 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportPupitriAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportPupitriAction.java @@ -39,6 +39,10 @@ import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchU import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchUIHandler; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchUIModel; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; +import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.jaxx.application.swing.AbstractApplicationUIHandler; import javax.swing.JOptionPane; import javax.swing.UIManager; @@ -55,6 +59,9 @@ import static org.nuiton.i18n.I18n.t; */ public class ImportPupitriAction extends AbstractTuttiAction<SpeciesBatchUIModel, SpeciesBatchUI, SpeciesBatchUIHandler> { + /** Logger. */ + private static final Log log = LogFactory.getLog(ImportPupitriAction.class); + protected File importedTrunkFile; protected File importedCarrouselFile; @@ -201,6 +208,36 @@ public class ImportPupitriAction extends AbstractTuttiAction<SpeciesBatchUIModel } + // Ask User to see pupiti report + + String reportAttachmentFilename = importResult.getReportAttachmentFilename(); + String htmlMessage = String.format( + AbstractApplicationUIHandler.CONFIRMATION_FORMAT, + t("tutti.editSpeciesBatch.action.importPupitri.showReport.message", reportAttachmentFilename), + ""); + + Component ui = getDialogParentComponent(); + + boolean showReport = JOptionPane.showOptionDialog( + ui, + htmlMessage, + t("tutti.editSpeciesBatch.action.importPupitri.showReport.title"), + JOptionPane.OK_CANCEL_OPTION, + JOptionPane.QUESTION_MESSAGE, + null, + new Object[]{t("tutti.editSpeciesBatch.action.showReport"), t("tutti.editSpeciesBatch.action.doNotShowReport")}, t("tutti.editSpeciesBatch.action.showReport")) == 0; + + if (showReport) { + + String reportAttachmentId = importResult.getReportAttachmentId(); + File attachmentFile = persistenceService.getAttachmentFile(reportAttachmentId); + if (log.isInfoEnabled()) { + log.info("Open pupitri report at " + attachmentFile); + } + + TuttiUIUtil.browseFile(attachmentFile); + + } } else { displayWarningMessage( diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java index 4f2b2b5..463ec9c 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java @@ -35,9 +35,12 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import javax.swing.*; +import java.awt.Desktop; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.MouseListener; +import java.io.File; +import java.io.IOException; import java.io.InputStream; import java.net.MalformedURLException; import java.net.URL; @@ -136,4 +139,15 @@ public final class TuttiUIUtil extends ApplicationUIUtil { } return SwingUtil.createActionIcon(iconName); } + + public static void browseFile(File file) { + + Desktop desktop = getDesktopForBrowse(); + try { + desktop.browse(file.toURI()); + + } catch (IOException e) { + TuttiUIContext.getApplicationContext().getErrorHelper().showErrorDialog(t("swing.error.cannot.open.file")); + } + } } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentEditorUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentEditorUIHandler.java index c85f630..bdb59d0 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentEditorUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentEditorUIHandler.java @@ -44,11 +44,9 @@ import javax.swing.JRootPane; import javax.swing.JToolBar; import javax.swing.KeyStroke; import java.awt.Component; -import java.awt.Desktop; import java.awt.event.ActionEvent; import java.awt.event.KeyEvent; import java.io.File; -import java.io.IOException; import java.util.List; import static org.nuiton.i18n.I18n.t; @@ -239,13 +237,7 @@ public class AttachmentEditorUIHandler extends AbstractTuttiUIHandler<TuttiUICon throw new ApplicationTechnicalException(t("tutti.attachmentEditor.fileNotFound", file.getAbsolutePath())); } - Desktop desktop = TuttiUIUtil.getDesktopForBrowse(); - try { - desktop.browse(file.toURI()); - - } catch (IOException e) { - getContext().getErrorHelper().showErrorDialog(t("swing.error.cannot.open.file")); - } + TuttiUIUtil.browseFile(file); } public void saveAttachment(Attachment attachment) { diff --git a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties index 6eabf35..d58638d 100644 --- a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties +++ b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties @@ -1015,6 +1015,7 @@ tutti.editSpeciesBatch.action.createBatch.tip= tutti.editSpeciesBatch.action.createMelag= tutti.editSpeciesBatch.action.createMelag.mnemonic= tutti.editSpeciesBatch.action.createMelag.tip= +tutti.editSpeciesBatch.action.doNotShowReport= tutti.editSpeciesBatch.action.editFrequencies= tutti.editSpeciesBatch.action.editFrequencies.mnemonic= tutti.editSpeciesBatch.action.editFrequencies.tip= @@ -1067,6 +1068,8 @@ tutti.editSpeciesBatch.action.importPupitri.mnemonic= tutti.editSpeciesBatch.action.importPupitri.no.matching.data= tutti.editSpeciesBatch.action.importPupitri.no.matching.fishingOperation= tutti.editSpeciesBatch.action.importPupitri.no.matching.fishingOperation.title= +tutti.editSpeciesBatch.action.importPupitri.showReport.message= +tutti.editSpeciesBatch.action.importPupitri.showReport.title= tutti.editSpeciesBatch.action.importPupitri.speciesNotImported.message= tutti.editSpeciesBatch.action.importPupitri.speciesNotImported.title= tutti.editSpeciesBatch.action.importPupitri.success= @@ -1084,6 +1087,7 @@ tutti.editSpeciesBatch.action.removeSubBatch.tip= tutti.editSpeciesBatch.action.renameBatch= tutti.editSpeciesBatch.action.renameBatch.mnemonic= tutti.editSpeciesBatch.action.renameBatch.tip= +tutti.editSpeciesBatch.action.showReport= tutti.editSpeciesBatch.action.splitBatch= tutti.editSpeciesBatch.action.splitBatch.mnemonic= tutti.editSpeciesBatch.action.splitBatch.tip= diff --git a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties index 4848047..cb83cdd 100644 --- a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties +++ b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties @@ -993,6 +993,7 @@ tutti.editSpeciesBatch.action.createBatch.tip=Créer un nouveau lot pour une esp tutti.editSpeciesBatch.action.createMelag=Espèces d'un MELAG (mélange) tutti.editSpeciesBatch.action.createMelag.mnemonic=C tutti.editSpeciesBatch.action.createMelag.tip=Calcul des poids des lots appartenant à un MELAG (mélange) +tutti.editSpeciesBatch.action.doNotShowReport=Continuer tutti.editSpeciesBatch.action.editFrequencies=Mensurations tutti.editSpeciesBatch.action.editFrequencies.mnemonic=M tutti.editSpeciesBatch.action.editFrequencies.tip=Éditer les mensurations @@ -1039,6 +1040,8 @@ tutti.editSpeciesBatch.action.importPupitri.mnemonic=u tutti.editSpeciesBatch.action.importPupitri.no.matching.data=Import pupitri non réalisé (Les identifiants de Station et/ ou de Date du trait ne correspondent pas) tutti.editSpeciesBatch.action.importPupitri.no.matching.fishingOperation=L'application n'a pas trouvé dans les fichiers Trunk et Carrousel les identifiants de Station et/ou de Date du trait en cours de saisie.<br/>Aucun lot n'a donc été importé. tutti.editSpeciesBatch.action.importPupitri.no.matching.fishingOperation.title=Import Pupitri +tutti.editSpeciesBatch.action.importPupitri.showReport.message=L'import pupitri a été réalisé et un rapport a été généré.<br/>Ce rapport (<strong>%s</strong>) a été enregistré dans les pièces-jointes de la capture. +tutti.editSpeciesBatch.action.importPupitri.showReport.title=Consulter le rapport d'import Pupitri tutti.editSpeciesBatch.action.importPupitri.speciesNotImported.message=%s espèces n'ont pas été importées lors de l'import Pupitri, en voici la liste \: <ul>%s</ul> tutti.editSpeciesBatch.action.importPupitri.speciesNotImported.title=Import Pupitri (espèces non importées) tutti.editSpeciesBatch.action.importPupitri.success=Import Pupitri réussi \: %1s espèces importées, %2s espèces rejetées @@ -1056,6 +1059,7 @@ tutti.editSpeciesBatch.action.removeSubBatch.tip=Supprimer tous les lots fils du tutti.editSpeciesBatch.action.renameBatch=Corriger l'espèce tutti.editSpeciesBatch.action.renameBatch.mnemonic=o tutti.editSpeciesBatch.action.renameBatch.tip=Corriger l'espèce +tutti.editSpeciesBatch.action.showReport=Consulter le rapport généré tutti.editSpeciesBatch.action.splitBatch=Catégoriser le lot tutti.editSpeciesBatch.action.splitBatch.mnemonic=C tutti.editSpeciesBatch.action.splitBatch.tip=Catégoriser le lot courant (celui de la ligne sélectionné) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch feature/6150 created (now 1f0b7a1)
by codelutin.com scm 22 Nov '14

22 Nov '14

This is an automated email from the git hooks/post-receive script. New change to branch feature/6150 in repository tutti. See http://git.codelutin.com/tutti.git at 1f0b7a1 Propose a l'utilisateur de consulter le rapport pupitri genere This branch includes the following new commits: new b9613b5 refs #6149 rename test new 9fcf63e - ajout d'un service de generation de pdf (utilisation pour le raport des captures) - debut de generation du rapport pupitri new 1f0b7a1 Propose a l'utilisateur de consulter le rapport pupitri genere The 3 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 1f0b7a10317739248f03f9739e9a4762c0959252 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Nov 22 15:51:08 2014 +0100 Propose a l'utilisateur de consulter le rapport pupitri genere commit 9fcf63e92d9090471b84c6d2a3ae9ce803cb0b0f Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Nov 22 15:04:02 2014 +0100 - ajout d'un service de generation de pdf (utilisation pour le raport des captures) - debut de generation du rapport pupitri commit b9613b5781bdf7fcc553dfccfaf11a8eee07aeb6 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Nov 22 14:50:46 2014 +0100 refs #6149 rename test -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

01/03: refs #6149 rename test
by codelutin.com scm 22 Nov '14

22 Nov '14

This is an automated email from the git hooks/post-receive script. New commit to branch feature/6150 in repository tutti. See http://git.codelutin.com/tutti.git commit b9613b5781bdf7fcc553dfccfaf11a8eee07aeb6 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Nov 22 14:50:46 2014 +0100 refs #6149 rename test --- ...riImportServiceEvo6149.java => PupitriImportServiceEvo6149Test.java} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceEvo6149.java b/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceEvo6149Test.java similarity index 98% rename from tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceEvo6149.java rename to tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceEvo6149Test.java index 3ebe58b..d4cba18 100644 --- a/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceEvo6149.java +++ b/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceEvo6149Test.java @@ -29,7 +29,7 @@ import java.util.Set; * @author Tony Chemit - chemit(a)codelutin.com * @since 3.10 */ -public class PupitriImportServiceEvo6149 extends PupitryImportServiceTestSupport { +public class PupitriImportServiceEvo6149Test extends PupitryImportServiceTestSupport { /** Logger. */ private static final Log log = LogFactory.getLog(PupitriImportServiceEvo5062Test.class); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch develop updated (3318653 -> 51ecc0c)
by codelutin.com scm 21 Nov '14

21 Nov '14

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from 3318653 fixes #6146: [CAPTURE] Pouvoir effectuer du melag sur un lot catégorisé (centrage des fenetres) new 7de70d3 reecriture de l'import pupitri pour mieux le gerer new fd9f6d3 les tests d'import pupitri refonctionnent new f742ba8 - ajout du commentaire de melag - ajout règle metier lors de l'import du melag pour changer en poids petit si aussi un poid G trouve new 51e9b2f amelioration du code d'import pupitri + ajout d'un test pour la fonctionnalite #6149 new 51ecc0c fixes #6147 fixes #6149 Merge branch 'feature/6147' into develop The 5 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 51ecc0c7ff9735f6b198e7d269ec9474d4bb20a0 Merge: 3318653 51e9b2f Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Nov 21 18:37:31 2014 +0100 fixes #6147 fixes #6149 Merge branch 'feature/6147' into develop commit 51e9b2fa3a92c5be9d6afd0ec61dd0de3eb0413f Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Nov 21 18:36:50 2014 +0100 amelioration du code d'import pupitri + ajout d'un test pour la fonctionnalite #6149 commit f742ba87cbe7e01af617911670dbfcb49d2d30bb Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Nov 21 18:00:02 2014 +0100 - ajout du commentaire de melag - ajout règle metier lors de l'import du melag pour changer en poids petit si aussi un poid G trouve commit fd9f6d3f6b2f90b6c68c213d779c8f2b1d96689a Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Nov 21 16:19:30 2014 +0100 les tests d'import pupitri refonctionnent commit 7de70d388fa024f52b8cd269ef3a3928a21cbb0a Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Nov 21 16:19:00 2014 +0100 reecriture de l'import pupitri pour mieux le gerer Summary of changes: .../pupitri/CarrouselImportRequestResult.java | 83 ++++++ .../tutti/service/pupitri/PupitriCatch.java | 27 +- .../tutti/service/pupitri/PupitriImportResult.java | 194 ++++++++------ .../service/pupitri/PupitriImportService.java | 298 ++++++++++++++------- .../resources/i18n/tutti-service_en_GB.properties | 1 - .../resources/i18n/tutti-service_fr_FR.properties | 4 +- .../pupitri/PupitriImportServiceAno3898Test.java | 58 +--- .../pupitri/PupitriImportServiceAno5032Test.java | 60 +---- .../pupitri/PupitriImportServiceAno5079Test.java | 57 +--- .../pupitri/PupitriImportServiceEvo5060Test.java | 56 +--- .../pupitri/PupitriImportServiceEvo5062Test.java | 56 +--- .../pupitri/PupitriImportServiceEvo6149.java | 153 +++++++++++ .../service/pupitri/PupitriImportServiceTest.java | 68 ++--- .../pupitri/PupitryImportServiceTestSupport.java | 53 ++++ .../src/test/resources/pupitri/evo-6149.car | 6 + .../pupitri/{evo-5060.tnk => evo-6149.tnk} | 0 ...o-5062.tuttiProtocol => evo-6149.tuttiProtocol} | 0 17 files changed, 705 insertions(+), 469 deletions(-) create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/CarrouselImportRequestResult.java create mode 100644 tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceEvo6149.java create mode 100644 tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitryImportServiceTestSupport.java create mode 100644 tutti-service/src/test/resources/pupitri/evo-6149.car copy tutti-service/src/test/resources/pupitri/{evo-5060.tnk => evo-6149.tnk} (100%) copy tutti-service/src/test/resources/pupitri/{evo-5062.tuttiProtocol => evo-6149.tuttiProtocol} (100%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 5

branch develop updated (7bd7807 -> 3318653)
by codelutin.com scm 21 Nov '14

21 Nov '14

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from 7bd7807 fixes #6146: [CAPTURE] Pouvoir effectuer du melag sur un lot catégorisé new 3318653 fixes #6146: [CAPTURE] Pouvoir effectuer du melag sur un lot catégorisé (centrage des fenetres) 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 3318653bb2f3fda3f28719652dee1a8a3a17de67 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Nov 21 09:22:39 2014 +0100 fixes #6146: [CAPTURE] Pouvoir effectuer du melag sur un lot catégorisé (centrage des fenetres) Summary of changes: .../fr/ifremer/tutti/ui/swing/action/CreateBenthosMelagAction.java | 2 +- .../fr/ifremer/tutti/ui/swing/action/CreateSpeciesMelagAction.java | 2 +- .../tutti/ui/swing/util/species/EnterMelagWeightUIHandler.java | 7 +++++-- 3 files changed, 7 insertions(+), 4 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (13263c3 -> 7bd7807)
by codelutin.com scm 21 Nov '14

21 Nov '14

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from 13263c3 fixes #6145 [IMPORT] pupitri depuis especes, si des espèces ne sont pas importées, lister les codes non importés pour aider à identifier le problème Merge branch 'feature/5737' into develop new 7bd7807 fixes #6146: [CAPTURE] Pouvoir effectuer du melag sur un lot catégorisé 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 7bd7807a7520fe8315f8084738ceda5aaee91d41 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Nov 21 09:13:56 2014 +0100 fixes #6146: [CAPTURE] Pouvoir effectuer du melag sur un lot catégorisé Summary of changes: .../ui/swing/action/CreateBenthosMelagAction.java | 154 ++++++++++++++------ .../ui/swing/action/CreateSpeciesMelagAction.java | 158 ++++++++++++++------- .../catches/SpeciesAbleBatchRowHelper.java | 41 +++++- .../catches/benthos/BenthosBatchUIHandler.java | 20 +-- .../catches/species/SpeciesBatchUIHandler.java | 20 +-- 5 files changed, 259 insertions(+), 134 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (75f9a99 -> 13263c3)
by codelutin.com scm 20 Nov '14

20 Nov '14

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from 75f9a99 fixes #6091: [CAPTURE] poids 127 ou 254 ou 508 g etc dans le Benthos, modification de la valeur saisie au moment de l'élévation des poids ! new ecd9945 separation en deux du service d'import et d'export pupitri new cdea1ed enregistrement des ids des especes non importees new b91151b affichage des especes non importees new 13263c3 fixes #6145 [IMPORT] pupitri depuis especes, si des espèces ne sont pas importées, lister les codes non importés pour aider à identifier le problème Merge branch 'feature/5737' into develop The 4 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 13263c398f23bd03c085d008faab0e9a106b63be Merge: 75f9a99 b91151b Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Nov 20 13:36:55 2014 +0100 fixes #6145 [IMPORT] pupitri depuis especes, si des espèces ne sont pas importées, lister les codes non importés pour aider à identifier le problème Merge branch 'feature/5737' into develop commit b91151b6c8b1c372ff8b550353133fdee4a44c60 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Nov 20 13:32:08 2014 +0100 affichage des especes non importees commit cdea1edd304af7ab74e3377fdffa34bb37c0933a Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Nov 20 13:31:47 2014 +0100 enregistrement des ids des especes non importees commit ecd99450526525904ac46db9fd5b786ffb9dc5b2 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Nov 20 12:52:22 2014 +0100 separation en deux du service d'import et d'export pupitri Summary of changes: .../service/pupitri/PupitriExportService.java | 58 ++++++++++++++++++++++ .../tutti/service/pupitri/PupitriImportResult.java | 33 ++++++++---- ...xportService.java => PupitriImportService.java} | 42 ++-------------- .../pupitri/PupitriImportServiceAno3898Test.java | 7 +-- .../pupitri/PupitriImportServiceAno5032Test.java | 7 +-- .../pupitri/PupitriImportServiceAno5079Test.java | 7 +-- .../pupitri/PupitriImportServiceEvo5060Test.java | 7 +-- .../pupitri/PupitriImportServiceEvo5062Test.java | 7 +-- ...viceTest.java => PupitriImportServiceTest.java} | 6 +-- .../fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 11 ++-- .../tutti/ui/swing/action/ExportPupitriAction.java | 9 ++-- .../tutti/ui/swing/action/ImportPupitriAction.java | 44 ++++++++++++---- .../resources/i18n/tutti-ui-swing_en_GB.properties | 2 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 2 + 14 files changed, 160 insertions(+), 82 deletions(-) create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriExportService.java rename tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/{PupitriImportExportService.java => PupitriImportService.java} (93%) rename tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/{PupitriImportExportServiceTest.java => PupitriImportServiceTest.java} (96%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 4

branch develop updated (1ea908c -> 75f9a99)
by codelutin.com scm 20 Nov '14

20 Nov '14

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from 1ea908c fixes #6139: [ERGO] case à cocher "à confirmer", déplacer en première colonne et surpprimer son titre new 75f9a99 fixes #6091: [CAPTURE] poids 127 ou 254 ou 508 g etc dans le Benthos, modification de la valeur saisie au moment de l'élévation des poids ! 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 75f9a99325522d77957c06aa07ca3bf7d22edbb4 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Nov 20 12:34:08 2014 +0100 fixes #6091: [CAPTURE] poids 127 ou 254 ou 508 g etc dans le Benthos, modification de la valeur saisie au moment de l'élévation des poids ! Summary of changes: .../java/fr/ifremer/tutti/type/WeightUnit.java | 24 +++++++++++++++ .../operation/catches/SampleCategoryComponent.java | 35 +++++++++++++++------- .../catches/benthos/BenthosBatchUIHandler.java | 3 +- .../catches/species/SpeciesBatchUIHandler.java | 3 +- 4 files changed, 53 insertions(+), 12 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (b9d1960 -> 1ea908c)
by codelutin.com scm 20 Nov '14

20 Nov '14

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from b9d1960 fixes #6096 new 1ea908c fixes #6139: [ERGO] case à cocher "à confirmer", déplacer en première colonne et surpprimer son titre 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 1ea908c5f39510427649a673aea7d7dda15c0e53 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Nov 20 11:44:41 2014 +0100 fixes #6139: [ERGO] case à cocher "à confirmer", déplacer en première colonne et surpprimer son titre Summary of changes: ...wHelper.java => SpeciesAbleBatchRowHelper.java} | 13 +++-- .../catches/benthos/BenthosBatchTableModel.java | 2 +- .../catches/benthos/BenthosBatchUIHandler.java | 58 ++++++++++------------ .../catches/species/SpeciesBatchTableModel.java | 14 +++--- .../catches/species/SpeciesBatchUIHandler.java | 47 ++++++++---------- .../content/protocol/EditProtocolUIHandler.java | 10 ++-- .../resources/i18n/tutti-ui-swing_en_GB.properties | 6 +++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 10 ++-- 8 files changed, 84 insertions(+), 76 deletions(-) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/{SpeciesBatchRowHelper.java => SpeciesAbleBatchRowHelper.java} (96%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/5954 created (now da2b256)
by codelutin.com scm 20 Nov '14

20 Nov '14

This is an automated email from the git hooks/post-receive script. New change to branch feature/5954 in repository tutti. See http://git.codelutin.com/tutti.git at da2b256 refs #6129 [IMPORT SUMATRA] Import des valeurs des PSFMs et des champs du trait This branch includes the following new commits: new da2b256 refs #6129 [IMPORT SUMATRA] Import des valeurs des PSFMs et des champs du trait 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 da2b256ba3825cb582592e9f1d5e2bd15346ed3b Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Nov 20 11:12:18 2014 +0100 refs #6129 [IMPORT SUMATRA] Import des valeurs des PSFMs et des champs du trait -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1