- Wao-commits - mailman.cloud.codelutin.com

r1579 - trunk/wao-business
by bleny＠users.forge.codelutin.com 27 Mar '12

27 Mar '12

Author: bleny Date: 2012-03-27 11:12:09 +0200 (Tue, 27 Mar 2012) New Revision: 1579 Url: http://forge.codelutin.com/repositories/revision/wao/1579 Log: suite ?\195?\160 la t?\195?\162che #768 (Supprimer tout ce qui concerne les calendriers d'activit?\195?\169), la d?\195?\169pendance vers log4j est de trop Modified: trunk/wao-business/pom.xml Modified: trunk/wao-business/pom.xml =================================================================== --- trunk/wao-business/pom.xml 2012-03-27 08:49:37 UTC (rev 1578) +++ trunk/wao-business/pom.xml 2012-03-27 09:12:09 UTC (rev 1579) @@ -64,10 +64,6 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </dependency>  <dependency> <groupId>ical4j</groupId>

1 0

r1578 - trunk/wao-business/src/test/java/fr/ifremer/wao/service
by bleny＠users.forge.codelutin.com 27 Mar '12

27 Mar '12

Author: bleny Date: 2012-03-27 10:49:37 +0200 (Tue, 27 Mar 2012) New Revision: 1578 Url: http://forge.codelutin.com/repositories/revision/wao/1578 Log: suppression du couplage vers javacsv (nuiton-csv doit cache tout ?\195?\167a) Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactImplTest.java Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactImplTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactImplTest.java 2012-03-27 08:27:48 UTC (rev 1577) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactImplTest.java 2012-03-27 08:49:37 UTC (rev 1578) @@ -21,7 +21,6 @@ package fr.ifremer.wao.service; -import com.csvreader.CsvReader; import fr.ifremer.wao.WaoBusinessException; import fr.ifremer.wao.WaoDAOHelper; import fr.ifremer.wao.bean.ConnectedUser; @@ -103,8 +102,6 @@ protected Contact contactReference; @Mock protected ConnectedUser creator; - @Mock - protected CsvReader reader; protected void prepareData(boolean needBoat, boolean needObserver) throws TopiaException {

1 0

r1577 - in trunk/wao-business/src: main/java/fr/ifremer/wao/bean main/java/fr/ifremer/wao/entity main/java/fr/ifremer/wao/io/csv2/models main/java/fr/ifremer/wao/io/csv2/models/operations test/java/fr/ifremer/wao test/java/fr/ifremer/wao/io/csv2/models
by bleny＠users.forge.codelutin.com 27 Mar '12

27 Mar '12

Author: bleny Date: 2012-03-27 10:27:48 +0200 (Tue, 27 Mar 2012) New Revision: 1577 Url: http://forge.codelutin.com/repositories/revision/wao/1577 Log: ajout des ent?\195?\170tes de licence Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/WaoFilterImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/BoatDAOImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ObservedDataControl.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowDAOImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ShipOwnerDAOImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/TerrestrialDivisionDAOImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/ObsMerObsVenteSamplingPlanImportExportModel.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/DCF5CodesParserFormatter.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/FishingZonesParserFormatter.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/ObservedDataControlParserFormatter.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/SampleRowCodeParserFormatter.java trunk/wao-business/src/test/java/fr/ifremer/wao/WaoUtilsTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/io/csv2/models/ObsMerObsVenteSamplingPlanImportExportModelTest.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/WaoFilterImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/WaoFilterImpl.java 2012-03-26 13:11:38 UTC (rev 1576) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/WaoFilterImpl.java 2012-03-27 08:27:48 UTC (rev 1577) @@ -1,3 +1,26 @@ +/* + * #%L + * Wao :: Business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ package fr.ifremer.wao.bean; public abstract class WaoFilterImpl extends WaoFilter { Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/BoatDAOImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/BoatDAOImpl.java 2012-03-26 13:11:38 UTC (rev 1576) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/BoatDAOImpl.java 2012-03-27 08:27:48 UTC (rev 1577) @@ -1,3 +1,26 @@ +/* + * #%L + * Wao :: Business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ package fr.ifremer.wao.entity; import fr.ifremer.wao.WaoDAOHelper; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ObservedDataControl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ObservedDataControl.java 2012-03-26 13:11:38 UTC (rev 1576) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ObservedDataControl.java 2012-03-27 08:27:48 UTC (rev 1577) @@ -1,3 +1,26 @@ +/* + * #%L + * Wao :: Business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ package fr.ifremer.wao.entity; import fr.ifremer.wao.WaoUtils; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowDAOImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowDAOImpl.java 2012-03-26 13:11:38 UTC (rev 1576) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowDAOImpl.java 2012-03-27 08:27:48 UTC (rev 1577) @@ -1,3 +1,26 @@ +/* + * #%L + * Wao :: Business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ package fr.ifremer.wao.entity; import fr.ifremer.wao.WaoQueryHelper; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ShipOwnerDAOImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ShipOwnerDAOImpl.java 2012-03-26 13:11:38 UTC (rev 1576) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ShipOwnerDAOImpl.java 2012-03-27 08:27:48 UTC (rev 1577) @@ -1,3 +1,26 @@ +/* + * #%L + * Wao :: Business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ package fr.ifremer.wao.entity; import fr.ifremer.wao.WaoQueryHelper; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/TerrestrialDivisionDAOImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/TerrestrialDivisionDAOImpl.java 2012-03-26 13:11:38 UTC (rev 1576) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/TerrestrialDivisionDAOImpl.java 2012-03-27 08:27:48 UTC (rev 1577) @@ -1,3 +1,26 @@ +/* + * #%L + * Wao :: Business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ package fr.ifremer.wao.entity; import org.nuiton.topia.TopiaException; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/ObsMerObsVenteSamplingPlanImportExportModel.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/ObsMerObsVenteSamplingPlanImportExportModel.java 2012-03-26 13:11:38 UTC (rev 1576) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/ObsMerObsVenteSamplingPlanImportExportModel.java 2012-03-27 08:27:48 UTC (rev 1577) @@ -1,3 +1,26 @@ +/* + * #%L + * Wao :: Business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ package fr.ifremer.wao.io.csv2.models; import fr.ifremer.wao.bean.ObsProgram; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/DCF5CodesParserFormatter.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/DCF5CodesParserFormatter.java 2012-03-26 13:11:38 UTC (rev 1576) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/DCF5CodesParserFormatter.java 2012-03-27 08:27:48 UTC (rev 1577) @@ -1,3 +1,26 @@ +/* + * #%L + * Wao :: Business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ package fr.ifremer.wao.io.csv2.models.operations; import fr.ifremer.wao.entity.DCF5Code; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/FishingZonesParserFormatter.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/FishingZonesParserFormatter.java 2012-03-26 13:11:38 UTC (rev 1576) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/FishingZonesParserFormatter.java 2012-03-27 08:27:48 UTC (rev 1577) @@ -1,3 +1,26 @@ +/* + * #%L + * Wao :: Business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ package fr.ifremer.wao.io.csv2.models.operations; import fr.ifremer.wao.WaoUtils; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/ObservedDataControlParserFormatter.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/ObservedDataControlParserFormatter.java 2012-03-26 13:11:38 UTC (rev 1576) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/ObservedDataControlParserFormatter.java 2012-03-27 08:27:48 UTC (rev 1577) @@ -1,3 +1,26 @@ +/* + * #%L + * Wao :: Business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ package fr.ifremer.wao.io.csv2.models.operations; import fr.ifremer.wao.entity.ObservedDataControl; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/SampleRowCodeParserFormatter.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/SampleRowCodeParserFormatter.java 2012-03-26 13:11:38 UTC (rev 1576) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/SampleRowCodeParserFormatter.java 2012-03-27 08:27:48 UTC (rev 1577) @@ -1,3 +1,26 @@ +/* + * #%L + * Wao :: Business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ package fr.ifremer.wao.io.csv2.models.operations; import fr.ifremer.wao.WaoUtils; Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/WaoUtilsTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/WaoUtilsTest.java 2012-03-26 13:11:38 UTC (rev 1576) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/WaoUtilsTest.java 2012-03-27 08:27:48 UTC (rev 1577) @@ -1,3 +1,26 @@ +/* + * #%L + * Wao :: Business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ package fr.ifremer.wao; import org.junit.Assert; Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/io/csv2/models/ObsMerObsVenteSamplingPlanImportExportModelTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/io/csv2/models/ObsMerObsVenteSamplingPlanImportExportModelTest.java 2012-03-26 13:11:38 UTC (rev 1576) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/io/csv2/models/ObsMerObsVenteSamplingPlanImportExportModelTest.java 2012-03-27 08:27:48 UTC (rev 1577) @@ -1,3 +1,26 @@ +/* + * #%L + * Wao :: Business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ package fr.ifremer.wao.io.csv2.models; import org.junit.Assert;

