r1983 - in trunk/wao-web/src/main: resources/fr/ifremer/wao/web/action/obsmer webapp/WEB-INF/content/obsmer - Wao-commits

27 May 2014

Author: bleny
Date: 2014-05-27 15:00:46 +0200 (Tue, 27 May 2014)
New Revision: 1983

Url: http://forge.codelutin.com/projects/wao/repository/revisions/1983

Log:
refs #4487 refs #4493 extract a component for contacts filter and use it in contacts and synthesis

Added:
   trunk/wao-web/src/main/resources/fr/ifremer/wao/web/action/obsmer/SynthesisAction-conversion.properties
   trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts-filter.jsp
Modified:
   trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp
   trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/synthesis.jsp

Copied: trunk/wao-web/src/main/resources/fr/ifremer/wao/web/action/obsmer/SynthesisAction-conversion.properties (from rev 1982, trunk/wao-web/src/main/resources/fr/ifremer/wao/web/action/obsmer/ContactsAction-conversion.properties)
===================================================================

--- trunk/wao-web/src/main/resources/fr/ifremer/wao/web/action/obsmer/SynthesisAction-conversion.properties	                        (rev 0)
+++ trunk/wao-web/src/main/resources/fr/ifremer/wao/web/action/obsmer/SynthesisAction-conversion.properties	2014-05-27 13:00:46 UTC (rev 1983)
@@ -0,0 +1 @@
+filter=org.nuiton.web.struts2.converters.JsonConverter

