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

[Suiviobsmer-commits] r743 - trunk/wao-business/src/main/xmi
by bleny＠users.labs.libre-entreprise.org 05 Nov '10

05 Nov '10

Author: bleny Date: 2010-11-05 12:46:28 +0000 (Fri, 05 Nov 2010) New Revision: 743 Log: add orderBy relation in model to make indicators have their levels sorted by level number Modified: trunk/wao-business/src/main/xmi/wao.zargo Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ)

1 0

[Suiviobsmer-commits] r742 - trunk/wao-ui/src/main/webapp
by bleny＠users.labs.libre-entreprise.org 05 Nov '10

05 Nov '10

Author: bleny Date: 2010-11-05 12:45:49 +0000 (Fri, 05 Nov 2010) New Revision: 742 Log: fix build Modified: trunk/wao-ui/src/main/webapp/Administration.tml Modified: trunk/wao-ui/src/main/webapp/Administration.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Administration.tml 2010-11-05 12:04:34 UTC (rev 741) +++ trunk/wao-ui/src/main/webapp/Administration.tml 2010-11-05 12:45:49 UTC (rev 742) @@ -172,7 +172,7 @@ <div class="mtop10" /> - <t:if test="user.indicatorsViewer"> + <t:if test="currentUser.indicatorsViewer"> <t:if t:test="currentUser.admin">

1 0

[Suiviobsmer-commits] r741 - in trunk: wao-business/src/main/filters wao-business/src/main/java/fr/ifremer/wao wao-business/src/main/java/fr/ifremer/wao/bean wao-business/src/main/xmi wao-ui/src/main/webapp
by bleny＠users.labs.libre-entreprise.org 05 Nov '10

05 Nov '10

