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

branch feature/7996 created (now eedea01)
by codelutin.com scm 22 Feb '16

22 Feb '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/7996 in repository tutti. See http://git.codelutin.com/tutti.git at eedea01 on ne pousse que les heures et les minutes quand on appelle set...Time (fixes #7996) This branch includes the following new commits: new eedea01 on ne pousse que les heures et les minutes quand on appelle set...Time (fixes #7996) 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 eedea0177e85d7b112e79ccf1ffa46328a4335e7 Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Feb 22 13:20:28 2016 +0100 on ne pousse que les heures et les minutes quand on appelle set...Time (fixes #7996) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/ecran_obs_individuelles updated (3bd5e2e -> 3a3bdac)
by codelutin.com scm 22 Feb '16

22 Feb '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/ecran_obs_individuelles in repository tutti. See http://git.codelutin.com/tutti.git from 3bd5e2e mise en page de l'écran refs #6926 new 3a3bdac - use jaxx 2.29-SNAPSHOT - correction du mode de config à l'ouverture de l'écran - ajout de useRTP dans le modele refs #6926 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 3a3bdac73077bdd48cd22bfc546a6c99643c7eb7 Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Feb 22 10:32:05 2016 +0100 - use jaxx 2.29-SNAPSHOT - correction du mode de config à l'ouverture de l'écran - ajout de useRTP dans le modele refs #6926 Summary of changes: pom.xml | 3 ++- .../species/frequency/SpeciesFrequencyUIHandler.java | 8 ++++++-- .../species/frequency/SpeciesFrequencyUIModel.java | 19 +++++++++++++++++++ 3 files changed, 27 insertions(+), 3 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/ecran_obs_individuelles updated (065fdd7 -> 3bd5e2e)
by codelutin.com scm 19 Feb '16

19 Feb '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/ecran_obs_individuelles in repository tutti. See http://git.codelutin.com/tutti.git from 065fdd7 début de réarrangement de l'écran des mensurations refs #6926 new 3bd5e2e mise en page de l'écran refs #6926 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 3bd5e2e229ebc5a72073be8b4f95b23fd8a104c5 Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Feb 19 15:09:16 2016 +0100 mise en page de l'écran refs #6926 Summary of changes: .../filtered-resources/tutti-help-fr.properties | 5 + .../species/frequency/SpeciesFrequencyUI.jaxx | 120 +++++--- .../species/frequency/SpeciesFrequencyUI.jcss | 311 +++++++++++++-------- .../resources/i18n/tutti-ui-swing_en_GB.properties | 13 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 15 +- 5 files changed, 301 insertions(+), 163 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/ecran_obs_individuelles created (now 065fdd7)
by codelutin.com scm 18 Feb '16

18 Feb '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/ecran_obs_individuelles in repository tutti. See http://git.codelutin.com/tutti.git at 065fdd7 début de réarrangement de l'écran des mensurations refs #6926 This branch includes the following new commits: new 065fdd7 début de réarrangement de l'écran des mensurations refs #6926 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 065fdd7597b1769eddfde7709b4208feaac678aa Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Feb 18 18:04:43 2016 +0100 début de réarrangement de l'écran des mensurations refs #6926 -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (fd17dbf -> 08f99eb)
by codelutin.com scm 18 Feb '16

