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

branch feature/8039 created (now 820547c)
by codelutin.com scm 01 Mar '16

01 Mar '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/8039 in repository tutti. See http://git.codelutin.com/tutti.git at 820547c Amélioration des états des actions sur la page d'accueil (See #8039) This branch includes the following new commits: new 820547c Amélioration des états des actions sur la page d'accueil (See #8039) 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 820547cd7005ca718463fa24228cf9f67eee8005 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Mar 1 20:29:40 2016 +0100 Amélioration des états des actions sur la page d'accueil (See #8039) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/8034 created (now 7ced401)
by codelutin.com scm 01 Mar '16

01 Mar '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/8034 in repository tutti. See http://git.codelutin.com/tutti.git at 7ced401 Suppression de plusieurs espèces (See #8034) This branch includes the following new commits: new 7ced401 Suppression de plusieurs espèces (See #8034) 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 7ced4017bea9423cbae2a9e7c84f8896d486a87e Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Mar 1 20:03:30 2016 +0100 Suppression de plusieurs espèces (See #8034) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/8035 updated (c21f7d2 -> 2d3f169)
by codelutin.com scm 01 Mar '16

01 Mar '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/8035 in repository tutti. See http://git.codelutin.com/tutti.git from c21f7d2 Ajout d'un hightlighter pour grouper et alterner la couleur de fond pour les espèces (See #8035) adds 2d3f169 Mise en évidence des lignes à ne pas prélever (Fixes #8036) No new revisions were added by this update. Summary of changes: .../CalcifiedPiecesSamplingEditorUIHandler.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch feature/ecran_obs_individuelles updated (cf52df3 -> 9e962b9)
by codelutin.com scm 01 Mar '16

01 Mar '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/ecran_obs_individuelles in repository tutti. See http://git.codelutin.com/tutti.git from cf52df3 - 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 7213e28 - suppression des lignes d'observations individuelles sur - correction de l'affichage de l'histogramme des mensurations refs #8019 new 52b5e76 remplissage des lignes vides lors de l'ajout en rafale (refs #8019) new 8f3eab7 correction de l'incrément des lignes quand on quitte et revient sur l'ecran des mensurations (refs #8019) new 7ec84d0 suppression des lignes d'observation individuelles générées en rafale quand on supprime le log correspondant (refs #8019) new 9e962b9 - validation des lignes d'observations - correction de l'ouverture de l'editeur de caracteristiques refs #8019 The 5 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 9e962b9ab0137fadd99939ce525444a2ede9b871 Author: Kevin Morin <morin(a)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 7ec84d07dfeb707e5bf9ce8d5bdde914f08b981e Author: Kevin Morin <morin(a)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 8f3eab7b03b9fa919626ad4fd36e3e1f8b31cccf Author: Kevin Morin <morin(a)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 52b5e76bbc5d3ba49c46ae81859fd20e1548ff5f Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Mar 1 14:45:52 2016 +0100 remplissage des lignes vides lors de l'ajout en rafale (refs #8019) commit 7213e28bef08c393e787d7f7a0a4eef7906e19cb Author: Kevin Morin <morin(a)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 Summary of changes: .../content/operation/catches/EditCatchesUI.jaxx | 6 + .../operation/catches/EditCatchesUIHandler.java | 54 +++++- .../accidental/AccidentalBatchUIHandler.java | 5 +- .../IndividualObservationBatchTableModel.java | 26 ++- .../frequency/SpeciesFrequencyLogRowModel.java | 11 ++ .../frequency/SpeciesFrequencyUIHandler.java | 188 ++++++++++++++------- .../species/frequency/SpeciesFrequencyUIModel.java | 121 +++++++++++-- .../actions/ApplySpeciesFrequencyRafaleAction.java | 19 ++- .../DeleteSpeciesFrequencyLogRowAction.java | 7 + .../frequency/actions/RemoveObservationAction.java | 1 + .../actions/ResetSpeciesFrequencyAction.java | 4 +- .../CaracteristicMapCellComponent.java | 2 +- .../CaracteristicMapColumnUIHandler.java | 4 +- .../caracteristics/CaracteristicMapEditorUI.jaxx | 2 +- 14 files changed, 354 insertions(+), 96 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 5

01/01: Ajout d'un hightlighter pour grouper et alterner la couleur de fond pour les espèces (See #8035)
by codelutin.com scm 01 Mar '16

01 Mar '16

This is an automated email from the git hooks/post-receive script. New commit to branch feature/8035 in repository tutti. See http://git.codelutin.com/tutti.git commit c21f7d22c39da06955f28f884b29a7b7e1cda634 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Mar 1 18:02:41 2016 +0100 Ajout d'un hightlighter pour grouper et alterner la couleur de fond pour les espèces (See #8035) --- .../CalcifiedPiecesSamplingEditorTableModel.java | 24 ++++++++++++++++++++++ .../CalcifiedPiecesSamplingEditorUIHandler.java | 12 +++++++++++ 2 files changed, 36 insertions(+) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/CalcifiedPiecesSamplingEditorTableModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/CalcifiedPiecesSamplingEditorTableModel.java index 823707b..d5c3a37 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/CalcifiedPiecesSamplingEditorTableModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/CalcifiedPiecesSamplingEditorTableModel.java @@ -30,7 +30,10 @@ import org.jdesktop.swingx.table.TableColumnModelExt; import org.nuiton.jaxx.application.swing.table.AbstractApplicationTableModel; import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; +import java.util.Set; import static org.nuiton.i18n.I18n.n; @@ -150,4 +153,25 @@ public class CalcifiedPiecesSamplingEditorTableModel extends AbstractApplication } return result; } + + public boolean isSpeciesOrderEven(int rowIndex) { + + CalcifiedPiecesSamplingEditorRowModel selectedRow = getEntry(rowIndex); + Integer selectedSpeciesReferenceTaxonId = selectedRow.getProtocolSpecies().getSpeciesReferenceTaxonId(); + + Set<Integer> speciesReferenceTaxonIds = new LinkedHashSet<>(); + for (CalcifiedPiecesSamplingEditorRowModel row : rows) { + Integer speciesReferenceTaxonId = row.getProtocolSpecies().getSpeciesReferenceTaxonId(); + speciesReferenceTaxonIds.add(speciesReferenceTaxonId); + if (Objects.equals(selectedSpeciesReferenceTaxonId, speciesReferenceTaxonId)) { + break; + } + } + int nbSpecies = speciesReferenceTaxonIds.size(); + + // Si on a trouvé des espèces, on doit alors incrémenter de 1 car l'espèce «0» est en fait la première trouvée ^^ + return nbSpecies == 0 || ((nbSpecies + 1) % 2 == 0); + + } + } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/CalcifiedPiecesSamplingEditorUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/CalcifiedPiecesSamplingEditorUIHandler.java index 879c675..2af9fc8 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/CalcifiedPiecesSamplingEditorUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/CalcifiedPiecesSamplingEditorUIHandler.java @@ -31,11 +31,13 @@ import fr.ifremer.tutti.ui.swing.content.protocol.EditProtocolSpeciesRowModel; import fr.ifremer.tutti.ui.swing.content.protocol.EditProtocolUIModel; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; import fr.ifremer.tutti.ui.swing.util.TuttiUI; +import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; import jaxx.runtime.SwingUtil; import jaxx.runtime.swing.JAXXWidgetUtil; import jaxx.runtime.swing.editor.cell.NumberCellEditor; import jaxx.runtime.validator.swing.SwingValidator; import org.jdesktop.swingx.JXTable; +import org.jdesktop.swingx.decorator.HighlightPredicate; import org.jdesktop.swingx.table.DefaultTableColumnModelExt; import org.jdesktop.swingx.table.TableColumnExt; @@ -168,6 +170,16 @@ public class CalcifiedPiecesSamplingEditorUIHandler extends AbstractTuttiUIHandl .map(EditProtocolSpeciesRowModel::getSpecies) .collect(Collectors.toList())); }); + + HighlightPredicate speciesOrderEven = (renderer, adapter) -> { + int rowIndex = adapter.convertRowIndexToModel(adapter.row); + return tableModel.isSpeciesOrderEven(rowIndex); + }; + cpsTable.addHighlighter(TuttiUIUtil.newBackgroundColorHighlighter(speciesOrderEven, Color.WHITE)); + cpsTable.addHighlighter(TuttiUIUtil.newBackgroundColorHighlighter( + new HighlightPredicate.NotHighlightPredicate(speciesOrderEven), + getConfig().getColorAlternateRow())); + } protected DefaultTableColumnModelExt initTableColumnModel() { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch feature/8035 created (now c21f7d2)
by codelutin.com scm 01 Mar '16

01 Mar '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/8035 in repository tutti. See http://git.codelutin.com/tutti.git at c21f7d2 Ajout d'un hightlighter pour grouper et alterner la couleur de fond pour les espèces (See #8035) This branch includes the following new commits: new c21f7d2 Ajout d'un hightlighter pour grouper et alterner la couleur de fond pour les espèces (See #8035) 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 c21f7d22c39da06955f28f884b29a7b7e1cda634 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Mar 1 18:02:41 2016 +0100 Ajout d'un hightlighter pour grouper et alterner la couleur de fond pour les espèces (See #8035) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch feature/8029 created (now 02e6144)
by codelutin.com scm 01 Mar '16

01 Mar '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/8029 in repository tutti. See http://git.codelutin.com/tutti.git at 02e6144 Utilisation d'un vrai drapeau pour savoir si l'utilisateur a bien valider le nouvel intervalle (See #8029) This branch includes the following new commits: new 02e6144 Utilisation d'un vrai drapeau pour savoir si l'utilisateur a bien valider le nouvel intervalle (See #8029) 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 02e61440cf232d03a3c7465d8ead75acb132a5b7 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Mar 1 17:12:38 2016 +0100 Utilisation d'un vrai drapeau pour savoir si l'utilisateur a bien valider le nouvel intervalle (See #8029) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/8033 created (now 608eee4)
by codelutin.com scm 01 Mar '16

01 Mar '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/8033 in repository tutti. See http://git.codelutin.com/tutti.git at 608eee4 Changement du comparateur de lignes de l'éditeur de prélèvement des pièces calcifiées (See #8033) This branch includes the following new commits: new 7250846 Changement de l'ordre d'insertion des lignes (See #8033) new 608eee4 Changement du comparateur de lignes de l'éditeur de prélèvement des pièces calcifiées (See #8033) 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 608eee40da45127b4eaf7bfc9f74b451d8b47966 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Mar 1 16:56:03 2016 +0100 Changement du comparateur de lignes de l'éditeur de prélèvement des pièces calcifiées (See #8033) commit 7250846a3d78139b681826abf03aeda91cb3c9db Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Mar 1 16:43:44 2016 +0100 Changement de l'ordre d'insertion des lignes (See #8033) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2

branch develop updated (ef6e386 -> 0e085e8)
by codelutin.com scm 01 Mar '16

01 Mar '16

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 ef6e386 Fixes #8023 Merge branch 'feature/8023' into develop new 2b01ccc Mise à jour de l'aide en ligne new 0e085e8 Merge branch 'feature/7962' into develop 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 0e085e86a2b7cce7b4232591a29b0ebe3a9ad0d4 Merge: ef6e386 2b01ccc Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Mar 1 16:38:33 2016 +0100 Merge branch 'feature/7962' into develop commit 2b01ccc829a5bc246f24f40cc315a8731230cfb9 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Mar 1 16:21:26 2016 +0100 Mise à jour de l'aide en ligne Summary of changes: tutti-ui-swing/src/main/help/fr/config.html | 60 +++++---- .../src/main/help/fr/editFishingOperation.html | 137 +++++++++++++++------ tutti-ui-swing/src/main/help/fr/selectCruise.html | 2 +- 3 files changed, 134 insertions(+), 65 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2

branch develop-4.4.x updated (d9886ac -> 95d2856)
by codelutin.com scm 01 Mar '16

01 Mar '16

This is an automated email from the git hooks/post-receive script. New change to branch develop-4.4.x in repository tutti. See http://git.codelutin.com/tutti.git from d9886ac [jgitflow-maven-plugin]Updating develop poms back to pre merge state new 01f94ca Mise à jour de l'aide en ligne new b88216e Mise à jour du guide utilisateur new 95d2856 Fixes #7962 Merge branch 'feature/7962' into develop-4.4.x The 3 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 95d2856d1d9be778a34d3be32aecdb44a6347daf Merge: d9886ac b88216e Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Mar 1 16:23:26 2016 +0100 Fixes #7962 Merge branch 'feature/7962' into develop-4.4.x commit b88216e6de2a4a5ad9d077efd1070864315db4ba Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Mar 1 16:23:20 2016 +0100 Mise à jour du guide utilisateur commit 01f94ca45813e9b6f0c6a3ad3ad313759b11bba1 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Mar 1 16:21:26 2016 +0100 Mise à jour de l'aide en ligne Summary of changes: .../help/Guide_utilisation_Allegro_Campagne.pdf | Bin 1996569 -> 1988880 bytes tutti-ui-swing/src/main/help/fr/config.html | 60 +++++---- .../src/main/help/fr/editFishingOperation.html | 137 +++++++++++++++------ tutti-ui-swing/src/main/help/fr/selectCruise.html | 2 +- 4 files changed, 134 insertions(+), 65 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 3