Author: bleny Date: 2010-11-05 12:04:34 +0000 (Fri, 05 Nov 2010) New Revision: 741 Log: add configuration option to hide indicators or not in Wao.properties Modified: trunk/wao-business/src/main/filters/Wao.properties trunk/wao-business/src/main/java/fr/ifremer/wao/WaoProperty.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ConnectedUserImpl.java trunk/wao-business/src/main/xmi/wao.zargo trunk/wao-ui/src/main/webapp/Administration.tml trunk/wao-ui/src/main/webapp/Synthesis.tml Modified: trunk/wao-business/src/main/filters/Wao.properties =================================================================== --- trunk/wao-business/src/main/filters/Wao.properties 2010-11-04 22:57:53 UTC (rev 740) +++ trunk/wao-business/src/main/filters/Wao.properties 2010-11-05 12:04:34 UTC (rev 741) @@ -56,3 +56,9 @@ ## Server path for chart generation chart.server.path= + +###### Since 1.6 + +# By default make indicators not visible +wao.indicators.show=false + Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoProperty.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoProperty.java 2010-11-04 22:57:53 UTC (rev 740) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoProperty.java 2010-11-05 12:04:34 UTC (rev 741) @@ -51,7 +51,9 @@ /** Path for Eastwood */ CHART_SERVER_PATH("chart.server.path"), /** Email address to use when contact is done */ - CONTACT_DONE_EMAIL("wao.contactDone.email"); + CONTACT_DONE_EMAIL("wao.contactDone.email"), + /** Will indicators be shown in UI or not */ + SHOW_INDICATORS("wao.indicators.show"); private String key; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ConnectedUserImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ConnectedUserImpl.java 2010-11-04 22:57:53 UTC (rev 740) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ConnectedUserImpl.java 2010-11-05 12:04:34 UTC (rev 741) @@ -20,6 +20,7 @@ */ package fr.ifremer.wao.bean; +import fr.ifremer.wao.WaoProperty; import fr.ifremer.wao.entity.Company; /** @@ -68,4 +69,10 @@ public Company getCompany() { return user.getCompany(); } + + @Override + public boolean isIndicatorsViewer() { + Boolean test = Boolean.parseBoolean(WaoProperty.SHOW_INDICATORS.getValue()); + return test; + } } Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ) Modified: trunk/wao-ui/src/main/webapp/Administration.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Administration.tml 2010-11-04 22:57:53 UTC (rev 740) +++ trunk/wao-ui/src/main/webapp/Administration.tml 2010-11-05 12:04:34 UTC (rev 741) @@ -172,61 +172,65 @@ <div class="mtop10" /> - <t:if t:test="currentUser.admin">  + <t:if test="user.indicatorsViewer"> - <t:zone t:id="synthesisParametersFormZone" t:update="show"> - <h2>Indicateurs qualités prestataires</h2> + <t:if t:test="currentUser.admin">  - <form t:type="form" t:id="synthesisParametersForm" t:zone="synthesisParametersFormZone"> + <t:zone t:id="synthesisParametersFormZone" t:update="show"> + <h2>Indicateurs qualités prestataires</h2> - <t:errors t:banner="message:errors-banner" /> + <form t:type="form" t:id="synthesisParametersForm" t:zone="synthesisParametersFormZone"> -  - <t:loop t:source="globalSynthesisParameters.parameters" t:value="indicator" t:volatile="true"> - <t:indicatorLevels t:indicator="indicator" editable="true" /> - </t:loop> + <t:errors t:banner="message:errors-banner" /> - <table class="indicatorLevels"> - <tr> - <th>Total coefficients : </th> - <td>${globalSynthesisParameters.totalCoefficients}</td> - </tr> - </table> +  + <t:loop t:source="globalSynthesisParameters.parameters" t:value="indicator" t:volatile="true"> + <t:indicatorLevels t:indicator="indicator" editable="true" /> + </t:loop> - <table class="indicatorLevels"> - <tr> - <td t:type="loop" t:source="globalSynthesisParameters.globalIndicator.indicatorLevel" t:value="indicatorLevel" t:volatile="true"> - ${globalIndicatorValue.label} - </td> - </tr> - <tr> - <td t:type="loop" t:source="globalSynthesisParameters.globalIndicator.indicatorLevel" t:value="indicatorLevel" volatile="true"> - [ <input type="text" size="3" value="${indicatorLevel.lowerBound}" disabled="disabled" /> ; - <input t:type="textfield" value="indicatorLevel.upperBound" size="3" /> - <t:if test="indicatorLevel.upperBoundIncluded"> - ] - <p:else> - [ - </p:else> - </t:if> - </td> - </tr> - </table> + <table class="indicatorLevels"> + <tr> + <th>Total coefficients : </th> + <td>${globalSynthesisParameters.totalCoefficients}</td> + </tr> + </table> - <div> - <p><label>Commentaire sur la modification* :</label></p> - <p><input t:type="textarea" t:id="comment" cols="50" rows="5" value="comment"/></p> - </div> + <table class="indicatorLevels"> + <tr> + <td t:type="loop" t:source="globalSynthesisParameters.globalIndicator.indicatorLevel" t:value="indicatorLevel" t:volatile="true"> + ${globalIndicatorValue.label} + </td> + </tr> + <tr> + <td t:type="loop" t:source="globalSynthesisParameters.globalIndicator.indicatorLevel" t:value="indicatorLevel" volatile="true"> + [ <input type="text" size="3" value="${indicatorLevel.lowerBound}" disabled="disabled" /> ; + <input t:type="textfield" value="indicatorLevel.upperBound" size="3" /> + <t:if test="indicatorLevel.upperBoundIncluded"> + ] + <p:else> + [ + </p:else> + </t:if> + </td> + </tr> + </table> - <div class="fright"> - <a t:type="pagelink" page="IndicatorsHistory"> - <img src="${asset:context:/img/clock.png}" alt="Historique" title="Voir l'historique des modifications des indicateurs" /> - </a> - <input t:type="submit" t:id="saveData" class="ico save" value="Save" title="Enregistrer les modifications" /> - <input type="reset" class="ico undo" value="Annuler les modificationss" title="Annuler les modifications" /> - </div> - </form> - </t:zone> + <div> + <p><label>Commentaire sur la modification* :</label></p> + <p><input t:type="textarea" t:id="comment" cols="50" rows="5" value="comment"/></p> + </div> + + <div class="fright"> + <a t:type="pagelink" page="IndicatorsHistory"> + <img src="${asset:context:/img/clock.png}" alt="Historique" title="Voir l'historique des modifications des indicateurs" /> + </a> + <input t:type="submit" t:id="saveData" class="ico save" value="Save" title="Enregistrer les modifications" /> + <input type="reset" class="ico undo" value="Annuler les modificationss" title="Annuler les modifications" /> + </div> + </form> + </t:zone> + </t:if> + </t:if> </t:layout> Modified: trunk/wao-ui/src/main/webapp/Synthesis.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Synthesis.tml 2010-11-04 22:57:53 UTC (rev 740) +++ trunk/wao-ui/src/main/webapp/Synthesis.tml 2010-11-05 12:04:34 UTC (rev 741) @@ -128,12 +128,14 @@ title="Indicateur de la qualité des données" /> </a> </li> - <li> - <a t:type="actionlink" t:context="[actionShowGlobalSynthesis,'']" t:zone="so-synthesis-main"> - <img src="${asset:context:}/img/synthesis-global-synthesis.png" alt="Synthèse globale des indicateurs" - title="Synthèse globale des indicateurs" /> - </a> - </li> + <t:if test="user.indicatorsViewer"> + <li> + <a t:type="actionlink" t:context="[actionShowGlobalSynthesis,'']" t:zone="so-synthesis-main"> + <img src="${asset:context:}/img/synthesis-global-synthesis.png" alt="Synthèse globale des indicateurs" + title="Synthèse globale des indicateurs" /> + </a> + </li> + </t:if> </ul> </div> <div t:type="zone" t:id="delegator" class="fleft" t:update="show" id="so-synthesis-main"> @@ -160,9 +162,11 @@ <t:chart t:width="600" t:height="400" t:chart="dataSamplingChart" />  -  - <br /> - <t:indicatorLevels t:indicator="activeIndicator" t:highlightLevel="activeIndicatorLevel" withLegend="true" /> + <t:if test="user.indicatorsViewer"> +  + <br /> + <t:indicatorLevels t:indicator="activeIndicator" t:highlightLevel="activeIndicatorLevel" withLegend="true" /> + </t:if> </div> </t:block>  @@ -180,9 +184,11 @@ </p> </t:if> -  - <br /> - <t:indicatorLevels t:indicator="activeIndicator" t:highlightLevel="activeIndicatorLevel" withLegend="true" /> + <t:if test="user.indicatorsViewer"> +  + <br /> + <t:indicatorLevels t:indicator="activeIndicator" t:highlightLevel="activeIndicatorLevel" withLegend="true" /> + </t:if> </div> </t:block>  @@ -228,9 +234,11 @@ </t:if> </div> -  - <br /> - <t:indicatorLevels t:indicator="activeIndicator" t:highlightLevel="activeIndicatorLevel" withLegend="true" /> + <t:if test="user.indicatorsViewer"> +  + <br /> + <t:indicatorLevels t:indicator="activeIndicator" t:highlightLevel="activeIndicatorLevel" withLegend="true" /> + </t:if> </t:block>  <t:block t:id="ind3"> @@ -310,9 +318,11 @@ </p:else> </t:if> -  - <br /> - <t:indicatorLevels t:indicator="activeIndicator" t:highlightLevel="activeIndicatorLevel" withLegend="true" /> + <t:if test="user.indicatorsViewer"> +  + <br /> + <t:indicatorLevels t:indicator="activeIndicator" t:highlightLevel="activeIndicatorLevel" withLegend="true" /> + </t:if> </div> </t:block>  @@ -348,40 +358,43 @@ </p:else> </t:if> -  - <br /> - <t:indicatorLevels t:indicator="activeIndicator" t:highlightLevel="activeIndicatorLevel" withLegend="true" /> + <t:if test="user.indicatorsViewer"> +  + <br /> + <t:indicatorLevels t:indicator="activeIndicator" t:highlightLevel="activeIndicatorLevel" withLegend="true" /> + </t:if> </div> </t:block>  <t:block t:id="globalSynthesis"> - <div class="print"> - <h2>Synthèse globale</h2> - <br /> + <t:if test="user.indicatorsViewer"> + <div class="print"> + <h2>Synthèse globale</h2> + <br /> - <t:loop t:source="globalSynthesisParameters.parameters" t:value="activeIndicator"> - <t:indicatorLevels t:indicator="activeIndicator" t:highlightLevel="activeIndicatorLevel" /> - </t:loop> + <t:loop t:source="globalSynthesisParameters.parameters" t:value="activeIndicator"> + <t:indicatorLevels t:indicator="activeIndicator" t:highlightLevel="activeIndicatorLevel" /> + </t:loop> - <table class="indicatorLevels"> - <tbody> - <tr> - <t:loop t:source="globalLevels" t:value="globalLevel"> - <t:if test="highlightGlobalLevel()"> - <td class="highlight selected"> - ${globalLevel.label} - </td> - <p:else> - <td> + <table class="indicatorLevels"> + <tbody> + <tr> + <t:loop t:source="globalLevels" t:value="globalLevel"> + <t:if test="highlightGlobalLevel()"> + <td class="highlight selected"> ${globalLevel.label} </td> - </p:else> - </t:if> - </t:loop> - </tr> - </tbody> - </table> - - </div> + <p:else> + <td> + ${globalLevel.label} + </td> + </p:else> + </t:if> + </t:loop> + </tr> + </tbody> + </table> + </div> + </t:if> </t:block> </t:layout>

1 0

[Suiviobsmer-commits] r740 - in trunk: wao-business/src/main/java/fr/ifremer/wao wao-ui/src/main/java/fr/ifremer/wao/ui/pages wao-ui/src/main/webapp
by bleny＠users.labs.libre-entreprise.org 04 Nov '10

04 Nov '10

