Author: fdesbois Date: 2010-01-14 18:44:17 +0000 (Thu, 14 Jan 2010) New Revision: 199 Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/base/AbstractFilteredPage.java trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Contacts.java trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Synthesis.java trunk/suiviobsmer-ui/src/main/resources/fr/ifremer/suiviobsmer/ui/components/Layout.tml trunk/suiviobsmer-ui/src/main/webapp/Synthesis.tml Log: Improve use of AbstractFilteredPage Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/base/AbstractFilteredPage.java =================================================================== --- trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/base/AbstractFilteredPage.java 2010-01-14 18:15:08 UTC (rev 198) +++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/base/AbstractFilteredPage.java 2010-01-14 18:44:17 UTC (rev 199) @@ -29,6 +29,21 @@ * * Created: 14 janv. 2010 * + * This class uses the BoatFilter bean (also SamplingFilter and UserFilter which are supertypes). + * + * Known implementations are {@link fr.ifremer.suiviobsmer.ui.pages.Synthesis } and {@link fr.ifremer.suiviobsmer.ui.pages.Contacts } + * + * You must override the three abstract methods and call {@link #initFilter() } in the setupRender of the page. + * <pre> + * - BoatName uses an Autocomplete mixins : + * <t:textfield t:id="boatName" t:value="filter.boatName" t:mixins="Autocomplete"/> + * - FacadeName uses the zoneUpdater mixins : + * <input t:type="select" t:id="facadeName" t:model="facadeSelectModel" t:value="filter.facadeName" t:mixins="zoneUpdater" t:event="change" t:zone="..." .../> + * The zone_id is the one of the zone returned by {@link #getFilterZone() } + * - SampleRow select value is sampleRowId : + * <input t:type="select" t:id="sampleRow" t:model="sampleRowSelectModel" value="sampleRowId" /> + * </pre> + * * @author fdesbois * @version $Revision$ * @@ -41,7 +56,6 @@ private Logger log; @SessionState - @Property private User user; @Inject @@ -68,7 +82,8 @@ @Persist private SelectModel sectorSelectModel; - void setupRender() throws SuiviObsmerException { + + protected void initFilter() throws SuiviObsmerException { facadeSelectModel = null; getFacadeSelectModel(); sectorSelectModel = null; Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Contacts.java =================================================================== --- trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Contacts.java 2010-01-14 18:15:08 UTC (rev 198) +++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Contacts.java 2010-01-14 18:44:17 UTC (rev 199) @@ -118,6 +118,7 @@ private String editableContactId; void setupRender() throws SuiviObsmerException { + initFilter(); contacts = null; getContacts(); contactsForm.clearErrors(); Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Synthesis.java =================================================================== --- trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Synthesis.java 2010-01-14 18:15:08 UTC (rev 198) +++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Synthesis.java 2010-01-14 18:44:17 UTC (rev 199) @@ -75,8 +75,8 @@ @Property private User user; - void setupRender() { - + void setupRender() throws SuiviObsmerException { + initFilter(); } /********************* DYNAMICAL GRAPH : DATASAMPLING *********************/ Modified: trunk/suiviobsmer-ui/src/main/resources/fr/ifremer/suiviobsmer/ui/components/Layout.tml =================================================================== --- trunk/suiviobsmer-ui/src/main/resources/fr/ifremer/suiviobsmer/ui/components/Layout.tml 2010-01-14 18:15:08 UTC (rev 198) +++ trunk/suiviobsmer-ui/src/main/resources/fr/ifremer/suiviobsmer/ui/components/Layout.tml 2010-01-14 18:44:17 UTC (rev 199) @@ -79,11 +79,11 @@ GPLv3 </a>  - Copyright 2009-2010 <!--<a href="http://www.codelutin.com" title="Code Lutin">--> - DPMA - <!--</a>-->  + DPMA, + <!--</a>--> <a href="http://www.ifremer.fr/sih" title="Ifremer"> Ifremer - </a>  + </a>, <a href="http://www.codelutin.com" title="Code Lutin"> Code Lutin </a> Modified: trunk/suiviobsmer-ui/src/main/webapp/Synthesis.tml =================================================================== --- trunk/suiviobsmer-ui/src/main/webapp/Synthesis.tml 2010-01-14 18:15:08 UTC (rev 198) +++ trunk/suiviobsmer-ui/src/main/webapp/Synthesis.tml 2010-01-14 18:44:17 UTC (rev 199) @@ -53,16 +53,16 @@ <div class="t-beaneditor"> <div> <t:label t:for="boatName" />: - <input t:type="textfield" t:id="boatName" class="width50" t:value="dataSamplingFilter.boatName" t:mixins="Autocomplete" />  + <input t:type="textfield" t:id="boatName" class="width50" t:value="filter.boatName" t:mixins="Autocomplete" />  <t:label t:for="boatImmatriculation" />: - <input t:type="textfield" t:id="boatImmatriculation" class="width50" t:value="dataSamplingFilter.boatImmatriculation" />  + <input t:type="textfield" t:id="boatImmatriculation" class="width50" t:value="filter.boatImmatriculation" />  <t:label t:for="boatDistrictCode" />: - <input t:type="textfield" t:id="boatDistrictCode" class="width50" t:value="dataSamplingFilter.boatDistrictCode" />  + <input t:type="textfield" t:id="boatDistrictCode" class="width50" t:value="filter.boatDistrictCode" />  <t:label t:for="facadeName" />: - <select t:type="select" t:id="facadeName" t:model="facadeSelectModel" value="dataSamplingFilter.facadeName" + <select t:type="select" t:id="facadeName" t:model="facadeSelectModel" value="filter.facadeName" t:mixins="zoneUpdater" t:event="change" t:zone="so-contacts-filters"/>  <t:label t:for="sectorName" />: - <select t:type="select" t:id="sectorName" t:model="sectorSelectModel" value="dataSamplingFilter.sectorName" />  + <select t:type="select" t:id="sectorName" t:model="sectorSelectModel" value="filter.sectorName" />  <t:label t:for="sampleRow" />: <input t:type="select" t:id="sampleRow" t:model="sampleRowSelectModel" value="sampleRowId" /> <!-- <t:if t:test="user.admin">