1 0

r1576 - in trunk/wao-business/src/main/java/fr/ifremer/wao: entity service
by bleny＠users.forge.codelutin.com 26 Mar '12

26 Mar '12

Author: bleny Date: 2012-03-26 15:11:38 +0200 (Mon, 26 Mar 2012) New Revision: 1576 Url: http://forge.codelutin.com/repositories/revision/wao/1576 Log: #664 Passer la synth?\195?\168se sur un filtrage au niveau contacts : dans la premi?\195?\168re synth?\195?\168se on restreint l'affichage aux dates d?\195?\169finies dans les filtres Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactDAOImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowDAOImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactDAOImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactDAOImpl.java 2012-03-21 09:59:37 UTC (rev 1575) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactDAOImpl.java 2012-03-26 13:11:38 UTC (rev 1576) @@ -40,6 +40,7 @@ import fr.ifremer.wao.bean.PieChartDataImpl; import fr.ifremer.wao.bean.PieChartSeries; import fr.ifremer.wao.bean.PieChartSeriesImpl; +import org.apache.commons.lang3.Range; import org.apache.commons.lang3.time.DateUtils; import org.nuiton.topia.TopiaException; import org.nuiton.topia.framework.TopiaQuery; @@ -349,19 +350,25 @@ .addEquals(query.getMainAlias() + "." + Contact.PROPERTY_VALIDATION_COMPANY, true) .addEquals(query.getMainAlias() + "." + Contact.PROPERTY_VALIDATION_PROGRAM, true); + Range<Date> range = Range.between(monthsPeriod.getFromDate(), monthsPeriod.getThruDate()); + for (Contact contact : findAllByQuery(query)) { Date month = DateUtils.truncate(contact.getObservationBeginDate(), Calendar.MONTH); - Integer count = actualObservationsMyMonths.get(month); + if (range.contains(month)) { - if (count == null) { - count = 0; - } + Integer count = actualObservationsMyMonths.get(month); - count += 1; + if (count == null) { + count = 0; + } - actualObservationsMyMonths.put(month, count); + count += 1; + + actualObservationsMyMonths.put(month, count); + + } } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowDAOImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowDAOImpl.java 2012-03-21 09:59:37 UTC (rev 1575) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowDAOImpl.java 2012-03-26 13:11:38 UTC (rev 1576) @@ -6,6 +6,7 @@ import fr.ifremer.wao.bean.ObservationType; import fr.ifremer.wao.bean.SamplingFilter; import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang3.Range; import org.apache.commons.lang3.StringUtils; import org.nuiton.topia.TopiaException; import org.nuiton.topia.framework.TopiaQuery; @@ -229,10 +230,14 @@ List<Object[]> res = context.findByQuery(query); + Range<Date> range = Range.between(monthsPeriod.getFromDate(), monthsPeriod.getThruDate()); + for (Object[] line : res) { Date month = (Date)line[0]; - int expectedValue = ((Long) line[1]).intValue(); - expectedObservationsByMonths.put(month, expectedValue); + if (range.contains(month)) { + int expectedValue = ((Long) line[1]).intValue(); + expectedObservationsByMonths.put(month, expectedValue); + } } return expectedObservationsByMonths; 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 2012-03-21 09:59:37 UTC (rev 1575) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 2012-03-26 13:11:38 UTC (rev 1576) @@ -111,16 +111,15 @@ TopiaContext transaction, ContactFilter filter) throws TopiaException { - PeriodDates monthsPeriod = new PeriodDates(filter.getPeriod().getFromDate(), filter.getPeriod().getThruDate()); - monthsPeriod.initDayOfMonthExtremities(); - filter.getSamplingFilter().setPeriod(monthsPeriod); - SampleRowDAO dao = WaoDAOHelper.getSampleRowDAO(transaction); ContactDAO contactDAO = WaoDAOHelper.getContactDAO(transaction); // Pour le calcul du programmé + PeriodDates monthsPeriod = new PeriodDates(filter.getPeriod().getFromDate(), filter.getPeriod().getThruDate()); + filter.getSamplingFilter().setPeriod(monthsPeriod); SortedMap<Date, Integer> expectedObservationsByMonths = dao.getExpectedObservationsByMonths(filter.getSamplingFilter()); + filter.getSamplingFilter().setPeriod(null); // Pour le calcul du réalisé SortedMap<Date, Integer> actualObservationsMyMonths =

