Author: bleny Date: 2014-06-20 21:35:09 +0200 (Fri, 20 Jun 2014) New Revision: 2080 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2080 Log: refs #4488 add missing filters Modified: branches/wao-4.0-obsvente/wao-web/src/main/resources/i18n/wao-web_en_GB.properties branches/wao-4.0-obsvente/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties branches/wao-4.0-obsvente/wao-web/src/main/webapp/WEB-INF/content/contacts.jsp branches/wao-4.0-obsvente/wao-web/src/main/webapp/WEB-INF/content/synthesis.jsp Modified: branches/wao-4.0-obsvente/wao-web/src/main/resources/i18n/wao-web_en_GB.properties =================================================================== --- branches/wao-4.0-obsvente/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-06-20 19:20:31 UTC (rev 2079) +++ branches/wao-4.0-obsvente/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-06-20 19:35:09 UTC (rev 2080) @@ -167,6 +167,7 @@ wao.ui.field.Boat.boatLength=Length wao.ui.field.Boat.buildYear=Build year wao.ui.field.Boat.district=Boat district +wao.ui.field.Boat.district.long=Boat district for boat wao.ui.field.Boat.districtCode=District oode wao.ui.field.Boat.fleet=Fleet wao.ui.field.Boat.immatriculation=Registration number Modified: branches/wao-4.0-obsvente/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties =================================================================== --- branches/wao-4.0-obsvente/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-06-20 19:20:31 UTC (rev 2079) +++ branches/wao-4.0-obsvente/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-06-20 19:35:09 UTC (rev 2080) @@ -167,6 +167,7 @@ wao.ui.field.Boat.boatLength=Longueur wao.ui.field.Boat.buildYear=Année de construction wao.ui.field.Boat.district=Quartier maritime +wao.ui.field.Boat.district.long=Quartier maritime du navire wao.ui.field.Boat.districtCode=Code quartier wao.ui.field.Boat.fleet=Flotille wao.ui.field.Boat.immatriculation=Immatriculation Modified: branches/wao-4.0-obsvente/wao-web/src/main/webapp/WEB-INF/content/contacts.jsp =================================================================== --- branches/wao-4.0-obsvente/wao-web/src/main/webapp/WEB-INF/content/contacts.jsp 2014-06-20 19:20:31 UTC (rev 2079) +++ branches/wao-4.0-obsvente/wao-web/src/main/webapp/WEB-INF/content/contacts.jsp 2014-06-20 19:35:09 UTC (rev 2080) @@ -119,6 +119,11 @@ </s:if> <s:if test="obsVente"> { + filterName: 'sampleRowFilter.terrestrialDistrictIds', + filterLabel: "<s:text name="wao.ui.field.SampleRow.terrestrialLocation"/>", + filterValuesField: 'sampleRowsFilterValues.terrestrialDistricts' + }, + { filterName: 'sampleRowFilter.samplingStrategies', filterLabel: "<s:text name="wao.ui.field.SampleRow.samplingStrategy"/>", filterValuesField: 'sampleRowsFilterValues.samplingStrategies' Modified: branches/wao-4.0-obsvente/wao-web/src/main/webapp/WEB-INF/content/synthesis.jsp =================================================================== --- branches/wao-4.0-obsvente/wao-web/src/main/webapp/WEB-INF/content/synthesis.jsp 2014-06-20 19:20:31 UTC (rev 2079) +++ branches/wao-4.0-obsvente/wao-web/src/main/webapp/WEB-INF/content/synthesis.jsp 2014-06-20 19:35:09 UTC (rev 2080) @@ -72,6 +72,13 @@ 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', @@ -82,9 +89,26 @@ </s:if> { filterName: 'boatFilter.districtIds', - filterLabel: "<s:text name="wao.ui.field.Boat.district"/>", + 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> { filterName: 'observerIds', filterLabel: "<s:text name="wao.ui.misc.observer"/>",