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

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

branch feature/8157 updated (d31ed9a -> bbc90a0)
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 d31ed9a On prend en compte les prélèvements qui ne rentrent pas dans le protocole (fixes #8157) new bbc90a0 add comment 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 bbc90a063b1a2e7181bcce6f8bbdb8661570a007 Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Apr 5 17:09:45 2016 +0200 add comment Summary of changes: .../main/java/fr/ifremer/tutti/service/sampling/CruiseSamplingCache.java | 1 + 1 file changed, 1 insertion(+) -- 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 (6afd5b0 -> d31ed9a)
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 omits 6afd5b0 i18n (fixes #8157) omits 20ebc02 ajout de l'action de rapport de prélèvement pour la campagne (refs #8157) omits 9b441cb service d'export du rapport de prélèvements (refs #8157) omits 946cdbe récup du nombre de prélèvement par classe de taille pour une espece/maturité/sexe (refs #8157) omits 2dbbf8d i18n 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 new 2255550 i18n new c4a9ecb récup du nombre de prélèvement par classe de taille pour une espece/maturité/sexe (refs #8157) new 73828f3 service d'export du rapport de prélèvements (refs #8157) new ee33996 ajout de l'action de rapport de prélèvement pour la campagne (refs #8157) new a4eecf3 i18n (fixes #8157) new 4cb6f60 on demande au cache de créer les lignes pour l'export (refs #8157) new d31ed9a On prend en compte les prélèvements qui ne rentrent pas dans le protocole (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 (6afd5b0) \ N -- N -- N refs/heads/feature/8157 (d31ed9a) 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 7 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 d31ed9aa0d320f92e2dd54d6ae7532b0cf2bc5f2 Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Apr 5 16:58:47 2016 +0200 On prend en compte les prélèvements qui ne rentrent pas dans le protocole (fixes #8157) commit 4cb6f60369a083fec68bea923745dc67475dc574 Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Apr 5 16:06:49 2016 +0200 on demande au cache de créer les lignes pour l'export (refs #8157) commit a4eecf336a0ddb10695345eaa1a203e996b71af1 Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Apr 1 23:34:13 2016 +0200 i18n (fixes #8157) commit ee339960af5c552da0d011b58580d6368d503bf9 Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Apr 1 15:45:49 2016 +0200 ajout de l'action de rapport de prélèvement pour la campagne (refs #8157) commit 73828f37f2c1c90c17cf8e1b4939b2750a0c05f4 Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Apr 1 15:45:21 2016 +0200 service d'export du rapport de prélèvements (refs #8157) commit c4a9ecb6a9c0f4cdcf8aad1de425ee994519e4a8 Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Apr 1 15:43:17 2016 +0200 récup du nombre de prélèvement par classe de taille pour une espece/maturité/sexe (refs #8157) commit 2255550a210abbab9e042f4ce4921ea8a33ab13e Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Apr 1 15:41:55 2016 +0200 i18n Summary of changes: .../tutti/persistence/TuttiPersistenceImpl.java | 5 + .../persistence/TuttiPersistenceNoDbImpl.java | 5 + ...dividualObservationBatchPersistenceService.java | 10 ++ ...dualObservationBatchPersistenceServiceImpl.java | 49 +++++++ .../service/util/SamplePersistenceHelper.java | 82 ++++++++--- .../src/main/resources/queries-failsafe.hbm.xml | 36 +++++ .../ifremer/tutti/service/PersistenceService.java | 5 + .../cps/CalcifiedPiecesSamplingExportService.java | 89 ++---------- ...ngRowModel.java => SamplingNumberRowModel.java} | 23 +-- .../CacheExtractedKey.java} | 11 +- .../service/sampling/CruiseSamplingCache.java | 156 ++++++++++++--------- .../sampling/CruiseSamplingCacheLoader.java | 2 +- .../sampling/CruiseSamplingInternalCache.java | 67 ++++++--- .../tutti/service/sampling/SamplingCodePrefix.java | 4 + .../tutti/service/sampling/SamplingEvent.java | 6 +- .../resources/i18n/tutti-service_en_GB.properties | 1 + .../resources/i18n/tutti-service_fr_FR.properties | 4 +- .../filtered-resources/tutti-help-fr.properties | 2 +- .../IndividualObservationBatchTableModel.java | 10 +- .../SamplingCodeCellEditor.java | 2 +- .../create/CreateSpeciesBatchUIHandler.java | 3 +- .../frequency/IndividualObservationUICache.java | 113 +++++++++++---- .../species/frequency/SpeciesFrequencyUI.jaxx | 13 +- .../frequency/SpeciesFrequencyUIHandler.java | 13 +- .../species/frequency/SpeciesFrequencyUIModel.java | 26 +++- .../actions/ApplySpeciesFrequencyRafaleAction.java | 17 +-- .../frequency/actions/EditSampleCodeAction.java | 102 +++++++++++++- .../frequency/actions/RemoveObservationAction.java | 7 +- .../swing/util/WideDataBeanFilterableComboBox.java | 26 ++++ .../tutti/ui/swing/util/WideDataComboBoxUI.java | 48 +++++-- .../resources/i18n/tutti-ui-swing_en_GB.properties | 1 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 1 + 32 files changed, 653 insertions(+), 286 deletions(-) rename tutti-service/src/main/java/fr/ifremer/tutti/service/export/cps/{CalcifiedPiecesSamplingRowModel.java => SamplingNumberRowModel.java} (62%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/{export/cps/CalcifiedPiecesSamplingRow.java => sampling/CacheExtractedKey.java} (88%) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/WideDataBeanFilterableComboBox.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 7

branch feature/8205 created (now 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 at 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 This branch includes the following new commits: new 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) new 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 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 c84a591a16cd339090430f4b61faf076a75b8322 Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Apr 5 11:54:19 2016 +0200 - 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 commit 5c94f8188751305703a7ac60718a4fd2c4483def Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Apr 5 11:54:16 2016 +0200 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) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2

branch develop updated (6e5e643 -> 049bea4)
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 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) new 049bea4 Livrable #8212 Merge branch 'feature/8212' 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 049bea40e693b0fcf57c907e11e72b83e1567152 Merge: 6e5e643 dd370be Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Apr 5 08:21:36 2016 +0200 Livrable #8212 Merge branch 'feature/8212' into develop Summary of changes: .../operation/catches/species/frequency/SpeciesFrequencyUI.jaxx | 6 +++--- .../catches/species/frequency/actions/RemoveObservationAction.java | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/8212 deleted (was dd370be)
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/8212 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git was 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) 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/8212 updated (f28dc6c -> dd370be)
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/8212 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git omits f28dc6c 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 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 new 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) 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 (f28dc6c) \ N -- N -- N refs/heads/feature/8212 (dd370be) 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 dd370be58228725e67520bb41ec8d981b36fe6e6 Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Apr 4 17:40:34 2016 +0200 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) Summary of changes: .../SamplingCodeCellEditor.java | 2 +- .../frequency/SpeciesFrequencyUIHandler.java | 1 + .../species/frequency/SpeciesFrequencyUIModel.java | 26 +++++++++++++++++++--- 3 files changed, 25 insertions(+), 4 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/8212 created (now f28dc6c)
by codelutin.com scm April 4, 2016

April 4, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/8212 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git at f28dc6c 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) This branch includes the following new commits: new f28dc6c 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) 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 f28dc6cc15b1d91fe6c4269dfa857350cc3c76bb Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Apr 4 17:40:34 2016 +0200 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) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (4cdee6d -> 6e5e643)
by codelutin.com scm April 4, 2016

April 4, 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 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) new 6e5e643 livrable #8211 Merge branch 'feature/8211' 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 6e5e643708133bdfade7a43f45a97dd2a0863e67 Merge: 4cdee6d a69ce47 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Apr 4 16:39:52 2016 +0200 livrable #8211 Merge branch 'feature/8211' into develop Summary of changes: .../operation/catches/individualobservation/SamplingCodeCellEditor.java | 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