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

[Suiviobsmer-commits] r713 - in trunk: 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 Oct. 27, 2010

Oct. 27, 2010

Author: bleny Date: 2010-10-27 09:10:56 +0000 (Wed, 27 Oct 2010) New Revision: 713 Log: fix indicator administration ; add mandatory comment field Modified: 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/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-10-26 17:06:43 UTC (rev 712) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 2010-10-27 09:10:56 UTC (rev 713) @@ -851,8 +851,7 @@ // fist, find the indicator Indicator oldIndicator = WaoDAOHelper.getIndicatorDAO(transaction) - .findAllByIndicatorId(indicator.getIndicatorId()) - .iterator().next(); + .findByIndicatorId(indicator.getIndicatorId()); // find what have been changed boolean coefficientChanged = indicator.getCoefficient() @@ -868,15 +867,16 @@ indicator.getSynthesisId().getLabel(), oldIndicator.getCoefficient(), indicator.getCoefficient()); + + oldIndicator.setCoefficient(indicator.getCoefficient()); } // new compare old and new level bounds for (IndicatorLevel level : oldIndicator.getIndicatorLevel()) { IndicatorLevel newLevel = null; - // set oldLevel + // set newLevel for (IndicatorLevel tempLevel : indicator.getIndicatorLevel()) { - log.debug(tempLevel.getLevel() + " ?= " + level.getLevel()); if (tempLevel.getLevel() == level.getLevel()) { newLevel = tempLevel; } @@ -914,10 +914,10 @@ IndicatorLog indicatorLog = new IndicatorLogImpl(); indicatorLog.setAuthor(author); indicatorLog.setComment(comment); + indicatorLog.setLogText(logText.trim()); // add entity logText WaoDAOHelper.getIndicatorLogDAO(transaction).create(indicatorLog); - indicatorLog.setLogText(logText.trim()); // attach the new indicator log to the concerned indicator // Collection indicatorLogs = indicator.getIndicatorLog(); 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-10-26 17:06:43 UTC (rev 712) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java 2010-10-27 09:10:56 UTC (rev 713) @@ -63,6 +63,7 @@ import org.apache.tapestry5.annotations.Property; import org.apache.tapestry5.annotations.SessionState; import org.apache.tapestry5.beaneditor.BeanModel; +import org.apache.tapestry5.beaneditor.Validate; import org.apache.tapestry5.corelib.components.BeanEditForm; import org.apache.tapestry5.corelib.components.Form; import org.apache.tapestry5.corelib.components.Zone; @@ -79,6 +80,7 @@ import java.io.InputStream; import java.util.ArrayList; import java.util.Collection; +import java.util.Iterator; import java.util.List; /** @@ -639,16 +641,24 @@ @InjectComponent private Form synthesisParametersForm; - @Log + /** The comment field value of the form. */ + @Property + @Validate("required") + private String comment; + + void onValidateFromSynthesisParametersForm() { + + // TODO bleny 20101027 check that for each level, upperBound is contained + // between the upperBound of the lower level and the upperBound of + // the higher level + + } + void onSuccessFromSynthesisParametersForm() { - - // FIXME bleny 20101026 replace missing comment by something from a textarea for (Indicator indicator : getIndicators()) { serviceSynthesis.updateGlobalSynthesisParameters(indicator, - currentUser.getUser(), "missing comment"); + currentUser.getUser(), comment); } - - } Modified: trunk/wao-ui/src/main/webapp/Administration.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Administration.tml 2010-10-26 17:06:43 UTC (rev 712) +++ trunk/wao-ui/src/main/webapp/Administration.tml 2010-10-27 09:10:56 UTC (rev 713) @@ -179,16 +179,28 @@ <form t:type="form" t:id="synthesisParametersForm" t:zone="synthesisParametersFormZone"> + <t:errors t:banner="message:errors-banner" /> +  <t:loop t:source="indicators" t:value="indicator" volatile="true"> <t:indicatorLevels t:indicator="indicator" editable="true" /> </t:loop> - Total coefficients : ${totalCoefficient} + <table class="indicatorLevels"> + <tr> + <th>Total coefficients : </th> + <td>${totalCoefficient}</td> + </tr> + </table> + <div> + <p><label>Commentaire sur la modification* :</label></p> + <p><input t:type="textarea" t:id="comment" cols="50" rows="5" value="comment"/></p> + </div> + <div class="fright"> <input t:type="submit" t:id="saveData" class="ico save" value="Save" title="Enregistrer les modifications" /> - <input t:type="submit" t:id="cancelSave" class="ico undo" value="Undo" title="Annuler les modifications" /> + <input type="reset" class="ico undo" value="Annuler les modificationss" title="Annuler les modifications" /> </div> </form> </t:zone>

1 0

[Suiviobsmer-commits] r712 - in trunk: wao-business/src/main/java/fr/ifremer/wao/service wao-business/src/main/xmi wao-ui/src/main/java/fr/ifremer/wao/ui/components wao-ui/src/main/java/fr/ifremer/wao/ui/pages wao-ui/src/main/resources/fr/ifremer/wao/ui/components wao-ui/src/main/webapp
by bleny＠users.labs.libre-entreprise.org Oct. 26, 2010

Oct. 26, 2010

