March 2014 - Wao-commits - mailman.cloud.codelutin.com

r1774 - in trunk: wao-services/src/main/java/fr/ifremer/wao/services/service wao-web/src/main/webapp/WEB-INF/content/obsmer
by tchemit＠users.forge.codelutin.com 31 Mar '14

31 Mar '14

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"> - <s:property value="key"/> + <s:property value="key"/> (<s:property value="value"/>) </s:iterator> </td> @@ -310,13 +314,13 @@ <td class="only-in-compact-view"> <s:iterator value="dcf5CodesAndDescriptions"> - <s:property value="key"/> + <s:property value="key"/> (<s:property value="value"/>) </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>  <s:iterator value="samplingPlan.months" var="month"> @@ -344,7 +348,7 @@ <s:property value="totalTidesEstimated" /> 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 ...) / </s:if>

1 0

r1773 - in trunk/wao-web/src/main/webapp: WEB-INF/content/obsmer css
by bleny＠users.forge.codelutin.com 31 Mar '14

31 Mar '14

Author: bleny Date: 2014-03-31 11:10:25 +0200 (Mon, 31 Mar 2014) New Revision: 1773 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1773 Log: refs #4483 some styles Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp trunk/wao-web/src/main/webapp/css/wao.css 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-28 10:24:41 UTC (rev 1772) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 2014-03-31 09:10:25 UTC (rev 1773) @@ -58,10 +58,6 @@ <content tag="mainClass">large</content> - <h1> - <s:text name="wao.ui.page.SamplingPlan.title" /> - </h1> - <s:form method="GET" id="sampling-plan-filters-form" cssClass="filters-form"> <fieldset> @@ -139,7 +135,7 @@ </fieldset> - <div class="form-actions" style="clear: both;"> + <div class="form-actions"> <s:url action="sampling-plan" id="samplingPlanUrl" /> <s:a href="%{samplingPlanUrl}" cssClass="btn"> @@ -486,12 +482,11 @@ <s:property value="#expected"/> <s:if test="authenticatedWaoUser.authorizedToViewSamplingPlanReal"> - <s:property value="samplingPlan.getTotalEstimatedRatio(#month)"/> + (<s:property value="samplingPlan.getTotalEstimatedRatio(#month)"/>) - <s:property value="samplingPlan.getTotalRealRatio(#month)"/> + (<s:property value="samplingPlan.getTotalRealRatio(#month)"/>) - </s:if> </td> </s:iterator> @@ -511,12 +506,11 @@ <s:property value="#expected"/> <s:if test="authenticatedWaoUser.authorizedToViewSamplingPlanReal"> - <s:property value="samplingPlan.highTotalEstimatedRatio"/> + (<s:property value="samplingPlan.highTotalEstimatedRatio"/>) - <s:property value="samplingPlan.highTotalRealRatio"/> + (<s:property value="samplingPlan.highTotalRealRatio"/>) - </s:if> </td> <td class="effort"> Modified: trunk/wao-web/src/main/webapp/css/wao.css =================================================================== --- trunk/wao-web/src/main/webapp/css/wao.css 2014-03-28 10:24:41 UTC (rev 1772) +++ trunk/wao-web/src/main/webapp/css/wao.css 2014-03-31 09:10:25 UTC (rev 1773) @@ -81,7 +81,22 @@ text-overflow: initial; } +.compact-view .only-in-full-view, +.full-view .only-in-compact-view, +.show-estimated .real, +.show-real .estimated { + display: none; +} +.effort .lower-than-expected { + color : red; +} + +.effort .higher-than-expected { + color : green; +} + + /****************************************************************************** * Styles globaux à l'application *****************************************************************************/ @@ -170,6 +185,13 @@ margin-right: 5px; } +form.filters-form .form-actions { + clear: both; + margin-top: 0px; + border: none; + background-color: white; +} + /****************************************************************************** * Styles spécifiques pour certaines pages de l'appli *****************************************************************************/ @@ -230,21 +252,11 @@ background-color: beige; } -.compact-view .only-in-full-view, -.full-view .only-in-compact-view, -.show-estimated .real, -.show-real .estimated { - display: none; +table.sampling-plan td.effort { + text-align: center; } -td.effort .lower-than-expected { - color : red; +table.sampling-plan .actions .dropdown-menu { + left: -200px } -td.effort .higher-than-expected { - color : green; -} - -td.effort { - text-align: center; -} \ No newline at end of file

1 0

r1772 - in trunk: wao-services/src/main/java/fr/ifremer/wao/services/service wao-web/src/main/webapp/WEB-INF/content/obsmer
by tchemit＠users.forge.codelutin.com 28 Mar '14

28 Mar '14

Author: tchemit Date: 2014-03-28 11:24:41 +0100 (Fri, 28 Mar 2014) New Revision: 1772 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1772 Log: refs #4483 add esitmated and real ratio 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-28 09:59:05 UTC (rev 1771) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlan.java 2014-03-28 10:24:41 UTC (rev 1772) @@ -138,11 +138,16 @@ return result; } - public String getTotalRatio(Date month) { - String result = totalsPerMonth.get(month).getRatio("-"); + public String getTotalRealRatio(Date month) { + String result = totalsPerMonth.get(month).getRealRatio("-"); return result; } + public String getTotalEstimatedRatio(Date month) { + String result = totalsPerMonth.get(month).getRealRatio("-"); + return result; + } + public Integer getHighTotalExpected() { return highTotals.getNbTidesExpected(); } @@ -155,11 +160,16 @@ return highTotals.getNbTidesEstimated(); } - public String getHighTotalRatio() { - String ratio = highTotals.getRatio(""); + public String getHighTotalRealRatio() { + String ratio = highTotals.getRealRatio(""); return ratio; } + public String getHighTotalEstimatedRatio() { + String ratio = highTotals.getEstimatedRatio(""); + return ratio; + } + public SampleRowsFilterValues getFilterValues() { return filterValues; } @@ -520,11 +530,16 @@ return result; } - public String getTotalPercentage() { - String result = totalTides.getRatio("-"); + public String getTotalRealPercentage() { + String result = totalTides.getRealRatio("-"); return result; } + public String getTotalEstimatedPercentage() { + String result = totalTides.getEstimatedRatio("-"); + return result; + } + public String getFishingZones() { return fishingZones; } @@ -593,7 +608,7 @@ return nbTidesEstimated; } - public String getRatio(String defaultValue) { + public String getRealRatio(String defaultValue) { String ratio = defaultValue; if (nbTidesExpected != null && nbTidesExpected > 0 && nbTidesReal != null && nbTidesReal > 0) { @@ -603,5 +618,15 @@ return ratio; } + public String getEstimatedRatio(String defaultValue) { + String ratio = defaultValue; + if (nbTidesExpected != null && nbTidesExpected > 0 && + nbTidesEstimated != null && nbTidesEstimated > 0) { + double percent = ((double) nbTidesEstimated / nbTidesExpected); + ratio = NumberFormat.getPercentInstance().format(percent); + } + return ratio; + } + } } 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-28 09:59:05 UTC (rev 1771) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 2014-03-28 10:24:41 UTC (rev 1772) @@ -355,7 +355,13 @@ <s:property value="totalTidesExpected" /> <s:if test="authenticatedWaoUser.authorizedToViewSamplingPlanReal"> - (<s:property value="totalPercentage" />) + + (<s:property value="totalEstimatedPercentage" />) + + + (<s:property value="totalRealPercentage" />) + + </s:if> </td> <td class="effort"> @@ -479,7 +485,13 @@ </s:if> <s:property value="#expected"/> <s:if test="authenticatedWaoUser.authorizedToViewSamplingPlanReal"> - <s:property value="samplingPlan.getTotalRatio(#month)"/> + + <s:property value="samplingPlan.getTotalEstimatedRatio(#month)"/> + + + <s:property value="samplingPlan.getTotalRealRatio(#month)"/> + + </s:if> </td> </s:iterator> @@ -498,7 +510,13 @@ </s:if> <s:property value="#expected"/> <s:if test="authenticatedWaoUser.authorizedToViewSamplingPlanReal"> - <s:property value="samplingPlan.highTotalRatio" /> + + <s:property value="samplingPlan.highTotalEstimatedRatio"/> + + + <s:property value="samplingPlan.highTotalRealRatio"/> + + </s:if> </td> <td class="effort">

1 0

r1771 - in trunk/wao-web/src/main/webapp: WEB-INF/content/obsmer css
by bleny＠users.forge.codelutin.com 28 Mar '14

28 Mar '14

Author: bleny Date: 2014-03-28 10:59:05 +0100 (Fri, 28 Mar 2014) New Revision: 1771 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1771 Log: refs #4483 show/hide sample row comment on hover Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp trunk/wao-web/src/main/webapp/css/wao.css 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-28 09:23:06 UTC (rev 1770) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 2014-03-28 09:59:05 UTC (rev 1771) @@ -380,7 +380,9 @@ <s:property value="appliedCoverageRate" />% </s:if> </td> - <td><s:property value="comment" /></td> + <td class="ellipsis"> + <s:property value="comment"/> + </td> <td class="actions"> <div class="dropdown"> Modified: trunk/wao-web/src/main/webapp/css/wao.css =================================================================== --- trunk/wao-web/src/main/webapp/css/wao.css 2014-03-28 09:23:06 UTC (rev 1770) +++ trunk/wao-web/src/main/webapp/css/wao.css 2014-03-28 09:59:05 UTC (rev 1771) @@ -65,7 +65,23 @@ } +td.ellipsis { + max-width: 100px; +} +.ellipsis { + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; +} + +td.ellipsis:hover { + overflow: visible; + white-space: normal; + text-overflow: initial; +} + + /****************************************************************************** * Styles globaux à l'application *****************************************************************************/

1 0

r1770 - in trunk/wao-web/src/main/webapp/WEB-INF: content/obsmer decorators
by bleny＠users.forge.codelutin.com 28 Mar '14

28 Mar '14

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>"> + + <s:text name="wao.ui.action.switchToFullView" /> + - <s:text name="wao.ui.action.switchToFullView" /> + <s:text name="wao.ui.action.switchToCompactView" /> - - <s:text name="wao.ui.action.switchToCompactView" /> - </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 @@  <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"/> <s:text name="wao.ui.field.SampleRow.dcf5Code"/></th> - <th class="only-visible-fullview"><s:text name="wao.ui.misc.METIER"/> <s:text name="wao.ui.field.SampleRow.meshSize"/></th> - <th class="only-visible-fullview"><s:text name="wao.ui.misc.METIER"/> <s:text name="wao.ui.field.SampleRow.size"/></th> - <th class="only-visible-fullview"><s:text name="wao.ui.misc.METIER"/> <s:text name="wao.ui.field.SampleRow.other"/></th> - <th class="only-visible-fullview"><s:text name="wao.ui.misc.METIER"/> <s:text name="wao.ui.field.SampleRow.libelle"/></th> - <th class="only-visible-fullview"><s:text name="wao.ui.misc.METIER"/> <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"/> <s:text name="wao.ui.field.SampleRow.dcf5Code"/></th> - <th class="only-visible-compactview"><s:text name="wao.ui.misc.METIER"/> <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"/> <s:text name="wao.ui.field.SampleRow.dcf5Code"/></th> + <th class="only-in-full-view"><s:text name="wao.ui.misc.METIER"/> <s:text name="wao.ui.field.SampleRow.meshSize"/></th> + <th class="only-in-full-view"><s:text name="wao.ui.misc.METIER"/> <s:text name="wao.ui.field.SampleRow.size"/></th> + <th class="only-in-full-view"><s:text name="wao.ui.misc.METIER"/> <s:text name="wao.ui.field.SampleRow.other"/></th> + <th class="only-in-full-view"><s:text name="wao.ui.misc.METIER"/> <s:text name="wao.ui.field.SampleRow.libelle"/></th> + <th class="only-in-full-view"><s:text name="wao.ui.misc.METIER"/> <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"/> <s:text name="wao.ui.field.SampleRow.dcf5Code"/></th> + <th class="only-in-compact-view"><s:text name="wao.ui.misc.METIER"/> <s:text name="wao.ui.field.SampleRow.libelle"/></th> +  <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"> <s:property value="key"/> </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"> <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>  <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>  <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" /> + <s:text name="wao.ui.page.Synthesis.title" /> </s:a> </li> </ul>

1 0

Build failed in Jenkins: wao-nightly #12
by admin+ci-codelutin.com＠codelutin.com 27 Mar '14

27 Mar '14

See <http://ci.codelutin.com/jenkins/job/wao-nightly/12/changes> Changes: [bleny] refs #4483 reintroduce SampleRowLogImplTest ------------------------------------------ [...truncated 407 lines...] [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-persistence/ta…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-persistence/ta…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-persistence/ta…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-persistence/ta…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-persistence/ta…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-persistence/ta…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-persistence/sr…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-persistence/sr…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-persistence/sr…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-persistence/sr…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-persistence/sr…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-persistence/sr…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-persistence/sr…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-persistence/sr…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-persistence/sr…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-persistence/sr…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-persistence/sr…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-persistence/sr…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-persistence/sr…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-persistence/sr…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-persistence/sr…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-persistence/sr…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-persistence/sr…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-persistence/sr…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-persistence/sr…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-persistence/sr…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-persistence/sr…> [INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-persistence/sr…> [INFO] Scan 235 files header done in 262.427ms. [INFO] * uptodate header on 36 files. * add header on 199 files. [INFO] [INFO] --- maven-compiler-plugin:3.1:compile (default-compile) @ wao-persistence --- [INFO] Compiling 202 source files to <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-persistence/ta…> [WARNING] <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-persistence/ta…>: Some input files use unchecked or unsafe operations. [WARNING] <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-persistence/ta…>: Recompile with -Xlint:unchecked for details. [INFO] [INFO] --- animal-sniffer-maven-plugin:1.9:check (default) @ wao-persistence --- [INFO] Checking unresolved references to org.codehaus.mojo.signature:java17:1.0 [INFO] [INFO] --- jredmine-maven-plugin:1.6:generate-changes (jredmine-generate-changes) @ wao-persistence --- [INFO] Skipping goal (skipGenerateChanges flag is on). [INFO] [INFO] --- maven-antrun-plugin:1.7:run (generate-surefire-workdir) @ wao-persistence --- [INFO] Executing tasks main: [mkdir] Created dir: <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-persistence/ta…> [INFO] Executed tasks [INFO] [INFO] --- maven-resources-plugin:2.6:testResources (default-testResources) @ wao-persistence --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 0 resource [INFO] [INFO] --- maven-compiler-plugin:3.1:testCompile (default-testCompile) @ wao-persistence --- [INFO] Compiling 1 source file to <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-persistence/ta…> [INFO] [INFO] --- maven-surefire-plugin:2.16:test (default-test) @ wao-persistence --- [INFO] Surefire report directory: <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-persistence/ta…> ------------------------------------------------------- T E S T S ------------------------------------------------------- Running fr.ifremer.wao.entity.SampleRowLogImplTest log4j:WARN No appenders could be found for logger (fr.ifremer.wao.entity.SampleRowLogImplTest). log4j:WARN Please initialize the log4j system properly. log4j:WARN See http://logging.apache.org/log4j/1.2/faq.html#noconfig for more info. Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.121 sec - in fr.ifremer.wao.entity.SampleRowLogImplTest Results : Tests run: 3, Failures: 0, Errors: 0, Skipped: 0 [JENKINS] Recording test results [INFO] [INFO] --- maven-jar-plugin:2.4:jar (default-jar) @ wao-persistence --- [INFO] Building jar: <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-persistence/ta…> [INFO] [INFO] >>> maven-source-plugin:2.2.1:jar (attach-sources) @ wao-persistence >>> [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (ensure-no-container-api) @ wao-persistence --- [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ wao-persistence --- [INFO] [INFO] --- helper-maven-plugin:2.1:share-server-secret (get-redmine-login) @ wao-persistence --- [INFO] Skipping goal (runOnce flag is on and goal was already executed). [INFO] [INFO] --- eugene-maven-plugin:2.7.3:generate (generate-entities) @ wao-persistence --- [INFO] Process phase [zargo] for one entry. [INFO] Expanding 1 xmi file(s) from <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-persistence/sr…> [INFO] Copy file <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-persistence/sr…> to <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-persistence/ta…> [INFO] No file generated. [INFO] Process phase [xmi] for one entry. [INFO] Processing XSL tranformation on <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-persistence/ta…> for 1 file(s). [INFO] No file generated. [INFO] Process phase [model] for one entry. WARN [pool-1-thread-1 for channel] (AbstractObjectModelReader.java:126) beforeReadFile - No properties provider filled, will instanciate a new default one WARN [pool-1-thread-1 for channel] (AbstractObjectModelReader.java:577) getObjectElements - Invalid tagvalue [fr.ifremer.wao.entity.Boat.attribute.boatDistrict.tagValue.lazy] : Element 'boatDistrict' of type 'attribute' on classifier 'fr.ifremer.wao.entity.Boat' is null. WARN [pool-1-thread-1 for channel] (AbstractObjectModelReader.java:577) getObjectElements - Invalid tagvalue [fr.ifremer.wao.entity.WaoUser.attribute.SampleRow.tagValue.inverse] : Element 'SampleRow' of type 'attribute' on classifier 'fr.ifremer.wao.entity.WaoUser' is null. WARN [pool-1-thread-1 for channel] (AbstractObjectModelReader.java:459) loadTagValue - Invalid tag value [fr.ifremer.wao.entity.WaoUser.attribute.allegroWallet.tagValue.unique] : this tagvalue 'unique' is unkown. WARN [pool-1-thread-1 for channel] (AbstractObjectModelReader.java:294) loadModelTagValue - Invalid model tag value [model.tagValue.copyright] : the tagvalue 'copyright' is unkown. WARN [pool-1-thread-1 for channel] (AbstractObjectModelReader.java:294) loadModelTagValue - Invalid model tag value [model.tagValue.exceptionClass] : the tagvalue 'exceptionClass' is unkown. WARN [pool-1-thread-1 for channel] (AbstractObjectModelReader.java:294) loadModelTagValue - Invalid model tag value [model.tagValue.java.lang.String] : the tagvalue 'java.lang.String' is unkown. WARN [pool-1-thread-1 for channel] (AbstractObjectModelReader.java:303) loadModelTagValue - Invalid model tag value [model.tagValue.useEnumerationName] : this tagvalue 'useEnumerationName' can not be apply on the model. INFO [pool-1-thread-1 for channel] (AbstractObjectModelReader.java:270) loadModelProperties - 32 tag values were succesfull imported from <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-persistence/ta…> [INFO] No file generated. [INFO] Apply generator TopiaMetaTransformer WARN [pool-1-thread-1 for channel] (TopiaMetaTransformer.java:110) validateModel - [VALIDATION] [getUserProfile([fr.ifremer.wao.entity.ObsProgram obsProgram<<[]>> tagvalue: {}])<<[]>> throws [] tagvalue: {}] Operation name getUserProfile is already reserved for a getter/setter of an entity attribute WARN [pool-1-thread-1 for channel] (TopiaMetaTransformer.java:110) validateModel - [VALIDATION] [setDCF5Code([java.lang.String codes<<[]>> tagvalue: {}, java.lang.String separatorRegex<<[]>> tagvalue: {}])<<[]>> throws [] tagvalue: {}] Operation name setDCF5Code is already reserved for a getter/setter of an entity attribute WARN [pool-1-thread-1 for channel] (TopiaMetaTransformer.java:110) validateModel - [VALIDATION] [getSampleMonth([java.util.Date date<<[]>> tagvalue: {}])<<[]>> throws [] tagvalue: {}] Operation name getSampleMonth is already reserved for a getter/setter of an entity attribute WARN [pool-1-thread-1 for channel] (TopiaMetaTransformer.java:110) validateModel - [VALIDATION] [setLogText([fr.ifremer.wao.entity.SampleRow oldSampleRow<<[]>> tagvalue: {}, fr.ifremer.wao.entity.SampleRow newSampleRow<<[]>> tagvalue: {}])<<[]>> throws [] tagvalue: {}] Operation name setLogText is already reserved for a getter/setter of an entity attribute INFO [pool-1-thread-1 for channel] (ObjectModelTransformerToJava.java:998) isInClassPath - Will not generate [fr.ifremer.wao.entity.WaoUserImpl], already found in class-path. INFO [pool-1-thread-1 for channel] (ObjectModelTransformerToJava.java:998) isInClassPath - Will not generate [fr.ifremer.wao.entity.FishingGearDCFImpl], already found in class-path. INFO [pool-1-thread-1 for channel] (ObjectModelTransformerToJava.java:998) isInClassPath - Will not generate [fr.ifremer.wao.entity.TerrestrialDivisionImpl], already found in class-path. INFO [pool-1-thread-1 for channel] (ObjectModelTransformerToJava.java:998) isInClassPath - Will not generate [fr.ifremer.wao.entity.DCF5CodeImpl], already found in class-path. INFO [pool-1-thread-1 for channel] (ObjectModelTransformerToJava.java:998) isInClassPath - Will not generate [fr.ifremer.wao.entity.SampleRowImpl], already found in class-path. INFO [pool-1-thread-1 for channel] (ObjectModelTransformerToJava.java:998) isInClassPath - Will not generate [fr.ifremer.wao.entity.BoatImpl], already found in class-path. INFO [pool-1-thread-1 for channel] (ObjectModelTransformerToJava.java:998) isInClassPath - Will not generate [fr.ifremer.wao.entity.ContactImpl], already found in class-path. INFO [pool-1-thread-1 for channel] (ObjectModelTransformerToJava.java:998) isInClassPath - Will not generate [fr.ifremer.wao.entity.IndicatorImpl], already found in class-path. INFO [pool-1-thread-1 for channel] (ObjectModelTransformerToJava.java:998) isInClassPath - Will not generate [fr.ifremer.wao.entity.ContactStateMotifImpl], already found in class-path. INFO [pool-1-thread-1 for channel] (ObjectModelTransformerToJava.java:998) isInClassPath - Will not generate [fr.ifremer.wao.entity.TerrestrialLocationImpl], already found in class-path. INFO [pool-1-thread-1 for channel] (ObjectModelTransformerToJava.java:998) isInClassPath - Will not generate [fr.ifremer.wao.entity.BoatGroupImpl], already found in class-path. INFO [pool-1-thread-1 for channel] (ObjectModelTransformerToJava.java:998) isInClassPath - Will not generate [fr.ifremer.wao.entity.CompanyImpl], already found in class-path. INFO [pool-1-thread-1 for channel] (ObjectModelTransformerToJava.java:998) isInClassPath - Will not generate [fr.ifremer.wao.entity.IndicatorLevelImpl], already found in class-path. INFO [pool-1-thread-1 for channel] (ObjectModelTransformerToJava.java:998) isInClassPath - Will not generate [fr.ifremer.wao.entity.FishingZoneImpl], already found in class-path. INFO [pool-1-thread-1 for channel] (ObjectModelTransformerToJava.java:998) isInClassPath - Will not generate [fr.ifremer.wao.entity.SampleMonthImpl], already found in class-path. INFO [pool-1-thread-1 for channel] (ObjectModelTransformerToJava.java:998) isInClassPath - Will not generate [fr.ifremer.wao.entity.FleetImpl], already found in class-path. INFO [pool-1-thread-1 for channel] (ObjectModelTransformerToJava.java:998) isInClassPath - Will not generate [fr.ifremer.wao.entity.UserProfileImpl], already found in class-path. INFO [pool-1-thread-1 for channel] (ObjectModelTransformerToJava.java:998) isInClassPath - Will not generate [fr.ifremer.wao.entity.TargetSpeciesDCFImpl], already found in class-path. INFO [pool-1-thread-1 for channel] (ObjectModelTransformerToJava.java:998) isInClassPath - Will not generate [fr.ifremer.wao.entity.ObsDebCodeImpl], already found in class-path. INFO [pool-1-thread-1 for channel] (ObjectModelTransformerToJava.java:998) isInClassPath - Will not generate [fr.ifremer.wao.entity.SampleRowLogImpl], already found in class-path. INFO [pool-1-thread-1 for channel] (ObjectModelTransformerToJava.java:998) isInClassPath - Will not generate [fr.ifremer.wao.entity.NewsImpl], already found in class-path. INFO [pool-1-thread-1 for channel] (ObjectModelTransformerToJava.java:998) isInClassPath - Will not generate [fr.ifremer.wao.entity.WaoUserTopiaDao], already found in class-path. INFO [pool-1-thread-1 for channel] (ObjectModelTransformerToJava.java:998) isInClassPath - Will not generate [fr.ifremer.wao.entity.TerrestrialDivisionTopiaDao], already found in class-path. INFO [pool-1-thread-1 for channel] (ObjectModelTransformerToJava.java:998) isInClassPath - Will not generate [fr.ifremer.wao.entity.SampleRowTopiaDao], already found in class-path. INFO [pool-1-thread-1 for channel] (ObjectModelTransformerToJava.java:998) isInClassPath - Will not generate [fr.ifremer.wao.entity.TerrestrialLocationTopiaDao], already found in class-path. [WARNING] Failed to getClass for org.apache.maven.plugin.source.SourceJarMojo [INFO] [INFO] <<< maven-source-plugin:2.2.1:jar (attach-sources) @ wao-persistence <<< [INFO] [INFO] --- maven-source-plugin:2.2.1:jar (attach-sources) @ wao-persistence --- [INFO] Building jar: <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-persistence/ta…> [INFO] [INFO] --- maven-javadoc-plugin:2.9.1:jar (attach-javadocs) @ wao-persistence --- [INFO] Building jar: <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-persistence/ta…> [INFO] [INFO] --- maven-site-plugin:3.3:attach-descriptor (attach-descriptor) @ wao-persistence --- [INFO] [INFO] --- helper-maven-plugin:2.1:share-server-secret (get-pgp-passphrase) @ wao-persistence --- [INFO] Exporting server [gpg-signer] username in ${gpg.keyname} [INFO] Exporting server [gpg-signer] password in ${gpg.passphrase} [INFO] [INFO] --- helper-maven-plugin:2.1:collect-files (collect-build-artifacts) @ wao-persistence --- [INFO] Loaded <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/target/collect-art…> [INFO] Copying wao-persistence-4.0-SNAPSHOT.jar to <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/target/collect/fr.…> [INFO] Copying THIRD-PARTY.properties to <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/target/collect/fr.…> [INFO] Copying wao-persistence-4.0-SNAPSHOT-sources.jar to <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/target/collect/fr.…> [INFO] Copying wao-persistence-4.0-SNAPSHOT-javadoc.jar to <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/target/collect/fr.…> [INFO] [INFO] --- helper-maven-plugin:2.1:collect-files (collect-build-attachements) @ wao-persistence --- [WARNING] Skipping goal (No file to collect). [INFO] [INFO] --- maven-gpg-plugin:1.4:sign (sign-artifacts) @ wao-persistence --- [INFO] [INFO] --- maven-dependency-plugin:2.8:analyze-only (analyze) @ wao-persistence --- [INFO] Used declared dependencies found: [INFO] org.nuiton.topia:topia-persistence:jar:3.0-SNAPSHOT:compile [INFO] org.nuiton:nuiton-config:jar:3.0-alpha-1:compile [INFO] org.nuiton.i18n:nuiton-i18n:jar:3.0:compile [INFO] org.apache.commons:commons-lang3:jar:3.1:compile [INFO] commons-logging:commons-logging:jar:1.1.3:compile [INFO] com.google.guava:guava:jar:15.0:compile [INFO] junit:junit:jar:4.11:test [WARNING] Used undeclared dependencies found: [WARNING] org.hibernate:hibernate-core:jar:4.2.8.Final:compile [WARNING] org.nuiton:nuiton-utils:jar:3.0-SNAPSHOT:compile [WARNING] commons-collections:commons-collections:jar:3.2.1:compile [WARNING] Unused declared dependencies found: [WARNING] org.apache.commons:commons-collections4:jar:4.0:compile [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [INFO] ------------------------------------------------------------------------ [INFO] Reactor Summary: [INFO] [INFO] Wao ............................................... SUCCESS [ 6.625 s] [INFO] Wao :: Persistence ................................ FAILURE [ 25.838 s] [INFO] Wao :: Services ................................... SKIPPED [INFO] Wao :: Web ........................................ SKIPPED [INFO] ------------------------------------------------------------------------ [INFO] BUILD FAILURE [INFO] ------------------------------------------------------------------------ [INFO] Total time: 34.095 s [INFO] Finished at: 2014-03-18T00:07:25+01:00 [JENKINS] Archiving disabled [INFO] Final Memory: 97M/1004M [INFO] ------------------------------------------------------------------------ [ERROR] Failed to execute goal org.apache.maven.plugins:maven-dependency-plugin:2.8:analyze-only (analyze) on project wao-persistence: Dependency problems found -> [Help 1] org.apache.maven.lifecycle.LifecycleExecutionException: Failed to execute goal org.apache.maven.plugins:maven-dependency-plugin:2.8:analyze-only (analyze) on project wao-persistence: Dependency problems found at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:216) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:153) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:145) at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:108) at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:76) at org.apache.maven.lifecycle.internal.builder.singlethreaded.SingleThreadedBuilder.build(SingleThreadedBuilder.java:51) at org.apache.maven.lifecycle.internal.LifecycleStarter.execute(LifecycleStarter.java:116) at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:361) at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:155) at org.jvnet.hudson.maven3.launcher.Maven31Launcher.main(Maven31Launcher.java:132) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:606) at org.codehaus.plexus.classworlds.launcher.Launcher.launchStandard(Launcher.java:330) at org.codehaus.plexus.classworlds.launcher.Launcher.launch(Launcher.java:238) at jenkins.maven3.agent.Maven31Main.launch(Maven31Main.java:181) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:606) at hudson.maven.Maven3Builder.call(Maven3Builder.java:134) at hudson.maven.Maven3Builder.call(Maven3Builder.java:69) at hudson.remoting.UserRequest.perform(UserRequest.java:118) at hudson.remoting.UserRequest.perform(UserRequest.java:48) at hudson.remoting.Request$2.run(Request.java:328) at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72) at java.util.concurrent.FutureTask.run(FutureTask.java:262) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615) at java.lang.Thread.run(Thread.java:744) Caused by: org.apache.maven.plugin.MojoExecutionException: Dependency problems found at org.apache.maven.plugin.dependency.analyze.AbstractAnalyzeMojo.execute(AbstractAnalyzeMojo.java:188) at org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo(DefaultBuildPluginManager.java:133) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:208) ... 30 more [ERROR] [ERROR] Re-run Maven using the -X switch to enable full debug logging. [ERROR] [ERROR] For more information about the errors and possible solutions, please read the following articles: [ERROR] [Help 1] http://cwiki.apache.org/confluence/display/MAVEN/MojoExecutionException [ERROR] [ERROR] After correcting the problems, you can resume the build with the command [ERROR] mvn <goals> -rf :wao-persistence Sending e-mails to: wao-commits(a)list.forge.codelutin.com Sending e-mails to: wao-commits(a)list.forge.codelutin.com leny(a)codelutin.com channel stopped Skipping sonar analysis due to bad build status FAILURE

1 7

Build failed in Jenkins: wao-nightly » Wao :: Services #17
by admin+ci-codelutin.com＠codelutin.com 27 Mar '14

27 Mar '14

