From bleny@users.forge.codelutin.com Fri Mar 28 10:23:06 2014
From: bleny@users.forge.codelutin.com
To: wao-commits@list.forge.codelutin.com
Subject: [Wao-commits] r1770 - in trunk/wao-web/src/main/webapp/WEB-INF:
	content/obsmer decorators
Date: Fri, 28 Mar 2014 10:23:06 +0100
Message-ID: <20140328092306.7BBD9181487@nuiton.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6999055634365253414=="

--===============6999055634365253414==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Author: bleny
Date: 2014-03-28 10:23:06 +0100 (Fri, 28 Mar 2014)
New Revision: 1770

Url: http://forge.codelutin.com/projects/wao/repository/revisions/1770

Log:
refs #4483 implements compact/full view switch

Modified:
   trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp
   trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp

Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.=
jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp	20=
14-03-27 16:51:58 UTC (rev 1769)
+++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp	20=
14-03-28 09:23:06 UTC (rev 1770)
@@ -159,12 +159,12 @@
     </s:form>
=20
     <button type=3D"button" id=3D"switch-compact-full-view" class=3D"btn <s:=
if test=3D"fullView">full-view</s:if><s:else>compact-view</s:else>">
+        <span class=3D"only-in-compact-view">
+            <i class=3D"icon-resize-full"></i> <s:text name=3D"wao.ui.action=
.switchToFullView" />
+        </span>
         <span class=3D"only-in-full-view">
-            <i class=3D"icon-resize-small"></i> <s:text name=3D"wao.ui.actio=
n.switchToFullView" />
+            <i class=3D"icon-resize-small"></i> <s:text name=3D"wao.ui.actio=
n.switchToCompactView" />
         </span>
-        <span class=3D"only-in-compact-view">
-            <i class=3D"icon-resize-full"></i> <s:text name=3D"wao.ui.action=
.switchToCompactView" />
-        </span>
     </button>
=20
     <s:if test=3D"authenticatedWaoUser.authorizedToViewSamplingPlanReal">
@@ -182,19 +182,26 @@
         </s:a>
     </s:if>
=20
-<s:set var=3D"estimatedTides" value=3D"true"/>
-<s:set var=3D"fullView" value=3D"%{fullView}"/>
-<s:set var=3D"displayTidesReal" value=3D"true"/>
+<s:set var=3D"estimatedTides" value=3D"true" />
+<s:set var=3D"fullView" value=3D"%{fullView}" />
+<s:set var=3D"displayTidesReal" value=3D"true" />
=20
-<s:set var=3D"nbColumnsForProfession" value=3D"%{#fullView ? 13 : 5}"/>
-<s:set var=3D"nbColumnsForMonths" value=3D"%{samplingPlan.months.size() + 1}=
"/>
-<s:set var=3D"nbColumnsForOther" value=3D"6"/>
-<s:set var=3D"nbColumnsTotal" value=3D"%{#nbColumnsForProfession + #nbColumn=
sForMonths + #nbColumnsForOther}"/>
+<s:set var=3D"nbColumnsForProfessionInFullView" value=3D"13" />
+<s:set var=3D"nbColumnsForProfessionInCompactView" value=3D"5" />
+<s:set var=3D"nbColumnsForMonths" value=3D"%{samplingPlan.months.size() + 1}=
" />
+<s:set var=3D"nbColumnsForOther" value=3D"6" />
+<s:set var=3D"nbColumnsTotalInFullView" value=3D"%{#nbColumnsForProfessionIn=
FullView + #nbColumnsForMonths + #nbColumnsForOther}" />
+<s:set var=3D"nbColumnsTotalInCompactView" value=3D"%{#nbColumnsForProfessio=
nInCompactView + #nbColumnsForMonths + #nbColumnsForOther}" />
=20
     <table id=3D"sampling-plan" class=3D"large-table sampling-plan show-esti=
mated <s:if test=3D"fullView">full-view</s:if><s:else>compact-view</s:else>">
         <thead>
             <tr>
-                <th colspan=3D"${nbColumnsForProfession}"> <s:text name=3D"w=
ao.ui.samplingPlan.sampledProfessions" /></th>
+                <th colspan=3D"<s:property value=3D"#nbColumnsForProfessionI=
nFullView" />" class=3D"only-in-full-view">
+                    <s:text name=3D"wao.ui.samplingPlan.sampledProfessions" =
/>
+                </th>
+                <th colspan=3D"<s:property value=3D"#nbColumnsForProfessionI=
nCompactView" />" class=3D"only-in-compact-view">
+                    <s:text name=3D"wao.ui.samplingPlan.sampledProfessions" =
/>
+                </th>
                 <th colspan=3D"${nbColumnsForMonths}">
                     <s:text name=3D"wao.ui.samplingPlan.effort" />
=20
@@ -217,26 +224,20 @@
                 <!-- Profession columns -->
                 <th><s:text name=3D"wao.ui.field.SampleRow.code"/></th>
                 <th><s:text name=3D"wao.ui.samplingPlan.program"/></th>
-<s:if test=3D"fullView">
-                <th class=3D"only-visible-fullview"><s:text name=3D"wao.ui.e=
ntity.Company"/></th>
-</s:if>
+                <th class=3D"only-in-full-view"><s:text name=3D"wao.ui.entit=
y.Company"/></th>
                 <th><s:text name=3D"wao.ui.entity.FishingZone"/></th>
-<s:if test=3D"fullView">
-                <th class=3D"only-visible-fullview"><s:text name=3D"wao.ui.s=
amplingPlan.fishingZoneInfo"/></th>
-                <th class=3D"only-visible-fullview"><s:text name=3D"wao.ui.m=
isc.METIER"/> <br/> <s:text name=3D"wao.ui.field.SampleRow.dcf5Code"/></th>
-                <th class=3D"only-visible-fullview"><s:text name=3D"wao.ui.m=
isc.METIER"/> <br/> <s:text name=3D"wao.ui.field.SampleRow.meshSize"/></th>
-                <th class=3D"only-visible-fullview"><s:text name=3D"wao.ui.m=
isc.METIER"/> <br/> <s:text name=3D"wao.ui.field.SampleRow.size"/></th>
-                <th class=3D"only-visible-fullview"><s:text name=3D"wao.ui.m=
isc.METIER"/> <br/> <s:text name=3D"wao.ui.field.SampleRow.other"/></th>
-                <th class=3D"only-visible-fullview"><s:text name=3D"wao.ui.m=
isc.METIER"/> <br/> <s:text name=3D"wao.ui.field.SampleRow.libelle"/></th>
-                <th class=3D"only-visible-fullview"><s:text name=3D"wao.ui.m=
isc.METIER"/> <br/> <s:text name=3D"wao.ui.field.SampleRow.species"/></th>
-                <th class=3D"only-visible-fullview"><s:text name=3D"wao.ui.f=
ield.SampleRow.periodBegin"/></th>
-                <th class=3D"only-visible-fullview"><s:text name=3D"wao.ui.f=
ield.SampleRow.periodEnd"/></th>
-</s:if>
-<s:else>
-                <th class=3D"only-visible-compactview"><s:text name=3D"wao.u=
i.misc.METIER"/> <br/> <s:text name=3D"wao.ui.field.SampleRow.dcf5Code"/></th>
-                <th class=3D"only-visible-compactview"><s:text name=3D"wao.u=
i.misc.METIER"/> <br/> <s:text name=3D"wao.ui.field.SampleRow.libelle"/></th>
-</s:else>
-   =20
+                <th class=3D"only-in-full-view"><s:text name=3D"wao.ui.sampl=
ingPlan.fishingZoneInfo"/></th>
+                <th class=3D"only-in-full-view"><s:text name=3D"wao.ui.misc.=
METIER"/> <br/> <s:text name=3D"wao.ui.field.SampleRow.dcf5Code"/></th>
+                <th class=3D"only-in-full-view"><s:text name=3D"wao.ui.misc.=
METIER"/> <br/> <s:text name=3D"wao.ui.field.SampleRow.meshSize"/></th>
+                <th class=3D"only-in-full-view"><s:text name=3D"wao.ui.misc.=
METIER"/> <br/> <s:text name=3D"wao.ui.field.SampleRow.size"/></th>
+                <th class=3D"only-in-full-view"><s:text name=3D"wao.ui.misc.=
METIER"/> <br/> <s:text name=3D"wao.ui.field.SampleRow.other"/></th>
+                <th class=3D"only-in-full-view"><s:text name=3D"wao.ui.misc.=
METIER"/> <br/> <s:text name=3D"wao.ui.field.SampleRow.libelle"/></th>
+                <th class=3D"only-in-full-view"><s:text name=3D"wao.ui.misc.=
METIER"/> <br/> <s:text name=3D"wao.ui.field.SampleRow.species"/></th>
+                <th class=3D"only-in-full-view"><s:text name=3D"wao.ui.field=
.SampleRow.periodBegin"/></th>
+                <th class=3D"only-in-full-view"><s:text name=3D"wao.ui.field=
.SampleRow.periodEnd"/></th>
+                <th class=3D"only-in-compact-view"><s:text name=3D"wao.ui.mi=
sc.METIER"/> <br/> <s:text name=3D"wao.ui.field.SampleRow.dcf5Code"/></th>
+                <th class=3D"only-in-compact-view"><s:text name=3D"wao.ui.mi=
sc.METIER"/> <br/> <s:text name=3D"wao.ui.field.SampleRow.libelle"/></th>
+
                 <!-- Months columns -->
                 <s:iterator value=3D"samplingPlan.months" var=3D"month">
                     <th class=3D"effort <s:if test=3D"@fr.ifremer.wao.WaoUti=
