r1770 - in trunk/wao-web/src/main/webapp/WEB-INF: content/obsmer decorators - Wao-commits

28 Mar 2014

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
===================================================================

--- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp	2014-03-27 16:51:58 UTC (rev 1769)
+++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp	2014-03-28 09:23:06 UTC (rev 1770)
@@ -159,12 +159,12 @@
     </s:form>
 
     <button type="button" id="switch-compact-full-view" class="btn <s:if test="fullView">full-view</s:if><s:else>compact-view</s:else>">
+        <span class="only-in-compact-view">
+            <i class="icon-resize-full"></i> <s:text name="wao.ui.action.switchToFullView" />
+        </span>
         <span class="only-in-full-view">
-            <i class="icon-resize-small"></i> <s:text name="wao.ui.action.switchToFullView" />
+            <i class="icon-resize-small"></i> <s:text name="wao.ui.action.switchToCompactView" />
         </span>
-        <span class="only-in-compact-view">
-            <i class="icon-resize-full"></i> <s:text name="wao.ui.action.switchToCompactView" />
-        </span>
     </button>
 
     <s:if test="authenticatedWaoUser.authorizedToViewSamplingPlanReal">
@@ -182,19 +182,26 @@
         </s:a>
     </s:if>
 
-<s:set var="estimatedTides" value="true"/>
-<s:set var="fullView" value="%{fullView}"/>
-<s:set var="displayTidesReal" value="true"/>
+<s:set var="estimatedTides" value="true" />
+<s:set var="fullView" value="%{fullView}" />
+<s:set var="displayTidesReal" value="true" />
 
-<s:set var="nbColumnsForProfession" value="%{#fullView ? 13 : 5}"/>
-<s:set var="nbColumnsForMonths" value="%{samplingPlan.months.size() + 1}"/>
-<s:set var="nbColumnsForOther" value="6"/>
-<s:set var="nbColumnsTotal" value="%{#nbColumnsForProfession + #nbColumnsForMonths + #nbColumnsForOther}"/>
+<s:set var="nbColumnsForProfessionInFullView" value="13" />
+<s:set var="nbColumnsForProfessionInCompactView" value="5" />
+<s:set var="nbColumnsForMonths" value="%{samplingPlan.months.size() + 1}" />
+<s:set var="nbColumnsForOther" value="6" />
+<s:set var="nbColumnsTotalInFullView" value="%{#nbColumnsForProfessionInFullView + #nbColumnsForMonths + #nbColumnsForOther}" />
+<s:set var="nbColumnsTotalInCompactView" value="%{#nbColumnsForProfessionInCompactView + #nbColumnsForMonths + #nbColumnsForOther}" />
 
     <table id="sampling-plan" class="large-table sampling-plan show-estimated <s:if test="fullView">full-view</s:if><s:else>compact-view</s:else>">
         <thead>
             <tr>
-                <th colspan="${nbColumnsForProfession}"> <s:text name="wao.ui.samplingPlan.sampledProfessions" /></th>
+                <th colspan="<s:property value="#nbColumnsForProfessionInFullView" />" class="only-in-full-view">
+                    <s:text name="wao.ui.samplingPlan.sampledProfessions" />
+                </th>
+                <th colspan="<s:property value="#nbColumnsForProfessionInCompactView" />" class="only-in-compact-view">
+                    <s:text name="wao.ui.samplingPlan.sampledProfessions" />
+                </th>
                 <th colspan="${nbColumnsForMonths}">
                     <s:text name="wao.ui.samplingPlan.effort" />
 
@@ -217,26 +224,20 @@
                 <!-- Profession columns -->
                 <th><s:text name="wao.ui.field.SampleRow.code"/></th>
                 <th><s:text name="wao.ui.samplingPlan.program"/></th>
-<s:if test="fullView">
-                <th class="only-visible-fullview"><s:text name="wao.ui.entity.Company"/></th>
-</s:if>
+                <th class="only-in-full-view"><s:text name="wao.ui.entity.Company"/></th>
                 <th><s:text name="wao.ui.entity.FishingZone"/></th>
