branch develop updated (9480d83 -> 29a6950)
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 9480d83 Synthèses pour la sclérochronologie (fixes #2265) new 15c4c06 Correction d'une NPE à l'export du plan scléro (fixes #6486) new 29a6950 On évite un échappement (fixes #6488) 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 29a69501cd20f45849fdc3c635046e8f24da6e48 Author: Brendan Le Ny <bleny@codelutin.com> Date: Tue Jan 20 15:03:06 2015 +0100 On évite un échappement (fixes #6488) commit 15c4c064c10d0cf318d1ca473e2e6cdb2d62e59d Author: Brendan Le Ny <bleny@codelutin.com> Date: Tue Jan 20 14:56:41 2015 +0100 Correction d'une NPE à l'export du plan scléro (fixes #6486) Summary of changes: .../wao/services/service/csv/SamplingPlanImportExportModel.java | 7 ++++++- .../services/service/SclerochronologySamplingPlanServiceTest.java | 8 ++++++++ .../src/main/webapp/WEB-INF/content/administration/wao-users.jsp | 2 +- 3 files changed, 15 insertions(+), 2 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 15c4c064c10d0cf318d1ca473e2e6cdb2d62e59d Author: Brendan Le Ny <bleny@codelutin.com> Date: Tue Jan 20 14:56:41 2015 +0100 Correction d'une NPE à l'export du plan scléro (fixes #6486) --- .../wao/services/service/csv/SamplingPlanImportExportModel.java | 7 ++++++- .../services/service/SclerochronologySamplingPlanServiceTest.java | 8 ++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/SamplingPlanImportExportModel.java b/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/SamplingPlanImportExportModel.java index 0c075e4..d8af8f8 100644 --- a/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/SamplingPlanImportExportModel.java +++ b/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/SamplingPlanImportExportModel.java @@ -24,6 +24,7 @@ package fr.ifremer.wao.services.service.csv; +import com.google.common.collect.ImmutableSet; import com.opensymphony.xwork2.util.logging.Logger; import com.opensymphony.xwork2.util.logging.LoggerFactory; import fr.ifremer.wao.entity.FishingZone; @@ -38,6 +39,7 @@ import fr.ifremer.wao.entity.SampleRow; import fr.ifremer.wao.entity.SampleRowImpl; import fr.ifremer.wao.entity.SamplingStrategy; import fr.ifremer.wao.entity.SclerochronologySamplingContext; +import fr.ifremer.wao.entity.Species; import fr.ifremer.wao.entity.TerrestrialLocation; import fr.ifremer.wao.services.service.administration.ReferentialService; import fr.ifremer.wao.services.service.csv.operations.Dcf5CodesParserFormatter; @@ -129,6 +131,8 @@ public class SamplingPlanImportExportModel implements ImportExportModel<SampleRo protected ModelBuilder<SampleRow> modelBuilder; + protected ImmutableSet<Species> allSpecies; + protected PeriodDates periodDates; /** Pour l'export */ @@ -149,6 +153,7 @@ public class SamplingPlanImportExportModel implements ImportExportModel<SampleRo this.fishingZones = fishingZones; this.terrestrialDistricts = terrestrialDistricts; this.referentialService = referentialService; + this.allSpecies = referentialService.getAllSpecies(); } @Override @@ -222,7 +227,7 @@ public class SamplingPlanImportExportModel implements ImportExportModel<SampleRo } if (obsProgram.isSclerochronology()) { - modelBuilder.newColumnForImportExport("ESPECE_CIBLE", SampleRow.PROPERTY_SPECIES, new SpeciesParserFormatter(locale, referentialService.getAllSpecies())); + modelBuilder.newColumnForImportExport("ESPECE_CIBLE", SampleRow.PROPERTY_SPECIES, new SpeciesParserFormatter(locale, allSpecies)); modelBuilder.newColumnForImportExport("CONTEXTE", SampleRow.PROPERTY_SCLEROCHRONOLOGY_SAMPLING_CONTEXT, new I18nAbleParserFormatter<>(locale, SclerochronologySamplingContext.values())); modelBuilder.newColumnForImportExport("CONTEXTE_COMPLEMENT", SampleRow.PROPERTY_SCLEROCHRONOLOGY_SAMPLING_CONTEXT_INFO); modelBuilder.newColumnForImportExport("MESURES", SampleRow.PROPERTY_INDIVIDUAL_MEASUREMENT_STRATEGY, new I18nAbleParserFormatter<>(locale, IndividualMeasurementStrategy.values())); diff --git a/wao-services/src/test/java/fr/ifremer/wao/services/service/SclerochronologySamplingPlanServiceTest.java b/wao-services/src/test/java/fr/ifremer/wao/services/service/SclerochronologySamplingPlanServiceTest.java index 2618224..c678180 100644 --- a/wao-services/src/test/java/fr/ifremer/wao/services/service/SclerochronologySamplingPlanServiceTest.java +++ b/wao-services/src/test/java/fr/ifremer/wao/services/service/SclerochronologySamplingPlanServiceTest.java @@ -166,4 +166,12 @@ public class SclerochronologySamplingPlanServiceTest extends AbstractWaoServiceT Assert.assertEquals(53, samplingPlan.getHighTotalEffortInIndividuals().getReal().intValue()); } + + @Test + public void testExportSamplingPlan() { + fixtures.samplingPlan(); + + SampleRowsFilter filter = service.newSampleRowsFilter(fixtures.admin()); + service.exportSamplingPlan(filter); + } } \ No newline at end of file -- 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 29a69501cd20f45849fdc3c635046e8f24da6e48 Author: Brendan Le Ny <bleny@codelutin.com> Date: Tue Jan 20 15:03:06 2015 +0100 On évite un échappement (fixes #6488) --- wao-web/src/main/webapp/WEB-INF/content/administration/wao-users.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wao-web/src/main/webapp/WEB-INF/content/administration/wao-users.jsp b/wao-web/src/main/webapp/WEB-INF/content/administration/wao-users.jsp index 5cd7db0..664e096 100644 --- a/wao-web/src/main/webapp/WEB-INF/content/administration/wao-users.jsp +++ b/wao-web/src/main/webapp/WEB-INF/content/administration/wao-users.jsp @@ -27,7 +27,7 @@ <s:set name="title"><s:text name="wao.ui.page.waoUsers.title" /></s:set> </s:if> <s:else> - <s:set name="title"><s:text name="wao.ui.page.waoUsers.title" /> <s:property value="waoUsersList.organisation.fullName" /> </s:set> + <s:set name="title"><s:text name="wao.ui.page.waoUsers.title" /> <s:property value="waoUsersList.organisation.fullName" escapeHtml="false" /></s:set> </s:else> <head> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm