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 16a9054c7c8c8a5cfa76c7c13fa9fe8494e4e8a3 Author: Brendan Le Ny <bleny@codelutin.com> Date: Wed Jan 14 18:12:33 2015 +0100 Filtres pour la synthèse scléro --- .../src/main/webapp/WEB-INF/content/synthesis.jsp | 96 ++++++++++++++-------- 1 file changed, 60 insertions(+), 36 deletions(-) diff --git a/wao-web/src/main/webapp/WEB-INF/content/synthesis.jsp b/wao-web/src/main/webapp/WEB-INF/content/synthesis.jsp index c2d98d0..c950ddc 100644 --- a/wao-web/src/main/webapp/WEB-INF/content/synthesis.jsp +++ b/wao-web/src/main/webapp/WEB-INF/content/synthesis.jsp @@ -38,7 +38,12 @@ <s:if test="authenticatedWaoUser.authorizedToViewOtherCompanies"> { filterName: 'sampleRowFilter.organisationIds', - filterLabel: "<s:text name="wao.ui.entity.Company"/>", + <s:if test="obsMer || obsVente"> + filterLabel: "<s:text name="wao.ui.entity.Company"/>", + </s:if> + <s:else> + filterLabel: "<s:text name="wao.ui.entity.Organisation"/>", + </s:else> filterValuesField: 'sampleRowsFilterValues.organisations', }, </s:if> @@ -62,51 +67,70 @@ filterLabel: "<s:text name="wao.ui.field.FishingZone.sectorName"/>", filterValuesField: 'sampleRowsFilterValues.fishingZoneSectorNames', }, - { - filterName: 'sampleRowFilter.fishingGearDcfIds', - filterLabel: "<s:text name="wao.ui.entity.fishingGearDcf"/>", - filterValuesField: 'sampleRowsFilterValues.fishingGearDcfs', - }, - { - filterName: 'sampleRowFilter.targetSpeciesDcfIds', - filterLabel: "<s:text name="wao.ui.entity.targetSpeciesDcf"/>", - filterValuesField: 'sampleRowsFilterValues.targetSpeciesDcfs', - }, - <s:if test="obsVente"> + <s:if test="obsMer || obsVente"> { - filterName: 'sampleRowFilter.terrestrialDistrictIds', - filterLabel: "<s:text name="wao.ui.field.SampleRow.terrestrialLocation"/>", - filterValuesField: 'sampleRowsFilterValues.terrestrialDistricts' + filterName: 'sampleRowFilter.fishingGearDcfIds', + filterLabel: "<s:text name="wao.ui.entity.fishingGearDcf"/>", + filterValuesField: 'sampleRowsFilterValues.fishingGearDcfs', }, - </s:if> - <s:if test="authenticatedWaoUser.authorizedToFilterOnBoats"> { - filterName: 'boatFilter.boatIds', - filterLabel: "<s:text name="wao.ui.entity.Boat"/>", - filterValuesField: 'boatsFilterValues.boats', - minimumInputLength: 3 + filterName: 'sampleRowFilter.targetSpeciesDcfIds', + filterLabel: "<s:text name="wao.ui.entity.targetSpeciesDcf"/>", + filterValuesField: 'sampleRowsFilterValues.targetSpeciesDcfs', }, + <s:if test="obsVente"> + { + filterName: 'sampleRowFilter.terrestrialDistrictIds', + filterLabel: "<s:text name="wao.ui.field.SampleRow.terrestrialLocation"/>", + filterValuesField: 'sampleRowsFilterValues.terrestrialDistricts' + }, + </s:if> + <s:if test="authenticatedWaoUser.authorizedToFilterOnBoats"> + { + filterName: 'boatFilter.boatIds', + filterLabel: "<s:text name="wao.ui.entity.Boat"/>", + filterValuesField: 'boatsFilterValues.boats', + minimumInputLength: 3 + }, + </s:if> + { + filterName: 'boatFilter.districtIds', + filterLabel: "<s:text name="wao.ui.field.Boat.district.long"/>", + filterValuesField: 'boatsFilterValues.districts' + }, + <s:if test="obsVente"> + { + filterName: 'sampleRowFilter.samplingStrategies', + filterLabel: "<s:text name="wao.ui.field.SampleRow.samplingStrategy"/>", + filterValuesField: 'sampleRowsFilterValues.samplingStrategies' + }, + { + filterName: 'actualSamplingStrategies', + filterLabel: "<s:text name="wao.ui.field.Contact.samplingStrategy"/>", + filterValuesField: 'actualSamplingStrategies' + }, + { + filterName: 'completeSamplings', + filterLabel: "<s:text name="wao.ui.field.Contact.completeSampling"/>", + filterValuesField: 'completeSamplings' + }, + </s:if> </s:if> - { - filterName: 'boatFilter.districtIds', - filterLabel: "<s:text name="wao.ui.field.Boat.district.long"/>", - filterValuesField: 'boatsFilterValues.districts' - }, - <s:if test="obsVente"> + <s:if test="sclerochronology"> { - filterName: 'sampleRowFilter.samplingStrategies', - filterLabel: "<s:text name="wao.ui.field.SampleRow.samplingStrategy"/>", - filterValuesField: 'sampleRowsFilterValues.samplingStrategies' + filterName: 'sampleRowFilter.sclerochronologySamplingContexts', + filterLabel: "<s:text name="wao.ui.field.SampleRow.sclerochronologySamplingContext"/>", + filterValuesField: 'sampleRowsFilterValues.sclerochronologySamplingContexts' }, { - filterName: 'actualSamplingStrategies', - filterLabel: "<s:text name="wao.ui.field.Contact.samplingStrategy"/>", - filterValuesField: 'actualSamplingStrategies' + filterName: 'sampleRowFilter.individualMeasurementStrategies', + filterLabel: "<s:text name="wao.ui.field.SampleRow.individualMeasurementStrategy"/>", + filterValuesField: 'sampleRowsFilterValues.individualMeasurementStrategies' }, { - filterName: 'completeSamplings', - filterLabel: "<s:text name="wao.ui.field.Contact.completeSampling"/>", - filterValuesField: 'completeSamplings' + filterName: 'sampleRowFilter.species', + filterLabel: "<s:text name="wao.ui.field.SampleRow.species"/>", + filterValuesField: 'sampleRowsFilterValues.species' }, </s:if> { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.