[Echobase-commits] branch develop updated (e9095b6 -> 7272ca2)

13 May 2016

      This is an automated email from the git hooks/post-receive script.

New change to branch develop in repository echobase.

See https://gitlab.nuiton.org/codelutin/echobase.git

      from  e9095b6   Livrable #8170 Merge branch 'feature/8170' into develop
       new  1541342   Ne pas autorisé un import d'un voyage déjà existant (clef unique name) (See #2246)
       new  2d6139e   Ajout bidirection sur le modèle (A reverter quand import branche Atlantos)
       new  262c51e   Début ajout migration pour les clef naturelles + traitement pour import transit (See #2246)
       new  cda7281   Typo sur le nom d'une méthode
       new  73ff899   Ne pas autoriser de réimporter des transits déjà existants (See #2246)
       new  31e9b45   Ne pas autoriser de réimporter des transects déjà existants (See #2246)
       new  b3b3fac   Ne pas pouvoir éditer les entitées transverses
       new  3209872   Ne pas autoriser de réimporter des opérations déjà existantes (See #2246)
       new  dec2182   Renommage i18n
       new  e847db7   Ajout toString
       new  fa0d99e   Bine utiliser la bonne page de résultat
       new  045c9fc   Gérer la nullité d'erreur sur un import
       new  8690ac9   Meilleure gestion de la suppression d'un ImportLog
       new  91a2107   Ajout toString
       new  7a78dc1   Nom de Zeus... ne jamais utiliser id comme nom de colonne car en hql ici c'est égale au TopiaId...
       new  42d9dbb   Tester avant de supprimer lors de la suppression d'un import
       new  9f72d77   Ne pas autoriser de réimporter des meta sur les opérations et engins déjà existantes (See #2246)
       new  883d892   Ne pas pouvoir effectuer plusieurs imports du même type
       new  ea54a1e   Début de check pour les Sub-Sample mais il me manque des confirmations, à revoir avec Mathieu
       new  0896dd7   Catch more exception while importing + ajout meilleur TODO
       new  6bcfd28   i18n
       new  a23905d   Ne pas autoriser de réimporter les données acoustiques déjà existantes (See #2246)
       new  0b1e7ee   Ajout du numéro de ligne dans les messages d'erreurs (See #2246)
       new  9867f8f   Ne pas autoriser de réimporter les résultats sur les voyages déjà existants (See #2246)
       new  8cf674f   Ne pas autoriser de réimporter les résultats sur les voyages déjà existants (See #2246)
       new  3800f29   Refs-60 #2246, il reste encore quelques petits ajustements à faire. Merge branch 'feature/2246' into develop
       new  7272ca2   Mise à jour des bases de test

The 27 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 7272ca2e7f0f6f3a1e2181ab26a330e1bab559ce
Author: Tony CHEMIT <chemit@codelutin.com>
Date:   Fri May 13 08:50:11 2016 +0200

    Mise à jour des bases de test

commit 3800f292fed0f97dbd270cf1c80ae39e66434f77
Merge: e9095b6 8cf674f
Author: Tony CHEMIT <chemit@codelutin.com>
Date:   Fri May 13 08:45:01 2016 +0200

    Refs-60 #2246, il reste encore quelques petits ajustements à faire.
    Merge branch 'feature/2246' into develop

commit 8cf674f1b633a46ba7f6006fedfbd14a3c173fe2
Author: Tony CHEMIT <chemit@codelutin.com>
Date:   Fri May 13 08:43:10 2016 +0200

    Ne pas autoriser de réimporter les résultats sur les voyages déjà existants (See #2246)

commit 9867f8f7a6cca1411711b3e7debb5b26d9dba16b
Author: Tony CHEMIT <chemit@codelutin.com>
Date:   Thu May 12 16:28:46 2016 +0200

    Ne pas autoriser de réimporter les résultats sur les voyages déjà existants (See #2246)

commit 0b1e7eef684a101f9c325a898721ae91aadae88a
Author: Tony CHEMIT <chemit@codelutin.com>
Date:   Thu May 12 15:49:30 2016 +0200

    Ajout du numéro de ligne dans les messages d'erreurs (See #2246)

commit a23905dde41b2fbd383cb388072f791e13eedc01
Author: Tony CHEMIT <chemit@codelutin.com>
Date:   Thu May 12 15:39:59 2016 +0200

    Ne pas autoriser de réimporter les données acoustiques déjà existantes (See #2246)

commit 6bcfd28ac5a7a8547b4881f45a94f8015143e0d3
Author: Tony CHEMIT <chemit@codelutin.com>
Date:   Thu May 12 09:10:22 2016 +0200

    i18n

commit 0896dd7e73ceaab18a32924bbe995f719a7d4956
Author: Tony CHEMIT <chemit@codelutin.com>
Date:   Thu May 12 09:09:06 2016 +0200

    Catch more exception while importing + ajout meilleur TODO

commit ea54a1e9f532ce63c96c8b723871a609649c4e9a
Author: Tony CHEMIT <chemit@codelutin.com>
Date:   Tue May 10 10:50:51 2016 +0200

    Début de check pour les Sub-Sample mais il me manque des confirmations, à revoir avec Mathieu

commit 883d89247f05706f7705b3d865dea461a9780ca1
Author: Tony CHEMIT <chemit@codelutin.com>
Date:   Tue May 10 10:03:34 2016 +0200

    Ne pas pouvoir effectuer plusieurs imports du même type

commit 9f72d77b3ef53ef5a390f1f9c790b541c3ae5e4b
Author: Tony CHEMIT <chemit@codelutin.com>
Date:   Tue May 10 09:46:46 2016 +0200

    Ne pas autoriser de réimporter des meta sur les opérations et engins déjà existantes (See #2246)

commit 42d9dbba9a49a41ab7d08a151dfbecf0b1053ca6
Author: Tony CHEMIT <chemit@codelutin.com>
Date:   Tue May 10 08:56:15 2016 +0200

    Tester avant de supprimer lors de la suppression d'un import

commit 7a78dc116fad15df2eb723e922cfb9cec2b216e2
Author: Tony CHEMIT <chemit@codelutin.com>
Date:   Tue May 10 08:55:34 2016 +0200

    Nom de Zeus... ne jamais utiliser id comme nom de colonne car en hql ici c'est égale au TopiaId...

commit 91a2107e04ad9955ce6cde17e8efa332d36fa8c9
Author: Tony CHEMIT <chemit@codelutin.com>
Date:   Tue May 10 08:54:44 2016 +0200

    Ajout toString

commit 8690ac9d3c8e864dbb6e13d085f1dcd9f246612f
Author: Tony CHEMIT <chemit@codelutin.com>
Date:   Mon May 9 19:20:48 2016 +0200

    Meilleure gestion de la suppression d'un ImportLog

commit 045c9fc487758a476e73a9a9a4fae09f070d1640
Author: Tony CHEMIT <chemit@codelutin.com>
Date:   Mon May 9 19:20:14 2016 +0200

    Gérer la nullité d'erreur sur un import

commit fa0d99e448c1bd5ecfb5b26b105f755c90db949c
Author: Tony CHEMIT <chemit@codelutin.com>
Date:   Mon May 9 19:19:51 2016 +0200

    Bine utiliser la bonne page de résultat

commit e847db717f176fcec2da21cf4c64be64cf77c712
Author: Tony CHEMIT <chemit@codelutin.com>
Date:   Mon May 9 18:38:36 2016 +0200

    Ajout toString

commit dec218226fafb44f80dcc85e11ba2324f4c79119
Author: Tony CHEMIT <chemit@codelutin.com>
Date:   Mon May 9 18:37:56 2016 +0200

    Renommage i18n

commit 32098723e5d9346217d1be59713a9630832fe5c3
Author: Tony CHEMIT <chemit@codelutin.com>
Date:   Mon May 9 18:37:39 2016 +0200

    Ne pas autoriser de réimporter des opérations déjà existantes (See #2246)

commit b3b3fac2a9ecde1f843db04c7e9a2ecca76c7d0f
Author: Tony CHEMIT <chemit@codelutin.com>
Date:   Mon May 9 18:36:32 2016 +0200

    Ne pas pouvoir éditer les entitées transverses

commit 31e9b4548532e513bc3563f6f9e283f526d5e091
Author: Tony CHEMIT <chemit@codelutin.com>
Date:   Mon May 9 15:08:46 2016 +0200

    Ne pas autoriser de réimporter des transects déjà existants (See #2246)

commit 73ff8998bbea1e78b5e9f802361b1289bb973868
Author: Tony CHEMIT <chemit@codelutin.com>
Date:   Mon May 9 14:49:36 2016 +0200

    Ne pas autoriser de réimporter des transits déjà existants (See #2246)

commit cda728120f5ebdb2c5e0cacecd3aa7a1077966e3
Author: Tony CHEMIT <chemit@codelutin.com>
Date:   Mon May 9 14:49:09 2016 +0200

    Typo sur le nom d'une méthode

commit 262c51e3583f2b496b87c78615a1f8cd4ba0c252
Author: Tony CHEMIT <chemit@codelutin.com>
Date:   Mon May 9 14:14:33 2016 +0200

    Début ajout migration pour les clef naturelles + traitement pour import transit (See #2246)

commit 2d6139eea45b74df2404f6f025c1b334cf57066c
Author: Tony CHEMIT <chemit@codelutin.com>
Date:   Mon May 9 14:12:27 2016 +0200

    Ajout bidirection sur le modèle (A reverter quand import branche Atlantos)

commit 1541342e799e303c66794950deca07c828e724f0
Author: Tony CHEMIT <chemit@codelutin.com>
Date:   Mon May 9 13:01:12 2016 +0200

    Ne pas autorisé un import d'un voyage déjà existant (clef unique name) (See #2246)

Summary of changes:
 .../echobase/entities/ImportFileIdTopiaDao.java    |   2 +-
 .../echobase/entities/ImportFileTopiaDao.java      |  15 +++-
 .../echobase/entities/ImportLogTopiaDao.java       |   6 +-
 .../{DataImpl.java => GearMetadataValueImpl.java}  |   8 +-
 ...taImpl.java => OperationMetadataValueImpl.java} |   9 +-
 .../java/fr/ifremer/echobase/io/InputFile.java     |  20 +++++
 .../echobase/persistence/EchoBaseDbMeta.java       |   5 ++
 ...WorkingDbMigrationCallBackForVersion3_903.java} |  10 +--
 .../workingDb/h2/3.903-0-add-naturalIds.sql        |   2 +
 .../workingDb/pg/3.903-0-add-naturalIds.sql        |   2 +
 echobase-domain/src/main/xmi/echobase.properties   |  10 ++-
 echobase-domain/src/main/xmi/echobase.zargo        | Bin 90458 -> 90445 bytes
 .../services/service/UserDbPersistenceService.java |  93 +++++++++++++++++++++
 .../DuplicatedEchotypeAssociationException.java    |  20 +++++
 ...java => DuplicatedElementaryCellException.java} |   8 +-
 ...ption.java => DuplicatedEsduCellException.java} |   8 +-
 ...a => DuplicatedGearMetadataValueException.java} |  19 +++--
 ...eption.java => DuplicatedMapCellException.java} |   8 +-
 ...tion.java => DuplicatedOperationException.java} |  10 +--
 ...DuplicatedOperationMetadataValueException.java} |  11 +--
 ...ion.java => DuplicatedRegionCellException.java} |   9 +-
 ...plicatedResultsVoyageLengthAgeKeyException.java |  20 +++++
 ...catedResultsVoyageLengthWeightKeyException.java |  20 +++++
 .../importdata/DuplicatedSampleException.java      |   4 +-
 ...tion.java => DuplicatedSubSampleException.java} |  15 ++--
 ...ption.java => DuplicatedTransectException.java} |  10 +--
 ...eption.java => DuplicatedTransitException.java} |  11 ++-
 ...ception.java => DuplicatedVoyageException.java} |  10 +--
 .../importdata/MismatchVoyageException.java        |  21 +++++
 .../actions/ImportDataActionSupport.java           |   8 +-
 .../actions/VoyageAcousticsImportAction.java       |  18 +++-
 .../VoyageCatchesSubSampleImportAction.java        |  12 +++
 .../VoyageCatchesTotalSampleImportAction.java      |   2 +-
 .../actions/VoyageCommonsTransectImportAction.java |   6 ++
 .../actions/VoyageCommonsTransitImportAction.java  |   8 +-
 .../actions/VoyageCommonsVoyageImportAction.java   |  13 ++-
 .../VoyageOperationsGearMetadataImportAction.java  |  24 ++++++
 .../VoyageOperationsOperationImportAction.java     |   6 ++
 ...ageOperationsOperationMetadataImportAction.java |  13 ++-
 .../VoyageResultsMapFishCellImportAction.java      |  15 +++-
 .../VoyageResultsMapOtherCellImportAction.java     |  15 +++-
 .../actions/VoyageResultsRegionImportAction.java   |  21 ++++-
 .../VoyageResultsVoyageEchotypeImportAction.java   |  19 +++--
 ...oyageResultsVoyageLengthAgeKeyImportAction.java |  31 +++++++
 ...geResultsVoyageLengthWeightKeyImportAction.java |  38 ++++++++-
 .../service/removedata/RemoveDataService.java      |   6 +-
 .../strategy/AbstractRemoveDataStrategy.java       |  15 ++--
 .../strategy/OperationRemoveDataStrategy.java      |  25 +++++-
 .../i18n/echobase-services_en_GB.properties        |  17 +++-
 .../i18n/echobase-services_fr_FR.properties        |  15 ++++
 .../removedata/AbstractRemoveDataServiceTest.java  |   6 ++
 .../echobase-catches-and-voyage-result.h2.db.gz    | Bin 826644 -> 825254 bytes
 .../import-data/echobase-catches.h2.db.gz          | Bin 754845 -> 755094 bytes
 .../import-data/echobase-commonData.h2.db.gz       | Bin 184388 -> 184645 bytes
 .../resources/import-data/echobase-nodata.h2.db.gz | Bin 137434 -> 137582 bytes
 .../echobase-operation-total-samples.h2.db.gz      | Bin 601307 -> 601537 bytes
 .../import-data/echobase-operation.h2.db.gz        | Bin 327903 -> 328156 bytes
 .../actions/importData/ConfigureCommonImport.java  |   2 +-
 .../jsp/importData/importDataActionResult.jsp      |   2 +-
 .../jsp/importData/resultAcousticImport.jsp        |   2 +-
 .../WEB-INF/jsp/importData/resultCatchesImport.jsp |   2 +-
 .../jsp/importData/resultOperationImport.jsp       |   2 +-
 .../WEB-INF/jsp/importData/resultResultsImport.jsp |   2 +-
 63 files changed, 615 insertions(+), 116 deletions(-)
 copy echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/{DataImpl.java => GearMetadataValueImpl.java} (61%)
 copy echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/{DataImpl.java => OperationMetadataValueImpl.java} (60%)
 copy echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/{WorkingDbMigrationCallBackForVersion3_902.java => WorkingDbMigrationCallBackForVersion3_903.java} (73%)
 create mode 100644 echobase-domain/src/main/resources/migration/workingDb/h2/3.903-0-add-naturalIds.sql
 create mode 100644 echobase-domain/src/main/resources/migration/workingDb/pg/3.903-0-add-naturalIds.sql
 create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/DuplicatedEchotypeAssociationException.java
 copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{NoVoyageToImportException.java => DuplicatedElementaryCellException.java} (77%)
 copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{NoVoyageToImportException.java => DuplicatedEsduCellException.java} (78%)
 copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{DataMetadataNotFoundException.java => DuplicatedGearMetadataValueException.java} (55%)
 copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{NoVoyageToImportException.java => DuplicatedMapCellException.java} (78%)
 copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{MoreThanOnceVoyageToImportException.java => DuplicatedOperationException.java} (72%)
 copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{MoreThanOnceVoyageToImportException.java => DuplicatedOperationMetadataValueException.java} (67%)
 copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{DataMetadataNotFoundException.java => DuplicatedRegionCellException.java} (77%)
 create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/DuplicatedResultsVoyageLengthAgeKeyException.java
 create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/DuplicatedResultsVoyageLengthWeightKeyException.java
 copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{MoreThanOnceVoyageToImportException.java => DuplicatedSubSampleException.java} (67%)
 copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{NoVoyageToImportException.java => DuplicatedTransectException.java} (77%)
 copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{TransitNotFoundException.java => DuplicatedTransitException.java} (74%)
 copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{NoVoyageToImportException.java => DuplicatedVoyageException.java} (79%)
 create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/MismatchVoyageException.java

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

[Echobase-commits] branch develop updated (e9095b6 -> 7272ca2)

codelutin.com scm