See <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/17/…> Changes: [Tony CHEMIT] refs-40 #4483 (continue ui) [bleny] fix test by fixing imported sampling plan [bleny] refs #4483 introduce SampleRowsFilterValues start filter form ui [Tony CHEMIT] refs-30 #4483 (begin of ui) [Tony CHEMIT] refs #4483 (add estimated, expected and real values) [bleny] refs #4487 introduce contact filter api [Tony CHEMIT] - fix test config - use diamonds [bleny] remove references to another project, add licence headers [Tony CHEMIT] refs-20 #4483 (fix tests) [Tony CHEMIT] use commons-collections4 instead of commons-collections [Tony CHEMIT] refs-20 #4483 (add SamplingPlan Builder) [Tony CHEMIT] fix licenses fix third-parties fix dependencies ------------------------------------------ [...truncated 232 lines...] 2014/03/26 12:08:03 TRACE (SampleRowTopiaDao.java:149) toSampleRowHqlAndParametersBuilder query to filter sample rows for fr.ifremer.wao.SampleRowsFilter@7c02a5e1[obsProgram=OBSMER,sampleRowIds=[fr.ifremer.wao.entity.SampleRow#1395788883228#0.002710629850469992],periodFrom=Thu Apr 01 00:00:00 CEST 2010,periodTo=Tue Mar 01 00:00:00 CET 2011,fishingZoneFacadeNames=<null>,fishingZoneSectorNames=<null>,sampleRowCodes=<null>,programNames=<null>,fishingGearDcfIds=<null>,targetSpeciesDcfIds=<null>,samplingStrategies=<null>,terrestrialDistrictIds=<null>,companyIds=<null>,orderByArguments=<null>] is from fr.ifremer.wao.entity.SampleRow sr where (sr.obsProgramOrdinal = :obsProgramOrdinal) and (sr.topiaId = :topiaId) and (sr.periodEnd >= :periodFromMonth) and (sr.periodEnd <= :periodToMonth) {obsProgramOrdinal=0, topiaId=fr.ifremer.wao.entity.SampleRow#1395788883228#0.002710629850469992, periodFromMonth=Thu Apr 01 00:00:00 CEST 2010, periodToMonth=Tue Mar 01 00:00:00 CET 2011} 2014/03/26 12:08:03 TRACE (ContactTopiaDao.java:157) toSampleRowHqlAndParametersBuilder query to filter contacts for fr.ifremer.wao.ContactsFilter@310c7c08[sampleRowFilter=fr.ifremer.wao.SampleRowsFilter@7c02a5e1[obsProgram=OBSMER,sampleRowIds=[fr.ifremer.wao.entity.SampleRow#1395788883228#0.002710629850469992],periodFrom=Thu Apr 01 00:00:00 CEST 2010,periodTo=Tue Mar 01 00:00:00 CET 2011,fishingZoneFacadeNames=<null>,fishingZoneSectorNames=<null>,sampleRowCodes=<null>,programNames=<null>,fishingGearDcfIds=<null>,targetSpeciesDcfIds=<null>,samplingStrategies=<null>,terrestrialDistrictIds=<null>,companyIds=<null>,orderByArguments=<null>],periodFrom=Thu Apr 01 00:00:00 CEST 2010,periodTo=Tue Mar 01 00:00:00 CET 2011,contactIds=<null>,contactStates=[OBSERVATION_DONE],dataReliabilities=<null>,actualSamplingStrategies=<null>,observationTypes=<null>,observedDataControls=<null>,observerIds=<null>,terrestrialLocationIds=<null>,contactStateMotiveIds=<null>,mammalsCaptureOnly=false,mammalsObservationOnly=false,commentDefinedOnly=false,commentAdminDefinedOnly=false,commentCompanyDefinedOnly=false,companyAcceptations=[null, true],programAcceptations=[null, true],completeSamplings=<null>,filterOnObservationBeginDate=true,sortedByBoardingDate=false] is from fr.ifremer.wao.entity.Contact c where (c.sampleRow.topiaId in (select sr.topiaId from fr.ifremer.wao.entity.SampleRow sr where (sr.obsProgramOrdinal = :obsProgramOrdinal) and (sr.topiaId = :topiaId) and (sr.periodEnd >= :periodFromMonth) and (sr.periodEnd <= :periodToMonth))) and (c.observationBeginDate >= :periodFrom) and (c.observationBeginDate <= :periodTo) and (c.state = :state) and ( c.validationCompany in ( :validationCompany ) or c.validationCompany is null) and ( c.validationProgram in ( :validationProgram ) or c.validationProgram is null) {obsProgramOrdinal=0, topiaId=fr.ifremer.wao.entity.SampleRow#1395788883228#0.002710629850469992, periodFromMonth=Thu Apr 01 00:00:00 CEST 2010, periodToMonth=Tue Mar 01 00:00:00 CET 2011, periodFrom=Thu Apr 01 00:00:00 CEST 2010, periodTo=Tue Mar 01 00:00:00 CET 2011, state=2, validationCompany=[null, true], validationProgram=[null, true]} 2014/03/26 12:08:03 TRACE (FakeWaoServiceContext.java:50) getNow injecting fake date in service: Sat May 15 00:00:00 CEST 2010 2014/03/26 12:08:03 TRACE (SampleRowTopiaDao.java:149) toSampleRowHqlAndParametersBuilder query to filter sample rows for fr.ifremer.wao.SampleRowsFilter@1da15229[obsProgram=OBSMER,sampleRowIds=<null>,periodFrom=Thu Apr 01 00:00:00 CEST 2010,periodTo=Tue Mar 01 00:00:00 CET 2011,fishingZoneFacadeNames=<null>,fishingZoneSectorNames=<null>,sampleRowCodes=<null>,programNames=<null>,fishingGearDcfIds=[fr.ifremer.wao.entity.FishingGearDCF#1395788870097#0.6052098891633803],targetSpeciesDcfIds=<null>,samplingStrategies=<null>,terrestrialDistrictIds=<null>,companyIds=<null>,orderByArguments=<null>] is from fr.ifremer.wao.entity.SampleRow sr where (sr.obsProgramOrdinal = :obsProgramOrdinal) and (sr.periodEnd >= :periodFromMonth) and (sr.periodEnd <= :periodToMonth) and (sr.topiaId in (select sr2.topiaId from fr.ifremer.wao.entity.SampleRowImpl as sr2 join sr2.dCF5Code as dcf where dcf.fishingGearDCF.topiaId in (:fishingGearDcfIds))) {obsProgramOrdinal=0, periodFromMonth=Thu Apr 01 00:00:00 CEST 2010, periodToMonth=Tue Mar 01 00:00:00 CET 2011, fishingGearDcfIds=[fr.ifremer.wao.entity.FishingGearDCF#1395788870097#0.6052098891633803]} 2014/03/26 12:08:03 TRACE (SampleRowTopiaDao.java:149) toSampleRowHqlAndParametersBuilder query to filter sample rows for fr.ifremer.wao.SampleRowsFilter@1da15229[obsProgram=OBSMER,sampleRowIds=[fr.ifremer.wao.entity.SampleRow#1395788883176#0.1958589174266282],periodFrom=Thu Apr 01 00:00:00 CEST 2010,periodTo=Tue Mar 01 00:00:00 CET 2011,fishingZoneFacadeNames=<null>,fishingZoneSectorNames=<null>,sampleRowCodes=<null>,programNames=<null>,fishingGearDcfIds=[fr.ifremer.wao.entity.FishingGearDCF#1395788870097#0.6052098891633803],targetSpeciesDcfIds=<null>,samplingStrategies=<null>,terrestrialDistrictIds=<null>,companyIds=<null>,orderByArguments=<null>] is from fr.ifremer.wao.entity.SampleRow sr where (sr.obsProgramOrdinal = :obsProgramOrdinal) and (sr.topiaId = :topiaId) and (sr.periodEnd >= :periodFromMonth) and (sr.periodEnd <= :periodToMonth) and (sr.topiaId in (select sr2.topiaId from fr.ifremer.wao.entity.SampleRowImpl as sr2 join sr2.dCF5Code as dcf where dcf.fishingGearDCF.topiaId in (:fishingGearDcfIds))) {obsProgramOrdinal=0, topiaId=fr.ifremer.wao.entity.SampleRow#1395788883176#0.1958589174266282, periodFromMonth=Thu Apr 01 00:00:00 CEST 2010, periodToMonth=Tue Mar 01 00:00:00 CET 2011, fishingGearDcfIds=[fr.ifremer.wao.entity.FishingGearDCF#1395788870097#0.6052098891633803]} 2014/03/26 12:08:03 TRACE (ContactTopiaDao.java:157) toSampleRowHqlAndParametersBuilder query to filter contacts for fr.ifremer.wao.ContactsFilter@17c831df[sampleRowFilter=fr.ifremer.wao.SampleRowsFilter@1da15229[obsProgram=OBSMER,sampleRowIds=[fr.ifremer.wao.entity.SampleRow#1395788883176#0.1958589174266282],periodFrom=Thu Apr 01 00:00:00 CEST 2010,periodTo=Tue Mar 01 00:00:00 CET 2011,fishingZoneFacadeNames=<null>,fishingZoneSectorNames=<null>,sampleRowCodes=<null>,programNames=<null>,fishingGearDcfIds=[fr.ifremer.wao.entity.FishingGearDCF#1395788870097#0.6052098891633803],targetSpeciesDcfIds=<null>,samplingStrategies=<null>,terrestrialDistrictIds=<null>,companyIds=<null>,orderByArguments=<null>],periodFrom=Thu Apr 01 00:00:00 CEST 2010,periodTo=Tue Mar 01 00:00:00 CET 2011,contactIds=<null>,contactStates=[OBSERVATION_DONE],dataReliabilities=<null>,actualSamplingStrategies=<null>,observationTypes=<null>,observedDataControls=<null>,observerIds=<null>,terrestrialLocationIds=<null>,contactStateMotiveIds=<null>,mammalsCaptureOnly=false,mammalsObservationOnly=false,commentDefinedOnly=false,commentAdminDefinedOnly=false,commentCompanyDefinedOnly=false,companyAcceptations=[null, true],programAcceptations=[null, true],completeSamplings=<null>,filterOnObservationBeginDate=true,sortedByBoardingDate=false] is from fr.ifremer.wao.entity.Contact c where (c.sampleRow.topiaId in (select sr.topiaId from fr.ifremer.wao.entity.SampleRow sr where (sr.obsProgramOrdinal = :obsProgramOrdinal) and (sr.topiaId = :topiaId) and (sr.periodEnd >= :periodFromMonth) and (sr.periodEnd <= :periodToMonth) and (sr.topiaId in (select sr2.topiaId from fr.ifremer.wao.entity.SampleRowImpl as sr2 join sr2.dCF5Code as dcf where dcf.fishingGearDCF.topiaId in (:fishingGearDcfIds))))) and (c.observationBeginDate >= :periodFrom) and (c.observationBeginDate <= :periodTo) and (c.state = :state) and ( c.validationCompany in ( :validationCompany ) or c.validationCompany is null) and ( c.validationProgram in ( :validationProgram ) or c.validationProgram is null) {obsProgramOrdinal=0, topiaId=fr.ifremer.wao.entity.SampleRow#1395788883176#0.1958589174266282, periodFromMonth=Thu Apr 01 00:00:00 CEST 2010, periodToMonth=Tue Mar 01 00:00:00 CET 2011, fishingGearDcfIds=[fr.ifremer.wao.entity.FishingGearDCF#1395788870097#0.6052098891633803], periodFrom=Thu Apr 01 00:00:00 CEST 2010, periodTo=Tue Mar 01 00:00:00 CET 2011, state=2, validationCompany=[null, true], validationProgram=[null, true]} 2014/03/26 12:08:03 TRACE (SampleRowTopiaDao.java:149) toSampleRowHqlAndParametersBuilder query to filter sample rows for fr.ifremer.wao.SampleRowsFilter@1da15229[obsProgram=OBSMER,sampleRowIds=[fr.ifremer.wao.entity.SampleRow#1395788883185#0.40926781661657896],periodFrom=Thu Apr 01 00:00:00 CEST 2010,periodTo=Tue Mar 01 00:00:00 CET 2011,fishingZoneFacadeNames=<null>,fishingZoneSectorNames=<null>,sampleRowCodes=<null>,programNames=<null>,fishingGearDcfIds=[fr.ifremer.wao.entity.FishingGearDCF#1395788870097#0.6052098891633803],targetSpeciesDcfIds=<null>,samplingStrategies=<null>,terrestrialDistrictIds=<null>,companyIds=<null>,orderByArguments=<null>] is from fr.ifremer.wao.entity.SampleRow sr where (sr.obsProgramOrdinal = :obsProgramOrdinal) and (sr.topiaId = :topiaId) and (sr.periodEnd >= :periodFromMonth) and (sr.periodEnd <= :periodToMonth) and (sr.topiaId in (select sr2.topiaId from fr.ifremer.wao.entity.SampleRowImpl as sr2 join sr2.dCF5Code as dcf where dcf.fishingGearDCF.topiaId in (:fishingGearDcfIds))) {obsProgramOrdinal=0, topiaId=fr.ifremer.wao.entity.SampleRow#1395788883185#0.40926781661657896, periodFromMonth=Thu Apr 01 00:00:00 CEST 2010, periodToMonth=Tue Mar 01 00:00:00 CET 2011, fishingGearDcfIds=[fr.ifremer.wao.entity.FishingGearDCF#1395788870097#0.6052098891633803]} 2014/03/26 12:08:03 TRACE (ContactTopiaDao.java:157) toSampleRowHqlAndParametersBuilder query to filter contacts for fr.ifremer.wao.ContactsFilter@4018f98f[sampleRowFilter=fr.ifremer.wao.SampleRowsFilter@1da15229[obsProgram=OBSMER,sampleRowIds=[fr.ifremer.wao.entity.SampleRow#1395788883185#0.40926781661657896],periodFrom=Thu Apr 01 00:00:00 CEST 2010,periodTo=Tue Mar 01 00:00:00 CET 2011,fishingZoneFacadeNames=<null>,fishingZoneSectorNames=<null>,sampleRowCodes=<null>,programNames=<null>,fishingGearDcfIds=[fr.ifremer.wao.entity.FishingGearDCF#1395788870097#0.6052098891633803],targetSpeciesDcfIds=<null>,samplingStrategies=<null>,terrestrialDistrictIds=<null>,companyIds=<null>,orderByArguments=<null>],periodFrom=Thu Apr 01 00:00:00 CEST 2010,periodTo=Tue Mar 01 00:00:00 CET 2011,contactIds=<null>,contactStates=[OBSERVATION_DONE],dataReliabilities=<null>,actualSamplingStrategies=<null>,observationTypes=<null>,observedDataControls=<null>,observerIds=<null>,terrestrialLocationIds=<null>,contactStateMotiveIds=<null>,mammalsCaptureOnly=false,mammalsObservationOnly=false,commentDefinedOnly=false,commentAdminDefinedOnly=false,commentCompanyDefinedOnly=false,companyAcceptations=[null, true],programAcceptations=[null, true],completeSamplings=<null>,filterOnObservationBeginDate=true,sortedByBoardingDate=false] is from fr.ifremer.wao.entity.Contact c where (c.sampleRow.topiaId in (select sr.topiaId from fr.ifremer.wao.entity.SampleRow sr where (sr.obsProgramOrdinal = :obsProgramOrdinal) and (sr.topiaId = :topiaId) and (sr.periodEnd >= :periodFromMonth) and (sr.periodEnd <= :periodToMonth) and (sr.topiaId in (select sr2.topiaId from fr.ifremer.wao.entity.SampleRowImpl as sr2 join sr2.dCF5Code as dcf where dcf.fishingGearDCF.topiaId in (:fishingGearDcfIds))))) and (c.observationBeginDate >= :periodFrom) and (c.observationBeginDate <= :periodTo) and (c.state = :state) and ( c.validationCompany in ( :validationCompany ) or c.validationCompany is null) and ( c.validationProgram in ( :validationProgram ) or c.validationProgram is null) {obsProgramOrdinal=0, topiaId=fr.ifremer.wao.entity.SampleRow#1395788883185#0.40926781661657896, periodFromMonth=Thu Apr 01 00:00:00 CEST 2010, periodToMonth=Tue Mar 01 00:00:00 CET 2011, fishingGearDcfIds=[fr.ifremer.wao.entity.FishingGearDCF#1395788870097#0.6052098891633803], periodFrom=Thu Apr 01 00:00:00 CEST 2010, periodTo=Tue Mar 01 00:00:00 CET 2011, state=2, validationCompany=[null, true], validationProgram=[null, true]} 2014/03/26 12:08:03 TRACE (SampleRowTopiaDao.java:149) toSampleRowHqlAndParametersBuilder query to filter sample rows for fr.ifremer.wao.SampleRowsFilter@1da15229[obsProgram=OBSMER,sampleRowIds=[fr.ifremer.wao.entity.SampleRow#1395788883206#0.14314465804642373],periodFrom=Thu Apr 01 00:00:00 CEST 2010,periodTo=Tue Mar 01 00:00:00 CET 2011,fishingZoneFacadeNames=<null>,fishingZoneSectorNames=<null>,sampleRowCodes=<null>,programNames=<null>,fishingGearDcfIds=[fr.ifremer.wao.entity.FishingGearDCF#1395788870097#0.6052098891633803],targetSpeciesDcfIds=<null>,samplingStrategies=<null>,terrestrialDistrictIds=<null>,companyIds=<null>,orderByArguments=<null>] is from fr.ifremer.wao.entity.SampleRow sr where (sr.obsProgramOrdinal = :obsProgramOrdinal) and (sr.topiaId = :topiaId) and (sr.periodEnd >= :periodFromMonth) and (sr.periodEnd <= :periodToMonth) and (sr.topiaId in (select sr2.topiaId from fr.ifremer.wao.entity.SampleRowImpl as sr2 join sr2.dCF5Code as dcf where dcf.fishingGearDCF.topiaId in (:fishingGearDcfIds))) {obsProgramOrdinal=0, topiaId=fr.ifremer.wao.entity.SampleRow#1395788883206#0.14314465804642373, periodFromMonth=Thu Apr 01 00:00:00 CEST 2010, periodToMonth=Tue Mar 01 00:00:00 CET 2011, fishingGearDcfIds=[fr.ifremer.wao.entity.FishingGearDCF#1395788870097#0.6052098891633803]} 2014/03/26 12:08:03 TRACE (ContactTopiaDao.java:157) toSampleRowHqlAndParametersBuilder query to filter contacts for fr.ifremer.wao.ContactsFilter@6369a309[sampleRowFilter=fr.ifremer.wao.SampleRowsFilter@1da15229[obsProgram=OBSMER,sampleRowIds=[fr.ifremer.wao.entity.SampleRow#1395788883206#0.14314465804642373],periodFrom=Thu Apr 01 00:00:00 CEST 2010,periodTo=Tue Mar 01 00:00:00 CET 2011,fishingZoneFacadeNames=<null>,fishingZoneSectorNames=<null>,sampleRowCodes=<null>,programNames=<null>,fishingGearDcfIds=[fr.ifremer.wao.entity.FishingGearDCF#1395788870097#0.6052098891633803],targetSpeciesDcfIds=<null>,samplingStrategies=<null>,terrestrialDistrictIds=<null>,companyIds=<null>,orderByArguments=<null>],periodFrom=Thu Apr 01 00:00:00 CEST 2010,periodTo=Tue Mar 01 00:00:00 CET 2011,contactIds=<null>,contactStates=[OBSERVATION_DONE],dataReliabilities=<null>,actualSamplingStrategies=<null>,observationTypes=<null>,observedDataControls=<null>,observerIds=<null>,terrestrialLocationIds=<null>,contactStateMotiveIds=<null>,mammalsCaptureOnly=false,mammalsObservationOnly=false,commentDefinedOnly=false,commentAdminDefinedOnly=false,commentCompanyDefinedOnly=false,companyAcceptations=[null, true],programAcceptations=[null, true],completeSamplings=<null>,filterOnObservationBeginDate=true,sortedByBoardingDate=false] is from fr.ifremer.wao.entity.Contact c where (c.sampleRow.topiaId in (select sr.topiaId from fr.ifremer.wao.entity.SampleRow sr where (sr.obsProgramOrdinal = :obsProgramOrdinal) and (sr.topiaId = :topiaId) and (sr.periodEnd >= :periodFromMonth) and (sr.periodEnd <= :periodToMonth) and (sr.topiaId in (select sr2.topiaId from fr.ifremer.wao.entity.SampleRowImpl as sr2 join sr2.dCF5Code as dcf where dcf.fishingGearDCF.topiaId in (:fishingGearDcfIds))))) and (c.observationBeginDate >= :periodFrom) and (c.observationBeginDate <= :periodTo) and (c.state = :state) and ( c.validationCompany in ( :validationCompany ) or c.validationCompany is null) and ( c.validationProgram in ( :validationProgram ) or c.validationProgram is null) {obsProgramOrdinal=0, topiaId=fr.ifremer.wao.entity.SampleRow#1395788883206#0.14314465804642373, periodFromMonth=Thu Apr 01 00:00:00 CEST 2010, periodToMonth=Tue Mar 01 00:00:00 CET 2011, fishingGearDcfIds=[fr.ifremer.wao.entity.FishingGearDCF#1395788870097#0.6052098891633803], periodFrom=Thu Apr 01 00:00:00 CEST 2010, periodTo=Tue Mar 01 00:00:00 CET 2011, state=2, validationCompany=[null, true], validationProgram=[null, true]} 2014/03/26 12:08:03 TRACE (FakeWaoServiceContext.java:50) getNow injecting fake date in service: Sat May 15 00:00:00 CEST 2010 2014/03/26 12:08:03 TRACE (SampleRowTopiaDao.java:149) toSampleRowHqlAndParametersBuilder query to filter sample rows for fr.ifremer.wao.SampleRowsFilter@10f679f2[obsProgram=OBSMER,sampleRowIds=<null>,periodFrom=Thu Apr 01 00:00:00 CEST 2010,periodTo=Tue Mar 01 00:00:00 CET 2011,fishingZoneFacadeNames=<null>,fishingZoneSectorNames=<null>,sampleRowCodes=<null>,programNames=<null>,fishingGearDcfIds=<null>,targetSpeciesDcfIds=[fr.ifremer.wao.entity.TargetSpeciesDCF#1395788870101#0.7788242816671336],samplingStrategies=<null>,terrestrialDistrictIds=<null>,companyIds=<null>,orderByArguments=<null>] is from fr.ifremer.wao.entity.SampleRow sr where (sr.obsProgramOrdinal = :obsProgramOrdinal) and (sr.periodEnd >= :periodFromMonth) and (sr.periodEnd <= :periodToMonth) and (sr.topiaId in (select sr2.topiaId from fr.ifremer.wao.entity.SampleRowImpl as sr2 join sr2.dCF5Code as dcf where dcf.targetSpeciesDCF.topiaId in (:targetSpeciesDcfIds))) {obsProgramOrdinal=0, periodFromMonth=Thu Apr 01 00:00:00 CEST 2010, periodToMonth=Tue Mar 01 00:00:00 CET 2011, targetSpeciesDcfIds=[fr.ifremer.wao.entity.TargetSpeciesDCF#1395788870101#0.7788242816671336]} 2014/03/26 12:08:03 TRACE (SampleRowTopiaDao.java:149) toSampleRowHqlAndParametersBuilder query to filter sample rows for fr.ifremer.wao.SampleRowsFilter@10f679f2[obsProgram=OBSMER,sampleRowIds=[fr.ifremer.wao.entity.SampleRow#1395788883148#0.5685673585906867],periodFrom=Thu Apr 01 00:00:00 CEST 2010,periodTo=Tue Mar 01 00:00:00 CET 2011,fishingZoneFacadeNames=<null>,fishingZoneSectorNames=<null>,sampleRowCodes=<null>,programNames=<null>,fishingGearDcfIds=<null>,targetSpeciesDcfIds=[fr.ifremer.wao.entity.TargetSpeciesDCF#1395788870101#0.7788242816671336],samplingStrategies=<null>,terrestrialDistrictIds=<null>,companyIds=<null>,orderByArguments=<null>] is from fr.ifremer.wao.entity.SampleRow sr where (sr.obsProgramOrdinal = :obsProgramOrdinal) and (sr.topiaId = :topiaId) and (sr.periodEnd >= :periodFromMonth) and (sr.periodEnd <= :periodToMonth) and (sr.topiaId in (select sr2.topiaId from fr.ifremer.wao.entity.SampleRowImpl as sr2 join sr2.dCF5Code as dcf where dcf.targetSpeciesDCF.topiaId in (:targetSpeciesDcfIds))) {obsProgramOrdinal=0, topiaId=fr.ifremer.wao.entity.SampleRow#1395788883148#0.5685673585906867, periodFromMonth=Thu Apr 01 00:00:00 CEST 2010, periodToMonth=Tue Mar 01 00:00:00 CET 2011, targetSpeciesDcfIds=[fr.ifremer.wao.entity.TargetSpeciesDCF#1395788870101#0.7788242816671336]} 2014/03/26 12:08:03 TRACE (ContactTopiaDao.java:157) toSampleRowHqlAndParametersBuilder query to filter contacts for fr.ifremer.wao.ContactsFilter@2a6026de[sampleRowFilter=fr.ifremer.wao.SampleRowsFilter@10f679f2[obsProgram=OBSMER,sampleRowIds=[fr.ifremer.wao.entity.SampleRow#1395788883148#0.5685673585906867],periodFrom=Thu Apr 01 00:00:00 CEST 2010,periodTo=Tue Mar 01 00:00:00 CET 2011,fishingZoneFacadeNames=<null>,fishingZoneSectorNames=<null>,sampleRowCodes=<null>,programNames=<null>,fishingGearDcfIds=<null>,targetSpeciesDcfIds=[fr.ifremer.wao.entity.TargetSpeciesDCF#1395788870101#0.7788242816671336],samplingStrategies=<null>,terrestrialDistrictIds=<null>,companyIds=<null>,orderByArguments=<null>],periodFrom=Thu Apr 01 00:00:00 CEST 2010,periodTo=Tue Mar 01 00:00:00 CET 2011,contactIds=<null>,contactStates=[OBSERVATION_DONE],dataReliabilities=<null>,actualSamplingStrategies=<null>,observationTypes=<null>,observedDataControls=<null>,observerIds=<null>,terrestrialLocationIds=<null>,contactStateMotiveIds=<null>,mammalsCaptureOnly=false,mammalsObservationOnly=false,commentDefinedOnly=false,commentAdminDefinedOnly=false,commentCompanyDefinedOnly=false,companyAcceptations=[null, true],programAcceptations=[null, true],completeSamplings=<null>,filterOnObservationBeginDate=true,sortedByBoardingDate=false] is from fr.ifremer.wao.entity.Contact c where (c.sampleRow.topiaId in (select sr.topiaId from fr.ifremer.wao.entity.SampleRow sr where (sr.obsProgramOrdinal = :obsProgramOrdinal) and (sr.topiaId = :topiaId) and (sr.periodEnd >= :periodFromMonth) and (sr.periodEnd <= :periodToMonth) and (sr.topiaId in (select sr2.topiaId from fr.ifremer.wao.entity.SampleRowImpl as sr2 join sr2.dCF5Code as dcf where dcf.targetSpeciesDCF.topiaId in (:targetSpeciesDcfIds))))) and (c.observationBeginDate >= :periodFrom) and (c.observationBeginDate <= :periodTo) and (c.state = :state) and ( c.validationCompany in ( :validationCompany ) or c.validationCompany is null) and ( c.validationProgram in ( :validationProgram ) or c.validationProgram is null) {obsProgramOrdinal=0, topiaId=fr.ifremer.wao.entity.SampleRow#1395788883148#0.5685673585906867, periodFromMonth=Thu Apr 01 00:00:00 CEST 2010, periodToMonth=Tue Mar 01 00:00:00 CET 2011, targetSpeciesDcfIds=[fr.ifremer.wao.entity.TargetSpeciesDCF#1395788870101#0.7788242816671336], periodFrom=Thu Apr 01 00:00:00 CEST 2010, periodTo=Tue Mar 01 00:00:00 CET 2011, state=2, validationCompany=[null, true], validationProgram=[null, true]} 2014/03/26 12:08:03 TRACE (SampleRowTopiaDao.java:149) toSampleRowHqlAndParametersBuilder query to filter sample rows for fr.ifremer.wao.SampleRowsFilter@10f679f2[obsProgram=OBSMER,sampleRowIds=[fr.ifremer.wao.entity.SampleRow#1395788883158#0.8007613842010958],periodFrom=Thu Apr 01 00:00:00 CEST 2010,periodTo=Tue Mar 01 00:00:00 CET 2011,fishingZoneFacadeNames=<null>,fishingZoneSectorNames=<null>,sampleRowCodes=<null>,programNames=<null>,fishingGearDcfIds=<null>,targetSpeciesDcfIds=[fr.ifremer.wao.entity.TargetSpeciesDCF#1395788870101#0.7788242816671336],samplingStrategies=<null>,terrestrialDistrictIds=<null>,companyIds=<null>,orderByArguments=<null>] is from fr.ifremer.wao.entity.SampleRow sr where (sr.obsProgramOrdinal = :obsProgramOrdinal) and (sr.topiaId = :topiaId) and (sr.periodEnd >= :periodFromMonth) and (sr.periodEnd <= :periodToMonth) and (sr.topiaId in (select sr2.topiaId from fr.ifremer.wao.entity.SampleRowImpl as sr2 join sr2.dCF5Code as dcf where dcf.targetSpeciesDCF.topiaId in (:targetSpeciesDcfIds))) {obsProgramOrdinal=0, topiaId=fr.ifremer.wao.entity.SampleRow#1395788883158#0.8007613842010958, periodFromMonth=Thu Apr 01 00:00:00 CEST 2010, periodToMonth=Tue Mar 01 00:00:00 CET 2011, targetSpeciesDcfIds=[fr.ifremer.wao.entity.TargetSpeciesDCF#1395788870101#0.7788242816671336]} 2014/03/26 12:08:03 TRACE (ContactTopiaDao.java:157) toSampleRowHqlAndParametersBuilder query to filter contacts for fr.ifremer.wao.ContactsFilter@3f3415b1[sampleRowFilter=fr.ifremer.wao.SampleRowsFilter@10f679f2[obsProgram=OBSMER,sampleRowIds=[fr.ifremer.wao.entity.SampleRow#1395788883158#0.8007613842010958],periodFrom=Thu Apr 01 00:00:00 CEST 2010,periodTo=Tue Mar 01 00:00:00 CET 2011,fishingZoneFacadeNames=<null>,fishingZoneSectorNames=<null>,sampleRowCodes=<null>,programNames=<null>,fishingGearDcfIds=<null>,targetSpeciesDcfIds=[fr.ifremer.wao.entity.TargetSpeciesDCF#1395788870101#0.7788242816671336],samplingStrategies=<null>,terrestrialDistrictIds=<null>,companyIds=<null>,orderByArguments=<null>],periodFrom=Thu Apr 01 00:00:00 CEST 2010,periodTo=Tue Mar 01 00:00:00 CET 2011,contactIds=<null>,contactStates=[OBSERVATION_DONE],dataReliabilities=<null>,actualSamplingStrategies=<null>,observationTypes=<null>,observedDataControls=<null>,observerIds=<null>,terrestrialLocationIds=<null>,contactStateMotiveIds=<null>,mammalsCaptureOnly=false,mammalsObservationOnly=false,commentDefinedOnly=false,commentAdminDefinedOnly=false,commentCompanyDefinedOnly=false,companyAcceptations=[null, true],programAcceptations=[null, true],completeSamplings=<null>,filterOnObservationBeginDate=true,sortedByBoardingDate=false] is from fr.ifremer.wao.entity.Contact c where (c.sampleRow.topiaId in (select sr.topiaId from fr.ifremer.wao.entity.SampleRow sr where (sr.obsProgramOrdinal = :obsProgramOrdinal) and (sr.topiaId = :topiaId) and (sr.periodEnd >= :periodFromMonth) and (sr.periodEnd <= :periodToMonth) and (sr.topiaId in (select sr2.topiaId from fr.ifremer.wao.entity.SampleRowImpl as sr2 join sr2.dCF5Code as dcf where dcf.targetSpeciesDCF.topiaId in (:targetSpeciesDcfIds))))) and (c.observationBeginDate >= :periodFrom) and (c.observationBeginDate <= :periodTo) and (c.state = :state) and ( c.validationCompany in ( :validationCompany ) or c.validationCompany is null) and ( c.validationProgram in ( :validationProgram ) or c.validationProgram is null) {obsProgramOrdinal=0, topiaId=fr.ifremer.wao.entity.SampleRow#1395788883158#0.8007613842010958, periodFromMonth=Thu Apr 01 00:00:00 CEST 2010, periodToMonth=Tue Mar 01 00:00:00 CET 2011, targetSpeciesDcfIds=[fr.ifremer.wao.entity.TargetSpeciesDCF#1395788870101#0.7788242816671336], periodFrom=Thu Apr 01 00:00:00 CEST 2010, periodTo=Tue Mar 01 00:00:00 CET 2011, state=2, validationCompany=[null, true], validationProgram=[null, true]} 2014/03/26 12:08:03 TRACE (SampleRowTopiaDao.java:149) toSampleRowHqlAndParametersBuilder query to filter sample rows for fr.ifremer.wao.SampleRowsFilter@10f679f2[obsProgram=OBSMER,sampleRowIds=[fr.ifremer.wao.entity.SampleRow#1395788883191#0.5358399466645478],periodFrom=Thu Apr 01 00:00:00 CEST 2010,periodTo=Tue Mar 01 00:00:00 CET 2011,fishingZoneFacadeNames=<null>,fishingZoneSectorNames=<null>,sampleRowCodes=<null>,programNames=<null>,fishingGearDcfIds=<null>,targetSpeciesDcfIds=[fr.ifremer.wao.entity.TargetSpeciesDCF#1395788870101#0.7788242816671336],samplingStrategies=<null>,terrestrialDistrictIds=<null>,companyIds=<null>,orderByArguments=<null>] is from fr.ifremer.wao.entity.SampleRow sr where (sr.obsProgramOrdinal = :obsProgramOrdinal) and (sr.topiaId = :topiaId) and (sr.periodEnd >= :periodFromMonth) and (sr.periodEnd <= :periodToMonth) and (sr.topiaId in (select sr2.topiaId from fr.ifremer.wao.entity.SampleRowImpl as sr2 join sr2.dCF5Code as dcf where dcf.targetSpeciesDCF.topiaId in (:targetSpeciesDcfIds))) {obsProgramOrdinal=0, topiaId=fr.ifremer.wao.entity.SampleRow#1395788883191#0.5358399466645478, periodFromMonth=Thu Apr 01 00:00:00 CEST 2010, periodToMonth=Tue Mar 01 00:00:00 CET 2011, targetSpeciesDcfIds=[fr.ifremer.wao.entity.TargetSpeciesDCF#1395788870101#0.7788242816671336]} 2014/03/26 12:08:03 TRACE (ContactTopiaDao.java:157) toSampleRowHqlAndParametersBuilder query to filter contacts for fr.ifremer.wao.ContactsFilter@2726737f[sampleRowFilter=fr.ifremer.wao.SampleRowsFilter@10f679f2[obsProgram=OBSMER,sampleRowIds=[fr.ifremer.wao.entity.SampleRow#1395788883191#0.5358399466645478],periodFrom=Thu Apr 01 00:00:00 CEST 2010,periodTo=Tue Mar 01 00:00:00 CET 2011,fishingZoneFacadeNames=<null>,fishingZoneSectorNames=<null>,sampleRowCodes=<null>,programNames=<null>,fishingGearDcfIds=<null>,targetSpeciesDcfIds=[fr.ifremer.wao.entity.TargetSpeciesDCF#1395788870101#0.7788242816671336],samplingStrategies=<null>,terrestrialDistrictIds=<null>,companyIds=<null>,orderByArguments=<null>],periodFrom=Thu Apr 01 00:00:00 CEST 2010,periodTo=Tue Mar 01 00:00:00 CET 2011,contactIds=<null>,contactStates=[OBSERVATION_DONE],dataReliabilities=<null>,actualSamplingStrategies=<null>,observationTypes=<null>,observedDataControls=<null>,observerIds=<null>,terrestrialLocationIds=<null>,contactStateMotiveIds=<null>,mammalsCaptureOnly=false,mammalsObservationOnly=false,commentDefinedOnly=false,commentAdminDefinedOnly=false,commentCompanyDefinedOnly=false,companyAcceptations=[null, true],programAcceptations=[null, true],completeSamplings=<null>,filterOnObservationBeginDate=true,sortedByBoardingDate=false] is from fr.ifremer.wao.entity.Contact c where (c.sampleRow.topiaId in (select sr.topiaId from fr.ifremer.wao.entity.SampleRow sr where (sr.obsProgramOrdinal = :obsProgramOrdinal) and (sr.topiaId = :topiaId) and (sr.periodEnd >= :periodFromMonth) and (sr.periodEnd <= :periodToMonth) and (sr.topiaId in (select sr2.topiaId from fr.ifremer.wao.entity.SampleRowImpl as sr2 join sr2.dCF5Code as dcf where dcf.targetSpeciesDCF.topiaId in (:targetSpeciesDcfIds))))) and (c.observationBeginDate >= :periodFrom) and (c.observationBeginDate <= :periodTo) and (c.state = :state) and ( c.validationCompany in ( :validationCompany ) or c.validationCompany is null) and ( c.validationProgram in ( :validationProgram ) or c.validationProgram is null) {obsProgramOrdinal=0, topiaId=fr.ifremer.wao.entity.SampleRow#1395788883191#0.5358399466645478, periodFromMonth=Thu Apr 01 00:00:00 CEST 2010, periodToMonth=Tue Mar 01 00:00:00 CET 2011, targetSpeciesDcfIds=[fr.ifremer.wao.entity.TargetSpeciesDCF#1395788870101#0.7788242816671336], periodFrom=Thu Apr 01 00:00:00 CEST 2010, periodTo=Tue Mar 01 00:00:00 CET 2011, state=2, validationCompany=[null, true], validationProgram=[null, true]} 2014/03/26 12:08:03 TRACE (SampleRowTopiaDao.java:149) toSampleRowHqlAndParametersBuilder query to filter sample rows for fr.ifremer.wao.SampleRowsFilter@10f679f2[obsProgram=OBSMER,sampleRowIds=[fr.ifremer.wao.entity.SampleRow#1395788883206#0.14314465804642373],periodFrom=Thu Apr 01 00:00:00 CEST 2010,periodTo=Tue Mar 01 00:00:00 CET 2011,fishingZoneFacadeNames=<null>,fishingZoneSectorNames=<null>,sampleRowCodes=<null>,programNames=<null>,fishingGearDcfIds=<null>,targetSpeciesDcfIds=[fr.ifremer.wao.entity.TargetSpeciesDCF#1395788870101#0.7788242816671336],samplingStrategies=<null>,terrestrialDistrictIds=<null>,companyIds=<null>,orderByArguments=<null>] is from fr.ifremer.wao.entity.SampleRow sr where (sr.obsProgramOrdinal = :obsProgramOrdinal) and (sr.topiaId = :topiaId) and (sr.periodEnd >= :periodFromMonth) and (sr.periodEnd <= :periodToMonth) and (sr.topiaId in (select sr2.topiaId from fr.ifremer.wao.entity.SampleRowImpl as sr2 join sr2.dCF5Code as dcf where dcf.targetSpeciesDCF.topiaId in (:targetSpeciesDcfIds))) {obsProgramOrdinal=0, topiaId=fr.ifremer.wao.entity.SampleRow#1395788883206#0.14314465804642373, periodFromMonth=Thu Apr 01 00:00:00 CEST 2010, periodToMonth=Tue Mar 01 00:00:00 CET 2011, targetSpeciesDcfIds=[fr.ifremer.wao.entity.TargetSpeciesDCF#1395788870101#0.7788242816671336]} 2014/03/26 12:08:03 TRACE (ContactTopiaDao.java:157) toSampleRowHqlAndParametersBuilder query to filter contacts for fr.ifremer.wao.ContactsFilter@75f0e333[sampleRowFilter=fr.ifremer.wao.SampleRowsFilter@10f679f2[obsProgram=OBSMER,sampleRowIds=[fr.ifremer.wao.entity.SampleRow#1395788883206#0.14314465804642373],periodFrom=Thu Apr 01 00:00:00 CEST 2010,periodTo=Tue Mar 01 00:00:00 CET 2011,fishingZoneFacadeNames=<null>,fishingZoneSectorNames=<null>,sampleRowCodes=<null>,programNames=<null>,fishingGearDcfIds=<null>,targetSpeciesDcfIds=[fr.ifremer.wao.entity.TargetSpeciesDCF#1395788870101#0.7788242816671336],samplingStrategies=<null>,terrestrialDistrictIds=<null>,companyIds=<null>,orderByArguments=<null>],periodFrom=Thu Apr 01 00:00:00 CEST 2010,periodTo=Tue Mar 01 00:00:00 CET 2011,contactIds=<null>,contactStates=[OBSERVATION_DONE],dataReliabilities=<null>,actualSamplingStrategies=<null>,observationTypes=<null>,observedDataControls=<null>,observerIds=<null>,terrestrialLocationIds=<null>,contactStateMotiveIds=<null>,mammalsCaptureOnly=false,mammalsObservationOnly=false,commentDefinedOnly=false,commentAdminDefinedOnly=false,commentCompanyDefinedOnly=false,companyAcceptations=[null, true],programAcceptations=[null, true],completeSamplings=<null>,filterOnObservationBeginDate=true,sortedByBoardingDate=false] is from fr.ifremer.wao.entity.Contact c where (c.sampleRow.topiaId in (select sr.topiaId from fr.ifremer.wao.entity.SampleRow sr where (sr.obsProgramOrdinal = :obsProgramOrdinal) and (sr.topiaId = :topiaId) and (sr.periodEnd >= :periodFromMonth) and (sr.periodEnd <= :periodToMonth) and (sr.topiaId in (select sr2.topiaId from fr.ifremer.wao.entity.SampleRowImpl as sr2 join sr2.dCF5Code as dcf where dcf.targetSpeciesDCF.topiaId in (:targetSpeciesDcfIds))))) and (c.observationBeginDate >= :periodFrom) and (c.observationBeginDate <= :periodTo) and (c.state = :state) and ( c.validationCompany in ( :validationCompany ) or c.validationCompany is null) and ( c.validationProgram in ( :validationProgram ) or c.validationProgram is null) {obsProgramOrdinal=0, topiaId=fr.ifremer.wao.entity.SampleRow#1395788883206#0.14314465804642373, periodFromMonth=Thu Apr 01 00:00:00 CEST 2010, periodToMonth=Tue Mar 01 00:00:00 CET 2011, targetSpeciesDcfIds=[fr.ifremer.wao.entity.TargetSpeciesDCF#1395788870101#0.7788242816671336], periodFrom=Thu Apr 01 00:00:00 CEST 2010, periodTo=Tue Mar 01 00:00:00 CET 2011, state=2, validationCompany=[null, true], validationProgram=[null, true]} 2014/03/26 12:08:03 TRACE (FakeWaoServiceContext.java:50) getNow injecting fake date in service: Sat May 15 00:00:00 CEST 2010 2014/03/26 12:08:03 TRACE (SampleRowTopiaDao.java:149) toSampleRowHqlAndParametersBuilder query to filter sample rows for fr.ifremer.wao.SampleRowsFilter@51182c3c[obsProgram=OBSMER,sampleRowIds=<null>,periodFrom=Thu Apr 01 00:00:00 CEST 2010,periodTo=Tue Mar 01 00:00:00 CET 2011,fishingZoneFacadeNames=<null>,fishingZoneSectorNames=<null>,sampleRowCodes=<null>,programNames=<null>,fishingGearDcfIds=[fr.ifremer.wao.entity.FishingGearDCF#1395788870097#0.6052098891633803],targetSpeciesDcfIds=[fr.ifremer.wao.entity.TargetSpeciesDCF#1395788870101#0.7788242816671336],samplingStrategies=<null>,terrestrialDistrictIds=<null>,companyIds=<null>,orderByArguments=<null>] is from fr.ifremer.wao.entity.SampleRow sr where (sr.obsProgramOrdinal = :obsProgramOrdinal) and (sr.periodEnd >= :periodFromMonth) and (sr.periodEnd <= :periodToMonth) and (sr.topiaId in (select sr2.topiaId from fr.ifremer.wao.entity.SampleRowImpl as sr2 join sr2.dCF5Code as dcf where dcf.fishingGearDCF.topiaId in (:fishingGearDcfIds))) and (sr.topiaId in (select sr2.topiaId from fr.ifremer.wao.entity.SampleRowImpl as sr2 join sr2.dCF5Code as dcf where dcf.targetSpeciesDCF.topiaId in (:targetSpeciesDcfIds))) {obsProgramOrdinal=0, periodFromMonth=Thu Apr 01 00:00:00 CEST 2010, periodToMonth=Tue Mar 01 00:00:00 CET 2011, fishingGearDcfIds=[fr.ifremer.wao.entity.FishingGearDCF#1395788870097#0.6052098891633803], targetSpeciesDcfIds=[fr.ifremer.wao.entity.TargetSpeciesDCF#1395788870101#0.7788242816671336]} 2014/03/26 12:08:03 TRACE (SampleRowTopiaDao.java:149) toSampleRowHqlAndParametersBuilder query to filter sample rows for fr.ifremer.wao.SampleRowsFilter@51182c3c[obsProgram=OBSMER,sampleRowIds=[fr.ifremer.wao.entity.SampleRow#1395788883206#0.14314465804642373],periodFrom=Thu Apr 01 00:00:00 CEST 2010,periodTo=Tue Mar 01 00:00:00 CET 2011,fishingZoneFacadeNames=<null>,fishingZoneSectorNames=<null>,sampleRowCodes=<null>,programNames=<null>,fishingGearDcfIds=[fr.ifremer.wao.entity.FishingGearDCF#1395788870097#0.6052098891633803],targetSpeciesDcfIds=[fr.ifremer.wao.entity.TargetSpeciesDCF#1395788870101#0.7788242816671336],samplingStrategies=<null>,terrestrialDistrictIds=<null>,companyIds=<null>,orderByArguments=<null>] is from fr.ifremer.wao.entity.SampleRow sr where (sr.obsProgramOrdinal = :obsProgramOrdinal) and (sr.topiaId = :topiaId) and (sr.periodEnd >= :periodFromMonth) and (sr.periodEnd <= :periodToMonth) and (sr.topiaId in (select sr2.topiaId from fr.ifremer.wao.entity.SampleRowImpl as sr2 join sr2.dCF5Code as dcf where dcf.fishingGearDCF.topiaId in (:fishingGearDcfIds))) and (sr.topiaId in (select sr2.topiaId from fr.ifremer.wao.entity.SampleRowImpl as sr2 join sr2.dCF5Code as dcf where dcf.targetSpeciesDCF.topiaId in (:targetSpeciesDcfIds))) {obsProgramOrdinal=0, topiaId=fr.ifremer.wao.entity.SampleRow#1395788883206#0.14314465804642373, periodFromMonth=Thu Apr 01 00:00:00 CEST 2010, periodToMonth=Tue Mar 01 00:00:00 CET 2011, fishingGearDcfIds=[fr.ifremer.wao.entity.FishingGearDCF#1395788870097#0.6052098891633803], targetSpeciesDcfIds=[fr.ifremer.wao.entity.TargetSpeciesDCF#1395788870101#0.7788242816671336]} 2014/03/26 12:08:03 TRACE (ContactTopiaDao.java:157) toSampleRowHqlAndParametersBuilder query to filter contacts for fr.ifremer.wao.ContactsFilter@4b427d62[sampleRowFilter=fr.ifremer.wao.SampleRowsFilter@51182c3c[obsProgram=OBSMER,sampleRowIds=[fr.ifremer.wao.entity.SampleRow#1395788883206#0.14314465804642373],periodFrom=Thu Apr 01 00:00:00 CEST 2010,periodTo=Tue Mar 01 00:00:00 CET 2011,fishingZoneFacadeNames=<null>,fishingZoneSectorNames=<null>,sampleRowCodes=<null>,programNames=<null>,fishingGearDcfIds=[fr.ifremer.wao.entity.FishingGearDCF#1395788870097#0.6052098891633803],targetSpeciesDcfIds=[fr.ifremer.wao.entity.TargetSpeciesDCF#1395788870101#0.7788242816671336],samplingStrategies=<null>,terrestrialDistrictIds=<null>,companyIds=<null>,orderByArguments=<null>],periodFrom=Thu Apr 01 00:00:00 CEST 2010,periodTo=Tue Mar 01 00:00:00 CET 2011,contactIds=<null>,contactStates=[OBSERVATION_DONE],dataReliabilities=<null>,actualSamplingStrategies=<null>,observationTypes=<null>,observedDataControls=<null>,observerIds=<null>,terrestrialLocationIds=<null>,contactStateMotiveIds=<null>,mammalsCaptureOnly=false,mammalsObservationOnly=false,commentDefinedOnly=false,commentAdminDefinedOnly=false,commentCompanyDefinedOnly=false,companyAcceptations=[null, true],programAcceptations=[null, true],completeSamplings=<null>,filterOnObservationBeginDate=true,sortedByBoardingDate=false] is from fr.ifremer.wao.entity.Contact c where (c.sampleRow.topiaId in (select sr.topiaId from fr.ifremer.wao.entity.SampleRow sr where (sr.obsProgramOrdinal = :obsProgramOrdinal) and (sr.topiaId = :topiaId) and (sr.periodEnd >= :periodFromMonth) and (sr.periodEnd <= :periodToMonth) and (sr.topiaId in (select sr2.topiaId from fr.ifremer.wao.entity.SampleRowImpl as sr2 join sr2.dCF5Code as dcf where dcf.fishingGearDCF.topiaId in (:fishingGearDcfIds))) and (sr.topiaId in (select sr2.topiaId from fr.ifremer.wao.entity.SampleRowImpl as sr2 join sr2.dCF5Code as dcf where dcf.targetSpeciesDCF.topiaId in (:targetSpeciesDcfIds))))) and (c.observationBeginDate >= :periodFrom) and (c.observationBeginDate <= :periodTo) and (c.state = :state) and ( c.validationCompany in ( :validationCompany ) or c.validationCompany is null) and ( c.validationProgram in ( :validationProgram ) or c.validationProgram is null) {obsProgramOrdinal=0, topiaId=fr.ifremer.wao.entity.SampleRow#1395788883206#0.14314465804642373, periodFromMonth=Thu Apr 01 00:00:00 CEST 2010, periodToMonth=Tue Mar 01 00:00:00 CET 2011, fishingGearDcfIds=[fr.ifremer.wao.entity.FishingGearDCF#1395788870097#0.6052098891633803], targetSpeciesDcfIds=[fr.ifremer.wao.entity.TargetSpeciesDCF#1395788870101#0.7788242816671336], periodFrom=Thu Apr 01 00:00:00 CEST 2010, periodTo=Tue Mar 01 00:00:00 CET 2011, state=2, validationCompany=[null, true], validationProgram=[null, true]} 2014/03/26 12:08:03 TRACE (AbstractWaoServiceTest.java:217) tearDown closing transaction fr.ifremer.wao.WaoTopiaPersistenceContext@7a282d91 2014/03/26 12:08:03 TRACE (AbstractWaoServiceTest.java:217) tearDown closing transaction fr.ifremer.wao.WaoTopiaPersistenceContext@59a0787c 2014/03/26 12:08:03 TRACE (AbstractWaoServiceTest.java:227) tearDown closing transaction fr.ifremer.wao.WaoTopiaApplicationContext@578237f6 Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 2.413 sec - in fr.ifremer.wao.services.service.ObsMerSamplingPlanServiceTest Running fr.ifremer.wao.services.service.csv.ObsMerObsVenteSamplingPlanImportExportModelTest Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.111 sec - in fr.ifremer.wao.services.service.csv.ObsMerObsVenteSamplingPlanImportExportModelTest Running fr.ifremer.wao.services.service.mail.EmailServiceTest 2014/03/26 12:08:03 TRACE (AbstractWaoServiceTest.java:83) newApplicationContext will store H2 data in <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…> 2014/03/26 12:08:03 TRACE (AbstractWaoServiceTest.java:84) newApplicationContext allJpaParameters = {hibernate.c3p0.max_statements=50, hibernate.c3p0.max_size=20, hibernate.c3p0.timeout=1800, hibernate.c3p0.min_size=5, hibernate.connection.url=jdbc:h2:<http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…,> hibernate.connection.driver_class=org.h2.Driver, hibernate.format_sql=true, hibernate.connection.username=sa, hibernate.connection.password=, hibernate.hbm2ddl.auto=update, hibernate.dialect=org.hibernate.dialect.H2Dialect, hibernate.show_sql=false, topia.persistence.topiaIdFactoryClassName=org.nuiton.topia.persistence.internal.LegacyTopiaIdFactory, hibernate.ejb.naming_strategy=org.hibernate.cfg.ImprovedNamingStrategy} 2014/03/26 12:08:03 DEBUG (AbstractWaoServiceTest.java:88) newApplicationContext jdbc url is jdbc:h2:<http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…> 2014/03/26 12:08:03 TRACE (AbstractWaoServiceTest.java:94) newApplicationContext created root context fr.ifremer.wao.WaoTopiaApplicationContext@58a89372 2014/03/26 12:08:04 TRACE (AbstractWaoServiceTest.java:202) newPersistenceContext opened transaction fr.ifremer.wao.WaoTopiaPersistenceContext@631dd1b0 2014/03/26 12:08:04 TRACE (AbstractWaoServiceTest.java:217) tearDown closing transaction fr.ifremer.wao.WaoTopiaPersistenceContext@631dd1b0 2014/03/26 12:08:04 TRACE (AbstractWaoServiceTest.java:227) tearDown closing transaction fr.ifremer.wao.WaoTopiaApplicationContext@58a89372 Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.449 sec - in fr.ifremer.wao.services.service.mail.EmailServiceTest Running fr.ifremer.wao.services.service.administration.WaoUsersServiceTest 2014/03/26 12:08:04 TRACE (AbstractWaoServiceTest.java:83) newApplicationContext will store H2 data in <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…> 2014/03/26 12:08:04 TRACE (AbstractWaoServiceTest.java:84) newApplicationContext allJpaParameters = {hibernate.c3p0.max_statements=50, hibernate.c3p0.max_size=20, hibernate.c3p0.timeout=1800, hibernate.c3p0.min_size=5, hibernate.connection.url=jdbc:h2:<http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…,> hibernate.connection.driver_class=org.h2.Driver, hibernate.format_sql=true, hibernate.connection.username=sa, hibernate.connection.password=, hibernate.hbm2ddl.auto=update, hibernate.dialect=org.hibernate.dialect.H2Dialect, hibernate.show_sql=false, topia.persistence.topiaIdFactoryClassName=org.nuiton.topia.persistence.internal.LegacyTopiaIdFactory, hibernate.ejb.naming_strategy=org.hibernate.cfg.ImprovedNamingStrategy} 2014/03/26 12:08:04 DEBUG (AbstractWaoServiceTest.java:88) newApplicationContext jdbc url is jdbc:h2:<http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…> 2014/03/26 12:08:04 TRACE (AbstractWaoServiceTest.java:94) newApplicationContext created root context fr.ifremer.wao.WaoTopiaApplicationContext@2f53db06 2014/03/26 12:08:04 TRACE (AbstractWaoServiceTest.java:202) newPersistenceContext opened transaction fr.ifremer.wao.WaoTopiaPersistenceContext@238661f8 2014/03/26 12:08:04 DEBUG (WaoUsersServiceTest.java:47) testNewPassword awHTVgLD 2014/03/26 12:08:04 DEBUG (WaoUsersServiceTest.java:48) testNewPassword F5qFwXRS 2014/03/26 12:08:04 DEBUG (WaoUsersServiceTest.java:49) testNewPassword 7P4mEbGf 2014/03/26 12:08:04 TRACE (AbstractWaoServiceTest.java:217) tearDown closing transaction fr.ifremer.wao.WaoTopiaPersistenceContext@238661f8 2014/03/26 12:08:04 TRACE (AbstractWaoServiceTest.java:227) tearDown closing transaction fr.ifremer.wao.WaoTopiaApplicationContext@2f53db06 Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.386 sec - in fr.ifremer.wao.services.service.administration.WaoUsersServiceTest Running fr.ifremer.wao.services.service.administration.ReferentialServiceTest 2014/03/26 12:08:04 TRACE (AbstractWaoServiceTest.java:83) newApplicationContext will store H2 data in <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…> 2014/03/26 12:08:04 TRACE (AbstractWaoServiceTest.java:84) newApplicationContext allJpaParameters = {hibernate.c3p0.max_statements=50, hibernate.c3p0.max_size=20, hibernate.c3p0.timeout=1800, hibernate.c3p0.min_size=5, hibernate.connection.url=jdbc:h2:<http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…,> hibernate.connection.driver_class=org.h2.Driver, hibernate.format_sql=true, hibernate.connection.username=sa, hibernate.connection.password=, hibernate.hbm2ddl.auto=update, hibernate.dialect=org.hibernate.dialect.H2Dialect, hibernate.show_sql=false, topia.persistence.topiaIdFactoryClassName=org.nuiton.topia.persistence.internal.LegacyTopiaIdFactory, hibernate.ejb.naming_strategy=org.hibernate.cfg.ImprovedNamingStrategy} 2014/03/26 12:08:04 DEBUG (AbstractWaoServiceTest.java:88) newApplicationContext jdbc url is jdbc:h2:<http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…> 2014/03/26 12:08:04 TRACE (AbstractWaoServiceTest.java:94) newApplicationContext created root context fr.ifremer.wao.WaoTopiaApplicationContext@6a9f8e49 2014/03/26 12:08:04 TRACE (AbstractWaoServiceTest.java:202) newPersistenceContext opened transaction fr.ifremer.wao.WaoTopiaPersistenceContext@3b6823d8 2014/03/26 12:08:06 INFO (ReferentialService.java:375) importTerrestrialLocations 1248 terrestrial locations added, 0 updated 2014/03/26 12:08:06 INFO (ReferentialService.java:376) importTerrestrialLocations 50 terrestrial district added, 0 updated 2014/03/26 12:08:06 INFO (ReferentialService.java:377) importTerrestrialLocations 18 terrestrial region added, 28 updated 2014/03/26 12:08:06 TRACE (FakeWaoServiceContext.java:50) getNow injecting fake date in service: Mon Nov 02 00:00:00 CET 2009 2014/03/26 12:08:08 TRACE (FakeWaoServiceContext.java:50) getNow injecting fake date in service: Mon Nov 02 00:00:00 CET 2009 2014/03/26 12:08:08 TRACE (AbstractWaoServiceTest.java:217) tearDown closing transaction fr.ifremer.wao.WaoTopiaPersistenceContext@3b6823d8 2014/03/26 12:08:08 TRACE (AbstractWaoServiceTest.java:227) tearDown closing transaction fr.ifremer.wao.WaoTopiaApplicationContext@6a9f8e49 2014/03/26 12:08:08 TRACE (AbstractWaoServiceTest.java:83) newApplicationContext will store H2 data in <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…> 2014/03/26 12:08:08 TRACE (AbstractWaoServiceTest.java:84) newApplicationContext allJpaParameters = {hibernate.c3p0.max_statements=50, hibernate.c3p0.max_size=20, hibernate.c3p0.timeout=1800, hibernate.c3p0.min_size=5, hibernate.connection.url=jdbc:h2:<http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…,> hibernate.connection.driver_class=org.h2.Driver, hibernate.format_sql=true, hibernate.connection.username=sa, hibernate.connection.password=, hibernate.hbm2ddl.auto=update, hibernate.dialect=org.hibernate.dialect.H2Dialect, hibernate.show_sql=false, topia.persistence.topiaIdFactoryClassName=org.nuiton.topia.persistence.internal.LegacyTopiaIdFactory, hibernate.ejb.naming_strategy=org.hibernate.cfg.ImprovedNamingStrategy} 2014/03/26 12:08:08 DEBUG (AbstractWaoServiceTest.java:88) newApplicationContext jdbc url is jdbc:h2:<http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…> 2014/03/26 12:08:08 TRACE (AbstractWaoServiceTest.java:94) newApplicationContext created root context fr.ifremer.wao.WaoTopiaApplicationContext@30405c1d 2014/03/26 12:08:08 TRACE (AbstractWaoServiceTest.java:202) newPersistenceContext opened transaction fr.ifremer.wao.WaoTopiaPersistenceContext@2cf10cfc 2014/03/26 12:08:10 INFO (ReferentialService.java:375) importTerrestrialLocations 1248 terrestrial locations added, 0 updated 2014/03/26 12:08:10 INFO (ReferentialService.java:376) importTerrestrialLocations 50 terrestrial district added, 0 updated 2014/03/26 12:08:10 INFO (ReferentialService.java:377) importTerrestrialLocations 18 terrestrial region added, 28 updated 2014/03/26 12:08:10 TRACE (FakeWaoServiceContext.java:50) getNow injecting fake date in service: Mon Nov 02 00:00:00 CET 2009 2014/03/26 12:08:10 TRACE (FakeWaoServiceContext.java:50) getNow injecting fake date in service: Mon Nov 02 00:00:00 CET 2009 2014/03/26 12:08:10 TRACE (FakeWaoServiceContext.java:50) getNow injecting fake date in service: Mon Nov 02 00:00:00 CET 2009 2014/03/26 12:08:10 TRACE (AbstractWaoServiceTest.java:217) tearDown closing transaction fr.ifremer.wao.WaoTopiaPersistenceContext@2cf10cfc 2014/03/26 12:08:10 TRACE (AbstractWaoServiceTest.java:227) tearDown closing transaction fr.ifremer.wao.WaoTopiaApplicationContext@30405c1d 2014/03/26 12:08:10 TRACE (AbstractWaoServiceTest.java:83) newApplicationContext will store H2 data in <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…> 2014/03/26 12:08:10 TRACE (AbstractWaoServiceTest.java:84) newApplicationContext allJpaParameters = {hibernate.c3p0.max_statements=50, hibernate.c3p0.max_size=20, hibernate.c3p0.timeout=1800, hibernate.c3p0.min_size=5, hibernate.connection.url=jdbc:h2:<http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…,> hibernate.connection.driver_class=org.h2.Driver, hibernate.format_sql=true, hibernate.connection.username=sa, hibernate.connection.password=, hibernate.hbm2ddl.auto=update, hibernate.dialect=org.hibernate.dialect.H2Dialect, hibernate.show_sql=false, topia.persistence.topiaIdFactoryClassName=org.nuiton.topia.persistence.internal.LegacyTopiaIdFactory, hibernate.ejb.naming_strategy=org.hibernate.cfg.ImprovedNamingStrategy} 2014/03/26 12:08:10 DEBUG (AbstractWaoServiceTest.java:88) newApplicationContext jdbc url is jdbc:h2:<http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…> 2014/03/26 12:08:10 TRACE (AbstractWaoServiceTest.java:94) newApplicationContext created root context fr.ifremer.wao.WaoTopiaApplicationContext@438a9b77 2014/03/26 12:08:10 TRACE (AbstractWaoServiceTest.java:202) newPersistenceContext opened transaction fr.ifremer.wao.WaoTopiaPersistenceContext@288757f1 2014/03/26 12:08:10 INFO (ReferentialService.java:673) initialDCF5CodesImport no DCF in database, mass import 2014/03/26 12:08:10 INFO (ReferentialService.java:741) initialDCF5CodesImport 53 dcf codes in database 2014/03/26 12:08:10 TRACE (AbstractWaoServiceTest.java:217) tearDown closing transaction fr.ifremer.wao.WaoTopiaPersistenceContext@288757f1 2014/03/26 12:08:10 TRACE (AbstractWaoServiceTest.java:227) tearDown closing transaction fr.ifremer.wao.WaoTopiaApplicationContext@438a9b77 2014/03/26 12:08:10 TRACE (AbstractWaoServiceTest.java:83) newApplicationContext will store H2 data in <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…> 2014/03/26 12:08:10 TRACE (AbstractWaoServiceTest.java:84) newApplicationContext allJpaParameters = {hibernate.c3p0.max_statements=50, hibernate.c3p0.max_size=20, hibernate.c3p0.timeout=1800, hibernate.c3p0.min_size=5, hibernate.connection.url=jdbc:h2:<http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…,> hibernate.connection.driver_class=org.h2.Driver, hibernate.format_sql=true, hibernate.connection.username=sa, hibernate.connection.password=, hibernate.hbm2ddl.auto=update, hibernate.dialect=org.hibernate.dialect.H2Dialect, hibernate.show_sql=false, topia.persistence.topiaIdFactoryClassName=org.nuiton.topia.persistence.internal.LegacyTopiaIdFactory, hibernate.ejb.naming_strategy=org.hibernate.cfg.ImprovedNamingStrategy} 2014/03/26 12:08:10 DEBUG (AbstractWaoServiceTest.java:88) newApplicationContext jdbc url is jdbc:h2:<http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…> 2014/03/26 12:08:10 TRACE (AbstractWaoServiceTest.java:94) newApplicationContext created root context fr.ifremer.wao.WaoTopiaApplicationContext@71c219ef 2014/03/26 12:08:11 TRACE (AbstractWaoServiceTest.java:202) newPersistenceContext opened transaction fr.ifremer.wao.WaoTopiaPersistenceContext@fbf4ae7 2014/03/26 12:08:12 INFO (ReferentialService.java:375) importTerrestrialLocations 1248 terrestrial locations added, 0 updated 2014/03/26 12:08:12 INFO (ReferentialService.java:376) importTerrestrialLocations 50 terrestrial district added, 0 updated 2014/03/26 12:08:12 INFO (ReferentialService.java:377) importTerrestrialLocations 18 terrestrial region added, 28 updated 2014/03/26 12:08:12 TRACE (FakeWaoServiceContext.java:50) getNow injecting fake date in service: Mon Nov 02 00:00:00 CET 2009 2014/03/26 12:08:12 DEBUG (ReferentialService.java:490) importTerrestrialDivisions 1181 ports, 18 regions 2014/03/26 12:08:14 DEBUG (ReferentialService.java:544) importTerrestrialDivisions 649 terrestrial divisions in database 2014/03/26 12:08:14 TRACE (FakeWaoServiceContext.java:50) getNow injecting fake date in service: Mon Nov 02 00:00:00 CET 2009 2014/03/26 12:08:14 TRACE (AbstractWaoServiceTest.java:217) tearDown closing transaction fr.ifremer.wao.WaoTopiaPersistenceContext@fbf4ae7 2014/03/26 12:08:14 TRACE (AbstractWaoServiceTest.java:227) tearDown closing transaction fr.ifremer.wao.WaoTopiaApplicationContext@71c219ef 2014/03/26 12:08:14 TRACE (AbstractWaoServiceTest.java:83) newApplicationContext will store H2 data in <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…> 2014/03/26 12:08:14 TRACE (AbstractWaoServiceTest.java:84) newApplicationContext allJpaParameters = {hibernate.c3p0.max_statements=50, hibernate.c3p0.max_size=20, hibernate.c3p0.timeout=1800, hibernate.c3p0.min_size=5, hibernate.connection.url=jdbc:h2:<http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…,> hibernate.connection.driver_class=org.h2.Driver, hibernate.format_sql=true, hibernate.connection.username=sa, hibernate.connection.password=, hibernate.hbm2ddl.auto=update, hibernate.dialect=org.hibernate.dialect.H2Dialect, hibernate.show_sql=false, topia.persistence.topiaIdFactoryClassName=org.nuiton.topia.persistence.internal.LegacyTopiaIdFactory, hibernate.ejb.naming_strategy=org.hibernate.cfg.ImprovedNamingStrategy} 2014/03/26 12:08:14 DEBUG (AbstractWaoServiceTest.java:88) newApplicationContext jdbc url is jdbc:h2:<http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…> 2014/03/26 12:08:14 TRACE (AbstractWaoServiceTest.java:94) newApplicationContext created root context fr.ifremer.wao.WaoTopiaApplicationContext@7dc99fa6 2014/03/26 12:08:14 TRACE (AbstractWaoServiceTest.java:202) newPersistenceContext opened transaction fr.ifremer.wao.WaoTopiaPersistenceContext@2a4d2b6f 2014/03/26 12:08:15 INFO (ReferentialService.java:375) importTerrestrialLocations 1248 terrestrial locations added, 0 updated 2014/03/26 12:08:15 INFO (ReferentialService.java:376) importTerrestrialLocations 50 terrestrial district added, 0 updated 2014/03/26 12:08:15 INFO (ReferentialService.java:377) importTerrestrialLocations 18 terrestrial region added, 28 updated 2014/03/26 12:08:15 TRACE (FakeWaoServiceContext.java:50) getNow injecting fake date in service: Mon Nov 02 00:00:00 CET 2009 2014/03/26 12:08:15 TRACE (FakeWaoServiceContext.java:50) getNow injecting fake date in service: Mon Nov 02 00:00:00 CET 2009 2014/03/26 12:08:15 TRACE (AbstractWaoServiceTest.java:217) tearDown closing transaction fr.ifremer.wao.WaoTopiaPersistenceContext@2a4d2b6f 2014/03/26 12:08:15 TRACE (AbstractWaoServiceTest.java:227) tearDown closing transaction fr.ifremer.wao.WaoTopiaApplicationContext@7dc99fa6 2014/03/26 12:08:15 TRACE (AbstractWaoServiceTest.java:83) newApplicationContext will store H2 data in <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…> 2014/03/26 12:08:15 TRACE (AbstractWaoServiceTest.java:84) newApplicationContext allJpaParameters = {hibernate.c3p0.max_statements=50, hibernate.c3p0.max_size=20, hibernate.c3p0.timeout=1800, hibernate.c3p0.min_size=5, hibernate.connection.url=jdbc:h2:<http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…,> hibernate.connection.driver_class=org.h2.Driver, hibernate.format_sql=true, hibernate.connection.username=sa, hibernate.connection.password=, hibernate.hbm2ddl.auto=update, hibernate.dialect=org.hibernate.dialect.H2Dialect, hibernate.show_sql=false, topia.persistence.topiaIdFactoryClassName=org.nuiton.topia.persistence.internal.LegacyTopiaIdFactory, hibernate.ejb.naming_strategy=org.hibernate.cfg.ImprovedNamingStrategy} 2014/03/26 12:08:15 DEBUG (AbstractWaoServiceTest.java:88) newApplicationContext jdbc url is jdbc:h2:<http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…> 2014/03/26 12:08:16 TRACE (AbstractWaoServiceTest.java:94) newApplicationContext created root context fr.ifremer.wao.WaoTopiaApplicationContext@351929aa 2014/03/26 12:08:16 TRACE (AbstractWaoServiceTest.java:202) newPersistenceContext opened transaction fr.ifremer.wao.WaoTopiaPersistenceContext@5dfddf46 2014/03/26 12:08:17 INFO (ReferentialService.java:375) importTerrestrialLocations 1248 terrestrial locations added, 0 updated 2014/03/26 12:08:17 INFO (ReferentialService.java:376) importTerrestrialLocations 50 terrestrial district added, 0 updated 2014/03/26 12:08:17 INFO (ReferentialService.java:377) importTerrestrialLocations 18 terrestrial region added, 28 updated 2014/03/26 12:08:17 TRACE (FakeWaoServiceContext.java:50) getNow injecting fake date in service: Mon Nov 02 00:00:00 CET 2009 2014/03/26 12:08:17 TRACE (AbstractWaoServiceTest.java:217) tearDown closing transaction fr.ifremer.wao.WaoTopiaPersistenceContext@5dfddf46 2014/03/26 12:08:17 TRACE (AbstractWaoServiceTest.java:227) tearDown closing transaction fr.ifremer.wao.WaoTopiaApplicationContext@351929aa 2014/03/26 12:08:17 TRACE (AbstractWaoServiceTest.java:83) newApplicationContext will store H2 data in <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…> 2014/03/26 12:08:17 TRACE (AbstractWaoServiceTest.java:84) newApplicationContext allJpaParameters = {hibernate.c3p0.max_statements=50, hibernate.c3p0.max_size=20, hibernate.c3p0.timeout=1800, hibernate.c3p0.min_size=5, hibernate.connection.url=jdbc:h2:<http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…,> hibernate.connection.driver_class=org.h2.Driver, hibernate.format_sql=true, hibernate.connection.username=sa, hibernate.connection.password=, hibernate.hbm2ddl.auto=update, hibernate.dialect=org.hibernate.dialect.H2Dialect, hibernate.show_sql=false, topia.persistence.topiaIdFactoryClassName=org.nuiton.topia.persistence.internal.LegacyTopiaIdFactory, hibernate.ejb.naming_strategy=org.hibernate.cfg.ImprovedNamingStrategy} 2014/03/26 12:08:17 DEBUG (AbstractWaoServiceTest.java:88) newApplicationContext jdbc url is jdbc:h2:<http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…> 2014/03/26 12:08:17 TRACE (AbstractWaoServiceTest.java:94) newApplicationContext created root context fr.ifremer.wao.WaoTopiaApplicationContext@232cde6e 2014/03/26 12:08:18 TRACE (AbstractWaoServiceTest.java:202) newPersistenceContext opened transaction fr.ifremer.wao.WaoTopiaPersistenceContext@4b1b4dfa 2014/03/26 12:08:18 TRACE (FakeWaoServiceContext.java:50) getNow injecting fake date in service: Mon Nov 02 00:00:00 CET 2009 2014/03/26 12:08:18 TRACE (AbstractWaoServiceTest.java:217) tearDown closing transaction fr.ifremer.wao.WaoTopiaPersistenceContext@4b1b4dfa 2014/03/26 12:08:18 TRACE (AbstractWaoServiceTest.java:227) tearDown closing transaction fr.ifremer.wao.WaoTopiaApplicationContext@232cde6e 2014/03/26 12:08:18 TRACE (AbstractWaoServiceTest.java:83) newApplicationContext will store H2 data in <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…> 2014/03/26 12:08:18 TRACE (AbstractWaoServiceTest.java:84) newApplicationContext allJpaParameters = {hibernate.c3p0.max_statements=50, hibernate.c3p0.max_size=20, hibernate.c3p0.timeout=1800, hibernate.c3p0.min_size=5, hibernate.connection.url=jdbc:h2:<http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…,> hibernate.connection.driver_class=org.h2.Driver, hibernate.format_sql=true, hibernate.connection.username=sa, hibernate.connection.password=, hibernate.hbm2ddl.auto=update, hibernate.dialect=org.hibernate.dialect.H2Dialect, hibernate.show_sql=false, topia.persistence.topiaIdFactoryClassName=org.nuiton.topia.persistence.internal.LegacyTopiaIdFactory, hibernate.ejb.naming_strategy=org.hibernate.cfg.ImprovedNamingStrategy} 2014/03/26 12:08:18 DEBUG (AbstractWaoServiceTest.java:88) newApplicationContext jdbc url is jdbc:h2:<http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…> 2014/03/26 12:08:18 TRACE (AbstractWaoServiceTest.java:94) newApplicationContext created root context fr.ifremer.wao.WaoTopiaApplicationContext@2ced9f7a 2014/03/26 12:08:18 TRACE (AbstractWaoServiceTest.java:202) newPersistenceContext opened transaction fr.ifremer.wao.WaoTopiaPersistenceContext@3302167f 2014/03/26 12:08:19 INFO (ReferentialService.java:375) importTerrestrialLocations 1248 terrestrial locations added, 0 updated 2014/03/26 12:08:19 INFO (ReferentialService.java:376) importTerrestrialLocations 50 terrestrial district added, 0 updated 2014/03/26 12:08:19 INFO (ReferentialService.java:377) importTerrestrialLocations 18 terrestrial region added, 28 updated 2014/03/26 12:08:19 TRACE (FakeWaoServiceContext.java:50) getNow injecting fake date in service: Mon Nov 02 00:00:00 CET 2009 2014/03/26 12:08:19 TRACE (FakeWaoServiceContext.java:50) getNow injecting fake date in service: Mon Nov 02 00:00:00 CET 2009 2014/03/26 12:08:19 TRACE (AbstractWaoServiceTest.java:217) tearDown closing transaction fr.ifremer.wao.WaoTopiaPersistenceContext@3302167f 2014/03/26 12:08:19 TRACE (AbstractWaoServiceTest.java:227) tearDown closing transaction fr.ifremer.wao.WaoTopiaApplicationContext@2ced9f7a 2014/03/26 12:08:19 TRACE (AbstractWaoServiceTest.java:83) newApplicationContext will store H2 data in <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…> 2014/03/26 12:08:19 TRACE (AbstractWaoServiceTest.java:84) newApplicationContext allJpaParameters = {hibernate.c3p0.max_statements=50, hibernate.c3p0.max_size=20, hibernate.c3p0.timeout=1800, hibernate.c3p0.min_size=5, hibernate.connection.url=jdbc:h2:<http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…,> hibernate.connection.driver_class=org.h2.Driver, hibernate.format_sql=true, hibernate.connection.username=sa, hibernate.connection.password=, hibernate.hbm2ddl.auto=update, hibernate.dialect=org.hibernate.dialect.H2Dialect, hibernate.show_sql=false, topia.persistence.topiaIdFactoryClassName=org.nuiton.topia.persistence.internal.LegacyTopiaIdFactory, hibernate.ejb.naming_strategy=org.hibernate.cfg.ImprovedNamingStrategy} 2014/03/26 12:08:19 DEBUG (AbstractWaoServiceTest.java:88) newApplicationContext jdbc url is jdbc:h2:<http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…> 2014/03/26 12:08:19 TRACE (AbstractWaoServiceTest.java:94) newApplicationContext created root context fr.ifremer.wao.WaoTopiaApplicationContext@1f382373 2014/03/26 12:08:20 TRACE (AbstractWaoServiceTest.java:202) newPersistenceContext opened transaction fr.ifremer.wao.WaoTopiaPersistenceContext@1b375ce6 2014/03/26 12:08:21 INFO (ReferentialService.java:375) importTerrestrialLocations 1248 terrestrial locations added, 0 updated 2014/03/26 12:08:21 INFO (ReferentialService.java:376) importTerrestrialLocations 50 terrestrial district added, 0 updated 2014/03/26 12:08:21 INFO (ReferentialService.java:377) importTerrestrialLocations 18 terrestrial region added, 28 updated 2014/03/26 12:08:21 TRACE (FakeWaoServiceContext.java:50) getNow injecting fake date in service: Mon Nov 02 00:00:00 CET 2009 2014/03/26 12:08:21 TRACE (FakeWaoServiceContext.java:50) getNow injecting fake date in service: Mon Nov 02 00:00:00 CET 2009 2014/03/26 12:08:21 TRACE (AbstractWaoServiceTest.java:217) tearDown closing transaction fr.ifremer.wao.WaoTopiaPersistenceContext@1b375ce6 2014/03/26 12:08:21 TRACE (AbstractWaoServiceTest.java:227) tearDown closing transaction fr.ifremer.wao.WaoTopiaApplicationContext@1f382373 Tests run: 9, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 16.939 sec - in fr.ifremer.wao.services.service.administration.ReferentialServiceTest Running fr.ifremer.wao.services.service.InitWaoServiceTest 2014/03/26 12:08:21 TRACE (AbstractWaoServiceTest.java:83) newApplicationContext will store H2 data in <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…> 2014/03/26 12:08:21 TRACE (AbstractWaoServiceTest.java:84) newApplicationContext allJpaParameters = {hibernate.c3p0.max_statements=50, hibernate.c3p0.max_size=20, hibernate.c3p0.timeout=1800, hibernate.c3p0.min_size=5, hibernate.connection.url=jdbc:h2:<http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…,> hibernate.connection.driver_class=org.h2.Driver, hibernate.format_sql=true, hibernate.connection.username=sa, hibernate.connection.password=, hibernate.hbm2ddl.auto=update, hibernate.dialect=org.hibernate.dialect.H2Dialect, hibernate.show_sql=false, topia.persistence.topiaIdFactoryClassName=org.nuiton.topia.persistence.internal.LegacyTopiaIdFactory, hibernate.ejb.naming_strategy=org.hibernate.cfg.ImprovedNamingStrategy} 2014/03/26 12:08:21 DEBUG (AbstractWaoServiceTest.java:88) newApplicationContext jdbc url is jdbc:h2:<http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…> 2014/03/26 12:08:21 TRACE (AbstractWaoServiceTest.java:94) newApplicationContext created root context fr.ifremer.wao.WaoTopiaApplicationContext@5b458bbc 2014/03/26 12:08:21 TRACE (AbstractWaoServiceTest.java:202) newPersistenceContext opened transaction fr.ifremer.wao.WaoTopiaPersistenceContext@279a0176 2014/03/26 12:08:21 TRACE (AbstractWaoServiceTest.java:217) tearDown closing transaction fr.ifremer.wao.WaoTopiaPersistenceContext@279a0176 2014/03/26 12:08:21 TRACE (AbstractWaoServiceTest.java:227) tearDown closing transaction fr.ifremer.wao.WaoTopiaApplicationContext@5b458bbc Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.294 sec - in fr.ifremer.wao.services.service.InitWaoServiceTest Results : Tests run: 17, Failures: 0, Errors: 0, Skipped: 0 [JENKINS] Recording test results [INFO] [INFO] --- maven-jar-plugin:2.4:jar (default-jar) @ wao-services --- [INFO] Building jar: <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…> [INFO] [INFO] >>> maven-source-plugin:2.2.1:jar (attach-sources) @ wao-services >>> [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (ensure-no-container-api) @ wao-services --- [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ wao-services --- [INFO] [INFO] --- helper-maven-plugin:2.1:share-server-secret (get-redmine-login) @ wao-services --- [INFO] Skipping goal (runOnce flag is on and goal was already executed). [WARNING] Failed to getClass for org.apache.maven.plugin.source.SourceJarMojo [INFO] [INFO] <<< maven-source-plugin:2.2.1:jar (attach-sources) @ wao-services <<< [INFO] [INFO] --- maven-source-plugin:2.2.1:jar (attach-sources) @ wao-services --- [INFO] Building jar: <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…> [INFO] [INFO] --- maven-javadoc-plugin:2.9.1:jar (attach-javadocs) @ wao-services --- [INFO] 1 warning [WARNING] Javadoc Warnings [WARNING] <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…>:572: warning - @returns is an unknown tag. [INFO] Building jar: <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…> [INFO] [INFO] --- maven-site-plugin:3.3:attach-descriptor (attach-descriptor) @ wao-services --- [INFO] [INFO] --- helper-maven-plugin:2.1:share-server-secret (get-pgp-passphrase) @ wao-services --- [INFO] Exporting server [gpg-signer] username in ${gpg.keyname} [INFO] Exporting server [gpg-signer] password in ${gpg.passphrase} [INFO] [INFO] --- helper-maven-plugin:2.1:collect-files (collect-build-artifacts) @ wao-services --- [INFO] Loaded /var/local/forge/data/codelutin.com/jenkins/workspace/wao-nightly/trunk/target/collect-artifacts.txt [INFO] Copying wao-services-4.0-SNAPSHOT.jar to /var/local/forge/data/codelutin.com/jenkins/workspace/wao-nightly/trunk/target/collect/fr.ifremer--wao-services/wao-services-4.0-SNAPSHOT.jar [INFO] Copying THIRD-PARTY.properties to /var/local/forge/data/codelutin.com/jenkins/workspace/wao-nightly/trunk/target/collect/fr.ifremer--wao-services/THIRD-PARTY.properties [INFO] Copying wao-services-4.0-SNAPSHOT-sources.jar to /var/local/forge/data/codelutin.com/jenkins/workspace/wao-nightly/trunk/target/collect/fr.ifremer--wao-services/wao-services-4.0-SNAPSHOT-sources.jar [INFO] Copying wao-services-4.0-SNAPSHOT-javadoc.jar to /var/local/forge/data/codelutin.com/jenkins/workspace/wao-nightly/trunk/target/collect/fr.ifremer--wao-services/wao-services-4.0-SNAPSHOT-javadoc.jar [INFO] [INFO] --- helper-maven-plugin:2.1:collect-files (collect-build-attachements) @ wao-services --- [WARNING] Skipping goal (No file to collect). [INFO] [INFO] --- maven-gpg-plugin:1.5:sign (sign-artifacts) @ wao-services --- [INFO] [INFO] --- maven-dependency-plugin:2.8:analyze-only (analyze) @ wao-services --- [INFO] Used declared dependencies found: [INFO] org.nuiton:nuiton-csv:jar:3.0-alpha-3:compile [INFO] org.nuiton.i18n:nuiton-i18n:jar:3.0:compile [INFO] org.nuiton:nuiton-utils:jar:3.0-SNAPSHOT:compile [INFO] com.github.spullara.mustache.java:compiler:jar:0.8.13:compile [INFO] org.apache.commons:commons-email:jar:1.3.2:compile [INFO] com.h2database:h2:jar:1.3.175:test [INFO] fr.ifremer:wao-persistence:jar:4.0-SNAPSHOT:compile [INFO] org.nuiton.topia:topia-persistence:jar:3.0-SNAPSHOT:compile [INFO] org.apache.commons:commons-lang3:jar:3.3:compile [INFO] commons-logging:commons-logging:jar:1.1.3:compile [INFO] com.google.guava:guava:jar:16.0.1:compile [INFO] org.apache.commons:commons-collections4:jar:4.0:compile [INFO] commons-io:commons-io:jar:2.4:compile [INFO] org.apache.shiro:shiro-core:jar:1.2.2:compile [INFO] junit:junit:jar:4.11:test [INFO] org.apache.struts.xwork:xwork-core:jar:2.3.16.1:compile [INFO] org.mockito:mockito-core:jar:1.9.5:test [WARNING] Used undeclared dependencies found: [WARNING] org.hibernate:hibernate-core:jar:4.2.8.Final:compile [JENKINS] Archiving disabled

