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

branch develop updated (a13e8d5 -> 24c70e7)
by codelutin.com scm April 6, 2016

April 6, 2016

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 a13e8d5 desactivation de la table des obs indiv si pas de methode de mensuration new ed4b64a [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 6f3a114 [jgitflow-maven-plugin]updating poms for 4.5-rc-2 branch with snapshot versions new f91e460 Add license headers new 92d6e9a [jgitflow-maven-plugin]updating poms for branch'release/4.5-rc-2' with non-snapshot versions new e8d61cd [jgitflow-maven-plugin]merging 'release/4.5-rc-2' into 'master' new a87a0f3 [jgitflow-maven-plugin]merging 'master' into 'develop' new 24c70e7 [jgitflow-maven-plugin]Updating develop poms back to pre merge state 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 24c70e7369c51178cbc2dc72bfa2b65cb3fc37ae Author: Maven Release <maven-release(a)codelutin.com> Date: Wed Apr 6 18:05:40 2016 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit a87a0f3aa5001f039c6528dd8fd27e3bf949fc2f Merge: ed4b64a e8d61cd Author: Maven Release <maven-release(a)codelutin.com> Date: Wed Apr 6 18:05:38 2016 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' commit ed4b64a84851264b2379e0cc007f663665d013ac Author: Maven Release <maven-release(a)codelutin.com> Date: Wed Apr 6 18:05:35 2016 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit e8d61cd6b999d1659d371362bbd342d6d3bc190f Merge: 262b35a 92d6e9a Author: Maven Release <maven-release(a)codelutin.com> Date: Wed Apr 6 18:05:32 2016 +0200 [jgitflow-maven-plugin]merging 'release/4.5-rc-2' into 'master' commit 92d6e9aff58e3af682d9e21be5d71bc8f574132e Author: Maven Release <maven-release(a)codelutin.com> Date: Wed Apr 6 18:03:01 2016 +0200 [jgitflow-maven-plugin]updating poms for branch'release/4.5-rc-2' with non-snapshot versions commit f91e4604a4a49a87071de8cef0e3b1762a92be13 Author: Maven Release <maven-release(a)codelutin.com> Date: Wed Apr 6 18:02:49 2016 +0200 Add license headers Summary of changes: .../cps/CalcifiedPiecesSamplingExportService.java | 24 ++++++++++++++++++++++ .../service/export/cps/SamplingNumberRowModel.java | 24 ++++++++++++++++++++++ .../tutti/service/sampling/CacheExtractedKey.java | 24 ++++++++++++++++++++++ .../filtered-resources/tutti-help-fr.properties | 23 +++++++++++++++++++++ .../CalcifiedPiecesSamplingReportAction.java | 24 ++++++++++++++++++++++ .../swing/util/WideDataBeanFilterableComboBox.java | 24 ++++++++++++++++++++++ 6 files changed, 143 insertions(+) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 6

annotated tag tutti-4.5-rc-2 created (now 4d68a24)
by codelutin.com scm April 6, 2016

April 6, 2016

This is an automated email from the git hooks/post-receive script. New change to annotated tag tutti-4.5-rc-2 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git at 4d68a24 (tag) tagging e8d61cd6b999d1659d371362bbd342d6d3bc190f (commit) replaces tutti-4.5-rc-1 tagged by Maven Release on Wed Apr 6 18:05:33 2016 +0200 - Log ----------------------------------------------------------------- [jgitflow-maven-plugin]tagging release 4.5-rc-2 ----------------------------------------------------------------------- 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-rc-2 updated (6f3a114 -> 92d6e9a)
by codelutin.com scm April 6, 2016

April 6, 2016

This is an automated email from the git hooks/post-receive script. New change to branch release/4.5-rc-2 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git from 6f3a114 [jgitflow-maven-plugin]updating poms for 4.5-rc-2 branch with snapshot versions adds f91e460 Add license headers adds 92d6e9a [jgitflow-maven-plugin]updating poms for branch'release/4.5-rc-2' 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 +- tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- .../cps/CalcifiedPiecesSamplingExportService.java | 24 ++++++++++++++++++++++ .../service/export/cps/SamplingNumberRowModel.java | 24 ++++++++++++++++++++++ .../tutti/service/sampling/CacheExtractedKey.java | 24 ++++++++++++++++++++++ tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- .../filtered-resources/tutti-help-fr.properties | 23 +++++++++++++++++++++ .../CalcifiedPiecesSamplingReportAction.java | 24 ++++++++++++++++++++++ .../swing/util/WideDataBeanFilterableComboBox.java | 24 ++++++++++++++++++++++ 13 files changed, 150 insertions(+), 7 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch master updated (262b35a -> e8d61cd)
by codelutin.com scm April 6, 2016

April 6, 2016

This is an automated email from the git hooks/post-receive script. New change to branch master in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git from 262b35a [jgitflow-maven-plugin]merging 'release/4.5-rc-1' into 'master' adds 100b5ac [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds b6dfa22 [jgitflow-maven-plugin]merging 'master' into 'develop' adds e12d758 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 927e936 prise en compte du cas de l'intervalle 1 (fixes #8208) adds 9c43cc8 Merge branch 'feature/8208' into 'develop' adds f7abf93 conversion des centimetres en millimetres avant d'envoyer à l'algo de prelevements (refs #8207) adds 856ac6e Merge branch 'feature/8207' into 'develop' adds 59dac8e on ne set le rtp a null que quand on edite un nouveau batch (fixes #8213) adds 002a348 Merge branch 'feature/8213' into 'develop' adds 26aef4b index selectionné >= 0 (pourquoi à 1 ????) (fixes #8218) adds 94616c1 Merge branch 'feature/8218' into 'develop' adds a32347d Utilisation de la bonne liste de taxons (See #8200) adds efd0d34 Merge branch 'feature/8200' into 'develop' adds f56397f lecture de la mesure venant de l'ichtyometre, qu'importe le mode de copie (fixes #8206) adds 4365ccc livrable #8206 Merge branch 'feature/8206' into develop adds ff7f247 l'ui qui permet d'avoir la popup plus large doit etre mise sur la combo à la création, sinon ça a l'air de virer des listeners (fixes #8209) adds 827b53a livrable #8209 Merge branch 'feature/8209' into develop adds 9d0beb9 on pousse la caracteristique de maturité dans les caracteristiques par defaut pour que la maturité ne soit pas éditable sur un lot maturé (fixes #8219) adds 1a76326 livrable #8219 Merge branch 'feature/8219' into develop adds 23db1ec Amélioration du cache des codes de prélèvements (ne pas utiliser des Integer en valeurs d'une map) adds 27b822c Ajout d'une méthode sur la persistence pour tester qu'on peut utiliser un code de prélèvement (See #8204) adds 16b60e9 Ajout d'un cache de code de prélèvement viables ou non + blocage si code de prélèvement pas possible (See #8204) adds f5aaca3 Add more logs + display error if code is not available (Fixes #8204) adds e8523b6 On decremente uniquement si le code matché est le plus haut + amélioration code adds b83f3ca we show the popup until the user enters a valid sample code (refs #8204) adds cd3f1b6 add or remove the sampling code even if the row should not be sampled according to the protocol (fixes #8204) adds 4fe32d1 Merge branch 'feature/8204' into 'develop' adds bac8951 on pousse les caractéristiques non éditables dans le modèle (par exemple le sexe dans le cas d'un lot sexé) pour ne pas considéré cette données comme saisie et permettre l'enregistrement même si des lignes ont des valeurs seulement pour ces caractéristiques (fixes #8210) adds 4cdee6d testable-client #8210 Merge branch 'feature/8210' into develop adds a69ce47 je sais pas pourquoi ca sélectionnait la celulle alors qu'on lui demandait que non, du coup on selectionne la cellule, et ça remplace la sélection précédente (fixes #8211) adds 6e5e643 livrable #8211 Merge branch 'feature/8211' into develop adds dd370be on met d'abord le poids à jour, puis la taille (la modif de la taille peut supprimer la ligne de mensuration si le nombre est à 0) (fixes #8212) adds 049bea4 Livrable #8212 Merge branch 'feature/8212' into develop adds 5c94f81 on ne peut pas se baser sur le columnmodel pour mettre à jour les identifiants, car on ne garde pas le même ordre et la colonne est déjà supprimée quand on passe dans le listener, donc on ne peut pas savoir quel id supprimer (refs #8205) adds c84a591 - on pousse la taille du columnmodel avec les colonnes cachées dans l'index de modele des colonnes - on pousse la colonne de maturité spécifiquement au modele de table qui saura l'ajouter ou la retirer aux identifiers fixes #8205 adds 127de03 Livrable #8205 Merge branch 'feature/8205' into develop adds 2c7e788 i18n adds fb9c233 récup du nombre de prélèvement par classe de taille pour une espece/maturité/sexe (refs #8157) adds ee83fe8 service d'export du rapport de prélèvements (refs #8157) adds 7ba8cc4 ajout de l'action de rapport de prélèvement pour la campagne (refs #8157) adds 25ee74b i18n (fixes #8157) adds 0c32490 on demande au cache de créer les lignes pour l'export (refs #8157) adds eae0937 On prend en compte les prélèvements qui ne rentrent pas dans le protocole (fixes #8157) adds 059bd44 add comment adds 82606f5 lengthstep non null dans l'event (refs #8157) adds 6fa51c5 - finalement, on ne permet pas de code prélèvement si pas de taille - on remplace le code campagne par le code ruben s'iln 'y en a pas - dans le prefixe, on met ~ au lieu de # quand il n'y a pas de code (fixes #8157) adds a44c7eb Livrable #8157 Merge branch 'feature/8157' into develop adds 796926f ajout du nombre d'observations dans l'export + on n'exporte pas les lignes sans obs ni prelevements (refs #8157) adds 4d9cc98 Improve code adds 3ac965d Livrable #8157 Merge branch 'feature/8157-2' into develop adds 6c57296 on demande au cache le résumé de prélèvement pour la ligne sélectionnée (s'il n'y a qu'une ligne sélectionnée) (fixes #8203) adds c961117 correction (pas d'incrément, on récupère juste le nombre d'observations) (fixes #8203) adds 597b1e3 - flag pour ne pas effacer le message de prélèvement en cas d'ajout en rafale - on n'efface pas le résumé des prelevements quand on modifie les lignes (refs #8203) adds 0e34ab5 on demande au cache le résumé de prélèvement pour la ligne sélectionnée (s'il n'y a qu'une ligne sélectionnée) (fixes #8203) adds ff5f44e correction (pas d'incrément, on récupère juste le nombre d'observations) (fixes #8203) adds 7a08a7e Fix merge adds 985fc53 - on cache le message de prélèvement avant de créer une ligen en rafale - on cache le résumé quand aucune ligne n'est sélectionnée refs #8203 adds de6697e flag pour ne pas afficher les notifs quand on charge le lot ou qu'on reset (refs #8203) adds 780e9e2 on n'affiche pas le bandeau de prélèvement si on ne peut pas afficher les notifs (fixes #8203) adds 3cccfa4 Livrable #8203 Merge branch 'feature/8203' into develop adds a13e8d5 desactivation de la table des obs indiv si pas de methode de mensuration adds 6f3a114 [jgitflow-maven-plugin]updating poms for 4.5-rc-2 branch with snapshot versions adds f91e460 Add license headers adds 92d6e9a [jgitflow-maven-plugin]updating poms for branch'release/4.5-rc-2' with non-snapshot versions adds e8d61cd [jgitflow-maven-plugin]merging 'release/4.5-rc-2' into 'master' No new revisions were added by this update. Summary of changes: pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- .../tutti/persistence/TuttiPersistenceImpl.java | 5 + .../persistence/TuttiPersistenceNoDbImpl.java | 5 + ...dividualObservationBatchPersistenceService.java | 10 + ...dualObservationBatchPersistenceServiceImpl.java | 49 ++++ .../service/util/SamplePersistenceHelper.java | 82 ++++-- .../main/java/fr/ifremer/tutti/util/Numbers.java | 24 ++ .../main/java/fr/ifremer/tutti/util/Weights.java | 5 +- .../src/main/resources/queries-failsafe.hbm.xml | 36 +++ tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- .../ifremer/tutti/service/PersistenceService.java | 5 + .../cps/CalcifiedPiecesSamplingExportService.java | 109 ++++++++ .../service/export/cps/SamplingNumberRowModel.java | 90 +++++++ .../tutti/service/sampling/CacheExtractedKey.java | 109 ++++++++ .../service/sampling/CruiseSamplingCache.java | 287 +++++++++++++------- .../sampling/CruiseSamplingCacheLoader.java | 4 +- .../sampling/CruiseSamplingInternalCache.java | 99 +++++-- .../tutti/service/sampling/SamplingCodePrefix.java | 11 +- .../tutti/service/sampling/SamplingEvent.java | 6 +- .../tutti/service/sampling/SamplingListener.java | 2 +- .../resources/i18n/tutti-service_en_GB.properties | 12 + .../resources/i18n/tutti-service_fr_FR.properties | 16 +- tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- .../filtered-resources/tutti-help-fr.properties | 3 +- .../fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 5 + .../ui/swing/content/home/SelectCruiseUI.jaxx | 1 + .../ui/swing/content/home/SelectCruiseUI.jcss | 10 +- .../CalcifiedPiecesSamplingReportAction.java | 141 ++++++++++ .../IndividualObservationBatchTableModel.java | 52 ++-- .../SamplingCodeCellEditor.java | 2 +- .../create/CreateSpeciesBatchUIHandler.java | 3 +- .../frequency/IndividualObservationUICache.java | 277 +++++++++++++------ .../species/frequency/SpeciesFrequencyUI.jaxx | 13 +- .../species/frequency/SpeciesFrequencyUI.jcss | 2 +- .../frequency/SpeciesFrequencyUIHandler.java | 296 +++++++++++++-------- .../species/frequency/SpeciesFrequencyUIModel.java | 64 ++++- .../actions/ApplySpeciesFrequencyRafaleAction.java | 28 +- .../actions/CancelEditSpeciesFrequencyAction.java | 2 + .../frequency/actions/EditSampleCodeAction.java | 102 ++++++- .../frequency/actions/RemoveObservationAction.java | 7 +- .../actions/ResetSpeciesFrequencyAction.java | 4 + .../WideDataBeanFilterableComboBox.java} | 23 +- .../tutti/ui/swing/util/WideDataComboBoxUI.java | 48 +++- .../resources/i18n/tutti-ui-swing_en_GB.properties | 13 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 15 +- 49 files changed, 1646 insertions(+), 445 deletions(-) create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/export/cps/CalcifiedPiecesSamplingExportService.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/export/cps/SamplingNumberRowModel.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/sampling/CacheExtractedKey.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/actions/CalcifiedPiecesSamplingReportAction.java copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/{content/protocol/zones/actions/ExpandZonesTreeAction.java => util/WideDataBeanFilterableComboBox.java} (58%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

[ANN] - Tutti 4.5-rc-2 released
by codelutin.com Release Notification April 6, 2016

April 6, 2016

The Tutti team is pleased to announce the tutti-4.5-rc-2 release! Outil de saisie de données d'opérations et de captures au cours des campagnes halieutiques. Documentation of the project can be found here: http://tutti.codelutin.com Changes ------- Changes in this version include: New features: o [OBSERVATIONS INDIVIDUELLES] éditeur de code prélèvement Issue: 8066. Thanks to Vincent BADTS. Resolved by kmorin. o [REPORTING] export csv de l'état des prélèvements de pièces calcifiées Issue: 8157. Thanks to Vincent BADTS. Resolved by tchemit. o [OBSERVATIONS INDIVIDUELLES] quand je sélectionne une ligne je dois voir l'état d'avancement de l'algo pour cette classe de taille Issue: 8203. Thanks to Vincent BADTS. Resolved by kmorin. Fixed Bugs: o [OBSERVATIONS INDIVIDUELLES] impossible de modifier le code sur la première ligne du tableau Issue: 8218. Thanks to Kevin Morin. Resolved by kmorin. o [OBSERVATIONS INDIVIDUELLES] problème de persistence de méthode de recopie Issue: 8215. Thanks to Vincent BADTS. Resolved by tchemit. o [OBSERVATIONS INDIVIDUELLES] impossible de supprimer une ligne qui a une classe de taille unique Issue: 8212. Thanks to Vincent BADTS. Resolved by kmorin. o [OBSERVATIONS INDIVIDUELLES] blocage écran, cf log Issue: 8205. Thanks to Vincent BADTS. Resolved by kmorin. o [OBSERVATIONS INDIVIDUELLES] notification non déclenchée Issue: 8193. Thanks to Kevin Morin. Resolved by kmorin. o [OBSERVATIONS INDIVIDUELLES] plus d'affichage des logs en mode rafale Issue: 8150. Thanks to Vincent BADTS. Resolved by kmorin. o [CAPTURES] Problème de sélection des espèces lors de la création d'un lot Issue: 8200. Thanks to Tony Chemit. Resolved by tchemit. o [OBSERVATIONS INDIVIDUELLES] Les tailles ne sont pas converties avant d'être prises en compte dans l'algorithme de prélèvement Issue: 8207. Thanks to Kevin Morin. Resolved by kmorin. o [CAPTURES] création lot, liste espèce non limitée au protocole Issue: 8201. Thanks to Vincent BADTS. Resolved by kmorin. o [OBSERVATIONS INDIVIDUELLES] ligne vide mais empêche l'enregistrement à cause des colonnes stiky ? Issue: 8210. Thanks to Vincent BADTS. Resolved by kmorin. o [OBSERVATIONS INDIVIDUELLES] si création code alors la ligne s'ajoute à la sélection Issue: 8211. Thanks to Vincent BADTS. Resolved by kmorin. o [ERGO] non conservation des choix d'organisation des écrans quand on navigue dans les différents écrans Issue: 8202. Thanks to Vincent BADTS. Resolved by kmorin. o [OBSERVATIONS INDIVIDUELLES] j'arrive à saisir plusieur fois le même code de prélèvement Issue: 8204. Thanks to Vincent BADTS. Resolved by kmorin. o [OBSERVATIONS INDIVIDUELLES] case RTP plus active Issue: 8213. Thanks to Vincent BADTS. Resolved by kmorin. o [OBSERVATIONS INDIVIDUELLES] message de prélèvement incohérent Issue: 8216. Thanks to Vincent BADTS. Resolved by kmorin. o [OBSERVATIONS INDIVIDUELLES] Pas de demande de prélèvement si on a un interval de 1 dans l'algorithme Issue: 8208. Thanks to Kevin Morin. Resolved by kmorin. o [ICHTYOMETRE] plus de retour sonore en mode "tout" ou "seulement les tailles" Issue: 8206. Thanks to Vincent BADTS. Resolved by kmorin. o [MENSURATIONS] ecran en anomalie, espèce à dénombré que j'essaye de mesurer Issue: 8209. Thanks to Vincent BADTS. Resolved by kmorin. o [OBSERVATIONS INDIVIDUELLES] La maturité est éditable sur un lot maturé Issue: 8219. Thanks to Kevin Morin. Resolved by kmorin. Downloads --------- For a manual installation, you can download files here: https://forge.codelutin.com/projects/tutti/files * tutti-ichtyometer-4.5-rc-2-tools.zip - https://forge.codelutin.com/attachments/download/3826 * tutti-ichtyometer-4.5-rc-2-tools.zip - https://forge.codelutin.com/attachments/download/3844 Maven artifacts --------------- Artifacts are deployed in nuiton maven repository http://maven.nuiton.org/other-releases/ Have fun! -Tutti team

1 0

branch release/4.5-rc-2 created (now 6f3a114)
by codelutin.com scm April 6, 2016

April 6, 2016

This is an automated email from the git hooks/post-receive script. New change to branch release/4.5-rc-2 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git at 6f3a114 [jgitflow-maven-plugin]updating poms for 4.5-rc-2 branch with snapshot versions This branch includes the following new commits: new 6f3a114 [jgitflow-maven-plugin]updating poms for 4.5-rc-2 branch with snapshot versions 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 6f3a11409a580ddd330750636df44ab0e4ff4bbc Author: Maven Release <maven-release(a)codelutin.com> Date: Wed Apr 6 17:58:52 2016 +0200 [jgitflow-maven-plugin]updating poms for 4.5-rc-2 branch with snapshot versions -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

annotated tag tutti-4.5-rc-2 deleted (was 1b898a0)
by codelutin.com scm April 6, 2016

April 6, 2016

This is an automated email from the git hooks/post-receive script. New change to annotated tag tutti-4.5-rc-2 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git *** WARNING: tag tutti-4.5-rc-2 was deleted! *** tag was 1b898a0 The revisions that were on this annotated tag 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/8202 deleted (was 674b052)
by codelutin.com scm April 6, 2016

April 6, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/8202 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git was 674b052 on supprime la colonne de maturité en fermant l'ui, pour avoir les même colonnes qu'à la création de l'écran (important pour la swing session) (fixes #8202) 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 develop updated (3cccfa4 -> a13e8d5)
by codelutin.com scm April 6, 2016

April 6, 2016

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 3cccfa4 Livrable #8203 Merge branch 'feature/8203' into develop new a13e8d5 desactivation de la table des obs indiv si pas de methode de mensuration 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 a13e8d5045665b34f0281ff8dc9c8c7551f7b50e Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Apr 6 17:46:02 2016 +0200 desactivation de la table des obs indiv si pas de methode de mensuration Summary of changes: .../content/operation/catches/species/frequency/SpeciesFrequencyUI.jcss | 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 1

branch feature/8202 updated (b11ce86 -> 674b052)
by codelutin.com scm April 6, 2016

April 6, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/8202 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git omits b11ce86 on supprime la colonne de maturité en fermant l'ui, pour avoir les même colonnes qu'à la création de l'écran (important pour la swing session) (fixes #8202) adds 6c57296 on demande au cache le résumé de prélèvement pour la ligne sélectionnée (s'il n'y a qu'une ligne sélectionnée) (fixes #8203) adds c961117 correction (pas d'incrément, on récupère juste le nombre d'observations) (fixes #8203) adds 597b1e3 - flag pour ne pas effacer le message de prélèvement en cas d'ajout en rafale - on n'efface pas le résumé des prelevements quand on modifie les lignes (refs #8203) adds 0e34ab5 on demande au cache le résumé de prélèvement pour la ligne sélectionnée (s'il n'y a qu'une ligne sélectionnée) (fixes #8203) adds ff5f44e correction (pas d'incrément, on récupère juste le nombre d'observations) (fixes #8203) adds 7a08a7e Fix merge adds 985fc53 - on cache le message de prélèvement avant de créer une ligen en rafale - on cache le résumé quand aucune ligne n'est sélectionnée refs #8203 adds de6697e flag pour ne pas afficher les notifs quand on charge le lot ou qu'on reset (refs #8203) adds 780e9e2 on n'affiche pas le bandeau de prélèvement si on ne peut pas afficher les notifs (fixes #8203) adds 3cccfa4 Livrable #8203 Merge branch 'feature/8203' into develop new 674b052 on supprime la colonne de maturité en fermant l'ui, pour avoir les même colonnes qu'à la création de l'écran (important pour la swing session) (fixes #8202) 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 (b11ce86) \ N -- N -- N refs/heads/feature/8202 (674b052) 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 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 674b052b56ba0fd5e0650c1a1440ee02f03ce279 Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Apr 6 15:17:45 2016 +0200 on supprime la colonne de maturité en fermant l'ui, pour avoir les même colonnes qu'à la création de l'écran (important pour la swing session) (fixes #8202) Summary of changes: .../service/sampling/CruiseSamplingCache.java | 68 ++++++++- .../sampling/CruiseSamplingInternalCache.java | 10 ++ .../tutti/service/sampling/SamplingListener.java | 2 +- .../frequency/IndividualObservationUICache.java | 154 +++++++++++++-------- .../frequency/SpeciesFrequencyUIHandler.java | 32 ++++- .../species/frequency/SpeciesFrequencyUIModel.java | 30 ++++ .../actions/ApplySpeciesFrequencyRafaleAction.java | 11 +- .../actions/CancelEditSpeciesFrequencyAction.java | 2 + .../actions/ResetSpeciesFrequencyAction.java | 4 + .../resources/i18n/tutti-ui-swing_en_GB.properties | 2 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 4 +- 11 files changed, 244 insertions(+), 75 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1