ls@isCurrentMonth(#month)"> now</s:if>">
@@ -267,13 +268,25 @@
 <%--Iterate on Facades--%>
 <s:iterator value=3D"samplingPlan" var=3D"samplingPlanFacade">
             <tr class=3D"facade-row">
-                <th colspan=3D"${nbColumnsTotal}" class=3D"facade"><s:proper=
ty value=3D"%{#samplingPlanFacade.facade}"/></td>
+                <th colspan=3D"${nbColumnsTotalInFullView}" class=3D"facade =
only-in-full-view">
+                    <s:property value=3D"%{#samplingPlanFacade.facade}"/>
+                </th>
+                <th colspan=3D"${nbColumnsTotalInCompactView}" class=3D"faca=
de only-in-compact-view">
+                    <s:property value=3D"%{#samplingPlanFacade.facade}"/>
+                </th>
             </tr>
 <%--Iterate on Sectors --%>
 <s:iterator value=3D"samplingPlanFacade" var=3D"samplingPlanSector">
             <tr class=3D"sector-row">
-                <th colspan=3D"${nbColumnsTotal}" class=3D"sector"><s:proper=
ty value=3D"%{#samplingPlanSector.sectors}"/></td>
+                <th colspan=3D"${nbColumnsTotalInFullView}" class=3D"sector =
only-in-full-view">
+                    <s:property value=3D"%{#samplingPlanSector.sectors}"/>
+                </th>
             </tr>
+            <tr class=3D"sector-row">
+                <th colspan=3D"${nbColumnsTotalInCompactView}" class=3D"sect=
or only-in-compact-view">
+                    <s:property value=3D"%{#samplingPlanSector.sectors}"/>
+                </th>
+            </tr>
 <%--Iterate on SampleRows --%>
 <s:iterator value=3D"samplingPlanSector" var=3D"samplingPlanRow">
             <tr class=3D"sample-row-row<s:if test=3D"sampleRowToHighlightId.=
equals(topiaId)"> highlight</s:if>">
@@ -281,29 +294,24 @@
                     <s:property value=3D"code" />
                 </th>
                 <td><s:property value=3D"programName" /></td>
-<s:if test=3D"fullView">
-                <td class=3D"only-visible-fullview"><s:property value=3D"com=
panyName" /></td>
-</s:if>
-                <td class=3D"only-visible-fullview"><s:property value=3D"fis=
hingZones" /></td>
-<s:if test=3D"fullView">
-                <td class=3D"only-visible-fullview"><s:property value=3D"fis=
hingZonesInfos" /></td>
-                <td class=3D"only-visible-fullview">
+                <td class=3D"only-in-full-view"><s:property value=3D"company=
Name" /></td>
+                <td><s:property value=3D"fishingZones" /></td>
+                <td class=3D"only-in-full-view"><s:property value=3D"fishing=
ZonesInfos" /></td>
+                <td class=3D"only-in-full-view">
                     <s:iterator value=3D"dcf5CodesAndDescriptions">
                         <span>
                             <s:property value=3D"key"/>
                         </span>
                     </s:iterator>
                 </td>
-                <td class=3D"only-visible-fullview"><s:property value=3D"pro=
fessionMeshSize" /></td>
-                <td class=3D"only-visible-fullview"><s:property value=3D"pro=
fessionSize" /></td>
-                <td class=3D"only-visible-fullview"><s:property value=3D"pro=
fessionOther" /></td>
-                <td class=3D"only-visible-fullview"><s:property value=3D"pro=
fessionLibelle" /></td>
-                <td class=3D"only-visible-fullview"><s:property value=3D"pro=
fessionSpecies" /></td>
-                <td class=3D"only-visible-fullview"><s:property value=3D"%{f=
ormatMonth(periodBegin)}" /></td>
-                <td class=3D"only-visible-fullview"><s:property value=3D"%{f=
ormatMonth(periodEnd)}" /></td>
-</s:if>
-<s:else>
-                <td class=3D"only-visible-compactview">
+                <td class=3D"only-in-full-view"><s:property value=3D"profess=
ionMeshSize" /></td>
+                <td class=3D"only-in-full-view"><s:property value=3D"profess=
ionSize" /></td>
+                <td class=3D"only-in-full-view"><s:property value=3D"profess=
ionOther" /></td>
+                <td class=3D"only-in-full-view"><s:property value=3D"profess=
ionLibelle" /></td>
+                <td class=3D"only-in-full-view"><s:property value=3D"profess=
ionSpecies" /></td>
+                <td class=3D"only-in-full-view"><s:property value=3D"%{forma=
tMonth(periodBegin)}" /></td>
+                <td class=3D"only-in-full-view"><s:property value=3D"%{forma=
tMonth(periodEnd)}" /></td>
+                <td class=3D"only-in-compact-view">
                     <s:iterator value=3D"dcf5CodesAndDescriptions">
                         <span>
                             <s:property value=3D"key"/>
