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

branch feature/8116-warning-ecrasement deleted (was 29edf84)
by codelutin.com scm March 18, 2016

March 18, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/8116-warning-ecrasement in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git was 29edf84 ajout d'un veto pour ne pas écraser les poids saisi (fixes #8116) 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/merge_species_benthos updated (98e8ce9 -> 1f74e7b)
by codelutin.com scm March 18, 2016

March 18, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/merge_species_benthos in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git from 98e8ce9 suppression de BenthosBatch, BenthosBatchFrequency et des contrat SpeciesBatchAble et SpeciesFrequencyBatchAble dans le module swing adds 32f9d25 Le début de la fin du paquetage benthos adds 1f74e7b Adaptation du multi-export pour la partie benthos No new revisions were added by this update. Summary of changes: .../catches/multipost/MultiPostExportService.java | 22 +- .../catches/multipost/MultiPostImportService.java | 66 +- .../multipost/MultiPostImportServiceTest.java | 2 +- .../operation/FishingOperationsUIHandler.java | 20 +- .../catches/AbstractTuttiBatchUIModel.java | 92 +- .../catches/BenthosBatchUISupportImpl.java | 241 ++++ .../content/operation/catches/EditCatchesUI.jaxx | 115 +- .../content/operation/catches/EditCatchesUI.jcss | 20 - .../operation/catches/EditCatchesUIHandler.java | 378 +++-- .../operation/catches/EditSpeciesBatchPanelUI.jaxx | 98 ++ .../catches/EditSpeciesBatchPanelUI.jcss} | 14 +- .../catches/EditSpeciesBatchPanelUIHandler.java | 156 +++ .../catches/EditSpeciesBatchPanelUIModel.java | 28 + .../catches/SpeciesBatchUISupportImpl.java | 241 ++++ .../catches/SpeciesOrBenthosBatchUISupport.java | 138 ++ .../catches/actions/CleanBatchWeightsAction.java | 15 +- .../catches/actions/ComputeBatchWeightsAction.java | 189 +-- .../ExportFishingOperationForSumatraAction.java | 29 +- .../ExportFishingOperationReportAction.java | 19 +- .../catches/actions/SaveCatchBatchAction.java | 24 +- .../catches/benthos/BenthosBatchRowModel.java | 677 --------- .../catches/benthos/BenthosBatchTableModel.java | 429 ------ .../operation/catches/benthos/BenthosBatchUI.jaxx | 178 --- .../operation/catches/benthos/BenthosBatchUI.jcss | 339 ----- .../catches/benthos/BenthosBatchUIHandler.java | 1456 -------------------- .../catches/benthos/BenthosBatchUIModel.java | 488 ------- .../ChangeBenthosBatchSampleCategoryAction.java | 205 --- .../benthos/actions/CreateBenthosMelagAction.java | 249 ---- .../actions/ExportMultiPostBenthosAction.java | 78 -- .../actions/ImportMultiPostBenthosAction.java | 111 -- .../OpenAddBenthosBatchSampleCategoryUIAction.java | 107 -- .../actions/OpenCreateBenthosBatchUIAction.java | 57 - .../OpenEditBenthosBatchFrequencyUIAction.java | 70 - .../actions/OpenSplitBenthosBatchUIAction.java | 122 -- .../benthos/actions/RemoveBenthosBatchAction.java | 181 --- .../actions/RemoveBenthosSubBatchAction.java | 138 -- .../benthos/actions/RenameBenthosBatchAction.java | 149 -- .../benthos/create/CreateBenthosBatchUI.jaxx | 185 --- .../benthos/create/CreateBenthosBatchUI.jcss | 218 --- .../create/CreateBenthosBatchUIHandler.java | 535 ------- .../benthos/create/CreateBenthosBatchUIModel.java | 358 ----- .../actions/CreateBenthosBatchAndCloseAction.java | 64 - .../CreateBenthosBatchAndContinueAction.java | 66 - .../CreateBenthosBatchAndFrequenciesAction.java | 78 -- .../actions/CreateBenthosBatchCancelAction.java | 59 - .../SelectSpeciesForBenthosBatchAction.java | 117 -- .../frequency/BenthosFrequencyCellComponent.java | 370 ----- .../BenthosFrequencyLogCellComponent.java | 156 --- .../frequency/BenthosFrequencyLogRowModel.java | 70 - .../frequency/BenthosFrequencyLogsTableModel.java | 57 - .../frequency/BenthosFrequencyRowModel.java | 250 ---- .../frequency/BenthosFrequencyTableModel.java | 318 ----- .../benthos/frequency/BenthosFrequencyUI.jaxx | 240 ---- .../benthos/frequency/BenthosFrequencyUI.jcss | 326 ----- .../frequency/BenthosFrequencyUIHandler.java | 639 --------- .../benthos/frequency/BenthosFrequencyUIModel.java | 613 -------- .../frequency/BenthosFrequencyUIModelCache.java | 156 --- ...thosFrequencyLengthStepCaracteristicAction.java | 99 -- .../actions/ApplyBenthosFrequencyRafaleAction.java | 130 -- .../actions/CancelEditBenthosFrequencyAction.java | 73 - .../DeleteBenthosFrequencyLogRowAction.java | 98 -- .../GenerateBenthosFrequencyLengthStepsAction.java | 102 -- .../actions/ResetBenthosFrequencyAction.java | 67 - .../SaveAndCloseBenthosFrequencyAction.java | 79 -- .../SaveAndContinueBenthosFrequencyAction.java | 73 - .../frequency/actions/SaveSupportAction.java | 129 -- .../benthos/split/SplitBenthosBatchRowModel.java | 151 -- .../benthos/split/SplitBenthosBatchTableModel.java | 106 -- .../catches/benthos/split/SplitBenthosBatchUI.jaxx | 115 -- .../catches/benthos/split/SplitBenthosBatchUI.jcss | 96 -- .../benthos/split/SplitBenthosBatchUIHandler.java | 487 ------- .../benthos/split/SplitBenthosBatchUIModel.java | 174 --- .../actions/SplitBenthosBatchCancelAction.java | 58 - .../split/actions/SplitBenthosBatchSaveAction.java | 79 -- .../operation/catches/species/SpeciesBatchUI.jaxx | 48 +- .../operation/catches/species/SpeciesBatchUI.jcss | 69 +- .../catches/species/SpeciesBatchUIHandler.java | 73 +- .../catches/species/SpeciesBatchUIModel.java | 200 +-- .../ChangeSpeciesBatchSampleCategoryAction.java | 30 +- .../species/actions/CreateSpeciesMelagAction.java | 2 +- .../actions/ExportMultiPostSpeciesFullAction.java | 2 +- ...xportMultiPostSpeciesOnlyFrequenciesAction.java | 2 +- ...ostSpeciesOnlyIndividualObservationsAction.java | 2 +- .../species/actions/ImportBigfinAction.java | 8 +- .../ImportMultiPostSpeciesSupportAction.java | 6 +- .../catches/species/actions/ImportPsionAction.java | 18 +- .../species/actions/ImportPupitriAction.java | 19 +- .../OpenAddSpeciesBatchSampleCategoryUIAction.java | 15 +- .../actions/OpenCreateSpeciesBatchUIAction.java | 9 +- .../OpenEditSpeciesBatchFrequencyUIAction.java | 6 +- .../actions/OpenSplitSpeciesBatchUIAction.java | 15 +- .../species/actions/RemoveSpeciesBatchAction.java | 13 +- .../actions/RemoveSpeciesSubBatchAction.java | 15 +- .../species/actions/RenameSpeciesBatchAction.java | 8 +- .../species/create/CreateSpeciesBatchUI.jaxx | 9 +- .../create/CreateSpeciesBatchUIHandler.java | 58 +- .../species/create/CreateSpeciesBatchUIModel.java | 11 +- .../actions/CreateSpeciesBatchAndCloseAction.java | 6 +- .../CreateSpeciesBatchAndContinueAction.java | 10 +- .../CreateSpeciesBatchAndFrequenciesAction.java | 6 +- .../SelectSpeciesForSpeciesBatchAction.java | 10 +- .../frequency/SpeciesFrequencyCellComponent.java | 20 +- .../species/frequency/SpeciesFrequencyUI.jaxx | 8 +- .../frequency/SpeciesFrequencyUIHandler.java | 18 +- .../species/frequency/SpeciesFrequencyUIModel.java | 10 +- ...ciesFrequencyLengthStepCaracteristicAction.java | 4 +- .../actions/ApplySpeciesFrequencyRafaleAction.java | 4 +- .../actions/ExportMultiPostSpeciesFullAction.java | 19 +- ...xportMultiPostSpeciesOnlyFrequenciesAction.java | 18 +- ...ostSpeciesOnlyIndividualObservationsAction.java | 18 +- ...va => ExportMultiPostSpeciesSupportAction.java} | 37 +- .../GenerateSpeciesFrequencyLengthStepsAction.java | 8 +- .../ImportMultiPostSpeciesSupportAction.java | 5 +- .../actions/ResetSpeciesFrequencyAction.java | 6 +- .../frequency/actions/SaveSupportAction.java | 4 +- .../catches/species/split/SplitSpeciesBatchUI.jaxx | 8 +- .../species/split/SplitSpeciesBatchUIHandler.java | 71 +- .../split/actions/SplitSpeciesBatchSaveAction.java | 33 +- .../actions/EditFishingOperationAction.java | 9 +- .../EditFishingOperationInValidationUIAction.java | 32 +- 120 files changed, 1934 insertions(+), 13000 deletions(-) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/BenthosBatchUISupportImpl.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditSpeciesBatchPanelUI.jaxx copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/{util/comment/CommentEditorUI.jcss => content/operation/catches/EditSpeciesBatchPanelUI.jcss} (73%) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditSpeciesBatchPanelUIHandler.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditSpeciesBatchPanelUIModel.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SpeciesBatchUISupportImpl.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SpeciesOrBenthosBatchUISupport.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchRowModel.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchTableModel.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUI.jaxx delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUI.jcss delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIModel.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/ChangeBenthosBatchSampleCategoryAction.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/CreateBenthosMelagAction.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/ExportMultiPostBenthosAction.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/ImportMultiPostBenthosAction.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/OpenAddBenthosBatchSampleCategoryUIAction.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/OpenCreateBenthosBatchUIAction.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/OpenEditBenthosBatchFrequencyUIAction.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/OpenSplitBenthosBatchUIAction.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/RemoveBenthosBatchAction.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/RemoveBenthosSubBatchAction.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/RenameBenthosBatchAction.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUI.jaxx delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUI.jcss delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIHandler.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIModel.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/actions/CreateBenthosBatchAndCloseAction.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/actions/CreateBenthosBatchAndContinueAction.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/actions/CreateBenthosBatchAndFrequenciesAction.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/actions/CreateBenthosBatchCancelAction.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/actions/SelectSpeciesForBenthosBatchAction.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyCellComponent.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyLogCellComponent.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyLogRowModel.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyLogsTableModel.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyRowModel.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyTableModel.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.jaxx delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.jcss delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIModel.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIModelCache.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/AddBenthosFrequencyLengthStepCaracteristicAction.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/ApplyBenthosFrequencyRafaleAction.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/CancelEditBenthosFrequencyAction.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/DeleteBenthosFrequencyLogRowAction.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/GenerateBenthosFrequencyLengthStepsAction.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/ResetBenthosFrequencyAction.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/SaveAndCloseBenthosFrequencyAction.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/SaveAndContinueBenthosFrequencyAction.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/SaveSupportAction.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchRowModel.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchTableModel.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUI.jaxx delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUI.jcss delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUIHandler.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUIModel.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/actions/SplitBenthosBatchCancelAction.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/actions/SplitBenthosBatchSaveAction.java copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/{ExportMultiPostSpeciesFullAction.java => ExportMultiPostSpeciesSupportAction.java} (61%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch feature/8116-warning-ecrasement created (now 29edf84)
by codelutin.com scm March 17, 2016

March 17, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/8116-warning-ecrasement in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git at 29edf84 ajout d'un veto pour ne pas écraser les poids saisi (fixes #8116) This branch includes the following new commits: new 29edf84 ajout d'un veto pour ne pas écraser les poids saisi (fixes #8116) 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 29edf84cbce012a0fb43119bab23c1a1f4964c65 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Mar 17 19:15:15 2016 +0100 ajout d'un veto pour ne pas écraser les poids saisi (fixes #8116) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/8142 created (now cd85081)
by codelutin.com scm March 17, 2016

March 17, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/8142 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git at cd85081 on vérifie que tous les poids sont saisis ou aucun (fixes #8142) This branch includes the following new commits: new cd85081 on vérifie que tous les poids sont saisis ou aucun (fixes #8142) 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 cd850814f9e93bb07ffdc0c7a5e6a5e708b55235 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Mar 17 18:47:49 2016 +0100 on vérifie que tous les poids sont saisis ou aucun (fixes #8142) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/8043 updated (6d30910 -> f3318ee)
by codelutin.com scm March 17, 2016

March 17, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/8043 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git discards 6d30910 - ajout du résumé des prélèvements - un peu de réagencement de l'écran refs #8043 discards 0451472 affichage du message de prélèvement quand on atteint les 1/n observations (refs #8043) discards 780656e création du cache des prélèvements (refs #8043) adds 9479b97 - ajout d'une colonne "poids calculé par rtp" - remplacement de la checkbox "utiliser les rtp" par "Recopie des poids via RTP" qui désactive la colonne de saisie des poids et qui recopie automatiquement les poids rtp dans la colonne poids fixes #8116 adds 734d29c extraction du calcul du poids par rtp dans la classe weights adds 2801687 reformat code + fix return type (float is not Float) adds d0af96b Gérer le cas où l'on a pas de rtp ou de classe de taille de renseignée, on ne peut pas effectuer le calcul rtp (See #8116) adds d79fd88 Fixes #8116 Merge branch 'feature/8116' into develop adds 20bf658 Java 8 party \o/ adds d159bac Selection + rendre visible la ligne de la rafal (See #8129) adds ae30f75 Merge branch 'feature/8129' into 'develop' adds 573e649 on force le mode rafale si on est en mode de recopie, même à l'initialisation adds 9522217 Permettre d'arrondir à partir d'une unité adds b031235 Ajout de nouvelles méthodes sur Weights adds 5868576 Utilisation des arrondis de poids (see #8128) + utilisation des nouvelles méthodes sur les poids adds d5c4c44 Correction de l'arrondi (See #8128) adds bd34b7e Fixes #8128 Merge branch 'feature/8128' into develop adds 06def09 import adds 0af8ebc Persister les mensurations si le poids ou la taille est présente adds a2d6dba Forcer le mode de recopie à l'ouverture de l'écran adds 0868f86 Ajout de deux titres (See #8140) adds 85cddd8 - remplacement des titleborders par des jxtitlepanes - deplacement de certains boutons dans les barres de titre see #8140 adds e5916d9 Fixes #8140 Merge branch 'feature/8140' into develop adds 5e8a7fe création du cache des prélèvements (refs #8043) adds c31e664 affichage du message de prélèvement quand on atteint les 1/n observations (refs #8043) adds 8168b7d - ajout du résumé des prélèvements - un peu de réagencement de l'écran refs #8043 adds 50ff5e1 mise a jour du cache quan don supprime des lignes, réinitilise ou annule (refs #8043) adds c8e2a9a - mise a jour du cache quand on modifie le sexe d'une observation - ajout d'infos sur le label de résumé see #8043 adds f3318ee cosmétique (fixes #8043) 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 (6d30910) \ N -- N -- N refs/heads/feature/8043 (f3318ee) 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: .../service/CatchBatchPersistenceServiceImpl.java | 4 +- .../java/fr/ifremer/tutti/type/WeightUnit.java | 19 +- .../main/java/fr/ifremer/tutti/util/Weights.java | 48 +- .../fr/ifremer/tutti/service/TuttiDataContext.java | 2 +- .../tutti/service/bigfin/BigfinImportService.java | 5 +- .../service/catches/WeightComputingService.java | 43 +- .../fr/ifremer/tutti/service/csv/TuttiCsvUtil.java | 5 +- .../service/psionimport/PsionImportService.java | 4 +- .../tutti/service/pupitri/PupitriImportResult.java | 6 +- .../service/pupitri/PupitriImportService.java | 7 +- .../pupitri/report/PupitriImportReportModel.java | 14 +- .../service/samplingCache/CruiseSamplingCache.java | 69 ++- .../tutti/service/samplingCache/SamplingEvent.java | 18 +- .../filtered-resources/tutti-help-fr.properties | 26 +- .../benthos/actions/CreateBenthosMelagAction.java | 2 +- .../IndividualObservationBatchRowModel.java | 5 +- .../species/actions/CreateSpeciesMelagAction.java | 5 +- .../frequency/SpeciesFrequencyCellComponent.java | 2 +- .../frequency/SpeciesFrequencyRowModel.java | 49 +- .../frequency/SpeciesFrequencyTableModel.java | 23 +- .../species/frequency/SpeciesFrequencyUI.jaxx | 114 ++-- .../species/frequency/SpeciesFrequencyUI.jcss | 126 +++-- .../frequency/SpeciesFrequencyUIHandler.java | 599 ++++++++++++--------- .../species/frequency/SpeciesFrequencyUIModel.java | 61 +-- .../actions/ApplySpeciesFrequencyRafaleAction.java | 14 +- .../actions/CancelEditSpeciesFrequencyAction.java | 3 + .../frequency/actions/RemoveObservationAction.java | 3 + .../actions/ResetSpeciesFrequencyAction.java | 7 +- .../util/table/CaracteristicColumnIdentifier.java | 2 + .../resources/i18n/tutti-ui-swing_en_GB.properties | 7 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 11 +- 31 files changed, 764 insertions(+), 539 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch feature/couleur_onglets created (now 017ea49)
by codelutin.com scm March 17, 2016

March 17, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/couleur_onglets in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git at 017ea49 - ajout d'un painter sur les jxtitledpanes pour colorer les barres de titre - mise en couleur des barres de titre en fonction de l'onglet - contraste d'ecriture en fonction de la couleur de fond de la barre de titre This branch includes the following new commits: new 017ea49 - ajout d'un painter sur les jxtitledpanes pour colorer les barres de titre - mise en couleur des barres de titre en fonction de l'onglet - contraste d'ecriture en fonction de la couleur de fond de la barre de titre 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 017ea49e3d89f33ef4326cce22cfc4fdde8fd32c Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Mar 17 15:22:15 2016 +0100 - ajout d'un painter sur les jxtitledpanes pour colorer les barres de titre - mise en couleur des barres de titre en fonction de l'onglet - contraste d'ecriture en fonction de la couleur de fond de la barre de titre -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/merge_species_benthos updated (ddeea47 -> 98e8ce9)
by codelutin.com scm March 17, 2016

March 17, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/merge_species_benthos in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git discards ddeea47 suppression de BenthosBatch, BenthosBatchFrequency et des contrat SpeciesBatchAble et SpeciesFrequencyBatchAble dans le module swing discards dfdf9c9 suppression de BenthosBatch, BenthosBatchFrequency et des contrat SpeciesBatchAble et SpeciesFrequencyBatchAble dans le module service discards 884591e suppression de BenthosBatch, BenthosBatchFrequency et des contrat SpeciesBatchAble et SpeciesFrequencyBatchAble dans le module persistence adds d159bac Selection + rendre visible la ligne de la rafal (See #8129) adds ae30f75 Merge branch 'feature/8129' into 'develop' adds 573e649 on force le mode rafale si on est en mode de recopie, même à l'initialisation adds 9522217 Permettre d'arrondir à partir d'une unité adds b031235 Ajout de nouvelles méthodes sur Weights adds 5868576 Utilisation des arrondis de poids (see #8128) + utilisation des nouvelles méthodes sur les poids adds d5c4c44 Correction de l'arrondi (See #8128) adds bd34b7e Fixes #8128 Merge branch 'feature/8128' into develop adds 06def09 import adds 0af8ebc Persister les mensurations si le poids ou la taille est présente adds a2d6dba Forcer le mode de recopie à l'ouverture de l'écran adds 0868f86 Ajout de deux titres (See #8140) adds 85cddd8 - remplacement des titleborders par des jxtitlepanes - deplacement de certains boutons dans les barres de titre see #8140 adds e5916d9 Fixes #8140 Merge branch 'feature/8140' into develop adds 7f23045 suppression de BenthosBatch, BenthosBatchFrequency et des contrat SpeciesBatchAble et SpeciesFrequencyBatchAble dans le module persistence adds 28557a2 suppression de BenthosBatch, BenthosBatchFrequency et des contrat SpeciesBatchAble et SpeciesFrequencyBatchAble dans le module service adds 98e8ce9 suppression de BenthosBatch, BenthosBatchFrequency et des contrat SpeciesBatchAble et SpeciesFrequencyBatchAble dans le module swing 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 (ddeea47) \ N -- N -- N refs/heads/feature/merge_species_benthos (98e8ce9) 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: .../service/CatchBatchPersistenceServiceImpl.java | 4 +- .../java/fr/ifremer/tutti/type/WeightUnit.java | 19 +++- .../main/java/fr/ifremer/tutti/util/Weights.java | 29 +++-- .../tutti/service/bigfin/BigfinImportService.java | 5 +- .../service/catches/WeightComputingService.java | 43 ++++---- .../fr/ifremer/tutti/service/csv/TuttiCsvUtil.java | 5 +- .../service/psionimport/PsionImportService.java | 4 +- .../tutti/service/pupitri/PupitriImportResult.java | 6 +- .../service/pupitri/PupitriImportService.java | 7 +- .../pupitri/report/PupitriImportReportModel.java | 14 +-- .../benthos/actions/CreateBenthosMelagAction.java | 2 +- .../species/actions/CreateSpeciesMelagAction.java | 5 +- .../frequency/SpeciesFrequencyCellComponent.java | 2 +- .../frequency/SpeciesFrequencyRowModel.java | 3 +- .../species/frequency/SpeciesFrequencyUI.jaxx | 114 ++++++++++---------- .../species/frequency/SpeciesFrequencyUI.jcss | 119 ++++++++++++--------- .../frequency/SpeciesFrequencyUIHandler.java | 15 +-- .../species/frequency/SpeciesFrequencyUIModel.java | 10 +- .../actions/ApplySpeciesFrequencyRafaleAction.java | 14 ++- .../resources/i18n/tutti-ui-swing_en_GB.properties | 2 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 4 +- 21 files changed, 238 insertions(+), 188 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch develop updated (a2d6dba -> e5916d9)
by codelutin.com scm March 17, 2016

March 17, 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 a2d6dba Forcer le mode de recopie à l'ouverture de l'écran adds 0868f86 Ajout de deux titres (See #8140) adds 85cddd8 - remplacement des titleborders par des jxtitlepanes - deplacement de certains boutons dans les barres de titre see #8140 new e5916d9 Fixes #8140 Merge branch 'feature/8140' 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 e5916d984944352809870cb7303122fa800d8bc1 Merge: a2d6dba 85cddd8 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Mar 17 15:04:29 2016 +0100 Fixes #8140 Merge branch 'feature/8140' into develop Summary of changes: .../species/frequency/SpeciesFrequencyUI.jaxx | 114 ++++++++++---------- .../species/frequency/SpeciesFrequencyUI.jcss | 119 ++++++++++++--------- .../resources/i18n/tutti-ui-swing_en_GB.properties | 2 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 4 +- 4 files changed, 131 insertions(+), 108 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/8140 deleted (was 85cddd8)
by codelutin.com scm March 17, 2016

March 17, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/8140 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git was 85cddd8 - remplacement des titleborders par des jxtitlepanes - deplacement de certains boutons dans les barres de titre see #8140 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/8140 updated (f7230a4 -> 85cddd8)
by codelutin.com scm March 17, 2016

March 17, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/8140 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git discards f7230a4 - remplacement des titleborders par des jxtitlepanes - deplacement de certains boutons dans les barres de titre see #8140 discards db357c6 Ajout de deux titres (See #8140) adds d159bac Selection + rendre visible la ligne de la rafal (See #8129) adds ae30f75 Merge branch 'feature/8129' into 'develop' adds 573e649 on force le mode rafale si on est en mode de recopie, même à l'initialisation adds 9522217 Permettre d'arrondir à partir d'une unité adds b031235 Ajout de nouvelles méthodes sur Weights adds 5868576 Utilisation des arrondis de poids (see #8128) + utilisation des nouvelles méthodes sur les poids adds d5c4c44 Correction de l'arrondi (See #8128) adds bd34b7e Fixes #8128 Merge branch 'feature/8128' into develop adds 06def09 import adds 0af8ebc Persister les mensurations si le poids ou la taille est présente adds a2d6dba Forcer le mode de recopie à l'ouverture de l'écran adds 0868f86 Ajout de deux titres (See #8140) adds 85cddd8 - remplacement des titleborders par des jxtitlepanes - deplacement de certains boutons dans les barres de titre see #8140 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 (f7230a4) \ N -- N -- N refs/heads/feature/8140 (85cddd8) 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: .../service/CatchBatchPersistenceServiceImpl.java | 4 +- .../java/fr/ifremer/tutti/type/WeightUnit.java | 19 +++++++++- .../main/java/fr/ifremer/tutti/util/Weights.java | 29 ++++++--------- .../tutti/service/bigfin/BigfinImportService.java | 5 ++- .../service/catches/WeightComputingService.java | 43 +++++++++++----------- .../fr/ifremer/tutti/service/csv/TuttiCsvUtil.java | 5 ++- .../service/psionimport/PsionImportService.java | 4 +- .../tutti/service/pupitri/PupitriImportResult.java | 6 +-- .../service/pupitri/PupitriImportService.java | 7 ++-- .../pupitri/report/PupitriImportReportModel.java | 14 +++---- .../benthos/actions/CreateBenthosMelagAction.java | 2 +- .../species/actions/CreateSpeciesMelagAction.java | 5 +-- .../frequency/SpeciesFrequencyCellComponent.java | 2 +- .../frequency/SpeciesFrequencyRowModel.java | 3 +- .../frequency/SpeciesFrequencyUIHandler.java | 15 ++++---- .../species/frequency/SpeciesFrequencyUIModel.java | 10 ++--- .../actions/ApplySpeciesFrequencyRafaleAction.java | 14 ++++++- 17 files changed, 107 insertions(+), 80 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0