Author: bleny Date: 2011-06-08 09:52:47 +0000 (Wed, 08 Jun 2011) New Revision: 1325 Log: icons for synthesis ; leaving sample row form lead back to the last seen sampling plan ; add filter on ship owner name on click in boat details Added: trunk/wao-ui/src/main/webapp/img/synthesis-observation-hour.png Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/WaoActivationContext.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Boats.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ObsDebSamplingPlan.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowForm.java trunk/wao-ui/src/main/webapp/Boats.tml trunk/wao-ui/src/main/webapp/ObsDebSamplingPlan.tml trunk/wao-ui/src/main/webapp/SampleRowForm.tml trunk/wao-ui/src/main/webapp/Synthesis.tml Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2011-06-08 08:06:04 UTC (rev 1324) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2011-06-08 09:52:47 UTC (rev 1325) @@ -691,9 +691,11 @@ if (result.getObsProgram() == ObsProgram.OBSDEB) { result.sizeObservers(); - result.getObservationUnit(); - result.getTerrestrialLocation(); - if (result.getObservationType() == ObservationType.PHONE_CALL) { + if (result.getObservationUnit() != null) { + result.getObservationUnit().getRegionIfremer(); + } + if (result.isPhoneCall()) { + result.getTerrestrialLocation(); result.getBoat().getBoatGroup(); } } @@ -733,9 +735,12 @@ if (ObsProgram.OBSDEB.equals(result.getObsProgram())) { result.sizeObservers(); - result.getObservationUnit(); - if (result.getObservationType() == ObservationType.PHONE_CALL) { + if (result.getObservationUnit() != null) { + result.getObservationUnit().getRegionIfremer(); + } + if (result.isPhoneCall()) { result.getBoat().getBoatGroup(); + result.getTerrestrialLocation(); } } else { result.sizeElligibleBoat(); Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/WaoActivationContext.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/WaoActivationContext.java 2011-06-08 08:06:04 UTC (rev 1324) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/WaoActivationContext.java 2011-06-08 09:52:47 UTC (rev 1325) @@ -36,15 +36,17 @@ protected static final String SAMPLE_ROW_ID = "sampleRowId"; protected static final String OBSERVATION_TYPE_NAME = "observationTypeName"; protected static final String BOAT_IMMATRICULATION = "boatImmatriculation"; + protected static final String SHIP_OWNER_NAME = "shipOwnerName"; protected static final List<String> VALID_KEYS = Arrays.asList( SAMPLE_ROW_CODE, SAMPLE_ROW_ID, OBSERVATION_TYPE_NAME, - BOAT_IMMATRICULATION); + BOAT_IMMATRICULATION, SHIP_OWNER_NAME); protected String sampleRowCode; protected String sampleRowId; protected ObservationType observationType; protected Integer boatImmatriculation; + protected String shipOwnerName; public static WaoActivationContext newEmptyContext() { WaoActivationContext newWaoActivationContext = new WaoActivationContext(); @@ -70,6 +72,7 @@ newWaoActivationContext.setObservationType(context.get(OBSERVATION_TYPE_NAME)); newWaoActivationContext.setSampleRowId(context.get(SAMPLE_ROW_ID)); newWaoActivationContext.setBoatImmatriculation(context.get(BOAT_IMMATRICULATION)); + newWaoActivationContext.setShipOwnerName(context.get(SHIP_OWNER_NAME)); return newWaoActivationContext; } @@ -94,6 +97,9 @@ context.put(BOAT_IMMATRICULATION, String.valueOf(boatImmatriculation)); } + if (shipOwnerName != null) { + context.put(SHIP_OWNER_NAME, shipOwnerName); + } String[] strings = new String[context.size() * 2]; int i = 0; for (Map.Entry<String, String> contextEntry : context.entrySet()) { @@ -148,4 +154,12 @@ public Integer getBoatImmatriculation() { return boatImmatriculation; } + + public String getShipOwnerName() { + return shipOwnerName; + } + + public void setShipOwnerName(String shipOwnerName) { + this.shipOwnerName = shipOwnerName; + } } 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-06-08 08:06:04 UTC (rev 1324) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Boats.java 2011-06-08 09:52:47 UTC (rev 1325) @@ -37,6 +37,7 @@ import fr.ifremer.wao.entity.Contact; import fr.ifremer.wao.entity.ElligibleBoat; import fr.ifremer.wao.entity.SampleRow; +import fr.ifremer.wao.entity.ShipOwner; import fr.ifremer.wao.service.ServiceBoat; import fr.ifremer.wao.service.ServiceContact; import fr.ifremer.wao.service.ServiceReferential; @@ -118,6 +119,8 @@ sampleRowContextId = waoActivationContext.getSampleRowCode(); getBoatFilter().setBoatImmatriculation( waoActivationContext.getBoatImmatriculation()); + getBoatFilter().setShipOwnerName( + waoActivationContext.getShipOwnerName()); } @Property @@ -444,6 +447,13 @@ this.company = company; } + public String[] getContextForShipOwner() { + ShipOwner shipOwner = getBoatInfos().getBoat().getShipOwner(); + String shipOwnerName = shipOwner.getFirstName() + " " + + shipOwner.getLastName(); + waoActivationContext.setShipOwnerName(shipOwnerName); + return waoActivationContext.toStrings(); + } /*@Persist private WaoPropertyChangeListener propertyChange;*/ Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ObsDebSamplingPlan.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ObsDebSamplingPlan.java 2011-06-08 08:06:04 UTC (rev 1324) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ObsDebSamplingPlan.java 2011-06-08 09:52:47 UTC (rev 1325) @@ -46,6 +46,7 @@ import fr.ifremer.wao.ui.services.WaoManager; import org.apache.tapestry5.Block; import org.apache.tapestry5.ComponentResources; +import org.apache.tapestry5.EventContext; import org.apache.tapestry5.StreamResponse; import org.apache.tapestry5.annotations.InjectComponent; import org.apache.tapestry5.annotations.Log; @@ -109,6 +110,12 @@ @Property private ConnectedUser connectedUser; + private WaoActivationContext waoActivationContext; + + void onActivate(EventContext ec) { + waoActivationContext = WaoActivationContext.newContextFromTapestry(ec); + } + //// actions of the sub-menu @Persist @@ -195,7 +202,11 @@ protected ObservationType getObservationType() { ObservationType observationType = samplingFilter.getFilter().getExpectedObservationType(); if (observationType == null) { - observationType = ObservationType.FIELD_WORK_OBSERVATION; + if (waoActivationContext.getObservationType() == null) { + observationType = ObservationType.FIELD_WORK_OBSERVATION; + } else { + observationType = waoActivationContext.getObservationType(); + } setObservationType(observationType); } return observationType; @@ -213,13 +224,11 @@ } public void onActionFromSwitchObservationType() { - ObservationType observationType = getObservationType(); - if (observationType == ObservationType.FIELD_WORK_OBSERVATION) { - observationType = ObservationType.PHONE_CALL; + if (showFieldWorkSamplingPlan()) { + setObservationType(ObservationType.PHONE_CALL); } else { - observationType = ObservationType.FIELD_WORK_OBSERVATION; + setObservationType(ObservationType.FIELD_WORK_OBSERVATION); } - setObservationType(observationType); } //// grid data @@ -309,6 +318,7 @@ public String[] getContextForEditingSampleRow() { WaoActivationContext waoActivationContext = WaoActivationContext.newEmptyContext(); waoActivationContext.setSampleRowId(sampleRow.getTopiaId()); + waoActivationContext.setObservationType(sampleRow.getObservationType()); return waoActivationContext.toStrings(); } Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowForm.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowForm.java 2011-06-08 08:06:04 UTC (rev 1324) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowForm.java 2011-06-08 09:52:47 UTC (rev 1325) @@ -876,6 +876,9 @@ @InjectPage private SamplingPlan samplingPlan; + @InjectPage + private ObsDebSamplingPlan obsDebSamplingPlan; + @Log Object onSuccessFromSampleRowForm() throws WaoException { if (cancel) { @@ -905,7 +908,8 @@ serviceSampling.createUpdateSampleRow(sampleRow, boats, getSampleRowLog(), user); if (user.isObsDeb()) { - return ObsDebSamplingPlan.class; + obsDebSamplingPlan.setObservationType(sampleRow.getObservationType()); + return obsDebSamplingPlan; } else { samplingPlan.setSelectedRowId(sampleRow.getTopiaId()); return samplingPlan; Modified: trunk/wao-ui/src/main/webapp/Boats.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Boats.tml 2011-06-08 08:06:04 UTC (rev 1324) +++ trunk/wao-ui/src/main/webapp/Boats.tml 2011-06-08 09:52:47 UTC (rev 1325) @@ -266,7 +266,9 @@ <div> <p> <label>${message:wao.ui.field.Boat.shipOwner} : </label> - ${boatInfos.boat.shipOwner.firstName} ${boatInfos.boat.shipOwner.lastName} + <a t:type="pagelink" t:page="boats" t:context="contextForShipOwner" title="${message:wao.ui.action.filter}" > + ${boatInfos.boat.shipOwner.firstName} ${boatInfos.boat.shipOwner.lastName} + </a> </p> <t:if t:test="boatSelected.fleet"> <p> Modified: trunk/wao-ui/src/main/webapp/ObsDebSamplingPlan.tml =================================================================== --- trunk/wao-ui/src/main/webapp/ObsDebSamplingPlan.tml 2011-06-08 08:06:04 UTC (rev 1324) +++ trunk/wao-ui/src/main/webapp/ObsDebSamplingPlan.tml 2011-06-08 09:52:47 UTC (rev 1325) @@ -53,7 +53,7 @@ t:page="sampleRowForm" t:context="contextForNewSampleRow" title="${message:wao.ui.samplingPlan.addSampleRow}"> - ${message:wao.ui.samplingPlan.addSampleRow} + ${message:wao.ui.samplingPlan.addSampleRow} </a> </li> <li> Modified: trunk/wao-ui/src/main/webapp/SampleRowForm.tml =================================================================== --- trunk/wao-ui/src/main/webapp/SampleRowForm.tml 2011-06-08 08:06:04 UTC (rev 1324) +++ trunk/wao-ui/src/main/webapp/SampleRowForm.tml 2011-06-08 09:52:47 UTC (rev 1325) @@ -59,7 +59,7 @@ <div class="t-beaneditor-row"> <label for="observers">${message:wao.ui.field.SampleRow.observers}</label> <t:topiaEntitySelector t:id="observers" - t:multiple="sampleRow.fieldWorkObservation" + t:multiple="true" t:clazzName="WaoUser" t:labelPropertyName="fullName" t:values="observers" Modified: trunk/wao-ui/src/main/webapp/Synthesis.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Synthesis.tml 2011-06-08 08:06:04 UTC (rev 1324) +++ trunk/wao-ui/src/main/webapp/Synthesis.tml 2011-06-08 09:52:47 UTC (rev 1325) @@ -51,7 +51,7 @@ </li> <li> <a t:type="actionlink" t:context="[actionSynthesisId,'DISTINCT_BOATS_COUNTS']" t:zone="so-synthesis-main" title="${message:SynthesisId.DISTINCT_BOATS_COUNTS}"> - <img src="${asset:context:}/img/synthesis-distinct-boats-counts.png" alt="${message:SynthesisId.DISTINCT_BOATS_COUNTS}" /> + <img src="${asset:context:}/img/synthesis-graph-boarding.png" alt="${message:SynthesisId.DISTINCT_BOATS_COUNTS}" /> </a> </li> <p:else> Added: trunk/wao-ui/src/main/webapp/img/synthesis-observation-hour.png =================================================================== (Binary files differ) Property changes on: trunk/wao-ui/src/main/webapp/img/synthesis-observation-hour.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream