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

branch feature/8157-2 created (now 796926f)
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/8157-2 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git at 796926f ajout du nombre d'observations dans l'export + on n'exporte pas les lignes sans obs ni prelevements (refs #8157) This branch includes the following new commits: new 796926f ajout du nombre d'observations dans l'export + on n'exporte pas les lignes sans obs ni prelevements (refs #8157) 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 796926f64c5e681d04618d0f41db188e98e1be50 Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Apr 6 14:06:49 2016 +0200 ajout du nombre d'observations dans l'export + on n'exporte pas les lignes sans obs ni prelevements (refs #8157) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/8203 updated (2f55a8d -> 36f362f)
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/8203 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git omits 2f55a8d correction (pas d'incrément, on récupère juste le nombre d'observations) (fixes #8203) omits 30f4e68 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 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 new 7cec81f 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) new 36f362f correction (pas d'incrément, on récupère juste le nombre d'observations) (fixes #8203) 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 (2f55a8d) \ N -- N -- N refs/heads/feature/8203 (36f362f) 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 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 36f362fc8ae942d69b3f41a8218b1030c57ab0d1 Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Apr 6 11:41:01 2016 +0200 correction (pas d'incrément, on récupère juste le nombre d'observations) (fixes #8203) commit 7cec81f6cb60ab9807e50b5a7bf9d0c954600bf6 Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Apr 6 11:34:34 2016 +0200 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) Summary of changes: .../cps/CalcifiedPiecesSamplingExportService.java | 85 ++++++++++ .../service/export/cps/SamplingNumberRowModel.java | 65 ++++++++ .../tutti/service/sampling/CacheExtractedKey.java | 75 +++++++++ .../service/sampling/CruiseSamplingCache.java | 143 ++++++++-------- .../sampling/CruiseSamplingCacheLoader.java | 4 +- .../sampling/CruiseSamplingInternalCache.java | 62 ++++++- .../tutti/service/sampling/SamplingCodePrefix.java | 7 +- .../resources/i18n/tutti-service_en_GB.properties | 11 ++ .../resources/i18n/tutti-service_fr_FR.properties | 15 +- .../fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 5 + .../ui/swing/content/home/SelectCruiseUI.jaxx | 1 + .../ui/swing/content/home/SelectCruiseUI.jcss | 10 +- .../CalcifiedPiecesSamplingReportAction.java | 117 ++++++++++++++ .../IndividualObservationBatchTableModel.java | 2 +- .../frequency/IndividualObservationUICache.java | 7 +- .../frequency/SpeciesFrequencyUIHandler.java | 179 +++++++++++---------- .../resources/i18n/tutti-ui-swing_en_GB.properties | 10 ++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 10 ++ 18 files changed, 638 insertions(+), 170 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 -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2

branch develop updated (127de03 -> a44c7eb)
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 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) new a44c7eb Livrable #8157 Merge branch 'feature/8157' 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 a44c7ebd22b25d146702628c3a2270c74ef39541 Merge: 127de03 6fa51c5 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Apr 6 12:27:55 2016 +0200 Livrable #8157 Merge branch 'feature/8157' into develop Summary of changes: .../cps/CalcifiedPiecesSamplingExportService.java | 85 ++++++++++ .../service/export/cps/SamplingNumberRowModel.java | 65 ++++++++ .../tutti/service/sampling/CacheExtractedKey.java | 75 +++++++++ .../service/sampling/CruiseSamplingCache.java | 143 ++++++++-------- .../sampling/CruiseSamplingCacheLoader.java | 4 +- .../sampling/CruiseSamplingInternalCache.java | 62 ++++++- .../tutti/service/sampling/SamplingCodePrefix.java | 7 +- .../tutti/service/sampling/SamplingEvent.java | 6 +- .../resources/i18n/tutti-service_en_GB.properties | 11 ++ .../resources/i18n/tutti-service_fr_FR.properties | 15 +- .../fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 5 + .../ui/swing/content/home/SelectCruiseUI.jaxx | 1 + .../ui/swing/content/home/SelectCruiseUI.jcss | 10 +- .../CalcifiedPiecesSamplingReportAction.java | 117 ++++++++++++++ .../IndividualObservationBatchTableModel.java | 2 +- .../frequency/IndividualObservationUICache.java | 7 +- .../frequency/SpeciesFrequencyUIHandler.java | 179 +++++++++++---------- .../resources/i18n/tutti-ui-swing_en_GB.properties | 10 ++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 10 ++ 19 files changed, 641 insertions(+), 173 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 -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/8157 updated (cb8e135 -> 6fa51c5)
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/8157 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git discards cb8e135 - 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) discards a327eb1 lengthstep non null dans l'event (refs #8157) discards bbc90a0 add comment discards d31ed9a On prend en compte les prélèvements qui ne rentrent pas dans le protocole (fixes #8157) discards 4cb6f60 on demande au cache de créer les lignes pour l'export (refs #8157) discards a4eecf3 i18n (fixes #8157) discards ee33996 ajout de l'action de rapport de prélèvement pour la campagne (refs #8157) discards 73828f3 service d'export du rapport de prélèvements (refs #8157) discards c4a9ecb récup du nombre de prélèvement par classe de taille pour une espece/maturité/sexe (refs #8157) discards 2255550 i18n 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) 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 (cb8e135) \ N -- N -- N refs/heads/feature/8157 (6fa51c5) 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: .../IndividualObservationBatchTableModel.java | 40 +++--------- .../frequency/SpeciesFrequencyUIHandler.java | 72 +++++++++++++++++----- 2 files changed, 66 insertions(+), 46 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch feature/8203 updated (30f4e68 -> 2f55a8d)
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/8203 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git from 30f4e68 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) new 2f55a8d correction (pas d'incrément, on récupère juste le nombre d'observations) (fixes #8203) 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 2f55a8d417fed58518ead68dcd7b6944e5f3299c Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Apr 6 11:41:01 2016 +0200 correction (pas d'incrément, on récupère juste le nombre d'observations) (fixes #8203) Summary of changes: .../fr/ifremer/tutti/service/sampling/CruiseSamplingCache.java | 6 +++--- .../tutti/service/sampling/CruiseSamplingInternalCache.java | 10 ++++++++++ 2 files changed, 13 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/8203 created (now 30f4e68)
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/8203 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git at 30f4e68 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) This branch includes the following new commits: new 30f4e68 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) 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 30f4e683857dde88ea0565823a61c5fb694fd7d8 Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Apr 6 11:34:34 2016 +0200 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) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/8157 updated (a327eb1 -> cb8e135)
by codelutin.com scm April 5, 2016

