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

branch feature/8194 created (now 3a92557)
by codelutin.com scm 25 Mar '16

25 Mar '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/8194 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git at 3a92557 on increment et decremente l'algo à partir du moment où il y a une taille (fixes #8194) This branch includes the following new commits: new 3a92557 on increment et decremente l'algo à partir du moment où il y a une taille (fixes #8194) 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 3a92557e2ed92de335858e8c9129be930d656836 Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Mar 25 17:02:52 2016 +0100 on increment et decremente l'algo à partir du moment où il y a une taille (fixes #8194) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/8146 created (now ebea8ee)
by codelutin.com scm 25 Mar '16

25 Mar '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/8146 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git at ebea8ee l'arrondi du poids rendait le poids négatif positif... d'où le poids total qui ne faisait qu'augmenter (fixes #8146) This branch includes the following new commits: new ebea8ee l'arrondi du poids rendait le poids négatif positif... d'où le poids total qui ne faisait qu'augmenter (fixes #8146) 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 ebea8ee3d46616df08af526fc84df1fa16e2ba20 Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Mar 25 16:38:58 2016 +0100 l'arrondi du poids rendait le poids négatif positif... d'où le poids total qui ne faisait qu'augmenter (fixes #8146) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/8192 created (now cdbec1d)
by codelutin.com scm 25 Mar '16

25 Mar '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/8192 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git at cdbec1d utilisation d'un objet pour gérer le code de prélèvement (fixes #8192) This branch includes the following new commits: new 3752234 suppression du separateur de la conf, sinon on ne peut pas récupérer les ids des précédents code si le séparateur change (enfin on pourrait mais c'est plus compliqué) (refs #8192) new cdbec1d utilisation d'un objet pour gérer le code de prélèvement (fixes #8192) 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 cdbec1d99010000a06bc27261ea20c537c3e99a1 Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Mar 25 12:35:53 2016 +0100 utilisation d'un objet pour gérer le code de prélèvement (fixes #8192) commit 3752234f2132459aa0ed3da0802107808be75932 Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Mar 25 12:30:28 2016 +0100 suppression du separateur de la conf, sinon on ne peut pas récupérer les ids des précédents code si le séparateur change (enfin on pourrait mais c'est plus compliqué) (refs #8192) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2

branch feature/8189 created (now 379048b)
by codelutin.com scm 25 Mar '16

25 Mar '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/8189 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git at 379048b correction de la conversion gramme -> unité de la conf (fixes #8189) This branch includes the following new commits: new 379048b correction de la conversion gramme -> unité de la conf (fixes #8189) 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 379048bc4e66ae39e3ab4295a8154a5abcac319c Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Mar 25 10:11:36 2016 +0100 correction de la conversion gramme -> unité de la conf (fixes #8189) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/8162 created (now f590a7c)
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/8162 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git at f590a7c correction du redimensionnement (fixes #8162) This branch includes the following new commits: new f590a7c correction du redimensionnement (fixes #8162) 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 f590a7cba045e4797f96e91aa2ccfc5e32f70530 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Mar 24 19:11:31 2016 +0100 correction du redimensionnement (fixes #8162) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (45df461 -> 4619e29)
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 45df461 fix command new 4b9485a ajout d'un renderer de poids qui affiche le bon nombre de decimales (fixes #8151) new 4f97152 on arrondit après le calcul rtp (see #8151) new faac160 N'ajouter dans le cache des échantillons uniquement ceux qui ont une taille new 4583d5a Oups encore du refactor sur le réusinage Species/Benthos new f7f8bf9 on arrondit avant la comparaison (refs #8151) new 4619e29 Fixes #8151 Merge branch 'feature/8151' into develop The 6 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 4619e29747cf3e26047b380e5796cf753d4ac425 Merge: 45df461 f7f8bf9 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Mar 24 18:59:39 2016 +0100 Fixes #8151 Merge branch 'feature/8151' into develop commit f7f8bf93ef169c6946cd8f3a1168b927c0cc83bf Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Mar 24 09:38:02 2016 +0100 on arrondit avant la comparaison (refs #8151) commit 4583d5a8bc57eb348793e7c67aad137ddcdcf253 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Mar 22 20:10:31 2016 +0100 Oups encore du refactor sur le réusinage Species/Benthos commit faac160666030cb7a18a52a83b672d77f667a9b0 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Mar 22 19:30:50 2016 +0100 N'ajouter dans le cache des échantillons uniquement ceux qui ont une taille commit 4f97152428d9ad282465dc103d63a769a58d0c8f Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Mar 22 15:21:06 2016 +0100 on arrondit après le calcul rtp (see #8151) commit 4b9485a45b809d366ceb48e2825d439b685fb5da Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Mar 22 15:10:35 2016 +0100 ajout d'un renderer de poids qui affiche le bon nombre de decimales (fixes #8151) Summary of changes: .../fr/ifremer/tutti/service/TuttiDataContext.java | 124 ++++++++++----------- .../service/catches/WeightComputingService.java | 10 +- .../service/pupitri/PupitriImportService.java | 2 +- .../samplingCache/CruiseSamplingCacheLoader.java | 2 +- .../catches/species/BenthosBatchUISupportImpl.java | 15 ++- .../catches/species/SpeciesBatchUISupportImpl.java | 27 ++--- .../species/SpeciesOrBenthosBatchUISupport.java | 23 +++- .../create/CreateSpeciesBatchUIHandler.java | 7 +- .../species/edit/SpeciesBatchUIHandler.java | 10 +- .../edit/actions/RenameSpeciesBatchAction.java | 7 +- .../frequency/SpeciesFrequencyUIHandler.java | 22 ++-- .../species/frequency/SpeciesFrequencyUIModel.java | 2 +- .../species/split/SplitSpeciesBatchUIHandler.java | 13 ++- .../species/split/SplitSpeciesBatchUIModel.java | 17 ++- .../ui/swing/util/AbstractTuttiUIHandler.java | 15 ++- 15 files changed, 178 insertions(+), 118 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 6

branch feature/8151 deleted (was ecad657)
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 was ecad657 on arrondit avant la comparaison (refs #8151) The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. -- 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 (a7a4f01 -> ecad657)
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 discards a7a4f01 on arrondit avant la comparaison (refs #8151) discards cbdeded Oups encore du refactor sur le réusinage Species/Benthos discards c35c0db N'ajouter dans le cache des échantillons uniquement ceux qui ont une taille discards cf2c0e6 on arrondit après le calcul rtp (see #8151) discards de01dd6 ajout d'un renderer de poids qui affiche le bon nombre de decimales (fixes #8151) 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 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) adds 79d610e fixes #8066 adds 3a3934f Update procédure de release adds 5ed9d7e More in gitignore adds 75cf42c [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 8ad645b [jgitflow-maven-plugin]updating poms for 4.5-beta-2 branch with snapshot versions adds 8d96dfa Add license headers adds 7535407 [jgitflow-maven-plugin]updating poms for branch'release/4.5-beta-2' with non-snapshot versions adds 4011d57 [jgitflow-maven-plugin]merging 'release/4.5-beta-2' into 'master' adds 0ac0949 [jgitflow-maven-plugin]merging 'master' into 'develop' adds ec4489e [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 22d6449 ajout d'un renderer de poids qui affiche le bon nombre de decimales (fixes #8151) adds 0b973a0 on arrondit après le calcul rtp (see #8151) adds 22be472 N'ajouter dans le cache des échantillons uniquement ceux qui ont une taille adds 35b26c2 Oups encore du refactor sur le réusinage Species/Benthos adds ecad657 on arrondit avant la comparaison (refs #8151) 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 (a7a4f01) \ N -- N -- N refs/heads/feature/8151 (ecad657) 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: .gitignore | 1 + README.md | 9 +- .../java/fr/ifremer/tutti/TuttiConfiguration.java | 8 ++ .../fr/ifremer/tutti/TuttiConfigurationOption.java | 17 +++ .../tutti/persistence/TuttiPersistenceImpl.java | 5 + .../persistence/TuttiPersistenceNoDbImpl.java | 5 + .../entities/data/SpeciesBatchFrequencys.java | 24 ++++ .../CalcifiedPiecesSamplingDefinitions.java | 24 ++++ .../{Rtps.java => MaturityCaracteristics.java} | 16 ++- .../entities/protocol/TuttiProtocols.java | 1 + .../persistence/entities/protocol/ZoneBean.java | 24 ++++ .../tutti/persistence/entities/protocol/Zones.java | 24 ++++ .../entities/referential/TuttiLocationBean.java | 24 ++++ ...dualObservationBatchPersistenceServiceImpl.java | 10 +- .../CaracteristicPersistenceService.java | 3 + .../CaracteristicPersistenceServiceImpl.java | 5 + .../main/java/fr/ifremer/tutti/util/Weights.java | 2 +- .../i18n/tutti-persistence_en_GB.properties | 2 + .../i18n/tutti-persistence_fr_FR.properties | 2 + .../src/main/xmi/tutti-persistence.properties | 2 +- .../src/main/xmi/tutti-persistence.zargo | Bin 59165 -> 59750 bytes .../fr/ifremer/tutti/service/DecoratorService.java | 11 +- .../ifremer/tutti/service/PersistenceService.java | 14 +- .../service/samplingCache/CruiseSamplingCache.java | 80 +++++++++-- .../samplingCache/CruiseSamplingCacheLoader.java | 29 +++- .../samplingCache/CruiseSamplingInternalCache.java | 24 ++++ tutti-service/src/test/data2 | 1 - .../filtered-resources/tutti-help-fr.properties | 5 +- .../swing/content/config/TuttiConfigUIHandler.java | 6 + .../IndividualObservationBatchRowModel.java | 102 +++++++++++++- .../IndividualObservationBatchTableModel.java | 33 +++++ .../SampleCodeEditionPopupUI.jaxx} | 27 ++-- .../SampleCodeEditionPopupUI.jcss} | 22 +-- .../SampleCodeEditionPopupUIHandler.java} | 34 ++--- .../SampleCodeEditionPopupUIModel.java | 75 +++++++++++ .../SamplingCodeCellEditor.java} | 93 +++++++------ .../SamplingCodeCellRenderer.java | 75 +++++++++++ .../catches/species/BenthosBatchUISupportImpl.java | 24 ++++ .../species/EditSpeciesBatchPanelUIHandler.java | 24 ++++ .../species/EditSpeciesBatchPanelUIModel.java | 24 ++++ .../catches/species/SpeciesBatchUISupportImpl.java | 24 ++++ .../species/SpeciesOrBenthosBatchUISupport.java | 24 ++++ .../frequency/IndividualObservationUICache.java | 42 ++++-- .../species/frequency/SpeciesFrequencyUI.jaxx | 2 + .../species/frequency/SpeciesFrequencyUI.jcss | 18 +++ .../frequency/SpeciesFrequencyUIHandler.java | 76 +++++++++-- .../frequency/actions/DeleteSampleCodeAction.java | 66 +++++++++ .../frequency/actions/EditSampleCodeAction.java | 60 +++++++++ .../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 | 72 ++++++++++ .../EditMaturityCaracteristicPopupUI.jaxx} | 38 +++--- .../EditMaturityCaracteristicPopupUI.jcss} | 30 ++--- .../EditMaturityCaracteristicPopupUIHandler.java | 146 ++++++++++++++++++++ .../EditMaturityCaracteristicPopupUIModel.java | 123 +++++++++++++++++ ...pleCodeEditionPopupUIModel-error-validation.xml | 18 ++- ...ualObservationBatchUIModel-error-validation.xml | 83 ------------ .../EditProtocolUIModel-error-validation.xml | 11 ++ ...CaracteristicPopupUIModel-error-validation.xml} | 17 +-- .../resources/i18n/tutti-ui-swing_en_GB.properties | 31 +++++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 35 ++++- 63 files changed, 1759 insertions(+), 312 deletions(-) copy tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/{Rtps.java => MaturityCaracteristics.java} (64%) delete mode 120000 tutti-service/src/test/data2 copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/{protocol/calcifiedpiecessampling/MinSizePopupUI.jaxx => operation/catches/individualobservation/SampleCodeEditionPopupUI.jaxx} (71%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/{protocol/calcifiedpiecessampling/MinSizePopupUI.jcss => operation/catches/individualobservation/SampleCodeEditionPopupUI.jcss} (76%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/{protocol/calcifiedpiecessampling/MinSizePopupUIHandler.java => operation/catches/individualobservation/SampleCodeEditionPopupUIHandler.java} (65%) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/SampleCodeEditionPopupUIModel.java copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/{util/attachment/AttachmentCellEditor.java => content/operation/catches/individualobservation/SamplingCodeCellEditor.java} (53%) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/SamplingCodeCellRenderer.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/DeleteSampleCodeAction.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/EditSampleCodeAction.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-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/SpeciesBatch-validate-fatal-validation.xml => tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/SampleCodeEditionPopupUIModel-error-validation.xml (81%) delete mode 100644 tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIModel-error-validation.xml 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 (ec4489e -> 45df461)
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 ec4489e [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 45df461 fix command No new revisions were added by this update. Summary of changes: README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch release/4.5-beta-2 deleted (was 7535407)
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 release/4.5-beta-2 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git was 7535407 [jgitflow-maven-plugin]updating poms for branch'release/4.5-beta-2' with non-snapshot versions The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0