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> <!-- IND5 : DATA_RELIABILITY --> <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> + <!-- GLOBAL SYNTHESIS --> + <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>