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

[Suiviobsmer-commits] r733 - in trunk: wao-business/src/main/java/fr/ifremer/wao/service 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 13:37:52 +0000 (Wed, 03 Nov 2010) New Revision: 733 Log: added form in admin to change global indicator levels ; fix build Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 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 11:22:57 UTC (rev 732) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 2010-11-03 13:37:52 UTC (rev 733) @@ -852,11 +852,13 @@ double lowerBound; double lastUpperBound; + int lastLevelNumber = levels.size() + 1; if (indicator.getSynthesisId() == null) { // this is the global average parameters globalIndicator = indicator; lowerBound = 1.0; lastUpperBound = 6.0; + lastLevelNumber = levels.size(); // start at 0, so don't do +1 } else if (indicator.getSynthesisId() == SynthesisId.IND_ALLEGRO_REACTIVITY) { lowerBound = Double.MAX_VALUE; lastUpperBound = 0.0; @@ -872,8 +874,7 @@ // Finally, adding a last level IndicatorLevelImpl lastIndicatorLevel = new IndicatorLevelImpl(); - int nextLevelNumber = levels.size() + 1; - lastIndicatorLevel.setLevel(nextLevelNumber); + lastIndicatorLevel.setLevel(lastLevelNumber); lastIndicatorLevel.setLowerBound(lowerBound); lastIndicatorLevel.setUpperBound(lastUpperBound); lastIndicatorLevel.setUpperBoundIncluded(true); 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 11:22:57 UTC (rev 732) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java 2010-11-03 13:37:52 UTC (rev 733) @@ -29,11 +29,13 @@ import fr.ifremer.wao.WaoException; import fr.ifremer.wao.WaoProperty; import fr.ifremer.wao.bean.ConnectedUser; +import fr.ifremer.wao.bean.GlobalIndicatorValue; import fr.ifremer.wao.bean.GlobalSynthesisParameters; import fr.ifremer.wao.bean.UserRole; import fr.ifremer.wao.entity.Company; import fr.ifremer.wao.entity.CompanyImpl; import fr.ifremer.wao.entity.Indicator; +import fr.ifremer.wao.entity.IndicatorLevel; import fr.ifremer.wao.entity.WaoUser; import fr.ifremer.wao.io.ImportResults; import fr.ifremer.wao.io.ImportResultsImpl; @@ -644,5 +646,18 @@ } } + /* variable used in loop */ + @Property + private IndicatorLevel indicatorLevel; + public GlobalIndicatorValue getGlobalIndicatorValue() { + if (log.isDebugEnabled()) { + log.debug("indicatorLevel is " + indicatorLevel); + log.debug(indicatorLevel.getLevel() + " is " + + GlobalIndicatorValue.valueOf(indicatorLevel.getLevel())); + } + return GlobalIndicatorValue.valueOf(indicatorLevel.getLevel()); + } + + } Modified: trunk/wao-ui/src/main/webapp/Administration.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Administration.tml 2010-11-03 11:22:57 UTC (rev 732) +++ trunk/wao-ui/src/main/webapp/Administration.tml 2010-11-03 13:37:52 UTC (rev 733) @@ -193,6 +193,26 @@ </tr> </table> + <table class="indicatorLevels"> + <tr> + <td t:type="loop" t:source="globalSynthesisParameters.globalIndicator.indicatorLevel" t:value="indicatorLevel"> + ${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> <p><label>Commentaire sur la modification* :</label></p> <p><input t:type="textarea" t:id="comment" cols="50" rows="5" value="comment"/></p> @@ -200,7 +220,7 @@ <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" /> + <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" />

1 0

[Suiviobsmer-commits] r732 - in trunk: 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-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 11:22:57 +0000 (Wed, 03 Nov 2010) New Revision: 732 Log: make global synthesis main indicator depends on data in the DB to make it modifiable by a user Added: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/GlobalSynthesisParametersImpl.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/GlobalIndicatorValue.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/GlobalSynthesisResultImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/IndicatorImpl.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/Administration.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java trunk/wao-ui/src/main/webapp/Administration.tml trunk/wao-ui/src/main/webapp/Synthesis.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-03 09:10:05 UTC (rev 731) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java 2010-11-03 11:22:57 UTC (rev 732) @@ -355,7 +355,15 @@ coefficientValue)); } + // now insert an indicator corresponding to the global level + String globalIndicatorTopiaId = topiaIndicatorIdPrefix + "g"; + queries.add(String.format(insertIntoIndicator, globalIndicatorTopiaId, + topiaVersion, + topiaCreateDateValue, + null, + null)); + String topiaIndicatorLevelIdPrefix = "fr.ifremer.wao.entities.IndicatorLevel#1286890064000#1929220062_"; int topiaIdSuffix = 0; @@ -397,6 +405,11 @@ queries.add(getInsertIndicatorLevelQuery_1_6(topiaIndicatorLevelIdPrefix + topiaIdSuffix++, 4, 95.0, indicatorTopiaId)); queries.add(getInsertIndicatorLevelQuery_1_6(topiaIndicatorLevelIdPrefix + topiaIdSuffix++, 5, 100.0, indicatorTopiaId)); + + queries.add(getInsertIndicatorLevelQuery_1_6(topiaIndicatorLevelIdPrefix + topiaIdSuffix++, 0, 2.0, globalIndicatorTopiaId)); + queries.add(getInsertIndicatorLevelQuery_1_6(topiaIndicatorLevelIdPrefix + topiaIdSuffix++, 1, 3.0, globalIndicatorTopiaId)); + queries.add(getInsertIndicatorLevelQuery_1_6(topiaIndicatorLevelIdPrefix + topiaIdSuffix++, 2, 5.0, globalIndicatorTopiaId)); + queries.add(getInsertIndicatorLevelQuery_1_6(topiaIndicatorLevelIdPrefix + topiaIdSuffix++, 3, 5.5, globalIndicatorTopiaId)); } /** Help method to create insertion for initial data in table levels. Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/GlobalIndicatorValue.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/GlobalIndicatorValue.java 2010-11-03 09:10:05 UTC (rev 731) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/GlobalIndicatorValue.java 2010-11-03 11:22:57 UTC (rev 732) @@ -23,4 +23,13 @@ public String getLabel() { return _(label); } + + public static GlobalIndicatorValue valueOf(int ordinal) { + for (GlobalIndicatorValue globalIndicatorValue : GlobalIndicatorValue.values()) { + if (globalIndicatorValue.ordinal() == ordinal) { + return globalIndicatorValue; + } + } + return null; + } } Added: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/GlobalSynthesisParametersImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/GlobalSynthesisParametersImpl.java (rev 0) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/GlobalSynthesisParametersImpl.java 2010-11-03 11:22:57 UTC (rev 732) @@ -0,0 +1,26 @@ +package fr.ifremer.wao.bean; + +import fr.ifremer.wao.entity.Indicator; + +public class GlobalSynthesisParametersImpl extends GlobalSynthesisParameters { + + /** in the list of indicators, find the one with given synthesisId. */ + @Override + public Indicator getParameter(SynthesisId synthesisId) { + for (Indicator indicator : getParameters()) { + if (indicator.getSynthesisId().equals(synthesisId)) { + return indicator; + } + } + return null; + } + + @Override + public Double getTotalCoefficients() { + Double totalCoefficient = 0.0; + for (Indicator indicator : getParameters()) { + totalCoefficient += indicator.getCoefficient(); + } + return totalCoefficient; + } +} 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-03 09:10:05 UTC (rev 731) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/GlobalSynthesisResultImpl.java 2010-11-03 11:22:57 UTC (rev 732) @@ -5,7 +5,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.List; import java.util.Map; public class GlobalSynthesisResultImpl extends GlobalSynthesisResult { @@ -15,32 +14,11 @@ protected Map<SynthesisId, Double> values; - protected List<Indicator> globalSynthesisParameters; - public void setIndicatorValues(Map<SynthesisId, Double> indicatorValues) { this.values = indicatorValues; } - public void setGlobalSynthesisParameters(List<Indicator> globalSynthesisParameters) { - this.globalSynthesisParameters = globalSynthesisParameters; - } - @Override - public List<Indicator> getGlobalSynthesisParameters() { - return globalSynthesisParameters; - } - - /** in the list of indicators, find the one with given synthesisId. */ - protected Indicator findIndicator(SynthesisId id) { - for (Indicator indicator : globalSynthesisParameters) { - if (indicator.getSynthesisId().equals(id)) { - return indicator; - } - } - return null; - } - - @Override public IndicatorLevel getLevelForIndicator(SynthesisId synthesisId) { if (log.isDebugEnabled()) { log.debug("looking for value of " + synthesisId); @@ -52,7 +30,7 @@ Double value = values.get(synthesisId); IndicatorLevel result = null; if (value != null) { - Indicator indicator = findIndicator(synthesisId); + Indicator indicator = globalSynthesisParameters.getParameter(synthesisId); result = indicator.getLevelForValue(value); } return result; @@ -65,7 +43,7 @@ double totalLevels = 0.0; double totalCoefficients = 0.0; - for (Indicator indicator : globalSynthesisParameters) { + for (Indicator indicator : globalSynthesisParameters.getParameters()) { IndicatorLevel indicatorLevel = getLevelForIndicator(indicator.getSynthesisId()); if (indicatorLevel == null) { @@ -92,18 +70,22 @@ log.debug("value for global indicator = " + value); } - GlobalIndicatorValue result = null; - if (value >= 1.0 && value < 2.0) { - result = GlobalIndicatorValue.VERY_BAD; - } else if (value >= 2.0 && value < 3.0) { - result = GlobalIndicatorValue.BAD; - } else if (value >= 3.0 && value < 5.0) { - result = GlobalIndicatorValue.NEUTRAL; - } else if (value >= 5.0 && value < 5.5) { - result = GlobalIndicatorValue.GOOD; - } else if (value >= 5.5 && value <= 6.0) { - result = GlobalIndicatorValue.VERY_GOOD; + // in this indicator, the level is the ordinal of GlobalIndicatorValue + Indicator globalIndicator = getGlobalSynthesisParameters().getGlobalIndicator(); + + if (log.isDebugEnabled()) { + log.debug("levels for global indicator are"); + for (IndicatorLevel level : globalIndicator.getIndicatorLevel()) { + log.debug(level.getLevel() + " -> " + level.getLowerBound() + + " to " + level.getUpperBound()); + } } + + int globalIndicatorValueOrdinal = globalIndicator.getLevelForValue(value).getLevel(); + GlobalIndicatorValue result = GlobalIndicatorValue.valueOf(globalIndicatorValueOrdinal); + if (log.isDebugEnabled()) { + log.debug("global indicator value is " + result); + } return result; } } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/IndicatorImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/IndicatorImpl.java 2010-11-03 09:10:05 UTC (rev 731) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/IndicatorImpl.java 2010-11-03 11:22:57 UTC (rev 732) @@ -14,7 +14,11 @@ @Override public SynthesisId getSynthesisId() { - return SynthesisId.valueOf(getIndicatorId()); + SynthesisId result = null; + if (getIndicatorId() != null) { + result = SynthesisId.valueOf(getIndicatorId()); + } + return result; } @Override 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 09:10:05 UTC (rev 731) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 2010-11-03 11:22:57 UTC (rev 732) @@ -830,21 +830,20 @@ value = getIndicatorValueForDataReliability(filter); indicatorValues.put(SynthesisId.IND_DATA_RELIABILITY, value); - GlobalSynthesisResultImpl result = null; - - result = new GlobalSynthesisResultImpl(); - List<Indicator> indicators = executeGetGlobalSynthesisParameters(transaction); + GlobalSynthesisResultImpl result = new GlobalSynthesisResultImpl(); + GlobalSynthesisParameters parameters = executeGetGlobalSynthesisParameters(transaction); result.setIndicatorValues(indicatorValues); - result.setGlobalSynthesisParameters(indicators); + result.setGlobalSynthesisParameters(parameters); return result; } @Override - protected List<Indicator> executeGetGlobalSynthesisParameters(TopiaContext transaction) throws Exception { + protected GlobalSynthesisParameters executeGetGlobalSynthesisParameters(TopiaContext transaction) throws Exception { IndicatorDAO indicatorDAO = WaoDAOHelper.getIndicatorDAO(transaction); List<Indicator> indicators = indicatorDAO.findAll(); + Indicator globalIndicator = null; // will be found in the list for (Indicator indicator : indicators) { @@ -853,7 +852,12 @@ double lowerBound; double lastUpperBound; - if (indicator.getSynthesisId() == SynthesisId.IND_ALLEGRO_REACTIVITY) { + if (indicator.getSynthesisId() == null) { + // this is the global average parameters + globalIndicator = indicator; + lowerBound = 1.0; + lastUpperBound = 6.0; + } else if (indicator.getSynthesisId() == SynthesisId.IND_ALLEGRO_REACTIVITY) { lowerBound = Double.MAX_VALUE; lastUpperBound = 0.0; } else { @@ -880,7 +884,13 @@ // but database should not be affected } - return indicators; + indicators.remove(globalIndicator); + + GlobalSynthesisParameters result = new GlobalSynthesisParametersImpl(); + result.setParameters(indicators); + result.setGlobalIndicator(globalIndicator); + + return result; } @Override 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 09:10:05 UTC (rev 731) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java 2010-11-03 11:22:57 UTC (rev 732) @@ -29,11 +29,11 @@ import fr.ifremer.wao.WaoException; import fr.ifremer.wao.WaoProperty; import fr.ifremer.wao.bean.ConnectedUser; +import fr.ifremer.wao.bean.GlobalSynthesisParameters; import fr.ifremer.wao.bean.UserRole; import fr.ifremer.wao.entity.Company; import fr.ifremer.wao.entity.CompanyImpl; import fr.ifremer.wao.entity.Indicator; -import fr.ifremer.wao.entity.IndicatorLevel; import fr.ifremer.wao.entity.WaoUser; import fr.ifremer.wao.io.ImportResults; import fr.ifremer.wao.io.ImportResultsImpl; @@ -79,8 +79,6 @@ import java.io.FileNotFoundException; import java.io.InputStream; import java.util.ArrayList; -import java.util.Collection; -import java.util.Iterator; import java.util.List; /** @@ -610,34 +608,19 @@ @Inject private ServiceSynthesis serviceSynthesis; + private GlobalSynthesisParameters globalSynthesisParameters; + /* variable used in view */ @Property private Indicator indicator; - /* variable used in view */ - private List<Indicator> indicators; - - /** Sum of the coefficient of the indicators. */ - private Double totalCoefficient; - - public Double getTotalCoefficient() { - if (totalCoefficient == null) { - totalCoefficient = 0.0; - for (Indicator indicator : getIndicators()) { - totalCoefficient += indicator.getCoefficient(); - } + public GlobalSynthesisParameters getGlobalSynthesisParameters() { + if (globalSynthesisParameters == null) { + globalSynthesisParameters = serviceSynthesis.getGlobalSynthesisParameters(); } - return totalCoefficient; + return globalSynthesisParameters; } - public List<Indicator> getIndicators() { - if (indicators == null) { - indicators = serviceSynthesis.getGlobalSynthesisParameters(); - } - return indicators; - } - - @InjectComponent private Form synthesisParametersForm; @@ -655,7 +638,7 @@ } void onSuccessFromSynthesisParametersForm() { - for (Indicator indicator : getIndicators()) { + for (Indicator indicator : getGlobalSynthesisParameters().getParameters()) { serviceSynthesis.updateGlobalSynthesisParameter (indicator, currentUser.getUser(), comment); } 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 09:10:05 UTC (rev 731) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java 2010-11-03 11:22:57 UTC (rev 732) @@ -31,6 +31,7 @@ import fr.ifremer.wao.bean.ContactState; import fr.ifremer.wao.bean.ContactStateStatistics; import fr.ifremer.wao.bean.GlobalIndicatorValue; +import fr.ifremer.wao.bean.GlobalSynthesisParameters; import fr.ifremer.wao.bean.GlobalSynthesisResult; import fr.ifremer.wao.bean.SamplingFilter; import fr.ifremer.wao.bean.SamplingFilterImpl; @@ -129,22 +130,10 @@ return activeSynthesis; } - /** in a list of indicators, find the one with given synthesisId. */ - protected Indicator findIndicator(SynthesisId id, - List<Indicator> indicators) { - for (Indicator indicator : indicators) { - if (indicator.getSynthesisId().equals(id)) { - return indicator; - } - } - log.warn("indicator not found : " + id); - return null; - } + private GlobalSynthesisParameters globalSynthesisParameters; - private List<Indicator> globalSynthesisParameters; - /** permit lazy call to serviceSynthesis to set globalSynthesisParameters field. */ - public List<Indicator> getGlobalSynthesisParameters() { + public GlobalSynthesisParameters getGlobalSynthesisParameters() { if (globalSynthesisParameters == null) { globalSynthesisParameters = getGlobalSynthesisResult().getGlobalSynthesisParameters(); @@ -166,8 +155,7 @@ */ public Indicator getActiveIndicator() { SynthesisId activeSynthesis = getActiveSynthesis(); - List<Indicator> globalSynthesisParameters = getGlobalSynthesisParameters(); - activeIndicator = findIndicator(activeSynthesis, globalSynthesisParameters); + activeIndicator = getGlobalSynthesisParameters().getParameter(activeSynthesis); return activeIndicator; } Modified: trunk/wao-ui/src/main/webapp/Administration.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Administration.tml 2010-11-03 09:10:05 UTC (rev 731) +++ trunk/wao-ui/src/main/webapp/Administration.tml 2010-11-03 11:22:57 UTC (rev 732) @@ -182,14 +182,14 @@ <t:errors t:banner="message:errors-banner" />  - <t:loop t:source="indicators" t:value="indicator" volatile="true"> + <t:loop t:source="globalSynthesisParameters.parameters" t:value="indicator" volatile="true"> <t:indicatorLevels t:indicator="indicator" editable="true" /> </t:loop> <table class="indicatorLevels"> <tr> <th>Total coefficients : </th> - <td>${totalCoefficient}</td> + <td>${globalSynthesisParameters.totalCoefficients}</td> </tr> </table> Modified: trunk/wao-ui/src/main/webapp/Synthesis.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Synthesis.tml 2010-11-03 09:10:05 UTC (rev 731) +++ trunk/wao-ui/src/main/webapp/Synthesis.tml 2010-11-03 11:22:57 UTC (rev 732) @@ -359,7 +359,7 @@ <h2>Synthèse globale</h2> <br /> - <t:loop t:source="globalSynthesisParameters" t:value="activeIndicator"> + <t:loop t:source="globalSynthesisParameters.parameters" t:value="activeIndicator"> <t:indicatorLevels t:indicator="activeIndicator" t:highlightLevel="activeIndicatorLevel" /> </t:loop>

