This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from fe272b9 Merge branch 'feature/8034' into 'develop' new efe93eb début de réarrangement de l'écran des mensurations refs #6926 new 7c6650e mise en page de l'écran refs #6926 new 16b3d9d - use jaxx 2.29-SNAPSHOT - correction du mode de config à l'ouverture de l'écran - ajout de useRTP dans le modele refs #6926 new 21cb702 ajout du model de colonnes de la table des observations (refs #6926) new 4e8e103 organize imports new d47fd99 activtation ou desactivation de cellules de la tables des mensurations en fonction du mode de copie (refs #6926) new 22363b2 - suppression de l'onglet observations individuelles dans la capture - ajout des lignes dans la table d'obs individuelles dans les mensurations (refs #8019) new 9317d63 affichage de l'histogramme dans une popup (refs #8019) new 1bf50ad utilisation des rtp pour calculer les poids des lignes de mensuration (refs #8019) new b9eb3c4 vérification que le poids saisi est proche du poids calculé avec la RTP (refs #8019) new 6188e68 une seule popup pour l'histogramme pour pouvoir la fermer quand on quitte (refs #8019) new 78e54f6 titre de la popup de l'histogramme (refs #8019) new e7863a8 graph des poids moyens (refs #8019) new 7e77962 ajout d'une ligne d'observation individuelle quand on ajoute en rafale (refs #8019) new dbcbb41 - ajout du numéro de l'observation - suppression d'observations refs #8019 new bad7ac5 use lanbdas where possible new ac1e009 - copie des donnees d'observation individuelles dans le tableau des mensurations en fonction du mode - suppression ou ecrasement des données au changement de mode de copie refs #8019 new 0b0fe18 - suppression des lignes d'observations individuelles sur - correction de l'affichage de l'histogramme des mensurations refs #8019 new 4488081 remplissage des lignes vides lors de l'ajout en rafale (refs #8019) new ba542e5 correction de l'incrément des lignes quand on quitte et revient sur l'ecran des mensurations (refs #8019) new 3af74a6 suppression des lignes d'observation individuelles générées en rafale quand on supprime le log correspondant (refs #8019) new d26a5b9 - validation des lignes d'observations - correction de l'ouverture de l'editeur de caracteristiques refs #8019 new 6b129ec Ne pas utiliser adagio dans les ui new fc1de39 Fix merge new 48b0400 Fixes #8019 Merge branch 'feature/ecran_obs_individuelles' into develop The 25 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 48b04007c2984568c3ecc5108f8f958396070443 Merge: fe272b9 fc1de39 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Mar 2 11:25:41 2016 +0100 Fixes #8019 Merge branch 'feature/ecran_obs_individuelles' into develop commit fc1de3969bf4e7d3353fbd0e593cc247bc173ea3 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Mar 2 11:13:19 2016 +0100 Fix merge commit 6b129ec9e92d2d896e3c07d48b6d5b94997a9cb6 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Mar 2 11:13:02 2016 +0100 Ne pas utiliser adagio dans les ui commit d26a5b9897d5549f187eebb7f080655b2298588d Author: Kevin Morin <morin@codelutin.com> Date: Tue Mar 1 18:57:28 2016 +0100 - validation des lignes d'observations - correction de l'ouverture de l'editeur de caracteristiques refs #8019 commit 3af74a612a9c601fc6058e536b8c0adb5232d1b1 Author: Kevin Morin <morin@codelutin.com> Date: Tue Mar 1 15:05:06 2016 +0100 suppression des lignes d'observation individuelles générées en rafale quand on supprime le log correspondant (refs #8019) commit ba542e56013d94c96b0003bca2f419e634d8139e Author: Kevin Morin <morin@codelutin.com> Date: Tue Mar 1 14:57:43 2016 +0100 correction de l'incrément des lignes quand on quitte et revient sur l'ecran des mensurations (refs #8019) commit 448808123b1f4d57a1d06dc4bec46757fc3b97f7 Author: Kevin Morin <morin@codelutin.com> Date: Tue Mar 1 14:45:52 2016 +0100 remplissage des lignes vides lors de l'ajout en rafale (refs #8019) commit 0b0fe184db70772d80dc26ecf43f81c2edadc217 Author: Kevin Morin <morin@codelutin.com> Date: Tue Mar 1 12:01:02 2016 +0100 - suppression des lignes d'observations individuelles sur - correction de l'affichage de l'histogramme des mensurations refs #8019 commit ac1e009bbfd23b2525a2ab8d2e57ba4a66dc8cda Author: Kevin Morin <morin@codelutin.com> Date: Mon Feb 29 16:04:42 2016 +0100 - copie des donnees d'observation individuelles dans le tableau des mensurations en fonction du mode - suppression ou ecrasement des données au changement de mode de copie refs #8019 commit bad7ac5e3eacf128cfe11bc6cf55feb754407a08 Author: Kevin Morin <morin@codelutin.com> Date: Fri Feb 26 16:35:25 2016 +0100 use lanbdas where possible commit dbcbb41e7ebe4cc4bb8c0001dc84dc52c04e0a55 Author: Kevin Morin <morin@codelutin.com> Date: Fri Feb 26 16:23:13 2016 +0100 - ajout du numéro de l'observation - suppression d'observations refs #8019 commit 7e77962cdf4224f9caffd0e4c423028c39031805 Author: Kevin Morin <morin@codelutin.com> Date: Fri Feb 26 14:20:21 2016 +0100 ajout d'une ligne d'observation individuelle quand on ajoute en rafale (refs #8019) commit e7863a8ebda9c072da10b53622e2d7a0d20dd0d9 Author: Kevin Morin <morin@codelutin.com> Date: Fri Feb 26 11:35:29 2016 +0100 graph des poids moyens (refs #8019) commit 78e54f6ea3a79d864f84aec51fecdb0425438fa4 Author: Kevin Morin <morin@codelutin.com> Date: Fri Feb 26 10:02:50 2016 +0100 titre de la popup de l'histogramme (refs #8019) commit 6188e6880ab5a6f64e36bfe702062aa15f85a34c Author: Kevin Morin <morin@codelutin.com> Date: Thu Feb 25 18:53:22 2016 +0100 une seule popup pour l'histogramme pour pouvoir la fermer quand on quitte (refs #8019) commit b9eb3c4c27c348dee54ad4493fad868945dc2413 Author: Kevin Morin <morin@codelutin.com> Date: Thu Feb 25 18:31:22 2016 +0100 vérification que le poids saisi est proche du poids calculé avec la RTP (refs #8019) commit 1bf50adf67dc5d08d3365b4320666b109b49ac26 Author: Kevin Morin <morin@codelutin.com> Date: Thu Feb 25 17:43:35 2016 +0100 utilisation des rtp pour calculer les poids des lignes de mensuration (refs #8019) commit 9317d638647e7c73a2ecfa84ceca4a6490ef2382 Author: Kevin Morin <morin@codelutin.com> Date: Thu Feb 25 14:24:41 2016 +0100 affichage de l'histogramme dans une popup (refs #8019) commit 22363b268ff97cd67095eb720b87a41cf49b51d7 Author: Kevin Morin <morin@codelutin.com> Date: Thu Feb 25 11:35:02 2016 +0100 - suppression de l'onglet observations individuelles dans la capture - ajout des lignes dans la table d'obs individuelles dans les mensurations (refs #8019) commit d47fd99a1c1f97e7f5ddaaa5d0571bc2bc6ade10 Author: Kevin Morin <morin@codelutin.com> Date: Tue Feb 23 09:31:57 2016 +0100 activtation ou desactivation de cellules de la tables des mensurations en fonction du mode de copie (refs #6926) commit 4e8e1039b4b3bb47b727214d7034593fe07a779d Author: Kevin Morin <morin@codelutin.com> Date: Mon Feb 22 14:30:13 2016 +0100 organize imports commit 21cb702409a8b5173e328de736c299b398e49b5d Author: Kevin Morin <morin@codelutin.com> Date: Mon Feb 22 14:25:37 2016 +0100 ajout du model de colonnes de la table des observations (refs #6926) commit 16b3d9d7cd82f8f2922b8ebe2f7ab31696937cde Author: Kevin Morin <morin@codelutin.com> Date: Mon Feb 22 10:32:05 2016 +0100 - use jaxx 2.29-SNAPSHOT - correction du mode de config à l'ouverture de l'écran - ajout de useRTP dans le modele refs #6926 commit 7c6650eb79f3ce07cb6a8d37fde6f3c7bced4b63 Author: Kevin Morin <morin@codelutin.com> Date: Fri Feb 19 15:09:16 2016 +0100 mise en page de l'écran refs #6926 commit efe93eb1301d442457e6de2548abb998059590f6 Author: Kevin Morin <morin@codelutin.com> Date: Thu Feb 18 18:04:43 2016 +0100 début de réarrangement de l'écran des mensurations refs #6926 Summary of changes: pom.xml | 3 +- .../java/fr/ifremer/tutti/TuttiConfiguration.java | 8 + .../fr/ifremer/tutti/TuttiConfigurationOption.java | 18 +- .../entities/protocol/TuttiProtocols.java | 4 +- .../persistence/entities/referential/Sexs.java | 21 + .../i18n/tutti-persistence_en_GB.properties | 2 + .../i18n/tutti-persistence_fr_FR.properties | 2 + tutti-ui-swing/src/license/THIRD-PARTY.properties | 2 +- .../filtered-resources/tutti-help-fr.properties | 10 +- .../swing/content/config/TuttiConfigUIHandler.java | 6 + .../operation/FishingOperationsUIHandler.java | 5 +- .../content/operation/catches/EditCatchesUI.jaxx | 34 +- .../content/operation/catches/EditCatchesUI.jcss | 12 - .../operation/catches/EditCatchesUIHandler.java | 105 +-- .../operation/catches/EditCatchesUIModel.java | 11 +- .../catches/FrequencyConfigurationMode.java | 5 +- .../accidental/AccidentalBatchUIHandler.java | 5 +- .../create/CreateBenthosBatchUIHandler.java | 2 +- .../benthos/split/SplitBenthosBatchUIHandler.java | 2 +- .../CopyIndividualObservationMode.java | 10 + .../IndividualObservationBatchTableModel.java | 70 +- .../IndividualObservationBatchUI.jaxx | 97 --- .../IndividualObservationBatchUI.jcss | 106 --- .../IndividualObservationBatchUIHandler.java | 758 ------------------ .../IndividualObservationBatchUIModel.java | 140 ---- ...ExportMultiPostIndividualObservationAction.java | 79 -- ...ImportMultiPostIndividualObservationAction.java | 81 -- ...enCreateIndividualObservationBatchUIAction.java | 57 -- .../RemoveAllIndividualObservationBatchAction.java | 156 ---- .../RemoveIndividualObservationBatchAction.java | 118 --- ...SpeciesForIndividualObservationBatchAction.java | 103 --- .../create/CreateIndividualObservationBatchUI.jaxx | 135 ---- .../create/CreateIndividualObservationBatchUI.jcss | 137 ---- .../CreateIndividualObservationBatchUIHandler.java | 412 ---------- .../CreateIndividualObservationBatchUIModel.java | 290 ------- ...teIndividualObservationBatchAndCloseAction.java | 64 -- ...ndividualObservationBatchAndContinueAction.java | 73 -- ...eateIndividualObservationBatchCancelAction.java | 59 -- .../create/CreateSpeciesBatchUIHandler.java | 2 +- .../frequency/SpeciesFrequencyLogRowModel.java | 11 + .../frequency/SpeciesFrequencyRowModel.java | 71 +- .../frequency/SpeciesFrequencyTableModel.java | 181 +++-- .../species/frequency/SpeciesFrequencyUI.jaxx | 351 +++++---- .../species/frequency/SpeciesFrequencyUI.jcss | 325 +++++--- .../frequency/SpeciesFrequencyUIHandler.java | 866 ++++++++++++++++++--- .../species/frequency/SpeciesFrequencyUIModel.java | 354 ++++++++- .../actions/ApplySpeciesFrequencyRafaleAction.java | 24 +- .../DeleteSpeciesFrequencyLogRowAction.java | 7 + .../frequency/actions/RemoveObservationAction.java | 75 ++ .../actions/ResetSpeciesFrequencyAction.java | 4 +- .../species/split/SplitSpeciesBatchUIHandler.java | 2 +- .../actions/EditFishingOperationAction.java | 3 - .../EditFishingOperationInValidationUIAction.java | 2 - .../ui/swing/util/AbstractTuttiUIHandler.java | 42 +- .../CaracteristicMapCellComponent.java | 2 +- .../CaracteristicMapColumnUIHandler.java | 4 +- .../caracteristics/CaracteristicMapEditorUI.jaxx | 2 +- .../util/table/AbstractTuttiTableUIHandler.java | 20 +- .../resources/i18n/tutti-ui-swing_en_GB.properties | 39 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 51 +- .../src/main/resources/icons/action-chart.png | Bin 0 -> 541 bytes 61 files changed, 2172 insertions(+), 3468 deletions(-) create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/Sexs.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/CopyIndividualObservationMode.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUI.jaxx delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUI.jcss delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIModel.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/actions/ExportMultiPostIndividualObservationAction.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/actions/ImportMultiPostIndividualObservationAction.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/actions/OpenCreateIndividualObservationBatchUIAction.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/actions/RemoveAllIndividualObservationBatchAction.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/actions/RemoveIndividualObservationBatchAction.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/actions/SelectSpeciesForIndividualObservationBatchAction.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUI.jaxx delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUI.jcss delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIHandler.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIModel.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/actions/CreateIndividualObservationBatchAndCloseAction.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/actions/CreateIndividualObservationBatchAndContinueAction.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/actions/CreateIndividualObservationBatchCancelAction.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/RemoveObservationAction.java create mode 100644 tutti-ui-swing/src/main/resources/icons/action-chart.png -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.