Author: bleny Date: 2010-11-04 20:22:38 +0000 (Thu, 04 Nov 2010) New Revision: 738 Log: make company field value kept between submission in synthesis filter Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java 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-11-04 20:21:42 UTC (rev 737) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java 2010-11-04 20:22:38 UTC (rev 738) @@ -117,9 +117,11 @@ private Zone delegator; void setupRender() { - // The company of connected user will be contributed to abstractFilteredPage - initCompanyFilter(); + // make filters keep company between submissions + initSelectFilters(true, false, true); + // add a special CSS to make global synthesis page printable without + // menu, filters, etc. renderSupport.addStylesheetLink("css/synthesis-print.css", "print"); } @@ -171,10 +173,6 @@ } public Block getActiveBlock() throws WaoException { - switch (getActiveSynthesis()) { - case GRAPH_SAMPLING : initSamplingBlock(); break; - case GRAPH_BOARDING : initBoardingBlock(); - } Block activeBlock; if (BooleanUtils.isTrue(showGlobalSynthesis)) { @@ -299,11 +297,7 @@ private boolean reset; - private void initSamplingBlock() throws WaoException { - initSelectFilters(true, false, true); - } - - public JFreeChart getDataSamplingChart() throws WaoException { + public JFreeChart getDataSamplingChart() throws WaoException { List<SortedMap<Date, Integer>> res = serviceSynthesis.getDataSampling(getFilter()); Map<String, Map<?, Integer>> data = new HashMap<String, Map<?, Integer>>(); data.put("Planifié", res.get(0)); @@ -329,25 +323,6 @@ private BoardingResult boardingResult; - @Persist - private Company companyForBoarding; - - @Property - private String companyIdForBoarding; - - private void initBoardingBlock() throws WaoException { - resetCompanySelect(); - // Set the companyIdForBoarding is only necessary for an admin which - // have access to a select with all active companies (from Filters : - // getCompanySelectModel()) - if (companyForBoarding != null && user.isAdmin()) { - companyIdForBoarding = companyForBoarding.getTopiaId(); - if (log.isDebugEnabled()) { - log.debug("companyId init : " + companyIdForBoarding); - } - } - } - public JFreeChart getBoardingBoatsChart() throws WaoException { Map<String, Map<?, Integer>> data = new HashMap<String, Map<?, Integer>>(); @@ -356,6 +331,7 @@ String title = "Sollicitations des navires depuis le " + getDateFormat().format(getFilter().getPeriod().getFromDate()); + Company companyForBoarding = getFilter().getCompany(); if (companyForBoarding != null) { title += "\nSociété " + companyForBoarding.getName(); }