This is an automated email from the git hooks/post-receive script. New commit to branch feature/2263 in repository wao. See http://git.codelutin.com/wao.git commit 5bcc4c289cf3ff8473efda00a0a1af960f537de5 Author: Brendan Le Ny <bleny@codelutin.com> Date: Thu Dec 18 16:59:10 2014 +0100 Dans le plan scléro, on ajoute une colonne pour l'espèce --- .../webapp/WEB-INF/content/sclerochronology/sampling-plan.jsp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/wao-web/src/main/webapp/WEB-INF/content/sclerochronology/sampling-plan.jsp b/wao-web/src/main/webapp/WEB-INF/content/sclerochronology/sampling-plan.jsp index bb7a9d9..3511394 100644 --- a/wao-web/src/main/webapp/WEB-INF/content/sclerochronology/sampling-plan.jsp +++ b/wao-web/src/main/webapp/WEB-INF/content/sclerochronology/sampling-plan.jsp @@ -182,12 +182,12 @@ </div> <s:if test="authenticatedWaoUser.authorizedToViewOtherCompanies"> - <s:set var="nbColumnsForProfessionInFullView" value="10" /> + <s:set var="nbColumnsForProfessionInFullView" value="11" /> </s:if> <s:else> - <s:set var="nbColumnsForProfessionInFullView" value="9" /> + <s:set var="nbColumnsForProfessionInFullView" value="10" /> </s:else> -<s:set var="nbColumnsForProfessionInCompactView" value="6" /> +<s:set var="nbColumnsForProfessionInCompactView" value="7" /> <s:set var="nbColumnsForMonths" value="%{samplingPlan.months.size() + 1}" /> <s:set var="nbColumnsForOther" value="2" /> <s:set var="nbColumnsTotalInFullView" value="%{#nbColumnsForProfessionInFullView + #nbColumnsForMonths + #nbColumnsForOther}" /> @@ -234,6 +234,7 @@ <th><s:text name="wao.ui.field.SampleRow.sclerochronologySamplingContext"/></th> <th><s:text name="wao.ui.field.SampleRow.sclerochronologySamplingContextInfo"/></th> <th><s:text name="wao.ui.field.SampleRow.individualMeasurementStrategy"/></th> + <th><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> @@ -314,6 +315,9 @@ <td> <s:property value="individualMeasurementStrategy"/> </td> + <td> + <s:property value="species"/> + </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> <!-- Months columns --> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.