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

branch feature/ecran_obs_individuelles updated (be0ac0e -> cf52df3)
by codelutin.com scm 29 Feb '16

29 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 discards be0ac0e - copie des donnees d'observation individuelles dans le tableau des mensurations en fonction du mode - suppression ou ecrasement des données au changement de mode de copie refs #8019 discards a9c22e9 use lanbdas where possible discards 815f48c - ajout du numéro de l'observation - suppression d'observations refs #8019 discards f600d0c ajout d'une ligne d'observation individuelle quand on ajoute en rafale (refs #8019) discards bed9756 graph des poids moyens (refs #8019) discards 6a26e7b titre de la popup de l'histogramme (refs #8019) discards 47891d3 une seule popup pour l'histogramme pour pouvoir la fermer quand on quitte (refs #8019) discards 2e5ab37 vérification que le poids saisi est proche du poids calculé avec la RTP (refs #8019) discards 6c3ee17 utilisation des rtp pour calculer les poids des lignes de mensuration (refs #8019) discards 02b0ee4 affichage de l'histogramme dans une popup (refs #8019) discards df1825b - suppression de l'onglet observations individuelles dans la capture - ajout des lignes dans la table d'obs individuelles dans les mensurations (refs #8019) discards aa1354f activtation ou desactivation de cellules de la tables des mensurations en fonction du mode de copie (refs #6926) discards a90fe9c organize imports discards 5de9cd8 ajout du model de colonnes de la table des observations (refs #6926) discards 3a3bdac - use jaxx 2.29-SNAPSHOT - correction du mode de config à l'ouverture de l'écran - ajout de useRTP dans le modele refs #6926 discards 3bd5e2e mise en page de l'écran refs #6926 discards 065fdd7 début de réarrangement de l'écran des mensurations refs #6926 adds 4ff1062 Simplification du code de calcul du raising factor final adds e5b5506 Ajout d'un test pour vérifier le calcul du raising factor final adds b68bfe7 Ajout méthode pour récupérer la dernière catégorie renseignée adds 8521235 Utilisation des bonnes catégories pour compléter le sampleWeight (utilisé pour le calcul du raising factor final) adds 1fe175a Fixes #7992 Merge branch 'feature/7992_erreur_calcul_coef_final' into develop adds fad5ce9 Utilisation des bonnes catégories pour compléter le sampleWeight (utilisé pour le calcul du raising factor final) adds c413e57 on ne pousse que les heures et les minutes quand on appelle set...Time (fixes #7996) adds 36d483b Fixes #7996 Merge branch 'feature/7996' into develop adds 39656ac Use pom 7-SNAPSHOT adds 463a07a Début de correction mais il me faut une confirmation de Vincent sur le sujet adds c796f8c Fix test values adds dee8e16 Ajout de nouveaux tests sur le calcul du RF final adds 3f598ad Bien tenir compte de la sous fraction dans le cas de mensurations s'il y a un sous-échantillonage (See #8014) adds f5449e2 Merge branch 'feature/8014' into 'develop' adds 85b0363 Use codelutinpom 7 adds caa6781 Do not use https for project url adds ca7d26b Mise à jour du guide utilisateur adds 27ed7e0 3. ajouter colonne « observations individuelles ». Cette case ne peut être cochée que si « méthode de mensuration » est renseignée refs #8013 adds 1e2aa09 4. ajouter colonne « maturité » et pour chaque taxon proposer liste psfm pour pointer sur l'échelle de maturité adaptée au taxon refs #8013 adds ddf9722 - suppression des colonnes dénombrement et pièces caclifiées - ajout de la colonne type de piece calcifiée refs #8013 adds 2381cf1 wording (refs #8013) adds 523e218 migration du protocole (refs #8013) adds c6bba11 cocher maturité dans l'éditeur de pieces calcifiées si l'espèce sélectionnée a un pmfm de maturité (refs #8013) adds 87cb8c1 Il faut n'autoriser que les taxons dont on a une méthode de mensuration renseigner et du coup il faut aussi demander une confirmation à l'utilisateur si il veut supprimer la méthode de mensuration dans l'onglet espèces (ou benthos) car cela va supprimer des lignes dans l'onglet algo (refs #8013) adds 1a9cd1e ajout du highlighter sur la table des cps (refs #8013) adds 9e44081 coorection de la validité des lignes (refs #8013) adds 370751c test que l'espèce a une méthode de mensuration à l'import de l'algo de pieces calcifiees (refs #8013) adds 883d2f9 modif du nom par défaut des fichiers d'export (refs #8013) adds ad65665 - correction de l'import / export - correction des tests (fixes #8013) adds f3d31f7 wording adds 7d8e1ee correction de la version courante du protocole (fixes #8013) adds ede141d Changement de l'ordre des colonnes dans l'onglet espèces et benthos adds 295d098 Ajout de méthode withXXX sur SpeciesProtocol + bien modifier le modèle global lors d'une modification du tableau des espèces des pièces calcifiées adds 041d0ec Wording toi même! adds a0118c9 Suppression des annotation de génération sur du code non généré adds f5ccf41 Fixes #8013 Merge branch 'feature/8013' into develop adds 7ef3920 Correction du poids total espèce vivant non détaillé trié non exporté (see #8022) adds dbdd317 Correction du poids total espèce vrac non exporté (see #8022) adds 441e785 fixes #8022 Merge branch 'feature/8022' into develop adds dc9b003 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 6d7f9a0 [jgitflow-maven-plugin]updating poms for 4.5-alpha-1 branch with snapshot versions adds 809bcd9 Add missing license headers adds 1ef3936 [jgitflow-maven-plugin]updating poms for branch'release/4.5-alpha-1' with non-snapshot versions adds 43e9096 [jgitflow-maven-plugin]merging 'release/4.5-alpha-1' into 'master' adds 0882928 [jgitflow-maven-plugin]merging 'master' into 'develop' adds d65d8e3 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new 34425f8 début de réarrangement de l'écran des mensurations refs #6926 new c8938cb mise en page de l'écran refs #6926 new fac69d8 - use jaxx 2.29-SNAPSHOT - correction du mode de config à l'ouverture de l'écran - ajout de useRTP dans le modele refs #6926 new 998f893 ajout du model de colonnes de la table des observations (refs #6926) new 9ad8c03 organize imports new 47f37ea activtation ou desactivation de cellules de la tables des mensurations en fonction du mode de copie (refs #6926) new c7698c5 - suppression de l'onglet observations individuelles dans la capture - ajout des lignes dans la table d'obs individuelles dans les mensurations (refs #8019) new aad6735 affichage de l'histogramme dans une popup (refs #8019) new ee48c20 utilisation des rtp pour calculer les poids des lignes de mensuration (refs #8019) new 948d32d vérification que le poids saisi est proche du poids calculé avec la RTP (refs #8019) new c15557b une seule popup pour l'histogramme pour pouvoir la fermer quand on quitte (refs #8019) new 95f1e47 titre de la popup de l'histogramme (refs #8019) new ce716ac graph des poids moyens (refs #8019) new c7901d3 ajout d'une ligne d'observation individuelle quand on ajoute en rafale (refs #8019) new e980ec1 - ajout du numéro de l'observation - suppression d'observations refs #8019 new f1b29ce use lanbdas where possible new cf52df3 - copie des donnees d'observation individuelles dans le tableau des mensurations en fonction du mode - suppression ou ecrasement des données au changement de mode de copie refs #8019 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 (be0ac0e) \ N -- N -- N refs/heads/feature/ecran_obs_individuelles (cf52df3) 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 17 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 cf52df320c4fa37faba9e9f2c0b2022dfb49f183 Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Feb 29 16:04:42 2016 +0100 - copie des donnees d'observation individuelles dans le tableau des mensurations en fonction du mode - suppression ou ecrasement des données au changement de mode de copie refs #8019 commit f1b29ce6ba2f02c866567e2c6435cbc9f5be16c4 Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Feb 26 16:35:25 2016 +0100 use lanbdas where possible commit e980ec1bd35ce9a6777aa74e7f1b8e98e660005d Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Feb 26 16:23:13 2016 +0100 - ajout du numéro de l'observation - suppression d'observations refs #8019 commit c7901d33fd3c2c87093bff68c9a923fc1d028d10 Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Feb 26 14:20:21 2016 +0100 ajout d'une ligne d'observation individuelle quand on ajoute en rafale (refs #8019) commit ce716ac883cf6b7aedcfcf7a27ff962a0f1c5eb3 Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Feb 26 11:35:29 2016 +0100 graph des poids moyens (refs #8019) commit 95f1e478713c4499d7ba70d0213d4d91428ed2ce Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Feb 26 10:02:50 2016 +0100 titre de la popup de l'histogramme (refs #8019) commit c15557b50da0a2e1aa3c2556e1f9b198fea8c672 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Feb 25 18:53:22 2016 +0100 une seule popup pour l'histogramme pour pouvoir la fermer quand on quitte (refs #8019) commit 948d32d0b05d2c75c3a1cb470f9a8dc511a2f829 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Feb 25 18:31:22 2016 +0100 vérification que le poids saisi est proche du poids calculé avec la RTP (refs #8019) commit ee48c200b8962663e81503f3fda6761b6e2faf09 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Feb 25 17:43:35 2016 +0100 utilisation des rtp pour calculer les poids des lignes de mensuration (refs #8019) commit aad67356d2f22799d008d5b189b04a5ea0bc89f0 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Feb 25 14:24:41 2016 +0100 affichage de l'histogramme dans une popup (refs #8019) commit c7698c5ff48c63f5b41fbaec3eade4035ce4fb5b Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Feb 25 11:35:02 2016 +0100 - suppression de l'onglet observations individuelles dans la capture - ajout des lignes dans la table d'obs individuelles dans les mensurations (refs #8019) commit 47f37eacb5e5dab3ac86b7447567aa74e80d7a5a Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Feb 23 09:31:57 2016 +0100 activtation ou desactivation de cellules de la tables des mensurations en fonction du mode de copie (refs #6926) commit 9ad8c03d92824d83ecbe0eaf706fbe81ad13653c Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Feb 22 14:30:13 2016 +0100 organize imports commit 998f89331ed84717af00e5aa5349df7cd933f2e4 Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Feb 22 14:25:37 2016 +0100 ajout du model de colonnes de la table des observations (refs #6926) commit fac69d8b8c95934bdb33bdc117b1018b7fb61fc9 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 commit c8938cb54bd762b60d9ae98b16eb213fc38e0411 Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Feb 19 15:09:16 2016 +0100 mise en page de l'écran refs #6926 commit 34425f8d30b0f0ea82cf975584b5b76472fd1e83 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 Summary of changes: .gitignore | 12 +- README.txt => README.md | 0 pom.xml | 7 +- src/site/site_fr.xml | 2 + .../README.txt => tutti-ichtyometer/README.md | 0 tutti-persistence/{README.txt => README.md} | 0 .../entities/protocol/SpeciesProtocolBean.java | 14 + .../entities/protocol/TuttiProtocols.java | 107 +++- .../entities/protocol/v1/SpeciesProtocol1.java | 5 +- .../entities/protocol/v1/SpeciesProtocolBean1.java | 5 +- .../entities/protocol/v1/TuttiProtocol1.java | 4 +- .../entities/protocol/v1/TuttiProtocolBean1.java | 4 +- .../entities/protocol/v2/TuttiProtocol2.java | 4 +- .../entities/protocol/v2/TuttiProtocolBean2.java | 2 - .../entities/protocol/v3/SpeciesProtocol3.java | 172 ++++++ .../entities/protocol/v3/SpeciesProtocolBean3.java | 182 +++--- .../entities/protocol/v3/TuttiProtocol3.java | 260 +++++++++ .../entities/protocol/v3/TuttiProtocolBean3.java | 620 +++++++++++++++++++++ .../src/main/xmi/tutti-persistence.zargo | Bin 62059 -> 62284 bytes .../entities/protocol/TuttiProtocolsTest.java | 20 - .../ProtocolPersistenceServiceReadTest.java | 6 - .../ProtocolPersistenceServiceWriteTest.java | 9 +- .../README.txt => tutti-report-generator/README.md | 0 tutti-service/{README.txt => README.md} | 0 .../catches/ValidateCruiseOperationsService.java | 4 +- .../tutti/service/genericformat/csv/CatchRow.java | 21 + .../service/genericformat/csv/OperationRow.java | 6 +- .../producer/CsvProducerForCatch.java | 73 ++- .../protocol/CalcifiedPiecesSamplingRow.java | 24 + .../protocol/CalcifiedPiecesSamplingRowModel.java | 24 + .../protocol/ProtocolImportExportService.java | 2 +- .../ifremer/tutti/service/protocol/SpeciesRow.java | 16 - .../tutti/service/protocol/SpeciesRowModel.java | 6 +- .../GenericFormatExportServiceAno7992Test.java | 217 ++++++++ .../protocol/ProtocolImportExportServiceTest.java | 52 +- .../resources/genericFormat/ano7992.tuttiProtocol | 249 +++++++++ .../README.txt => tutti-ui-swing-updater/README.md | 0 .../README.txt => tutti-ui-swing/README.md | 0 .../filtered-resources/tutti-help-fr.properties | 23 + .../help/Guide_utilisation_Allegro_Campagne.pdf | Bin 1996569 -> 1988880 bytes .../operation/EditFishingOperationUIHandler.java | 2 +- .../operation/EditFishingOperationUIModel.java | 20 +- .../content/operation/catches/BatchSavedEvent.java | 24 + .../operation/catches/BatchSavedListener.java | 24 + .../create/CreateBenthosBatchUIHandler.java | 2 +- .../create/CreateSpeciesBatchUIHandler.java | 2 +- .../protocol/EditProtocolSpeciesRowModel.java | 99 +++- .../protocol/EditProtocolSpeciesTableModel.java | 27 +- .../content/protocol/EditProtocolUIHandler.java | 157 +++++- .../content/protocol/EditProtocolUIModel.java | 12 + .../protocol/actions/AddBenthosProtocolAction.java | 3 +- .../protocol/actions/AddSpeciesProtocolAction.java | 3 +- .../actions/ExportAllCaracteristicAction.java | 2 +- .../actions/ExportProtocolBenthosAction.java | 2 +- .../actions/ExportProtocolCaracteristicAction.java | 2 +- .../actions/ExportProtocolSpeciesAction.java | 2 +- .../protocol/actions/ExportPupitriAction.java | 2 +- .../actions/RemoveBenthosProtocolAction.java | 25 +- .../actions/RemoveSpeciesProtocolAction.java | 26 +- .../protocol/actions/SaveProtocolAction.java | 19 - .../CalcifiedPiecesSamplingEditorRowModel.java | 24 + .../CalcifiedPiecesSamplingEditorTableModel.java | 25 + .../CalcifiedPiecesSamplingEditorUI.jaxx | 23 + .../CalcifiedPiecesSamplingEditorUIHandler.java | 39 ++ .../MinSizePopupUIModel.java | 24 + .../actions/AddSpeciesAction.java | 24 + .../actions/DeleteRowAction.java | 24 + .../actions/DeleteSpeciesAction.java | 24 + .../actions/ExportProtocolCpsAction.java | 2 +- .../actions/ImportProtocolCpsAction.java | 1 + .../actions/SplitSpeciesAction.java | 24 + .../content/protocol/rtp/RtpEditorUIModel.java | 2 +- .../swing/content/protocol/zones/ZoneEditorUI.jaxx | 23 + .../protocol/zones/ZoneEditorUIHandler.java | 24 + .../protocol/zones/actions/AddStratasAction.java | 24 + .../CollapseAvailableStratasTreeAction.java | 24 + .../zones/actions/CollapseZonesTreeAction.java | 24 + .../protocol/zones/actions/CreateZoneAction.java | 24 + .../protocol/zones/actions/DeleteZoneAction.java | 24 + .../actions/ExpandAvailableStratasTreeAction.java | 24 + .../zones/actions/ExpandZonesTreeAction.java | 24 + .../zones/actions/RemoveStratasAction.java | 24 + .../protocol/zones/actions/RenameZoneAction.java | 24 + .../protocol/zones/models/StrataUIModel.java | 24 + .../protocol/zones/models/SubStrataUIModel.java | 24 + .../content/protocol/zones/models/ZoneUIModel.java | 24 + .../zones/tree/AbstractZoneEditorTreeModel.java | 24 + .../content/protocol/zones/tree/StrataNode.java | 24 + .../protocol/zones/tree/StratasTreeModel.java | 24 + .../content/protocol/zones/tree/SubStrataNode.java | 24 + .../protocol/zones/tree/ZoneEditorNode.java | 24 + .../zones/tree/ZoneEditorTreeCellRenderer.java | 24 + .../content/protocol/zones/tree/ZoneNode.java | 24 + .../protocol/zones/tree/ZonesTreeModel.java | 24 + .../MinSizePopupUIModel-error-validation.xml | 23 + .../resources/i18n/tutti-ui-swing_en_GB.properties | 8 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 15 +- 97 files changed, 3004 insertions(+), 412 deletions(-) rename README.txt => README.md (100%) rename tutti-ui-swing/README.txt => tutti-ichtyometer/README.md (100%) rename tutti-persistence/{README.txt => README.md} (100%) create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/v3/SpeciesProtocol3.java copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolSpeciesRowModel.java => tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/v3/SpeciesProtocolBean3.java (62%) create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/v3/TuttiProtocol3.java create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/v3/TuttiProtocolBean3.java rename tutti-ui-swing-updater/README.txt => tutti-report-generator/README.md (100%) rename tutti-service/{README.txt => README.md} (100%) create mode 100644 tutti-service/src/test/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportServiceAno7992Test.java create mode 100644 tutti-service/src/test/resources/genericFormat/ano7992.tuttiProtocol rename tutti-report-generator/README.txt => tutti-ui-swing-updater/README.md (100%) rename tutti-ichtyometer/README.txt => tutti-ui-swing/README.md (100%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 17

branch feature/ecran_obs_individuelles updated (f600d0c -> be0ac0e)
by codelutin.com scm 29 Feb '16

29 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 f600d0c ajout d'une ligne d'observation individuelle quand on ajoute en rafale (refs #8019) new 815f48c - ajout du numéro de l'observation - suppression d'observations refs #8019 new a9c22e9 use lanbdas where possible new be0ac0e - copie des donnees d'observation individuelles dans le tableau des mensurations en fonction du mode - suppression ou ecrasement des données au changement de mode de copie refs #8019 The 3 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 be0ac0efc3c93bfe2fa24c7dc7977f7235b19ad5 Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Feb 29 16:04:42 2016 +0100 - copie des donnees d'observation individuelles dans le tableau des mensurations en fonction du mode - suppression ou ecrasement des données au changement de mode de copie refs #8019 commit a9c22e976e587b4871778c52276c16ba6b5ee0d0 Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Feb 26 16:35:25 2016 +0100 use lanbdas where possible commit 815f48cbc956f2bc62ba4b988107f71ee2b6309f Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Feb 26 16:23:13 2016 +0100 - ajout du numéro de l'observation - suppression d'observations refs #8019 Summary of changes: .../filtered-resources/tutti-help-fr.properties | 3 +- .../IndividualObservationBatchTableModel.java | 44 +- .../frequency/SpeciesFrequencyRowModel.java | 30 ++ .../species/frequency/SpeciesFrequencyUI.jaxx | 8 +- .../species/frequency/SpeciesFrequencyUI.jcss | 18 +- .../frequency/SpeciesFrequencyUIHandler.java | 446 ++++++++++++++------- .../species/frequency/SpeciesFrequencyUIModel.java | 25 +- .../frequency/actions/RemoveObservationAction.java | 74 ++++ .../resources/i18n/tutti-ui-swing_en_GB.properties | 12 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 15 +- 10 files changed, 510 insertions(+), 165 deletions(-) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/RemoveObservationAction.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 3

branch feature/8023 deleted (was 7560d97)
by codelutin.com scm 27 Feb '16

27 Feb '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/8023 in repository tutti. See http://git.codelutin.com/tutti.git was 7560d97 o Modification du modèle pour avoir les identifiants des lots dans les observations individuelles o Amélioration de l'API de persistence pour utiliser les bons types d'identifiants (Integer au lieu de String) o Nettoyage de code (java 8, variables inline, imports non optimisés, variables non utilisées) This change permanently discards the following revisions: discards 7560d97 o Modification du modèle pour avoir les identifiants des lots dans les observations individuelles o Amélioration de l'API de persistence pour utiliser les bons types d'identifiants (Integer au lieu de String) o Nettoyage de code (java 8, variables inline, imports non optimisés, variables non utilisées) discards ac9f784 Ajout du batchId sur l'entitié IndividualObservation (See #8023) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch feature/ecran_obs_individuelles updated (bed9756 -> f600d0c)
by codelutin.com scm 26 Feb '16

26 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 bed9756 graph des poids moyens (refs #8019) new f600d0c ajout d'une ligne d'observation individuelle quand on ajoute en rafale (refs #8019) 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 f600d0cfe30ce05453a2c9b5ce3e7fab1735f05d Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Feb 26 14:20:21 2016 +0100 ajout d'une ligne d'observation individuelle quand on ajoute en rafale (refs #8019) Summary of changes: .../filtered-resources/tutti-help-fr.properties | 3 +- .../species/frequency/SpeciesFrequencyUI.jaxx | 6 ++++ .../species/frequency/SpeciesFrequencyUI.jcss | 6 ++++ .../frequency/SpeciesFrequencyUIHandler.java | 9 +++-- .../species/frequency/SpeciesFrequencyUIModel.java | 39 ++++++++++++++++++++++ .../actions/ApplySpeciesFrequencyRafaleAction.java | 11 ++++++ .../resources/i18n/tutti-ui-swing_en_GB.properties | 2 ++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 2 ++ 8 files changed, 75 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/8023 created (now 7560d97)
by codelutin.com scm 26 Feb '16

26 Feb '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/8023 in repository tutti. See http://git.codelutin.com/tutti.git at 7560d97 o Modification du modèle pour avoir les identifiants des lots dans les observations individuelles o Amélioration de l'API de persistence pour utiliser les bons types d'identifiants (Integer au lieu de String) o Nettoyage de code (java 8, variables inline, imports non optimisés, variables non utilisées) This branch includes the following new commits: new ac9f784 Ajout du batchId sur l'entitié IndividualObservation (See #8023) new 7560d97 o Modification du modèle pour avoir les identifiants des lots dans les observations individuelles o Amélioration de l'API de persistence pour utiliser les bons types d'identifiants (Integer au lieu de String) o Nettoyage de code (java 8, variables inline, imports non optimisés, variables non utilisées) 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 7560d9797ab141f8af8179dd5c1ea38767850c63 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Feb 26 12:42:09 2016 +0100 o Modification du modèle pour avoir les identifiants des lots dans les observations individuelles o Amélioration de l'API de persistence pour utiliser les bons types d'identifiants (Integer au lieu de String) o Nettoyage de code (java 8, variables inline, imports non optimisés, variables non utilisées) commit ac9f78414833fedcc4d4ebc29307012fc780ade6 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Feb 26 07:38:45 2016 +0100 Ajout du batchId sur l'entitié IndividualObservation (See #8023) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2

branch feature/ecran_obs_individuelles updated (47891d3 -> bed9756)
by codelutin.com scm 26 Feb '16

26 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 47891d3 une seule popup pour l'histogramme pour pouvoir la fermer quand on quitte (refs #8019) new 6a26e7b titre de la popup de l'histogramme (refs #8019) new bed9756 graph des poids moyens (refs #8019) 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 bed975694b1b9b595ac64950e4df5246d102d862 Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Feb 26 11:35:29 2016 +0100 graph des poids moyens (refs #8019) commit 6a26e7bc068cabf9dcaf882c46830d9792a5b6ec Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Feb 26 10:02:50 2016 +0100 titre de la popup de l'histogramme (refs #8019) Summary of changes: .../operation/catches/EditCatchesUIHandler.java | 10 +- .../frequency/SpeciesFrequencyRowModel.java | 8 ++ .../frequency/SpeciesFrequencyTableModel.java | 61 ++++++++++--- .../species/frequency/SpeciesFrequencyUI.jaxx | 2 +- .../species/frequency/SpeciesFrequencyUI.jcss | 1 + .../frequency/SpeciesFrequencyUIHandler.java | 101 +++++++++++++++------ .../species/frequency/SpeciesFrequencyUIModel.java | 41 +++++++-- .../ui/swing/util/AbstractTuttiUIHandler.java | 42 ++++++++- .../resources/i18n/tutti-ui-swing_en_GB.properties | 1 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 1 + .../src/main/resources/icons/action-chart.png | Bin 0 -> 541 bytes 11 files changed, 212 insertions(+), 56 deletions(-) create mode 100644 tutti-ui-swing/src/main/resources/icons/action-chart.png -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2

branch feature/ecran_obs_individuelles updated (df1825b -> 47891d3)
by codelutin.com scm 25 Feb '16

25 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 df1825b - suppression de l'onglet observations individuelles dans la capture - ajout des lignes dans la table d'obs individuelles dans les mensurations (refs #8019) new 02b0ee4 affichage de l'histogramme dans une popup (refs #8019) new 6c3ee17 utilisation des rtp pour calculer les poids des lignes de mensuration (refs #8019) new 2e5ab37 vérification que le poids saisi est proche du poids calculé avec la RTP (refs #8019) new 47891d3 une seule popup pour l'histogramme pour pouvoir la fermer quand on quitte (refs #8019) 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 47891d347497825fc33c7c52ef004093e471a2b3 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Feb 25 18:53:22 2016 +0100 une seule popup pour l'histogramme pour pouvoir la fermer quand on quitte (refs #8019) commit 2e5ab370389abf6ced274727f04845dc94ea9f34 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Feb 25 18:31:22 2016 +0100 vérification que le poids saisi est proche du poids calculé avec la RTP (refs #8019) commit 6c3ee17741a731c00f068fa350e6d85b04d22471 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Feb 25 17:43:35 2016 +0100 utilisation des rtp pour calculer les poids des lignes de mensuration (refs #8019) commit 02b0ee4f4dc41942b28bfbff8c9d01b3dac8517f Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Feb 25 14:24:41 2016 +0100 affichage de l'histogramme dans une popup (refs #8019) Summary of changes: .../java/fr/ifremer/tutti/TuttiConfiguration.java | 8 + .../fr/ifremer/tutti/TuttiConfigurationOption.java | 18 ++- .../i18n/tutti-persistence_en_GB.properties | 2 + .../i18n/tutti-persistence_fr_FR.properties | 2 + .../swing/content/config/TuttiConfigUIHandler.java | 6 + .../frequency/SpeciesFrequencyRowModel.java | 33 ++++- .../frequency/SpeciesFrequencyTableModel.java | 5 +- .../species/frequency/SpeciesFrequencyUI.jcss | 1 + .../frequency/SpeciesFrequencyUIHandler.java | 161 +++++++++++++++++++-- .../species/frequency/SpeciesFrequencyUIModel.java | 46 ++++++ .../resources/i18n/tutti-ui-swing_en_GB.properties | 2 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 2 + 12 files changed, 265 insertions(+), 21 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 4

branch release/4.5-alpha-1 deleted (was 1ef3936)
by codelutin.com scm 25 Feb '16

25 Feb '16

This is an automated email from the git hooks/post-receive script. New change to branch release/4.5-alpha-1 in repository tutti. See http://git.codelutin.com/tutti.git was 1ef3936 [jgitflow-maven-plugin]updating poms for branch'release/4.5-alpha-1' 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

annotated tag tutti-4.5-alpha-1 created (now c4849f5)
by codelutin.com scm 25 Feb '16

25 Feb '16

This is an automated email from the git hooks/post-receive script. New change to annotated tag tutti-4.5-alpha-1 in repository tutti. See http://git.codelutin.com/tutti.git at c4849f5 (tag) tagging 43e9096e7d7c7b828df8b61e566f072a3d126e27 (commit) replaces tutti-4.4 tagged by Maven Release on Thu Feb 25 18:13:23 2016 +0100 - Log ----------------------------------------------------------------- [jgitflow-maven-plugin]tagging release 4.5-alpha-1 ----------------------------------------------------------------------- No new revisions were added by this update. -- 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-alpha-1 updated (6d7f9a0 -> 1ef3936)
by codelutin.com scm 25 Feb '16

25 Feb '16

This is an automated email from the git hooks/post-receive script. New change to branch release/4.5-alpha-1 in repository tutti. See http://git.codelutin.com/tutti.git from 6d7f9a0 [jgitflow-maven-plugin]updating poms for 4.5-alpha-1 branch with snapshot versions adds 809bcd9 Add missing license headers adds 1ef3936 [jgitflow-maven-plugin]updating poms for branch'release/4.5-alpha-1' with non-snapshot versions No new revisions were added by this update. Summary of changes: pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- .../entities/protocol/v3/SpeciesProtocol3.java | 24 ++++++++++++++++++++++ .../entities/protocol/v3/SpeciesProtocolBean3.java | 24 ++++++++++++++++++++++ .../entities/protocol/v3/TuttiProtocol3.java | 24 ++++++++++++++++++++++ .../entities/protocol/v3/TuttiProtocolBean3.java | 24 ++++++++++++++++++++++ tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- .../protocol/CalcifiedPiecesSamplingRow.java | 24 ++++++++++++++++++++++ .../protocol/CalcifiedPiecesSamplingRowModel.java | 24 ++++++++++++++++++++++ tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- .../filtered-resources/tutti-help-fr.properties | 23 +++++++++++++++++++++ .../content/operation/catches/BatchSavedEvent.java | 24 ++++++++++++++++++++++ .../operation/catches/BatchSavedListener.java | 24 ++++++++++++++++++++++ .../CalcifiedPiecesSamplingEditorRowModel.java | 24 ++++++++++++++++++++++ .../CalcifiedPiecesSamplingEditorTableModel.java | 24 ++++++++++++++++++++++ .../CalcifiedPiecesSamplingEditorUI.jaxx | 23 +++++++++++++++++++++ .../CalcifiedPiecesSamplingEditorUIHandler.java | 24 ++++++++++++++++++++++ .../MinSizePopupUIModel.java | 24 ++++++++++++++++++++++ .../actions/AddSpeciesAction.java | 24 ++++++++++++++++++++++ .../actions/DeleteRowAction.java | 24 ++++++++++++++++++++++ .../actions/DeleteSpeciesAction.java | 24 ++++++++++++++++++++++ .../actions/SplitSpeciesAction.java | 24 ++++++++++++++++++++++ .../swing/content/protocol/zones/ZoneEditorUI.jaxx | 23 +++++++++++++++++++++ .../protocol/zones/ZoneEditorUIHandler.java | 24 ++++++++++++++++++++++ .../protocol/zones/actions/AddStratasAction.java | 24 ++++++++++++++++++++++ .../CollapseAvailableStratasTreeAction.java | 24 ++++++++++++++++++++++ .../zones/actions/CollapseZonesTreeAction.java | 24 ++++++++++++++++++++++ .../protocol/zones/actions/CreateZoneAction.java | 24 ++++++++++++++++++++++ .../protocol/zones/actions/DeleteZoneAction.java | 24 ++++++++++++++++++++++ .../actions/ExpandAvailableStratasTreeAction.java | 24 ++++++++++++++++++++++ .../zones/actions/ExpandZonesTreeAction.java | 24 ++++++++++++++++++++++ .../zones/actions/RemoveStratasAction.java | 24 ++++++++++++++++++++++ .../protocol/zones/actions/RenameZoneAction.java | 24 ++++++++++++++++++++++ .../protocol/zones/models/StrataUIModel.java | 24 ++++++++++++++++++++++ .../protocol/zones/models/SubStrataUIModel.java | 24 ++++++++++++++++++++++ .../content/protocol/zones/models/ZoneUIModel.java | 24 ++++++++++++++++++++++ .../zones/tree/AbstractZoneEditorTreeModel.java | 24 ++++++++++++++++++++++ .../content/protocol/zones/tree/StrataNode.java | 24 ++++++++++++++++++++++ .../protocol/zones/tree/StratasTreeModel.java | 24 ++++++++++++++++++++++ .../content/protocol/zones/tree/SubStrataNode.java | 24 ++++++++++++++++++++++ .../protocol/zones/tree/ZoneEditorNode.java | 24 ++++++++++++++++++++++ .../zones/tree/ZoneEditorTreeCellRenderer.java | 24 ++++++++++++++++++++++ .../content/protocol/zones/tree/ZoneNode.java | 24 ++++++++++++++++++++++ .../protocol/zones/tree/ZonesTreeModel.java | 24 ++++++++++++++++++++++ .../MinSizePopupUIModel-error-validation.xml | 23 +++++++++++++++++++++ 48 files changed, 987 insertions(+), 7 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0