1 0

r1575 - trunk
by bleny＠users.forge.codelutin.com 21 Mar '12

21 Mar '12

Author: bleny Date: 2012-03-21 10:59:37 +0100 (Wed, 21 Mar 2012) New Revision: 1575 Url: http://forge.codelutin.com/repositories/revision/wao/1575 Log: utilisation de mavenpom 3.2 (m?\195?\160j redmine) Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-03-21 09:59:07 UTC (rev 1574) +++ trunk/pom.xml 2012-03-21 09:59:37 UTC (rev 1575) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.1.1</version> + <version>3.2</version> </parent> <groupId>fr.ifremer</groupId>

1 0

r1574 - trunk/wao-business/src/main/xmi
by bleny＠users.forge.codelutin.com 21 Mar '12

21 Mar '12

Author: bleny Date: 2012-03-21 10:59:07 +0100 (Wed, 21 Mar 2012) New Revision: 1574 Url: http://forge.codelutin.com/repositories/revision/wao/1574 Log: activation de l'indexation des cl?\195?\169s ?\195?\169trang?\195?\168res Modified: trunk/wao-business/src/main/xmi/wao.properties Modified: trunk/wao-business/src/main/xmi/wao.properties =================================================================== --- trunk/wao-business/src/main/xmi/wao.properties 2012-03-20 14:00:03 UTC (rev 1573) +++ trunk/wao-business/src/main/xmi/wao.properties 2012-03-21 09:59:07 UTC (rev 1574) @@ -27,7 +27,7 @@ model.tagValue.notGenerateToString=true model.tagValue.constantPrefix=PROPERTY_ model.tagValue.useEnumerationName=true -# model.tagValue.indexForeignKeys=true +model.tagValue.indexForeignKeys=true # model.tagValue.doNotGenerateBooleanGetMethods=true

1 0

r1573 - trunk
by bleny＠users.forge.codelutin.com 20 Mar '12

20 Mar '12

Author: bleny Date: 2012-03-20 15:00:03 +0100 (Tue, 20 Mar 2012) New Revision: 1573 Url: http://forge.codelutin.com/repositories/revision/wao/1573 Log: mise ?\195?\160 jour des d?\195?\169pendances Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-03-20 13:56:25 UTC (rev 1572) +++ trunk/pom.xml 2012-03-20 14:00:03 UTC (rev 1573) @@ -215,7 +215,7 @@ <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <version>1.3.164</version> + <version>1.3.165</version> </dependency> <dependency> <groupId>postgresql</groupId> @@ -340,7 +340,7 @@ <nuitonI18nVersion>2.4.1</nuitonI18nVersion> <nuitonUtilsVersion>2.4.5</nuitonUtilsVersion> <nuitonWebVersion>1.10</nuitonWebVersion> - <topiaVersion>2.6.7</topiaVersion> + <topiaVersion>2.6.8</topiaVersion> <eugeneVersion>2.4.2</eugeneVersion> <tapestryVersion>5.2.5</tapestryVersion> <hibernateVersion>3.6.10.Final</hibernateVersion>