-<s:if test="fullView">
-                <th class="only-visible-fullview"><s:text name="wao.ui.samplingPlan.fishingZoneInfo"/></th>
-                <th class="only-visible-fullview"><s:text name="wao.ui.misc.METIER"/> <br/> <s:text name="wao.ui.field.SampleRow.dcf5Code"/></th>
-                <th class="only-visible-fullview"><s:text name="wao.ui.misc.METIER"/> <br/> <s:text name="wao.ui.field.SampleRow.meshSize"/></th>
-                <th class="only-visible-fullview"><s:text name="wao.ui.misc.METIER"/> <br/> <s:text name="wao.ui.field.SampleRow.size"/></th>
-                <th class="only-visible-fullview"><s:text name="wao.ui.misc.METIER"/> <br/> <s:text name="wao.ui.field.SampleRow.other"/></th>
-                <th class="only-visible-fullview"><s:text name="wao.ui.misc.METIER"/> <br/> <s:text name="wao.ui.field.SampleRow.libelle"/></th>
-                <th class="only-visible-fullview"><s:text name="wao.ui.misc.METIER"/> <br/> <s:text name="wao.ui.field.SampleRow.species"/></th>
-                <th class="only-visible-fullview"><s:text name="wao.ui.field.SampleRow.periodBegin"/></th>
-                <th class="only-visible-fullview"><s:text name="wao.ui.field.SampleRow.periodEnd"/></th>
-</s:if>
-<s:else>
-                <th class="only-visible-compactview"><s:text name="wao.ui.misc.METIER"/> <br/> <s:text name="wao.ui.field.SampleRow.dcf5Code"/></th>
-                <th class="only-visible-compactview"><s:text name="wao.ui.misc.METIER"/> <br/> <s:text name="wao.ui.field.SampleRow.libelle"/></th>
-</s:else>
-    
+                <th class="only-in-full-view"><s:text name="wao.ui.samplingPlan.fishingZoneInfo"/></th>
+                <th class="only-in-full-view"><s:text name="wao.ui.misc.METIER"/> <br/> <s:text name="wao.ui.field.SampleRow.dcf5Code"/></th>
+                <th class="only-in-full-view"><s:text name="wao.ui.misc.METIER"/> <br/> <s:text name="wao.ui.field.SampleRow.meshSize"/></th>
+                <th class="only-in-full-view"><s:text name="wao.ui.misc.METIER"/> <br/> <s:text name="wao.ui.field.SampleRow.size"/></th>
+                <th class="only-in-full-view"><s:text name="wao.ui.misc.METIER"/> <br/> <s:text name="wao.ui.field.SampleRow.other"/></th>
+                <th class="only-in-full-view"><s:text name="wao.ui.misc.METIER"/> <br/> <s:text name="wao.ui.field.SampleRow.libelle"/></th>
+                <th class="only-in-full-view"><s:text name="wao.ui.misc.METIER"/> <br/> <s:text name="wao.ui.field.SampleRow.species"/></th>
+                <th class="only-in-full-view"><s:text name="wao.ui.field.SampleRow.periodBegin"/></th>
+                <th class="only-in-full-view"><s:text name="wao.ui.field.SampleRow.periodEnd"/></th>
+                <th class="only-in-compact-view"><s:text name="wao.ui.misc.METIER"/> <br/> <s:text name="wao.ui.field.SampleRow.dcf5Code"/></th>
+                <th class="only-in-compact-view"><s:text name="wao.ui.misc.METIER"/> <br/> <s:text name="wao.ui.field.SampleRow.libelle"/></th>
+
                 <!-- Months columns -->
                 <s:iterator value="samplingPlan.months" var="month">
                     <th class="effort <s:if test="@fr.ifremer.wao.WaoUtils@isCurrentMonth(#month)"> now</s:if>">
@@ -267,13 +268,25 @@
 <%--Iterate on Facades--%>
 <s:iterator value="samplingPlan" var="samplingPlanFacade">
             <tr class="facade-row">
-                <th colspan="${nbColumnsTotal}" class="facade"><s:property value="%{#samplingPlanFacade.facade}"/></td>
+                <th colspan="${nbColumnsTotalInFullView}" class="facade only-in-full-view">
+                    <s:property value="%{#samplingPlanFacade.facade}"/>
+                </th>
+                <th colspan="${nbColumnsTotalInCompactView}" class="facade only-in-compact-view">
+                    <s:property value="%{#samplingPlanFacade.facade}"/>
+                </th>
             </tr>
 <%--Iterate on Sectors --%>
 <s:iterator value="samplingPlanFacade" var="samplingPlanSector">
             <tr class="sector-row">
-                <th colspan="${nbColumnsTotal}" class="sector"><s:property value="%{#samplingPlanSector.sectors}"/></td>
+                <th colspan="${nbColumnsTotalInFullView}" class="sector only-in-full-view">
+                    <s:property value="%{#samplingPlanSector.sectors}"/>
+                </th>
             </tr>
+            <tr class="sector-row">
+                <th colspan="${nbColumnsTotalInCompactView}" class="sector only-in-compact-view">
+                    <s:property value="%{#samplingPlanSector.sectors}"/>
+                </th>
+            </tr>
 <%--Iterate on SampleRows --%>
 <s:iterator value="samplingPlanSector" var="samplingPlanRow">
             <tr class="sample-row-row<s:if test="sampleRowToHighlightId.equals(topiaId)"> highlight</s:if>">
@@ -281,29 +294,24 @@
                     <s:property value="code" />
                 </th>
                 <td><s:property value="programName" /></td>
-<s:if test="fullView">
-                <td class="only-visible-fullview"><s:property value="companyName" /></td>
-</s:if>
-                <td class="only-visible-fullview"><s:property value="fishingZones" /></td>
-<s:if test="fullView">
-                <td class="only-visible-fullview"><s:property value="fishingZonesInfos" /></td>
-                <td class="only-visible-fullview">
+                <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="fishingZonesInfos" /></td>
+                <td class="only-in-full-view">
                     <s:iterator value="dcf5CodesAndDescriptions">
                         <span>
                             <s:property value="key"/>
                         </span>
                     </s:iterator>
                 </td>
-                <td class="only-visible-fullview"><s:property value="professionMeshSize" /></td>
-                <td class="only-visible-fullview"><s:property value="professionSize" /></td>
-                <td class="only-visible-fullview"><s:property value="professionOther" /></td>
-                <td class="only-visible-fullview"><s:property value="professionLibelle" /></td>
-                <td class="only-visible-fullview"><s:property value="professionSpecies" /></td>
-                <td class="only-visible-fullview"><s:property value="%{formatMonth(periodBegin)}" /></td>
-                <td class="only-visible-fullview"><s:property value="%{formatMonth(periodEnd)}" /></td>
-</s:if>
-<s:else>
-                <td class="only-visible-compactview">
+                <td class="only-in-full-view"><s:property value="professionMeshSize" /></td>
+                <td class="only-in-full-view"><s:property value="professionSize" /></td>
+                <td class="only-in-full-view"><s:property value="professionOther" /></td>
+                <td class="only-in-full-view"><s:property value="professionLibelle" /></td>
+                <td class="only-in-full-view"><s:property value="professionSpecies" /></td>
+                <td class="only-in-full-view"><s:property value="%{formatMonth(periodBegin)}" /></td>
+                <td class="only-in-full-view"><s:property value="%{formatMonth(periodEnd)}" /></td>
+                <td class="only-in-compact-view">
                     <s:iterator value="dcf5CodesAndDescriptions">
                         <span>
                             <s:property value="key"/>
@@ -311,10 +319,9 @@
                     </s:iterator>
                     <s:property value="professionDescriptionWithoutDCF5" />
                 </td>
-                <td class="only-visible-compactview">
+                <td class="only-in-compact-view">
                     <s:property value="professionLibelle" />
                 </td>
-</s:else>
                 <!-- Months columns -->
 <s:iterator value="samplingPlan.months" var="month">
                 <s:set var="expected" value="%{getNbTidesExpected(#month)}"/>
@@ -447,9 +454,12 @@
 
         </todby>
         <tfoot>
-            <th colspan="${nbColumnsForProfession}">
+            <th colspan="<s:property value="#nbColumnsForProfessionInFullView" />" class="only-in-full-view">
                 <s:text name="wao.ui.misc.totals" />
             </th>
+            <th colspan="<s:property value="#nbColumnsForProfessionInCompactView" />" class="only-in-compact-view">
+                <s:text name="wao.ui.misc.totals" />
+            </th>
             <!-- Months columns -->
             <s:iterator value="samplingPlan.months" var="month">
                 <td class="effort<s:if test="@fr.ifremer.wao.WaoUtils@isCurrentMonth(#month)"> now</s:if>">
@@ -489,7 +499,7 @@
                     <s:property value="samplingPlan.highTotalRatio" />
                 </s:if>
             </td>
-            <td>
+            <td class="effort">
                 <s:set var="expected" value="%{samplingPlan.observationTimesInDaysTotalExpected}"/>
                 <s:set var="estimated" value="%{samplingPlan.observationTimesInDaysTotalEstimated}"/>
                 <s:set var="real" value="%{samplingPlan.observationTimesInDaysTotalReal}"/>

Modified: trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp
===================================================================
--- 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="/%{obsProgram.name().toLowerCase()}" action="synthesis" id="synthesisUrl" />
                         <s:a href="%{synthesisUrl}">
-                            <s:text name="wao.ui.page.Synthesis.title" />
+                            <i class="icon-signal"></i> <s:text name="wao.ui.page.Synthesis.title" />
                         </s:a>
                     </li>
                 </ul>

    

r1770 - in trunk/wao-web/src/main/webapp/WEB-INF: content/obsmer decorators

bleny＠users.forge.codelutin.com

tags

participants (1)