April 5, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/8157 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git from a327eb1 lengthstep non null dans l'event (refs #8157) new cb8e135 - 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) 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 cb8e1353c086954ddba83e9596536a12bcd2dfa0 Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Apr 5 18:16:24 2016 +0200 - 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) Summary of changes: .../cps/CalcifiedPiecesSamplingExportService.java | 8 +- .../service/export/cps/SamplingNumberRowModel.java | 9 +- .../tutti/service/sampling/CacheExtractedKey.java | 6 +- .../service/sampling/CruiseSamplingCache.java | 39 +++-- .../sampling/CruiseSamplingCacheLoader.java | 2 +- .../sampling/CruiseSamplingInternalCache.java | 34 ++-- .../tutti/service/sampling/SamplingCodePrefix.java | 7 +- .../IndividualObservationBatchTableModel.java | 2 +- .../frequency/IndividualObservationUICache.java | 7 +- .../frequency/SpeciesFrequencyUIHandler.java | 179 +++++++++++---------- 10 files changed, 149 insertions(+), 144 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/8157 updated (bbc90a0 -> a327eb1)
by codelutin.com scm April 5, 2016

April 5, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/8157 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git from bbc90a0 add comment new a327eb1 lengthstep non null dans l'event (refs #8157) 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 a327eb1f1b9f761b400ea12efadb7da0559b4b87 Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Apr 5 17:17:43 2016 +0200 lengthstep non null dans l'event (refs #8157) Summary of changes: .../main/java/fr/ifremer/tutti/service/sampling/SamplingEvent.java | 6 +++--- 1 file changed, 3 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 develop updated (049bea4 -> 127de03)
by codelutin.com scm April 5, 2016

April 5, 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 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 new 127de03 Livrable #8205 Merge branch 'feature/8205' 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 127de0355de4bbcba17a31c70aba23f4f3ff7f17 Merge: 049bea4 c84a591 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Apr 5 17:15:56 2016 +0200 Livrable #8205 Merge branch 'feature/8205' into develop Summary of changes: .../IndividualObservationBatchTableModel.java | 40 +++--------- .../frequency/SpeciesFrequencyUIHandler.java | 72 +++++++++++++++++----- 2 files changed, 66 insertions(+), 46 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/8205 deleted (was c84a591)
by codelutin.com scm April 5, 2016

April 5, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/8205 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git was 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 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