Author: fdesbois Date: 2010-01-07 11:15:49 +0000 (Thu, 07 Jan 2010) New Revision: 175 Modified: trunk/pom.xml trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceContactImpl.java trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceSamplingImpl.java trunk/suiviobsmer-ui/src/main/webapp/img/fishing-net-22px.png Log: - Use last topia SNAPSHOT - Uncomment query for sampleRows Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-07 10:40:03 UTC (rev 174) +++ trunk/pom.xml 2010-01-07 11:15:49 UTC (rev 175) @@ -239,7 +239,7 @@ <!-- libraries version --> <nuitonutils.version>1.1.2</nuitonutils.version> - <topia.version>2.3.0-beta-3</topia.version> + <topia.version>2.3.0-beta-4-SNAPSHOT</topia.version> <license.version>2.0.0</license.version> <helper.version>1.1.0</helper.version> <eugene.version>2.0.0-beta-2</eugene.version> Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceContactImpl.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceContactImpl.java 2010-01-07 10:40:03 UTC (rev 174) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceContactImpl.java 2010-01-07 11:15:49 UTC (rev 175) @@ -157,8 +157,8 @@ query.addLoad("user.company", "sampleRow.program", "sampleRow.profession", "sampleRow.company"); - if (log.isInfoEnabled()) { - log.info("Query : " + query); + if (log.isDebugEnabled()) { + log.debug("Query : " + query); } results = query.executeToEntityMap(); Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceSamplingImpl.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceSamplingImpl.java 2010-01-07 10:40:03 UTC (rev 174) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceSamplingImpl.java 2010-01-07 11:15:49 UTC (rev 175) @@ -179,54 +179,32 @@ } transaction = rootContext.beginTransaction(); - // uncomment the query for Topia 2.3.0-beta-4 (manage order and multiple select results, need addSelect method) + SampleRowDAO dao = SuiviObsmerModelDAOHelper.getSampleRowDAO(transaction); -// SampleRowDAO dao = SuiviObsmerModelDAOHelper.getSampleRowDAO(transaction); -// -// TopiaQuery<SampleRow> query = dao.createQuery("S").addDistinct(). -// addFrom(FishingZone.class.getName() + " F").add("S IN elements(F.sampleRow)"); -// -// if (company != null) { -// query.add("S.company", company); -// } -// -// // Prepare period dates -// periodBegin = DateUtils.setFirstDayOfMonth(periodBegin); -// periodEnd = DateUtils.setLastDayOfMonth(periodEnd); -// query.add("S.program.periodBegin", Op.LT, periodEnd).add("S.program.periodEnd", Op.GT, periodBegin); -// -// String zoneOrder = "F.facadeName, F.sectorName, F.districtCode"; -// query.addOrder(zoneOrder).addOrder("S.code").addSelect(zoneOrder); -// -// query.addLoad(SampleRow.PROFESSION, SampleRow.PROGRAM, SampleRow.COMPANY); -// results = query.executeToEntityList(); + TopiaQuery<SampleRow> query = dao.createQuery("S").addDistinct(). + addFrom(FishingZone.class.getName() + " F").add("S IN elements(F.sampleRow)"); - FishingZoneDAO zoneDAO = SuiviObsmerModelDAOHelper.getFishingZoneDAO(transaction); - List<FishingZone> list = zoneDAO.findAllWithOrder( - FishingZone.FACADE_NAME, - FishingZone.SECTOR_NAME, - FishingZone.DISTRICT_CODE); + if (company != null) { + query.add("S.company", company); + } - for (FishingZone zone : list) { - if (log.isTraceEnabled()) { - log.trace("Zone : " + zone); - } - for (SampleRow row : zone.getSampleRow()) { - if (!results.contains(row)) { - Company rowCompany = row.getCompany(); - Program rowProgram = row.getProgram(); - if (rowProgram.isValid(periodBegin, periodEnd) && (company == null || company.equals(rowCompany))) { - if (log.isTraceEnabled()) { - log.trace("Code : " + row.getCode()); - } - // load data - row.getProfession(); - results.add(row); - } - } - } + // Prepare period dates + periodBegin = DateUtils.setFirstDayOfMonth(periodBegin); + periodEnd = DateUtils.setLastDayOfMonth(periodEnd); + query.add("S.program.periodBegin", Op.LT, periodEnd).add("S.program.periodEnd", Op.GT, periodBegin); + + // Order By facade, sector, districtCode, sampleRowCode + String zoneOrder = "F.facadeName, F.sectorName, F.districtCode"; + query.addOrder(zoneOrder).addOrder("S.code").addSelect(zoneOrder); + // Load data + query.addLoad(SampleRow.PROFESSION, SampleRow.PROGRAM, SampleRow.COMPANY); + + if (log.isDebugEnabled()) { + log.debug("Query : " + query); } + results = query.executeToEntityList(); + transaction.closeContext(); } catch (Exception eee) { SuiviObsmerContext.serviceException(transaction, Modified: trunk/suiviobsmer-ui/src/main/webapp/img/fishing-net-22px.png =================================================================== (Binary files differ)