Author: bleny Date: 2014-06-23 22:00:40 +0200 (Mon, 23 Jun 2014) New Revision: 2091 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2091 Log: fixes #5113 fixes #5256 remove filterOnObservationBeginDate from synthesis Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SynthesisService.java trunk/wao-web/src/main/webapp/WEB-INF/content/synthesis.jsp Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SynthesisService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SynthesisService.java 2014-06-23 19:47:33 UTC (rev 2090) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SynthesisService.java 2014-06-23 20:00:40 UTC (rev 2091) @@ -1,5 +1,6 @@ package fr.ifremer.wao.services.service; +import com.google.common.base.Preconditions; import com.google.common.cache.Cache; import com.google.common.collect.Multimap; import fr.ifremer.wao.ContactsFilter; @@ -37,6 +38,7 @@ import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.Set; import java.util.SortedMap; import java.util.TreeMap; @@ -62,24 +64,26 @@ if (synthesis == null) { + ContactTopiaDao dao = getContactDao(); + synthesis = new Synthesis(); - List<String> sampleRowsIds = getContactDao().getSampleRowsIds(filter); + Set<String> sampleRowIds = new HashSet<>(); - synthesis.setSampleRowIds(new HashSet<>(sampleRowsIds)); - + filter.setFilterOnObservationBeginDate(true); setExpectedVsActualObservationsByMonthsBarChartData(synthesis, filter); - setBoardingBoatsData(synthesis, filter); - setComplianceBoardingIndicator(synthesis, filter); + setDataInputDateReactivity(synthesis, filter); + setDataReliability(synthesis, filter); + sampleRowIds.addAll(dao.getSampleRowsIds(filter)); + filter.setFilterOnObservationBeginDate(false); setContactStatesStatistics(synthesis, filter); + sampleRowIds.addAll(dao.getSampleRowsIds(filter)); - setDataInputDateReactivity(synthesis, filter); + synthesis.setSampleRowIds(sampleRowIds); - setDataReliability(synthesis, filter); - for (CompanySynthesis companySynthesis : synthesis.getCompanySyntheses().values()) { String companyId = companySynthesis.getCompanyId(); Company company = getCompanyDao().findByTopiaId(companyId); @@ -96,6 +100,8 @@ protected void setDataReliability(Synthesis synthesis, ContactsFilter filter) { + Preconditions.checkArgument(filter.isFilterOnObservationBeginDate()); + ContactTopiaDao dao = getContactDao(); Map<String, Long> reliableObservationsCount = dao.getReliableObservationsCount(filter); @@ -110,6 +116,8 @@ protected void setDataInputDateReactivity(Synthesis synthesis, ContactsFilter filter) { + Preconditions.checkArgument(filter.isFilterOnObservationBeginDate()); + ContactTopiaDao dao = getContactDao(); Multimap<String, Pair<Date, Date>> contactsDoneObservationBeginDateAndDateInputDate @@ -140,6 +148,8 @@ protected void setContactStatesStatistics(Synthesis synthesis, ContactsFilter filter) { + Preconditions.checkArgument( ! filter.isFilterOnObservationBeginDate()); + ContactTopiaDao dao = getContactDao(); Map<String, Long> contactsCountsByCompany = dao.countByCompany(filter); @@ -157,6 +167,8 @@ protected void setComplianceBoardingIndicator(Synthesis synthesis, ContactsFilter filter) { + Preconditions.checkArgument(filter.isFilterOnObservationBeginDate()); + ContactTopiaDao dao = getContactDao(); Map<String, Double> complianceBoardingIndicator = dao.getComplianceBoardingIndicator(filter); @@ -174,6 +186,8 @@ */ protected void setExpectedVsActualObservationsByMonthsBarChartData(Synthesis synthesis, ContactsFilter filter) { + Preconditions.checkArgument(filter.isFilterOnObservationBeginDate()); + Locale locale = serviceContext.getLocale(); // définition de la fenêtre @@ -244,6 +258,8 @@ */ protected void setBoardingBoatsData(Synthesis synthesis, ContactsFilter filter) { + Preconditions.checkArgument(filter.isFilterOnObservationBeginDate()); + Locale locale = serviceContext.getLocale(); ContactTopiaDao dao = getContactDao(); Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/synthesis.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/synthesis.jsp 2014-06-23 19:47:33 UTC (rev 2090) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/synthesis.jsp 2014-06-23 20:00:40 UTC (rev 2091) @@ -142,11 +142,6 @@ placeholder="%{getFilterPeriodToPlaceholder()}" cssClass="input-small"/> - <div title="<s:text name="wao.ui.form.filterOnObservationBeginDate.tooltip"/>"> - <s:checkbox name="filter.filterOnObservationBeginDate" - label="%{getText('wao.ui.form.filterOnObservationBeginDate')}"/> - </div> - </fieldset> <fieldset class="extra-filters">