Author: bleny Date: 2010-11-04 22:57:53 +0000 (Thu, 04 Nov 2010) New Revision: 740 Log: refactoring totals by columns in sampling plan ; start filter by multiple codes Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java trunk/wao-ui/src/main/webapp/SamplingPlan.tml Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java 2010-11-04 22:55:02 UTC (rev 739) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java 2010-11-04 22:57:53 UTC (rev 740) @@ -225,8 +225,20 @@ // sectorName and facadeName are the two FishingZone filters known // FishingZone filter (sectorName OR facadeName) + + if (logger.isDebugEnabled()) { + logger.debug("CollectionUtils.isNotEmpty(filter.getSampleRows())" + + CollectionUtils.isNotEmpty(filter.getSampleRows())); + } + if (CollectionUtils.isNotEmpty(filter.getSampleRows())) { + if (logger.isDebugEnabled()) { + for (SampleRow row : filter.getSampleRows()) { + logger.debug("sampleRows contains row " + row); + } + } + query.addEquals(sampleRowProperty.$alias(), filter.getSampleRows().toArray( new SampleRow[filter.getSampleRows().size()])); Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java 2010-11-04 22:55:02 UTC (rev 739) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java 2010-11-04 22:57:53 UTC (rev 740) @@ -62,7 +62,9 @@ import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** * SampingPlan @@ -239,6 +241,51 @@ return this; } + @Property + private boolean refreshSampleRowCodeZone; + + @Property + private String sampleRowCodeIndex; + + @Persist + @Property + private SampleRow selectedSampleRow; + + @InjectComponent + private Zone sampleRowZone; + + public void onChangeFromSelectedSampleRow(String sampleRowCode) { + selectedSampleRow = getSampleRowSelectModel().findObject(sampleRowCode); + + logger.debug("selectedSampleRow " + selectedSampleRow.getCode()); + } + + public Object onActionFromAddSampleRowCode() { + refreshSampleRowCodeZone = true; + if (logger.isDebugEnabled()) { + logger.debug("added filter on code " + selectedSampleRow.getCode()); + } + + if (getFilter().getSampleRows() == null) { + getFilter().setSampleRows(new ArrayList<SampleRow>()); + } + getFilter().addSampleRows(selectedSampleRow); + + selectedSampleRow = null; + + return sampleRowZone; + } + + public Object onActionFromRemoveSampleRowCode(String sampleRowCodeIndex) { + refreshSampleRowCodeZone = true; + + logger.debug("should remove" + sampleRowCodeIndex); + + getFilter().getSampleRows().remove(selectedSampleRow); + + return sampleRowZone; + } + /**************************** MAIN ACTIONS ********************************/ @Persist @@ -297,6 +344,11 @@ */ public List<SampleRow> getData() throws WaoException { if (data == null) { + if (logger.isDebugEnabled()) { + logger.debug("sampleRows filter sent to service : " + + getFilter().getSampleRows()); + } + FacadeRow facade = serviceSampling.getSampleRowsOrderedByFishingZone(getFilter()); data = facade.getValues(); @@ -401,19 +453,26 @@ return NumberFormat.getNumberInstance(); } - private List<String> totals; + private Map<Date, Integer> totalExpectedForMonths; + private Map<Date, Integer> totalRealForMonths; + private Integer highTotalExpected; + private Integer highTotalReal; - @Property - private String total; + /** Set totalExpectedForMonths, totalRealForMonths, highTotalExpected and + * highTotalReal values. + */ + protected void setTotalsForMonths() { - public List<String> getTotals() { + // to prevent a side-effect, keep month value + Date keptMonth = month; - List<String> totals = new ArrayList<String>(); + totalExpectedForMonths = new HashMap<Date, Integer>(); + totalRealForMonths = new HashMap<Date, Integer>(); - // high totals are the total... of the totals, it will appear + // high totals is the total... of the totals, it will appear // in the bottom right, as the last element of the "totals" line - Integer highTotalExpected = 0; - Integer highTotalReal = 0; + highTotalExpected = 0; + highTotalReal = 0; for (Date month : getMonths()) { this.month = month; @@ -423,37 +482,95 @@ for (SampleRow row : getData()) { this.row = row; - Integer expected = getNbTidesExpected(), real = getNbTidesReal(); if (logger.isDebugEnabled()) { - logger.debug(String.format("expected = %s, real = %s", expected, real)); + logger.debug( String.format("for month %s and row %s : expected = %s, real = %s", + getDateFormat().format(month), row.getCode(), expected, real)); } if (expected != null) { totalExpected += expected; } - if (real != null) { + if (real != null && canDisplayTidesReal()) { totalReal += real; } } - String total = totalExpected.toString(); - if (canDisplayTidesReal() && totalReal != 0) { - total += " (" + totalReal + ")"; + totalExpectedForMonths.put(month, totalExpected); + totalRealForMonths.put(month, totalReal); + + if (logger.isDebugEnabled()) { + logger.debug( String.format("totals for month %s : expected = %s, actual = %s", + getDateFormat().format(month), totalExpected, totalReal)); } - totals.add(total); - highTotalExpected += totalExpected; highTotalReal += totalReal; } + + if (logger.isDebugEnabled()) { + for (Map.Entry<Date, Integer> expected : totalExpectedForMonths.entrySet()) { + logger.debug( String.format("totals for month %s : expected = %s, actual = %s", + getDateFormat().format(expected.getKey()), expected.getValue(), + totalRealForMonths.get(expected.getKey()))); + } + } - totals.add(highTotalExpected + " (" + highTotalReal + ")"); + // to prevent side-effect, restore month value + month = keptMonth; + } - return totals; + public Integer getTotalExpectedForMonth() { + if (totalExpectedForMonths == null) { + setTotalsForMonths(); + } + Integer total = totalExpectedForMonths.get(month); + if (logger.isDebugEnabled()) { + logger.debug(String.format("total for month %s is %s", getDateFormat().format(month), total)); + } + return total; } + public Integer getTotalRealForMonth() { + if (totalExpectedForMonths == null) { + setTotalsForMonths(); + } + return totalRealForMonths.get(month); + } + + public String getRatioForMonth() { + String ratio = ""; + if (getTotalExpectedForMonth() > 0) { + double percent = ((double) getTotalRealForMonth() / getTotalExpectedForMonth()); + ratio = NumberFormat.getPercentInstance().format(percent); + } + return ratio; + } + + public Integer getHighTotalExpected() { + if (highTotalExpected == null) { + setTotalsForMonths(); + } + return highTotalExpected; + } + + public Integer getHighTotalReal() { + if (highTotalReal == null) { + setTotalsForMonths(); + } + return highTotalReal; + } + + public String getHighTotalRatio() { + String ratio = ""; + if (getHighTotalExpected() > 0) { + double percent = ((double) getHighTotalReal() / getHighTotalExpected()); + ratio = NumberFormat.getPercentInstance().format(percent); + } + return ratio; + } + /** ------------------------- HTML & STYLE ----------------------------- **/ @Property @@ -512,6 +629,16 @@ return result; } + public String getRealTidesClassForTotal() { + String result = "real-warning"; + if (getTotalRealForMonth() < getTotalExpectedForMonth()) { + result += "-inf"; + } else if (getTotalExpectedForMonth() > getTotalRealForMonth()) { + result += "-sup"; + } + return result; + } + public String getMonthCurrentClass() { return isCurrentMonth() ? "selected" : ""; } Modified: trunk/wao-ui/src/main/webapp/SamplingPlan.tml =================================================================== --- trunk/wao-ui/src/main/webapp/SamplingPlan.tml 2010-11-04 22:55:02 UTC (rev 739) +++ trunk/wao-ui/src/main/webapp/SamplingPlan.tml 2010-11-04 22:57:53 UTC (rev 740) @@ -128,8 +128,31 @@ <select t:type="select" t:id="sectorName" t:model="sectorSelectModel" t:value="filter.sectorName" />  <input t:type="submit" class="ico22px refresh" t:id="refreshBySector" value="Refresh" title="Rafraîchir les métiers en fonction de la zone sélectionnée"/>  - <t:label t:for="sampleRow" />: - <input t:type="select" t:id="sampleRow" t:model="sampleRowSelectModel" value="sampleRowId" /> +  + + + <t:zone id="so-sampling-sampleRowZone" t:id="sampleRowZone" t:update="show"> + <t:nuiton.subForm t:visible="refreshSampleRowCodeZone"> + <t:label t:for="selectedSampleRow" />: + <select t:type="select" t:id="selectedSampleRow" t:value="selectedSampleRow" t:model="sampleRowSelectModel" + t:mixins="ck/onEvent" t:event="change"/> + <a t:type="actionlink" t:id="addSampleRowCode" title="Ajouter un code de ligne" t:zone="so-sampling-sampleRowZone"> + <img src="${asset:context:img/add-16px.png}" /> + </a>  +  + </t:nuiton.subForm> + </t:zone> + + + </div> <div class="t-beaneditor-row aright"> <input t:type="submit" class="ico search-32px" t:id="search" value="Search" title="Rechercher les lignes du plan correspondants aux filtres saisies" />  @@ -303,11 +326,25 @@ </tr> <tr> <td colspan="${nbColumnsForProfession}" /> - <t:loop source="totals" value="total"> + + <t:loop source="months" value="month"> <td class="width50 acenter ${monthCurrentClass}"> - ${total} + ${totalExpectedForMonth} +  + <span class="${realTidesClassForTotal}"><em>(${totalRealForMonth})</em></span> + <br /> + ${ratioForMonth} +  </td> </t:loop> + <td class="width50 acenter bright"> + <span t:type="ck/Tooltip" title="Infos" t:value="Total sur la période du mois ${dateFormat.format(month)}" t:effect="appear"> + ${highTotalExpected} + <t:unless t:test="user.guest"> + <em>(${highTotalReal})</em><br /><strong>${highTotalRatio}</strong> + </t:unless> + </span> + </td> <td colspan="${nbColumnsForOther}" /> </tr> </tbody>

