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@codelutin.com> Date: Thu Mar 24 11:41:32 2016 +0100 fixes #8109' commit 71b9d25c6aa2e5701e7fc87579b68129bf68ebbb Author: Kevin Morin <morin@codelutin.com> Date: Thu Mar 24 11:39:33 2016 +0100 add translation commit dbadce9642ed658ad20b8ea15631963a4b1e90e9 Author: Kevin Morin <morin@codelutin.com> Date: Thu Mar 24 11:36:44 2016 +0100 fix optional error (see #8109) commit d2fde3ea96cd590242dfd45bf8a59450075d9e6f Author: Kevin Morin <morin@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@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@codelutin.com> Date: Wed Mar 23 18:18:47 2016 +0100 ajout du tooltip (refs #8109) commit f0a22bcdc8a25457088b2c80b8e15dd3b3dd434c Author: Kevin Morin <morin@codelutin.com> Date: Wed Mar 23 17:58:27 2016 +0100 validation + couleurs des caractéristiques (refs #8109) commit c714d04f5e6300bffcff8f58cdd8a7af47965ed4 Author: Kevin Morin <morin@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@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@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@codelutin.com>.