@@ -311,10 +319,9 @@
                     </s:iterator>
                     <s:property value=3D"professionDescriptionWithoutDCF5" />
                 </td>
-                <td class=3D"only-visible-compactview">
+                <td class=3D"only-in-compact-view">
                     <s:property value=3D"professionLibelle" />
                 </td>
-</s:else>
                 <!-- Months columns -->
 <s:iterator value=3D"samplingPlan.months" var=3D"month">
                 <s:set var=3D"expected" value=3D"%{getNbTidesExpected(#month=
)}"/>
@@ -447,9 +454,12 @@
=20
         </todby>
         <tfoot>
-            <th colspan=3D"${nbColumnsForProfession}">
+            <th colspan=3D"<s:property value=3D"#nbColumnsForProfessionInFul=
lView" />" class=3D"only-in-full-view">
                 <s:text name=3D"wao.ui.misc.totals" />
             </th>
+            <th colspan=3D"<s:property value=3D"#nbColumnsForProfessionInCom=
pactView" />" class=3D"only-in-compact-view">
+                <s:text name=3D"wao.ui.misc.totals" />
+            </th>
             <!-- Months columns -->
             <s:iterator value=3D"samplingPlan.months" var=3D"month">
                 <td class=3D"effort<s:if test=3D"@fr.ifremer.wao.WaoUtils@is=
CurrentMonth(#month)"> now</s:if>">
@@ -489,7 +499,7 @@
                     <s:property value=3D"samplingPlan.highTotalRatio" />
                 </s:if>
             </td>
-            <td>
+            <td class=3D"effort">
                 <s:set var=3D"expected" value=3D"%{samplingPlan.observationT=
imesInDaysTotalExpected}"/>
                 <s:set var=3D"estimated" value=3D"%{samplingPlan.observation=
TimesInDaysTotalEstimated}"/>
                 <s:set var=3D"real" value=3D"%{samplingPlan.observationTimes=
InDaysTotalReal}"/>

Modified: trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp	2014-03-27 16=
:51:58 UTC (rev 1769)
+++ trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp	2014-03-28 09=
:23:06 UTC (rev 1770)
@@ -75,7 +75,7 @@
                     <li>
                         <s:url namespace=3D"/%{obsProgram.name().toLowerCase=
()}" action=3D"synthesis" id=3D"synthesisUrl" />
                         <s:a href=3D"%{synthesisUrl}">
-                            <s:text name=3D"wao.ui.page.Synthesis.title" />
+                            <i class=3D"icon-signal"></i> <s:text name=3D"wa=
o.ui.page.Synthesis.title" />
                         </s:a>
                     </li>
                 </ul>


--===============6999055634365253414==--