Author: fdesbois Date: 2010-06-18 13:09:39 +0000 (Fri, 18 Jun 2010) New Revision: 548 Log: Evo #2336 : Add filter in boats page Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/AbstractFilteredPage.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Boats.java trunk/wao-ui/src/main/webapp/Boats.tml Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/AbstractFilteredPage.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/AbstractFilteredPage.java 2010-06-18 08:16:29 UTC (rev 547) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/AbstractFilteredPage.java 2010-06-18 13:09:39 UTC (rev 548) @@ -350,7 +350,7 @@ public String[] onProvideCompletionsFromBoatName(String input) throws WaoException { List<String> results = serviceBoat.getBoatNamesStartWith(input); - return results.toArray(new String[0]); + return results.toArray(new String[results.size()]); } /** Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Boats.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Boats.java 2010-06-18 08:16:29 UTC (rev 547) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Boats.java 2010-06-18 13:09:39 UTC (rev 548) @@ -421,6 +421,11 @@ return filtersZone.getBody(); } + public String[] onProvideCompletionsFromShipOwnerName(String input) { + List<String> results = serviceBoat.getShipOwnerNamesContains(input); + return results.toArray(new String[results.size()]); + } + /** * EVENT_SELECTED :: reset submit button for filtersForm. Reset filters and sampleRow from context. */ Modified: trunk/wao-ui/src/main/webapp/Boats.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Boats.tml 2010-06-18 08:16:29 UTC (rev 547) +++ trunk/wao-ui/src/main/webapp/Boats.tml 2010-06-18 13:09:39 UTC (rev 548) @@ -127,6 +127,8 @@ <input t:type="textfield" t:id="boatImmatriculation" class="width50" t:value="boatFilter.boatImmatriculation" /> <span> code quartier </span> <input t:type="textfield" t:id="boatDistrictCode" class="width50" t:value="boatFilter.boatDistrictCode" /> + <span> armateur </span> + <input t:type="textfield" t:id="shipOwnerName" class="width150" t:value="boatFilter.shipOwnerName" t:mixins="Autocomplete" /> </div> <div class="t-beaneditor-row aright"> <input t:type="submit" class="ico search-32px" t:id="search" value="Search" title="Rechercher les navires correspondants aux filtres saisies" />