1 0

r1572 - trunk/wao-business/src/main/java/fr/ifremer/wao
by bleny＠users.forge.codelutin.com 20 Mar '12

20 Mar '12

Author: bleny Date: 2012-03-20 14:56:25 +0100 (Tue, 20 Mar 2012) New Revision: 1572 Url: http://forge.codelutin.com/repositories/revision/wao/1572 Log: Evolution #1007 Ajouter des index sur les cl?\195?\169s ?\195?\169trang?\195?\168res Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java 2012-03-20 13:51:45 UTC (rev 1571) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java 2012-03-20 13:56:25 UTC (rev 1572) @@ -1114,4 +1114,23 @@ queries.add("UPDATE SampleRow SET code=REPLACE(code, '_', '_V') WHERE obsProgramOrdinal=1;"); queries.add("UPDATE SampleRow SET code=REPLACE(code, '_', '_D') WHERE obsProgramOrdinal=2;"); } + + @Override + protected void addAllMissingIndexesOnForeignKeys_3_3(List<String> queries) { + queries.add("CREATE INDEX idx_Boat_elligibleBoat ON elligibleBoat(boat); "); + queries.add("CREATE INDEX idx_Company_waoUser ON waoUser(company); "); + queries.add("CREATE INDEX idx_Contact_secondaryObservers ON contact_secondaryobservers(contact);"); + queries.add("CREATE INDEX idx_FishingZone_sampleRow ON fishingzone_samplerow(fishingZone); "); + queries.add("CREATE INDEX idx_Indicator_indicatorLevel ON indicatorLevel(indicator); "); + queries.add("CREATE INDEX idx_ObsDebCode_obsDebCodeDetails ON obsDebCodeDetails(obsDebCode); "); + queries.add("CREATE INDEX idx_SampleRow_sampleMonth ON sampleMonth(sampleRow); "); + queries.add("CREATE INDEX idx_SampleRow_sampleRowLog ON sampleRowLog(sampleRow); "); + queries.add("CREATE INDEX idx_SampleRow_elligibleBoat ON elligibleBoat(sampleRow); "); + queries.add("CREATE INDEX idx_SampleRow_fishingZone ON fishingzone_samplerow(sampleRow); "); + queries.add("CREATE INDEX idx_SampleRow_dCF5Code ON dcf5code_samplerow(sampleRow); "); + queries.add("CREATE INDEX idx_SampleRow_observers ON observers_samplerow(sampleRow); "); + queries.add("CREATE INDEX idx_WaoUser_userProfile ON userProfile(waoUser); "); + queries.add("CREATE INDEX idx_WaoUser_allegroWallet ON allegrowallet_waouser(waoUser); "); + queries.add("CREATE INDEX idx_WaoUser_canReadBoats ON canreadboats_waouser(waoUser); "); + } } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java 2012-03-20 13:51:45 UTC (rev 1571) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java 2012-03-20 13:56:25 UTC (rev 1572) @@ -621,10 +621,14 @@ migrateSampleRowCodes_3_3(queries); + addAllMissingIndexesOnForeignKeys_3_3(queries); + String[] strings = queries.toArray(new String[queries.size()]); executeSQL(tx, showSql, showProgression, strings); } + protected abstract void addAllMissingIndexesOnForeignKeys_3_3(List<String> queries); + protected abstract void migrateSampleRowCodes_3_3(List<String> queries); protected abstract void addWaoUserCguAccepted_3_3(List<String> queries);

1 0

r1571 - trunk/wao-business/src/main/java/fr/ifremer/wao
by bleny＠users.forge.codelutin.com 20 Mar '12

20 Mar '12

