Author: fdesbois Date: 2010-06-07 19:02:26 +0000 (Mon, 07 Jun 2010) New Revision: 493 Log: Use filter for exportSamplingPlan Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactFilterImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java trunk/wao-business/src/main/xmi/wao.zargo trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactFilterImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactFilterImpl.java 2010-06-07 18:36:10 UTC (rev 492) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactFilterImpl.java 2010-06-07 19:02:26 UTC (rev 493) @@ -54,6 +54,9 @@ // Company filter is managed by SamplingFilter because the company is // linked with the sampleRow instead of contact user + + + // FIXME-fdesbois-2010-06-07 ANO #2327 : problem on filtering fromDate for contacts : need to be filtered on topiaCreateDate of Contact if (isSamplingFiltered() || getFromDate() != null || getCompany() != null) { String sampleRowProperty = TopiaQuery.getProperty(contact, Contact.SAMPLE_ROW); 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-06-07 18:36:10 UTC (rev 492) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2010-06-07 19:02:26 UTC (rev 493) @@ -561,14 +561,14 @@ @Override public InputStream executeExportSamplingPlanCsv(TopiaContext transaction, - List<Object> errorArgs, WaoUser user, PeriodDates period) + List<Object> errorArgs, WaoUser user, SamplingFilter filter) throws Exception { CsvWriter writer = null; try { DateFormat dateFormat = SAMPLING.getDateFormat(); - errorArgs.add(dateFormat.format(period.getFromDate())); - errorArgs.add(dateFormat.format(period.getThruDate())); +// errorArgs.add(dateFormat.format(period.getFromDate())); +// errorArgs.add(dateFormat.format(period.getThruDate())); File file = File.createTempFile("wao-samplingPlan-", ".csv"); file.deleteOnExit(); @@ -581,6 +581,8 @@ // Date max = (Date)query.executeToObject("MAX(S." + SampleRow.PERIOD_END + ")"); // PeriodDates periodMax = new PeriodDates(min, max); + + PeriodDates period = filter.getPeriod(); period.setPattern(SAMPLING.defaultDatePattern()); List<String> monthHeaders = period.getFormatedMonths(); @@ -592,19 +594,24 @@ // Get sampleRows from database filtered by company if needed // (only for user) and period SampleRowDAO dao = WaoDAOHelper.getSampleRowDAO(transaction); - TopiaQuery query = dao.createQuery("S"); + String sampleRowAlias = "S"; + String sampleRowCodeProperty = + TopiaQuery.getProperty(sampleRowAlias, SampleRow.CODE); + TopiaQuery query = dao.createQuery(sampleRowAlias); - // Evo #2227 : No filter on company for GUEST users, all samplingPlan can be exported - if (!user.isAdmin() && !user.isGuest()) { - query.add("S." + SampleRow.COMPANY, user.getCompany()); - } +// // Evo #2227 : No filter on company for GUEST users, all samplingPlan can be exported +// if (!user.isAdmin() && !user.isGuest()) { +// query.add("S." + SampleRow.COMPANY, user.getCompany()); +// } +// +// // Prepare period dates +// period.initDayOfMonthExtremities(); +// query.add("S." + SampleRow.PERIOD_BEGIN, Op.LT, period.getThruDate()). +// add("S." + SampleRow.PERIOD_END, Op.GT, period.getFromDate()); - // Prepare period dates - period.initDayOfMonthExtremities(); - query.add("S." + SampleRow.PERIOD_BEGIN, Op.LT, period.getThruDate()). - add("S." + SampleRow.PERIOD_END, Op.GT, period.getFromDate()); + filter.prepareQueryForSampling(query, sampleRowAlias); - query.addOrder("S." + SampleRow.CODE); + query.addOrder(sampleRowCodeProperty); List<SampleRow> rows = dao.findAllByQuery(query); 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-06-07 18:36:10 UTC (rev 492) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java 2010-06-07 19:02:26 UTC (rev 493) @@ -153,7 +153,7 @@ InputStream result = null; try { result = serviceSampling.exportSamplingPlanCsv( - user, getPeriod()); + user, getFilter()); } catch (WaoException eee) { throw new IOException(eee); }