1 2

r1769 - in trunk/wao-web/src/main: resources/i18n webapp/WEB-INF/content/obsmer webapp/WEB-INF/decorators webapp/css
by bleny＠users.forge.codelutin.com 27 Mar '14

27 Mar '14

Author: bleny Date: 2014-03-27 17:51:58 +0100 (Thu, 27 Mar 2014) New Revision: 1769 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1769 Log: refs #4483 prepare compact/full view switch Modified: trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp trunk/wao-web/src/main/webapp/css/wao.css Modified: trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties =================================================================== --- trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-03-27 16:23:08 UTC (rev 1768) +++ trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-03-27 16:51:58 UTC (rev 1769) @@ -69,12 +69,16 @@ wao.ui.action.save.success=Modifications saved wao.ui.action.showDetails=Show details wao.ui.action.showFilters=Show filters +wao.ui.action.switchToCompactView=Switch to compact view +wao.ui.action.switchToFullView=Switch to full view wao.ui.action.unvalidateContact=Unvalidate contact wao.ui.action.viewAssociatedContacts=View sample row contacts wao.ui.action.viewBoatsForRow=View the boats for this sample row wao.ui.action.viewCompanyWaoUsers=View users for this company wao.ui.action.viewElligibleBoats=View eligible boats +wao.ui.action.viewEstimated=View estimated observation effort wao.ui.action.viewIndicatorsHistory=View indicators historic +wao.ui.action.viewReal=View real observation effort wao.ui.action.viewSampleRowLog=View sample row log wao.ui.actions=Actions wao.ui.boatList=List of %s boats Modified: trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties =================================================================== --- trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-03-27 16:23:08 UTC (rev 1768) +++ trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-03-27 16:51:58 UTC (rev 1769) @@ -69,12 +69,16 @@ wao.ui.action.save.success=Les informations ont bien été enregistrées wao.ui.action.showDetails=Voir les détails wao.ui.action.showFilters=Afficher les filtres +wao.ui.action.switchToCompactView=Réduire la vue +wao.ui.action.switchToFullView=Étendre la vue wao.ui.action.unvalidateContact=Invalider le contact wao.ui.action.viewAssociatedContacts=Voir les contacts associés à cette ligne wao.ui.action.viewBoatsForRow=Voir les navires présentis pour cette ligne wao.ui.action.viewCompanyWaoUsers=Voir les utilisateurs associés à cette société wao.ui.action.viewElligibleBoats=Consulter les navires éligibles +wao.ui.action.viewEstimated=Voir l'effort d'observation estimé wao.ui.action.viewIndicatorsHistory=Voir l'historique des modifications des indicateurs +wao.ui.action.viewReal=Voir l'effort d'observation réalisé wao.ui.action.viewSampleRowLog=Consulter l'historique de cette ligne wao.ui.actions=Actions wao.ui.boatList=Liste de %s navires 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:23:08 UTC (rev 1768) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 2014-03-27 16:51:58 UTC (rev 1769) @@ -37,12 +37,19 @@ var sampleRowsFilterController = new SampleRowsFilterController(SAMPLE_ROWS_FILTER_VALUES_JSON_URL, $('#sampling-plan-filters-form')); sampleRowsFilterController.init(); + var fullView = <s:property value="fullView" />; + $('#switch-estimated-real').click(function () { $('#switch-estimated-real').toggleClass('show-estimated').toggleClass('show-real'); $('table.sampling-plan').toggleClass('show-estimated').toggleClass('show-real'); $('.estimated-differ-from-real').effect( "highlight", "slow" ) }); + $('#switch-compact-full-view').click(function () { + $('#switch-compact-full-view').toggleClass('full-view').toggleClass('compact-view'); + $('table.sampling-plan').toggleClass('full-view').toggleClass('compact-view'); + }); + }); </script> @@ -151,11 +158,20 @@ </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>"> + + <s:text name="wao.ui.action.switchToFullView" /> + + + <s:text name="wao.ui.action.switchToCompactView" /> + + </button> + <s:if test="authenticatedWaoUser.authorizedToViewSamplingPlanReal"> <button type="button" id="switch-estimated-real" class="btn show-estimated"> - - Voir le réel - Voir l'estimé + + <s:text name="wao.ui.action.viewReal" /> + <s:text name="wao.ui.action.viewEstimated" /> </button> </s:if> @@ -175,7 +191,7 @@ <s:set var="nbColumnsForOther" value="6"/> <s:set var="nbColumnsTotal" value="%{#nbColumnsForProfession + #nbColumnsForMonths + #nbColumnsForOther}"/> - <table id="sampling-plan" class="large-table sampling-plan show-estimated"> + <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> 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:23:08 UTC (rev 1768) +++ trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2014-03-27 16:51:58 UTC (rev 1769) @@ -57,7 +57,7 @@ <li class="active"> <s:url namespace="/%{obsProgram.name().toLowerCase()}" action="sampling-plan" id="samplingPlanUrl" /> <s:a href="%{samplingPlanUrl}"> - <s:text name="wao.ui.page.SamplingPlan.title" /> + <s:text name="wao.ui.page.SamplingPlan.title" /> </s:a> </li> <li> @@ -69,7 +69,7 @@ <li> <s:url namespace="/%{obsProgram.name().toLowerCase()}" action="contacts" id="contactsUrl" /> <s:a href="%{contactsUrl}"> - <s:text name="wao.ui.page.Contacts.title" /> + <s:text name="wao.ui.page.Contacts.title" /> </s:a> </li> <li> Modified: trunk/wao-web/src/main/webapp/css/wao.css =================================================================== --- trunk/wao-web/src/main/webapp/css/wao.css 2014-03-27 16:23:08 UTC (rev 1768) +++ trunk/wao-web/src/main/webapp/css/wao.css 2014-03-27 16:51:58 UTC (rev 1769) @@ -214,7 +214,10 @@ background-color: beige; } -.show-estimated .real, .show-real .estimated { +.compact-view .only-in-full-view, +.full-view .only-in-compact-view, +.show-estimated .real, +.show-real .estimated { display: none; }