1 0

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

03 Nov '10

Author: bleny Date: 2010-11-03 09:10:05 +0000 (Wed, 03 Nov 2010) New Revision: 731 Log: bugfix in synthesis page layout Modified: trunk/wao-ui/src/main/webapp/Synthesis.tml Modified: trunk/wao-ui/src/main/webapp/Synthesis.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Synthesis.tml 2010-11-03 09:02:07 UTC (rev 730) +++ trunk/wao-ui/src/main/webapp/Synthesis.tml 2010-11-03 09:10:05 UTC (rev 731) @@ -187,9 +187,10 @@ </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 /> <t:if t:test="user.admin"> <p> Ces résultats concernent l'ensemble des contrats en cours @@ -225,11 +226,11 @@ </div> </p:else> </t:if> + </div> -  - <br /> - <t:indicatorLevels t:indicator="activeIndicator" t:highlightLevel="activeIndicatorLevel" withLegend="true" /> - </div> +  + <br /> + <t:indicatorLevels t:indicator="activeIndicator" t:highlightLevel="activeIndicatorLevel" withLegend="true" /> </t:block>  <t:block t:id="ind3">

1 0

[Suiviobsmer-commits] r730 - in trunk/wao-ui/src/main/webapp/img: . source
by bleny＠users.labs.libre-entreprise.org 03 Nov '10

03 Nov '10

Author: bleny Date: 2010-11-03 09:02:07 +0000 (Wed, 03 Nov 2010) New Revision: 730 Log: add icon for data reliability menu in synthesis page Added: trunk/wao-ui/src/main/webapp/img/source/synthesis-ind-data-reliability.xcf trunk/wao-ui/src/main/webapp/img/synthesis-ind-data-reliability.png Added: trunk/wao-ui/src/main/webapp/img/source/synthesis-ind-data-reliability.xcf =================================================================== (Binary files differ) Property changes on: trunk/wao-ui/src/main/webapp/img/source/synthesis-ind-data-reliability.xcf ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/wao-ui/src/main/webapp/img/synthesis-ind-data-reliability.png =================================================================== (Binary files differ) Property changes on: trunk/wao-ui/src/main/webapp/img/synthesis-ind-data-reliability.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream

1 0

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

02 Nov '10

Author: bleny Date: 2010-11-02 22:45:28 +0000 (Tue, 02 Nov 2010) New Revision: 729 Log: add message in case there is no modification in history Modified: trunk/wao-ui/src/main/webapp/IndicatorsHistory.tml Modified: trunk/wao-ui/src/main/webapp/IndicatorsHistory.tml =================================================================== --- trunk/wao-ui/src/main/webapp/IndicatorsHistory.tml 2010-11-02 22:41:53 UTC (rev 728) +++ trunk/wao-ui/src/main/webapp/IndicatorsHistory.tml 2010-11-02 22:45:28 UTC (rev 729) @@ -41,13 +41,18 @@ <div class="mtop30" /> - <p t:type="loop" t:source="indicatorLogs" t:value="indicatorLog"> - Auteur de la modification : <strong>${indicatorLog.author.fullName}</strong><br /> - Commentaire : ${indicatorLog.comment}<br /> - Modifications effectuées : ${indicatorLog.logText}<br /><br /> + <t:if test="indicatorLogs.empty"> + <strong>Aucune modification n'a été apportée à ce jour</strong> + <p:else> + <p t:type="loop" t:source="indicatorLogs" t:value="indicatorLog"> + Auteur de la modification : <strong>${indicatorLog.author.fullName}</strong><br /> + Commentaire : ${indicatorLog.comment}<br /> + Modifications effectuées : ${indicatorLog.logText}<br /><br /> - <div class="mtop30" /> - </p> + <div class="mtop30" /> + </p> + </p:else> + </t:if> </div> </t:layout>

1 0

[Suiviobsmer-commits] r728 - 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 02 Nov '10

02 Nov '10

Author: bleny Date: 2010-11-02 22:41:53 +0000 (Tue, 02 Nov 2010) New Revision: 728 Log: add page with indicators modification history Added: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/IndicatorsHistory.java trunk/wao-ui/src/main/webapp/IndicatorsHistory.tml 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.properties trunk/wao-business/src/main/xmi/wao.zargo 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-02 21:17:33 UTC (rev 727) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 2010-11-02 22:41:53 UTC (rev 728) @@ -905,7 +905,7 @@ // update database logText += String.format( "Modification du coefficient de l'indicateur « %s » " + - "(ancienne valeur = %s, nouvelle valeur = %s)\n\n", + "(ancienne valeur = %s, nouvelle valeur = %s).\n\n", indicator.getSynthesisId().getLabel(), oldIndicator.getCoefficient(), indicator.getCoefficient()); @@ -932,7 +932,7 @@ 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", + + ", nouvelle valeur = %s).\n\n", level.getLevel(), level.getLevel() + 1, indicator.getSynthesisId().getLabel(), level.getUpperBound(), newLevel.getUpperBound()); @@ -977,6 +977,13 @@ } } + @Override + protected List<IndicatorLog> executeGetAllIndicatorLogs(TopiaContext transaction) throws Exception { + List<IndicatorLog> allIndicatorLogs = + WaoDAOHelper.getIndicatorLogDAO(transaction).findAll(); + return allIndicatorLogs; + } + protected PieChartData createContactPieChartData() { PieChartData data = new PieChartDataImpl(); for (ContactPieChartConstant constant : ContactPieChartConstant.values()) { 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-02 21:17:33 UTC (rev 727) +++ trunk/wao-business/src/main/resources/i18n/wao-business-en_GB.properties 2010-11-02 22:41:53 UTC (rev 728) @@ -78,6 +78,7 @@ wao.error.serviceSampling.getSampleRowsByFilter= wao.error.serviceSampling.getSampleRowsOrderedByFishingZone= wao.error.serviceSampling.importSamplingPlanCsv= +wao.error.serviceSynthesis.getAllIndicatorLogs= wao.error.serviceSynthesis.getBoardingBoats= wao.error.serviceSynthesis.getComplianceBoardingIndicator= wao.error.serviceSynthesis.getContactDataInputDateReactivity= 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-02 21:17:33 UTC (rev 727) +++ trunk/wao-business/src/main/resources/i18n/wao-business-fr_FR.properties 2010-11-02 22:41:53 UTC (rev 728) @@ -77,6 +77,7 @@ wao.error.serviceSampling.getSampleRowsByFilter=Impossible de r\u00E9cup\u00E9rer la liste des lignes du plan d'\u00E9chantillonnage wao.error.serviceSampling.getSampleRowsOrderedByFishingZone=Impossible de r\u00E9cup\u00E9rer la liste des lignes du plan d'\u00E9chantillonnage wao.error.serviceSampling.importSamplingPlanCsv=Erreur \u00E0 la ligne %1$d [CODE \= %2$s] +wao.error.serviceSynthesis.getAllIndicatorLogs= wao.error.serviceSynthesis.getBoardingBoats=Impossible de r\u00E9cup\u00E9rer les donn\u00E9es du graphique concernant les embarquements sur les navires wao.error.serviceSynthesis.getComplianceBoardingIndicator= wao.error.serviceSynthesis.getContactDataInputDateReactivity=Impossible de r\u00E9cup\u00E9rer l'indicateur de r\u00E9activit\u00E9 sur les dates de saisies dans Allegro Modified: trunk/wao-business/src/main/xmi/wao.properties =================================================================== --- trunk/wao-business/src/main/xmi/wao.properties 2010-11-02 21:17:33 UTC (rev 727) +++ trunk/wao-business/src/main/xmi/wao.properties 2010-11-02 22:41:53 UTC (rev 728) @@ -33,3 +33,4 @@ fr.ifremer.wao.entity.Contact.attribute.boat.tagvalue.lazy=false fr.ifremer.wao.entity.Indicator.attribute.indicatorLevel.tagvalue.lazy=false +fr.ifremer.wao.entity.IndicatorLog.attribute.author.tagvalue.lazy=false Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ) Added: 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 (rev 0) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/IndicatorsHistory.java 2010-11-02 22:41:53 UTC (rev 728) @@ -0,0 +1,38 @@ +package fr.ifremer.wao.ui.pages; + +import fr.ifremer.wao.bean.UserRole; +import fr.ifremer.wao.entity.IndicatorLog; +import fr.ifremer.wao.service.ServiceSynthesis; +import fr.ifremer.wao.ui.data.RequiresAuthentication; +import org.apache.tapestry5.annotations.IncludeStylesheet; +import org.apache.tapestry5.annotations.Property; +import org.apache.tapestry5.ioc.annotations.Inject; + +import java.util.List; + +/** + * This page show the list of all modifications done by administrators + * on the coefficient and bounds between levels since the beginning + * + * @author bleny + */ + at RequiresAuthentication(value = {UserRole.ADMIN}, readOnlyAllowed = true) + at IncludeStylesheet("context:css/common.css") +public class IndicatorsHistory { + + @Inject + private ServiceSynthesis serviceSynthesis; + + private List<IndicatorLog> indicatorLogs; + + /* variable used in template in a loop */ + @Property + private IndicatorLog indicatorLog; + + public List<IndicatorLog> getIndicatorLogs() { + if (indicatorLogs == null) { + indicatorLogs = serviceSynthesis.getAllIndicatorLogs(); + } + return indicatorLogs; + } +} Modified: trunk/wao-ui/src/main/webapp/Administration.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Administration.tml 2010-11-02 21:17:33 UTC (rev 727) +++ trunk/wao-ui/src/main/webapp/Administration.tml 2010-11-02 22:41:53 UTC (rev 728) @@ -199,6 +199,9 @@ </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> Added: trunk/wao-ui/src/main/webapp/IndicatorsHistory.tml =================================================================== --- trunk/wao-ui/src/main/webapp/IndicatorsHistory.tml (rev 0) +++ trunk/wao-ui/src/main/webapp/IndicatorsHistory.tml 2010-11-02 22:41:53 UTC (rev 728) @@ -0,0 +1,53 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<t:layout t:pageTitle="Historisque des paramètres de calculs des indicateurs" t:contentId="so-indicators-history" + xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter"> + + <div style="margin-left:auto; margin-right:auto; width: 80%;"> + <h2>Historique des modifications des paramètres de la synthèse globale</h2> + + <p> + Cette page présente toutes les modifications effectuées depuis l'oririgine + qui portent sur les bornes de chaque niveaux ainsi que les coefficients + de chaque indicateurs. + </p> + + <div class="mtop30" /> + + <p t:type="loop" t:source="indicatorLogs" t:value="indicatorLog"> + Auteur de la modification : <strong>${indicatorLog.author.fullName}</strong><br /> + Commentaire : ${indicatorLog.comment}<br /> + Modifications effectuées : ${indicatorLog.logText}<br /><br /> + + <div class="mtop30" /> + </p> + </div> + +</t:layout>

1 0

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

02 Nov '10

Author: bleny Date: 2010-11-02 21:17:33 +0000 (Tue, 02 Nov 2010) New Revision: 727 Log: add print css for global synthesis Added: trunk/wao-ui/src/main/webapp/css/synthesis-print.css Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java trunk/wao-ui/src/main/webapp/Synthesis.tml 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-02 19:59:41 UTC (rev 726) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java 2010-11-02 21:17:33 UTC (rev 727) @@ -24,17 +24,17 @@ package fr.ifremer.wao.ui.pages; -import fr.ifremer.wao.bean.GlobalIndicatorValue; -import fr.ifremer.wao.bean.GlobalSynthesisResult; -import fr.ifremer.wao.bean.SynthesisId; import fr.ifremer.wao.WaoException; import fr.ifremer.wao.bean.BoardingResult; import fr.ifremer.wao.bean.ConnectedUser; import fr.ifremer.wao.bean.ContactAverageReactivity; import fr.ifremer.wao.bean.ContactState; import fr.ifremer.wao.bean.ContactStateStatistics; +import fr.ifremer.wao.bean.GlobalIndicatorValue; +import fr.ifremer.wao.bean.GlobalSynthesisResult; import fr.ifremer.wao.bean.SamplingFilter; import fr.ifremer.wao.bean.SamplingFilterImpl; +import fr.ifremer.wao.bean.SynthesisId; import fr.ifremer.wao.bean.UserRole; import fr.ifremer.wao.entity.Company; import fr.ifremer.wao.entity.Indicator; @@ -48,6 +48,8 @@ import org.apache.commons.collections.CollectionUtils; import org.apache.tapestry5.Block; import org.apache.tapestry5.ComponentResources; +import org.apache.tapestry5.RenderSupport; +import org.apache.tapestry5.annotations.Environmental; import org.apache.tapestry5.annotations.IncludeStylesheet; import org.apache.tapestry5.annotations.InjectComponent; import org.apache.tapestry5.annotations.Log; @@ -57,9 +59,9 @@ import org.apache.tapestry5.corelib.components.Zone; import org.apache.tapestry5.ioc.annotations.Inject; import org.jfree.chart.JFreeChart; -import org.nuiton.util.DateUtil; import org.nuiton.util.PeriodDates; import org.slf4j.Logger; + import java.text.DateFormat; import java.text.NumberFormat; import java.text.SimpleDateFormat; @@ -81,6 +83,9 @@ @IncludeStylesheet("context:css/synthesis.css") public class Synthesis extends AbstractFilteredPage { + @Environmental + private RenderSupport renderSupport; + @Inject private WaoManager manager; @@ -112,6 +117,8 @@ void setupRender() { // The company of connected user will be contributed to abstractFilteredPage initCompanyFilter(); + + renderSupport.addStylesheetLink("css/synthesis-print.css", "print"); } public SynthesisId getActiveSynthesis() { Modified: trunk/wao-ui/src/main/webapp/Synthesis.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Synthesis.tml 2010-11-02 19:59:41 UTC (rev 726) +++ trunk/wao-ui/src/main/webapp/Synthesis.tml 2010-11-02 21:17:33 UTC (rev 727) @@ -354,7 +354,7 @@ </t:block>  <t:block t:id="globalSynthesis"> - <div > + <div class="print"> <h2>Synthèse globale</h2> <br /> Added: trunk/wao-ui/src/main/webapp/css/synthesis-print.css =================================================================== --- trunk/wao-ui/src/main/webapp/css/synthesis-print.css (rev 0) +++ trunk/wao-ui/src/main/webapp/css/synthesis-print.css 2010-11-02 21:17:33 UTC (rev 727) @@ -0,0 +1,22 @@ + + +* { + font-size: 9pt; +} + +#so-session, #so-menu, #so-footer { + display: none; +} + +#so-synthesis fieldset, /* hide filters */ +#so-synthesis #so-synthesis-menu { + display: none; +} + +td.selected { + background-color: yellow; +} + +td.highlight { + border-width: 3px; +} \ No newline at end of file

1 0

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

02 Nov '10

Author: bleny Date: 2010-11-02 19:59:41 +0000 (Tue, 02 Nov 2010) New Revision: 726 Log: add square brackets to show bound inclusions in UI Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/IndicatorLevelImpl.java trunk/wao-business/src/main/xmi/wao.zargo trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/IndicatorLevels.tml Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/IndicatorLevelImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/IndicatorLevelImpl.java 2010-11-02 19:38:31 UTC (rev 725) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/IndicatorLevelImpl.java 2010-11-02 19:59:41 UTC (rev 726) @@ -70,6 +70,7 @@ return containsValue; } + @Override public boolean isUpperBoundIncluded() { return upperBoundIncluded; } 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-02 19:38:31 UTC (rev 725) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/IndicatorLevels.tml 2010-11-02 19:59:41 UTC (rev 726) @@ -51,9 +51,15 @@ ${indicatorLevel.upperBound} <p:else> <t:if test="indicatorLevel.lowerBoundPositiveInfinity"> - ${indicatorLevel.upperBound} et plus + ] ${indicatorLevel.upperBound} et plus <p:else> - ${indicatorLevel.lowerBound} à ${indicatorLevel.upperBound} + [ ${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] r725 - in trunk/wao-ui/src/main: java/fr/ifremer/wao/ui/pages webapp
by bleny＠users.labs.libre-entreprise.org 02 Nov '10

02 Nov '10

Author: bleny Date: 2010-11-02 19:38:31 +0000 (Tue, 02 Nov 2010) New Revision: 725 Log: bugfix : form to get data-reliability appear now Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java trunk/wao-ui/src/main/webapp/Contacts.tml Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java 2010-11-02 17:00:31 UTC (rev 724) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java 2010-11-02 19:38:31 UTC (rev 725) @@ -421,6 +421,12 @@ /**************************** CONTACT ROW ACTION **************************/ + public boolean isDataReliabilityAsked() { + boolean result = contact.getValidationProgram() == null; + return result; + } + + /** * Flag to know if it's only edition (=true) or save action (=false) */ Modified: trunk/wao-ui/src/main/webapp/Contacts.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Contacts.tml 2010-11-02 17:00:31 UTC (rev 724) +++ trunk/wao-ui/src/main/webapp/Contacts.tml 2010-11-02 19:38:31 UTC (rev 725) @@ -292,11 +292,10 @@ <p:dataReliabilityCell> <t:if t:test="boardingDone"> <t:if t:test="contact.validationCompany"> - <t:if t:test="contact.validationProgram"> - ${contact.dataReliability.label} + <t:if test="dataReliabilityAsked"> + <input t:type="select" t:id="dataReliability" t:value="contact.dataReliability" validate="required" /> <p:else> -  - <input t:type="select" t:id="dataReliability" t:value="contact.dataReliability" validate="required" /> + ${contact.dataReliability.label} </p:else> </t:if> </t:if>

1 0

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

02 Nov '10

Author: bleny Date: 2010-11-02 17:00:31 +0000 (Tue, 02 Nov 2010) New Revision: 724 Log: add i18n UI representation of global indicator value Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/GlobalIndicatorValue.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-ui/src/main/webapp/Synthesis.tml Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/GlobalIndicatorValue.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/GlobalIndicatorValue.java 2010-11-02 16:41:38 UTC (rev 723) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/GlobalIndicatorValue.java 2010-11-02 17:00:31 UTC (rev 724) @@ -1,16 +1,26 @@ package fr.ifremer.wao.bean; +import static org.nuiton.i18n.I18n._; + public enum GlobalIndicatorValue { - VERY_BAD, + VERY_BAD("wao.business.bean.GlobalIndicatorValue.very_bad"), - BAD, + BAD("wao.business.bean.GlobalIndicatorValue.bad"), - NEUTRAL, + NEUTRAL("wao.business.bean.GlobalIndicatorValue.neutral"), - GOOD, + GOOD("wao.business.bean.GlobalIndicatorValue.good"), - VERY_GOOD; + VERY_GOOD("wao.business.bean.GlobalIndicatorValue.very_good"); + protected String label; + GlobalIndicatorValue(String label) { + this.label = label; + } + + public String getLabel() { + return _(label); + } } 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-02 16:41:38 UTC (rev 723) +++ trunk/wao-business/src/main/resources/i18n/wao-business-en_GB.properties 2010-11-02 17:00:31 UTC (rev 724) @@ -2,6 +2,11 @@ wao.business.bean.DataReliability.not_reliable=not reliable wao.business.bean.DataReliability.reliable=reliable wao.business.bean.DataReliability.unknown=unknown +wao.business.bean.GlobalIndicatorValue.bad= +wao.business.bean.GlobalIndicatorValue.good= +wao.business.bean.GlobalIndicatorValue.neutral= +wao.business.bean.GlobalIndicatorValue.very_bad= +wao.business.bean.GlobalIndicatorValue.very_good= wao.business.bean.SynthesisId.allegro_reactivity= wao.business.bean.SynthesisId.compliance_boarding= wao.business.bean.SynthesisId.contact_state= 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-02 16:41:38 UTC (rev 723) +++ trunk/wao-business/src/main/resources/i18n/wao-business-fr_FR.properties 2010-11-02 17:00:31 UTC (rev 724) @@ -2,6 +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.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-ui/src/main/webapp/Synthesis.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Synthesis.tml 2010-11-02 16:41:38 UTC (rev 723) +++ trunk/wao-ui/src/main/webapp/Synthesis.tml 2010-11-02 17:00:31 UTC (rev 724) @@ -368,11 +368,11 @@ <t:loop t:source="globalLevels" t:value="globalLevel"> <t:if test="highlightGlobalLevel()"> <td class="highlight selected"> - ${globalLevel} + ${globalLevel.label} </td> <p:else> <td> - ${globalLevel} + ${globalLevel.label} </td> </p:else> </t:if>

1 0