Author: bleny Date: 2011-04-07 13:03:49 +0000 (Thu, 07 Apr 2011) New Revision: 1157 Log: fix boats filters (CSS ; values after refresh ; contact creation from boats Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceBoatImpl.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/BoatFilterComponent.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Boats.java trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/BoatFilterComponent.tml trunk/wao-ui/src/main/webapp/SamplingPlan.tml trunk/wao-ui/src/main/webapp/css/common.css Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceBoatImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceBoatImpl.java 2011-04-07 11:30:30 UTC (rev 1156) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceBoatImpl.java 2011-04-07 13:03:49 UTC (rev 1157) @@ -713,8 +713,14 @@ result.setFacadeNames(serviceReferential.getFacades(filter)); result.setSectorsNames(serviceReferential.getSectors(filter)); + + SampleRow sampleRow = filter.getSampleRow(); + filter.setSampleRow(null); result.setSampleRows(serviceSampling.getSampleRowsByFilter(filter)); + filter.setSampleRow(sampleRow); + } else { + // extract data Map<Integer, Boat> integerBoatMap = executeGetBoatsByFilter(transaction, filter); Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/BoatFilterComponent.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/BoatFilterComponent.java 2011-04-07 11:30:30 UTC (rev 1156) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/BoatFilterComponent.java 2011-04-07 13:03:49 UTC (rev 1157) @@ -5,6 +5,7 @@ import fr.ifremer.wao.bean.BoatFilterValues; import fr.ifremer.wao.entity.SampleRow; import fr.ifremer.wao.service.ServiceBoat; +import javassist.tools.reflect.Sample; import org.apache.tapestry5.annotations.InjectComponent; import org.apache.tapestry5.annotations.Parameter; import org.apache.tapestry5.annotations.Persist; @@ -28,9 +29,6 @@ @Persist private BoatFilterValues possibleValuesForFilter; - @Persist - private SampleRow sampleRow; - @Override protected boolean isAvailableDataForFiltersOnly() { return false; @@ -38,7 +36,6 @@ @Override public void resetFilter() { - sampleRow = null; setFilter(serviceBoat.newBoatFilter(getUser())); } @@ -48,11 +45,6 @@ } public BoatFilterValues getPossibleValuesForFilter() { - // Manage sampleRow from context - if (isSampleRowExists()) { - filterFeedback.addInfo("Vous êtes en cours de sélection d'un navire pour la ligne du plan " + getSampleRow().getCode()); - } - return getPossibleValuesForFilter(false); } @@ -78,12 +70,12 @@ } public SampleRow getSampleRow() { - return sampleRow; + return getFilter().getSampleRow(); } public void setSampleRow(SampleRow sampleRow) { getFilter().setSampleRow(sampleRow); - getFilter().setSampleRowExists(true); + getFilter().setSampleRowExists(sampleRow != null); } public String[] onProvideCompletionsFromShipOwnerName(String input) { 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 2011-04-07 11:30:30 UTC (rev 1156) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Boats.java 2011-04-07 13:03:49 UTC (rev 1157) @@ -24,6 +24,7 @@ package fr.ifremer.wao.ui.pages; +import fr.ifremer.wao.WaoBusinessException; import fr.ifremer.wao.WaoException; import fr.ifremer.wao.bean.BoatFilter; import fr.ifremer.wao.bean.CompanyBoatInfos; @@ -49,6 +50,7 @@ import fr.ifremer.wao.ui.services.WaoManager; import org.apache.commons.lang.BooleanUtils; import org.apache.tapestry5.Block; +import org.apache.tapestry5.EventContext; import org.apache.tapestry5.StreamResponse; import org.apache.tapestry5.annotations.Import; import org.apache.tapestry5.annotations.InjectComponent; @@ -112,15 +114,15 @@ return serviceBoat; } - void setupRender() throws WaoException { + void setupRender() throws WaoException, WaoBusinessException { -// if (boatSelectedImmatriculation != null && getBoatSelected() == null) { -// layout.addFatal("L'immatriculation " + boatSelectedImmatriculation + -// " ne correspond à aucun navire affichable. " + -// "Veuillez à enlever cette immatriculation de l'url puis" + -// " rechargez la page."); -// boatSelectedImmatriculation = null; -// } + if (boatSelectedImmatriculation != null && getBoatSelected() == null) { + layout.addFatal("L'immatriculation " + boatSelectedImmatriculation + + " ne correspond à aucun navire affichable. " + + "Veuillez à enlever cette immatriculation de l'url puis" + + " rechargez la page."); + boatSelectedImmatriculation = null; + } // Initialize filters using AbstractFilteredPage superclass // initSelectFilters(false, false, false); @@ -130,14 +132,20 @@ boats = null; boatSelectedImmatriculation = null; companyBoatInfos = null; + + if (sampleRowContextId != null) { + SampleRow sampleRow = serviceSampling.getSampleRowByCode(user, sampleRowContextId); + filterComponent.setSampleRow(sampleRow); + } } -// void onActivate(EventContext ec) { -// sampleRowContextId = ec.get(String.class, 0); + + void onActivate(EventContext ec) { + sampleRowContextId = ec.get(String.class, 0); // if (ec.getCount() > 1) { // boatSelectedImmatriculation = ec.get(Integer.class, 1); // } // boatSelectedImmatriculation = ec.get(Integer.class, 1); -// } + } // Object[] onPassivate() { // return new Object[] { sampleRowContextId, boatSelectedImmatriculation }; @@ -171,8 +179,8 @@ @InjectComponent private BoatFilterComponent filterComponent; -// @Property -// private String sampleRowContextId; + @Property + private String sampleRowContextId; /** Selected boat immatriculation for showing boatInfos */ @Persist @@ -245,11 +253,11 @@ /** * EVENT_SELECTED :: reset submit button for filtersForm. Reset filters and sampleRow from context. */ -// void onSelectedFromReset() { + void onSelectedFromReset() { // Suppress persistant boat filter and sampleRowId in url context. -// boatFilter = null; -// sampleRowContextId = null; -// } + sampleRowContextId = null; + filterComponent.setSampleRow(null); + } /** * EVENT_SELECTED :: search sumit button for filtersForm. Get profession from selectModel to add it in filters. @@ -293,6 +301,7 @@ // companyBoatInfos = null; // return this; // } + @Log Object onSuccessFromFiltersForm() throws WaoException { // Suppress persistant boats list to get new one with filter @@ -301,7 +310,7 @@ boatSelectedImmatriculation = null; // Suppress persistant boat informations for boat selected companyBoatInfos = null; - return boatsZone; + return this; } /*************** RIGHT PANEL ****************/ Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/BoatFilterComponent.tml =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/BoatFilterComponent.tml 2011-04-07 11:30:30 UTC (rev 1156) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/BoatFilterComponent.tml 2011-04-07 13:03:49 UTC (rev 1157) @@ -113,5 +113,10 @@ </div> </div> </form> + + <t:if test="sampleRowExists"> + Vous êtes en cours de sélection d'un navire pour la ligne du plan ${sampleRow.code} + </t:if> + </div> </html> \ No newline at end of file Modified: trunk/wao-ui/src/main/webapp/SamplingPlan.tml =================================================================== --- trunk/wao-ui/src/main/webapp/SamplingPlan.tml 2011-04-07 11:30:30 UTC (rev 1156) +++ trunk/wao-ui/src/main/webapp/SamplingPlan.tml 2011-04-07 13:03:49 UTC (rev 1157) @@ -283,7 +283,7 @@ <td class="${actionsClass} bright" style="white-space: nowrap;"> <t:unless t:test="user.guest"> <t:if t:test="rowNotFinished"> - <a t:type="pagelink" t:page="boats" t:context="row.topiaId"> + <a t:type="pagelink" t:page="boats" t:context="row.code"> <img src="${asset:context:}/img/boat.png" alt="${message:wao.ui.entity.Boats}" /> </a> <p:else> Modified: trunk/wao-ui/src/main/webapp/css/common.css =================================================================== --- trunk/wao-ui/src/main/webapp/css/common.css 2011-04-07 11:30:30 UTC (rev 1156) +++ trunk/wao-ui/src/main/webapp/css/common.css 2011-04-07 13:03:49 UTC (rev 1157) @@ -326,7 +326,7 @@ /** FILTERS COMPONENT **/ div.so-filters { - width: 60%; + /*width: 60%;*/ margin-left: auto; margin-right: auto; }