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

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

08 Nov '10

Author: bleny Date: 2010-11-08 23:05:03 +0000 (Mon, 08 Nov 2010) New Revision: 753 Log: init data reliability when creating a new contact Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2010-11-08 22:50:25 UTC (rev 752) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2010-11-08 23:05:03 UTC (rev 753) @@ -39,6 +39,7 @@ import fr.ifremer.wao.bean.ContactState; import fr.ifremer.wao.bean.ContactStatus; import fr.ifremer.wao.bean.ContactStatus.NullSampleMonthException; +import fr.ifremer.wao.bean.DataReliability; import fr.ifremer.wao.bean.UserRole; import fr.ifremer.wao.entity.Boat; import fr.ifremer.wao.entity.Company; @@ -170,6 +171,7 @@ result.setSampleRow(row); result.setBoat(boat); result.setContactState(ContactState.CONTACT_START); + result.setDataReliability(DataReliability.UNKNOWN); return result; }

1 0

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

08 Nov '10

Author: bleny Date: 2010-11-08 22:50:25 +0000 (Mon, 08 Nov 2010) New Revision: 752 Log: remove potential bugs by adding a default value for new column in DB 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-08 22:49:50 UTC (rev 751) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java 2010-11-08 22:50:25 UTC (rev 752) @@ -437,7 +437,6 @@ /** Add a columns to Contact. */ @Override protected void addDataReliability_1_6(List<String> queries) { - queries.add("ALTER TABLE Contact ADD dataReliabilityOrdinal SMALLINT;"); - queries.add("UPDATE Contact SET dataReliabilityOrdinal=0;"); + queries.add("ALTER TABLE Contact ADD dataReliabilityOrdinal SMALLINT NOT NULL DEFAULT 0;"); } }

1 0

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

08 Nov '10

Author: bleny Date: 2010-11-08 22:49:50 +0000 (Mon, 08 Nov 2010) New Revision: 751 Log: consider estimatedTides boolean in service (a field from filter that was ignored) Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 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-08 21:42:32 UTC (rev 750) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 2010-11-08 22:49:50 UTC (rev 751) @@ -280,9 +280,13 @@ ContactProperty contactProperty = builder.initializeForContact(); TopiaQuery query = builder.applySamplingFilter(filter). addEquals(contactProperty.state(), ContactState.BOARDING_DONE.ordinal()). - addEquals(contactProperty.validationCompany(), Boolean.TRUE). - addNullOr(contactProperty.validationProgram(), Op.EQ, Boolean.TRUE); + addEquals(contactProperty.validationCompany(), Boolean.TRUE); + if (filter.getEstimatedTides()) { + query.addNullOr(contactProperty.validationProgram(), Op.EQ, Boolean.TRUE); + } else { + query.addEquals(contactProperty.validationProgram(), Boolean.TRUE); + } // Only for done contacts with no constraint // TopiaQuery query = @@ -395,9 +399,14 @@ WaoQueryBuilder builder = context.newQueryBuilder(); ContactProperty contactProperty = builder.initializeForContact(); - TopiaQuery query = builder.applySamplingFilter(filter). - addNullOr(contactProperty.validationProgram(), Op.EQ, Boolean.TRUE); + TopiaQuery query = builder.applySamplingFilter(filter); + if (filter.getEstimatedTides()) { + query.addNullOr(contactProperty.validationProgram(), Op.EQ, Boolean.TRUE); + } else { + query.addEquals(contactProperty.validationProgram(), Boolean.TRUE); + } + WaoQueryHelper.CompanyProperty companyProperty = contactProperty.observerProperty().companyProperty(); @@ -462,10 +471,15 @@ ContactProperty contactProperty = builder.initializeForContact(); TopiaQuery query = builder.applySamplingFilter(filter). addEquals(contactProperty.state(), ContactState.BOARDING_DONE.ordinal()). - addEquals(contactProperty.validationCompany(), Boolean.TRUE). - addNullOr(contactProperty.validationProgram(), Op.EQ, Boolean.TRUE); + addEquals(contactProperty.validationCompany(), Boolean.TRUE); + if (filter.getEstimatedTides()) { + query.addNullOr(contactProperty.validationProgram(), Op.EQ, Boolean.TRUE); + } else { + query.addEquals(contactProperty.validationProgram(), Boolean.TRUE); + } + // Carefull with results, the company may not be present in the map : // only if there is no unfinished sampleRow or no contact done @@ -545,14 +559,18 @@ TopiaQuery query = builder.applySamplingFilter(filter). addEquals(contactProperty.state(), ContactState.BOARDING_DONE.ordinal()). addEquals(contactProperty.validationCompany(), Boolean.TRUE). - addEquals(contactProperty.validationProgram(), Boolean.TRUE). - // Set the results wanted : by company, by reliability, // get number of each realiability level setSelect(companyProperty.name(), contactProperty.dataReliabilityOrdinal(), "COUNT(*)"). addGroup(companyProperty.name(), contactProperty.dataReliabilityOrdinal()); + if (filter.getEstimatedTides()) { + query.addNullOr(contactProperty.validationProgram(), Op.EQ, Boolean.TRUE); + } else { + query.addEquals(contactProperty.validationProgram(), Boolean.TRUE); + } + if (log.isDebugEnabled()) { log.debug("query for data reliability is " + query); }

