Author: tchemit Date: 2014-03-26 18:14:02 +0100 (Wed, 26 Mar 2014) New Revision: 1761 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1761 Log: refs-40 #4483 (fix full-view compact-view) Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 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-26 17:12:39 UTC (rev 1760) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 2014-03-26 17:14:02 UTC (rev 1761) @@ -163,7 +163,7 @@ <td><s:text name="wao.ui.entity.FishingZone"/></td> <s:if test="fullView"> <td class="only-visible-fullview"><s:text name="wao.ui.samplingPlan.fishingZoneInfo"/></td> - <td class="only-visible-fullview"><s:text name="wao.ui.misc.METIER"/> <br/> <s:text name="wao.ui.field.SampleRow.dCF5Code"/></td> + <td class="only-visible-fullview"><s:text name="wao.ui.misc.METIER"/> <br/> <s:text name="wao.ui.field.SampleRow.dcf5Code"/></td> <td class="only-visible-fullview"><s:text name="wao.ui.misc.METIER"/> <br/> <s:text name="wao.ui.field.SampleRow.meshSize"/></td> <td class="only-visible-fullview"><s:text name="wao.ui.misc.METIER"/> <br/> <s:text name="wao.ui.field.SampleRow.size"/></td> <td class="only-visible-fullview"><s:text name="wao.ui.misc.METIER"/> <br/> <s:text name="wao.ui.field.SampleRow.other"/></td> @@ -173,8 +173,8 @@ <td class="only-visible-fullview"><s:text name="wao.ui.field.SampleRow.periodEnd"/></td> </s:if> <s:else> - <td><s:text name="wao.ui.misc.METIER"/> <br/> <s:text name="wao.ui.field.SampleRow.dCF5Code"/></td> - <td><s:text name="wao.ui.misc.METIER"/> <br/> <s:text name="wao.ui.field.SampleRow.libelle"/></td> + <td class="only-visible-compactview"><s:text name="wao.ui.misc.METIER"/> <br/> <s:text name="wao.ui.field.SampleRow.dcf5Code"/></td> + <td class="only-visible-compactview"><s:text name="wao.ui.misc.METIER"/> <br/> <s:text name="wao.ui.field.SampleRow.libelle"/></td> </s:else> <!-- Months columns --> @@ -216,12 +216,14 @@ <td><s:property value="#sampleRow.programName" /></td> <s:if test="fullView"> <td class="only-visible-fullview"><s:property value="#sampleRow.company.name" /></td> +</s:if> <td class="only-visible-fullview"><s:property value="#samplingPlanRow.fishingZones" /></td> +<s:if test="fullView"> <td class="only-visible-fullview"><s:property value="#sampleRow.fishingZonesInfos" /></td> <td class="only-visible-fullview"> - <s:iterator value="sampleRow.dcf5code" var="dcf5code"> + <s:iterator value="%{#sampleRow.getdCF5Code()}" var="dcf5code"> <span> - <s:property /> + <s:property value="code"/> </span> </s:iterator> </td> @@ -234,15 +236,17 @@ <td class="only-visible-fullview"><s:property value="%{formatMonth(#sampleRow.periodEnd)}" /></td> </s:if> <s:else> - <td><s:property value="#samplingPlanRow.fishingZones" /></td> - <td> - <s:iterator value="sampleRow.dcf5code" var="dcf5code"> + <td class="only-visible-compactview"> + <s:iterator value="%{#sampleRow.getdCF5Code()}" var="dcf5code"> <span> - <s:property /> + <s:property value="code"/> </span> </s:iterator> <s:property value="#sampleRow.professionDescriptionWithoutDCF5" /> </td> + <td class="only-visible-compactview"> + <s:property value="#row.profession.libelle" /> + </td> </s:else> <!-- Months columns --> <s:iterator value="samplingPlan.months" var="month">