Author: fdesbois Date: 2010-04-19 22:24:09 +0000 (Mon, 19 Apr 2010) New Revision: 459 Log: Evo #2100 : View modification to display estimatedTides (in samplingFilter) Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/FacadeRowImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.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/SamplingPlan.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Synthesis.properties trunk/wao-ui/src/main/webapp/SamplingPlan.tml trunk/wao-ui/src/main/webapp/Synthesis.tml Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/FacadeRowImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/FacadeRowImpl.java 2010-04-19 21:56:02 UTC (rev 458) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/FacadeRowImpl.java 2010-04-19 22:24:09 UTC (rev 459) @@ -69,7 +69,7 @@ } // Prepare data by month : calculate tides (real/expected) and remove // unused months for period - row.prepareDataByMonth(period); + row.prepareDataByMonth(period, estimatedTides); // Add the row to the list rows.add(row); } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java 2010-04-19 21:56:02 UTC (rev 458) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java 2010-04-19 22:24:09 UTC (rev 459) @@ -120,7 +120,7 @@ } @Override - public void prepareDataByMonth(PeriodDates period) { + public void prepareDataByMonth(PeriodDates period, boolean estimated) { // Do not call this method outside a TopiaContext, will not work // because of lazy initialization over sampleMonth. Also this // calcul need to be done when data for sampleRows is loading. @@ -133,7 +133,8 @@ SampleMonth curr = it.next(); if (period == null || period.between(curr.getPeriodDate())) { totalTidesExpected += curr.getExpectedTidesValue(); - totalTidesReal += curr.getRealTidesValue(); + totalTidesReal += estimated ? curr.getEstimatedTidesValue() : + curr.getRealTidesValue(); String date = monthFormat.format(curr.getPeriodDate()); sampleMonthMap.put(date, curr); } else { Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2010-04-19 21:56:02 UTC (rev 458) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2010-04-19 22:24:09 UTC (rev 459) @@ -277,6 +277,7 @@ SamplingFilter filter, Company company) throws TopiaException { FacadeRow result = new FacadeRowImpl(); + result.setEstimatedTides(filter.getEstimatedTides()); result.setPeriod(filter.getPeriod()); SampleRowDAO dao = WaoDAOHelper.getSampleRowDAO(transaction); 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-04-19 21:56:02 UTC (rev 458) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 2010-04-19 22:24:09 UTC (rev 459) @@ -131,9 +131,11 @@ SampleMonthDAO dao = WaoDAOHelper.getSampleMonthDAO(transaction); String periodDate = "M." + SampleMonth.PERIOD_DATE; + String realTidesProperty = filter.getEstimatedTides() ? + SampleMonth.ESTIMATED_TIDES_VALUE : SampleMonth.REAL_TIDES_VALUE; TopiaQuery query = dao.createQuery("M"). setSelect(periodDate). - addSelect("SUM(M." + SampleMonth.REAL_TIDES_VALUE + ")"). + addSelect("SUM(M." + realTidesProperty + ")"). addSelect("SUM(M." + SampleMonth.EXPECTED_TIDES_VALUE + ")"). add(periodDate + " BETWEEN :fromDate AND :thruDate"). addParam("fromDate", period.getFromDate()). Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ) Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java 2010-04-19 21:56:02 UTC (rev 458) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java 2010-04-19 22:24:09 UTC (rev 459) @@ -391,7 +391,9 @@ Integer result = null; SampleMonth sampleMonth = row.getSampleMonth(month); if (sampleMonth != null) { - result = sampleMonth.getRealTidesValue(); + result = getFilter().getEstimatedTides() ? + sampleMonth.getEstimatedTidesValue() : + sampleMonth.getRealTidesValue(); } return result; } 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-04-19 21:56:02 UTC (rev 458) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java 2010-04-19 22:24:09 UTC (rev 459) @@ -202,7 +202,9 @@ List<SortedMap<Date, Integer>> res = serviceSynthesis.getDataSampling(getFilter()); Map<String, Map<?, Integer>> data = new HashMap<String, Map<?, Integer>>(); data.put("Planifié", res.get(0)); - data.put("Réalisé", res.get(1)); + String realText = + getFilter().getEstimatedTides() ? "Estimé" : "Réalisé"; + data.put(realText, res.get(1)); String title = BusinessUtils.getDataSamplingTitle(getFilter()); return ChartUtils.createCategoryChart(title, "Nb marées", "Mois", getDataSamplingChartType(), data); } Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Synthesis.properties =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Synthesis.properties 2010-04-19 21:56:02 UTC (rev 458) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Synthesis.properties 2010-04-19 22:24:09 UTC (rev 459) @@ -35,6 +35,7 @@ sampleRow-label: Code ligne company-label: Soci\u00E9t\u00E9 programName-label: Programme +estimatedTides-label: Voir l'effort d'observations estim\u00E9 companyForBoarding-label: Soci\u00E9t\u00E9 Modified: trunk/wao-ui/src/main/webapp/SamplingPlan.tml =================================================================== --- trunk/wao-ui/src/main/webapp/SamplingPlan.tml 2010-04-19 21:56:02 UTC (rev 458) +++ trunk/wao-ui/src/main/webapp/SamplingPlan.tml 2010-04-19 22:24:09 UTC (rev 459) @@ -60,8 +60,8 @@ <img src="${asset:context:img/true-22px.png}" alt="Effort d'observations réalisé pour contacts validés" title="Afficher l'effort d'observations réalisé pour les contacts validés seulement" /> <p:else> - <img src="${asset:context:img/help-22px.png}" alt="Effort d'observations réalisé pour contacts terminés" - title="Afficher l'effort d'observations réalisé pour les contacts validés + celui estimé pour les contacts non validés" /> + <img src="${asset:context:img/help-22px.png}" alt="Effort d'observations estimé pour contacts terminés" + title="Afficher l'effort d'observations estimé pour les contacts validés ou non par la société" /> </p:else> </t:if> </a> Modified: trunk/wao-ui/src/main/webapp/Synthesis.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Synthesis.tml 2010-04-19 21:56:02 UTC (rev 458) +++ trunk/wao-ui/src/main/webapp/Synthesis.tml 2010-04-19 22:24:09 UTC (rev 459) @@ -113,9 +113,14 @@ title="Rafraîchir les métiers en fonction de la zone sélectionnée"/>  <t:label t:for="sampleRow" />: <input t:type="select" t:id="sampleRow" t:model="sampleRowSelectModel" value="sampleRowId" /> + <!--<t:label t:for="program" />: <input t:type="select" t:id="program" t:model="programSelectModel" value="programId" />--> </div> + <div class="filterRow"> + <input t:type="checkbox" t:id="estimatedTides" value="filter.estimatedTides" /> + <t:label t:for="estimatedTides" title="L'effort d'observations estimé équivaut au nombre de contacts validés ou non par la société. Les contacts refusés par le programme ne sont pas pris en compte" /> + </div> <div class="t-beaneditor-row aright"> <input t:type="submit" class="ico search-32px" t:id="search" value="Search" title="Création du graphique en fonction des filtres saisies"/>  <input t:type="submit" class="ico undo" t:id="reset" value="Reset" title="Remettre les filtres par défaut" />