Author: bleny Date: 2012-03-20 14:51:45 +0100 (Tue, 20 Mar 2012) New Revision: 1571 Url: http://forge.codelutin.com/repositories/revision/wao/1571 Log: conventions de nommage des m?\195?\169thodes de migration Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java 2012-03-19 17:01:27 UTC (rev 1570) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java 2012-03-20 13:51:45 UTC (rev 1571) @@ -1109,7 +1109,7 @@ } @Override - protected void migrateSampleRowCodes(List<String> queries) { + protected void migrateSampleRowCodes_3_3(List<String> queries) { queries.add("UPDATE SampleRow SET code=REPLACE(code, '_', '_M') WHERE obsProgramOrdinal=0;"); queries.add("UPDATE SampleRow SET code=REPLACE(code, '_', '_V') WHERE obsProgramOrdinal=1;"); queries.add("UPDATE SampleRow SET code=REPLACE(code, '_', '_D') WHERE obsProgramOrdinal=2;"); Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java 2012-03-19 17:01:27 UTC (rev 1570) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java 2012-03-20 13:51:45 UTC (rev 1571) @@ -619,13 +619,13 @@ addWaoUserCguAccepted_3_3(queries); - migrateSampleRowCodes(queries); + migrateSampleRowCodes_3_3(queries); String[] strings = queries.toArray(new String[queries.size()]); executeSQL(tx, showSql, showProgression, strings); } - protected abstract void migrateSampleRowCodes(List<String> queries); + protected abstract void migrateSampleRowCodes_3_3(List<String> queries); protected abstract void addWaoUserCguAccepted_3_3(List<String> queries);

1 0

r1570 - in trunk: src/site/resources/exemples_imports/obsDeb src/site/rst/obsMer src/site/rst/obsVente wao-business/src/main/java/fr/ifremer/wao wao-business/src/main/java/fr/ifremer/wao/bean wao-business/src/main/java/fr/ifremer/wao/io/csv2/models wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations wao-business/src/main/java/fr/ifremer/wao/service wao-business/src/main/resources/i18n wao-business/src/test/java/fr/ifremer/wao/business wao-business/src/test/java/fr/ifremer/wao/b
by bleny＠users.forge.codelutin.com 19 Mar '12

19 Mar '12

Author: bleny Date: 2012-03-19 18:01:27 +0100 (Mon, 19 Mar 2012) New Revision: 1570 Url: http://forge.codelutin.com/repositories/revision/wao/1570 Log: Evolution #792 Changer la forme des codes des lignes Modified: trunk/src/site/resources/exemples_imports/obsDeb/plan_?\195?\169chantillonnage_t?\195?\169l?\195?\169phonique.csv trunk/src/site/resources/exemples_imports/obsDeb/plan_?\195?\169chantillonnage_terrain.csv trunk/src/site/rst/obsMer/administrateur.rst trunk/src/site/rst/obsVente/administrateur.rst trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java trunk/wao-business/src/main/java/fr/ifremer/wao/WaoUtils.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ObsProgram.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/ObsDebSamplingPlanImportExportModel.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/ObsMerObsVenteSamplingPlanImportExportModel.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/SampleRowCodeParserFormatter.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties trunk/wao-business/src/test/java/fr/ifremer/wao/business/ObsDebFieldWorkTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/business/ObsDebPhoneTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/business/fixtures/ObsMerFixtures.java trunk/wao-business/src/test/java/fr/ifremer/wao/entity/BoatImplTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingTest.java trunk/wao-business/src/test/resources/import/echantillonnage.csv trunk/wao-business/src/test/resources/import/misc.csv trunk/wao-business/src/test/resources/import/samplingPlan-obsdeb.csv trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowForm.java /opt/redmine-tools/commit-email.pl: `/usr/bin/svnlook diff /var/lib/svn/svn-forge.codelutin.com/wao -r 1570' failed with this output: Modified: trunk/src/site/resources/exemples_imports/obsDeb/plan_?\195?\169chantillonnage_terrain.csv =================================================================== svnlook: Can't convert string from 'UTF-8' to native encoding: svnlook: --- trunk/src/site/resources/exemples_imports/obsDeb/plan_?\195?\169chantillonnage_terrain.csv 2012-03-16 16:17:07 UTC (rev 1569) +++ trunk/src/site/resources/exemples_imports/obsDeb/plan_?\195?\169chantillonnage_terrain.csv 2012-03-19 17:01:27 UTC (rev 1570)

1 0