18 Feb '16

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from fd17dbf Fixes #7972 Merge branch 'feature/7972' into develop adds 5d7769f creation de l'onglet d'edition de l'algo de prelevement de pieces calcifiees (refs #7930) adds 23661cf combo de selection de l'espece + ajout de lignes dans le tableau + possibilité de splitter une ligne (refs #7930) adds fe785f8 Fin de merge depuis develop adds b6d0e4c Ajout de la propriété programId sur le modèle d'un protocole (sert à filtrer les protocole d'une série de campagne) adds c153564 Ajout d'une méthode de persistence pour ne récupérer que les protocoles d'une série de campagne adds 384ff90 Filtrer les protocoles par série de campagne adds 6d43c7a Charger le modèle des strates dispnibles plus haut + ne pas reproposer à la sélection des strates et sous-strates déjà dans le protocole adds 4f565d3 Ajout d'une propriété pour utiliser le prélèvement des pièces calcifiées, et utilisation dans l'éditeur de protocole adds a82e69b - ajout des lignes mature et immatue si la case maturité est cochee - renderer des maturités - cellule de min size 0 non editable - ajout de la suppression des lignes d'une espèce refs #7930 adds ad17e2a - ajout de la suppression d'une ligne - activation/descativation des menus - validation de ce que l'utilisateur entre comme taille minimale dans la popup refs #7930 adds 403709b fix build (refs #7930) adds e63dfae - symbole infini au lieu de null - validation de la taille minquand on clique sur entrée refs #7930 adds d81f2e5 ajout des libellés des menus refs #7930 adds 57296e7 - ajout des autres colonnes - modification de la taille max de la ligne précédente quand on modifie la taille min refs #7930 adds fb4a47a test de la nouvelle valeur de min size refs #7930 adds 3aaa5b7 - modification de la prise en compte du sexe pour toutes les lignes d'une meme espece - correction du tri des espèces refs #7930 adds c9daf39 - persistence - chargement des lignes existantes - chargement de la combo des especes avec les especes du protocole (especes et benthos) refs #7930 adds 273bcf8 - ajout des listener à l'initialisation de la liste des lignes - ajout de la modif du model quand on modifie une ligne refs #7930 adds 4bffb23 suppression des lignes des expèces supprimés depuis les onglets especes et benthos fixes #7930 adds 83955d6 erreur lors du premier ajout dans la liste (refs #7930) adds b786a8b suppressiondans la combo des espèces déjà présentes dans le tableau (refs #7930) adds 5b79421 decoration de l'intervalle(refs #7930) adds f4296c9 message de confirmation de suppression d'une espèce du protocole si elle est dans le tableau (refs #7930) adds a03682d correction de la validité de la taille min (refs #7930) adds 0b4774a NPE lors de la création d'un nouveau protocol adds ae3f589 Meilleure chargement de la liste des espèces pour l'onglet des pièces calcifiées + lambda power adds 51a31e3 ajout de l'import export (refs #7930) new 08f99eb Fixes #7930 Merge branch 'feature/7930' into develop 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 08f99eb708560f280a354d78a1565ab94958d07d Merge: fd17dbf 51a31e3 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Feb 18 10:32:10 2016 +0100 Fixes #7930 Merge branch 'feature/7930' into develop Summary of changes: pom.xml | 4 +- .../tutti/persistence/TuttiPersistenceImpl.java | 5 + .../persistence/TuttiPersistenceNoDbImpl.java | 5 + .../entities/protocol/TuttiProtocols.java | 7 + .../service/ProtocolPersistenceService.java | 7 + .../service/ProtocolPersistenceServiceImpl.java | 19 + .../src/main/xmi/tutti-persistence.zargo | Bin 60851 -> 62059 bytes .../fr/ifremer/tutti/service/DecoratorService.java | 37 ++ .../ifremer/tutti/service/PersistenceService.java | 5 + .../csv/AbstractTuttiImportExportModel.java | 4 + .../protocol/CalcifiedPiecesSamplingRow.java | 112 ++++++ .../protocol/CalcifiedPiecesSamplingRowModel.java | 70 ++++ .../protocol/ProtocolImportExportService.java | 157 ++++++++ .../tutti/service/protocol/SpeciesRowModel.java | 12 +- .../resources/i18n/tutti-service_en_GB.properties | 10 + .../resources/i18n/tutti-service_fr_FR.properties | 9 + .../filtered-resources/tutti-help-fr.properties | 24 +- .../ui/swing/content/home/SelectCruiseUI.jcss | 4 + .../swing/content/home/SelectCruiseUIHandler.java | 25 +- .../protocol/EditProtocolSpeciesRowModel.java | 75 ++++ .../ui/swing/content/protocol/EditProtocolUI.jaxx | 19 +- .../ui/swing/content/protocol/EditProtocolUI.jcss | 11 + .../content/protocol/EditProtocolUIHandler.java | 445 ++++++++++++--------- .../content/protocol/EditProtocolUIModel.java | 100 ++++- .../protocol/actions/AddBenthosProtocolAction.java | 1 + .../protocol/actions/AddSpeciesProtocolAction.java | 3 +- .../actions/ImportProtocolBenthosAction.java | 36 +- .../actions/ImportProtocolSpeciesAction.java | 36 +- .../actions/RemoveBenthosProtocolAction.java | 109 +++-- .../actions/RemoveSpeciesProtocolAction.java | 113 ++++-- .../protocol/actions/SaveProtocolAction.java | 43 +- .../CalcifiedPiecesSamplingEditorRowModel.java | 211 ++++++++++ .../CalcifiedPiecesSamplingEditorTableModel.java | 128 ++++++ .../CalcifiedPiecesSamplingEditorUI.jaxx | 66 +++ .../CalcifiedPiecesSamplingEditorUI.jcss | 64 +++ .../CalcifiedPiecesSamplingEditorUIHandler.java | 325 +++++++++++++++ .../calcifiedpiecessampling/MinSizePopupUI.jaxx} | 31 +- .../calcifiedpiecessampling/MinSizePopupUI.jcss} | 39 +- .../MinSizePopupUIHandler.java | 104 +++++ .../MinSizePopupUIModel.java | 52 +++ .../actions/AddSpeciesAction.java | 71 ++++ .../actions/DeleteRowAction.java | 73 ++++ .../actions/DeleteSpeciesAction.java | 71 ++++ .../actions/ExportProtocolCpsAction.java} | 69 ++-- .../actions/ImportProtocolCpsAction.java | 179 +++++++++ .../actions/SplitSpeciesAction.java | 67 ++++ .../protocol/zones/ZoneEditorUIHandler.java | 45 +-- .../protocol/zones/tree/ZonesTreeModel.java | 1 - .../EditProtocolUIModel-error-validation.xml | 2 +- .../MinSizePopupUIModel-error-validation.xml | 23 ++ .../rtp/RtpEditorUIModel-error-validation.xml | 2 - .../resources/i18n/tutti-ui-swing_en_GB.properties | 63 +++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 59 +++ .../icons/{fatal.png => action-delete2.png} | Bin 54 files changed, 2805 insertions(+), 447 deletions(-) create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/CalcifiedPiecesSamplingRow.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/CalcifiedPiecesSamplingRowModel.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/CalcifiedPiecesSamplingEditorRowModel.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/CalcifiedPiecesSamplingEditorTableModel.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/CalcifiedPiecesSamplingEditorUI.jaxx create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/CalcifiedPiecesSamplingEditorUI.jcss create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/CalcifiedPiecesSamplingEditorUIHandler.java copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/{operation/catches/species/ImportPupitriMelagWeightPopupUI.jaxx => protocol/calcifiedpiecessampling/MinSizePopupUI.jaxx} (59%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/{util/auth/LoginUI.jcss => content/protocol/calcifiedpiecessampling/MinSizePopupUI.jcss} (62%) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/MinSizePopupUIHandler.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/MinSizePopupUIModel.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/actions/AddSpeciesAction.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/actions/DeleteRowAction.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/actions/DeleteSpeciesAction.java copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/{actions/ExportProtocolSpeciesAction.java => calcifiedpiecessampling/actions/ExportProtocolCpsAction.java} (55%) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/actions/ImportProtocolCpsAction.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/actions/SplitSpeciesAction.java create mode 100644 tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/MinSizePopupUIModel-error-validation.xml copy tutti-ui-swing/src/main/resources/icons/{fatal.png => action-delete2.png} (100%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/7930 deleted (was 51a31e3)
by codelutin.com scm 18 Feb '16

