[Tutti-commits] branch develop updated (41ae140 -> 3cbcdc3)

27 Mar 2015

      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  41ae140   move some code
       new  aaeb470   problème d'égalite d'une campagne si le surveyPart est vide ou null
       new  4550174   suppression des pieces jointes d'une catchBatch a sa suppression
       new  5f907f3   amélioration de la suppression d'une pièce jointe
       new  59e93c7   decompresser l'archive d'import des le debut (on ne travaille plus sur les entrées du zip
       new  ee8aa17   refs #6820 modification des imports pour pouvoir importer les pj
       new  1432b54   refs #6820 ajout de l'import des pj
       new  b53e9a7   fix typo
       new  ded5f75   delete pj before deleting catch batch
       new  2e3fee3   all pj imports wokrs now
       new  3cbcdc3   fixes #6820: [IMPORT GENERIQUE] Import des pièces jointes Merge branch 'feature/6820' into develop

The 10 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 3cbcdc3f96f32ecd7abc3c19ae33119b622c3d4c
Merge: 41ae140 2e3fee3
Author: Tony CHEMIT <chemit@codelutin.com>
Date:   Fri Mar 27 18:22:18 2015 +0100

    fixes #6820: [IMPORT GENERIQUE] Import des pièces jointes
    Merge branch 'feature/6820' into develop

commit 2e3fee3260ccc887bdbb20c5b120e43486b8ec62
Author: Tony CHEMIT <chemit@codelutin.com>
Date:   Fri Mar 27 18:21:59 2015 +0100

    all pj imports wokrs now

commit ded5f75bbcbda4cb94469546380151cd44dc0c95
Author: Tony CHEMIT <chemit@codelutin.com>
Date:   Fri Mar 27 18:21:46 2015 +0100

    delete pj before deleting catch batch

commit b53e9a70035870da94608926a9bd7bfb9063df6d
Author: Tony CHEMIT <chemit@codelutin.com>
Date:   Fri Mar 27 16:24:58 2015 +0100

    fix typo

commit 1432b54c76b994b3a887bd4d6bfd6923b10962cd
Author: Tony CHEMIT <chemit@codelutin.com>
Date:   Fri Mar 27 16:24:44 2015 +0100

    refs #6820 ajout de l'import des pj

commit ee8aa173479d96a13fc4fad46763298a8e82a5cf
Author: Tony CHEMIT <chemit@codelutin.com>
Date:   Fri Mar 27 16:24:11 2015 +0100

    refs #6820 modification des imports pour pouvoir importer les pj

commit 59e93c7bfb3c13d5aee235cf40c57d02ee5b6db7
Author: Tony CHEMIT <chemit@codelutin.com>
Date:   Fri Mar 27 16:22:49 2015 +0100

    decompresser l'archive d'import des le debut (on ne travaille plus sur les entrées du zip

commit 5f907f33e5565f424c1cb50d279225839e47913a
Author: Tony CHEMIT <chemit@codelutin.com>
Date:   Fri Mar 27 16:22:00 2015 +0100

    amélioration de la suppression d'une pièce jointe

commit 455017422a1c98861d0ce963f9f48f1dc40b9756
Author: Tony CHEMIT <chemit@codelutin.com>
Date:   Fri Mar 27 16:21:35 2015 +0100

    suppression des pieces jointes d'une catchBatch a sa suppression

commit aaeb47017c46cfbb0a361704f7fde8014f5891ee
Author: Tony CHEMIT <chemit@codelutin.com>
Date:   Fri Mar 27 16:20:53 2015 +0100

    problème d'égalite d'une campagne si le surveyPart est vide ou null

Summary of changes:
 .../tutti/persistence/entities/data/Cruises.java   |  18 ++-
 .../service/AttachmentPersistenceServiceImpl.java  |  26 +++-
 .../FishingOperationPersistenceServiceImpl.java    |  11 +-
 .../service/util/BatchPersistenceHelper.java       |   1 +
 .../genericformat/GenericFormatArchive.java        | 148 +++++++--------------
 .../genericformat/GenericFormatContextSupport.java |  33 ++++-
 .../GenericFormatImportOperationContext.java       |  15 +++
 .../genericformat/GenericFormatImportService.java  |   3 +
 .../GenericformatImportPersitenceHelper.java       |  96 +++++++++++--
 .../consumer/CsvConsumerForAccidentalCatch.java    |   1 +
 .../consumer/CsvConsumerForAttachment.java         |  29 ++++
 .../consumer/CsvConsumerForCatch.java              |  12 +-
 .../CsvConsumerForIndividualObservation.java       |   1 +
 .../service/genericformat/csv/AttachmentRow.java   |  12 ++
 .../service/genericformat/csv/CatchModel.java      |   4 +-
 .../genericformat/csv/ExportSampleCategory.java    |   6 +-
 .../genericformat/csv/MarineLitterModel.java       |   4 +-
 .../service/genericformat/csv/MarineLitterRow.java |  10 +-
 .../service/genericformat/csv/OperationModel.java  |   8 +-
 .../service/genericformat/csv/OperationRow.java    |  26 ++--
 .../service/genericformat/csv/SurveyModel.java     |   4 +-
 .../tutti/service/genericformat/csv/SurveyRow.java |  12 +-
 .../importactions/ImportOperationAction.java       |   8 +-
 .../importactions/ImportSurveyAction.java          |   7 +-
 .../importactions/LoadAttachmentsAction.java       |  80 +++++++++++
 .../producer/CsvProducerForSurvey.java             |   1 +
 .../resources/i18n/tutti-service_en_GB.properties  |   1 +
 .../resources/i18n/tutti-service_fr_FR.properties  |   1 +
 .../resources/i18n/tutti-ui-swing_fr_FR.properties |   4 +-
 29 files changed, 420 insertions(+), 162 deletions(-)
 create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/CsvConsumerForAttachment.java
 create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/LoadAttachmentsAction.java

-- 
To stop receiving notification emails like this one, please contact
codelutin.com SCM administrator <admin+scm@codelutin.com>.

[Tutti-commits] branch develop updated (41ae140 -> 3cbcdc3)

codelutin.com scm