1 0

[Suiviobsmer-commits] r750 - in trunk/wao-ui/src/main: resources/fr/ifremer/wao/ui/components webapp webapp/css
by bleny＠users.labs.libre-entreprise.org 08 Nov '10

08 Nov '10

Author: bleny Date: 2010-11-08 21:42:32 +0000 (Mon, 08 Nov 2010) New Revision: 750 Log: manage rights to see administration of indicators Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/IndicatorLevels.tml trunk/wao-ui/src/main/webapp/Administration.tml trunk/wao-ui/src/main/webapp/css/common.css 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-08 16:40:11 UTC (rev 749) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/IndicatorLevels.tml 2010-11-08 21:42:32 UTC (rev 750) @@ -90,7 +90,7 @@ </tbody> </table> <t:if test="isWithLegend()"> - <div class="acenter"> + <div class="acenter" style="font-size: 9pt;"> En jaune, la position actuelle de la société selon cet indicateur. </div> </t:if> Modified: trunk/wao-ui/src/main/webapp/Administration.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Administration.tml 2010-11-08 16:40:11 UTC (rev 749) +++ trunk/wao-ui/src/main/webapp/Administration.tml 2010-11-08 21:42:32 UTC (rev 750) @@ -174,34 +174,35 @@ <t:if test="currentUser.indicatorsViewer"> - <t:if t:test="currentUser.admin">  + <t:zone t:id="synthesisParametersFormZone" t:update="show"> + <h2>Indicateurs qualités prestataires</h2> - <t:zone t:id="synthesisParametersFormZone" t:update="show"> - <h2>Indicateurs qualités prestataires</h2> + <div class="mtop30" /> - <form t:type="form" t:id="synthesisParametersForm" t:zone="synthesisParametersFormZone"> + <form t:type="form" t:id="synthesisParametersForm" t:zone="synthesisParametersFormZone"> - <t:errors t:banner="message:errors-banner" /> + <t:errors t:banner="message:errors-banner" /> -  - <t:loop t:source="globalSynthesisParameters.parameters" t:value="indicator" t:volatile="true"> - <t:indicatorLevels t:indicator="indicator" editable="true" /> - </t:loop> +  + <t:loop t:source="globalSynthesisParameters.parameters" t:value="indicator" t:volatile="true"> + <t:indicatorLevels t:indicator="indicator" editable="currentUser.admin" /> + </t:loop> - <table class="indicatorLevels"> - <tr> - <th>Total coefficients : </th> - <td>${globalSynthesisParameters.totalCoefficients}</td> - </tr> - </table> + <table class="indicatorLevels"> + <tr> + <th>Total coefficients : </th> + <td>${globalSynthesisParameters.totalCoefficients}</td> + </tr> + </table> - <table class="indicatorLevels"> - <tr> - <td t:type="loop" t:source="globalSynthesisParameters.globalIndicator.indicatorLevel" t:value="indicatorLevel" t:volatile="true"> - ${globalIndicatorValue.label} - </td> - </tr> - <tr> + <table class="indicatorLevels"> + <tr> + <td t:type="loop" t:source="globalSynthesisParameters.globalIndicator.indicatorLevel" t:value="indicatorLevel" t:volatile="true"> + ${globalIndicatorValue.label} + </td> + </tr> + <tr> + <t:if test="currentUser.admin"> <td t:type="loop" t:source="globalSynthesisParameters.globalIndicator.indicatorLevel" t:value="indicatorLevel" volatile="true"> [ <input type="text" size="3" value="${indicatorLevel.lowerBound}" disabled="disabled" /> ; <span t:type="ck/Tooltip" t:value="Attention à bien utiliser ',' et non '.' pour les décimales" t:effect="appear"> @@ -214,24 +215,35 @@ </p:else> </t:if> </td> - </tr> - </table> + <p:else> + <td t:type="loop" t:source="globalSynthesisParameters.globalIndicator.indicatorLevel" t:value="indicatorLevel" volatile="true"> + [ ${indicatorLevel.lowerBound} ; ${indicatorLevel.upperBound} + <t:if test="indicatorLevel.upperBoundIncluded"> + ] + <p:else> + [ + </p:else> + </t:if> + </td> + </p:else> + </t:if> + </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> + <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> + <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> Modified: trunk/wao-ui/src/main/webapp/css/common.css =================================================================== --- trunk/wao-ui/src/main/webapp/css/common.css 2010-11-08 16:40:11 UTC (rev 749) +++ trunk/wao-ui/src/main/webapp/css/common.css 2010-11-08 21:42:32 UTC (rev 750) @@ -375,6 +375,7 @@ /* INDICATOR TABLES */ table.indicatorLevels { + width: 750px; border: solid 1px black; margin-left: auto; margin-right: auto; @@ -393,6 +394,7 @@ table.indicatorLevels td { text-align: center; + font-size: 90%; } table.indicatorLevels td.highlight {

1 0

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

08 Nov '10

Author: bleny Date: 2010-11-08 16:40:11 +0000 (Mon, 08 Nov 2010) New Revision: 749 Log: add date in IndicatorLog + rendering in history Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java trunk/wao-business/src/main/xmi/wao.zargo trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/IndicatorsHistory.java trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/IndicatorLevels.tml trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Administration.properties trunk/wao-ui/src/main/webapp/IndicatorsHistory.tml 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-08 16:11:08 UTC (rev 748) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java 2010-11-08 16:40:11 UTC (rev 749) @@ -303,6 +303,7 @@ "topiaCreateDate TIMESTAMP WITHOUT TIME ZONE NOT NULL," + "logText TEXT," + "\"comment\" TEXT," + + "modificationDate TIMESTAMP WITHOUT TIME ZONE," + "author CHARACTER VARYING(255)," + "CONSTRAINT author_fkey FOREIGN KEY (author) " + "REFERENCES WaoUser (topiaid) MATCH SIMPLE " + 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-08 16:11:08 UTC (rev 748) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 2010-11-08 16:40:11 UTC (rev 749) @@ -1000,6 +1000,7 @@ IndicatorLog indicatorLog = new IndicatorLogImpl(); indicatorLog.setAuthor(author); indicatorLog.setComment(comment); + indicatorLog.setModificationDate(new Date()); indicatorLog.setLogText(logText.trim()); // add entity logText Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ) Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/IndicatorsHistory.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/IndicatorsHistory.java 2010-11-08 16:11:08 UTC (rev 748) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/IndicatorsHistory.java 2010-11-08 16:40:11 UTC (rev 749) @@ -8,6 +8,8 @@ import org.apache.tapestry5.annotations.Property; import org.apache.tapestry5.ioc.annotations.Inject; +import java.text.DateFormat; +import java.text.SimpleDateFormat; import java.util.List; /** @@ -35,4 +37,8 @@ } return indicatorLogs; } + + public DateFormat getDateFormat() { + return new SimpleDateFormat("dd/MM/yyyy"); + } } 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-08 16:11:08 UTC (rev 748) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/IndicatorLevels.tml 2010-11-08 16:40:11 UTC (rev 749) @@ -81,7 +81,9 @@ </td> </t:loop> <td> - <input t:type="textfield" value="indicator.coefficient" size="3" /> + <span t:type="ck/Tooltip" t:value="Attention à bien utiliser ',' et non '.' pour les décimales" t:effect="appear"> + <input t:type="textfield" value="indicator.coefficient" size="3" /> + </span> </td> </tr> </t:if> Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Administration.properties =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Administration.properties 2010-11-08 16:11:08 UTC (rev 748) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Administration.properties 2010-11-08 16:40:11 UTC (rev 749) @@ -42,6 +42,8 @@ # follow statement doesn't work with BeanEditForm userForm-errors-banner: L'utilisateur n'a pas \u00e9t\u00e9 sauvegard\u00e9 \u00e0 cause des erreurs suivantes : +errors-banner: Impossible de modifier les changements des param\u00e8tres des inticateurs : + # UserRole UserRole.ADMIN: Administrateur UserRole.OBSERVER: Observateur Modified: trunk/wao-ui/src/main/webapp/IndicatorsHistory.tml =================================================================== --- trunk/wao-ui/src/main/webapp/IndicatorsHistory.tml 2010-11-08 16:11:08 UTC (rev 748) +++ trunk/wao-ui/src/main/webapp/IndicatorsHistory.tml 2010-11-08 16:40:11 UTC (rev 749) @@ -46,6 +46,7 @@ <p:else> <p t:type="loop" t:source="indicatorLogs" t:value="indicatorLog"> Auteur de la modification : <strong>${indicatorLog.author.fullName}</strong><br /> + Date de la modification : <t:output value="indicatorLog.modificationDate" format="dateFormat" /><br /> Commentaire : ${indicatorLog.comment}<br /> Modifications effectuées : ${indicatorLog.logText}<br /><br />

1 0

[Suiviobsmer-commits] r748 - in trunk/wao-ui/src/main: resources/fr/ifremer/wao/ui/components webapp
by bleny＠users.labs.libre-entreprise.org 08 Nov '10

08 Nov '10

Author: bleny Date: 2010-11-08 16:11:08 +0000 (Mon, 08 Nov 2010) New Revision: 748 Log: fix sampling plan html+css for totals ; add tooltip in indicators admin to prevent user to use '.' instead of ',' Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/IndicatorLevels.tml trunk/wao-ui/src/main/webapp/Administration.tml trunk/wao-ui/src/main/webapp/SamplingPlan.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-08 15:44:00 UTC (rev 747) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/IndicatorLevels.tml 2010-11-08 16:11:08 UTC (rev 748) @@ -75,7 +75,9 @@  </p:else> </t:if> - <input t:type="textfield" value="indicatorLevel.upperBound" size="3" /> + <span t:type="ck/Tooltip" t:value="Attention à bien utiliser ',' et non '.' pour les décimales" t:effect="appear"> + <input t:type="textfield" value="indicatorLevel.upperBound" size="3" /> + </span> </td> </t:loop> <td> Modified: trunk/wao-ui/src/main/webapp/Administration.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Administration.tml 2010-11-08 15:44:00 UTC (rev 747) +++ trunk/wao-ui/src/main/webapp/Administration.tml 2010-11-08 16:11:08 UTC (rev 748) @@ -204,7 +204,9 @@ <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" /> + <span t:type="ck/Tooltip" t:value="Attention à bien utiliser ',' et non '.' pour les décimales" t:effect="appear"> + <input t:type="textfield" value="indicatorLevel.upperBound" size="3" /> + </span> <t:if test="indicatorLevel.upperBoundIncluded"> ] <p:else> Modified: trunk/wao-ui/src/main/webapp/SamplingPlan.tml =================================================================== --- trunk/wao-ui/src/main/webapp/SamplingPlan.tml 2010-11-08 15:44:00 UTC (rev 747) +++ trunk/wao-ui/src/main/webapp/SamplingPlan.tml 2010-11-08 16:11:08 UTC (rev 748) @@ -327,20 +327,18 @@ </tr> </t:loop> <tr> - <td colspan="${nbColumnsForProfession}" /> + <td colspan="${nbColumnsForProfession}" style="font-size:1.4em; font-weight:bold; border: solid 2px #000000;"> Totaux </td> - <t:loop source="months" value="month"> - <td class="width50 acenter ${monthCurrentClass}"> - ${totalExpectedForMonth} -  - <span class="${realTidesClassForTotal}"><em>(${totalRealForMonth})</em></span> - <br /> - ${ratioForMonth} -  - </td> - </t:loop> - <td class="width50 acenter bright"> + <td t:type="loop" source="months" value="month" class="width50 acenter ${monthCurrentClass}" style="border-top: solid 2px #000000;"> + ${totalExpectedForMonth} +  + <span class="${realTidesClassForTotal}"><em>(${totalRealForMonth})</em></span> + <br /> + ${ratioForMonth} +  + </td> + <td class="width50 acenter bright" style="border-top: solid 2px #000000;"> <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"> @@ -348,7 +346,7 @@ </t:unless> </span> </td> - <td colspan="${nbColumnsForOther}" /> + <td colspan="${nbColumnsForOther}" style="border: solid 2px #000000;" /> </tr> </tbody> </table>

1 0

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

08 Nov '10

Author: bleny Date: 2010-11-08 15:44:00 +0000 (Mon, 08 Nov 2010) New Revision: 747 Log: misc UI fixes Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/GlobalSynthesisResultImpl.java 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/resources/fr/ifremer/wao/ui/components/IndicatorLevels.tml trunk/wao-ui/src/main/webapp/SamplingPlan.tml trunk/wao-ui/src/main/webapp/Synthesis.tml Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/GlobalSynthesisResultImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/GlobalSynthesisResultImpl.java 2010-11-08 10:13:56 UTC (rev 746) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/GlobalSynthesisResultImpl.java 2010-11-08 15:44:00 UTC (rev 747) @@ -36,9 +36,8 @@ return result; } - /** return a value between 1 and 6 */ @Override - public GlobalIndicatorValue getGlobalLevel() { + public Double getGlobalResult() { // compute an average with coefficients double totalLevels = 0.0; double totalCoefficients = 0.0; @@ -70,6 +69,13 @@ log.debug("value for global indicator = " + value); } + return value; + } + + /** return a value between 1 and 6 */ + @Override + public GlobalIndicatorValue getGlobalLevel() { + // in this indicator, the level is the ordinal of GlobalIndicatorValue Indicator globalIndicator = getGlobalSynthesisParameters().getGlobalIndicator(); @@ -81,7 +87,7 @@ } } - int globalIndicatorValueOrdinal = globalIndicator.getLevelForValue(value).getLevel(); + int globalIndicatorValueOrdinal = globalIndicator.getLevelForValue(getGlobalResult()).getLevel(); GlobalIndicatorValue result = GlobalIndicatorValue.valueOf(globalIndicatorValueOrdinal); if (log.isDebugEnabled()) { log.debug("global indicator value is " + result); 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-08 10:13:56 UTC (rev 746) +++ trunk/wao-business/src/main/resources/i18n/wao-business-fr_FR.properties 2010-11-08 15:44:00 UTC (rev 747) @@ -2,11 +2,11 @@ wao.business.bean.DataReliability.not_reliable=non exploitable wao.business.bean.DataReliability.reliable=exploitable wao.business.bean.DataReliability.unknown=non renseign\u00E9e -wao.business.bean.GlobalIndicatorValue.bad=P\u00E9nalit\u00E9 1 -wao.business.bean.GlobalIndicatorValue.good=Bonus 1 -wao.business.bean.GlobalIndicatorValue.neutral=Rien \u00E0 signaler -wao.business.bean.GlobalIndicatorValue.very_bad=P\u00E9nalit\u00E9 2 -wao.business.bean.GlobalIndicatorValue.very_good=Bonus 2 +wao.business.bean.GlobalIndicatorValue.bad=P\u00E9nalit\u00E9 de niveau 1 +wao.business.bean.GlobalIndicatorValue.good=Bonus de niveau 1 +wao.business.bean.GlobalIndicatorValue.neutral=Conforme au cahier des charges +wao.business.bean.GlobalIndicatorValue.very_bad=P\u00E9nalit\u00E9 de niveau 2 +wao.business.bean.GlobalIndicatorValue.very_good=Bonus de niveau 2 wao.business.bean.SynthesisId.allegro_reactivity=D\u00E9lais de transmission des donn\u00E9es wao.business.bean.SynthesisId.compliance_boarding=Respect du nombre d'observateurs embarqu\u00E9s wao.business.bean.SynthesisId.contact_state=\u00C9tats des contacts Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ) 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-08 10:13:56 UTC (rev 746) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/IndicatorLevels.tml 2010-11-08 15:44:00 UTC (rev 747) @@ -27,7 +27,7 @@ <tr> <th /> <th colspan="${indicator.indicatorLevel.size()}">Indicateur : ${indicator.synthesisId.label}</th> - <th>coefficient</th> + <th>Pondération</th> </tr> <tr> <th>Niveaux</th> @@ -86,7 +86,9 @@ </tbody> </table> <t:if test="isWithLegend()"> - En jaune, la position actuelle de la société selon cet indicateur. + <div class="acenter"> + En jaune, la position actuelle de la société selon cet indicateur. + </div> </t:if> </html> \ No newline at end of file Modified: trunk/wao-ui/src/main/webapp/SamplingPlan.tml =================================================================== --- trunk/wao-ui/src/main/webapp/SamplingPlan.tml 2010-11-08 10:13:56 UTC (rev 746) +++ trunk/wao-ui/src/main/webapp/SamplingPlan.tml 2010-11-08 15:44:00 UTC (rev 747) @@ -327,13 +327,9 @@ </tr> </t:loop> <tr> - <td colspan="${nbColumnsTotal}" class="facade"> + <td colspan="${nbColumnsForProfession}" /> Totaux </td> - </tr> - <tr> - <td colspan="${nbColumnsForProfession}" /> - <t:loop source="months" value="month"> <td class="width50 acenter ${monthCurrentClass}"> ${totalExpectedForMonth} Modified: trunk/wao-ui/src/main/webapp/Synthesis.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Synthesis.tml 2010-11-08 10:13:56 UTC (rev 746) +++ trunk/wao-ui/src/main/webapp/Synthesis.tml 2010-11-08 15:44:00 UTC (rev 747) @@ -111,12 +111,6 @@ </a> </li> <li> - <a t:type="actionlink" t:context="[actionSynthesisId,'IND_CONTACT_STATE']" t:zone="so-synthesis-main"> - <img src="${asset:context:}/img/synthesis-ind-contact-states.png" alt="Indicateur sur les états des contacts" - title="Indicateur sur les états des contacts" /> - </a> - </li> - <li> <a t:type="actionlink" t:context="[actionSynthesisId,'IND_ALLEGRO_REACTIVITY']" t:zone="so-synthesis-main"> <img src="${asset:context:}/img/synthesis-ind-allegro-reactivity.png" alt="Indicateur de réactivité sur la saisie des données dans Allegro" title="Indicateur de réactivité sur la saisie des données dans Allegro" /> @@ -136,6 +130,12 @@ </a> </li> </t:if> + <li> + <a t:type="actionlink" t:context="[actionSynthesisId,'IND_CONTACT_STATE']" t:zone="so-synthesis-main"> + <img src="${asset:context:}/img/synthesis-ind-contact-states.png" alt="Indicateur sur les états des contacts" + title="Indicateur sur les états des contacts" /> + </a> + </li> </ul> </div> <div t:type="zone" t:id="delegator" class="fleft" t:update="show" id="so-synthesis-main"> @@ -193,15 +193,14 @@ </t:block>  <t:block t:id="ind2"> - <h2>Respect du nombre d'observateurs embarqués</h2> - <br /> - <div class="ind-table acenter" id="so-noncomplianceboarding"> + <h2>Respect du nombre d'observateurs embarqués</h2> + <br /> + <p> + Respect du nombre prévu d'observateurs pour chaque marée réalisée. + </p> + <t:if t:test="user.admin"> - <p> - Ces résultats concernent l'ensemble des contrats en cours - ayant des données réelles (contacts validés). - </p> <table class="t-data-grid"> <thead> <tr> @@ -219,10 +218,6 @@ </tbody> </table> <p:else> - <p> - Ce résultat concerne l'ensemble des contrats en cours - pour votre société ayant des données réelles (contacts validés). - </p> <div class="indicator"> <p class="number"> <span t:type="output" t:value="complianceBoardingValue" t:format="percentFormat"> @@ -243,7 +238,7 @@  <t:block t:id="ind3"> <div class="ind-table acenter" id="so-contactstate"> - <h2>Etats des contacts</h2> + <h2>États des contacts</h2> <br /> <p> Ces résultats concernent l'ensemble des états des contacts<br /> excepté @@ -289,7 +284,7 @@ <h2>Réactivité de la saisie dans Allegro par rapport à la date de fin de la marée</h2> <br /> <p> - Ce résultat est une moyenne du nombre de jours entre la date de saisie dans Allegro et la date de fin de la marée des contacts validés. + Ce résultat est une moyenne du nombre de jours entre la date de saisie dans Allegro et la date de fin de la marée. </p> <br /> <t:if t:test="user.admin"> @@ -330,33 +325,25 @@ <div class="ind-table acenter" id="so-datareliability"> <h2>Qualité de la donnée</h2> <br /> - <t:if t:test="user.admin"> - <table class="t-data-grid"> - <thead> - <tr> - <th class="company">Société</th> - <th>Indicateur</th> - </tr> - </thead> - <tbody> - <tr t:type="loop" t:source="dataReliability.entrySet()" t:value="dataReliabilityEntry"> - <td class="company">${dataReliabilityEntry.key}</td> - <td class="number"> - <t:output t:value="dataReliabilityEntry.value" t:format="percentFormat"/> - </td> - </tr> - </tbody> - </table> - <p:else> - <div class="indicator"> - <p class="number"> - <span t:type="output" t:value="complianceBoardingValue" t:format="percentFormat"> - ${complianceBoardingValue} - </span> - </p> - </div> - </p:else> - </t:if> + <p> + Pourcentage du nombre de marées exploitables par rapport nombre de marée réalisées + </p> + <table class="t-data-grid"> + <thead> + <tr> + <th class="company">Société</th> + <th>Indicateur</th> + </tr> + </thead> + <tbody> + <tr t:type="loop" t:source="dataReliability.entrySet()" t:value="dataReliabilityEntry"> + <td class="company">${dataReliabilityEntry.key}</td> + <td class="number"> + <t:output t:value="dataReliabilityEntry.value" t:format="percentFormat"/> + </td> + </tr> + </tbody> + </table> <t:if test="user.indicatorsViewer">  @@ -368,7 +355,7 @@  <t:block t:id="globalSynthesis"> <t:if test="user.indicatorsViewer"> - <div class="print"> + <div class="print acenter"> <h2>Synthèse globale</h2> <br /> @@ -379,6 +366,12 @@ <table class="indicatorLevels"> <tbody> <tr> + <td colspan="5"> + Bilan de la synthèse global : + <t:output t:value="globalSynthesisResult.globalResult" t:format="numberFormat" /> + </td> + </tr> + <tr> <t:loop t:source="globalLevels" t:value="globalLevel"> <t:if test="highlightGlobalLevel()"> <td class="highlight selected">

1 0

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

08 Nov '10

Author: bleny Date: 2010-11-08 10:13:56 +0000 (Mon, 08 Nov 2010) New Revision: 746 Log: remaining bug : data reliability is printed enven if not admin Modified: trunk/wao-ui/src/main/webapp/Contacts.tml Modified: trunk/wao-ui/src/main/webapp/Contacts.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Contacts.tml 2010-11-05 16:04:40 UTC (rev 745) +++ trunk/wao-ui/src/main/webapp/Contacts.tml 2010-11-08 10:13:56 UTC (rev 746) @@ -292,10 +292,12 @@ <p:dataReliabilityCell> <t:if t:test="boardingDone"> <t:if t:test="contact.validationCompany"> - <t:if test="dataReliabilityAsked"> - <input t:type="select" t:id="dataReliability" t:value="contact.dataReliability" validate="required" /> + <t:if test="contact.validationProgram"> + ${contact.dataReliability.label} <p:else> - ${contact.dataReliability.label} + <t:if test="dataReliabilityAsked"> + <input t:type="select" t:id="dataReliability" t:value="contact.dataReliability" validate="required" /> + </t:if> </p:else> </t:if> </t:if>

1 0

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

05 Nov '10

Author: bleny Date: 2010-11-05 16:04:40 +0000 (Fri, 05 Nov 2010) New Revision: 745 Log: better filter on multiple codes in sampling plan ; still not working :-( Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingFilterImpl.java trunk/wao-business/src/main/xmi/wao.zargo trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/AbstractFilteredPage.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/SamplingPlan.properties trunk/wao-ui/src/main/webapp/SamplingPlan.tml Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingFilterImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingFilterImpl.java 2010-11-05 13:56:46 UTC (rev 744) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingFilterImpl.java 2010-11-05 16:04:40 UTC (rev 745) @@ -31,7 +31,7 @@ import org.slf4j.LoggerFactory; import java.util.ArrayList; -import java.util.Collection; +import java.util.List; /** * SamplingFilterImpl @@ -77,7 +77,7 @@ if (sampleRow == null) { setSampleRows(null); } else { - Collection<SampleRow> tempSampleRows = new ArrayList<SampleRow>(); + List<SampleRow> tempSampleRows = new ArrayList<SampleRow>(); tempSampleRows.add(sampleRow); setSampleRows(tempSampleRows); } @@ -93,7 +93,7 @@ public SampleRow getSampleRow() { SampleRow sampleRow = null; if (CollectionUtils.isNotEmpty(getSampleRows())) { - sampleRow = getSampleRows(0); + sampleRow = getSampleRows().get(0); if (getSampleRows().size() > 1) { log.warn("other sample rows in the filter will be ignored"); } Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ) Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/AbstractFilteredPage.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/AbstractFilteredPage.java 2010-11-05 13:56:46 UTC (rev 744) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/AbstractFilteredPage.java 2010-11-05 16:04:40 UTC (rev 745) @@ -36,7 +36,6 @@ import fr.ifremer.wao.service.ServiceUser; import fr.ifremer.wao.ui.data.FiltersModel; import fr.ifremer.wao.ui.data.GenericSelectModel; -import org.apache.commons.collections.CollectionUtils; import org.apache.tapestry5.OptionModel; import org.apache.tapestry5.SelectModel; import org.apache.tapestry5.annotations.Persist; @@ -277,11 +276,19 @@ public GenericSelectModel<SampleRow> getSampleRowSelectModel() throws WaoException { if (sampleRowSelectModel == null) { // WARN : no use of sampleRow filter + + /* SampleRow rowFiltered = getFilter().getSampleRow(); getFilter().setSampleRow(null); List<SampleRow> sampleRows = serviceSampling.getSampleRowsByFilter(getFilter()); getFilter().setSampleRow(rowFiltered); - + */ + + //List<SampleRow> rowsFiltered = getFilter().getSampleRows(); + //getFilter().setSampleRows(null); + List<SampleRow> sampleRows = serviceSampling.getSampleRowsByFilter(getFilter()); + //getFilter().setSampleRows(rowsFiltered); + sampleRowSelectModel = new GenericSelectModel<SampleRow>(sampleRows, SampleRow.class, "code", "topiaId", propertyAccess); } @@ -367,8 +374,8 @@ log.debug("REFRESH FILTERS DATA"); log.debug("observerSelect : " + observerSelect); } - SampleRow row = getSampleRowSelectModel().findObject(sampleRowId); - getFilter().setSampleRow(row); + //SampleRow row = getSampleRowSelectModel().findObject(sampleRowId); + // getFilter().setSampleRow(row); if (user.isAdmin()) { Company company = getCompanySelectModel().findObject(companyId); getFilter().setCompany(company); 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-05 13:56:46 UTC (rev 744) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java 2010-11-05 16:04:40 UTC (rev 745) @@ -244,7 +244,7 @@ private boolean refreshSampleRowCodeZone; @Property - private String sampleRowCodeIndex; + private int sampleRowCodeIndex; @Persist @Property @@ -260,28 +260,33 @@ } 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); + getFilter().getSampleRows().add(selectedSampleRow); + if (logger.isDebugEnabled()) { + logger.debug("added filter on code " + selectedSampleRow.getCode()); + } + selectedSampleRow = null; - + refreshSampleRowCodeZone = true; return sampleRowZone; } - public Object onActionFromRemoveSampleRowCode(String sampleRowCodeIndex) { - refreshSampleRowCodeZone = true; + public Object onActionFromRemoveSampleRowCode(int sampleRowCodeIndex) { - logger.debug("should remove" + sampleRowCodeIndex); + logger.debug("should remove " + sampleRowCodeIndex); - getFilter().getSampleRows().remove(selectedSampleRow); + SampleRow sampleRowToRemove = getFilter().getSampleRows().get(sampleRowCodeIndex); + logger.debug("will remove " + sampleRowToRemove.getCode()); + + boolean result = getFilter().getSampleRows().remove(sampleRowToRemove); + logger.debug("removed " + result); + + refreshSampleRowCodeZone = true; return sampleRowZone; } @@ -294,7 +299,7 @@ /** * ACTION:: Used to change the display mode of the samplingPlan table. * This change affect the loading of the css style over the main table. - * + * * @see #getMainClass() */ void onActionFromToggleDisplayMode() { Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/SamplingPlan.properties =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/SamplingPlan.properties 2010-11-05 13:56:46 UTC (rev 744) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/SamplingPlan.properties 2010-11-05 16:04:40 UTC (rev 745) @@ -30,6 +30,6 @@ codeDCF5-label: M\u00e9tier code DCF5 facadeName-label: Fa\u00e7ade sectorName-label: Zone -sampleRow-label: Code ligne +selectedSampleRow-label: Code ligne -sampleRow-delete-confirmMessage: Etes-vous s\u00fbr de vouloir supprimer d\u00e9finitivement la ligne %1$s du plan d\'\u00e9chantillonnage ? +sampleRow-delete-confirmMessage: \u00cates-vous s\u00fbr de vouloir supprimer d\u00e9finitivement la ligne %1$s du plan d\'\u00e9chantillonnage ? Modified: trunk/wao-ui/src/main/webapp/SamplingPlan.tml =================================================================== --- trunk/wao-ui/src/main/webapp/SamplingPlan.tml 2010-11-05 13:56:46 UTC (rev 744) +++ trunk/wao-ui/src/main/webapp/SamplingPlan.tml 2010-11-05 16:04:40 UTC (rev 745) @@ -140,14 +140,14 @@ <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>  -  + </ul> </t:nuiton.subForm> </t:zone>

1 0

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

05 Nov '10

Author: bleny Date: 2010-11-05 13:56:46 +0000 (Fri, 05 Nov 2010) New Revision: 744 Log: add an icons for modified lines in sampling plan Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java trunk/wao-ui/src/main/webapp/SamplingPlan.tml 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-05 12:46:28 UTC (rev 743) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java 2010-11-05 13:56:46 UTC (rev 744) @@ -129,7 +129,6 @@ // * Fichier CSV contenant un plan d'échantillonnage // */ // @Property -// private UploadedFile samplingPlanCsvFile; // // public boolean canImportSamplingPlan() { // return user.isAdmin() && !user.isReadOnly(); @@ -683,5 +682,12 @@ // Test if the row isFinished with a gap of 1 month (today - 1 month) return !row.isFinished(-1); } + + public boolean isRowModified() { + // XXX bleny 20101105 this is a dirty hack. Actually, we should test + // CollectionUtils.isEmpty(row.getSampleRowLog()) + // but it's not initialized by hibernate + return row.getTopiaVersion() > 1; + } } Modified: trunk/wao-ui/src/main/webapp/SamplingPlan.tml =================================================================== --- trunk/wao-ui/src/main/webapp/SamplingPlan.tml 2010-11-05 12:46:28 UTC (rev 743) +++ trunk/wao-ui/src/main/webapp/SamplingPlan.tml 2010-11-05 13:56:46 UTC (rev 744) @@ -232,6 +232,13 @@ title="Changer les dates de la période par rapport à celles de la ligne"> ${row.code} </a> + <t:if t:test="canEditSampleRow()"> + <t:if test="rowModified"> + <a t:type="pagelink" t:page="sampleRowHistoric" t:context="row.code"> + <img src="${asset:context:}/img/edit.png" class="fright" alt=" * " title="Cette ligne a été modifiée (voir l'historique)"/> + </a> + </t:if> + </t:if> </td> <td class="width150">${row.programName}</td> <t:if t:test="fullView">

1 0