branch develop updated (f7553a4 -> 86d2bb9)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository wao. See http://git.codelutin.com/wao.git from f7553a4 Ajout d'une stratégie d'échantillonnage Poids/Taille/Sexe/Age (termine #6645) new 88bd4db Corrige un contrôle de sécurité qui fait que le coordinateur ne voit rien dans les filtres new 86d2bb9 Dans les filtres, on ajoute le nom commun en plus du nom scientifique de l'espèce (testable-client #6638) 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 86d2bb9bd2a9e8005bac526d9d2ad031a9113aa0 Author: Brendan Le Ny <bleny@codelutin.com> Date: Thu Feb 12 15:12:40 2015 +0100 Dans les filtres, on ajoute le nom commun en plus du nom scientifique de l'espèce (testable-client #6638) commit 88bd4dbf97146a721a2296b4681a30832543f94d Author: Brendan Le Ny <bleny@codelutin.com> Date: Thu Feb 12 11:35:06 2015 +0100 Corrige un contrôle de sécurité qui fait que le coordinateur ne voit rien dans les filtres Summary of changes: .../ifremer/wao/services/service/SampleRowsFilterValues.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository wao. See http://git.codelutin.com/wao.git commit 88bd4dbf97146a721a2296b4681a30832543f94d Author: Brendan Le Ny <bleny@codelutin.com> Date: Thu Feb 12 11:35:06 2015 +0100 Corrige un contrôle de sécurité qui fait que le coordinateur ne voit rien dans les filtres --- .../fr/ifremer/wao/services/service/SampleRowsFilterValues.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/wao-services/src/main/java/fr/ifremer/wao/services/service/SampleRowsFilterValues.java b/wao-services/src/main/java/fr/ifremer/wao/services/service/SampleRowsFilterValues.java index 1c3cb1b..cd3fd41 100644 --- a/wao-services/src/main/java/fr/ifremer/wao/services/service/SampleRowsFilterValues.java +++ b/wao-services/src/main/java/fr/ifremer/wao/services/service/SampleRowsFilterValues.java @@ -88,11 +88,11 @@ public class SampleRowsFilterValues extends AbstractFilterValues { boolean sampleRowMatchesObsProgram = obsProgram.equals(sampleRow.getObsProgram()); boolean sampleRowMatchesOrganisation = true; if (optionalCompanyId.isPresent()) { - String sampleRowOrganisationId = null; + String sampleRowCompanyId = null; if (sampleRow.getOrganisation() != null) { - sampleRowOrganisationId = sampleRow.getOrganisation().getTopiaId(); + sampleRowCompanyId = sampleRow.getOrganisation().getCompany().getTopiaId(); } - sampleRowMatchesOrganisation = optionalCompanyId.get().equals(sampleRowOrganisationId); + sampleRowMatchesOrganisation = optionalCompanyId.get().equals(sampleRowCompanyId); } // par exemple, dans le cas du filtre navire, la présente méthode est appelée pour toutes les -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository wao. See http://git.codelutin.com/wao.git commit 86d2bb9bd2a9e8005bac526d9d2ad031a9113aa0 Author: Brendan Le Ny <bleny@codelutin.com> Date: Thu Feb 12 15:12:40 2015 +0100 Dans les filtres, on ajoute le nom commun en plus du nom scientifique de l'espèce (testable-client #6638) --- .../fr/ifremer/wao/services/service/SampleRowsFilterValues.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/wao-services/src/main/java/fr/ifremer/wao/services/service/SampleRowsFilterValues.java b/wao-services/src/main/java/fr/ifremer/wao/services/service/SampleRowsFilterValues.java index cd3fd41..4bad269 100644 --- a/wao-services/src/main/java/fr/ifremer/wao/services/service/SampleRowsFilterValues.java +++ b/wao-services/src/main/java/fr/ifremer/wao/services/service/SampleRowsFilterValues.java @@ -157,7 +157,11 @@ public class SampleRowsFilterValues extends AbstractFilterValues { sclerochronologySamplingContexts.add( FilterOption.forEnum(locale, sampleRow.getSclerochronologySamplingContext())); species.add( - FilterOption.forValueAndLabel(sampleRow.getSpecies().getTopiaId(), sampleRow.getSpecies().getScientificName())); + FilterOption.forValueAndLabel( + sampleRow.getSpecies().getTopiaId(), + sampleRow.getSpecies().getScientificName() + "(" + sampleRow.getSpecies().getVernacularName() + ")" + ) + ); } } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm