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" />