Author: bleny Date: 2010-10-26 17:06:43 +0000 (Tue, 26 Oct 2010) New Revision: 712 Log: WIP : create form to update indicators and levels Modified: 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/components/IndicatorLevels.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java 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/Synthesis.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-10-26 12:52:54 UTC (rev 711) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 2010-10-26 17:06:43 UTC (rev 712) @@ -841,6 +841,100 @@ return indicators; } + @Override + protected void executeUpdateGlobalSynthesisParameters(TopiaContext transaction, + Indicator indicator, WaoUser author, String comment) + throws Exception { + String logText = ""; + + boolean somethingChanged = false; + + // fist, find the indicator + Indicator oldIndicator = WaoDAOHelper.getIndicatorDAO(transaction) + .findAllByIndicatorId(indicator.getIndicatorId()) + .iterator().next(); + + // find what have been changed + boolean coefficientChanged = indicator.getCoefficient() + != oldIndicator.getCoefficient(); + if (coefficientChanged) { + somethingChanged = true; + + // add something to log + // update database + logText += String.format( + "Modification du coefficient de l'indicateur « %s » " + + "(ancienne valeur = %s, nouvelle valeur = %s)\n\n", + indicator.getSynthesisId().getLabel(), + oldIndicator.getCoefficient(), + indicator.getCoefficient()); + } + + // new compare old and new level bounds + for (IndicatorLevel level : oldIndicator.getIndicatorLevel()) { + IndicatorLevel newLevel = null; + + // set oldLevel + for (IndicatorLevel tempLevel : indicator.getIndicatorLevel()) { + log.debug(tempLevel.getLevel() + " ?= " + level.getLevel()); + if (tempLevel.getLevel() == level.getLevel()) { + newLevel = tempLevel; + } + } + + boolean upperBoundChanged = level.getUpperBound() + != newLevel.getUpperBound(); + if (upperBoundChanged) { + somethingChanged = true; + + logText += String.format( + "Modification du seuil de transition entre les niveaux " + + "%s et %s de l'indicateur « %s » (ancienne valeur = %s" + + ", nouvelle valeur = %s)\n\n", + level.getLevel(), level.getLevel() + 1, + indicator.getSynthesisId().getLabel(), + level.getUpperBound(), newLevel.getUpperBound()); + + level.setUpperBound(newLevel.getUpperBound()); + + WaoDAOHelper.getIndicatorLevelDAO(transaction).update(level); + } + + } + + if (somethingChanged) { + + // something has changed so we must store a log + + if (log.isDebugEnabled()) { + log.debug("modifications in global synthesis parameters :\n" + + logText); + } + + IndicatorLog indicatorLog = new IndicatorLogImpl(); + indicatorLog.setAuthor(author); + indicatorLog.setComment(comment); + + // add entity logText + WaoDAOHelper.getIndicatorLogDAO(transaction).create(indicatorLog); + indicatorLog.setLogText(logText.trim()); + + // attach the new indicator log to the concerned indicator + // Collection indicatorLogs = indicator.getIndicatorLog(); + Collection<IndicatorLog> indicatorLogs = oldIndicator.getIndicatorLog(); + indicatorLogs.add(indicatorLog); + oldIndicator.setIndicatorLog(indicatorLogs); + + // finally, update the indicator + WaoDAOHelper.getIndicatorDAO(transaction).update(oldIndicator); + + transaction.commitTransaction(); + } else { + log.warn("no modification were found in global synthesis " + + "parameters at updating"); + } + } + protected PieChartData createContactPieChartData() { PieChartData data = new PieChartDataImpl(); for (ContactPieChartConstant constant : ContactPieChartConstant.values()) { Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ) Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/IndicatorLevels.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/IndicatorLevels.java 2010-10-26 12:52:54 UTC (rev 711) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/IndicatorLevels.java 2010-10-26 17:06:43 UTC (rev 712) @@ -34,6 +34,9 @@ @Parameter(required = false) private Boolean withLegend; + @Parameter + private Boolean editable; + /* variable used in view */ @Property private IndicatorLevel indicatorLevel; @@ -52,6 +55,21 @@ return withLegend; } + public void setWithLegend(Boolean withLegend) { + this.withLegend = withLegend; + } + + public void setEditable(Boolean editable) { + this.editable = editable; + } + + public Boolean getEditable() { + if (editable == null) { + editable = false; + } + return editable; + } + public boolean highLightCurrentIndicatorLevel() { if (log.isDebugEnabled()) { log.debug("indicatorLevel = " + indicatorLevel); 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-10-26 12:52:54 UTC (rev 711) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java 2010-10-26 17:06:43 UTC (rev 712) @@ -64,6 +64,7 @@ import org.apache.tapestry5.annotations.SessionState; import org.apache.tapestry5.beaneditor.BeanModel; import org.apache.tapestry5.corelib.components.BeanEditForm; +import org.apache.tapestry5.corelib.components.Form; import org.apache.tapestry5.corelib.components.Zone; import org.apache.tapestry5.internal.OptionModelImpl; import org.apache.tapestry5.internal.SelectModelImpl; @@ -633,4 +634,22 @@ } return indicators; } + + + @InjectComponent + private Form synthesisParametersForm; + + @Log + void onSuccessFromSynthesisParametersForm() { + + // FIXME bleny 20101026 replace missing comment by something from a textarea + for (Indicator indicator : getIndicators()) { + serviceSynthesis.updateGlobalSynthesisParameters(indicator, + currentUser.getUser(), "missing comment"); + } + + + } + + } 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-10-26 12:52:54 UTC (rev 711) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/IndicatorLevels.tml 2010-10-26 17:06:43 UTC (rev 712) @@ -23,7 +23,6 @@ xmlns:p="tapestry:parameter"> <table class="indicatorLevels"> - <caption></caption> <tbody> <tr> <th /> @@ -32,7 +31,7 @@ </tr> <tr> <th>Niveaux</th> - <t:loop t:source="indicator.indicatorLevel" t:value="indicatorLevel"> + <t:loop t:source="indicator.indicatorLevel" t:value="indicatorLevel" volatile="true"> <t:if test="highLightCurrentIndicatorLevel()"> <td class="highlight selected">${indicatorLevel.level}</td> <p:else> @@ -46,7 +45,7 @@ </tr> <tr> <th>Bornes</th> - <t:loop t:source="indicator.indicatorLevel" t:value="indicatorLevel"> + <t:loop t:source="indicator.indicatorLevel" t:value="indicatorLevel" volatile="true"> <td> <t:if test="indicatorLevel.lowerEqualsUpperBounds()"> ${indicatorLevel.upperBound} @@ -62,12 +61,31 @@ </td> </t:loop> </tr> -  - <caption> - En jaune, la position actuelle de la société selon cet indicateur. - </caption> -  + <t:if test="getEditable()"> + <tr> + <th>Modifications</th> + <t:loop t:source="indicator.indicatorLevel" t:value="indicatorLevel" volatile="true"> + <td> + <t:if test="indicatorLevel.lowerBoundPositiveInfinity"> + <input type="text" size="3" value="∞" disabled="disabled" /> + <p:else> +  + <input type="text" size="3" value="${indicatorLevel.lowerBound}" disabled="disabled" /> +  + </p:else> + </t:if> + <input t:type="textfield" value="indicatorLevel.upperBound" size="3" /> + </td> + </t:loop> + <td> + <input t:type="textfield" value="indicator.coefficient" size="3" /> + </td> + </tr> + </t:if> </tbody> </table> + <t:if test="isWithLegend()"> + En jaune, la position actuelle de la société selon cet indicateur. + </t:if> </html> \ No newline at end of file Modified: trunk/wao-ui/src/main/webapp/Administration.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Administration.tml 2010-10-26 12:52:54 UTC (rev 711) +++ trunk/wao-ui/src/main/webapp/Administration.tml 2010-10-26 17:06:43 UTC (rev 712) @@ -172,18 +172,26 @@ <div class="mtop10" /> - <t:if t:test="currentUser.admin"> + <t:if t:test="currentUser.admin">  - <h2>Indicateurs qualités prestataires</h2> + <t:zone t:id="synthesisParametersFormZone" t:update="show"> + <h2>Indicateurs qualités prestataires</h2> -  + <form t:type="form" t:id="synthesisParametersForm" t:zone="synthesisParametersFormZone"> - <t:loop t:source="indicators" t:value="indicator"> - <t:indicatorLevels t:indicator="indicator" /> - </t:loop> +  + <t:loop t:source="indicators" t:value="indicator" volatile="true"> + <t:indicatorLevels t:indicator="indicator" editable="true" /> + </t:loop> - Total coefficients : ${totalCoefficient} + Total coefficients : ${totalCoefficient} + <div class="fright"> + <input t:type="submit" t:id="saveData" class="ico save" value="Save" title="Enregistrer les modifications" /> + <input t:type="submit" t:id="cancelSave" class="ico undo" value="Undo" title="Annuler les modifications" /> + </div> + </form> + </t:zone> </t:if> </t:layout> Modified: trunk/wao-ui/src/main/webapp/Synthesis.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Synthesis.tml 2010-10-26 12:52:54 UTC (rev 711) +++ trunk/wao-ui/src/main/webapp/Synthesis.tml 2010-10-26 17:06:43 UTC (rev 712) @@ -162,7 +162,7 @@  <br /> - <t:indicatorLevels t:indicator="activeIndicator" t:highlightLevel="activeIndicatorLevel" /> + <t:indicatorLevels t:indicator="activeIndicator" t:highlightLevel="activeIndicatorLevel" withLegend="true" /> </div> </t:block>  @@ -182,7 +182,7 @@  <br /> - <t:indicatorLevels t:indicator="activeIndicator" t:highlightLevel="activeIndicatorLevel" /> + <t:indicatorLevels t:indicator="activeIndicator" t:highlightLevel="activeIndicatorLevel" withLegend="true" /> </div> </t:block>  @@ -228,7 +228,7 @@  <br /> - <t:indicatorLevels t:indicator="activeIndicator" t:highlightLevel="activeIndicatorLevel" /> + <t:indicatorLevels t:indicator="activeIndicator" t:highlightLevel="activeIndicatorLevel" withLegend="true" /> </div> </t:block>  @@ -311,7 +311,7 @@  <br /> - <t:indicatorLevels t:indicator="activeIndicator" t:highlightLevel="activeIndicatorLevel" /> + <t:indicatorLevels t:indicator="activeIndicator" t:highlightLevel="activeIndicatorLevel" withLegend="true" /> </div> </t:block>  @@ -349,7 +349,7 @@  <br /> - <t:indicatorLevels t:indicator="activeIndicator" t:highlightLevel="activeIndicatorLevel" /> + <t:indicatorLevels t:indicator="activeIndicator" t:highlightLevel="activeIndicatorLevel" withLegend="true" /> </div> </t:block>

1 0

[Suiviobsmer-commits] r711 - trunk
by tchemit＠users.labs.libre-entreprise.org Oct. 26, 2010

Oct. 26, 2010

Author: tchemit Date: 2010-10-26 12:52:54 +0000 (Tue, 26 Oct 2010) New Revision: 711 Log: fix build (use inheritance from mavenpom for commons libs) Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-10-26 12:02:51 UTC (rev 710) +++ trunk/pom.xml 2010-10-26 12:52:54 UTC (rev 711) @@ -25,7 +25,7 @@ <dependencyManagement> <dependencies> - <dependency> +  <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-email</artifactId> @@ -112,11 +112,11 @@ <version>${tapestryVersion}</version> <scope>test</scope> </dependency>--> - <dependency> +  <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> @@ -203,12 +203,12 @@ <version>0.9.10-hudson-16</version> <scope>provided</scope> </dependency> - <dependency> +  <dependency> <groupId>com.formos.tapestry</groupId> <artifactId>tapestry-testify</artifactId>

1 0

[Suiviobsmer-commits] r710 - trunk
by tchemit＠users.labs.libre-entreprise.org Oct. 26, 2010

Oct. 26, 2010

Author: tchemit Date: 2010-10-26 12:02:51 +0000 (Tue, 26 Oct 2010) New Revision: 710 Log: use mavenpom 2.4-SNAPSHOT use camelCase style for version properties use default libraries version from mavenpom Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-10-25 09:29:41 UTC (rev 709) +++ trunk/pom.xml 2010-10-26 12:02:51 UTC (rev 710) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4labs</artifactId> - <version>2.3.2</version> + <version>2.4-SNAPSHOT</version> </parent> <groupId>fr.ifremer</groupId> @@ -48,7 +48,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> - <version>${nuitonutils.version}</version> + <version>${nuitonUtilsVersion}</version> <scope>compile</scope> <exclusions> <exclusion> @@ -60,23 +60,23 @@ <dependency> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-tapestry-extra</artifactId> - <version>${nuitonweb.version}</version> + <version>${nuitonWebVersion}</version> </dependency>  <dependency> <groupId>org.nuiton.topia</groupId> <artifactId>topia-persistence</artifactId> - <version>${topia.version}</version> + <version>${topiaVersion}</version> </dependency> <dependency> <groupId>org.nuiton.topia</groupId> <artifactId>topia-service-migration</artifactId> - <version>${topia.version}</version> + <version>${topiaVersion}</version> </dependency> <dependency> <groupId>org.apache.tapestry</groupId> <artifactId>tapestry-core</artifactId> - <version>${tapestry.version}</version> + <version>${tapestryVersion}</version> <scope>compile</scope> <exclusions> <exclusion> @@ -88,7 +88,7 @@ <dependency> <groupId>org.apache.tapestry</groupId> <artifactId>tapestry-upload</artifactId> - <version>${tapestry.version}</version> + <version>${tapestryVersion}</version> </dependency> <dependency> <groupId>com.orientimport</groupId> @@ -109,7 +109,7 @@  <dependency> @@ -305,12 +305,12 @@ <labs.id>154</labs.id>  - <i18n.version>1.2.2</i18n.version> - <nuitonutils.version>1.4.2</nuitonutils.version> - <nuitonweb.version>0.1</nuitonweb.version> - <topia.version>2.4.3</topia.version> - <eugene.version>2.2</eugene.version> - <tapestry.version>5.1.0.5</tapestry.version> + <nuitonI18nVersion>1.2.2</nuitonI18nVersion> + <nuitonUtilsVersion>1.4.2</nuitonUtilsVersion> + <nuitonWebVersion>0.1</nuitonWebVersion> + <topiaVersion>2.4.3</topiaVersion> + <eugeneVersion>2.2</eugeneVersion> + <tapestryVersion>5.1.0.5</tapestryVersion> </properties> @@ -342,7 +342,7 @@ <dependency> <groupId>org.nuiton.jrst</groupId> <artifactId>doxia-module-jrst</artifactId> - <version>${jrst.version}</version> + <version>${jrstPluginVersion}</version> </dependency> </dependencies> </plugin> @@ -350,7 +350,7 @@ <plugin> <groupId>org.nuiton.eugene</groupId> <artifactId>maven-eugene-plugin</artifactId> - <version>${eugene.version}</version> + <version>${eugeneVersion}</version> <configuration> <inputs>zargo</inputs> <resolver>org.nuiton.util.FasterCachedResourceResolver</resolver> @@ -359,7 +359,7 @@ <dependency> <groupId>org.nuiton.topia</groupId> <artifactId>topia-persistence</artifactId> - <version>${topia.version}</version> + <version>${topiaVersion}</version> </dependency> </dependencies> </plugin> @@ -367,7 +367,7 @@ <plugin> <groupId>org.nuiton.i18n</groupId> <artifactId>maven-i18n-plugin</artifactId> - <version>${i18n.version}</version> + <version>${nuitonI18nVersion}</version> </plugin> </plugins>

1 0

[Suiviobsmer-commits] r709 - in trunk: wao-business/src/main/java/fr/ifremer/wao/bean wao-ui/src/main/webapp
by bleny＠users.labs.libre-entreprise.org Oct. 25, 2010

Oct. 25, 2010

Author: bleny Date: 2010-10-25 09:29:41 +0000 (Mon, 25 Oct 2010) New Revision: 709 Log: bugfix global synthesis average calculus Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/GlobalSynthesisResultImpl.java 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-10-22 17:00:26 UTC (rev 708) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/GlobalSynthesisResultImpl.java 2010-10-25 09:29:41 UTC (rev 709) @@ -59,19 +59,29 @@ @Override public GlobalIndicatorValue getGlobalLevel() { // compute an average with coefficients - double totalValues = 0.0; + double totalLevels = 0.0; double totalCoefficients = 0.0; for (Indicator indicator : globalSynthesisParameters) { - Double value = values.get(indicator.getSynthesisId()); - Double coefficient = indicator.getCoefficient(); + double value = values.get(indicator.getSynthesisId()); + double level = indicator.getLevelForValue(value).getLevel(); + double coefficient = indicator.getCoefficient(); - totalValues += value * coefficient; + totalLevels += level * coefficient; totalCoefficients += coefficient; + + if (log.isDebugEnabled()) { + log.debug("totalLevels = " + totalLevels + + ", totalCoefficients = " + totalCoefficients); + } } - double value = totalValues / totalCoefficients; + double value = totalLevels / totalCoefficients; + if (log.isDebugEnabled()) { + log.debug("value for global indicator = " + value); + } + GlobalIndicatorValue result = null; if (value >= 1.0 && value < 2.0) { result = GlobalIndicatorValue.VERY_BAD; Modified: trunk/wao-ui/src/main/webapp/Synthesis.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Synthesis.tml 2010-10-22 17:00:26 UTC (rev 708) +++ trunk/wao-ui/src/main/webapp/Synthesis.tml 2010-10-25 09:29:41 UTC (rev 709) @@ -362,7 +362,7 @@ <t:indicatorLevels t:indicator="activeIndicator" t:highlightLevel="activeIndicatorLevel" /> </t:loop> - BILAN + Bilan de la synthèse globale : ${globalSynthesisResult.globalLevel} </div> </t:block> </t:layout>

1 0

[Suiviobsmer-commits] r708 - in trunk: 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 Oct. 22, 2010

Oct. 22, 2010

Author: bleny Date: 2010-10-22 17:00:26 +0000 (Fri, 22 Oct 2010) New Revision: 708 Log: added a page with all indicators in synthesis ; ajax is buggy Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/GlobalSynthesisResultImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/IndicatorLevelImpl.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/Synthesis.java 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-10-22 12:46:40 UTC (rev 707) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/GlobalSynthesisResultImpl.java 2010-10-22 17:00:26 UTC (rev 708) @@ -15,19 +15,24 @@ protected Map<SynthesisId, Double> values; - protected List<Indicator> indicators; + protected List<Indicator> globalSynthesisParameters; public void setIndicatorValues(Map<SynthesisId, Double> indicatorValues) { this.values = indicatorValues; } - public void setIndicators(List<Indicator> indicators) { - this.indicators = indicators; + 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 : indicators) { + for (Indicator indicator : globalSynthesisParameters) { if (indicator.getSynthesisId().equals(id)) { return indicator; } @@ -57,7 +62,7 @@ double totalValues = 0.0; double totalCoefficients = 0.0; - for (Indicator indicator : indicators) { + for (Indicator indicator : globalSynthesisParameters) { Double value = values.get(indicator.getSynthesisId()); Double coefficient = indicator.getCoefficient(); 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-10-22 12:46:40 UTC (rev 707) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/IndicatorLevelImpl.java 2010-10-22 17:00:26 UTC (rev 708) @@ -1,7 +1,14 @@ package fr.ifremer.wao.entity; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + public class IndicatorLevelImpl extends IndicatorLevelAbstract { + private static final Logger log = + LoggerFactory.getLogger(IndicatorLevelImpl.class); + + /** the upperBound of the lower level */ protected double lowerBound; @Override @@ -49,6 +56,12 @@ && value < getLowerBound(); } } + + if (log.isDebugEnabled()) { + log.debug(value + " is contained between " + getLowerBound() + + " and " + getUpperBound() + " -> " + containsValue); + } + return containsValue; } 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-10-22 12:46:40 UTC (rev 707) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 2010-10-22 17:00:26 UTC (rev 708) @@ -795,7 +795,7 @@ GlobalSynthesisResultImpl result = new GlobalSynthesisResultImpl(); result.setIndicatorValues(indicatorValues); - result.setIndicators(indicators); + result.setGlobalSynthesisParameters(indicators); return result; } Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ) 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-10-22 12:46:40 UTC (rev 707) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java 2010-10-22 17:00:26 UTC (rev 708) @@ -139,7 +139,7 @@ public List<Indicator> getGlobalSynthesisParameters() { if (globalSynthesisParameters == null) { globalSynthesisParameters = - serviceSynthesis.getGlobalSynthesisParameters(); + getGlobalSynthesisResult().getGlobalSynthesisParameters(); } return globalSynthesisParameters; } @@ -148,8 +148,6 @@ public GlobalSynthesisResult getGlobalSynthesisResult() { if (globalSynthesisResult == null) { - PeriodDates period = PeriodDates.createMonthsPeriodFromToday(-12); - Company company = !user.isAdmin() ? user.getCompany() : null; globalSynthesisResult = serviceSynthesis.getGlobalSynthesisResult(getFilter()); } return globalSynthesisResult; @@ -165,6 +163,11 @@ return activeIndicator; } + public void setActiveIndicator(Indicator activeIndicator) { + this.activeIndicator = activeIndicator; + this.activeSynthesis = activeIndicator.getSynthesisId(); + } + public IndicatorLevel getActiveIndicatorLevel() { activeIndicatorLevel = getGlobalSynthesisResult().getLevelForIndicator(getActiveSynthesis()); return activeIndicatorLevel; @@ -175,7 +178,14 @@ case GRAPH_SAMPLING : initSamplingBlock(); break; case GRAPH_BOARDING : initBoardingBlock(); } - return resources.getBlock("ind" + getActiveSynthesis().ordinal()); + + Block activeBlock; + if (showGlobalSynthesis) { + activeBlock = resources.getBlock("globalSynthesis"); + } else { + activeBlock = resources.getBlock("ind" + getActiveSynthesis().ordinal()); + } + return activeBlock; } public String getActionSynthesisId() { @@ -186,6 +196,14 @@ return ChartType.class.getName(); } + private boolean showGlobalSynthesis; + + public String getActionShowGlobalSynthesis() { + showGlobalSynthesis = true; + return "globalSynthesis"; + } + + public NumberFormat getPercentFormat() { return NumberFormat.getPercentInstance(); } @@ -209,6 +227,8 @@ // Change chart type for dataSampling } else if (actionType.equals(ChartType.class.getName())) { dataSamplingChartType = ChartType.valueOf(actionValue); + } else if (actionType.equals("ShowGlobalSynthesis")) { + return "globalSynthesis"; } return this; } @@ -358,7 +378,6 @@ */ public Map<String, Double> getComplianceBoarding() throws WaoException { if (complianceBoarding == null) { - Company company = !user.isAdmin() ? user.getCompany() : null; complianceBoarding = serviceSynthesis.getComplianceBoardingIndicator(getFilter()); } @@ -405,7 +424,6 @@ public Collection<ContactStateStatistics> getContactStateStatistics() throws WaoException { if (contactStateStatistics == null) { - Company company = !user.isAdmin() ? user.getCompany() : null; contactStateStatistics = serviceSynthesis.getContactStateStatistics(getFilter()); } @@ -446,7 +464,6 @@ public Collection<ContactAverageReactivity> getAllegroReactivity() throws WaoException { if (allegroReactivity == null) { - Company company = !user.isAdmin() ? user.getCompany() : null; allegroReactivity = serviceSynthesis.getContactDataInputDateReactivity(getFilter()); } Modified: trunk/wao-ui/src/main/webapp/Synthesis.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Synthesis.tml 2010-10-22 12:46:40 UTC (rev 707) +++ trunk/wao-ui/src/main/webapp/Synthesis.tml 2010-10-22 17:00:26 UTC (rev 708) @@ -94,40 +94,46 @@ <ul> <li> <a t:type="actionlink" t:context="[actionSynthesisId,'GRAPH_SAMPLING']" t:zone="so-synthesis-main"> - <img src="${asset:context:}/img/synthesis-graph-sampling.png" alt="Diagramme en bâtons" + <img src="${asset:context:}/img/synthesis-graph-sampling.png" alt="Graphique des données des marées (réalisé / planifié)" title="Graphique des données des marées (réalisé / planifié)" /> </a> </li> <li> <a t:type="actionlink" t:context="[actionSynthesisId,'GRAPH_BOARDING']" t:zone="so-synthesis-main"> - <img src="${asset:context:}/img/synthesis-graph-boarding.png" alt="Diagramme en bâtons" + <img src="${asset:context:}/img/synthesis-graph-boarding.png" alt="Graphique des sollicitations des navires" title="Graphique des sollicitations des navires" /> </a> </li> <li> <a t:type="actionlink" t:context="[actionSynthesisId,'IND_COMPLIANCE_BOARDING']" t:zone="so-synthesis-main"> - <img src="${asset:context:}/img/synthesis-ind-non-compliance-boarding.png" alt="Indicateur" + <img src="${asset:context:}/img/synthesis-ind-non-compliance-boarding.png" alt="Indicateur de non respect du nombre d'observateurs embarqués" title="Indicateur de non respect du nombre d'observateurs embarqués" /> </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" + <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" + <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" /> </a> </li> <li> <a t:type="actionlink" t:context="[actionSynthesisId,'IND_DATA_RELIABILITY']" t:zone="so-synthesis-main"> - <img src="${asset:context:}/img/synthesis-ind-non-compliance-boarding.png" alt="Indicateur" + <img src="${asset:context:}/img/synthesis-ind-data-reliability.png" alt="Indicateur de la qualité des données" title="Indicateur de la qualité des données" /> </a> </li> + <li> + <a t:type="actionlink" t:context="[actionShowGlobalSynthesis,'']" t:zone="so-synthesis-main"> + <img src="${asset:context:}/img/synthesis-global-synthesis.png" alt="Synthèse globale des indicateurs" + title="Synthèse globale des indicateurs" /> + </a> + </li> </ul> </div> <div t:type="zone" t:id="delegator" class="fleft" t:update="show" id="so-synthesis-main"> @@ -310,7 +316,7 @@ </t:block>  <t:block t:id="ind5"> - <div class="ind-table acenter" id="so-noncomplianceboarding"> + <div class="ind-table acenter" id="so-datareliability"> <h2>Qualité de la donnée</h2> <br /> <t:if t:test="user.admin"> @@ -346,4 +352,17 @@ <t:indicatorLevels t:indicator="activeIndicator" t:highlightLevel="activeIndicatorLevel" /> </div> </t:block> +  + <t:block t:id="globalSynthesis"> + <div > + <h2>Synthèse globale</h2> + <br /> + + <t:loop t:source="globalSynthesisParameters" t:value="activeIndicator"> + <t:indicatorLevels t:indicator="activeIndicator" t:highlightLevel="activeIndicatorLevel" /> + </t:loop> + + BILAN + </div> + </t:block> </t:layout>

1 0

[Suiviobsmer-commits] r707 - trunk/wao-ui/src/main/webapp
by bleny＠users.labs.libre-entreprise.org Oct. 22, 2010

Oct. 22, 2010

Author: bleny Date: 2010-10-22 12:46:40 +0000 (Fri, 22 Oct 2010) New Revision: 707 Log: fix bad comment 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-10-22 12:45:49 UTC (rev 706) +++ trunk/wao-ui/src/main/webapp/Synthesis.tml 2010-10-22 12:46:40 UTC (rev 707) @@ -308,7 +308,7 @@ <t:indicatorLevels t:indicator="activeIndicator" t:highlightLevel="activeIndicatorLevel" /> </div> </t:block> -  +  <t:block t:id="ind5"> <div class="ind-table acenter" id="so-noncomplianceboarding"> <h2>Qualité de la donnée</h2>

1 0

[Suiviobsmer-commits] r706 - in trunk: wao-business/src/main/java/fr/ifremer/wao/service wao-business/src/main/xmi wao-business/src/test/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 Oct. 22, 2010

Oct. 22, 2010

Author: bleny Date: 2010-10-22 12:45:49 +0000 (Fri, 22 Oct 2010) New Revision: 706 Log: add data reliability indicator in service and UI Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java trunk/wao-business/src/main/xmi/wao.zargo trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSynthesisImplTest.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java trunk/wao-ui/src/main/webapp/Synthesis.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-10-22 10:36:47 UTC (rev 705) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 2010-10-22 12:45:49 UTC (rev 706) @@ -46,6 +46,7 @@ import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collection; import java.util.Date; import java.util.HashMap; @@ -515,6 +516,118 @@ } @Override + protected Map<String, Double> executeGetDataReliability + (TopiaContext transaction, SamplingFilter filter) throws Exception { + + + WaoQueryBuilder builder = context.newQueryBuilder(); + ContactProperty contactProperty = builder.initializeForContact(); + + WaoQueryHelper.CompanyProperty companyProperty = + contactProperty.observerProperty().companyProperty(); + + 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 (log.isDebugEnabled()) { + log.debug("query for data reliability is " + query); + } + + List<Object[]> queryResults = transaction.findByQuery(query); + + if (log.isDebugEnabled()) { + for (Object[] result : queryResults) { + log.debug("result for data reliability contains " + + Arrays.toString(result)); + } + } + + // example results : [IMA, 0, 12] + // [OCEANIC DEVELOPPEMENT, 0, 94] + // [IFREMER, 0, 53] + // [YLAHE, 0, 145] + // [COFREPECHE, 0, 227] + // first column is the name of the company + // second column is the ordinal for DataReliability level + // third column is the number of contacts with this level + + List<String> companies = new ArrayList<String>(); + + Map<String, Long> companyNumberOfReliableData = new HashMap<String, Long>(); + + // value is the sum of reliable, doubtful and non-reliable contacts + // in this sum, number of "unknown" must be ignored + Map<String, Long> companyNumberOfEvaluatedData = new HashMap<String, Long>(); + + for (Object[] row : queryResults) { + String rowCompanyName = (String) row[0]; + int rowDataReliabilityOrdinal = (Integer) row[1]; + Long rowCount = (Long) row[2]; + + DataReliability reliability = + DataReliability.valueOf(rowDataReliabilityOrdinal); + + companies.add(rowCompanyName); + + if (reliability == DataReliability.RELIABLE) { + companyNumberOfReliableData.put(rowCompanyName, rowCount); + } + + if (reliability != DataReliability.UNKNOWN) { + Long oldValue = companyNumberOfEvaluatedData.get(rowCompanyName); + if (oldValue == null) { + // it's a sum, so init to 0 + oldValue = 0L; + } + Long newValue = oldValue + rowCount; + companyNumberOfEvaluatedData.put(rowCompanyName, newValue); + } + } + + // now compute the results (take care of zeros) + Map<String, Double> results = new HashMap<String, Double>(); + + for (String companyName : companies) { + Long numberOfEvaluated = companyNumberOfReliableData.get(companyName); + + if (numberOfEvaluated == null) { + // we will not divide by 0 + + if (log.isTraceEnabled()) { + log.trace("company " + companyName + " has never been " + + "evaluated yet. It will not be included in results"); + } + + // company is considered trustful + results.put(companyName, 1.0); + } else { + Long numberOfReliable = companyNumberOfReliableData.get(companyName); + if (numberOfReliable == null) { + numberOfReliable = 0L; + } + + Double result = (double) numberOfReliable / (double) numberOfEvaluated; + results.put(companyName, result); + + if (log.isDebugEnabled()) { + log.debug("result for company " + companyName + " is " + result); + } + } + } + + return results; + + } + + @Override public Map<String, PieChartData> executeGetContactPieChartDataByBoatDistrict( TopiaContext transaction, ContactFilter filter) throws TopiaException { @@ -572,19 +685,8 @@ return results; } - @Override - protected Map<Company, Double> executeGetDataReliability - (TopiaContext transaction, SamplingFilter filter) throws Exception { + protected Double getIndicatorValueForDataSampling(SamplingFilter filter) { - log.debug("period " + filter.getPeriod()); - - return null; - - } - - protected Double getIndicatorValueForDataSampling - (TopiaContext transaction, SamplingFilter filter) { - List<SortedMap<Date, Integer>> res = getDataSampling(filter); int totalNumberOfRealized = 0; @@ -619,11 +721,8 @@ return percentRealized; } - protected Double getIndicatorValueForBoarding - (TopiaContext transaction, SamplingFilter filter) { - + protected Double getIndicatorValueForBoarding(SamplingFilter filter) { BoardingResult boardingResult = getBoardingBoats(filter); - int numberOfBoatWithOneBoarding = boardingResult.getData().get("1"); int totalNumberOfBoarding = 0; for (Integer numberOfBoarding : boardingResult.getData().values()) { @@ -634,8 +733,7 @@ return rate; } - protected Double getIndicatorValueForComplianceBoarding - (TopiaContext transaction, SamplingFilter filter) { + protected Double getIndicatorValueForComplianceBoarding(SamplingFilter filter) { Map<String, Double> complianceBoarding = getComplianceBoardingIndicator(filter); double total = 0.0; int numberOfCompanies = complianceBoarding.size(); @@ -646,8 +744,7 @@ return indicatorValue; } - protected Double getIndicatorValueForAllegroReactivity - (TopiaContext transaction, SamplingFilter filter) { + protected Double getIndicatorValueForAllegroReactivity(SamplingFilter filter) { Collection<ContactAverageReactivity> allegroReactivity = getContactDataInputDateReactivity(filter); @@ -661,6 +758,17 @@ return totalAverages; } + protected Double getIndicatorValueForDataReliability(SamplingFilter filter) { + Map<String, Double> dataReliability = getDataReliability(filter); + double total = 0.0; + int numberOfCompanies = dataReliability.size(); + for (Double reliabilityRate : dataReliability.values()) { + total += reliabilityRate; + } + double indicatorValue = 100 * (total / numberOfCompanies); + return indicatorValue; + } + @Override protected GlobalSynthesisResult executeGetGlobalSynthesisResult (TopiaContext transaction, SamplingFilter filter) throws Exception { @@ -668,20 +776,20 @@ Double value; Map<SynthesisId, Double> indicatorValues = new HashMap<SynthesisId, Double>(); - value = getIndicatorValueForDataSampling(transaction, filter); + value = getIndicatorValueForDataSampling(filter); indicatorValues.put(SynthesisId.GRAPH_SAMPLING, value); - value = getIndicatorValueForBoarding(transaction, filter); + value = getIndicatorValueForBoarding(filter); indicatorValues.put(SynthesisId.GRAPH_BOARDING, value); - value = getIndicatorValueForComplianceBoarding(transaction, filter); + value = getIndicatorValueForComplianceBoarding(filter); indicatorValues.put(SynthesisId.IND_COMPLIANCE_BOARDING, value); - value = getIndicatorValueForAllegroReactivity(transaction, filter); + value = getIndicatorValueForAllegroReactivity(filter); indicatorValues.put(SynthesisId.IND_ALLEGRO_REACTIVITY, value); - // add data reliability indicator here - + value = getIndicatorValueForDataReliability(filter); + indicatorValues.put(SynthesisId.IND_DATA_RELIABILITY, value); List<Indicator> indicators = executeGetGlobalSynthesisParameters(transaction); Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ) Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSynthesisImplTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSynthesisImplTest.java 2010-10-22 10:36:47 UTC (rev 705) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSynthesisImplTest.java 2010-10-22 12:45:49 UTC (rev 706) @@ -586,4 +586,10 @@ assertEquals(0, res.getResult(), 0.01); } + @Test + public void testGetDataReliability() throws Exception { + + + + } } 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-10-22 10:36:47 UTC (rev 705) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java 2010-10-22 12:45:49 UTC (rev 706) @@ -475,4 +475,23 @@ return ""; } + /********************* INDICATOR : DATA RELIABILITY ***********************/ + + private Map<String, Double> dataReliability; + + /* variable used in template */ + @Property + private Map.Entry<String, Double> dataReliabilityEntry; + + public Map<String, Double> getDataReliability() { + if (dataReliability == null) { + dataReliability = serviceSynthesis.getDataReliability(getFilter()); + } + return dataReliability; + } + + public Double getDataReliabilityValue() throws WaoException { + return getDataReliability().get(user.getCompany()); + } + } \ No newline at end of file Modified: trunk/wao-ui/src/main/webapp/Synthesis.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Synthesis.tml 2010-10-22 10:36:47 UTC (rev 705) +++ trunk/wao-ui/src/main/webapp/Synthesis.tml 2010-10-22 12:45:49 UTC (rev 706) @@ -122,6 +122,12 @@ title="Indicateur de réactivité sur la saisie des données dans Allegro" /> </a> </li> + <li> + <a t:type="actionlink" t:context="[actionSynthesisId,'IND_DATA_RELIABILITY']" t:zone="so-synthesis-main"> + <img src="${asset:context:}/img/synthesis-ind-non-compliance-boarding.png" alt="Indicateur" + title="Indicateur de la qualité des données" /> + </a> + </li> </ul> </div> <div t:type="zone" t:id="delegator" class="fleft" t:update="show" id="so-synthesis-main"> @@ -302,4 +308,42 @@ <t:indicatorLevels t:indicator="activeIndicator" t:highlightLevel="activeIndicatorLevel" /> </div> </t:block> +  + <t:block t:id="ind5"> + <div class="ind-table acenter" id="so-noncomplianceboarding"> + <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> + +  + <br /> + <t:indicatorLevels t:indicator="activeIndicator" t:highlightLevel="activeIndicatorLevel" /> + </div> + </t:block> </t:layout>

1 0

[Suiviobsmer-commits] r705 - trunk
by bleny＠users.labs.libre-entreprise.org Oct. 22, 2010

Oct. 22, 2010

Author: bleny Date: 2010-10-22 10:36:47 +0000 (Fri, 22 Oct 2010) New Revision: 705 Log: update POM ; +bleny as developer Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-10-22 10:35:35 UTC (rev 704) +++ trunk/pom.xml 2010-10-22 10:36:47 UTC (rev 705) @@ -272,6 +272,17 @@ <role>Développeur</role> </roles> </developer> + <developer> + <name>Brendan Le Ny</name> + <id>bleny</id> + <email>bleny at codelutin.com</email> + <organization>CodeLutin</organization> + <organizationUrl>http://www.codelutin.com</organizationUrl> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> </developers> <url>http://suiviobsmer.labs.libre-entreprise.org/suiviobsmer</url>

1 0

[Suiviobsmer-commits] r704 - trunk/wao-business/src/test/java/fr/ifremer/wao/service
by bleny＠users.labs.libre-entreprise.org Oct. 22, 2010

Oct. 22, 2010

Author: bleny Date: 2010-10-22 10:35:35 +0000 (Fri, 22 Oct 2010) New Revision: 704 Log: fix tests ; should make build stable Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSynthesisImplTest.java Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSynthesisImplTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSynthesisImplTest.java 2010-10-22 09:31:53 UTC (rev 703) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSynthesisImplTest.java 2010-10-22 10:35:35 UTC (rev 704) @@ -30,6 +30,8 @@ import fr.ifremer.wao.bean.ContactAverageReactivity; import fr.ifremer.wao.bean.ContactState; import fr.ifremer.wao.bean.ContactStateStatistics; +import fr.ifremer.wao.bean.SamplingFilter; +import fr.ifremer.wao.bean.SamplingFilterImpl; import fr.ifremer.wao.entity.Boat; import fr.ifremer.wao.entity.Company; import fr.ifremer.wao.entity.CompanyDAO; @@ -181,7 +183,8 @@ serviceContact.saveContact(contact3, false); /** EXEC METHOD **/ - BoardingResult result = service.getBoardingBoats(null, null); + SamplingFilter filter = new SamplingFilterImpl(); + BoardingResult result = service.getBoardingBoats(filter); // one boat with one boarding (177474) assertEquals(1, result.getData().get("1").intValue()); // one boat with two boardings (174258) @@ -278,8 +281,10 @@ /** EXEC METHOD **/ // result for company TARTANPION + SamplingFilter filter = new SamplingFilterImpl(); + filter.setCompany(company); Map<String, Double> results = - service.getComplianceBoardingIndicator(company); + service.getComplianceBoardingIndicator(filter); assertEquals(1, results.size()); @@ -288,7 +293,8 @@ assertEquals(1., value, 0); // result for company BIS using admin mode (no company filtered) - results = service.getComplianceBoardingIndicator(null); + filter = new SamplingFilterImpl(); + results = service.getComplianceBoardingIndicator(filter); assertEquals(2, results.size()); @@ -414,8 +420,10 @@ /** EXEC METHOD **/ // result for company TARTANPION with no period + SamplingFilter filter = new SamplingFilterImpl(); + filter.setCompany(company); Collection<ContactStateStatistics> results = - service.getContactStateStatistics(company, null); + service.getContactStateStatistics(filter); assertEquals(1, results.size()); ContactStateStatistics result = (ContactStateStatistics)CollectionUtils.get(results, 0); @@ -428,7 +436,8 @@ assertEquals(1, data.get(ContactState.BOAT_REFUSED).intValue()); // result for company BIS using admin mode - results = service.getContactStateStatistics(null, null); + filter = new SamplingFilterImpl(); + results = service.getContactStateStatistics(filter); assertEquals(2, results.size()); result = null; @@ -449,7 +458,10 @@ Date end = DateUtil.createDate(31, 3, 2010); PeriodDates period = new PeriodDates(begin, end); - results = service.getContactStateStatistics(company2, period); + filter = new SamplingFilterImpl(); + filter.setCompany(company2); + filter.setPeriod(period); + results = service.getContactStateStatistics(filter); assertEquals(1, results.size()); result = (ContactStateStatistics)CollectionUtils.get(results, 0); @@ -460,7 +472,7 @@ assertEquals(0, data.get(ContactState.BOAT_UNAVAILABLE).intValue()); } - /** + /** * Test of getBoardingBoats method, of class ServiceSynthesisImpl. */ @Test @@ -547,10 +559,13 @@ /** EXEC METHOD **/ PeriodDates period = new PeriodDates(begin, begin); + SamplingFilter filter = new SamplingFilterImpl(); + filter.setCompany(company); + filter.setPeriod(period); // result for company TARTANPION Collection<ContactAverageReactivity> results = - service.getContactDataInputDateReactivity(company, period); + service.getContactDataInputDateReactivity(filter); assertEquals(1, results.size()); @@ -561,7 +576,9 @@ assertEquals(27., res.getResult(), 0.01); // result for company BIS using admin mode (no company filtered) - results = service.getContactDataInputDateReactivity(null, period); + filter = new SamplingFilterImpl(); + filter.setPeriod(period); + results = service.getContactDataInputDateReactivity(filter); // 0 days for contact3 / 1 = O days res = (ContactAverageReactivity)CollectionUtils.get(results, 0);

1 0