Author: bleny Date: 2014-05-27 14:49:58 +0200 (Tue, 27 May 2014) New Revision: 1982 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1982 Log: refs #4487 use new filters in contacts Added: trunk/wao-web/src/main/resources/fr/ifremer/wao/web/action/obsmer/ContactsAction-conversion.properties Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp Copied: trunk/wao-web/src/main/resources/fr/ifremer/wao/web/action/obsmer/ContactsAction-conversion.properties (from rev 1977, trunk/wao-web/src/main/resources/fr/ifremer/wao/web/action/obsmer/BoatsAction-conversion.properties) =================================================================== --- trunk/wao-web/src/main/resources/fr/ifremer/wao/web/action/obsmer/ContactsAction-conversion.properties (rev 0) +++ trunk/wao-web/src/main/resources/fr/ifremer/wao/web/action/obsmer/ContactsAction-conversion.properties 2014-05-27 12:49:58 UTC (rev 1982) @@ -0,0 +1 @@ +filter=org.nuiton.web.struts2.converters.JsonConverter Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp 2014-05-27 09:34:43 UTC (rev 1981) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp 2014-05-27 12:49:58 UTC (rev 1982) @@ -32,9 +32,95 @@ $(document).ready(function () { - var contactsFilterController = new FilterController(WAO.OBSMER_CONTACTS_FILTER_VALUES_JSON_URL, $('#contacts-filters-form')); - contactsFilterController.init(); +// var contactsFilterController = new FilterController(WAO.OBSMER_CONTACTS_FILTER_VALUES_JSON_URL, $('#contacts-filters-form')); +// contactsFilterController.init(); + var contactsFilterMappings = [ + <s:if test="authenticatedWaoUser.authorizedToViewOtherCompanies"> + { + filterName: 'sampleRowFilter.companyIds', + filterLabel: "<s:text name="wao.ui.entity.Company"/>", + filterValuesField: 'sampleRowsFilterValues.companies', + }, + </s:if> + { + filterName: 'sampleRowFilter.sampleRowCodes', + filterLabel: "<s:text name="wao.ui.field.SampleRow.code"/>", + filterValuesField: 'sampleRowsFilterValues.sampleRowCodes', + }, + { + filterName: 'sampleRowFilter.programNames', + filterLabel: "<s:text name="wao.ui.field.SampleRow.programName"/>", + filterValuesField: 'sampleRowsFilterValues.programNames', + }, + { + filterName: 'sampleRowFilter.fishingZoneFacadeNames', + filterLabel: "<s:text name="wao.ui.field.FishingZone.facadeName"/>", + filterValuesField: 'sampleRowsFilterValues.fishingZoneFacadeNames', + }, + { + filterName: 'sampleRowFilter.fishingZoneSectorNames', + 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', + }, + { + filterName: 'boatFilter.boatIds', + filterLabel: "<s:text name="wao.ui.entity.Boat"/>", + filterValuesField: 'boatsFilterValues.boats', + minimumInputLength: 3 + }, + { + filterName: 'boatFilter.districtIds', + filterLabel: "<s:text name="wao.ui.field.Boat.district"/>", + filterValuesField: 'boatsFilterValues.districts' + }, + { + filterName: 'observerIds', + filterLabel: "<s:text name="wao.ui.misc.observer"/>", + filterValuesField: 'observers' + }, + { + filterName: 'contactStates', + filterLabel: "<s:text name="wao.ui.field.Contact.contactState"/>", + filterValuesField: 'contactStates' + }, + { + filterName: 'companyAcceptations', + filterLabel: "<s:text name="wao.ui.field.Contact.validationCompany"/>", + filterValuesField: 'companyAcceptations' + }, + { + filterName: 'programAcceptations', + filterLabel: "<s:text name="wao.ui.field.Contact.validationProgram"/>", + filterValuesField: 'programAcceptations' + }, + { + filterName: 'observedDataControls', + filterLabel: "<s:text name="wao.ui.field.Contact.observedDataControl"/>", + filterValuesField: 'observedDataControls' + }, + { + filterName: 'dataReliabilities', + filterLabel: "<s:text name="wao.ui.field.Contact.dataReliability"/>", + filterValuesField: 'dataReliabilities' + } + ]; + + filter = <s:property value="filter" escapeHtml="false"/>; + + contactsFilterController2 = new FilterController2(contactsFilterMappings, filter, WAO.OBSMER_CONTACTS_FILTER_VALUES_JSON_URL, $('#contacts-filters-form fieldset.extra-filters')); + contactsFilterController2.init(); + $('#switch-compact-full-view').click(function () { $('#switch-compact-full-view').toggleClass('full-view').toggleClass('compact-view'); $('table.contacts-list').toggleClass('full-view').toggleClass('compact-view'); @@ -88,127 +174,12 @@ </fieldset> - <fieldset> + <fieldset class="extra-filters"> - <s:select name="filter.sampleRowFilter.sampleRowCodes" - label="%{getText('wao.ui.field.SampleRow.code')}" - list="filterValues.sampleRowsFilterValues.sampleRowCodes" - listKey="value" - listValue="label" - multiple="true" - dataBinding="sampleRowsFilterValues.sampleRowCodes"/> - - <s:select name="filter.sampleRowFilter.programNames" - label="%{getText('wao.ui.field.SampleRow.programName')}" - list="filterValues.sampleRowsFilterValues.programNames" - listKey="value" - listValue="label" - multiple="true" - dataBinding="sampleRowsFilterValues.programNames"/> - - <s:select name="filter.sampleRowFilter.fishingZoneFacadeNames" - label="%{getText('wao.ui.field.FishingZone.facadeName')}" - list="filterValues.sampleRowsFilterValues.fishingZoneFacadeNames" - listKey="value" - listValue="label" - multiple="true" - dataBinding="sampleRowsFilterValues.fishingZoneFacadeNames"/> - - <s:select name="filter.sampleRowFilter.fishingZoneSectorNames" - label="%{getText('wao.ui.field.FishingZone.sectorName')}" - list="filterValues.sampleRowsFilterValues.fishingZoneSectorNames" - listKey="value" - listValue="label" - multiple="true" - dataBinding="sampleRowsFilterValues.fishingZoneSectorNames"/> - </fieldset> <fieldset> - <s:select name="filter.boatFilter.registrationCode" - label="%{getText('wao.ui.field.Contact.boat')}" - list="filterValues.boatRegistrationCodes" - listKey="value" - listValue="label" - multiple="true" - dataBinding="boatRegistrationCodes"/> - - <s:select name="filter.boatFilter.districtIds" - label="%{getText('wao.ui.field.Boat.district')}" - list="filterValues.boatsFilterValues.districts" - listKey="value" - listValue="label" - multiple="true" - dataBinding="boatsFilterValues.districts"/> - - </fieldset> - - <fieldset> - - <s:if test="authenticatedWaoUser.authorizedToViewOtherCompanies"> - - <s:select name="filter.sampleRowFilter.companyIds" - label="%{getText('wao.ui.entity.Company')}" - list="filterValues.sampleRowsFilterValues.companies" - listKey="value" - listValue="label" - multiple="true" - dataBinding="sampleRowsFilterValues.companies"/> - - </s:if> - - <s:select name="filter.observerIds" - label="%{getText('wao.ui.misc.observer')}" - list="filterValues.observers" - listKey="value" - listValue="label" - multiple="true" - dataBinding="observers"/> - - <s:select name="filter.contactStates" - label="%{getText('wao.ui.field.Contact.contactState')}" - list="filterValues.contactStates" - listKey="value" - listValue="label" - multiple="true" - dataBinding="contactStates"/> - - <s:select name="filter.companyAcceptations" - label="%{getText('wao.ui.field.Contact.validationCompany')}" - list="filterValues.companyAcceptations" - listKey="value" - listValue="label" - multiple="true" - dataBinding="companyAcceptations"/> - - <s:select name="filter.programAcceptations" - label="%{getText('wao.ui.field.Contact.validationProgram')}" - list="filterValues.programAcceptations" - listKey="value" - listValue="label" - multiple="true" - dataBinding="programAcceptations"/> - </fieldset> - - <fieldset> - - <s:select name="filter.observedDataControls" - label="%{getText('wao.ui.field.Contact.observedDataControl')}" - list="filterValues.observedDataControls" - listKey="value" - listValue="label" - multiple="true" - dataBinding="observedDataControls"/> - - <s:select name="filter.dataReliabilities" - label="%{getText('wao.ui.field.Contact.dataReliability')}" - list="filterValues.dataReliabilities" - listKey="value" - listValue="label" - multiple="true" - dataBinding="dataReliabilities"/> - <s:checkbox name="filter.mammalsObservationOnly" label="%{getText('wao.ui.misc.observations')}"/> @@ -223,6 +194,7 @@ <s:checkbox name="filter.commentAdminDefinedOnly" label="%{getText('wao.ui.field.Contact.commentAdmin')}"/> + </fieldset> <fieldset>