1 0

r1768 - in trunk: wao-services/src/main/java/fr/ifremer/wao/services wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer wao-web/src/main/webapp/WEB-INF/content/obsmer wao-web/src/main/webapp/css
by bleny＠users.forge.codelutin.com 27 Mar '14

27 Mar '14

Author: bleny Date: 2014-03-27 17:23:08 +0100 (Thu, 27 Mar 2014) New Revision: 1768 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1768 Log: refs #4483 start styling and rethinking sampling plan Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/SamplingPlanAction.java trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp trunk/wao-web/src/main/webapp/css/wao.css Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java 2014-03-27 13:34:21 UTC (rev 1767) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java 2014-03-27 16:23:08 UTC (rev 1768) @@ -212,4 +212,8 @@ return userProfile.isCoordinatorOrObserver(); } + public boolean isAuthorizedToViewSamplingPlanReal() { + return ! userProfile.isGuest(); + } + } Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/SamplingPlanAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/SamplingPlanAction.java 2014-03-27 13:34:21 UTC (rev 1767) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/SamplingPlanAction.java 2014-03-27 16:23:08 UTC (rev 1768) @@ -78,4 +78,9 @@ getSamplingPlan().getFilterValues()); return filterValues; } + + public boolean isFullView() { + boolean fullView = getAuthenticatedWaoUser().isAdmin() || getAuthenticatedWaoUser().isProfessional(); + return fullView; + } } 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 13:34:21 UTC (rev 1767) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 2014-03-27 16:23:08 UTC (rev 1768) @@ -37,6 +37,12 @@ var sampleRowsFilterController = new SampleRowsFilterController(SAMPLE_ROWS_FILTER_VALUES_JSON_URL, $('#sampling-plan-filters-form')); sampleRowsFilterController.init(); + $('#switch-estimated-real').click(function () { + $('#switch-estimated-real').toggleClass('show-estimated').toggleClass('show-real'); + $('table.sampling-plan').toggleClass('show-estimated').toggleClass('show-real'); + $('.estimated-differ-from-real').effect( "highlight", "slow" ) + }); + }); </script> @@ -49,13 +55,6 @@ <s:text name="wao.ui.page.SamplingPlan.title" /> </h1> - <s:if test="authenticatedWaoUser.authorizedToEditSamplingPlan"> - <s:url action="edit-sample-row!input" id="createSampleRow" /> - <s:a href="%{createSampleRow}" cssClass="btn"> - <s:text name="wao.ui.action.createSampleRow" /> - </s:a> - </s:if> - <s:form method="GET" id="sampling-plan-filters-form" cssClass="filters-form"> <fieldset> @@ -152,8 +151,23 @@ </s:form> + <s:if test="authenticatedWaoUser.authorizedToViewSamplingPlanReal"> + <button type="button" id="switch-estimated-real" class="btn show-estimated"> + + Voir le réel + Voir l'estimé + </button> + </s:if> + + <s:if test="authenticatedWaoUser.authorizedToEditSamplingPlan"> + <s:url action="edit-sample-row!input" id="createSampleRow" /> + <s:a href="%{createSampleRow}" cssClass="btn"> + <s:text name="wao.ui.action.createSampleRow" /> + </s:a> + </s:if> + <s:set var="estimatedTides" value="true"/> -<s:set var="fullView" value="true"/> +<s:set var="fullView" value="%{fullView}"/> <s:set var="displayTidesReal" value="true"/> <s:set var="nbColumnsForProfession" value="%{#fullView ? 13 : 5}"/> @@ -161,211 +175,253 @@ <s:set var="nbColumnsForOther" value="6"/> <s:set var="nbColumnsTotal" value="%{#nbColumnsForProfession + #nbColumnsForMonths + #nbColumnsForOther}"/> - <table class="large-table table-hover"> + <table id="sampling-plan" class="large-table sampling-plan show-estimated"> <thead> - <tr> - <th colspan="${nbColumnsForProfession}"> <s:text name="wao.ui.samplingPlan.sampledProfessions" /></th> - <th colspan="${nbColumnsForMonths}"> - <s:text name="wao.ui.samplingPlan.effort" /> + <tr> + <th colspan="${nbColumnsForProfession}"> <s:text name="wao.ui.samplingPlan.sampledProfessions" /></th> + <th colspan="${nbColumnsForMonths}"> + <s:text name="wao.ui.samplingPlan.effort" /> - [ <s:text name="wao.ui.samplingPlan.expected"/> - ( <s:text name="wao.ui.samplingPlan.actual" /> - <s:if test="estimatedTides">  + <s:text name="wao.ui.samplingPlan.estimated" /> </s:if>) ] - </th> - <th colspan="${nbColumnsForOther}"><s:text name="wao.ui.misc.others" /></th> - </tr> - <tr> -  - <td><s:text name="wao.ui.field.SampleRow.code"/></td> - <td><s:text name="wao.ui.samplingPlan.program"/></td> + <s:if test="authenticatedWaoUser.authorizedToViewSamplingPlanReal"> + [ + + (<s:text name="wao.ui.samplingPlan.actual" /> + <s:text name="wao.ui.samplingPlan.estimated" />) + + + <s:text name="wao.ui.samplingPlan.actual" /> + + / + <s:text name="wao.ui.samplingPlan.expected" /> + ] + </s:if> + </th> + <th colspan="${nbColumnsForOther}"><s:text name="wao.ui.misc.others" /></th> + </tr> + <tr> +  + <th><s:text name="wao.ui.field.SampleRow.code"/></th> + <th><s:text name="wao.ui.samplingPlan.program"/></th> <s:if test="fullView"> - <td class="only-visible-fullview"><s:text name="wao.ui.entity.Company"/></td> + <th class="only-visible-fullview"><s:text name="wao.ui.entity.Company"/></th> </s:if> - <td><s:text name="wao.ui.entity.FishingZone"/></td> + <th><s:text name="wao.ui.entity.FishingZone"/></th> <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"/> <s:text name="wao.ui.field.SampleRow.dcf5Code"/></td> - <td class="only-visible-fullview"><s:text name="wao.ui.misc.METIER"/> <s:text name="wao.ui.field.SampleRow.meshSize"/></td> - <td class="only-visible-fullview"><s:text name="wao.ui.misc.METIER"/> <s:text name="wao.ui.field.SampleRow.size"/></td> - <td class="only-visible-fullview"><s:text name="wao.ui.misc.METIER"/> <s:text name="wao.ui.field.SampleRow.other"/></td> - <td class="only-visible-fullview"><s:text name="wao.ui.misc.METIER"/> <s:text name="wao.ui.field.SampleRow.libelle"/></td> - <td class="only-visible-fullview"><s:text name="wao.ui.misc.METIER"/> <s:text name="wao.ui.field.SampleRow.species"/></td> - <td class="only-visible-fullview"><s:text name="wao.ui.field.SampleRow.periodBegin"/></td> - <td class="only-visible-fullview"><s:text name="wao.ui.field.SampleRow.periodEnd"/></td> + <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"/> <s:text name="wao.ui.field.SampleRow.dcf5Code"/></th> + <th class="only-visible-fullview"><s:text name="wao.ui.misc.METIER"/> <s:text name="wao.ui.field.SampleRow.meshSize"/></th> + <th class="only-visible-fullview"><s:text name="wao.ui.misc.METIER"/> <s:text name="wao.ui.field.SampleRow.size"/></th> + <th class="only-visible-fullview"><s:text name="wao.ui.misc.METIER"/> <s:text name="wao.ui.field.SampleRow.other"/></th> + <th class="only-visible-fullview"><s:text name="wao.ui.misc.METIER"/> <s:text name="wao.ui.field.SampleRow.libelle"/></th> + <th class="only-visible-fullview"><s:text name="wao.ui.misc.METIER"/> <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> - <td class="only-visible-compactview"><s:text name="wao.ui.misc.METIER"/> <s:text name="wao.ui.field.SampleRow.dcf5Code"/></td> - <td class="only-visible-compactview"><s:text name="wao.ui.misc.METIER"/> <s:text name="wao.ui.field.SampleRow.libelle"/></td> + <th class="only-visible-compactview"><s:text name="wao.ui.misc.METIER"/> <s:text name="wao.ui.field.SampleRow.dcf5Code"/></th> + <th class="only-visible-compactview"><s:text name="wao.ui.misc.METIER"/> <s:text name="wao.ui.field.SampleRow.libelle"/></th> </s:else> - -  - <s:iterator value="samplingPlan.months" var="month"> - <td<s:if test="@fr.ifremer.wao.WaoUtils@isCurrentMonth(#month)"> class="current-month"</s:if>><s:property value="%{formatMonth(#month)}"/></td> - </s:iterator> - <td><s:text name="wao.ui.misc.total"/></td> -  - <td> - <s:text name="wao.ui.samplingPlan.observationTimesInDays"/> - [ <s:text name="wao.ui.samplingPlan.expected"/>(<s:text name="wao.ui.samplingPlan.actual"/><s:if test="estimatedTides"> + <s:text name="wao.ui.samplingPlan.estimated"/></s:if>) ] - </td> - <td><s:text name="wao.ui.samplingPlan.averageTideTime"/></td> - <td><s:text name="wao.ui.samplingPlan.nbObservants"/></td> - <td><s:text name="wao.ui.field.SampleRow.appliedCoverageRate"/></td> - <td><s:text name="wao.ui.misc.comment"/></td> - <td><s:text name="wao.ui.samplingPlan.actions"/></td> - </tr> + +  + <s:iterator value="samplingPlan.months" var="month"> + <th class="effort <s:if test="@fr.ifremer.wao.WaoUtils@isCurrentMonth(#month)"> now</s:if>"> + <s:property value="%{formatMonth(#month)}"/> + </th> + </s:iterator> + <th><s:text name="wao.ui.misc.total"/></th> +  + <th> + <s:text name="wao.ui.samplingPlan.observationTimesInDays"/> + [ <s:text name="wao.ui.samplingPlan.expected"/>(<s:text name="wao.ui.samplingPlan.actual"/><s:if test="estimatedTides"> + <s:text name="wao.ui.samplingPlan.estimated"/></s:if>) ] + </th> + <th> + <s:text name="wao.ui.samplingPlan.averageTideTime"/> + </th> + <th> + <s:text name="wao.ui.samplingPlan.nbObservants"/> + </th> + <th> + <s:text name="wao.ui.field.SampleRow.appliedCoverageRate"/> + </th> + <th><s:text name="wao.ui.misc.comment"/></th> + <th><s:text name="wao.ui.samplingPlan.actions"/></th> + </tr> </thead> <tbody> <%--Iterate on Facades--%> <s:iterator value="samplingPlan" var="samplingPlanFacade"> - <tr> - <td colspan="${nbColumnsTotal}" class="facade"><s:property value="%{#samplingPlanFacade.facade}"/></td> - </tr> + <tr class="facade-row"> + <th colspan="${nbColumnsTotal}" class="facade"><s:property value="%{#samplingPlanFacade.facade}"/></td> + </tr> <%--Iterate on Sectors --%> <s:iterator value="samplingPlanFacade" var="samplingPlanSector"> - <tr> - <td colspan="${nbColumnsTotal}" class="sector"><s:property value="%{#samplingPlanSector.sectors}"/></td> - </tr> + <tr class="sector-row"> + <th colspan="${nbColumnsTotal}" class="sector"><s:property value="%{#samplingPlanSector.sectors}"/></td> + </tr> <%--Iterate on SampleRows --%> <s:iterator value="samplingPlanSector" var="samplingPlanRow"> - <tr<s:if test="sampleRowToHighlightId.equals(topiaId)"> class="highlight"</s:if>> - <th> - <s:property value="code" /> - </th> - <td><s:property value="programName" /></td> + <tr class="sample-row-row<s:if test="sampleRowToHighlightId.equals(topiaId)"> highlight</s:if>"> + <th> + <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> + <td class="only-visible-fullview"><s:property value="companyName" /></td> </s:if> - <td class="only-visible-fullview"><s:property value="fishingZones" /></td> + <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"> - <s:iterator value="dcf5CodesAndDescriptions"> - - <s:property value="key"/> - - </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> + <td class="only-visible-fullview"><s:property value="fishingZonesInfos" /></td> + <td class="only-visible-fullview"> + <s:iterator value="dcf5CodesAndDescriptions"> + + <s:property value="key"/> + + </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"> - <s:iterator value="dcf5CodesAndDescriptions"> - - <s:property value="key"/> - - </s:iterator> - <s:property value="professionDescriptionWithoutDCF5" /> - </td> - <td class="only-visible-compactview"> - <s:property value="professionLibelle" /> - </td> + <td class="only-visible-compactview"> + <s:iterator value="dcf5CodesAndDescriptions"> + + <s:property value="key"/> + + </s:iterator> + <s:property value="professionDescriptionWithoutDCF5" /> + </td> + <td class="only-visible-compactview"> + <s:property value="professionLibelle" /> + </td> </s:else> -  +  <s:iterator value="samplingPlan.months" var="month"> - <td<s:if test="@fr.ifremer.wao.WaoUtils@isCurrentMonth(#month)"> class="current-month"</s:if>> - <s:property value="%{getNbTidesExpected(#month)}"/> - <span<s:if test="hasNbTidesReal(#month) && !#authenticatedWaoUser.guest"> class="display-tides-real"</s:if>> - (<s:property value="%{getNbTidesReal(#month)}"/>) - - - </td> + <s:set var="expected" value="%{getNbTidesExpected(#month)}"/> + <s:set var="estimated" value="%{getNbTidesEstimated(#month)}"/> + <s:set var="real" value="%{getNbTidesReal(#month)}"/> + <td class="effort <s:if test="@fr.ifremer.wao.WaoUtils@isCurrentMonth(#month)"> now</s:if><s:if test="#estimated != #real"> estimated-differ-from-real</s:if>"> + <s:if test="#expected != null"> + <s:if test="authenticatedWaoUser.authorizedToViewSamplingPlanReal"> + lower-than-expected</s:if><s:if test="#estimated > #expected"> higher-than-expected</s:if>"> + <s:property value="#estimated"/> + + lower-than-expected</s:if><s:if test="#real > #expected"> higher-than-expected</s:if>"> + <s:property value="#real"/> + + / + </s:if> + <s:property value="#expected"/> + </s:if> + </td> </s:iterator> - <td> - - <s:property value="totalTidesExpected" /> - <s:if test="!authenticatedWaoUser.guest"> - (<s:property value="totalTidesReal" />) - - <s:property value="totalPercentage" /> - </s:if> - - </td> - <td> - <s:property value="observationTimesInDaysExpected" /> <s:text name="wao.ui.misc.day"/> - - (<s:property value="observationTimesInDaysReal" /> <s:text name="wao.ui.misc.day"/>) - - </td> - <td><s:property value="averageTideTime" /></td> - <td><s:property value="nbObservants" /></td> - <td> - <s:if test="appliedCoverageRate"> - <s:property value="appliedCoverageRate" />% - </s:if> - </td> - <td><s:property value="comment" /></td> + <td class="effort"> + <s:if test="authenticatedWaoUser.authorizedToViewSamplingPlanReal"> + lower-than-expected</s:if><s:if test="totalTidesEstimated > totalTidesExpected"> higher-than-expected</s:if>"> + <s:property value="totalTidesEstimated" /> + + lower-than-expected</s:if><s:if test="totalTidesReal > totalTidesExpected"> higher-than-expected</s:if>"> + <s:property value="totalTidesReal" /> + + / + </s:if> + <s:property value="totalTidesExpected" /> - <td class="actions"> - <div class="dropdown"> - <a class="btn dropdown-toggle" data-toggle="dropdown" href="#"> - <s:text name="wao.ui.actions" /> - - </a> - <ul class="dropdown-menu"> - <s:if test="authenticatedWaoUser.authorizedToEditSamplingPlan"> + <s:if test="authenticatedWaoUser.authorizedToViewSamplingPlanReal"> + (<s:property value="totalPercentage" />) + </s:if> + </td> + <td class="effort"> + + <s:if test="authenticatedWaoUser.authorizedToViewSamplingPlanReal"> + lower-than-expected</s:if><s:if test="observationTimesInDaysEstimated > observationTimesInDaysExpected"> higher-than-expected</s:if>"> + <s:property value="observationTimesInDaysEstimated" /> <s:text name="wao.ui.misc.day"/> + + lower-than-expected</s:if><s:if test="observationTimesInDaysReal > observationTimesInDaysExpected"> higher-than-expected</s:if>"> + <s:property value="observationTimesInDaysReal" /> <s:text name="wao.ui.misc.day"/> + + / + </s:if> + + <s:property value="observationTimesInDaysExpected" /> <s:text name="wao.ui.misc.day"/> + + </td> + <td><s:property value="averageTideTime" /></td> + <td><s:property value="nbObservants" /></td> + <td> + <s:if test="appliedCoverageRate"> + <s:property value="appliedCoverageRate" />% + </s:if> + </td> + <td><s:property value="comment" /></td> + + <td class="actions"> + <div class="dropdown"> + <a class="btn dropdown-toggle" data-toggle="dropdown" href="#"> + <s:text name="wao.ui.actions" /> + + </a> + <ul class="dropdown-menu"> + <s:if test="authenticatedWaoUser.authorizedToEditSamplingPlan"> + <li> + <s:url action="edit-sample-row!input" id="editSampleRowUrl"> + <s:param name="sampleRowId" value="sampleRowId" /> + </s:url> + <s:a href="%{editSampleRowUrl}"> + <s:text name="wao.ui.action.edit" /> + </s:a> + </li> + <li> + <s:url action="delete-sample-row" id="deleteSampleRowUrl"> + <s:param name="companyId" value="sampleRowId" /> + </s:url> + <s:a href="%{deleteSampleRowUrl}"> + <s:text name="wao.ui.action.delete" /> + </s:a> + </li> + </s:if> <li> - <s:url action="edit-sample-row!input" id="editSampleRowUrl"> + <s:url action="sample-row-log" id="sampleRowLogUrl"> <s:param name="sampleRowId" value="sampleRowId" /> </s:url> - <s:a href="%{editSampleRowUrl}"> - <s:text name="wao.ui.action.edit" /> + <s:a href="%{sampleRowLogUrl}"> + <s:text name="wao.ui.action.viewSampleRowLog" /> </s:a> </li> <li> - <s:url action="delete-sample-row" id="deleteSampleRowUrl"> - <s:param name="companyId" value="sampleRowId" /> + <s:url action="boats" id="viewElligibleBoatsUrl"> + <s:param name="sampleRowIds" value="sampleRowId" /> </s:url> - <s:a href="%{deleteSampleRowUrl}"> - <s:text name="wao.ui.action.delete" /> + <s:a href="%{viewElligibleBoatsUrl}"> + <s:text name="wao.ui.action.viewElligibleBoats" /> </s:a> </li> - </s:if> - <li> - <s:url action="sample-row-log" id="sampleRowLogUrl"> - <s:param name="sampleRowId" value="sampleRowId" /> - </s:url> - <s:a href="%{sampleRowLogUrl}"> - <s:text name="wao.ui.action.viewSampleRowLog" /> - </s:a> - </li> - <li> - <s:url action="boats" id="viewElligibleBoatsUrl"> - <s:param name="sampleRowIds" value="sampleRowId" /> - </s:url> - <s:a href="%{viewElligibleBoatsUrl}"> - <s:text name="wao.ui.action.viewElligibleBoats" /> - </s:a> - </li> - <li> - <s:url action="contacts" id="viewAssociatedContactsUrl"> - <s:param name="sampleRowIds" value="sampleRowId" /> - </s:url> - <s:a href="%{viewAssociatedContactsUrl}"> - <s:text name="wao.ui.action.viewAssociatedContacts" /> - </s:a> - </li> - <s:if test="authenticatedWaoUser.authorizedToCreateContact"> <li> - <s:url action="contacts" id="createAssociatedContactUrl"> + <s:url action="contacts" id="viewAssociatedContactsUrl"> <s:param name="sampleRowIds" value="sampleRowId" /> </s:url> - <s:a href="%{createAssociatedContactUrl}"> - <s:text name="wao.ui.action.createAssociatedContact" /> + <s:a href="%{viewAssociatedContactsUrl}"> + <s:text name="wao.ui.action.viewAssociatedContacts" /> </s:a> </li> - </s:if> - </ul> - </div> - </td> - </tr> + <s:if test="authenticatedWaoUser.authorizedToCreateContact"> + <li> + <s:url action="contacts" id="createAssociatedContactUrl"> + <s:param name="sampleRowIds" value="sampleRowId" /> + </s:url> + <s:a href="%{createAssociatedContactUrl}"> + <s:text name="wao.ui.action.createAssociatedContact" /> + </s:a> + </li> + </s:if> + </ul> + </div> + </td> + </tr> <%--Iterate on SampleRows --%> </s:iterator> <%--Iterate on Sectors --%> @@ -375,36 +431,64 @@ </todby> <tfoot> - <td colspan="${nbColumnsForProfession}"> - <s:text name="wao.ui.misc.totals" /> - </td> -  - <s:iterator value="samplingPlan.months" var="month"> - <td<s:if test="@fr.ifremer.wao.WaoUtils@isCurrentMonth(#month)"> class="current-month"</s:if>> - <s:property value="samplingPlan.getTotalExpected(#month)"/> - - - (<s:property value="samplingPlan.getTotalReal(#month)"/>) + <th colspan="${nbColumnsForProfession}"> + <s:text name="wao.ui.misc.totals" /> + </th> +  + <s:iterator value="samplingPlan.months" var="month"> + <td class="effort<s:if test="@fr.ifremer.wao.WaoUtils@isCurrentMonth(#month)"> now</s:if>"> + <s:set var="expected" value="%{samplingPlan.getTotalExpected(#month)}"/> + <s:set var="estimated" value="%{samplingPlan.getTotalEstimated(#month)}"/> + <s:set var="real" value="%{samplingPlan.getTotalReal(#month)}"/> + <s:if test="authenticatedWaoUser.authorizedToViewSamplingPlanReal"> + lower-than-expected</s:if><s:if test="#estimated > #expected"> higher-than-expected</s:if>"> + <s:property value="#estimated"/> + + lower-than-expected</s:if><s:if test="#real > #expected"> higher-than-expected</s:if>"> + <s:property value="#real"/> + + / + </s:if> + <s:property value="#expected"/> + <s:if test="authenticatedWaoUser.authorizedToViewSamplingPlanReal"> + <s:property value="samplingPlan.getTotalRatio(#month)"/> + </s:if> + </td> + </s:iterator> + <td class="effort"> + <s:set var="expected" value="%{samplingPlan.highTotalExpected}"/> + <s:set var="estimated" value="%{samplingPlan.highTotalEstimated}"/> + <s:set var="real" value="%{samplingPlan.highTotalReal}"/> + <s:if test="authenticatedWaoUser.authorizedToViewSamplingPlanReal"> + lower-than-expected</s:if><s:if test="#estimated > #expected"> higher-than-expected</s:if>"> + <s:property value="#estimated"/> - - <s:property value="samplingPlan.getTotalRatio(#month)"/> - + lower-than-expected</s:if><s:if test="#real > #expected"> higher-than-expected</s:if>"> + <s:property value="#real"/> + + / + </s:if> + <s:property value="#expected"/> + <s:if test="authenticatedWaoUser.authorizedToViewSamplingPlanReal"> + <s:property value="samplingPlan.highTotalRatio" /> + </s:if> </td> - </s:iterator> - <td> - <s:property value="samplingPlan.highTotalExpected" /> - <s:if test="!authenticatedWaoUser.guest"> - (<s:property value="samplingPlan.highTotalReal" />) - <s:property value="samplingPlan.highTotalRatio" /> - </s:if> - </td> - <td> - <s:property value="samplingPlan.observationTimesInDaysTotalExpected" /> <s:text name="wao.ui.misc.day"/> - - (<s:property value="samplingPlan.observationTimesInDaysTotalReal"/> <s:text name="wao.ui.misc.day"/>) - - </td> - <td colspan="${nbColumnsForOther}"> </td> + <td> + <s:set var="expected" value="%{samplingPlan.observationTimesInDaysTotalExpected}"/> + <s:set var="estimated" value="%{samplingPlan.observationTimesInDaysTotalEstimated}"/> + <s:set var="real" value="%{samplingPlan.observationTimesInDaysTotalReal}"/> + <s:if test="authenticatedWaoUser.authorizedToViewSamplingPlanReal"> + lower-than-expected</s:if><s:if test="#estimated > #expected"> higher-than-expected</s:if>"> + <s:property value="#estimated"/> <s:text name="wao.ui.misc.day"/> + + lower-than-expected</s:if><s:if test="#real > #expected"> higher-than-expected</s:if>"> + <s:property value="#real"/> <s:text name="wao.ui.misc.day"/> + + / + </s:if> + <s:property value="#expected"/> <s:text name="wao.ui.misc.day"/> + </td> + <th colspan="${nbColumnsForOther}"></th> </tfoot> </table> Modified: trunk/wao-web/src/main/webapp/css/wao.css =================================================================== --- trunk/wao-web/src/main/webapp/css/wao.css 2014-03-27 13:34:21 UTC (rev 1767) +++ trunk/wao-web/src/main/webapp/css/wao.css 2014-03-27 16:23:08 UTC (rev 1768) @@ -19,16 +19,58 @@ * #L% */ -/** +/****************************************************************************** * Personnalisation de Bootstrap - */ + *****************************************************************************/ /* On surcharge left: 0px par left: 0% car ça pose problème pour Firefox qui place le menu complètement à gauche de la fenêtre et pas en dessous du bouton */ .dropdown-menu { left: 0%; } +legend+.control-group { + margin-top: 0px; +} + +/****************************************************************************** + * Des classes à usage transverse + *****************************************************************************/ + +/* pour représente qu'une entité (société, utilisateur) est inactive */ +.highlight { + background-color: #ffff99; +} + +/* pour représenter qu'on est à l'instant présent */ +.now { + background-color: #ffff99; +} + +.inactive { + text-decoration: line-through; +} + /** + * Class permettant de faire faire une rotation à un élément de 90° sur la gauche. + * Ça peut par exemeple servir pour un th, afin de gagner de la largeur + * + * voir http://stackoverflow.com/questions/15806925/how-to-rotate-text-left-90-degr… + */ +.rotate { + display: block; + -moz-transform: rotate(-90.0deg); /* FF3.5+ */ + -o-transform: rotate(-90.0deg); /* Opera 10.5 */ + -webkit-transform: rotate(-90.0deg); /* Saf3.1+, Chrome */ + -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=0.083)"; /* IE8 */ + +} + + +/****************************************************************************** + * Styles globaux à l'application + *****************************************************************************/ + +/** * Le style du layout */ @@ -77,23 +119,6 @@ float: right; } -legend+.control-group { - margin-top: 0px; -} - -/** - * Des classes à usage transverse - */ - -/* pour représente qu'une entité (société, utilisateur) est inactive */ -.highlight { - background-color: #ffff99; -} - -.inactive { - text-decoration: line-through; -} - th.actions, td.actions { white-space: nowrap; } @@ -106,10 +131,6 @@ list-style-type: none; } -.large-table tbody tr:hover { - background-color: #f5f5f5; -} - .large-table tbody th, .large-table td { border: solid 1px #aaaaaa; border-left-style: dashed; @@ -133,9 +154,9 @@ margin-right: 5px; } -/** +/****************************************************************************** * Styles spécifiques pour certaines pages de l'appli - */ + *****************************************************************************/ #expectedObservationsByMonthsTable th { white-space: nowrap; @@ -158,3 +179,53 @@ margin-bottom: 20px; } +table.sampling-plan tr.facade-row { + color: white; + background-color: seagreen; + background-color: darkslategrey; + font-size: 150%; + line-height: 150%; +} + +table.sampling-plan tr.sector-row { + color: white; + background-color: darkcyan; + background-color: darkseagreen; + font-size: 120%; + line-height: 120%; +} + +table.sampling-plan tr.facade-row th, +table.sampling-plan tr.sector-row th { + text-align: left; + padding: 10px; +} + +table.sampling-plan tbody tr.sample-row-row:nth-child(2n) { + background-color: #e6e6e6; +} + +table.sampling-plan tbody tr.sample-row-row:hover { + background-color: tan; + background-color: antiquewhite; + background-color: palegoldenrod; + background-color: papayawhip; + background-color: wheat; + background-color: beige; +} + +.show-estimated .real, .show-real .estimated { + display: none; +} + +td.effort .lower-than-expected { + color : red; +} + +td.effort .higher-than-expected { + color : green; +} + +td.effort { + text-align: center; +} \ No newline at end of file