18 Feb '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/7930 in repository tutti. See http://git.codelutin.com/tutti.git was 51a31e3 ajout de l'import export (refs #7930) 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/7930 updated (ae3f589 -> 51a31e3)
by codelutin.com scm 16 Feb '16

16 Feb '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/7930 in repository tutti. See http://git.codelutin.com/tutti.git from ae3f589 Meilleure chargement de la liste des espèces pour l'onglet des pièces calcifiées + lambda power new 51a31e3 ajout de l'import export (refs #7930) 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 51a31e3db513a8e51d977876eabd8354b5ea6632 Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Feb 16 16:26:11 2016 +0100 ajout de l'import export (refs #7930) Summary of changes: .../csv/AbstractTuttiImportExportModel.java | 4 + .../protocol/CalcifiedPiecesSamplingRow.java | 112 +++++++++++++ .../protocol/CalcifiedPiecesSamplingRowModel.java | 70 ++++++++ .../protocol/ProtocolImportExportService.java | 157 ++++++++++++++++++ .../tutti/service/protocol/SpeciesRowModel.java | 12 +- .../resources/i18n/tutti-service_en_GB.properties | 5 + .../resources/i18n/tutti-service_fr_FR.properties | 4 + .../content/protocol/EditProtocolUIModel.java | 57 +++++++ .../actions/ImportProtocolBenthosAction.java | 36 +++-- .../actions/ImportProtocolSpeciesAction.java | 36 +++-- .../actions/RemoveBenthosProtocolAction.java | 6 +- .../actions/RemoveSpeciesProtocolAction.java | 6 +- .../protocol/actions/SaveProtocolAction.java | 54 ------- .../CalcifiedPiecesSamplingEditorUI.jaxx | 5 + .../CalcifiedPiecesSamplingEditorUI.jcss | 18 +++ .../CalcifiedPiecesSamplingEditorUIHandler.java | 7 +- .../actions/ExportProtocolCpsAction.java} | 69 ++++---- .../actions/ImportProtocolCpsAction.java | 179 +++++++++++++++++++++ .../resources/i18n/tutti-ui-swing_en_GB.properties | 14 ++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 14 ++ 20 files changed, 738 insertions(+), 127 deletions(-) create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/CalcifiedPiecesSamplingRow.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/CalcifiedPiecesSamplingRowModel.java copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/{actions/ExportProtocolSpeciesAction.java => calcifiedpiecessampling/actions/ExportProtocolCpsAction.java} (55%) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/actions/ImportProtocolCpsAction.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/7930 updated (0b4774a -> ae3f589)
by codelutin.com scm 16 Feb '16

16 Feb '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/7930 in repository tutti. See http://git.codelutin.com/tutti.git from 0b4774a NPE lors de la création d'un nouveau protocol adds ae3f589 Meilleure chargement de la liste des espèces pour l'onglet des pièces calcifiées + lambda power No new revisions were added by this update. Summary of changes: .../protocol/EditProtocolSpeciesRowModel.java | 8 + .../content/protocol/EditProtocolUIHandler.java | 345 ++++++++++----------- .../CalcifiedPiecesSamplingEditorUIHandler.java | 37 +-- 3 files changed, 172 insertions(+), 218 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch feature/7930 updated (a03682d -> 0b4774a)
by codelutin.com scm 16 Feb '16

16 Feb '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/7930 in repository tutti. See http://git.codelutin.com/tutti.git from a03682d correction de la validité de la taille min (refs #7930) adds 0b4774a NPE lors de la création d'un nouveau protocol No new revisions were added by this update. Summary of changes: .../tutti/ui/swing/content/protocol/EditProtocolUIHandler.java | 8 ++++---- 1 file changed, 4 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/7930 updated (4bffb23 -> a03682d)
by codelutin.com scm 15 Feb '16

15 Feb '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/7930 in repository tutti. See http://git.codelutin.com/tutti.git from 4bffb23 suppression des lignes des expèces supprimés depuis les onglets especes et benthos fixes #7930 adds 83955d6 erreur lors du premier ajout dans la liste (refs #7930) adds b786a8b suppressiondans la combo des espèces déjà présentes dans le tableau (refs #7930) adds 5b79421 decoration de l'intervalle(refs #7930) adds f4296c9 message de confirmation de suppression d'une espèce du protocole si elle est dans le tableau (refs #7930) adds a03682d correction de la validité de la taille min (refs #7930) No new revisions were added by this update. Summary of changes: .../content/protocol/EditProtocolUIHandler.java | 15 ++-- .../actions/RemoveBenthosProtocolAction.java | 99 +++++++++++--------- .../actions/RemoveSpeciesProtocolAction.java | 100 ++++++++++++--------- .../CalcifiedPiecesSamplingEditorUIHandler.java | 81 +++++++++-------- .../actions/DeleteRowAction.java | 8 +- .../resources/i18n/tutti-ui-swing_fr_FR.properties | 4 +- 6 files changed, 175 insertions(+), 132 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0