1 0

[Suiviobsmer-commits] r739 - trunk/wao-business/src/main/java/fr/ifremer/wao
by bleny＠users.labs.libre-entreprise.org 04 Nov '10

04 Nov '10

Author: bleny Date: 2010-11-04 22:55:02 +0000 (Thu, 04 Nov 2010) New Revision: 739 Log: update migration code to make it coherent with model Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java 2010-11-04 20:22:38 UTC (rev 738) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java 2010-11-04 22:55:02 UTC (rev 739) @@ -303,17 +303,11 @@ "topiaCreateDate TIMESTAMP WITHOUT TIME ZONE NOT NULL," + "logText TEXT," + "\"comment\" TEXT," + - "indicator CHARACTER VARYING(255)," + "author CHARACTER VARYING(255)," + "CONSTRAINT author_fkey FOREIGN KEY (author) " + "REFERENCES WaoUser (topiaid) MATCH SIMPLE " + - "ON UPDATE NO ACTION ON DELETE NO ACTION, " + - "CONSTRAINT indicator_fkey FOREIGN KEY (indicator) " + - "REFERENCES Indicator (topiaid) MATCH SIMPLE " + "ON UPDATE NO ACTION ON DELETE NO ACTION);"); - - } /** Insert initial data specified in newly created tables about indicators. */

1 0

[Suiviobsmer-commits] r738 - trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages
by bleny＠users.labs.libre-entreprise.org 04 Nov '10

04 Nov '10

