Author: tchemit Date: 2014-03-31 11:16:40 +0200 (Mon, 31 Mar 2014) New Revision: 1774 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1774 Log: refs #4483 (ajout info pour tooltips) Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlan.java trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlan.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlan.java 2014-03-31 09:10:25 UTC (rev 1773) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlan.java 2014-03-31 09:16:40 UTC (rev 1774) @@ -35,6 +35,7 @@ import java.util.Iterator; import java.util.LinkedHashMap; import java.util.List; +import java.util.Locale; import java.util.Map; public class ObsMerSamplingPlan implements Iterable<ObsMerSamplingPlan.ObsMerSamplingPlanFacadePart>, Serializable { @@ -42,6 +43,11 @@ private static final long serialVersionUID = 1L; /** + * Locale used by this sampling plan. Need to be here as part of future cache index. + */ + protected Locale locale; + + /** * All facades of the sampling plan. */ protected Collection<ObsMerSamplingPlanFacadePart> facades; Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 2014-03-31 09:10:25 UTC (rev 1773) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 2014-03-31 09:16:40 UTC (rev 1774) @@ -291,12 +291,16 @@ </th> <td><s:property value="programName" /></td> <td class="only-in-full-view"><s:property value="companyName" /></td> - <td><s:property value="fishingZones" /></td> + <td class="only-in-full-view"><s:property value="fishingZones" /></td> + <td class="only-in-compact-view"> + <s:property value="fishingZones" /> + (<s:property value="fishingZonesInfos" />) + </td> <td class="only-in-full-view"><s:property value="fishingZonesInfos" /></td> <td class="only-in-full-view"> <s:iterator value="dcf5CodesAndDescriptions"> <span> - <s:property value="key"/> + <s:property value="key"/> (<s:property value="value"/>) </span> </s:iterator> </td> @@ -310,13 +314,13 @@ <td class="only-in-compact-view"> <s:iterator value="dcf5CodesAndDescriptions"> <span> - <s:property value="key"/> + <s:property value="key"/> (<s:property value="value"/>) </span> </s:iterator> <s:property value="professionDescriptionWithoutDCF5" /> </td> <td class="only-in-compact-view"> - <s:property value="professionLibelle" /> + <s:property value="professionLibelle" /> (<s:property value="professionSpecies" />) </td> <!-- Months columns --> <s:iterator value="samplingPlan.months" var="month"> @@ -344,7 +348,7 @@ <s:property value="totalTidesEstimated" /> </span> <span class="real<s:if test="totalTidesReal < totalTidesExpected"> lower-than-expected</s:if><s:if test="totalTidesReal > totalTidesExpected"> higher-than-expected</s:if>"> - <s:property value="totalTidesReal" /> + <s:property value="totalTidesReal" /> (Total sur la période du ... au ...) </span> / </s:if>