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

branch feature/8116 created (now 9479b97)
by codelutin.com scm 16 Mar '16

16 Mar '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/8116 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git at 9479b97 - ajout d'une colonne "poids calculé par rtp" - remplacement de la checkbox "utiliser les rtp" par "Recopie des poids via RTP" qui désactive la colonne de saisie des poids et qui recopie automatiquement les poids rtp dans la colonne poids fixes #8116 This branch includes the following new commits: new 9479b97 - ajout d'une colonne "poids calculé par rtp" - remplacement de la checkbox "utiliser les rtp" par "Recopie des poids via RTP" qui désactive la colonne de saisie des poids et qui recopie automatiquement les poids rtp dans la colonne poids fixes #8116 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 9479b97233bf40172168d169399a5f7ad31462a7 Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Mar 16 16:33:23 2016 +0100 - ajout d'une colonne "poids calculé par rtp" - remplacement de la checkbox "utiliser les rtp" par "Recopie des poids via RTP" qui désactive la colonne de saisie des poids et qui recopie automatiquement les poids rtp dans la colonne poids fixes #8116 -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (17feb63 -> ac8ec7d)
by codelutin.com scm 16 Mar '16

16 Mar '16

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git from 17feb63 Merge branch 'feature/8135' into 'develop' adds 1033b95 ajout de méthodes sympas pour éviter les cast adds edeba5d Réusinage du modèle des échantillons adds 0b453b4 Ajout du mode de recopie au niveau des observations individuelles (See #8130) adds 61e3c16 Récupération de la valeur qualitative mise en cache adds e7e9719 Surcharge de la méthode put de CaracteristicMap pour bien vérifier de ce qui est mis dedans adds 22d3bf9 fix api adds 5c4d5c5 bien enregistrer la valeur qualitative de mode de recopie et non pas la valeur de l'enum + rennomage de la méthode d'extraction des caractéristiques de Sample adds 64e0a57 Recopie du mode dans chaque ligne adds 8edce14 Ajout méthode de recopie adds d08a3f6 Utilisation des méthodes withXXX + ne plus utiliser guava quand c'est possible adds c47df44 Amélioration du chargement de l'écran (et intégration du mode de recopie) adds 8082660 Revue de la sauvegarde et intégration du mode de recopie adds ac8ec7d Merge branch 'feature/8130' into 'develop' No new revisions were added by this update. Summary of changes: .../tutti/persistence/TuttiPersistenceImpl.java | 5 + .../persistence/TuttiPersistenceNoDbImpl.java | 5 + .../persistence/entities/CaracteristicMap.java | 59 +++- .../data/CopyIndividualObservationMode.java | 41 +++ .../AccidentalBatchPersistenceServiceImpl.java | 56 +--- ...dualObservationBatchPersistenceServiceImpl.java | 149 ++++------ .../CaracteristicPersistenceService.java | 9 + .../CaracteristicPersistenceServiceImpl.java | 18 +- .../service/util/SamplePersistenceHelper.java | 51 +++- .../src/main/xmi/tutti-persistence.zargo | Bin 64820 -> 65155 bytes .../ifremer/tutti/service/PersistenceService.java | 5 + .../catches/multipost/MultiPostImportService.java | 6 +- .../CopyIndividualObservationMode.java | 34 --- .../IndividualObservationBatchRowModel.java | 14 +- .../frequency/SpeciesFrequencyCellComponent.java | 91 +++--- .../frequency/SpeciesFrequencyRowModel.java | 7 + .../frequency/SpeciesFrequencyTableModel.java | 2 +- .../species/frequency/SpeciesFrequencyUI.jaxx | 2 +- .../frequency/SpeciesFrequencyUIHandler.java | 329 ++++++++++++--------- .../species/frequency/SpeciesFrequencyUIModel.java | 105 +++---- 20 files changed, 565 insertions(+), 423 deletions(-) create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/CopyIndividualObservationMode.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/CopyIndividualObservationMode.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch feature/8130 updated (5bd489f -> 8082660)
by codelutin.com scm 16 Mar '16

16 Mar '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/8130 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git discards 5bd489f Revue de la sauvegarde et intégration du mode de recopie discards d8f89e4 Amélioration du chargement de l'écran (et intégration du mode de recopie) discards 34b61ff Utilisation des méthodes withXXX + ne plus utiliser guava quand c'est possible discards 41deb41 Ajout méthode de recopie discards f2a064a Recopie du mode dans chaque ligne discards e727cda bien enregistrer la valeur qualitative de mode de recopie et non pas la valeur de l'enum + rennomage de la méthode d'extraction des caractéristiques de Sample discards e2c0654 fix api discards 38f75a8 Surcharge de la méthode put de CaracteristicMap pour bien vérifier de ce qui est mis dedans discards d1bbe6e Récupération de la valeur qualitative mise en cache discards 16a04d4 Ajout du mode de recopie au niveau des observations individuelles (See #8130) discards 9b54236 Réusinage du modèle des échantillons discards f04b084 ajout de méthodes sympas pour éviter les cast adds d871a3f Ajout de confirmation avant de réinitialiser l'écran des mensurations ou bien son départ alors que des données ne sont pas enregistrées (see #8133) adds d14913d modele modifié quand on supprime une ligne d'observation individuelle (fixes #8133) adds 48911a4 Merge branch 'feature/8133' into 'develop' adds 6b899d2 Ne pas pouvoir importer sur un lot si le mode de recopie est autre que «Rien» (See #8135) adds 17feb63 Merge branch 'feature/8135' into 'develop' new 1033b95 ajout de méthodes sympas pour éviter les cast new edeba5d Réusinage du modèle des échantillons new 0b453b4 Ajout du mode de recopie au niveau des observations individuelles (See #8130) new 61e3c16 Récupération de la valeur qualitative mise en cache new e7e9719 Surcharge de la méthode put de CaracteristicMap pour bien vérifier de ce qui est mis dedans new 22d3bf9 fix api new 5c4d5c5 bien enregistrer la valeur qualitative de mode de recopie et non pas la valeur de l'enum + rennomage de la méthode d'extraction des caractéristiques de Sample new 64e0a57 Recopie du mode dans chaque ligne new 8edce14 Ajout méthode de recopie new d08a3f6 Utilisation des méthodes withXXX + ne plus utiliser guava quand c'est possible new c47df44 Amélioration du chargement de l'écran (et intégration du mode de recopie) new 8082660 Revue de la sauvegarde et intégration du mode de recopie This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (5bd489f) \ N -- N -- N refs/heads/feature/8130 (8082660) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. The 12 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 80826602549b9ae621b8319bebc59bf8f761eb58 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Mar 16 08:50:23 2016 +0100 Revue de la sauvegarde et intégration du mode de recopie commit c47df44b0efa7b857468d59749b1cb3f73031c58 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Mar 16 08:47:17 2016 +0100 Amélioration du chargement de l'écran (et intégration du mode de recopie) commit d08a3f6c146be98e8ba09dc396b97f5c16daf6dc Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Mar 16 08:42:49 2016 +0100 Utilisation des méthodes withXXX + ne plus utiliser guava quand c'est possible commit 8edce14289e1fd14021f7c84e8f4afef8b52d6e3 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Mar 16 07:53:46 2016 +0100 Ajout méthode de recopie commit 64e0a5783a3ec2ff68864c7deb7126a7240378a0 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Mar 16 07:53:30 2016 +0100 Recopie du mode dans chaque ligne commit 5c4d5c50a57c841b8b87723702c4c1c0da8ff8ae Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Mar 16 07:53:00 2016 +0100 bien enregistrer la valeur qualitative de mode de recopie et non pas la valeur de l'enum + rennomage de la méthode d'extraction des caractéristiques de Sample commit 22d3bf9da29367fbf61d2435ae1ec84b1df2b1fc Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Mar 16 07:51:18 2016 +0100 fix api commit e7e97191ab16730ef7f06567733577329dbdc870 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Mar 16 07:51:03 2016 +0100 Surcharge de la méthode put de CaracteristicMap pour bien vérifier de ce qui est mis dedans commit 61e3c16d2ed18dd9b49be6b49cf72841d30fbd3f Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Mar 16 07:50:18 2016 +0100 Récupération de la valeur qualitative mise en cache commit 0b453b48cf1c6fa7b8a7be73e3500543a00d3860 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Mar 16 05:38:41 2016 +0100 Ajout du mode de recopie au niveau des observations individuelles (See #8130) commit edeba5d697dc5d061ee79ea1717dfed3ef38aec5 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Mar 16 05:37:38 2016 +0100 Réusinage du modèle des échantillons commit 1033b95484a87618c633818c861926c5b8155841 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Mar 16 05:36:36 2016 +0100 ajout de méthodes sympas pour éviter les cast Summary of changes: .../frequency/SpeciesFrequencyTableModel.java | 4 ++ .../species/frequency/SpeciesFrequencyUI.jaxx | 2 - .../species/frequency/SpeciesFrequencyUI.jcss | 13 ++++- .../frequency/SpeciesFrequencyUIHandler.java | 11 +++- .../actions/CancelEditSpeciesFrequencyAction.java | 60 +++++++++++++++------ .../frequency/actions/RemoveObservationAction.java | 2 + .../actions/ResetSpeciesFrequencyAction.java | 62 ++++++++++++++++------ .../resources/i18n/tutti-ui-swing_en_GB.properties | 10 ++++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 10 ++++ 9 files changed, 138 insertions(+), 36 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 12

branch feature/8130 created (now 5bd489f)
by codelutin.com scm 16 Mar '16

16 Mar '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/8130 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git at 5bd489f Revue de la sauvegarde et intégration du mode de recopie This branch includes the following new commits: new f04b084 ajout de méthodes sympas pour éviter les cast new 9b54236 Réusinage du modèle des échantillons new 16a04d4 Ajout du mode de recopie au niveau des observations individuelles (See #8130) new d1bbe6e Récupération de la valeur qualitative mise en cache new 38f75a8 Surcharge de la méthode put de CaracteristicMap pour bien vérifier de ce qui est mis dedans new e2c0654 fix api new e727cda bien enregistrer la valeur qualitative de mode de recopie et non pas la valeur de l'enum + rennomage de la méthode d'extraction des caractéristiques de Sample new f2a064a Recopie du mode dans chaque ligne new 41deb41 Ajout méthode de recopie new 34b61ff Utilisation des méthodes withXXX + ne plus utiliser guava quand c'est possible new d8f89e4 Amélioration du chargement de l'écran (et intégration du mode de recopie) new 5bd489f Revue de la sauvegarde et intégration du mode de recopie The 12 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 5bd489fbf103db03bc70ca5f54474ab4e33187dd Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Mar 16 08:50:23 2016 +0100 Revue de la sauvegarde et intégration du mode de recopie commit d8f89e4ce58e61db04fbbef283c016f4353708db Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Mar 16 08:47:17 2016 +0100 Amélioration du chargement de l'écran (et intégration du mode de recopie) commit 34b61ff23388818412e60f9216e6d3a0692d0ca4 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Mar 16 08:42:49 2016 +0100 Utilisation des méthodes withXXX + ne plus utiliser guava quand c'est possible commit 41deb419bc5edcc5cf31640be32b6eb671117bfb Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Mar 16 07:53:46 2016 +0100 Ajout méthode de recopie commit f2a064aee865f0b098539734090d2114882ead9d Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Mar 16 07:53:30 2016 +0100 Recopie du mode dans chaque ligne commit e727cda8ea9a068afc3fbc5bf058ee199cd4c51a Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Mar 16 07:53:00 2016 +0100 bien enregistrer la valeur qualitative de mode de recopie et non pas la valeur de l'enum + rennomage de la méthode d'extraction des caractéristiques de Sample commit e2c0654ffd0480b1fc50947759b0fc0d905c6398 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Mar 16 07:51:18 2016 +0100 fix api commit 38f75a82358eb60974944c8a20f377630860b422 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Mar 16 07:51:03 2016 +0100 Surcharge de la méthode put de CaracteristicMap pour bien vérifier de ce qui est mis dedans commit d1bbe6e3f819cefbf7c6b2e3dd778390133a8ca7 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Mar 16 07:50:18 2016 +0100 Récupération de la valeur qualitative mise en cache commit 16a04d411f130d68e2244cf360c0cbd616a691fb Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Mar 16 05:38:41 2016 +0100 Ajout du mode de recopie au niveau des observations individuelles (See #8130) commit 9b54236eeb0f3f371167c716b0718f9929e00639 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Mar 16 05:37:38 2016 +0100 Réusinage du modèle des échantillons commit f04b084836517e03a9289974e15626eaa1fc7ab6 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Mar 16 05:36:36 2016 +0100 ajout de méthodes sympas pour éviter les cast -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 12

branch develop updated (48911a4 -> 17feb63)
by codelutin.com scm 15 Mar '16

15 Mar '16

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git from 48911a4 Merge branch 'feature/8133' into 'develop' adds 6b899d2 Ne pas pouvoir importer sur un lot si le mode de recopie est autre que «Rien» (See #8135) adds 17feb63 Merge branch 'feature/8135' into 'develop' No new revisions were added by this update. Summary of changes: .../content/operation/catches/species/frequency/SpeciesFrequencyUI.jcss | 1 + 1 file changed, 1 insertion(+) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch develop updated (0380282 -> 48911a4)
by codelutin.com scm 15 Mar '16

15 Mar '16

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git from 0380282 Develop on snapshot adds d871a3f Ajout de confirmation avant de réinitialiser l'écran des mensurations ou bien son départ alors que des données ne sont pas enregistrées (see #8133) adds d14913d modele modifié quand on supprime une ligne d'observation individuelle (fixes #8133) adds 48911a4 Merge branch 'feature/8133' into 'develop' No new revisions were added by this update. Summary of changes: .../frequency/SpeciesFrequencyTableModel.java | 4 ++ .../species/frequency/SpeciesFrequencyUI.jaxx | 2 - .../species/frequency/SpeciesFrequencyUI.jcss | 12 ++++- .../frequency/SpeciesFrequencyUIHandler.java | 9 ++++ .../actions/CancelEditSpeciesFrequencyAction.java | 60 +++++++++++++++------ .../frequency/actions/RemoveObservationAction.java | 2 + .../actions/ResetSpeciesFrequencyAction.java | 62 ++++++++++++++++------ .../resources/i18n/tutti-ui-swing_en_GB.properties | 10 ++++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 10 ++++ 9 files changed, 136 insertions(+), 35 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch feature/8133 updated (d871a3f -> d14913d)
by codelutin.com scm 15 Mar '16

15 Mar '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/8133 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git from d871a3f Ajout de confirmation avant de réinitialiser l'écran des mensurations ou bien son départ alors que des données ne sont pas enregistrées (see #8133) adds d14913d modele modifié quand on supprime une ligne d'observation individuelle (fixes #8133) No new revisions were added by this update. Summary of changes: .../catches/species/frequency/actions/RemoveObservationAction.java | 2 ++ 1 file changed, 2 insertions(+) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch feature/8043 updated (b21ab75 -> 5790b23)
by codelutin.com scm 15 Mar '16

15 Mar '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/8043 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git discards b21ab75 création du cache des prélèvements (refs #8043) adds faf58c6 Revue de l'export multi-poste adds f978ee3 Début de revue de l'import multi-poste adds 1053984 Ajout des actions pour l'import-export multi-poste sur l'écran des espèces (See #8061) adds ffc4503 Fix api adds db4c1c0 Ajout d'un nouveau contrat CaracteristicsAware adds 168bd6f Optimize Accidental catches import adds 59b7124 Renommage clef i18n adds 5497db1 Revue de la récupération et sauvegarde des observations individuelles adds c591dfd Bien exporter aussi le species Batch id adds e5cfcdb Revue de l'import multi-poste + codage pour les observations individuelles adds 8d211de I18n adds dc52936 Refs #8061 (l'import/export au niveau des lots espèces est ok) Merge branch 'feature/8061' into develop adds bf60870 Ajout de nouvelles requetes pour récupérer toutes les observation individuelles d'un trait (pour la suppression) adds a5abb23 Meilleur API de suppression des pièces jointes adds 57153a3 Suppression des observations individuelles sur un lot ou un trait (See #8114) adds c883030 Implements persistence API adds 65ac7cc Fixes #8114 Merge branch 'feature/8114' into develop adds ed5a12f Ajout de la colonne maturité même s'il n'y a pas d'observations individuelles encore présentes (See #8118) adds 9f19d6d Fixes #8118 Merge branch 'feature/8118' into develop adds bb7298d Ave Cesar... adds 6e7d6b8 On met tous les classes d'import/export csv dans un paquetage csv + import/export sur un lot (See #8119) adds 29caf78 réusinage actions d'import sur le trait adds 98fc416 Import/export au niveau d'un lot (See #8119) adds 6181678 Ajout avertissement avant import multi-poste si des données existent (See #8119) adds 18ce0bf Fixes #8119 Merge branch 'feature/8119' into develop adds efe7f4c option pour ne plus mettre de classe de taille par défaut sur les lignes de mensuration si c'est calculé (fixes #8056) adds 4fb61ce I18n adds 59d368b Fixes #8056 Merge branch 'feature/8056' into develop adds ea5bb50 on cherche la classe de taille dans les observations individuelles en plus des mensurations (au cas où il n'y ait pas de mensurations) adds 20120fd Bien calculer l'action corriger une espèce (See #8121) adds eebc867 renommage methode (refs #8121) adds 4a57b27 Merge branch 'feature/8121' into 'develop' adds 2960ff5 on ne prend pas en compte les caractéristiques par défaut pour chcker si une ligne est vide (fixes #8125) adds 4077f3c Fixes #8107 Merge branch 'feature/8107' into develop adds 6b28b54 mettre l'axe des y du graph poids moyens en gramme et préciser l'unité sur l'axe des x (fixes #8117) adds d270e83 Fixes #8117 Merge branch 'feature/8117' into develop adds 43c8586 le modele n'est valide que si les poids sont tous saisis en mode de recopie "tout" (fixes #8113) adds 5f648dc on ajoute un listener sur les lignes en erreur pour mettre a jour la validation du modele (fixes #8113) adds adcc047 Fix i18n adds a599aa2 Fix JavaBean API adds b96f7da Fixes #8113 Merge branch 'feature/8113-v2' into develop adds e61b09f Fix release merge adds b5977b9 [jgitflow-maven-plugin]updating poms for 4.5-beta-1 branch with snapshot versions adds 6bff97f add missing license headers adds e3635be [jgitflow-maven-plugin]updating poms for branch'release/4.5-beta-1' with non-snapshot versions adds 873e52d [jgitflow-maven-plugin]merging 'release/4.5-beta-1' into 'master' adds 98d8b79 [jgitflow-maven-plugin]updating poms for 4.5-alpha-5 branch with snapshot versions adds cdc26ba [jgitflow-maven-plugin]updating poms for branch'release/4.5-alpha-5' with non-snapshot versions adds 89f8bc7 add missing license headers adds da778e8 Fix release merge adds 9ca78de [jgitflow-maven-plugin]merging 'master' into 'develop' adds 0380282 Develop on snapshot adds 4968716 création du cache des prélèvements (refs #8043) adds 5790b23 affichage du message de prélèvement quand on atteint les 1/n observations (refs #8043) This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (b21ab75) \ N -- N -- N refs/heads/feature/8043 (5790b23) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. No new revisions were added by this update. Summary of changes: .../tutti/persistence/TuttiPersistenceImpl.java | 26 +- .../persistence/TuttiPersistenceNoDbImpl.java | 25 +- .../persistence/entities/CaracteristicMap.java | 8 +- .../entities/data/SampleCategoryModel.java | 21 + .../CalcifiedPiecesSamplingDefinitionBean.java | 22 + .../service/AccidentalBatchPersistenceService.java | 2 +- .../AccidentalBatchPersistenceServiceImpl.java | 2 +- .../service/AttachmentPersistenceService.java | 15 +- .../service/AttachmentPersistenceServiceImpl.java | 13 +- .../FishingOperationPersistenceServiceImpl.java | 4 +- ...dividualObservationBatchPersistenceService.java | 15 +- ...dualObservationBatchPersistenceServiceImpl.java | 264 ++-- .../service/util/BatchPersistenceHelper.java | 47 +- .../service/util/SamplePersistenceHelper.java | 37 +- .../java/fr/ifremer/tutti/type/WeightUnit.java | 6 + .../src/main/resources/queries-failsafe.hbm.xml | 22 +- .../src/main/xmi/tutti-persistence.zargo | Bin 62463 -> 64820 bytes .../ifremer/tutti/service/PersistenceService.java | 27 +- .../catches/multipost/MultiPostConstants.java | 2 + .../catches/multipost/MultiPostExportContext.java | 355 +++++ .../catches/multipost/MultiPostExportService.java | 694 +++------ .../catches/multipost/MultiPostImportContext.java | 165 +++ .../catches/multipost/MultiPostImportService.java | 1538 ++++++++++---------- .../{ => csv}/AbstractFishingOperationRow.java | 2 +- .../AbstractFishingOperationRowModel.java | 12 +- .../multipost/{ => csv}/AccidentalCatchRow.java | 13 +- .../{ => csv}/AccidentalCatchRowModel.java | 28 +- .../catches/multipost/{ => csv}/AttachmentRow.java | 9 +- .../multipost/{ => csv}/AttachmentRowModel.java | 19 +- .../multipost/{ => csv}/CaracteristicRow.java | 8 +- .../multipost/{ => csv}/CaracteristicRowModel.java | 19 +- .../catches/multipost/{ => csv}/CatchBatchRow.java | 2 +- .../multipost/{ => csv}/CatchBatchRowModel.java | 5 +- .../multipost/{ => csv}/CatchFrequencyRow.java | 22 +- .../{ => csv}/CatchFrequencyRowModel.java | 22 +- .../catches/multipost/{ => csv}/CatchRow.java | 15 +- .../catches/multipost/{ => csv}/CatchRowModel.java | 21 +- .../multipost/{ => csv}/CatchWeightsRow.java | 2 +- .../multipost/{ => csv}/CatchWeightsRowModel.java | 5 +- .../multipost/{ => csv}/FishingOperationRow.java | 2 +- .../{ => csv}/FishingOperationRowModel.java | 6 +- .../{ => csv}/IndividualObservationRow.java | 23 +- .../{ => csv}/IndividualObservationRowModel.java | 20 +- .../multipost/{ => csv}/MarineLitterRow.java | 11 +- .../multipost/{ => csv}/MarineLitterRowModel.java | 19 +- .../multipost/{ => csv}/MarineLitterWeightRow.java | 2 +- .../{ => csv}/MarineLitterWeightRowModel.java | 5 +- .../GenericformatImportPersistenceHelper.java | 2 +- .../service/samplingCache/CruiseSamplingCache.java | 112 +- .../tutti/service/samplingCache/SamplingEvent.java | 36 + .../service/samplingCache/SamplingListener.java | 18 + .../resources/i18n/tutti-service_en_GB.properties | 1 + .../resources/i18n/tutti-service_fr_FR.properties | 1 + .../multipost/MultiPostExportServiceTest.java | 46 +- .../multipost/MultiPostImportServiceTest.java | 2 +- .../filtered-resources/tutti-help-fr.properties | 14 +- .../content/operation/catches/EditCatchesUI.jcss | 4 + .../operation/catches/EditCatchesUIHandler.java | 3 +- .../actions/ImportMultiPostActionSupport.java | 2 +- .../actions/ExportMultiPostBenthosAction.java | 2 +- .../IndividualObservationBatchRowModel.java | 25 +- .../IndividualObservationBatchTableModel.java | 3 + .../catches/species/SpeciesBatchRowModel.java | 39 +- .../operation/catches/species/SpeciesBatchUI.jaxx | 13 +- .../operation/catches/species/SpeciesBatchUI.jcss | 76 +- .../catches/species/SpeciesBatchUIHandler.java | 8 +- ....java => ExportMultiPostSpeciesFullAction.java} | 20 +- ...portMultiPostSpeciesOnlyFrequenciesAction.java} | 20 +- ...stSpeciesOnlyIndividualObservationsAction.java} | 20 +- ....java => ImportMultiPostSpeciesFullAction.java} | 40 +- ...portMultiPostSpeciesOnlyFrequenciesAction.java} | 40 +- ...stSpeciesOnlyIndividualObservationsAction.java} | 40 +- ...va => ImportMultiPostSpeciesSupportAction.java} | 40 +- .../frequency/SpeciesFrequencyCellComponent.java | 2 +- .../frequency/SpeciesFrequencyTableModel.java | 19 +- .../species/frequency/SpeciesFrequencyUI.jaxx | 18 + .../species/frequency/SpeciesFrequencyUI.jcss | 88 ++ .../frequency/SpeciesFrequencyUIHandler.java | 181 ++- .../species/frequency/SpeciesFrequencyUIModel.java | 53 +- .../actions/ExportMultiPostSpeciesFullAction.java} | 30 +- ...portMultiPostSpeciesOnlyFrequenciesAction.java} | 30 +- ...stSpeciesOnlyIndividualObservationsAction.java} | 30 +- .../actions/ImportMultiPostSpeciesFullAction.java} | 44 +- ...portMultiPostSpeciesOnlyFrequenciesAction.java} | 44 +- ...stSpeciesOnlyIndividualObservationsAction.java} | 44 +- .../ImportMultiPostSpeciesSupportAction.java | 157 ++ .../frequency/actions/RemoveObservationAction.java | 12 +- .../SpeciesFrequencyUIModel-error-validation.xml | 9 + .../resources/i18n/tutti-ui-swing_en_GB.properties | 89 ++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 113 +- 90 files changed, 3255 insertions(+), 1937 deletions(-) create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/CalcifiedPiecesSamplingDefinitionBean.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MultiPostExportContext.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MultiPostImportContext.java rename tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/{ => csv}/AbstractFishingOperationRow.java (97%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/{ => csv}/AbstractFishingOperationRowModel.java (81%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/{ => csv}/AccidentalCatchRow.java (98%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/{ => csv}/AccidentalCatchRowModel.java (73%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/{ => csv}/AttachmentRow.java (97%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/{ => csv}/AttachmentRowModel.java (81%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/{ => csv}/CaracteristicRow.java (96%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/{ => csv}/CaracteristicRowModel.java (77%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/{ => csv}/CatchBatchRow.java (98%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/{ => csv}/CatchBatchRowModel.java (93%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/{ => csv}/CatchFrequencyRow.java (87%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/{ => csv}/CatchFrequencyRowModel.java (70%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/{ => csv}/CatchRow.java (98%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/{ => csv}/CatchRowModel.java (83%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/{ => csv}/CatchWeightsRow.java (97%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/{ => csv}/CatchWeightsRowModel.java (91%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/{ => csv}/FishingOperationRow.java (94%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/{ => csv}/FishingOperationRowModel.java (88%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/{ => csv}/IndividualObservationRow.java (90%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/{ => csv}/IndividualObservationRowModel.java (75%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/{ => csv}/MarineLitterRow.java (97%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/{ => csv}/MarineLitterRowModel.java (76%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/{ => csv}/MarineLitterWeightRow.java (95%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/{ => csv}/MarineLitterWeightRowModel.java (90%) create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/samplingCache/SamplingEvent.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/samplingCache/SamplingListener.java copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/{ExportMultiPostSpeciesAction.java => ExportMultiPostSpeciesFullAction.java} (74%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/{ExportMultiPostSpeciesAction.java => ExportMultiPostSpeciesOnlyFrequenciesAction.java} (72%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/{ExportMultiPostSpeciesAction.java => ExportMultiPostSpeciesOnlyIndividualObservationsAction.java} (70%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/{ExportMultiPostSpeciesAction.java => ImportMultiPostSpeciesFullAction.java} (52%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/{ExportMultiPostSpeciesAction.java => ImportMultiPostSpeciesOnlyFrequenciesAction.java} (52%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/{ExportMultiPostSpeciesAction.java => ImportMultiPostSpeciesOnlyIndividualObservationsAction.java} (52%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/{ImportMultiPostSpeciesAction.java => ImportMultiPostSpeciesSupportAction.java} (71%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{actions/ExportMultiPostSpeciesAction.java => frequency/actions/ExportMultiPostSpeciesFullAction.java} (63%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{actions/ExportMultiPostSpeciesAction.java => frequency/actions/ExportMultiPostSpeciesOnlyFrequenciesAction.java} (61%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{actions/ExportMultiPostSpeciesAction.java => frequency/actions/ExportMultiPostSpeciesOnlyIndividualObservationsAction.java} (60%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{actions/ExportMultiPostSpeciesAction.java => frequency/actions/ImportMultiPostSpeciesFullAction.java} (51%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{actions/ExportMultiPostSpeciesAction.java => frequency/actions/ImportMultiPostSpeciesOnlyFrequenciesAction.java} (51%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{actions/ExportMultiPostSpeciesAction.java => frequency/actions/ImportMultiPostSpeciesOnlyIndividualObservationsAction.java} (51%) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/ImportMultiPostSpeciesSupportAction.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch feature/8133 created (now d871a3f)
by codelutin.com scm 15 Mar '16

15 Mar '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/8133 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git at d871a3f Ajout de confirmation avant de réinitialiser l'écran des mensurations ou bien son départ alors que des données ne sont pas enregistrées (see #8133) This branch includes the following new commits: new d871a3f Ajout de confirmation avant de réinitialiser l'écran des mensurations ou bien son départ alors que des données ne sont pas enregistrées (see #8133) 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 d871a3fe149b37b89fad9efea1976656a6d9258b Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Mar 15 14:20:12 2016 +0100 Ajout de confirmation avant de réinitialiser l'écran des mensurations ou bien son départ alors que des données ne sont pas enregistrées (see #8133) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/8135 created (now 6b899d2)
by codelutin.com scm 15 Mar '16

15 Mar '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/8135 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git at 6b899d2 Ne pas pouvoir importer sur un lot si le mode de recopie est autre que «Rien» (See #8135) This branch includes the following new commits: new 6b899d2 Ne pas pouvoir importer sur un lot si le mode de recopie est autre que «Rien» (See #8135) 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 6b899d269d2b853fd351831eee16545e71518e4b Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Mar 15 12:54:13 2016 +0100 Ne pas pouvoir importer sur un lot si le mode de recopie est autre que «Rien» (See #8135) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1