Added: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts-filter.jsp
===================================================================
--- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts-filter.jsp	                        (rev 0)
+++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts-filter.jsp	2014-05-27 13:00:46 UTC (rev 1983)
@@ -0,0 +1,163 @@
+<head>
+    <script>
+
+        $(document).ready(function () {
+
+            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();
+
+        });
+
+    </script>
+</head>
+
+
+<s:form method="GET" id="contacts-filters-form" cssClass="filters-form">
+
+    <fieldset>
+
+        <s:textfield name="filter.periodFrom"
+                     label="%{getText('wao.ui.form.periodFrom')}"
+                     placeholder="%{getFilterPeriodFromPlaceholder()}"
+                     cssClass="input-small"/>
+
+        <s:textfield name="filter.periodTo"
+                     label="%{getText('wao.ui.form.period.to')}"
+                     placeholder="%{getFilterPeriodToPlaceholder()}"
+                     cssClass="input-small"/>
+
+        <s:checkbox name="filter.filterOnObservationBeginDate"
+                    label="%{getText('wao.ui.form.filterOnObservationBeginDate')}"/>
+
+    </fieldset>
+
+    <fieldset class="extra-filters">
+
+    </fieldset>
+
+    <fieldset>
+
+        <s:checkbox name="filter.mammalsObservationOnly"
+                    label="%{getText('wao.ui.misc.observations')}"/>
+
+        <s:checkbox name="filter.mammalsCaptureOnly"
+                    label="%{getText('wao.ui.field.Contact.mammalsCapture')}"/>
+
+        <s:checkbox name="filter.commentDefinedOnly"
+                    label="%{getText('wao.ui.field.Contact.comment')}"/>
+
+        <s:checkbox name="filter.commentCompanyDefinedOnly"
+                    label="%{getText('wao.ui.field.Contact.commentCompany')}"/>
+
+        <s:checkbox name="filter.commentAdminDefinedOnly"
+                    label="%{getText('wao.ui.field.Contact.commentAdmin')}"/>
+
+    </fieldset>
+
+    <fieldset>
+
+        <s:checkbox name="filter.sortedByBoardingDate"
+                    label="%{getText('wao.ui.form.sortByTideBegin')}"/>
+
+    </fieldset>
+
+    <div class="form-actions">
+
+        <s:submit type="button" cssClass="btn btn-primary">
+            <i class="icon-filter"></i> <s:text name="wao.ui.action.filter"/>
+        </s:submit>
+
+        <s:submit action="reset-contacts-filter" type="button" cssClass="btn">
+            <i class="icon-reset"></i> <s:text name="wao.ui.action.reset"/>
+        </s:submit>
+
+        <s:submit action="export-contacts" type="button" cssClass="btn">
+            <i class="icon-download"></i> <s:text name="wao.ui.action.csvExport"/>
+        </s:submit>
+
+    </div>
+
+</s:form>
\ No newline at end of file

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 12:49:58 UTC (rev 1982)
+++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp	2014-05-27 13:00:46 UTC (rev 1983)
@@ -32,95 +32,6 @@
 
         $(document).ready(function () {
 
-//            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');
@@ -155,73 +66,8 @@
 <content tag="mainClass">large</content>
 <content tag="contactsMenuItemClass">active</content>
 
-<s:form method="GET" id="contacts-filters-form" cssClass="filters-form">
+<%@include file="contacts-filter.jsp"%>
 
-    <fieldset>
-
-        <s:textfield name="filter.periodFrom"
-                     label="%{getText('wao.ui.form.periodFrom')}"
-                     placeholder="%{getFilterPeriodFromPlaceholder()}"
-                     cssClass="input-small"/>
-
-        <s:textfield name="filter.periodTo"
-                     label="%{getText('wao.ui.form.period.to')}"
-                     placeholder="%{getFilterPeriodToPlaceholder()}"
-                     cssClass="input-small"/>
-
-        <s:checkbox name="filter.filterOnObservationBeginDate"
-                    label="%{getText('wao.ui.form.filterOnObservationBeginDate')}"/>
-
-    </fieldset>
-
-    <fieldset class="extra-filters">
-
-    </fieldset>
-
-    <fieldset>
-
-        <s:checkbox name="filter.mammalsObservationOnly"
-                    label="%{getText('wao.ui.misc.observations')}"/>
-
-        <s:checkbox name="filter.mammalsCaptureOnly"
-                    label="%{getText('wao.ui.field.Contact.mammalsCapture')}"/>
-
-        <s:checkbox name="filter.commentDefinedOnly"
-                    label="%{getText('wao.ui.field.Contact.comment')}"/>
-
-        <s:checkbox name="filter.commentCompanyDefinedOnly"
-                    label="%{getText('wao.ui.field.Contact.commentCompany')}"/>
-
-        <s:checkbox name="filter.commentAdminDefinedOnly"
-                    label="%{getText('wao.ui.field.Contact.commentAdmin')}"/>
-
-    </fieldset>
-
-    <fieldset>
-
-        <s:checkbox name="filter.sortedByBoardingDate"
-                    label="%{getText('wao.ui.form.sortByTideBegin')}"/>
-
-    </fieldset>
-
-    <div class="form-actions">
-
-        <s:submit type="button" cssClass="btn btn-primary">
-            <i class="icon-filter"></i> <s:text name="wao.ui.action.filter"/>
-        </s:submit>
-
-        <s:submit action="reset-contacts-filter" type="button" cssClass="btn">
-            <i class="icon-reset"></i> <s:text name="wao.ui.action.reset"/>
-        </s:submit>
-
-        <s:submit action="export-contacts" type="button" cssClass="btn">
-            <i class="icon-download"></i> <s:text name="wao.ui.action.csvExport"/>
-        </s:submit>
-
-    </div>
-
-</s:form>
-
 <h3>
     <s:text name="wao.ui.contacts.title">
         <s:param value="%{pagination.nbRecords}"/>

Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/synthesis.jsp
===================================================================
--- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/synthesis.jsp	2014-05-27 12:49:58 UTC (rev 1982)
+++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/synthesis.jsp	2014-05-27 13:00:46 UTC (rev 1983)
@@ -55,6 +55,8 @@
 
     <content tag="mainClass"></content>
 
+    <%@include file="contacts-filter.jsp"%>
+
     <article>
         <h2>
             <s:text name="SynthesisId.GRAPH_SAMPLING"/>

    

r1983 - in trunk/wao-web/src/main: resources/fr/ifremer/wao/web/action/obsmer webapp/WEB-INF/content/obsmer

bleny＠users.forge.codelutin.com

tags

participants (1)