1 0

r1767 - in trunk: wao-persistence/src/main/java/fr/ifremer/wao/entity wao-services/src/main/java/fr/ifremer/wao/services/service wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer wao-web/src/main/webapp/WEB-INF/content/obsmer wao-web/src/main/webapp/js
by bleny＠users.forge.codelutin.com 27 Mar '14

27 Mar '14

Author: bleny Date: 2014-03-27 14:34:21 +0100 (Thu, 27 Mar 2014) New Revision: 1767 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1767 Log: refs #4483 sort option by labels in select in filter form, introduce FilterOption Added: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/FilterOption.java Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SamplingStrategy.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SampleRowsFilterValues.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/LocalizedSampleRowsFilterValues.java trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp trunk/wao-web/src/main/webapp/js/wao.js Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SamplingStrategy.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SamplingStrategy.java 2014-03-27 12:39:43 UTC (rev 1766) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SamplingStrategy.java 2014-03-27 13:34:21 UTC (rev 1767) @@ -22,7 +22,7 @@ import static org.nuiton.i18n.I18n.n; -public enum SamplingStrategy { +public enum SamplingStrategy implements I18nAble { SIMULTANEOUS_G1_SPECIES(n("SamplingStrategy.SIMULTANEOUS_G1_SPECIES")), SIMULTANEOUS_G1_G2_SPECIES(n("SamplingStrategy.SIMULTANEOUS_G1_G2_SPECIES")), @@ -45,9 +45,8 @@ } @Override - public String toString() { - // return WaoUtils.t(i18nKey); - throw new UnsupportedOperationException(); + public String getI18nKey() { + return i18nKey; } public boolean isSpecificStock() { Added: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/FilterOption.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/FilterOption.java (rev 0) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/FilterOption.java 2014-03-27 13:34:21 UTC (rev 1767) @@ -0,0 +1,50 @@ +package fr.ifremer.wao.services.service; + +import com.google.common.collect.Ordering; +import fr.ifremer.wao.entity.I18nAble; + +public class FilterOption implements Comparable<FilterOption> { + + protected String value; + + protected String label; + + /** + * Both label and value is the given str. + */ + public static FilterOption forString(String str) { + FilterOption filterOption = new FilterOption(str, str); + return filterOption; + } + + /** + * Both label and value is the given str. + */ + public static <T extends Enum & I18nAble> FilterOption forEnum(T enumValue) { + FilterOption filterOption = new FilterOption(enumValue.name(), enumValue.getI18nKey()); + return filterOption; + } + + public static FilterOption forValueAndLabel(String value, String label) { + FilterOption filterOption = new FilterOption(value, label); + return filterOption; + } + + public FilterOption(String value, String label) { + this.value = value; + this.label = label; + } + + public String getValue() { + return value; + } + + public String getLabel() { + return label; + } + + @Override + public int compareTo(FilterOption other) { + return Ordering.natural().compare(label, other.label); + } +} Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SampleRowsFilterValues.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SampleRowsFilterValues.java 2014-03-27 12:39:43 UTC (rev 1766) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SampleRowsFilterValues.java 2014-03-27 13:34:21 UTC (rev 1767) @@ -3,15 +3,11 @@ import fr.ifremer.wao.entity.DCF5Code; import fr.ifremer.wao.entity.FishingZone; import fr.ifremer.wao.entity.SampleRow; -import fr.ifremer.wao.entity.SamplingStrategy; import fr.ifremer.wao.entity.TerrestrialLocation; -import org.apache.commons.lang3.tuple.Pair; import java.io.Serializable; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; +import java.util.SortedSet; +import java.util.TreeSet; /** * Bean to hold all values that user can select to fill {@link fr.ifremer.wao.SampleRowsFilter}. @@ -20,86 +16,89 @@ private static final long serialVersionUID = 1L; - protected Set<String> fishingZoneFacadeNames = new HashSet<>(); + protected SortedSet<FilterOption> fishingZoneFacadeNames = new TreeSet<>(); - protected Set<String> fishingZoneSectorNames = new HashSet<>(); + protected SortedSet<FilterOption> fishingZoneSectorNames = new TreeSet<>(); - protected Set<String> sampleRowCodes = new HashSet<>(); + protected SortedSet<FilterOption> sampleRowCodes = new TreeSet<>(); - protected Set<String> programNames = new HashSet<>(); + protected SortedSet<FilterOption> programNames = new TreeSet<>(); - protected Map<String, String> companies = new HashMap<>(); + protected SortedSet<FilterOption> companies = new TreeSet<>(); - protected Set<SamplingStrategy> samplingStrategies = new HashSet<>(); + protected SortedSet<FilterOption> samplingStrategies = new TreeSet<>(); - protected Map<String, String> terrestrialDistricts = new HashMap<>(); + protected SortedSet<FilterOption> terrestrialDistricts = new TreeSet<>(); /** Values are the code and the label i18n key. */ - protected Map<String, Pair<String, String>> fishingGearDcfs = new HashMap<>(); + protected SortedSet<FilterOption> fishingGearDcfs = new TreeSet<>(); /** Values are the code and the label i18n key. */ - protected Map<String, Pair<String, String>> targetSpeciesDcfs = new HashMap<>(); + protected SortedSet<FilterOption> targetSpeciesDcfs = new TreeSet<>(); public void addSampleRow(SampleRow sampleRow) { for (FishingZone fishingZone : sampleRow.getFishingZone()) { - fishingZoneFacadeNames.add(fishingZone.getFacadeName()); - fishingZoneSectorNames.add(fishingZone.getSectorName()); + fishingZoneFacadeNames.add(FilterOption.forString(fishingZone.getFacadeName())); + fishingZoneSectorNames.add(FilterOption.forString(fishingZone.getSectorName())); } - sampleRowCodes.add(sampleRow.getCode()); - programNames.add(sampleRow.getProgramName()); - companies.put(sampleRow.getCompany().getTopiaId(), sampleRow.getCompany().getName()); - samplingStrategies.add(sampleRow.getSamplingStrategy()); + sampleRowCodes.add(FilterOption.forString(sampleRow.getCode())); + programNames.add(FilterOption.forString(sampleRow.getProgramName())); + companies.add(FilterOption.forValueAndLabel(sampleRow.getCompany().getTopiaId(), sampleRow.getCompany().getName())); + samplingStrategies.add(FilterOption.forEnum(sampleRow.getSamplingStrategy())); if (sampleRow.getObsProgram().isObsVente()) { TerrestrialLocation terrestrialDistrict = sampleRow.getTerrestrialLocation(); - terrestrialDistricts.put(terrestrialDistrict.getTopiaId(), terrestrialDistrict.getDescription()); + terrestrialDistricts.add( + FilterOption.forValueAndLabel( + terrestrialDistrict.getTopiaId(), + terrestrialDistrict.getDescription())); } for (DCF5Code dcf5Code : sampleRow.getdCF5Code()) { - fishingGearDcfs.put( - dcf5Code.getFishingGearDCF().getTopiaId(), - Pair.of(dcf5Code.getFishingGearDCF().getCode(), + fishingGearDcfs.add( + FilterOption.forValueAndLabel( + dcf5Code.getFishingGearDCF().getTopiaId(), dcf5Code.getFishingGearDCF().getI18nKey())); if (dcf5Code.getTargetSpeciesDCF() != null) { - targetSpeciesDcfs.put( - dcf5Code.getTargetSpeciesDCF().getTopiaId(), - Pair.of(dcf5Code.getTargetSpeciesDCF().getCode(), + targetSpeciesDcfs.add( + FilterOption.forValueAndLabel( + dcf5Code.getTargetSpeciesDCF().getTopiaId(), dcf5Code.getTargetSpeciesDCF().getI18nKey())); } } } - public Set<String> getFishingZoneFacadeNames() { + public SortedSet<FilterOption> getFishingZoneFacadeNames() { return fishingZoneFacadeNames; } - public Set<String> getFishingZoneSectorNames() { + public SortedSet<FilterOption> getFishingZoneSectorNames() { return fishingZoneSectorNames; } - public Set<String> getSampleRowCodes() { + public SortedSet<FilterOption> getSampleRowCodes() { return sampleRowCodes; } - public Set<String> getProgramNames() { + public SortedSet<FilterOption> getProgramNames() { return programNames; } - public Map<String, String> getCompanies() { + public SortedSet<FilterOption> getCompanies() { return companies; } - public Set<SamplingStrategy> getSamplingStrategies() { + public SortedSet<FilterOption> getSamplingStrategies() { return samplingStrategies; } - public Map<String, String> getTerrestrialDistricts() { + public SortedSet<FilterOption> getTerrestrialDistricts() { return terrestrialDistricts; } - public Map<String, Pair<String, String>> getFishingGearDcfs() { + public SortedSet<FilterOption> getFishingGearDcfs() { return fishingGearDcfs; } - public Map<String, Pair<String, String>> getTargetSpeciesDcfs() { + public SortedSet<FilterOption> getTargetSpeciesDcfs() { return targetSpeciesDcfs; } } Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/LocalizedSampleRowsFilterValues.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/LocalizedSampleRowsFilterValues.java 2014-03-27 12:39:43 UTC (rev 1766) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/LocalizedSampleRowsFilterValues.java 2014-03-27 13:34:21 UTC (rev 1767) @@ -1,16 +1,12 @@ package fr.ifremer.wao.web.action.obsmer; import fr.ifremer.wao.entity.SampleRow; -import fr.ifremer.wao.entity.SamplingStrategy; import fr.ifremer.wao.services.WaoCacheElement; +import fr.ifremer.wao.services.service.FilterOption; import fr.ifremer.wao.services.service.SampleRowsFilterValues; -import org.apache.commons.lang3.tuple.Pair; -import org.nuiton.i18n.I18n; -import java.util.HashMap; import java.util.Locale; -import java.util.Map; -import java.util.Set; +import java.util.SortedSet; public class LocalizedSampleRowsFilterValues implements WaoCacheElement { @@ -27,56 +23,39 @@ decorated.addSampleRow(sampleRow); } - public Set<String> getSampleRowCodes() { - return decorated.getSampleRowCodes(); + public SortedSet<FilterOption> getTargetSpeciesDcfs() { + return decorated.getTargetSpeciesDcfs(); } - public Set<SamplingStrategy> getSamplingStrategies() { - return decorated.getSamplingStrategies(); + public SortedSet<FilterOption> getTerrestrialDistricts() { + return decorated.getTerrestrialDistricts(); } - public Set<String> getFishingZoneSectorNames() { - return decorated.getFishingZoneSectorNames(); + public SortedSet<FilterOption> getSampleRowCodes() { + return decorated.getSampleRowCodes(); } - public Set<String> getProgramNames() { - return decorated.getProgramNames(); + public SortedSet<FilterOption> getFishingZoneSectorNames() { + return decorated.getFishingZoneSectorNames(); } - public Set<String> getFishingZoneFacadeNames() { - return decorated.getFishingZoneFacadeNames(); - } - - public Map<String, String> getCompanies() { + public SortedSet<FilterOption> getCompanies() { return decorated.getCompanies(); } - public Map<String, String> getTerrestrialDistricts() { - return decorated.getTerrestrialDistricts(); + public SortedSet<FilterOption> getProgramNames() { + return decorated.getProgramNames(); } - public Map<String, String> getFishingGearDcfs() { - Map<String, String> translated = new HashMap<>(); - for (Map.Entry<String, Pair<String, String>> entry : - decorated.getFishingGearDcfs().entrySet()) { - String topiaId = entry.getKey(); - String code = entry.getValue().getLeft(); - String i18nKey = entry.getValue().getRight(); - translated.put(topiaId, code + " " + I18n.l(locale, i18nKey)); - } - return translated; + public SortedSet<FilterOption> getSamplingStrategies() { + return decorated.getSamplingStrategies(); } - public Map<String, String> getTargetSpeciesDcfs() { - Map<String, String> translated = new HashMap<>(); - for (Map.Entry<String, Pair<String, String>> entry : - decorated.getTargetSpeciesDcfs().entrySet()) { - String topiaId = entry.getKey(); - String code = entry.getValue().getLeft(); - String i18nKey = entry.getValue().getRight(); - translated.put(topiaId, code + " " + I18n.l(locale, i18nKey)); - } - return translated; + public SortedSet<FilterOption> getFishingZoneFacadeNames() { + return decorated.getFishingZoneFacadeNames(); } + public SortedSet<FilterOption> getFishingGearDcfs() { + return decorated.getFishingGearDcfs(); + } } 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 12:39:43 UTC (rev 1766) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 2014-03-27 13:34:21 UTC (rev 1767) @@ -77,36 +77,48 @@ <s:select name="filter.companyIds" label="%{getText('wao.ui.entity.Company')}" list="filterValues.companies" + listKey="value" + listValue="label" multiple="true" dataBinding="companies" /> <s:select name="filter.programNames" label="%{getText('wao.ui.field.SampleRow.programName')}" list="filterValues.programNames" + listKey="value" + listValue="label" multiple="true" dataBinding="programNames" /> <s:select name="filter.fishingZoneFacadeNames" label="%{getText('wao.ui.field.FishingZone.facadeName')}" list="filterValues.fishingZoneFacadeNames" + listKey="value" + listValue="label" multiple="true" dataBinding="fishingZoneFacadeNames" /> <s:select name="filter.fishingZoneSectorNames" label="%{getText('wao.ui.field.FishingZone.sectorName')}" list="filterValues.fishingZoneSectorNames" + listKey="value" + listValue="label" multiple="true" dataBinding="fishingZoneSectorNames" /> <s:select name="filter.sampleRowCodes" label="%{getText('wao.ui.field.SampleRow.code')}" list="filterValues.sampleRowCodes" + listKey="value" + listValue="label" multiple="true" dataBinding="sampleRowCodes" /> <s:select name="filter.fishingGearDcfIds" label="%{getText('wao.ui.entity.fishingGearDCF')}" list="filterValues.fishingGearDcfs" + listKey="value" + listValue="label" value="%getText(#value)" multiple="true" dataBinding="fishingGearDcfs" /> @@ -114,6 +126,8 @@ <s:select name="filter.targetSpeciesDcfIds" label="%{getText('wao.ui.entity.targetSpeciesDCF')}" list="filterValues.targetSpeciesDcfs" + listKey="value" + listValue="label" multiple="true" dataBinding="targetSpeciesDcfs" /> Modified: trunk/wao-web/src/main/webapp/js/wao.js =================================================================== --- trunk/wao-web/src/main/webapp/js/wao.js 2014-03-27 12:39:43 UTC (rev 1766) +++ trunk/wao-web/src/main/webapp/js/wao.js 2014-03-27 13:34:21 UTC (rev 1767) @@ -79,11 +79,8 @@ // FIXME brendan 26/03/14 should be data-binding but freemarker break the template :-( var binding = $select.attr('databinding'); var options = filterValues[binding]; - $.each(options, function (value, label) { - if (typeof value == "number") { - value = label; - } - var optionHtml = '<option value="' + value + '">' + label + '</option>'; + $.each(options, function (index, option) { + var optionHtml = '<option value="' + option.value + '">' + option.label + '</option>'; $select.append(optionHtml); }); var selectedOptions = filter[name];

1 0