Author: bleny Date: 2010-11-04 20:22:38 +0000 (Thu, 04 Nov 2010) New Revision: 738 Log: make company field value kept between submission in synthesis filter Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java 2010-11-04 20:21:42 UTC (rev 737) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java 2010-11-04 20:22:38 UTC (rev 738) @@ -117,9 +117,11 @@ private Zone delegator; void setupRender() { - // The company of connected user will be contributed to abstractFilteredPage - initCompanyFilter(); + // make filters keep company between submissions + initSelectFilters(true, false, true); + // add a special CSS to make global synthesis page printable without + // menu, filters, etc. renderSupport.addStylesheetLink("css/synthesis-print.css", "print"); } @@ -171,10 +173,6 @@ } public Block getActiveBlock() throws WaoException { - switch (getActiveSynthesis()) { - case GRAPH_SAMPLING : initSamplingBlock(); break; - case GRAPH_BOARDING : initBoardingBlock(); - } Block activeBlock; if (BooleanUtils.isTrue(showGlobalSynthesis)) { @@ -299,11 +297,7 @@ private boolean reset; - private void initSamplingBlock() throws WaoException { - initSelectFilters(true, false, true); - } - - public JFreeChart getDataSamplingChart() throws WaoException { + public JFreeChart getDataSamplingChart() throws WaoException { List<SortedMap<Date, Integer>> res = serviceSynthesis.getDataSampling(getFilter()); Map<String, Map<?, Integer>> data = new HashMap<String, Map<?, Integer>>(); data.put("Planifié", res.get(0)); @@ -329,25 +323,6 @@ private BoardingResult boardingResult; - @Persist - private Company companyForBoarding; - - @Property - private String companyIdForBoarding; - - private void initBoardingBlock() throws WaoException { - resetCompanySelect(); - // Set the companyIdForBoarding is only necessary for an admin which - // have access to a select with all active companies (from Filters : - // getCompanySelectModel()) - if (companyForBoarding != null && user.isAdmin()) { - companyIdForBoarding = companyForBoarding.getTopiaId(); - if (log.isDebugEnabled()) { - log.debug("companyId init : " + companyIdForBoarding); - } - } - } - public JFreeChart getBoardingBoatsChart() throws WaoException { Map<String, Map<?, Integer>> data = new HashMap<String, Map<?, Integer>>(); @@ -356,6 +331,7 @@ String title = "Sollicitations des navires depuis le " + getDateFormat().format(getFilter().getPeriod().getFromDate()); + Company companyForBoarding = getFilter().getCompany(); if (companyForBoarding != null) { title += "\nSociété " + companyForBoarding.getName(); }

1 0

[Suiviobsmer-commits] r737 - trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components
by bleny＠users.labs.libre-entreprise.org 04 Nov '10

04 Nov '10

Author: bleny Date: 2010-11-04 20:21:42 +0000 (Thu, 04 Nov 2010) New Revision: 737 Log: layout for square brackets (no line break) Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/IndicatorLevels.tml Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/IndicatorLevels.tml =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/IndicatorLevels.tml 2010-11-04 10:32:57 UTC (rev 736) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/IndicatorLevels.tml 2010-11-04 20:21:42 UTC (rev 737) @@ -51,15 +51,10 @@ ${indicatorLevel.upperBound} <p:else> <t:if test="indicatorLevel.lowerBoundPositiveInfinity"> - ] ${indicatorLevel.upperBound} et plus + ] ${indicatorLevel.upperBound} et plus <p:else> - [ ${indicatorLevel.lowerBound} à ${indicatorLevel.upperBound} - <t:if test="indicatorLevel.upperBoundIncluded"> - ] - <p:else> - [ - </p:else> - </t:if> + [ ${indicatorLevel.lowerBound} à + ${indicatorLevel.upperBound} <t:if test="indicatorLevel.upperBoundIncluded">]<p:else>[</p:else></t:if> </p:else> </t:if> </p:else>

1 0

[Suiviobsmer-commits] r736 - trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages
by bleny＠users.labs.libre-entreprise.org 04 Nov '10

04 Nov '10

Author: bleny Date: 2010-11-04 10:32:57 +0000 (Thu, 04 Nov 2010) New Revision: 736 Log: bugfix : using filters no longer change page in synthesis Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java 2010-11-03 18:42:33 UTC (rev 735) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java 2010-11-04 10:32:57 UTC (rev 736) @@ -47,6 +47,7 @@ import fr.ifremer.wao.ui.data.RequiresAuthentication; import fr.ifremer.wao.ui.services.WaoManager; import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang.BooleanUtils; import org.apache.tapestry5.Block; import org.apache.tapestry5.ComponentResources; import org.apache.tapestry5.RenderSupport; @@ -176,11 +177,16 @@ } Block activeBlock; - if (showGlobalSynthesis) { + if (BooleanUtils.isTrue(showGlobalSynthesis)) { activeBlock = resources.getBlock("globalSynthesis"); } else { activeBlock = resources.getBlock("ind" + getActiveSynthesis().ordinal()); } + + if (log.isDebugEnabled()) { + log.debug("activeBlock = " + activeBlock); + } + return activeBlock; } @@ -192,11 +198,11 @@ return ChartType.class.getName(); } - private boolean showGlobalSynthesis; + @Persist + private Boolean showGlobalSynthesis; public String getActionShowGlobalSynthesis() { - showGlobalSynthesis = true; - return "globalSynthesis"; + return "showGlobalSynthesis"; } @@ -216,15 +222,23 @@ @Log Object onAction(String actionType, String actionValue) { + + showGlobalSynthesis = false; + + if (log.isDebugEnabled()) { + log.debug("actionType = " + actionType); + } + // Delegator action (menu) if (actionType.equals(SynthesisId.class.getName())) { activeSynthesis = SynthesisId.valueOf(actionValue); return delegator.getBody(); - // Change chart type for dataSampling + // Change chart type for dataSampling } else if (actionType.equals(ChartType.class.getName())) { - dataSamplingChartType = ChartType.valueOf(actionValue); - } else if (actionType.equals("ShowGlobalSynthesis")) { - return "globalSynthesis"; + dataSamplingChartType = ChartType.valueOf(actionValue); + } else if (actionType.equals("showGlobalSynthesis")) { + showGlobalSynthesis = true; + return delegator.getBody(); } return this; }

1 0

[Suiviobsmer-commits] r735 - in trunk: wao-business/src/main/java/fr/ifremer/wao/service wao-business/src/main/resources/i18n wao-business/src/main/xmi wao-ui/src/main/java/fr/ifremer/wao/ui/pages wao-ui/src/main/webapp
by bleny＠users.labs.libre-entreprise.org 03 Nov '10

03 Nov '10

Author: bleny Date: 2010-11-03 18:42:33 +0000 (Wed, 03 Nov 2010) New Revision: 735 Log: update service synthesis to support modification of all global synthesis parameters Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java trunk/wao-business/src/main/resources/i18n/wao-business-en_GB.properties trunk/wao-business/src/main/resources/i18n/wao-business-fr_FR.properties trunk/wao-business/src/main/xmi/wao.zargo trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java trunk/wao-ui/src/main/webapp/Administration.tml Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 2010-11-03 16:51:31 UTC (rev 734) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 2010-11-03 18:42:33 UTC (rev 735) @@ -895,64 +895,97 @@ } @Override - protected void executeUpdateGlobalSynthesisParameter(TopiaContext transaction, - Indicator indicator, WaoUser author, String comment) - throws Exception { - String logText = ""; + protected void executeUpdateGlobalSynthesisParameters(TopiaContext transaction, + GlobalSynthesisParameters parameters, WaoUser author, String comment) + throws Exception { + // will be true if something has changed and we need to add a log for that boolean somethingChanged = false; + String logText = ""; - // fist, find the indicator - Indicator oldIndicator = WaoDAOHelper.getIndicatorDAO(transaction) - .findByIndicatorId(indicator.getIndicatorId()); - // find what have been changed - boolean coefficientChanged = indicator.getCoefficient() - != oldIndicator.getCoefficient(); - if (coefficientChanged) { - somethingChanged = true; + List<Indicator> allIndicators = new ArrayList<Indicator>(); + allIndicators.addAll(parameters.getParameters()); + allIndicators.add(parameters.getGlobalIndicator()); + + for (Indicator indicator : allIndicators) { - // add something to log - // update database - logText += String.format( - "Modification du coefficient de l'indicateur « %s » " + - "(ancienne valeur = %s, nouvelle valeur = %s).\n\n", - indicator.getSynthesisId().getLabel(), - oldIndicator.getCoefficient(), - indicator.getCoefficient()); + boolean indicatorChanged = false; - oldIndicator.setCoefficient(indicator.getCoefficient()); - } + // fist, find the indicator + Indicator oldIndicator = WaoDAOHelper.getIndicatorDAO(transaction) + .findByIndicatorId(indicator.getIndicatorId()); - // new compare old and new level bounds - for (IndicatorLevel level : oldIndicator.getIndicatorLevel()) { - IndicatorLevel newLevel = null; + // now, find what has changed + boolean coefficientChanged = false; + if (oldIndicator.getCoefficient() != null) { + coefficientChanged = ! oldIndicator.getCoefficient(). + equals( indicator.getCoefficient()); + } - // set newLevel - for (IndicatorLevel tempLevel : indicator.getIndicatorLevel()) { - if (tempLevel.getLevel() == level.getLevel()) { - newLevel = tempLevel; - } + if (log.isDebugEnabled()) { + log.debug("old coefficient value = " + oldIndicator.getCoefficient() + + " new coefficient value = " + indicator.getCoefficient() + + " coefficientChanged = " + coefficientChanged); } + if (coefficientChanged) { + indicatorChanged = true; - boolean upperBoundChanged = level.getUpperBound() - != newLevel.getUpperBound(); - if (upperBoundChanged) { - somethingChanged = true; - + // add something to log + // update database logText += String.format( - "Modification du seuil de transition entre les niveaux " - + "%s et %s de l'indicateur « %s » (ancienne valeur = %s" - + ", nouvelle valeur = %s).\n\n", - level.getLevel(), level.getLevel() + 1, + "Modification du coefficient de l'indicateur « %s » " + + "(ancienne valeur = %s, nouvelle valeur = %s).\n\n", indicator.getSynthesisId().getLabel(), - level.getUpperBound(), newLevel.getUpperBound()); + oldIndicator.getCoefficient(), + indicator.getCoefficient()); - level.setUpperBound(newLevel.getUpperBound()); + oldIndicator.setCoefficient(indicator.getCoefficient()); + } - WaoDAOHelper.getIndicatorLevelDAO(transaction).update(level); + // new compare old and new level bounds + for (IndicatorLevel level : oldIndicator.getIndicatorLevel()) { + IndicatorLevel newLevel = null; + + // set newLevel + for (IndicatorLevel tempLevel : indicator.getIndicatorLevel()) { + if (tempLevel.getLevel() == level.getLevel()) { + newLevel = tempLevel; + } + } + + boolean upperBoundChanged = level.getUpperBound() + != newLevel.getUpperBound(); + if (upperBoundChanged) { + indicatorChanged = true; + + String changedIndicatorName; + if (indicator.getSynthesisId() == null) { + changedIndicatorName = "Bilan de la synthèse globale"; + } else { + changedIndicatorName = indicator.getSynthesisId().getLabel(); + } + + logText += String.format( + "Modification du seuil de transition entre les niveaux " + + "%s et %s de l'indicateur « %s » (ancienne valeur = %s" + + ", nouvelle valeur = %s).\n\n", + level.getLevel(), level.getLevel() + 1, + changedIndicatorName, + level.getUpperBound(), newLevel.getUpperBound()); + + level.setUpperBound(newLevel.getUpperBound()); + + WaoDAOHelper.getIndicatorLevelDAO(transaction).update(level); + } + } + if (indicatorChanged) { + // finally, update the indicator + WaoDAOHelper.getIndicatorDAO(transaction).update(oldIndicator); + somethingChanged = true; + } } if (somethingChanged) { @@ -972,15 +1005,6 @@ // add entity logText WaoDAOHelper.getIndicatorLogDAO(transaction).create(indicatorLog); - // attach the new indicator log to the concerned indicator - // Collection indicatorLogs = indicator.getIndicatorLog(); - Collection<IndicatorLog> indicatorLogs = oldIndicator.getIndicatorLog(); - indicatorLogs.add(indicatorLog); - oldIndicator.setIndicatorLog(indicatorLogs); - - // finally, update the indicator - WaoDAOHelper.getIndicatorDAO(transaction).update(oldIndicator); - transaction.commitTransaction(); } else { log.warn("no modification were found in global synthesis " + Modified: trunk/wao-business/src/main/resources/i18n/wao-business-en_GB.properties =================================================================== --- trunk/wao-business/src/main/resources/i18n/wao-business-en_GB.properties 2010-11-03 16:51:31 UTC (rev 734) +++ trunk/wao-business/src/main/resources/i18n/wao-business-en_GB.properties 2010-11-03 18:42:33 UTC (rev 735) @@ -90,7 +90,7 @@ wao.error.serviceSynthesis.getGlobalSynthesisParameters=Unable to get data about global synthesis parameters wao.error.serviceSynthesis.getGlobalSynthesisResult= wao.error.serviceSynthesis.getNonComplianceBoardingIndicator= -wao.error.serviceSynthesis.updateGlobalSynthesisParameter=Unable to update global synthesis parameters +wao.error.serviceSynthesis.updateGlobalSynthesisParameters=Unable to update global synthesis parameters wao.error.serviceUser.connect= wao.error.serviceUser.createDefaultAdmin= wao.error.serviceUser.createUpdateCompany= Modified: trunk/wao-business/src/main/resources/i18n/wao-business-fr_FR.properties =================================================================== --- trunk/wao-business/src/main/resources/i18n/wao-business-fr_FR.properties 2010-11-03 16:51:31 UTC (rev 734) +++ trunk/wao-business/src/main/resources/i18n/wao-business-fr_FR.properties 2010-11-03 18:42:33 UTC (rev 735) @@ -89,7 +89,7 @@ wao.error.serviceSynthesis.getGlobalSynthesisParameters=Impossible de r\u00E9cup\u00E9rer les donn\u00E9es concernant les indicateurs pour la synth\u00E8se globale wao.error.serviceSynthesis.getGlobalSynthesisResult= wao.error.serviceSynthesis.getNonComplianceBoardingIndicator=Impossible de r\u00E9cup\u00E9rer l'indicateur de non respect du nombre d'observateurs embarqu\u00E9s -wao.error.serviceSynthesis.updateGlobalSynthesisParameter=Impossible de mettre \u00E0 jour les param\u00E8tres de la synth\u00E8se globale +wao.error.serviceSynthesis.updateGlobalSynthesisParameters=Impossible de mettre \u00E0 jour les param\u00E8tres de la synth\u00E8se globale wao.error.serviceUser.connect=Une erreur est survenue lors de la demande de connexion wao.error.serviceUser.createDefaultAdmin=Impossible de cr\u00E9er l'administrateur par d\u00E9faut wao.error.serviceUser.createUpdateCompany=Impossible de cr\u00E9er ou de mettre \u00E0 jour la soci\u00E9t\u00E9 Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ) Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java 2010-11-03 16:51:31 UTC (rev 734) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java 2010-11-03 18:42:33 UTC (rev 735) @@ -640,10 +640,9 @@ } void onSuccessFromSynthesisParametersForm() { - for (Indicator indicator : getGlobalSynthesisParameters().getParameters()) { - serviceSynthesis.updateGlobalSynthesisParameter - (indicator, currentUser.getUser(), comment); - } + serviceSynthesis.updateGlobalSynthesisParameters( + getGlobalSynthesisParameters(), currentUser.getUser(), comment); + getGlobalSynthesisParameters(); } /* variable used in loop */ Modified: trunk/wao-ui/src/main/webapp/Administration.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Administration.tml 2010-11-03 16:51:31 UTC (rev 734) +++ trunk/wao-ui/src/main/webapp/Administration.tml 2010-11-03 18:42:33 UTC (rev 735) @@ -182,7 +182,7 @@ <t:errors t:banner="message:errors-banner" />  - <t:loop t:source="globalSynthesisParameters.parameters" t:value="indicator" volatile="true"> + <t:loop t:source="globalSynthesisParameters.parameters" t:value="indicator" t:volatile="true"> <t:indicatorLevels t:indicator="indicator" editable="true" /> </t:loop> @@ -195,7 +195,7 @@ <table class="indicatorLevels"> <tr> - <td t:type="loop" t:source="globalSynthesisParameters.globalIndicator.indicatorLevel" t:value="indicatorLevel"> + <td t:type="loop" t:source="globalSynthesisParameters.globalIndicator.indicatorLevel" t:value="indicatorLevel" t:volatile="true"> ${globalIndicatorValue.label} </td> </tr>

1 0

[Suiviobsmer-commits] r734 - in trunk: . src/announcement src/site/rst wao-business wao-business/src/main/filters wao-business/src/main/java/fr/ifremer/wao wao-business/src/main/java/fr/ifremer/wao/bean wao-business/src/main/java/fr/ifremer/wao/entity wao-business/src/main/java/fr/ifremer/wao/service wao-business/src/main/xmi wao-business/src/test/java/fr/ifremer/wao wao-business/src/test/java/fr/ifremer/wao/io wao-business/src/test/java/fr/ifremer/wao/service wao-business/src/test/resources wao-business/sr
by bleny＠users.labs.libre-entreprise.org 03 Nov '10

03 Nov '10

Author: bleny Date: 2010-11-03 16:51:31 +0000 (Wed, 03 Nov 2010) New Revision: 734 Log: merge changes from branches 1.5.4 : will bring bugfixes into 1.6 Added: trunk/src/announcement/release-email-1.5.4.txt trunk/wao-ui/src/main/webapp/js/administration.js trunk/wao-ui/src/main/webapp/js/news.js Removed: trunk/wao-ui/src/main/webapp/js/AdminUserSelect.js trunk/wao-ui/src/main/webapp/js/NewsHider.js Modified: trunk/ trunk/changelog.txt trunk/src/site/rst/index.rst trunk/wao-business/ trunk/wao-business/pom.xml trunk/wao-business/src/main/filters/Wao.properties trunk/wao-business/src/main/java/fr/ifremer/wao/ trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java trunk/wao-business/src/main/java/fr/ifremer/wao/WaoBusinessException.java trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/CompanyBoatInfosImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SynthesisId.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/WaoUserImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ trunk/wao-business/src/main/xmi/wao.properties trunk/wao-business/src/main/xmi/wao.zargo trunk/wao-business/src/test/java/fr/ifremer/wao/ trunk/wao-business/src/test/java/fr/ifremer/wao/TestManager.java trunk/wao-business/src/test/java/fr/ifremer/wao/WaoUtilsTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/io/ImportHelperTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ActivityCalendarImportTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceBoatImplTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactInternalTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceReferentialImplTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingImplTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSynthesisImplTest.java trunk/wao-business/src/test/resources/WaoTest.properties trunk/wao-business/src/test/resources/import/echantillonnage.csv trunk/wao-business/src/test/resources/import/navires.csv trunk/wao-business/src/test/resources/import/zonesPeche.csv trunk/wao-ui/ trunk/wao-ui/src/main/java/fr/ifremer/wao/ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/WaoPropertyChangeListener.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Index.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/WaoManager.java trunk/wao-ui/src/main/resources/fr/ifremer/wao/ trunk/wao-ui/src/main/webapp/Contacts.tml trunk/wao-ui/src/main/webapp/js/contacts.js Property changes on: trunk ___________________________________________________________________ Added: svn:mergeinfo + /branches/wao-1.5.x:679-733 Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2010-11-03 13:37:52 UTC (rev 733) +++ trunk/changelog.txt 2010-11-03 16:51:31 UTC (rev 734) @@ -3,6 +3,16 @@ Historique des versions +1.5.4 +----- + +Anomalies ++++++++++ + +- [fdesbois] Ano #2526 : Mail automatique non fonctionnel sous IE. +- [fdesbois] Ano #2540 : La validation programme ne fonctionne plus sur un + contact avec l'état "refus", "refus définitif" ou "non abouti. + 1.5.3 ----- Copied: trunk/src/announcement/release-email-1.5.4.txt (from rev 733, branches/wao-1.5.x/src/announcement/release-email-1.5.4.txt) =================================================================== --- trunk/src/announcement/release-email-1.5.4.txt (rev 0) +++ trunk/src/announcement/release-email-1.5.4.txt 2010-11-03 16:51:31 UTC (rev 734) @@ -0,0 +1,21 @@ + +Un correctif 1.5.4 pour la version 1.5 de Wao est disponible. + +Résolution d'anomalies : + +- Mail automatique non fonctionnel sous IE. [fdesbois-Ano #2526] +- La validation programme ne fonctionne plus sur un contact refusé. + [fdesbois-Ano #2540] + +Documentation : + +http://suiviobsmer.labs.libre-entreprise.org/wao/ + +Téléchargement : + +https://labs.libre-entreprise.org/frs/?group_id=154 + +Cordialement, + +L'équipe Wao + Modified: trunk/src/site/rst/index.rst =================================================================== --- trunk/src/site/rst/index.rst 2010-11-03 13:37:52 UTC (rev 733) +++ trunk/src/site/rst/index.rst 2010-11-03 16:51:31 UTC (rev 734) @@ -26,3 +26,8 @@ .. - Application permettant le suivi des embarquements effectués sur des navires de pêche dans le cadre d'observations scientifiques. + +Cette application n'est pas complètement supporté par le navigateur Microsoft Internet Explorer. Il est préférable d'utiliser un +autre navigateur Internet comme `Mozilla Firefox`_ . + +.. _Mozilla Firefox: http://www.mozilla-europe.org/fr/firefox/ Property changes on: trunk/wao-business ___________________________________________________________________ Deleted: svn:mergeinfo - Modified: trunk/wao-business/pom.xml =================================================================== --- trunk/wao-business/pom.xml 2010-11-03 13:37:52 UTC (rev 733) +++ trunk/wao-business/pom.xml 2010-11-03 16:51:31 UTC (rev 734) @@ -205,9 +205,9 @@ <scm> <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/wao-business/?root=su…</url> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business</connection> - <developerConnection>scm:svn:svn+ssh://${username}@labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business</developerConnection> - </scm> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business</connection> + <developerConnection>scm:svn:svn+ssh://${username}@labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business</developerConnection> + </scm>   Property changes on: trunk/wao-business/src/main/filters/Wao.properties ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoBusinessException.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/CompanyBoatInfosImpl.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SynthesisId.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/WaoUserImpl.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/service ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/wao-business/src/main/xmi/wao.properties ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/wao-business/src/main/xmi/wao.zargo ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/wao-business/src/test/java/fr/ifremer/wao ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/wao-business/src/test/java/fr/ifremer/wao/TestManager.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/wao-business/src/test/java/fr/ifremer/wao/WaoUtilsTest.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/wao-business/src/test/java/fr/ifremer/wao/io/ImportHelperTest.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ActivityCalendarImportTest.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceBoatImplTest.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactInternalTest.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceReferentialImplTest.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingImplTest.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSynthesisImplTest.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/wao-business/src/test/resources/WaoTest.properties ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/wao-business/src/test/resources/import/echantillonnage.csv ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/wao-business/src/test/resources/import/navires.csv ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/wao-business/src/test/resources/import/zonesPeche.csv ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/wao-ui ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/wao-ui/src/main/java/fr/ifremer/wao ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/WaoPropertyChangeListener.java ___________________________________________________________________ Deleted: svn:mergeinfo - Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java 2010-11-03 13:37:52 UTC (rev 733) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java 2010-11-03 16:51:31 UTC (rev 734) @@ -92,7 +92,7 @@ */ @RequiresAuthentication(value = {UserRole.ADMIN, UserRole.COORDINATOR}, readOnlyAllowed = false) @IncludeStylesheet("context:css/administration.css") - at IncludeJavaScriptLibrary("context:js/AdminUserSelect.js") + at IncludeJavaScriptLibrary("context:js/administration.js") public class Administration { @InjectComponent Property changes on: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java ___________________________________________________________________ Deleted: svn:mergeinfo - Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Index.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Index.java 2010-11-03 13:37:52 UTC (rev 733) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Index.java 2010-11-03 16:51:31 UTC (rev 734) @@ -56,7 +56,7 @@ */ @RequiresAuthentication @IncludeStylesheet("context:css/news.css") - at IncludeJavaScriptLibrary("context:js/NewsHider.js") + at IncludeJavaScriptLibrary("context:js/news.js") public class Index { @Inject Property changes on: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/WaoManager.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/wao-ui/src/main/resources/fr/ifremer/wao ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/wao-ui/src/main/webapp/Contacts.tml ___________________________________________________________________ Deleted: svn:mergeinfo - Deleted: trunk/wao-ui/src/main/webapp/js/AdminUserSelect.js =================================================================== --- trunk/wao-ui/src/main/webapp/js/AdminUserSelect.js 2010-11-03 13:37:52 UTC (rev 733) +++ trunk/wao-ui/src/main/webapp/js/AdminUserSelect.js 2010-11-03 16:51:31 UTC (rev 734) @@ -1,53 +0,0 @@ -/* - * #%L - * Wao :: Web Interface - * %% - * Copyright (C) 2009 - 2010 Ifremer - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -/** - * This class is used to manage manually user select on Administration page. - * Options need style depends on inactivity of users. So we use javascript to - * manage dynamic states of the select. Initialization if needed (the correct - * option to select) then use a hidden field 'hiddenUserId' to keep userId - * context (ids are values of options). - * This hidden field will be interpreted by Tapestry when form will be submit. - */ -AdminUserSelect = Class.create({ - initialize: function() { - this.hiddenUserId = $('userActionsForm').hiddenUserId; - this.userSelect = $('userActionsForm').users; - this.userSelect.observe('change', this.updateUserId.bind(this)); - - var userId = $F(this.hiddenUserId); - - // Initialize selected option - if (userId) { - var options = this.userSelect.select('option'); - for (i = 0; i < options.length; i++) { - if (options[i].value == userId) { - options[i].selected = true; - break; - } - } - } - //Tapestry.debug('Initialized !'); - }, - updateUserId: function(event) { - //Tapestry.debug('select value : ' + $F(this.userSelect)); - this.hiddenUserId.setValue($F(this.userSelect)); - } -}); Deleted: trunk/wao-ui/src/main/webapp/js/NewsHider.js =================================================================== --- trunk/wao-ui/src/main/webapp/js/NewsHider.js 2010-11-03 13:37:52 UTC (rev 733) +++ trunk/wao-ui/src/main/webapp/js/NewsHider.js 2010-11-03 16:51:31 UTC (rev 734) @@ -1,100 +0,0 @@ -/* - * #%L - * Wao :: Web Interface - * %% - * Copyright (C) 2009 - 2010 Ifremer - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -/** - * This class is used to hide news details depends on an anchor. This anchor - * must be called 'details' and be surrounded by a paragraph block (<p>) in - * the news content. The anchor will be transformed in a clickable link, then - * the rest of the news will be hidden using NewsDetails object. - */ -NewsHider = Class.create({ - initialize: function() { - this.allNews = $('so-news').select('div.news-content'); - this.anchorPattern = 'a[name="details"]'; - }, - /** - * Method to call to hide all news that contains the anchor 'details' - */ - hideAllNewsDetails: function() { - for (j = 0; j < this.allNews.length; j++) { - this.hideNewsDetails(this.allNews[j]); - } - }, - /** - * Hide a {news} if contains an anchor called 'details'. A NewsDetails object - * will be instantiate to transform the anchor found and hide the rest of - * the news in a hiddenBlock. - */ - hideNewsDetails: function(news) { - // Select all paragraphs in the news - var paragraphs = news.select('p'); - //Tapestry.debug('nb paragraphs in news : ' + paragraphs.length); - - for (i = 0; i < paragraphs.length; i++) { - var paragraph = paragraphs[i]; - - // Check the firstDescendant in the paragraph, we take only anchor called 'details' - if (paragraph.firstDescendant() && paragraph.firstDescendant().match(this.anchorPattern)) { - var anchor = paragraph.firstDescendant(); - - //Tapestry.debug('Find anchor !'); - - // paragraphs to hide are the next siblings of current paragraph - var paragraphsToHide = paragraph.nextSiblings(); - - var details = new NewsDetails(anchor, paragraphsToHide); - - // append the hidden block to the news - news.appendChild(details.hiddenBlock); - break; - } - } - } -}); - -/** - * This class is used to transform an {anchor} in clickable link to display a - * hidden block as news details. The {paragraphsToHide} will be wrapped into - * a div hidden element. When user will click on the {anchor}, the hidden - * block will be toggled to be displayed or not. - */ -NewsDetails = Class.create({ - initialize: function(anchor, paragraphsToHide) { - - //Tapestry.debug('create NewsDetails'); - - // Update params of the anchor to be clickable - anchor.update('Lire la suite...'); - anchor.addClassName('news-details-link'); - // Bind the click on the anchor with the toggle on hiddenBlock - anchor.observe('click', this.toggleDetails.bind(this)); - - // Create hidden block - this.hiddenBlock = document.createElement('div'); - this.hiddenBlock.addClassName('hidden'); - - for (i = 0; i < paragraphsToHide.length; i++) { - this.hiddenBlock.appendChild(paragraphsToHide[i]); - } - }, - toggleDetails: function(event) { - this.hiddenBlock.toggleClassName('hidden'); - } -}); Copied: trunk/wao-ui/src/main/webapp/js/administration.js (from rev 733, branches/wao-1.5.x/wao-ui/src/main/webapp/js/administration.js) =================================================================== --- trunk/wao-ui/src/main/webapp/js/administration.js (rev 0) +++ trunk/wao-ui/src/main/webapp/js/administration.js 2010-11-03 16:51:31 UTC (rev 734) @@ -0,0 +1,53 @@ +/* + * #%L + * Wao :: Web Interface + * %% + * Copyright (C) 2009 - 2010 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +/** + * This class is used to manage manually user select on Administration page. + * Options need style depends on inactivity of users. So we use javascript to + * manage dynamic states of the select. Initialization if needed (the correct + * option to select) then use a hidden field 'hiddenUserId' to keep userId + * context (ids are values of options). + * This hidden field will be interpreted by Tapestry when form will be submit. + */ +AdminUserSelect = Class.create({ + initialize: function() { + this.hiddenUserId = $('userActionsForm').hiddenUserId; + this.userSelect = $('userActionsForm').users; + this.userSelect.observe('change', this.updateUserId.bind(this)); + + var userId = $F(this.hiddenUserId); + + // Initialize selected option + if (userId) { + var options = this.userSelect.select('option'); + for (i = 0; i < options.length; i++) { + if (options[i].value == userId) { + options[i].selected = true; + break; + } + } + } + //Tapestry.debug('Initialized !'); + }, + updateUserId: function(event) { + //Tapestry.debug('select value : ' + $F(this.userSelect)); + this.hiddenUserId.setValue($F(this.userSelect)); + } +}); Modified: trunk/wao-ui/src/main/webapp/js/contacts.js =================================================================== --- trunk/wao-ui/src/main/webapp/js/contacts.js 2010-11-03 13:37:52 UTC (rev 733) +++ trunk/wao-ui/src/main/webapp/js/contacts.js 2010-11-03 16:51:31 UTC (rev 734) @@ -142,7 +142,8 @@ initialize: function(message, contactState) { this.contactState = contactState; this.message = message; - $('contactsForm').saveContact.observe('click', this.doConfirm.bind(this)); + + $('saveContact').observe('click', this.doConfirm.bind(this)); }, doConfirm: function(event) { Copied: trunk/wao-ui/src/main/webapp/js/news.js (from rev 733, branches/wao-1.5.x/wao-ui/src/main/webapp/js/news.js) =================================================================== --- trunk/wao-ui/src/main/webapp/js/news.js (rev 0) +++ trunk/wao-ui/src/main/webapp/js/news.js 2010-11-03 16:51:31 UTC (rev 734) @@ -0,0 +1,100 @@ +/* + * #%L + * Wao :: Web Interface + * %% + * Copyright (C) 2009 - 2010 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +/** + * This class is used to hide news details depends on an anchor. This anchor + * must be called 'details' and be surrounded by a paragraph block (<p>) in + * the news content. The anchor will be transformed in a clickable link, then + * the rest of the news will be hidden using NewsDetails object. + */ +NewsHider = Class.create({ + initialize: function() { + this.allNews = $('so-news').select('div.news-content'); + this.anchorPattern = 'a[name="details"]'; + }, + /** + * Method to call to hide all news that contains the anchor 'details' + */ + hideAllNewsDetails: function() { + for (j = 0; j < this.allNews.length; j++) { + this.hideNewsDetails(this.allNews[j]); + } + }, + /** + * Hide a {news} if contains an anchor called 'details'. A NewsDetails object + * will be instantiate to transform the anchor found and hide the rest of + * the news in a hiddenBlock. + */ + hideNewsDetails: function(news) { + // Select all paragraphs in the news + var paragraphs = news.select('p'); + //Tapestry.debug('nb paragraphs in news : ' + paragraphs.length); + + for (i = 0; i < paragraphs.length; i++) { + var paragraph = paragraphs[i]; + + // Check the firstDescendant in the paragraph, we take only anchor called 'details' + if (paragraph.firstDescendant() && paragraph.firstDescendant().match(this.anchorPattern)) { + var anchor = paragraph.firstDescendant(); + + //Tapestry.debug('Find anchor !'); + + // paragraphs to hide are the next siblings of current paragraph + var paragraphsToHide = paragraph.nextSiblings(); + + var details = new NewsDetails(anchor, paragraphsToHide); + + // append the hidden block to the news + news.appendChild(details.hiddenBlock); + break; + } + } + } +}); + +/** + * This class is used to transform an {anchor} in clickable link to display a + * hidden block as news details. The {paragraphsToHide} will be wrapped into + * a div hidden element. When user will click on the {anchor}, the hidden + * block will be toggled to be displayed or not. + */ +NewsDetails = Class.create({ + initialize: function(anchor, paragraphsToHide) { + + //Tapestry.debug('create NewsDetails'); + + // Update params of the anchor to be clickable + anchor.update('Lire la suite...'); + anchor.addClassName('news-details-link'); + // Bind the click on the anchor with the toggle on hiddenBlock + anchor.observe('click', this.toggleDetails.bind(this)); + + // Create hidden block + this.hiddenBlock = new Element('div'); + this.hiddenBlock.addClassName('hidden'); + + for (i = 0; i < paragraphsToHide.length; i++) { + this.hiddenBlock.appendChild(paragraphsToHide[i]); + } + }, + toggleDetails: function(event) { + this.hiddenBlock.toggleClassName('hidden'); + } +});

1 0