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

branch feature/8066 updated (dfbd064 -> 1a8cd88)
by codelutin.com scm 24 Mar '16

24 Mar '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/8066 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git discards dfbd064 correction suite aux modif du cache (refs #8066) discards 5d1098e ajout d'un menu pour supprimer le code de prélèvement (refs #8066) discards 2757e24 on génère le code de prélevement quand on clique, et on doit faire un clic droit pour afficher une popup d'édition du code de prélèvement (refs #8066) discards cd658c6 extraction de l'id du code de prélèvement (refs #8066) discards f2e468d fix NPE si une observation n'a pas de taille (refs #8066) discards b1fa95c sauvegarde des code prélèvement (refs #8066) discards 8215055 amélioration de l'editeur de code de prélèvement (refs #8066) discards 16df9de debut de l'editeur de code de prelevement (à ameliorer) (refs #8066) discards 4ed5578 ajout dans la conf du separateur de code de prelevement (refs #8066) discards 3abd7ec ajout du champ et de la colonne du code de prelevement (refs #8066) discards 45eaf82 ajout de la conf du code de prélèvement (refs #8147) adds d0a96b9 filtre des psfm avec valeurs qualitatuves pour la maturité (refs #8019) adds 5198ea0 ajout de la popup d'edition des etats matures d'une caracteristique (refs #8109) adds c714d04 ajout des nouveaux objets dans le modele + persistence (refs #8109) adds f0a22bc validation + couleurs des caractéristiques (refs #8109) adds 8c66e19 ajout du tooltip (refs #8109) adds fa8b548 gestion de la maturité dans le cache des observations individuelles (refs #8109) adds d2fde3e gestion des maturités dans l'algo de prélèvement (fixes #8109) adds dbadce9 fix optional error (see #8109) adds 71b9d25 add translation adds 885b189 fixes #8109' adds 7d64f6c ajout de la conf du code de prélèvement (refs #8147) adds 5bdf9de ajout du champ et de la colonne du code de prelevement (refs #8066) adds 5a79663 ajout dans la conf du separateur de code de prelevement (refs #8066) adds aae0482 debut de l'editeur de code de prelevement (à ameliorer) (refs #8066) adds 1724fd1 amélioration de l'editeur de code de prélèvement (refs #8066) adds ce6a6dc sauvegarde des code prélèvement (refs #8066) adds 072878c fix NPE si une observation n'a pas de taille (refs #8066) adds aa32bbb extraction de l'id du code de prélèvement (refs #8066) adds 6668249 on génère le code de prélevement quand on clique, et on doit faire un clic droit pour afficher une popup d'édition du code de prélèvement (refs #8066) adds fc6ba26 ajout d'un menu pour supprimer le code de prélèvement (refs #8066) adds 166911d correction suite aux modif du cache (refs #8066) adds 1a8cd88 récupération des plus gros code de prélèvement (fixes #8066) 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 (dfbd064) \ N -- N -- N refs/heads/feature/8066 (1a8cd88) 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: .../entities/protocol/MaturityCaracteristics.java | 14 ++ .../entities/protocol/TuttiProtocols.java | 1 + .../src/main/xmi/tutti-persistence.properties | 2 +- .../src/main/xmi/tutti-persistence.zargo | Bin 59246 -> 59750 bytes .../ifremer/tutti/service/PersistenceService.java | 9 +- .../service/samplingCache/CruiseSamplingCache.java | 82 ++++++++++-- .../samplingCache/CruiseSamplingCacheLoader.java | 5 +- .../filtered-resources/tutti-help-fr.properties | 1 + .../IndividualObservationBatchRowModel.java | 24 +++- .../IndividualObservationBatchTableModel.java | 11 ++ .../SamplingCodeCellEditor.java | 2 +- .../frequency/IndividualObservationUICache.java | 18 +-- .../frequency/SpeciesFrequencyUIHandler.java | 42 ++++-- .../ui/swing/content/protocol/EditProtocolUI.jaxx | 3 + .../ui/swing/content/protocol/EditProtocolUI.jcss | 10 ++ .../content/protocol/EditProtocolUIHandler.java | 84 +++++++++++- .../content/protocol/EditProtocolUIModel.java | 147 +++++++++++++++++---- .../actions/EditMaturityCaracteristicAction.java | 48 +++++++ .../EditMaturityCaracteristicPopupUI.jaxx} | 38 +++--- .../EditMaturityCaracteristicPopupUI.jcss} | 30 ++--- .../EditMaturityCaracteristicPopupUIHandler.java | 146 ++++++++++++++++++++ .../EditMaturityCaracteristicPopupUIModel.java | 99 ++++++++++++++ .../EditProtocolUIModel-error-validation.xml | 11 ++ ...CaracteristicPopupUIModel-error-validation.xml} | 17 +-- .../resources/i18n/tutti-ui-swing_en_GB.properties | 10 ++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 13 +- 26 files changed, 747 insertions(+), 120 deletions(-) create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/MaturityCaracteristics.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/EditMaturityCaracteristicAction.java copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/{calcifiedpiecessampling/MinSizePopupUI.jaxx => maturity/EditMaturityCaracteristicPopupUI.jaxx} (60%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/{util/auth/LoginUI.jcss => content/protocol/maturity/EditMaturityCaracteristicPopupUI.jcss} (69%) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/maturity/EditMaturityCaracteristicPopupUIHandler.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/maturity/EditMaturityCaracteristicPopupUIModel.java copy tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/protocol/{EditProtocolUIModel-error-validation.xml => maturity/EditMaturityCaracteristicPopupUIModel-error-validation.xml} (79%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch develop updated (2760bf6 -> 885b189)
by codelutin.com scm 24 Mar '16

24 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 2760bf6 Merge branch 'feature/8156' into 'develop' new d0a96b9 filtre des psfm avec valeurs qualitatuves pour la maturité (refs #8019) new 5198ea0 ajout de la popup d'edition des etats matures d'une caracteristique (refs #8109) new c714d04 ajout des nouveaux objets dans le modele + persistence (refs #8109) new f0a22bc validation + couleurs des caractéristiques (refs #8109) new 8c66e19 ajout du tooltip (refs #8109) new fa8b548 gestion de la maturité dans le cache des observations individuelles (refs #8109) new d2fde3e gestion des maturités dans l'algo de prélèvement (fixes #8109) new dbadce9 fix optional error (see #8109) new 71b9d25 add translation new 885b189 fixes #8109' 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 885b189b37593ed9245fde05307fe5c2182a8ba9 Merge: 2760bf6 71b9d25 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Mar 24 11:41:32 2016 +0100 fixes #8109' commit 71b9d25c6aa2e5701e7fc87579b68129bf68ebbb Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Mar 24 11:39:33 2016 +0100 add translation commit dbadce9642ed658ad20b8ea15631963a4b1e90e9 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Mar 24 11:36:44 2016 +0100 fix optional error (see #8109) commit d2fde3ea96cd590242dfd45bf8a59450075d9e6f Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Mar 24 11:32:46 2016 +0100 gestion des maturités dans l'algo de prélèvement (fixes #8109) commit fa8b5488f6e6d8cfd3eefe9944603b01455bd790 Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Mar 23 19:41:21 2016 +0100 gestion de la maturité dans le cache des observations individuelles (refs #8109) commit 8c66e198df69f0c306cdc53c7f6c6fab78b0cbf2 Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Mar 23 18:18:47 2016 +0100 ajout du tooltip (refs #8109) commit f0a22bcdc8a25457088b2c80b8e15dd3b3dd434c Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Mar 23 17:58:27 2016 +0100 validation + couleurs des caractéristiques (refs #8109) commit c714d04f5e6300bffcff8f58cdd8a7af47965ed4 Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Mar 23 16:07:42 2016 +0100 ajout des nouveaux objets dans le modele + persistence (refs #8109) commit 5198ea04e728204949d4483c9709aad107d9143a Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Mar 23 10:33:50 2016 +0100 ajout de la popup d'edition des etats matures d'une caracteristique (refs #8109) commit d0a96b9535bbef50cd86f1beb2cc1a0230247228 Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Mar 22 15:34:18 2016 +0100 filtre des psfm avec valeurs qualitatuves pour la maturité (refs #8019) Summary of changes: .../entities/protocol/MaturityCaracteristics.java | 14 ++ .../entities/protocol/TuttiProtocols.java | 1 + .../src/main/xmi/tutti-persistence.properties | 2 +- .../src/main/xmi/tutti-persistence.zargo | Bin 59165 -> 59646 bytes .../ifremer/tutti/service/PersistenceService.java | 9 +- .../service/samplingCache/CruiseSamplingCache.java | 58 ++++++-- .../samplingCache/CruiseSamplingCacheLoader.java | 5 +- .../filtered-resources/tutti-help-fr.properties | 26 +--- .../IndividualObservationBatchRowModel.java | 24 +++- .../IndividualObservationBatchTableModel.java | 11 ++ .../frequency/IndividualObservationUICache.java | 18 +-- .../frequency/SpeciesFrequencyUIHandler.java | 42 ++++-- .../ui/swing/content/protocol/EditProtocolUI.jaxx | 3 + .../ui/swing/content/protocol/EditProtocolUI.jcss | 10 ++ .../content/protocol/EditProtocolUIHandler.java | 84 +++++++++++- .../content/protocol/EditProtocolUIModel.java | 147 +++++++++++++++++---- .../actions/EditMaturityCaracteristicAction.java | 48 +++++++ .../EditMaturityCaracteristicPopupUI.jaxx} | 38 +++--- .../EditMaturityCaracteristicPopupUI.jcss} | 30 ++--- .../EditMaturityCaracteristicPopupUIHandler.java | 146 ++++++++++++++++++++ .../EditMaturityCaracteristicPopupUIModel.java | 99 ++++++++++++++ .../EditProtocolUIModel-error-validation.xml | 11 ++ ...CaracteristicPopupUIModel-error-validation.xml} | 17 +-- .../resources/i18n/tutti-ui-swing_en_GB.properties | 10 ++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 13 +- 25 files changed, 727 insertions(+), 139 deletions(-) create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/MaturityCaracteristics.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/EditMaturityCaracteristicAction.java copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/{calcifiedpiecessampling/MinSizePopupUI.jaxx => maturity/EditMaturityCaracteristicPopupUI.jaxx} (60%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/{util/auth/LoginUI.jcss => content/protocol/maturity/EditMaturityCaracteristicPopupUI.jcss} (69%) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/maturity/EditMaturityCaracteristicPopupUIHandler.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/maturity/EditMaturityCaracteristicPopupUIModel.java copy tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/protocol/{EditProtocolUIModel-error-validation.xml => maturity/EditMaturityCaracteristicPopupUIModel-error-validation.xml} (79%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 10

branch feature/8109 deleted (was 71b9d25)
by codelutin.com scm 24 Mar '16

24 Mar '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/8109 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git was 71b9d25 add translation This change permanently discards the following revisions: discards 71b9d25 add translation discards dbadce9 fix optional error (see #8109) discards d2fde3e gestion des maturités dans l'algo de prélèvement (fixes #8109) discards fa8b548 gestion de la maturité dans le cache des observations individuelles (refs #8109) discards 8c66e19 ajout du tooltip (refs #8109) discards f0a22bc validation + couleurs des caractéristiques (refs #8109) discards c714d04 ajout des nouveaux objets dans le modele + persistence (refs #8109) discards 5198ea0 ajout de la popup d'edition des etats matures d'une caracteristique (refs #8109) discards d0a96b9 filtre des psfm avec valeurs qualitatuves pour la maturité (refs #8019) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch feature/8109 updated (dbadce9 -> 71b9d25)
by codelutin.com scm 24 Mar '16

24 Mar '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/8109 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git from dbadce9 fix optional error (see #8109) new 71b9d25 add translation 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 71b9d25c6aa2e5701e7fc87579b68129bf68ebbb Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Mar 24 11:39:33 2016 +0100 add translation Summary of changes: tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties | 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 1

branch feature/8109 updated (fa8b548 -> dbadce9)
by codelutin.com scm 24 Mar '16

24 Mar '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/8109 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git from fa8b548 gestion de la maturité dans le cache des observations individuelles (refs #8109) new d2fde3e gestion des maturités dans l'algo de prélèvement (fixes #8109) new dbadce9 fix optional error (see #8109) The 2 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 dbadce9642ed658ad20b8ea15631963a4b1e90e9 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Mar 24 11:36:44 2016 +0100 fix optional error (see #8109) commit d2fde3ea96cd590242dfd45bf8a59450075d9e6f Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Mar 24 11:32:46 2016 +0100 gestion des maturités dans l'algo de prélèvement (fixes #8109) Summary of changes: .../service/samplingCache/CruiseSamplingCache.java | 23 +++++++---- .../samplingCache/CruiseSamplingCacheLoader.java | 5 +-- .../IndividualObservationBatchRowModel.java | 24 ++++++++++-- .../IndividualObservationBatchTableModel.java | 11 ++++++ .../frequency/IndividualObservationUICache.java | 18 +++++---- .../frequency/SpeciesFrequencyUIHandler.java | 45 +++++++++++++--------- ...yCaracteristicPopupUIModel-error-validation.xml | 2 +- .../resources/i18n/tutti-ui-swing_fr_FR.properties | 5 ++- 8 files changed, 91 insertions(+), 42 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2

branch feature/8066 updated (c013e3f -> dfbd064)
by codelutin.com scm 24 Mar '16

24 Mar '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/8066 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git discards c013e3f ajout d'un menu pour supprimer le code de prélèvement (refs #8066) discards a0dd3a4 on génère le code de prélevement quand on clique, et on doit faire un clic droit pour afficher une popup d'édition du code de prélèvement (refs #8066) discards a063a20 extraction de l'id du code de prélèvement (refs #8066) discards 7515d7f fix NPE si une observation n'a pas de taille (refs #8066) discards 0e4a297 sauvegarde des code prélèvement (refs #8066) discards 54a7b3c amélioration de l'editeur de code de prélèvement (refs #8066) discards 5b82d33 debut de l'editeur de code de prelevement (à ameliorer) (refs #8066) discards e0688b0 ajout dans la conf du separateur de code de prelevement (refs #8066) discards 0df0b69 ajout dans la conf du prefix de code de prélèvement (refs #8066) discards 22a4586 ajout du champ et de la colonne du code de prelevement (refs #8066) discards 9828b19 ajout de la conf du code de prélèvement (refs #8147) adds 8393422 Amélioration log adds 2c99890 Revue du cache adds 89e4d7e Ajout méthodes utiles + un toString digne de ce nom adds dacfac0 Création d'un cache d'ui et suppression du code du handler adds 395f752 Amélioration de l'API dans DataContext adds 778dd63 Clean code adds 8a0f6ba Fixes #8145 Merge branch 'feature/8145' into develop adds affd875 Remise à plat de l'éditeur de zone qui ne fonctionne pas bien du tout adds b7d7b96 Rethink Protocol zone model adds 58163da Vérifier au chargement du protocole que toutes le contenue des zones est encore correct + ajout method manquante adds e9d169d Rethink protocol zone editor adds 3a436f8 Revue de la définition des zones au niveau du cache des échantillons adds 9085601 retour sur develop (at last!) Merge branch 'feature/reecriture_editeur_de_zones' into develop adds 48adaad Ajout de nouvelles méthodes sur CaracteristicMap adds 537f034 Ajout d'un chargeur de cache + amélioration de l'API de cache sur les échantillons adds c182786 Revue du chargement du cache d'échantillon au niveau de l'ui et des actions d'édition des captures d'une campagne adds e661bc9 Ajout méthode pour récupérer les ids des batchs enfants adds 5462f81 Gestion du nettoyage du cache avant la suppresion de lot ou de trait adds 4136577 Amélioration du cache adds c166fdc Passage en log debug sur le cache adds 9740706 Fix test adds 44d1157 Fix bad merge :( adds e19c54c Retour sur develop, mais y'a encore du taff je pense sur le sujet... Merge branch 'feature/8145-2' into develop adds dfcf76d ajout en rafale dans les obs individiuelles par defaut (fixes #8163) adds 216896a Utilisation du modèle et non pas directement changer les états dans l'ui + ne rien faire si le mode de recopie est null (uniquement utilisé pour bien gérer le repositionnement dans les ui) adds f47a69a Fixes #8163 Merge branch 'feature/8163' into develop adds 7a258bc c'est l'inverse, on divise si on a des millimètres... (fixes #8156) adds 2760bf6 Merge branch 'feature/8156' into 'develop' adds 45eaf82 ajout de la conf du code de prélèvement (refs #8147) adds 3abd7ec ajout du champ et de la colonne du code de prelevement (refs #8066) adds 4ed5578 ajout dans la conf du separateur de code de prelevement (refs #8066) adds 16df9de debut de l'editeur de code de prelevement (à ameliorer) (refs #8066) adds 8215055 amélioration de l'editeur de code de prélèvement (refs #8066) adds b1fa95c sauvegarde des code prélèvement (refs #8066) adds f2e468d fix NPE si une observation n'a pas de taille (refs #8066) adds cd658c6 extraction de l'id du code de prélèvement (refs #8066) adds 2757e24 on génère le code de prélevement quand on clique, et on doit faire un clic droit pour afficher une popup d'édition du code de prélèvement (refs #8066) adds 5d1098e ajout d'un menu pour supprimer le code de prélèvement (refs #8066) adds dfbd064 correction suite aux modif du cache (refs #8066) 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 (c013e3f) \ N -- N -- N refs/heads/feature/8066 (dfbd064) 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 | 11 + .../persistence/TuttiPersistenceNoDbImpl.java | 11 + .../persistence/entities/CaracteristicMap.java | 24 ++ .../persistence/entities/TuttiEntityBean.java | 9 +- .../CalcifiedPiecesSamplingDefinitionBean.java | 30 +- .../CalcifiedPiecesSamplingDefinitions.java | 21 + .../persistence/entities/protocol/ZoneBean.java | 17 + .../tutti/persistence/entities/protocol/Zones.java | 22 + .../entities/referential/TuttiLocationBean.java | 16 + .../service/BenthosBatchPersistenceService.java | 9 + .../service/ProtocolPersistenceServiceImpl.java | 34 +- .../service/SpeciesBatchPersistenceService.java | 9 + .../SpeciesBatchPersistenceServiceSupport.java | 7 +- .../referential/LocationPersistenceService.java | 10 + .../LocationPersistenceServiceImpl.java | 30 ++ .../referential/SpeciesPersistenceServiceImpl.java | 4 + .../main/java/fr/ifremer/tutti/util/Weights.java | 2 +- .../src/main/xmi/tutti-persistence.zargo | Bin 59391 -> 59246 bytes .../ifremer/tutti/service/PersistenceService.java | 164 ++++++- .../fr/ifremer/tutti/service/TuttiDataContext.java | 89 ++-- .../service/samplingCache/CruiseSamplingCache.java | 480 +++++++++++++++------ .../samplingCache/CruiseSamplingCacheLoader.java | 120 ++++++ .../samplingCache/CruiseSamplingInternalCache.java | 124 ++++++ tutti-service/src/test/data2 | 1 + .../src/main/filtered-resources/log4j.properties | 3 +- .../actions/AbstractChangeScreenAction.java | 10 +- .../EditCatchesForSelectedCruiseAction.java | 55 +-- .../EditCatchesSupportAction.java} | 71 ++- .../content/home/actions/EditCatchesAction.java | 56 +-- .../IndividualObservationBatchRowModel.java | 22 +- .../SamplingCodeCellEditor.java | 7 +- .../frequency/IndividualObservationUICache.java | 303 +++++++++++++ .../species/frequency/SpeciesFrequencyUI.jcss | 1 + .../frequency/SpeciesFrequencyUIHandler.java | 239 ++++------ .../species/frequency/SpeciesFrequencyUIModel.java | 20 +- .../actions/CancelEditSpeciesFrequencyAction.java | 5 +- .../frequency/actions/RemoveObservationAction.java | 5 +- .../actions/ResetSpeciesFrequencyAction.java | 5 +- .../content/protocol/EditProtocolUIHandler.java | 257 ++++++++--- .../content/protocol/EditProtocolUIModel.java | 267 ++++++------ .../swing/content/protocol/zones/ZoneEditorUI.jaxx | 9 +- .../swing/content/protocol/zones/ZoneEditorUI.jcss | 8 + .../protocol/zones/ZoneEditorUIHandler.java | 274 +----------- .../protocol/zones/actions/AddStratasAction.java | 115 +++-- .../protocol/zones/actions/CreateZoneAction.java | 19 +- .../protocol/zones/actions/DeleteZoneAction.java | 35 +- .../zones/actions/RemoveStratasAction.java | 99 +++-- .../protocol/zones/actions/RenameZoneAction.java | 24 +- .../protocol/zones/models/StrataUIModel.java | 249 ----------- .../protocol/zones/models/SubStrataUIModel.java | 146 ------- .../content/protocol/zones/models/ZoneUIModel.java | 228 ---------- .../zones/tree/AbstractZoneEditorTreeModel.java | 43 -- ...ataNode.java => AvailableStratasTreeModel.java} | 19 +- .../protocol/zones/tree/StratasTreeModel.java | 153 ------- .../content/protocol/zones/tree/SubStrataNode.java | 42 -- .../protocol/zones/tree/ZoneEditorNode.java | 70 --- .../zones/tree/ZoneEditorTreeCellRenderer.java | 16 +- .../zones/tree/ZoneEditorTreeModelSupport.java | 199 +++++++++ .../content/protocol/zones/tree/ZoneNode.java | 43 -- .../protocol/zones/tree/ZonesTreeModel.java | 187 +------- .../protocol/zones/tree/node/StrataNode.java | 69 +++ .../node/SubStrataNode.java} | 32 +- .../zones/tree/node/ZoneEditorNodeSupport.java | 94 ++++ .../content/protocol/zones/tree/node/ZoneNode.java | 73 ++++ .../EditProtocolUIModel-error-validation.xml | 2 +- .../resources/i18n/tutti-ui-swing_fr_FR.properties | 2 +- .../tutti/ui/swing/BeanValidatorDetectorTest.java | 2 +- 67 files changed, 2585 insertions(+), 2237 deletions(-) create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/CalcifiedPiecesSamplingDefinitions.java create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/ZoneBean.java create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/Zones.java create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/TuttiLocationBean.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/samplingCache/CruiseSamplingCacheLoader.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/samplingCache/CruiseSamplingInternalCache.java create mode 120000 tutti-service/src/test/data2 copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/{home/actions/EditCatchesAction.java => actions/EditCatchesSupportAction.java} (55%) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/IndividualObservationUICache.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/models/StrataUIModel.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/models/SubStrataUIModel.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/models/ZoneUIModel.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/AbstractZoneEditorTreeModel.java rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/{StrataNode.java => AvailableStratasTreeModel.java} (61%) delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/StratasTreeModel.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/SubStrataNode.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/ZoneEditorNode.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/ZoneEditorTreeModelSupport.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/ZoneNode.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/node/StrataNode.java copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/{actions/CollapseZonesTreeAction.java => tree/node/SubStrataNode.java} (51%) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/node/ZoneEditorNodeSupport.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/node/ZoneNode.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch feature/8151 updated (cbdeded -> a7a4f01)
by codelutin.com scm 24 Mar '16

24 Mar '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/8151 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git from cbdeded Oups encore du refactor sur le réusinage Species/Benthos adds a7a4f01 on arrondit avant la comparaison (refs #8151) No new revisions were added by this update. Summary of changes: .../ifremer/tutti/service/catches/WeightComputingService.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch feature/8109 updated (5198ea0 -> fa8b548)
by codelutin.com scm 23 Mar '16

23 Mar '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/8109 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git from 5198ea0 ajout de la popup d'edition des etats matures d'une caracteristique (refs #8109) new c714d04 ajout des nouveaux objets dans le modele + persistence (refs #8109) new f0a22bc validation + couleurs des caractéristiques (refs #8109) new 8c66e19 ajout du tooltip (refs #8109) new fa8b548 gestion de la maturité dans le cache des observations individuelles (refs #8109) 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 fa8b5488f6e6d8cfd3eefe9944603b01455bd790 Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Mar 23 19:41:21 2016 +0100 gestion de la maturité dans le cache des observations individuelles (refs #8109) commit 8c66e198df69f0c306cdc53c7f6c6fab78b0cbf2 Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Mar 23 18:18:47 2016 +0100 ajout du tooltip (refs #8109) commit f0a22bcdc8a25457088b2c80b8e15dd3b3dd434c Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Mar 23 17:58:27 2016 +0100 validation + couleurs des caractéristiques (refs #8109) commit c714d04f5e6300bffcff8f58cdd8a7af47965ed4 Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Mar 23 16:07:42 2016 +0100 ajout des nouveaux objets dans le modele + persistence (refs #8109) Summary of changes: .../entities/protocol/MaturityCaracteristics.java | 14 ++ .../entities/protocol/TuttiProtocols.java | 1 + .../src/main/xmi/tutti-persistence.properties | 2 +- .../src/main/xmi/tutti-persistence.zargo | Bin 59165 -> 59646 bytes .../ifremer/tutti/service/PersistenceService.java | 9 +- .../service/samplingCache/CruiseSamplingCache.java | 47 ++++++- .../samplingCache/CruiseSamplingCacheLoader.java | 6 +- .../frequency/SpeciesFrequencyUIHandler.java | 19 ++- .../ui/swing/content/protocol/EditProtocolUI.jaxx | 1 + .../content/protocol/EditProtocolUIHandler.java | 70 +++++++++- .../content/protocol/EditProtocolUIModel.java | 147 +++++++++++++++++---- .../actions/EditMaturityCaracteristicAction.java | 61 ++++----- .../maturity/EditMaturityCaracteristicPopupUI.jaxx | 7 +- .../EditMaturityCaracteristicPopupUIHandler.java | 29 ++-- .../EditMaturityCaracteristicPopupUIModel.java | 93 +++++++------ .../EditProtocolUIModel-error-validation.xml | 11 ++ ...yCaracteristicPopupUIModel-error-validation.xml | 2 +- .../resources/i18n/tutti-ui-swing_en_GB.properties | 3 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 4 +- 19 files changed, 387 insertions(+), 139 deletions(-) create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/MaturityCaracteristics.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 4

branch feature/8109 updated (c417e39 -> 5198ea0)
by codelutin.com scm 23 Mar '16

23 Mar '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/8109 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git discards c417e39 ajout de la popup d'edition des etats matures d'une caracteristique (refs #8109) discards 71ce616 filtre des psfm avec valeurs qualitatuves pour la maturité (refs #8019) adds affd875 Remise à plat de l'éditeur de zone qui ne fonctionne pas bien du tout adds b7d7b96 Rethink Protocol zone model adds 58163da Vérifier au chargement du protocole que toutes le contenue des zones est encore correct + ajout method manquante adds e9d169d Rethink protocol zone editor adds 3a436f8 Revue de la définition des zones au niveau du cache des échantillons adds 9085601 retour sur develop (at last!) Merge branch 'feature/reecriture_editeur_de_zones' into develop adds 48adaad Ajout de nouvelles méthodes sur CaracteristicMap adds 537f034 Ajout d'un chargeur de cache + amélioration de l'API de cache sur les échantillons adds c182786 Revue du chargement du cache d'échantillon au niveau de l'ui et des actions d'édition des captures d'une campagne adds e661bc9 Ajout méthode pour récupérer les ids des batchs enfants adds 5462f81 Gestion du nettoyage du cache avant la suppresion de lot ou de trait adds 4136577 Amélioration du cache adds c166fdc Passage en log debug sur le cache adds 9740706 Fix test adds 44d1157 Fix bad merge :( adds e19c54c Retour sur develop, mais y'a encore du taff je pense sur le sujet... Merge branch 'feature/8145-2' into develop adds dfcf76d ajout en rafale dans les obs individiuelles par defaut (fixes #8163) adds 216896a Utilisation du modèle et non pas directement changer les états dans l'ui + ne rien faire si le mode de recopie est null (uniquement utilisé pour bien gérer le repositionnement dans les ui) adds f47a69a Fixes #8163 Merge branch 'feature/8163' into develop adds 7a258bc c'est l'inverse, on divise si on a des millimètres... (fixes #8156) adds 2760bf6 Merge branch 'feature/8156' into 'develop' new d0a96b9 filtre des psfm avec valeurs qualitatuves pour la maturité (refs #8019) new 5198ea0 ajout de la popup d'edition des etats matures d'une caracteristique (refs #8109) 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 (c417e39) \ N -- N -- N refs/heads/feature/8109 (5198ea0) 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 2 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 5198ea04e728204949d4483c9709aad107d9143a Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Mar 23 10:33:50 2016 +0100 ajout de la popup d'edition des etats matures d'une caracteristique (refs #8109) commit d0a96b9535bbef50cd86f1beb2cc1a0230247228 Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Mar 22 15:34:18 2016 +0100 filtre des psfm avec valeurs qualitatuves pour la maturité (refs #8019) Summary of changes: .../tutti/persistence/TuttiPersistenceImpl.java | 11 + .../persistence/TuttiPersistenceNoDbImpl.java | 11 + .../persistence/entities/CaracteristicMap.java | 24 ++ .../persistence/entities/TuttiEntityBean.java | 9 +- .../persistence/entities/protocol/ZoneBean.java | 17 + .../tutti/persistence/entities/protocol/Zones.java | 22 ++ .../entities/referential/TuttiLocationBean.java | 16 + .../service/BenthosBatchPersistenceService.java | 9 + .../service/ProtocolPersistenceServiceImpl.java | 34 +- .../service/SpeciesBatchPersistenceService.java | 9 + .../SpeciesBatchPersistenceServiceSupport.java | 7 +- .../referential/LocationPersistenceService.java | 10 + .../LocationPersistenceServiceImpl.java | 30 ++ .../main/java/fr/ifremer/tutti/util/Weights.java | 2 +- .../src/main/xmi/tutti-persistence.zargo | Bin 59307 -> 59165 bytes .../ifremer/tutti/service/PersistenceService.java | 164 ++++++++- .../fr/ifremer/tutti/service/TuttiDataContext.java | 78 +++-- .../service/samplingCache/CruiseSamplingCache.java | 381 ++++++++++++++++----- .../samplingCache/CruiseSamplingCacheLoader.java | 120 +++++++ .../samplingCache/CruiseSamplingInternalCache.java | 180 +++++----- tutti-service/src/test/data2 | 1 + .../src/main/filtered-resources/log4j.properties | 3 +- .../actions/AbstractChangeScreenAction.java | 10 +- .../EditCatchesForSelectedCruiseAction.java | 55 +-- .../EditCatchesSupportAction.java} | 71 +++- .../content/home/actions/EditCatchesAction.java | 56 +-- .../frequency/IndividualObservationUICache.java | 20 +- .../species/frequency/SpeciesFrequencyUI.jcss | 1 + .../frequency/SpeciesFrequencyUIHandler.java | 12 +- .../species/frequency/SpeciesFrequencyUIModel.java | 2 +- .../content/protocol/EditProtocolUIHandler.java | 257 ++++++++++---- .../content/protocol/EditProtocolUIModel.java | 267 +++++++-------- .../swing/content/protocol/zones/ZoneEditorUI.jaxx | 9 +- .../swing/content/protocol/zones/ZoneEditorUI.jcss | 8 + .../protocol/zones/ZoneEditorUIHandler.java | 274 +-------------- .../protocol/zones/actions/AddStratasAction.java | 115 +++++-- .../protocol/zones/actions/CreateZoneAction.java | 19 +- .../protocol/zones/actions/DeleteZoneAction.java | 35 +- .../zones/actions/RemoveStratasAction.java | 99 +++--- .../protocol/zones/actions/RenameZoneAction.java | 24 +- .../protocol/zones/models/StrataUIModel.java | 249 -------------- .../protocol/zones/models/SubStrataUIModel.java | 146 -------- .../content/protocol/zones/models/ZoneUIModel.java | 228 ------------ .../zones/tree/AbstractZoneEditorTreeModel.java | 43 --- ...ataNode.java => AvailableStratasTreeModel.java} | 19 +- .../protocol/zones/tree/StratasTreeModel.java | 153 --------- .../content/protocol/zones/tree/SubStrataNode.java | 42 --- .../protocol/zones/tree/ZoneEditorNode.java | 70 ---- .../zones/tree/ZoneEditorTreeCellRenderer.java | 16 +- .../zones/tree/ZoneEditorTreeModelSupport.java | 199 +++++++++++ .../content/protocol/zones/tree/ZoneNode.java | 43 --- .../protocol/zones/tree/ZonesTreeModel.java | 187 ++-------- .../protocol/zones/tree/node/StrataNode.java | 69 ++++ .../node/SubStrataNode.java} | 32 +- .../zones/tree/node/ZoneEditorNodeSupport.java | 94 +++++ .../content/protocol/zones/tree/node/ZoneNode.java | 73 ++++ .../EditProtocolUIModel-error-validation.xml | 2 +- .../resources/i18n/tutti-ui-swing_fr_FR.properties | 2 +- .../tutti/ui/swing/BeanValidatorDetectorTest.java | 2 +- 59 files changed, 2032 insertions(+), 2109 deletions(-) create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/ZoneBean.java create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/Zones.java create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/TuttiLocationBean.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/samplingCache/CruiseSamplingCacheLoader.java create mode 120000 tutti-service/src/test/data2 copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/{home/actions/EditCatchesAction.java => actions/EditCatchesSupportAction.java} (55%) delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/models/StrataUIModel.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/models/SubStrataUIModel.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/models/ZoneUIModel.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/AbstractZoneEditorTreeModel.java rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/{StrataNode.java => AvailableStratasTreeModel.java} (61%) delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/StratasTreeModel.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/SubStrataNode.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/ZoneEditorNode.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/ZoneEditorTreeModelSupport.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/ZoneNode.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/node/StrataNode.java copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/{actions/CollapseZonesTreeAction.java => tree/node/SubStrataNode.java} (51%) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/node/ZoneEditorNodeSupport.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/node/ZoneNode.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2

branch feature/8109 created (now c417e39)
by codelutin.com scm 23 Mar '16

23 Mar '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/8109 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git at c417e39 ajout de la popup d'edition des etats matures d'une caracteristique (refs #8109) This branch includes the following new commits: new 71ce616 filtre des psfm avec valeurs qualitatuves pour la maturité (refs #8019) new c417e39 ajout de la popup d'edition des etats matures d'une caracteristique (refs #8109) The 2 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 c417e3966af810ac8916399f779314ee8f6396bd Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Mar 23 10:33:50 2016 +0100 ajout de la popup d'edition des etats matures d'une caracteristique (refs #8109) commit 71ce61697cbceaf3fd7dfa3af7e9eb868cf55382 Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Mar 22 15:34:18 2016 +0100 filtre des psfm avec valeurs qualitatuves pour la maturité (refs #8019) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2