Wao-commits
Threads by month
- ----- 2026 -----
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2025 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
May 2014
- 3 participants
- 79 discussions
May 27, 2014
Build failed in Jenkins: wao-nightly » Wao :: Services #53
by admin+ci-codelutin.com＠codelutin.com May 27, 2014
by admin+ci-codelutin.com＠codelutin.com May 27, 2014
May 27, 2014
See <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/53/…>
Changes:
[bleny] refs #4493 start first bar chart
------------------------------------------
[...truncated 363 lines...]
2014/05/24 12:09:45 TRACE (AbstractWaoServiceTest.java:202) newPersistenceContext opened transaction fr.ifremer.wao.WaoTopiaPersistenceContext@4151b7fd
2014/05/24 12:09:45 TRACE (AbstractWaoServiceTest.java:217) tearDown closing transaction fr.ifremer.wao.WaoTopiaPersistenceContext@4151b7fd
2014/05/24 12:09:45 TRACE (AbstractWaoServiceTest.java:227) tearDown closing transaction fr.ifremer.wao.WaoTopiaApplicationContext@75748283
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.912 sec - in fr.ifremer.wao.services.service.mail.EmailServiceTest
Running fr.ifremer.wao.services.service.administration.WaoUsersServiceTest
2014/05/24 12:09:45 TRACE (AbstractWaoServiceTest.java:83) newApplicationContext will store H2 data in <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…>
2014/05/24 12:09:45 TRACE (AbstractWaoServiceTest.java:84) newApplicationContext allJpaParameters = {hibernate.c3p0.max_statements=50, hibernate.c3p0.max_size=20, topia.service.migration=org.nuiton.topia.flyway.TopiaFlywayServiceImpl, hibernate.c3p0.timeout=1800, hibernate.c3p0.min_size=5, hibernate.connection.url=jdbc:h2:<http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…,> hibernate.connection.driver_class=org.h2.Driver, hibernate.format_sql=true, hibernate.connection.username=sa, hibernate.connection.password=, hibernate.dialect=org.hibernate.dialect.H2Dialect, hibernate.show_sql=false, topia.persistence.topiaIdFactoryClassName=org.nuiton.topia.persistence.internal.LegacyTopiaIdFactory, hibernate.ejb.naming_strategy=org.hibernate.cfg.ImprovedNamingStrategy, topia.service.migration.flyway.initVersion=3.4.1}
2014/05/24 12:09:45 DEBUG (AbstractWaoServiceTest.java:88) newApplicationContext jdbc url is
jdbc:h2:<http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…>
2014/05/24 12:09:45 TRACE (AbstractWaoServiceTest.java:94) newApplicationContext created root context fr.ifremer.wao.WaoTopiaApplicationContext@2608acc1
2014/05/24 12:09:46 TRACE (AbstractWaoServiceTest.java:202) newPersistenceContext opened transaction fr.ifremer.wao.WaoTopiaPersistenceContext@233ac9ea
2014/05/24 12:09:46 DEBUG (WaoUsersServiceTest.java:47) testNewPassword 5dUlNuJG
2014/05/24 12:09:46 DEBUG (WaoUsersServiceTest.java:48) testNewPassword Bu8GkJlu
2014/05/24 12:09:46 DEBUG (WaoUsersServiceTest.java:49) testNewPassword mOzbanc9
2014/05/24 12:09:46 TRACE (AbstractWaoServiceTest.java:217) tearDown closing transaction fr.ifremer.wao.WaoTopiaPersistenceContext@233ac9ea
2014/05/24 12:09:46 TRACE (AbstractWaoServiceTest.java:227) tearDown closing transaction fr.ifremer.wao.WaoTopiaApplicationContext@2608acc1
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.631 sec - in fr.ifremer.wao.services.service.administration.WaoUsersServiceTest
Running fr.ifremer.wao.services.service.administration.ReferentialServiceTest
2014/05/24 12:09:46 TRACE (AbstractWaoServiceTest.java:83) newApplicationContext will store H2 data in <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…>
2014/05/24 12:09:46 TRACE (AbstractWaoServiceTest.java:84) newApplicationContext allJpaParameters = {hibernate.c3p0.max_statements=50, hibernate.c3p0.max_size=20, topia.service.migration=org.nuiton.topia.flyway.TopiaFlywayServiceImpl, hibernate.c3p0.timeout=1800, hibernate.c3p0.min_size=5, hibernate.connection.url=jdbc:h2:<http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…,> hibernate.connection.driver_class=org.h2.Driver, hibernate.format_sql=true, hibernate.connection.username=sa, hibernate.connection.password=, hibernate.dialect=org.hibernate.dialect.H2Dialect, hibernate.show_sql=false, topia.persistence.topiaIdFactoryClassName=org.nuiton.topia.persistence.internal.LegacyTopiaIdFactory, hibernate.ejb.naming_strategy=org.hibernate.cfg.ImprovedNamingStrategy, topia.service.migration.flyway.initVersion=3.4.1}
2014/05/24 12:09:46 DEBUG (AbstractWaoServiceTest.java:88) newApplicationContext jdbc url is
jdbc:h2:<http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…>
2014/05/24 12:09:46 TRACE (AbstractWaoServiceTest.java:94) newApplicationContext created root context fr.ifremer.wao.WaoTopiaApplicationContext@315b3807
2014/05/24 12:09:46 TRACE (AbstractWaoServiceTest.java:202) newPersistenceContext opened transaction fr.ifremer.wao.WaoTopiaPersistenceContext@5cff08bf
2014/05/24 12:09:48 INFO (ReferentialService.java:375) importTerrestrialLocations 1248 terrestrial locations added, 0 updated
2014/05/24 12:09:48 INFO (ReferentialService.java:376) importTerrestrialLocations 50 terrestrial district added, 0 updated
2014/05/24 12:09:48 INFO (ReferentialService.java:377) importTerrestrialLocations 18 terrestrial region added, 28 updated
2014/05/24 12:09:48 TRACE (FakeWaoServiceContext.java:55) getNow injecting fake date in service: Mon Nov 02 00:00:00 CET 2009
2014/05/24 12:09:50 TRACE (FakeWaoServiceContext.java:55) getNow injecting fake date in service: Mon Nov 02 00:00:00 CET 2009
2014/05/24 12:09:50 TRACE (AbstractWaoServiceTest.java:217) tearDown closing transaction fr.ifremer.wao.WaoTopiaPersistenceContext@5cff08bf
2014/05/24 12:09:50 TRACE (AbstractWaoServiceTest.java:227) tearDown closing transaction fr.ifremer.wao.WaoTopiaApplicationContext@315b3807
2014/05/24 12:09:50 TRACE (AbstractWaoServiceTest.java:83) newApplicationContext will store H2 data in <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…>
2014/05/24 12:09:50 TRACE (AbstractWaoServiceTest.java:84) newApplicationContext allJpaParameters = {hibernate.c3p0.max_statements=50, hibernate.c3p0.max_size=20, topia.service.migration=org.nuiton.topia.flyway.TopiaFlywayServiceImpl, hibernate.c3p0.timeout=1800, hibernate.c3p0.min_size=5, hibernate.connection.url=jdbc:h2:<http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…,> hibernate.connection.driver_class=org.h2.Driver, hibernate.format_sql=true, hibernate.connection.username=sa, hibernate.connection.password=, hibernate.dialect=org.hibernate.dialect.H2Dialect, hibernate.show_sql=false, topia.persistence.topiaIdFactoryClassName=org.nuiton.topia.persistence.internal.LegacyTopiaIdFactory, hibernate.ejb.naming_strategy=org.hibernate.cfg.ImprovedNamingStrategy, topia.service.migration.flyway.initVersion=3.4.1}
2014/05/24 12:09:50 DEBUG (AbstractWaoServiceTest.java:88) newApplicationContext jdbc url is
jdbc:h2:<http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…>
2014/05/24 12:09:52 TRACE (AbstractWaoServiceTest.java:94) newApplicationContext created root context fr.ifremer.wao.WaoTopiaApplicationContext@6a315701
2014/05/24 12:09:52 TRACE (AbstractWaoServiceTest.java:202) newPersistenceContext opened transaction fr.ifremer.wao.WaoTopiaPersistenceContext@37161fe
2014/05/24 12:09:54 INFO (ReferentialService.java:375) importTerrestrialLocations 1248 terrestrial locations added, 0 updated
2014/05/24 12:09:54 INFO (ReferentialService.java:376) importTerrestrialLocations 50 terrestrial district added, 0 updated
2014/05/24 12:09:54 INFO (ReferentialService.java:377) importTerrestrialLocations 18 terrestrial region added, 28 updated
2014/05/24 12:09:54 TRACE (FakeWaoServiceContext.java:55) getNow injecting fake date in service: Mon Nov 02 00:00:00 CET 2009
2014/05/24 12:09:54 TRACE (FakeWaoServiceContext.java:55) getNow injecting fake date in service: Mon Nov 02 00:00:00 CET 2009
2014/05/24 12:09:54 TRACE (FakeWaoServiceContext.java:55) getNow injecting fake date in service: Mon Nov 02 00:00:00 CET 2009
2014/05/24 12:09:54 TRACE (AbstractWaoServiceTest.java:217) tearDown closing transaction fr.ifremer.wao.WaoTopiaPersistenceContext@37161fe
2014/05/24 12:09:54 TRACE (AbstractWaoServiceTest.java:227) tearDown closing transaction fr.ifremer.wao.WaoTopiaApplicationContext@6a315701
2014/05/24 12:09:54 TRACE (AbstractWaoServiceTest.java:83) newApplicationContext will store H2 data in <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…>
2014/05/24 12:09:54 TRACE (AbstractWaoServiceTest.java:84) newApplicationContext allJpaParameters = {hibernate.c3p0.max_statements=50, hibernate.c3p0.max_size=20, topia.service.migration=org.nuiton.topia.flyway.TopiaFlywayServiceImpl, hibernate.c3p0.timeout=1800, hibernate.c3p0.min_size=5, hibernate.connection.url=jdbc:h2:<http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…,> hibernate.connection.driver_class=org.h2.Driver, hibernate.format_sql=true, hibernate.connection.username=sa, hibernate.connection.password=, hibernate.dialect=org.hibernate.dialect.H2Dialect, hibernate.show_sql=false, topia.persistence.topiaIdFactoryClassName=org.nuiton.topia.persistence.internal.LegacyTopiaIdFactory, hibernate.ejb.naming_strategy=org.hibernate.cfg.ImprovedNamingStrategy, topia.service.migration.flyway.initVersion=3.4.1}
2014/05/24 12:09:54 DEBUG (AbstractWaoServiceTest.java:88) newApplicationContext jdbc url is
jdbc:h2:<http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…>
2014/05/24 12:09:55 TRACE (AbstractWaoServiceTest.java:94) newApplicationContext created root context fr.ifremer.wao.WaoTopiaApplicationContext@6c6f3a15
2014/05/24 12:09:55 TRACE (AbstractWaoServiceTest.java:202) newPersistenceContext opened transaction fr.ifremer.wao.WaoTopiaPersistenceContext@14037d2f
2014/05/24 12:09:55 INFO (ReferentialService.java:673) initialDCF5CodesImport no DCF in database, mass import
2014/05/24 12:09:55 INFO (ReferentialService.java:741) initialDCF5CodesImport 54 dcf codes in database
2014/05/24 12:09:55 TRACE (AbstractWaoServiceTest.java:217) tearDown closing transaction fr.ifremer.wao.WaoTopiaPersistenceContext@14037d2f
2014/05/24 12:09:55 TRACE (AbstractWaoServiceTest.java:227) tearDown closing transaction fr.ifremer.wao.WaoTopiaApplicationContext@6c6f3a15
2014/05/24 12:09:55 TRACE (AbstractWaoServiceTest.java:83) newApplicationContext will store H2 data in <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…>
2014/05/24 12:09:55 TRACE (AbstractWaoServiceTest.java:84) newApplicationContext allJpaParameters = {hibernate.c3p0.max_statements=50, hibernate.c3p0.max_size=20, topia.service.migration=org.nuiton.topia.flyway.TopiaFlywayServiceImpl, hibernate.c3p0.timeout=1800, hibernate.c3p0.min_size=5, hibernate.connection.url=jdbc:h2:<http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…,> hibernate.connection.driver_class=org.h2.Driver, hibernate.format_sql=true, hibernate.connection.username=sa, hibernate.connection.password=, hibernate.dialect=org.hibernate.dialect.H2Dialect, hibernate.show_sql=false, topia.persistence.topiaIdFactoryClassName=org.nuiton.topia.persistence.internal.LegacyTopiaIdFactory, hibernate.ejb.naming_strategy=org.hibernate.cfg.ImprovedNamingStrategy, topia.service.migration.flyway.initVersion=3.4.1}
2014/05/24 12:09:55 DEBUG (AbstractWaoServiceTest.java:88) newApplicationContext jdbc url is
jdbc:h2:<http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…>
2014/05/24 12:09:57 TRACE (AbstractWaoServiceTest.java:94) newApplicationContext created root context fr.ifremer.wao.WaoTopiaApplicationContext@4f68f28
2014/05/24 12:09:57 TRACE (AbstractWaoServiceTest.java:202) newPersistenceContext opened transaction fr.ifremer.wao.WaoTopiaPersistenceContext@74891d79
2014/05/24 12:09:59 INFO (ReferentialService.java:375) importTerrestrialLocations 1248 terrestrial locations added, 0 updated
2014/05/24 12:09:59 INFO (ReferentialService.java:376) importTerrestrialLocations 50 terrestrial district added, 0 updated
2014/05/24 12:09:59 INFO (ReferentialService.java:377) importTerrestrialLocations 18 terrestrial region added, 28 updated
2014/05/24 12:09:59 TRACE (FakeWaoServiceContext.java:55) getNow injecting fake date in service: Mon Nov 02 00:00:00 CET 2009
2014/05/24 12:09:59 DEBUG (ReferentialService.java:490) importTerrestrialDivisions 1181 ports, 18 regions
2014/05/24 12:10:01 DEBUG (ReferentialService.java:544) importTerrestrialDivisions 649 terrestrial divisions in database
2014/05/24 12:10:01 TRACE (FakeWaoServiceContext.java:55) getNow injecting fake date in service: Mon Nov 02 00:00:00 CET 2009
2014/05/24 12:10:01 TRACE (AbstractWaoServiceTest.java:217) tearDown closing transaction fr.ifremer.wao.WaoTopiaPersistenceContext@74891d79
2014/05/24 12:10:01 TRACE (AbstractWaoServiceTest.java:227) tearDown closing transaction fr.ifremer.wao.WaoTopiaApplicationContext@4f68f28
2014/05/24 12:10:01 TRACE (AbstractWaoServiceTest.java:83) newApplicationContext will store H2 data in <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…>
2014/05/24 12:10:01 TRACE (AbstractWaoServiceTest.java:84) newApplicationContext allJpaParameters = {hibernate.c3p0.max_statements=50, hibernate.c3p0.max_size=20, topia.service.migration=org.nuiton.topia.flyway.TopiaFlywayServiceImpl, hibernate.c3p0.timeout=1800, hibernate.c3p0.min_size=5, hibernate.connection.url=jdbc:h2:<http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…,> hibernate.connection.driver_class=org.h2.Driver, hibernate.format_sql=true, hibernate.connection.username=sa, hibernate.connection.password=, hibernate.dialect=org.hibernate.dialect.H2Dialect, hibernate.show_sql=false, topia.persistence.topiaIdFactoryClassName=org.nuiton.topia.persistence.internal.LegacyTopiaIdFactory, hibernate.ejb.naming_strategy=org.hibernate.cfg.ImprovedNamingStrategy, topia.service.migration.flyway.initVersion=3.4.1}
2014/05/24 12:10:01 DEBUG (AbstractWaoServiceTest.java:88) newApplicationContext jdbc url is
jdbc:h2:<http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…>
2014/05/24 12:10:02 TRACE (AbstractWaoServiceTest.java:94) newApplicationContext created root context fr.ifremer.wao.WaoTopiaApplicationContext@18e8fe76
2014/05/24 12:10:02 TRACE (AbstractWaoServiceTest.java:202) newPersistenceContext opened transaction fr.ifremer.wao.WaoTopiaPersistenceContext@5deb485b
2014/05/24 12:10:04 INFO (ReferentialService.java:375) importTerrestrialLocations 1248 terrestrial locations added, 0 updated
2014/05/24 12:10:04 INFO (ReferentialService.java:376) importTerrestrialLocations 50 terrestrial district added, 0 updated
2014/05/24 12:10:04 INFO (ReferentialService.java:377) importTerrestrialLocations 18 terrestrial region added, 28 updated
2014/05/24 12:10:04 TRACE (FakeWaoServiceContext.java:55) getNow injecting fake date in service: Mon Nov 02 00:00:00 CET 2009
2014/05/24 12:10:04 TRACE (FakeWaoServiceContext.java:55) getNow injecting fake date in service: Mon Nov 02 00:00:00 CET 2009
2014/05/24 12:10:04 TRACE (AbstractWaoServiceTest.java:217) tearDown closing transaction fr.ifremer.wao.WaoTopiaPersistenceContext@5deb485b
2014/05/24 12:10:04 TRACE (AbstractWaoServiceTest.java:227) tearDown closing transaction fr.ifremer.wao.WaoTopiaApplicationContext@18e8fe76
2014/05/24 12:10:04 TRACE (AbstractWaoServiceTest.java:83) newApplicationContext will store H2 data in <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…>
2014/05/24 12:10:04 TRACE (AbstractWaoServiceTest.java:84) newApplicationContext allJpaParameters = {hibernate.c3p0.max_statements=50, hibernate.c3p0.max_size=20, topia.service.migration=org.nuiton.topia.flyway.TopiaFlywayServiceImpl, hibernate.c3p0.timeout=1800, hibernate.c3p0.min_size=5, hibernate.connection.url=jdbc:h2:<http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…,> hibernate.connection.driver_class=org.h2.Driver, hibernate.format_sql=true, hibernate.connection.username=sa, hibernate.connection.password=, hibernate.dialect=org.hibernate.dialect.H2Dialect, hibernate.show_sql=false, topia.persistence.topiaIdFactoryClassName=org.nuiton.topia.persistence.internal.LegacyTopiaIdFactory, hibernate.ejb.naming_strategy=org.hibernate.cfg.ImprovedNamingStrategy, topia.service.migration.flyway.initVersion=3.4.1}
2014/05/24 12:10:04 DEBUG (AbstractWaoServiceTest.java:88) newApplicationContext jdbc url is
jdbc:h2:<http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…>
2014/05/24 12:10:05 TRACE (AbstractWaoServiceTest.java:94) newApplicationContext created root context fr.ifremer.wao.WaoTopiaApplicationContext@6b456f66
2014/05/24 12:10:05 TRACE (AbstractWaoServiceTest.java:202) newPersistenceContext opened transaction fr.ifremer.wao.WaoTopiaPersistenceContext@72f3e28b
2014/05/24 12:10:06 INFO (ReferentialService.java:375) importTerrestrialLocations 1248 terrestrial locations added, 0 updated
2014/05/24 12:10:06 INFO (ReferentialService.java:376) importTerrestrialLocations 50 terrestrial district added, 0 updated
2014/05/24 12:10:06 INFO (ReferentialService.java:377) importTerrestrialLocations 18 terrestrial region added, 28 updated
2014/05/24 12:10:06 TRACE (FakeWaoServiceContext.java:55) getNow injecting fake date in service: Mon Nov 02 00:00:00 CET 2009
2014/05/24 12:10:06 TRACE (AbstractWaoServiceTest.java:217) tearDown closing transaction fr.ifremer.wao.WaoTopiaPersistenceContext@72f3e28b
2014/05/24 12:10:06 TRACE (AbstractWaoServiceTest.java:227) tearDown closing transaction fr.ifremer.wao.WaoTopiaApplicationContext@6b456f66
2014/05/24 12:10:06 TRACE (AbstractWaoServiceTest.java:83) newApplicationContext will store H2 data in <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…>
2014/05/24 12:10:06 TRACE (AbstractWaoServiceTest.java:84) newApplicationContext allJpaParameters = {hibernate.c3p0.max_statements=50, hibernate.c3p0.max_size=20, topia.service.migration=org.nuiton.topia.flyway.TopiaFlywayServiceImpl, hibernate.c3p0.timeout=1800, hibernate.c3p0.min_size=5, hibernate.connection.url=jdbc:h2:<http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…,> hibernate.connection.driver_class=org.h2.Driver, hibernate.format_sql=true, hibernate.connection.username=sa, hibernate.connection.password=, hibernate.dialect=org.hibernate.dialect.H2Dialect, hibernate.show_sql=false, topia.persistence.topiaIdFactoryClassName=org.nuiton.topia.persistence.internal.LegacyTopiaIdFactory, hibernate.ejb.naming_strategy=org.hibernate.cfg.ImprovedNamingStrategy, topia.service.migration.flyway.initVersion=3.4.1}
2014/05/24 12:10:06 DEBUG (AbstractWaoServiceTest.java:88) newApplicationContext jdbc url is
jdbc:h2:<http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…>
2014/05/24 12:10:09 TRACE (AbstractWaoServiceTest.java:94) newApplicationContext created root context fr.ifremer.wao.WaoTopiaApplicationContext@40f67ee2
2014/05/24 12:10:09 TRACE (AbstractWaoServiceTest.java:202) newPersistenceContext opened transaction fr.ifremer.wao.WaoTopiaPersistenceContext@6ca346ac
2014/05/24 12:10:09 TRACE (FakeWaoServiceContext.java:55) getNow injecting fake date in service: Mon Nov 02 00:00:00 CET 2009
2014/05/24 12:10:09 TRACE (AbstractWaoServiceTest.java:217) tearDown closing transaction fr.ifremer.wao.WaoTopiaPersistenceContext@6ca346ac
2014/05/24 12:10:09 TRACE (AbstractWaoServiceTest.java:227) tearDown closing transaction fr.ifremer.wao.WaoTopiaApplicationContext@40f67ee2
2014/05/24 12:10:09 TRACE (AbstractWaoServiceTest.java:83) newApplicationContext will store H2 data in <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…>
2014/05/24 12:10:09 TRACE (AbstractWaoServiceTest.java:84) newApplicationContext allJpaParameters = {hibernate.c3p0.max_statements=50, hibernate.c3p0.max_size=20, topia.service.migration=org.nuiton.topia.flyway.TopiaFlywayServiceImpl, hibernate.c3p0.timeout=1800, hibernate.c3p0.min_size=5, hibernate.connection.url=jdbc:h2:<http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…,> hibernate.connection.driver_class=org.h2.Driver, hibernate.format_sql=true, hibernate.connection.username=sa, hibernate.connection.password=, hibernate.dialect=org.hibernate.dialect.H2Dialect, hibernate.show_sql=false, topia.persistence.topiaIdFactoryClassName=org.nuiton.topia.persistence.internal.LegacyTopiaIdFactory, hibernate.ejb.naming_strategy=org.hibernate.cfg.ImprovedNamingStrategy, topia.service.migration.flyway.initVersion=3.4.1}
2014/05/24 12:10:09 DEBUG (AbstractWaoServiceTest.java:88) newApplicationContext jdbc url is
jdbc:h2:<http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…>
2014/05/24 12:10:09 TRACE (AbstractWaoServiceTest.java:94) newApplicationContext created root context fr.ifremer.wao.WaoTopiaApplicationContext@1bcfc212
2014/05/24 12:10:09 TRACE (AbstractWaoServiceTest.java:202) newPersistenceContext opened transaction fr.ifremer.wao.WaoTopiaPersistenceContext@f9ad5f9
2014/05/24 12:10:11 INFO (ReferentialService.java:375) importTerrestrialLocations 1248 terrestrial locations added, 0 updated
2014/05/24 12:10:11 INFO (ReferentialService.java:376) importTerrestrialLocations 50 terrestrial district added, 0 updated
2014/05/24 12:10:11 INFO (ReferentialService.java:377) importTerrestrialLocations 18 terrestrial region added, 28 updated
2014/05/24 12:10:11 TRACE (FakeWaoServiceContext.java:55) getNow injecting fake date in service: Mon Nov 02 00:00:00 CET 2009
2014/05/24 12:10:11 TRACE (FakeWaoServiceContext.java:55) getNow injecting fake date in service: Mon Nov 02 00:00:00 CET 2009
2014/05/24 12:10:11 TRACE (AbstractWaoServiceTest.java:217) tearDown closing transaction fr.ifremer.wao.WaoTopiaPersistenceContext@f9ad5f9
2014/05/24 12:10:11 TRACE (AbstractWaoServiceTest.java:227) tearDown closing transaction fr.ifremer.wao.WaoTopiaApplicationContext@1bcfc212
2014/05/24 12:10:11 TRACE (AbstractWaoServiceTest.java:83) newApplicationContext will store H2 data in <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…>
2014/05/24 12:10:11 TRACE (AbstractWaoServiceTest.java:84) newApplicationContext allJpaParameters = {hibernate.c3p0.max_statements=50, hibernate.c3p0.max_size=20, topia.service.migration=org.nuiton.topia.flyway.TopiaFlywayServiceImpl, hibernate.c3p0.timeout=1800, hibernate.c3p0.min_size=5, hibernate.connection.url=jdbc:h2:<http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…,> hibernate.connection.driver_class=org.h2.Driver, hibernate.format_sql=true, hibernate.connection.username=sa, hibernate.connection.password=, hibernate.dialect=org.hibernate.dialect.H2Dialect, hibernate.show_sql=false, topia.persistence.topiaIdFactoryClassName=org.nuiton.topia.persistence.internal.LegacyTopiaIdFactory, hibernate.ejb.naming_strategy=org.hibernate.cfg.ImprovedNamingStrategy, topia.service.migration.flyway.initVersion=3.4.1}
2014/05/24 12:10:11 DEBUG (AbstractWaoServiceTest.java:88) newApplicationContext jdbc url is
jdbc:h2:<http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…>
2014/05/24 12:10:12 TRACE (AbstractWaoServiceTest.java:94) newApplicationContext created root context fr.ifremer.wao.WaoTopiaApplicationContext@778c9e3a
2014/05/24 12:10:12 TRACE (AbstractWaoServiceTest.java:202) newPersistenceContext opened transaction fr.ifremer.wao.WaoTopiaPersistenceContext@425294fd
2014/05/24 12:10:13 INFO (ReferentialService.java:375) importTerrestrialLocations 1248 terrestrial locations added, 0 updated
2014/05/24 12:10:13 INFO (ReferentialService.java:376) importTerrestrialLocations 50 terrestrial district added, 0 updated
2014/05/24 12:10:13 INFO (ReferentialService.java:377) importTerrestrialLocations 18 terrestrial region added, 28 updated
2014/05/24 12:10:13 TRACE (FakeWaoServiceContext.java:55) getNow injecting fake date in service: Mon Nov 02 00:00:00 CET 2009
2014/05/24 12:10:13 TRACE (FakeWaoServiceContext.java:55) getNow injecting fake date in service: Mon Nov 02 00:00:00 CET 2009
2014/05/24 12:10:13 TRACE (AbstractWaoServiceTest.java:217) tearDown closing transaction fr.ifremer.wao.WaoTopiaPersistenceContext@425294fd
2014/05/24 12:10:13 TRACE (AbstractWaoServiceTest.java:227) tearDown closing transaction fr.ifremer.wao.WaoTopiaApplicationContext@778c9e3a
Tests run: 9, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 27.425 sec - in fr.ifremer.wao.services.service.administration.ReferentialServiceTest
Running fr.ifremer.wao.services.service.ObsMerBoatsServiceTest
2014/05/24 12:10:13 TRACE (AbstractWaoServiceTest.java:172) getApplicationContext Copy referential database to 4725db23-9e80-4c07-8398-5117b51b39de
2014/05/24 12:10:13 TRACE (AbstractWaoServiceTest.java:182) getApplicationContext Copy referential database : Complete
2014/05/24 12:10:13 TRACE (AbstractWaoServiceTest.java:83) newApplicationContext will store H2 data in <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…>
2014/05/24 12:10:13 TRACE (AbstractWaoServiceTest.java:84) newApplicationContext allJpaParameters = {hibernate.c3p0.max_statements=50, hibernate.c3p0.max_size=20, topia.service.migration=org.nuiton.topia.flyway.TopiaFlywayServiceImpl, hibernate.c3p0.timeout=1800, hibernate.c3p0.min_size=5, hibernate.connection.url=jdbc:h2:<http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…,> hibernate.connection.driver_class=org.h2.Driver, hibernate.format_sql=true, hibernate.connection.username=sa, hibernate.connection.password=, hibernate.dialect=org.hibernate.dialect.H2Dialect, hibernate.show_sql=false, topia.persistence.topiaIdFactoryClassName=org.nuiton.topia.persistence.internal.LegacyTopiaIdFactory, hibernate.ejb.naming_strategy=org.hibernate.cfg.ImprovedNamingStrategy, topia.service.migration.flyway.initVersion=3.4.1}
2014/05/24 12:10:13 DEBUG (AbstractWaoServiceTest.java:88) newApplicationContext jdbc url is
jdbc:h2:<http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…>
2014/05/24 12:10:13 TRACE (AbstractWaoServiceTest.java:94) newApplicationContext created root context fr.ifremer.wao.WaoTopiaApplicationContext@3c455c6f
2014/05/24 12:10:13 TRACE (AbstractWaoServiceTest.java:202) newPersistenceContext opened transaction fr.ifremer.wao.WaoTopiaPersistenceContext@38910738
2014/05/24 12:10:13 TRACE (AbstractWaoServiceTest.java:202) newPersistenceContext opened transaction fr.ifremer.wao.WaoTopiaPersistenceContext@378eaf9d
2014/05/24 12:10:13 TRACE (BoatTopiaDao.java:137) toBoatHqlAndParametersBuilder query to filter boats for fr.ifremer.wao.BoatsFilter@4f68c919[elligibleForSampleRowsFilter=fr.ifremer.wao.SampleRowsFilter@686ab109[obsProgram=<null>,sampleRowIds=<null>,periodFrom=<null>,periodTo=<null>,fishingZoneFacadeNames=<null>,fishingZoneSectorNames=<null>,sampleRowCodes=<null>,programNames=<null>,fishingGearDcfIds=<null>,targetSpeciesDcfIds=<null>,samplingStrategies=<null>,terrestrialDistrictIds=<null>,companyIds=<null>,orderByArguments=<null>],boatName=<null>,registrationCode=<null>,boatNameOrRegistrationCode=<null>,boatIds=<null>,shipOwnerIds=<null>,districtIds=<null>,portOfRegistryIds=<null>,fleetIds=<null>] is from fr.ifremer.wao.entity.Boat b {}
2014/05/24 12:10:13 TRACE (AbstractWaoServiceTest.java:217) tearDown closing transaction fr.ifremer.wao.WaoTopiaPersistenceContext@38910738
2014/05/24 12:10:13 TRACE (AbstractWaoServiceTest.java:217) tearDown closing transaction fr.ifremer.wao.WaoTopiaPersistenceContext@378eaf9d
2014/05/24 12:10:13 TRACE (AbstractWaoServiceTest.java:227) tearDown closing transaction fr.ifremer.wao.WaoTopiaApplicationContext@3c455c6f
2014/05/24 12:10:13 TRACE (AbstractWaoServiceTest.java:172) getApplicationContext Copy referential database to 0cdbae5c-2a52-4d8c-9658-5464d71988ff
2014/05/24 12:10:14 TRACE (AbstractWaoServiceTest.java:182) getApplicationContext Copy referential database : Complete
2014/05/24 12:10:14 TRACE (AbstractWaoServiceTest.java:83) newApplicationContext will store H2 data in <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…>
2014/05/24 12:10:14 TRACE (AbstractWaoServiceTest.java:84) newApplicationContext allJpaParameters = {hibernate.c3p0.max_statements=50, hibernate.c3p0.max_size=20, topia.service.migration=org.nuiton.topia.flyway.TopiaFlywayServiceImpl, hibernate.c3p0.timeout=1800, hibernate.c3p0.min_size=5, hibernate.connection.url=jdbc:h2:<http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…,> hibernate.connection.driver_class=org.h2.Driver, hibernate.format_sql=true, hibernate.connection.username=sa, hibernate.connection.password=, hibernate.dialect=org.hibernate.dialect.H2Dialect, hibernate.show_sql=false, topia.persistence.topiaIdFactoryClassName=org.nuiton.topia.persistence.internal.LegacyTopiaIdFactory, hibernate.ejb.naming_strategy=org.hibernate.cfg.ImprovedNamingStrategy, topia.service.migration.flyway.initVersion=3.4.1}
2014/05/24 12:10:14 DEBUG (AbstractWaoServiceTest.java:88) newApplicationContext jdbc url is
jdbc:h2:<http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…>
2014/05/24 12:10:14 TRACE (AbstractWaoServiceTest.java:94) newApplicationContext created root context fr.ifremer.wao.WaoTopiaApplicationContext@71c9871f
2014/05/24 12:10:14 TRACE (AbstractWaoServiceTest.java:202) newPersistenceContext opened transaction fr.ifremer.wao.WaoTopiaPersistenceContext@3ba2944d
2014/05/24 12:10:14 TRACE (AbstractWaoServiceTest.java:202) newPersistenceContext opened transaction fr.ifremer.wao.WaoTopiaPersistenceContext@588df376
2014/05/24 12:10:14 TRACE (BoatTopiaDao.java:137) toBoatHqlAndParametersBuilder query to filter boats for fr.ifremer.wao.BoatsFilter@4a107705[elligibleForSampleRowsFilter=fr.ifremer.wao.SampleRowsFilter@7ef60f3f[obsProgram=<null>,sampleRowIds=<null>,periodFrom=<null>,periodTo=<null>,fishingZoneFacadeNames=<null>,fishingZoneSectorNames=<null>,sampleRowCodes=<null>,programNames=<null>,fishingGearDcfIds=<null>,targetSpeciesDcfIds=<null>,samplingStrategies=<null>,terrestrialDistrictIds=<null>,companyIds=<null>,orderByArguments=<null>],boatName=<null>,registrationCode=<null>,boatNameOrRegistrationCode=<null>,boatIds=<null>,shipOwnerIds=<null>,districtIds=<null>,portOfRegistryIds=<null>,fleetIds=<null>] is from fr.ifremer.wao.entity.Boat b {}
2014/05/24 12:10:14 TRACE (BoatTopiaDao.java:137) toBoatHqlAndParametersBuilder query to filter boats for fr.ifremer.wao.BoatsFilter@4a107705[elligibleForSampleRowsFilter=fr.ifremer.wao.SampleRowsFilter@7ef60f3f[obsProgram=<null>,sampleRowIds=<null>,periodFrom=<null>,periodTo=<null>,fishingZoneFacadeNames=<null>,fishingZoneSectorNames=<null>,sampleRowCodes=<null>,programNames=<null>,fishingGearDcfIds=<null>,targetSpeciesDcfIds=<null>,samplingStrategies=<null>,terrestrialDistrictIds=<null>,companyIds=<null>,orderByArguments=<null>],boatName=<null>,registrationCode=<null>,boatNameOrRegistrationCode=<null>,boatIds=<null>,shipOwnerIds=<null>,districtIds=<null>,portOfRegistryIds=<null>,fleetIds=<null>] is from fr.ifremer.wao.entity.Boat b {}
2014/05/24 12:10:14 TRACE (AbstractWaoServiceTest.java:217) tearDown closing transaction fr.ifremer.wao.WaoTopiaPersistenceContext@3ba2944d
2014/05/24 12:10:14 TRACE (AbstractWaoServiceTest.java:217) tearDown closing transaction fr.ifremer.wao.WaoTopiaPersistenceContext@588df376
2014/05/24 12:10:14 TRACE (AbstractWaoServiceTest.java:227) tearDown closing transaction fr.ifremer.wao.WaoTopiaApplicationContext@71c9871f
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.902 sec - in fr.ifremer.wao.services.service.ObsMerBoatsServiceTest
Running fr.ifremer.wao.services.service.InitWaoServiceTest
2014/05/24 12:10:14 TRACE (AbstractWaoServiceTest.java:83) newApplicationContext will store H2 data in <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…>
2014/05/24 12:10:14 TRACE (AbstractWaoServiceTest.java:84) newApplicationContext allJpaParameters = {hibernate.c3p0.max_statements=50, hibernate.c3p0.max_size=20, topia.service.migration=org.nuiton.topia.flyway.TopiaFlywayServiceImpl, hibernate.c3p0.timeout=1800, hibernate.c3p0.min_size=5, hibernate.connection.url=jdbc:h2:<http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…,> hibernate.connection.driver_class=org.h2.Driver, hibernate.format_sql=true, hibernate.connection.username=sa, hibernate.connection.password=, hibernate.dialect=org.hibernate.dialect.H2Dialect, hibernate.show_sql=false, topia.persistence.topiaIdFactoryClassName=org.nuiton.topia.persistence.internal.LegacyTopiaIdFactory, hibernate.ejb.naming_strategy=org.hibernate.cfg.ImprovedNamingStrategy, topia.service.migration.flyway.initVersion=3.4.1}
2014/05/24 12:10:14 DEBUG (AbstractWaoServiceTest.java:88) newApplicationContext jdbc url is
jdbc:h2:<http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…>
2014/05/24 12:10:14 TRACE (AbstractWaoServiceTest.java:94) newApplicationContext created root context fr.ifremer.wao.WaoTopiaApplicationContext@4b0220ad
2014/05/24 12:10:14 TRACE (AbstractWaoServiceTest.java:202) newPersistenceContext opened transaction fr.ifremer.wao.WaoTopiaPersistenceContext@696ea7f6
2014/05/24 12:10:14 TRACE (AbstractWaoServiceTest.java:217) tearDown closing transaction fr.ifremer.wao.WaoTopiaPersistenceContext@696ea7f6
2014/05/24 12:10:14 TRACE (AbstractWaoServiceTest.java:227) tearDown closing transaction fr.ifremer.wao.WaoTopiaApplicationContext@4b0220ad
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.554 sec - in fr.ifremer.wao.services.service.InitWaoServiceTest
Results :
Tests in error:
ObsMerContactsServiceTest.testImportContacts:89 » NullPointer
ObsMerSamplingPlanServiceTest.testRecomputeSampleRowEstimatedAndRealTides:170 » NullPointer
Tests run: 23, Failures: 0, Errors: 2, Skipped: 0
[ERROR] There are test failures.
Please refer to <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…> for the individual test results.
[JENKINS] Recording test results
[INFO]
[INFO] --- maven-jar-plugin:2.4:jar (default-jar) @ wao-services ---
[INFO] Building jar: <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…>
[INFO]
[INFO] >>> maven-source-plugin:2.2.1:jar (attach-sources) @ wao-services >>>
[INFO]
[INFO] --- maven-enforcer-plugin:1.3.1:enforce (ensure-no-container-api) @ wao-services ---
[INFO]
[INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ wao-services ---
[INFO]
[INFO] --- helper-maven-plugin:2.1:share-server-secret (get-redmine-login) @ wao-services ---
[INFO] Skipping goal (runOnce flag is on and goal was already executed).
[WARNING] Failed to getClass for org.apache.maven.plugin.source.SourceJarMojo
[INFO]
[INFO] <<< maven-source-plugin:2.2.1:jar (attach-sources) @ wao-services <<<
[INFO]
[INFO] --- maven-source-plugin:2.2.1:jar (attach-sources) @ wao-services ---
[INFO] Building jar: <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…>
[INFO]
[INFO] --- maven-javadoc-plugin:2.9.1:jar (attach-javadocs) @ wao-services ---
[INFO]
1 warning
[WARNING] Javadoc Warnings
[WARNING] <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…>:572: warning - @returns is an unknown tag.
[INFO] Building jar: <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-services/ws/…>
[INFO]
[INFO] --- maven-site-plugin:3.3:attach-descriptor (attach-descriptor) @ wao-services ---
[INFO]
[INFO] --- helper-maven-plugin:2.1:share-server-secret (get-pgp-passphrase) @ wao-services ---
[INFO] Exporting server [gpg-signer] username in ${gpg.keyname}
[INFO] Exporting server [gpg-signer] password in ${gpg.passphrase}
[INFO]
[INFO] --- helper-maven-plugin:2.1:collect-files (collect-build-artifacts) @ wao-services ---
[INFO] Loaded /var/local/forge/data/codelutin.com/jenkins/workspace/wao-nightly/trunk/target/collect-artifacts.txt
[INFO] Copying wao-services-4.0-SNAPSHOT.jar to /var/local/forge/data/codelutin.com/jenkins/workspace/wao-nightly/trunk/target/collect/fr.ifremer--wao-services/wao-services-4.0-SNAPSHOT.jar
[INFO] Copying THIRD-PARTY.properties to /var/local/forge/data/codelutin.com/jenkins/workspace/wao-nightly/trunk/target/collect/fr.ifremer--wao-services/THIRD-PARTY.properties
[INFO] Copying wao-services-4.0-SNAPSHOT-sources.jar to /var/local/forge/data/codelutin.com/jenkins/workspace/wao-nightly/trunk/target/collect/fr.ifremer--wao-services/wao-services-4.0-SNAPSHOT-sources.jar
[INFO] Copying wao-services-4.0-SNAPSHOT-javadoc.jar to /var/local/forge/data/codelutin.com/jenkins/workspace/wao-nightly/trunk/target/collect/fr.ifremer--wao-services/wao-services-4.0-SNAPSHOT-javadoc.jar
[INFO]
[INFO] --- helper-maven-plugin:2.1:collect-files (collect-build-attachements) @ wao-services ---
[WARNING] Skipping goal (No file to collect).
[INFO]
[INFO] --- maven-gpg-plugin:1.5:sign (sign-artifacts) @ wao-services ---
[INFO]
[INFO] --- maven-dependency-plugin:2.8:analyze-only (analyze) @ wao-services ---
[INFO] Used declared dependencies found:
[INFO] org.nuiton:nuiton-csv:jar:3.0-alpha-3:compile
[INFO] org.nuiton.i18n:nuiton-i18n:jar:3.0:compile
[INFO] org.nuiton:nuiton-utils:jar:3.0-SNAPSHOT:compile
[INFO] com.github.spullara.mustache.java:compiler:jar:0.8.13:compile
[INFO] org.apache.commons:commons-email:jar:1.3.2:compile
[INFO] com.h2database:h2:jar:1.3.175:test
[INFO] fr.ifremer:wao-persistence:jar:4.0-SNAPSHOT:compile
[INFO] org.nuiton.topia:topia-persistence:jar:3.0-beta-4:compile
[INFO] org.hibernate:hibernate-core:jar:4.3.5.Final:compile
[INFO] org.apache.commons:commons-lang3:jar:3.3.2:compile
[INFO] commons-logging:commons-logging:jar:1.1.3:compile
[INFO] com.google.guava:guava:jar:16.0.1:compile
[INFO] org.apache.commons:commons-collections4:jar:4.0:compile
[INFO] commons-io:commons-io:jar:2.4:compile
[INFO] junit:junit:jar:4.11:test
[INFO] org.apache.struts.xwork:xwork-core:jar:2.3.16.1:compile
[INFO] org.mockito:mockito-core:jar:1.9.5:test
[WARNING] Used undeclared dependencies found:
[WARNING] commons-beanutils:commons-beanutils:jar:1.9.1:compile
[JENKINS] Archiving disabled
1
2
r1985 - trunk/wao-services/src/main/java/fr/ifremer/wao/services/service
by bleny＠users.forge.codelutin.com May 27, 2014
by bleny＠users.forge.codelutin.com May 27, 2014
May 27, 2014
Author: bleny
Date: 2014-05-27 17:31:39 +0200 (Tue, 27 May 2014)
New Revision: 1985
Url: http://forge.codelutin.com/projects/wao/repository/revisions/1985
Log:
change Service to Sector
Modified:
trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanBuilder.java
Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanBuilder.java
===================================================================
--- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanBuilder.java 2014-05-27 14:17:54 UTC (rev 1984)
+++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanBuilder.java 2014-05-27 15:31:39 UTC (rev 1985)
@@ -171,7 +171,7 @@
String sectors = sampleRow.getSectors();
// get sector context
- ServiceContext sectorPart = facadeContext.getOrAddSectorContext(sectors);
+ SectorContext sectorPart = facadeContext.getOrAddSectorContext(sectors);
// compute nb tides per month
Map<Date, ObsMerSamplingPlan.ObsMerSamplingPlanStatistics> nbTidesPerMonth = computeNbTidesPerMonth(sampleRow);
@@ -280,19 +280,19 @@
protected String facade;
- protected Map<String, ServiceContext> sectorMap;
+ protected Map<String, SectorContext> sectorMap;
protected FacadeContext(String facade) {
this.facade = facade;
this.sectorMap = new TreeMap<>();
}
- protected ServiceContext getOrAddSectorContext(String sectors) {
- ServiceContext sectorPart = sectorMap.get(sectors);
+ protected SectorContext getOrAddSectorContext(String sectors) {
+ SectorContext sectorPart = sectorMap.get(sectors);
if (sectorPart == null) {
// register a new sector
- sectorPart = new ServiceContext(sectors);
+ sectorPart = new SectorContext(sectors);
sectorMap.put(sectors, sectorPart);
}
return sectorPart;
@@ -302,8 +302,8 @@
// get sector parts
Collection<ObsMerSamplingPlan.ObsMerSamplingPlanSectorPart> sectorParts = new ArrayList<>();
- for (ServiceContext serviceContext : sectorMap.values()) {
- ObsMerSamplingPlan.ObsMerSamplingPlanSectorPart sectorPart = serviceContext.toBean();
+ for (SectorContext sectorContext : sectorMap.values()) {
+ ObsMerSamplingPlan.ObsMerSamplingPlanSectorPart sectorPart = sectorContext.toBean();
sectorParts.add(sectorPart);
}
// sort them
@@ -318,13 +318,13 @@
}
}
- protected static class ServiceContext {
+ protected static class SectorContext {
protected String sectors;
protected Collection<ObsMerSamplingPlan.ObsMerSamplingPlanSampleRowPart> rows;
- protected ServiceContext(String sectors) {
+ protected SectorContext(String sectors) {
this.sectors = sectors;
this.rows = new ArrayList<>();
}
1
0
r1984 - in trunk: wao-persistence/src/main/java/fr/ifremer/wao/entity wao-services/src/main/java/fr/ifremer/wao/services/service wao-web/src/main/webapp/WEB-INF/content/obsmer
by bleny＠users.forge.codelutin.com May 27, 2014
by bleny＠users.forge.codelutin.com May 27, 2014
May 27, 2014
Author: bleny
Date: 2014-05-27 16:17:54 +0200 (Tue, 27 May 2014)
New Revision: 1984
Url: http://forge.codelutin.com/projects/wao/repository/revisions/1984
Log:
refs #4487 add compliance boarding
Modified:
trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactTopiaDao.java
trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSynthesis.java
trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SynthesisService.java
trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/synthesis.jsp
Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactTopiaDao.java
===================================================================
--- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactTopiaDao.java 2014-05-27 13:00:46 UTC (rev 1983)
+++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactTopiaDao.java 2014-05-27 14:17:54 UTC (rev 1984)
@@ -318,4 +318,52 @@
return data;
}
+
+ protected Map<String, Long> countByCompany(HqlAndParametersBuilder<Contact> hqlAndParametersBuilder) {
+
+ String hql = hqlAndParametersBuilder.getHql();
+
+ hql = "select c.sampleRow.company.name, count(c.topiaId) " + hql + " group by c.sampleRow.company.name order by c.sampleRow.company.name";
+
+ if (log.isDebugEnabled()) {
+ log.debug("query count by company" + hql);
+ }
+
+ List<Object[]> findAll = findAll(hql, hqlAndParametersBuilder.getHqlParameters());
+
+ Map<String, Long> countByCompany = new LinkedHashMap<>();
+ for (Object[] row : findAll) {
+ countByCompany.put((String) row[0], (long) row[1]);
+ }
+
+ return countByCompany;
+ }
+
+ public Map<String, Double> getComplianceBoardingIndicator(ContactsFilter filter) {
+
+ HqlAndParametersBuilder<Contact> hqlAndParametersBuilder = toContactHqlAndParametersBuilder(filter);
+
+ Map<String, Long> countContactsByCompany = countByCompany(hqlAndParametersBuilder);
+
+ hqlAndParametersBuilder.addWhereClause("c." + Contact.PROPERTY_NB_OBSERVANTS + " >= c.sampleRow." + SampleRow.PROPERTY_NB_OBSERVANTS);
+
+ Map<String, Long> countContactsWithComplianceByCompany = countByCompany(hqlAndParametersBuilder);
+
+ Map<String, Double> complianceBoardingIndicator = new LinkedHashMap<>();
+ for (Map.Entry<String, Long> entry : countContactsByCompany.entrySet()) {
+
+ String companyName = entry.getKey();
+ Long contactsCount = entry.getValue();
+
+ Long contactsWithComplianceCount = countContactsWithComplianceByCompany.get(companyName);
+ if (contactsWithComplianceCount == null) {
+ contactsWithComplianceCount = 0l;
+ }
+
+ Double ratio = contactsWithComplianceCount.doubleValue() / contactsCount.doubleValue();
+ complianceBoardingIndicator.put(companyName, ratio);
+ }
+
+ return complianceBoardingIndicator;
+ }
}
Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSynthesis.java
===================================================================
--- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSynthesis.java 2014-05-27 13:00:46 UTC (rev 1983)
+++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSynthesis.java 2014-05-27 14:17:54 UTC (rev 1984)
@@ -3,6 +3,8 @@
import fr.ifremer.wao.entity.Boat;
import fr.ifremer.wao.services.utils.BarChartData;
+import java.util.Map;
+
public class ObsMerSynthesis {
protected BarChartData expectedVsActualObservationsByMonthsBarChartData;
@@ -19,6 +21,8 @@
protected int validBoardingsCount;
+ protected Map<String, Double> complianceBoardingIndicator;
+
public BarChartData getExpectedVsActualObservationsByMonthsBarChartData() {
return expectedVsActualObservationsByMonthsBarChartData;
}
@@ -74,4 +78,12 @@
public void setValidBoardingsCount(int validBoardingsCount) {
this.validBoardingsCount = validBoardingsCount;
}
+
+ public void setComplianceBoardingIndicator(Map<String, Double> complianceBoardingIndicator) {
+ this.complianceBoardingIndicator = complianceBoardingIndicator;
+ }
+
+ public Map<String, Double> getComplianceBoardingIndicator() {
+ return complianceBoardingIndicator;
+ }
}
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-05-27 13:00:46 UTC (rev 1983)
+++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SynthesisService.java 2014-05-27 14:17:54 UTC (rev 1984)
@@ -45,10 +45,22 @@
setBoardingBoatsData(obsMerSynthesis, filter);
+ setComplianceBoardingIndicator(obsMerSynthesis, filter);
+
return obsMerSynthesis;
}
+ protected void setComplianceBoardingIndicator(ObsMerSynthesis obsMerSynthesis, ContactsFilter filter) {
+
+ ContactTopiaDao dao = getContactDao();
+
+ Map<String, Double> complianceBoardingIndicator = dao.getComplianceBoardingIndicator(filter);
+
+ obsMerSynthesis.setComplianceBoardingIndicator(complianceBoardingIndicator);
+
+ }
+
/**
* Un graphique avec, pour chaque mois, deux barres qui représentent l'effort demandé
* vs l'effort réalisé.
Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/synthesis.jsp
===================================================================
--- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/synthesis.jsp 2014-05-27 13:00:46 UTC (rev 1983)
+++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/synthesis.jsp 2014-05-27 14:17:54 UTC (rev 1984)
@@ -101,6 +101,34 @@
<s:text name="SynthesisId.IND_COMPLIANCE_BOARDING"/>
</h2>
+ <table class="table">
+ <thead>
+ <tr>
+ <th>
+ <s:text name="wao.ui.entity.Company"/>
+ </th>
+ <th>
+ <s:text name="wao.ui.synthesis.complianceBoarding.description"/>
+ </th>
+ </tr>
+ </thead>
+ <tbody>
+ <s:iterator value="synthesis.complianceBoardingIndicator">
+ <tr>
+ <td>
+ <s:property value="key"/>
+ </td>
+ <td>
+ <s:property value="value * 100"/> %
+ </td>
+ </tr>
+ </s:iterator>
+ </tbody>
+ </table>
+
+ <s:if test="authenticatedWaoUser.authorizedToViewOtherCompanies">
+ </s:if>
+
</article>
<article>
1
0
r1983 - in trunk/wao-web/src/main: resources/fr/ifremer/wao/web/action/obsmer webapp/WEB-INF/content/obsmer
by bleny＠users.forge.codelutin.com May 27, 2014
by bleny＠users.forge.codelutin.com May 27, 2014
May 27, 2014
Author: bleny
Date: 2014-05-27 15:00:46 +0200 (Tue, 27 May 2014)
New Revision: 1983
Url: http://forge.codelutin.com/projects/wao/repository/revisions/1983
Log:
refs #4487 refs #4493 extract a component for contacts filter and use it in contacts and synthesis
Added:
trunk/wao-web/src/main/resources/fr/ifremer/wao/web/action/obsmer/SynthesisAction-conversion.properties
trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts-filter.jsp
Modified:
trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp
trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/synthesis.jsp
Copied: trunk/wao-web/src/main/resources/fr/ifremer/wao/web/action/obsmer/SynthesisAction-conversion.properties (from rev 1982, trunk/wao-web/src/main/resources/fr/ifremer/wao/web/action/obsmer/ContactsAction-conversion.properties)
===================================================================
--- trunk/wao-web/src/main/resources/fr/ifremer/wao/web/action/obsmer/SynthesisAction-conversion.properties (rev 0)
+++ trunk/wao-web/src/main/resources/fr/ifremer/wao/web/action/obsmer/SynthesisAction-conversion.properties 2014-05-27 13:00:46 UTC (rev 1983)
@@ -0,0 +1 @@
+filter=org.nuiton.web.struts2.converters.JsonConverter
Added: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts-filter.jsp
===================================================================
--- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts-filter.jsp (rev 0)
+++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts-filter.jsp 2014-05-27 13:00:46 UTC (rev 1983)
@@ -0,0 +1,163 @@
+<head>
+ <script>
+
+ $(document).ready(function () {
+
+ var contactsFilterMappings = [
+ <s:if test="authenticatedWaoUser.authorizedToViewOtherCompanies">
+ {
+ filterName: 'sampleRowFilter.companyIds',
+ filterLabel: "<s:text name="wao.ui.entity.Company"/>",
+ filterValuesField: 'sampleRowsFilterValues.companies',
+ },
+ </s:if>
+ {
+ filterName: 'sampleRowFilter.sampleRowCodes',
+ filterLabel: "<s:text name="wao.ui.field.SampleRow.code"/>",
+ filterValuesField: 'sampleRowsFilterValues.sampleRowCodes',
+ },
+ {
+ filterName: 'sampleRowFilter.programNames',
+ filterLabel: "<s:text name="wao.ui.field.SampleRow.programName"/>",
+ filterValuesField: 'sampleRowsFilterValues.programNames',
+ },
+ {
+ filterName: 'sampleRowFilter.fishingZoneFacadeNames',
+ filterLabel: "<s:text name="wao.ui.field.FishingZone.facadeName"/>",
+ filterValuesField: 'sampleRowsFilterValues.fishingZoneFacadeNames',
+ },
+ {
+ filterName: 'sampleRowFilter.fishingZoneSectorNames',
+ filterLabel: "<s:text name="wao.ui.field.FishingZone.sectorName"/>",
+ filterValuesField: 'sampleRowsFilterValues.fishingZoneSectorNames',
+ },
+ {
+ filterName: 'sampleRowFilter.fishingGearDcfIds',
+ filterLabel: "<s:text name="wao.ui.entity.fishingGearDCF"/>",
+ filterValuesField: 'sampleRowsFilterValues.fishingGearDcfs',
+ },
+ {
+ filterName: 'sampleRowFilter.targetSpeciesDcfIds',
+ filterLabel: "<s:text name="wao.ui.entity.targetSpeciesDCF"/>",
+ filterValuesField: 'sampleRowsFilterValues.targetSpeciesDcfs',
+ },
+ {
+ filterName: 'boatFilter.boatIds',
+ filterLabel: "<s:text name="wao.ui.entity.Boat"/>",
+ filterValuesField: 'boatsFilterValues.boats',
+ minimumInputLength: 3
+ },
+ {
+ filterName: 'boatFilter.districtIds',
+ filterLabel: "<s:text name="wao.ui.field.Boat.district"/>",
+ filterValuesField: 'boatsFilterValues.districts'
+ },
+ {
+ filterName: 'observerIds',
+ filterLabel: "<s:text name="wao.ui.misc.observer"/>",
+ filterValuesField: 'observers'
+ },
+ {
+ filterName: 'contactStates',
+ filterLabel: "<s:text name="wao.ui.field.Contact.contactState"/>",
+ filterValuesField: 'contactStates'
+ },
+ {
+ filterName: 'companyAcceptations',
+ filterLabel: "<s:text name="wao.ui.field.Contact.validationCompany"/>",
+ filterValuesField: 'companyAcceptations'
+ },
+ {
+ filterName: 'programAcceptations',
+ filterLabel: "<s:text name="wao.ui.field.Contact.validationProgram"/>",
+ filterValuesField: 'programAcceptations'
+ },
+ {
+ filterName: 'observedDataControls',
+ filterLabel: "<s:text name="wao.ui.field.Contact.observedDataControl"/>",
+ filterValuesField: 'observedDataControls'
+ },
+ {
+ filterName: 'dataReliabilities',
+ filterLabel: "<s:text name="wao.ui.field.Contact.dataReliability"/>",
+ filterValuesField: 'dataReliabilities'
+ }
+ ];
+
+ filter = <s:property value="filter" escapeHtml="false"/>;
+
+ contactsFilterController2 = new FilterController2(contactsFilterMappings, filter, WAO.OBSMER_CONTACTS_FILTER_VALUES_JSON_URL, $('#contacts-filters-form fieldset.extra-filters'));
+ contactsFilterController2.init();
+
+ });
+
+ </script>
+</head>
+
+
+<s:form method="GET" id="contacts-filters-form" cssClass="filters-form">
+
+ <fieldset>
+
+ <s:textfield name="filter.periodFrom"
+ label="%{getText('wao.ui.form.periodFrom')}"
+ placeholder="%{getFilterPeriodFromPlaceholder()}"
+ cssClass="input-small"/>
+
+ <s:textfield name="filter.periodTo"
+ label="%{getText('wao.ui.form.period.to')}"
+ placeholder="%{getFilterPeriodToPlaceholder()}"
+ cssClass="input-small"/>
+
+ <s:checkbox name="filter.filterOnObservationBeginDate"
+ label="%{getText('wao.ui.form.filterOnObservationBeginDate')}"/>
+
+ </fieldset>
+
+ <fieldset class="extra-filters">
+
+ </fieldset>
+
+ <fieldset>
+
+ <s:checkbox name="filter.mammalsObservationOnly"
+ label="%{getText('wao.ui.misc.observations')}"/>
+
+ <s:checkbox name="filter.mammalsCaptureOnly"
+ label="%{getText('wao.ui.field.Contact.mammalsCapture')}"/>
+
+ <s:checkbox name="filter.commentDefinedOnly"
+ label="%{getText('wao.ui.field.Contact.comment')}"/>
+
+ <s:checkbox name="filter.commentCompanyDefinedOnly"
+ label="%{getText('wao.ui.field.Contact.commentCompany')}"/>
+
+ <s:checkbox name="filter.commentAdminDefinedOnly"
+ label="%{getText('wao.ui.field.Contact.commentAdmin')}"/>
+
+ </fieldset>
+
+ <fieldset>
+
+ <s:checkbox name="filter.sortedByBoardingDate"
+ label="%{getText('wao.ui.form.sortByTideBegin')}"/>
+
+ </fieldset>
+
+ <div class="form-actions">
+
+ <s:submit type="button" cssClass="btn btn-primary">
+ <i class="icon-filter"></i> <s:text name="wao.ui.action.filter"/>
+ </s:submit>
+
+ <s:submit action="reset-contacts-filter" type="button" cssClass="btn">
+ <i class="icon-reset"></i> <s:text name="wao.ui.action.reset"/>
+ </s:submit>
+
+ <s:submit action="export-contacts" type="button" cssClass="btn">
+ <i class="icon-download"></i> <s:text name="wao.ui.action.csvExport"/>
+ </s:submit>
+
+ </div>
+
+</s:form>
\ No newline at end of file
Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp
===================================================================
--- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp 2014-05-27 12:49:58 UTC (rev 1982)
+++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp 2014-05-27 13:00:46 UTC (rev 1983)
@@ -32,95 +32,6 @@
$(document).ready(function () {
-// var contactsFilterController = new FilterController(WAO.OBSMER_CONTACTS_FILTER_VALUES_JSON_URL, $('#contacts-filters-form'));
-// contactsFilterController.init();
-
- var contactsFilterMappings = [
- <s:if test="authenticatedWaoUser.authorizedToViewOtherCompanies">
- {
- filterName: 'sampleRowFilter.companyIds',
- filterLabel: "<s:text name="wao.ui.entity.Company"/>",
- filterValuesField: 'sampleRowsFilterValues.companies',
- },
- </s:if>
- {
- filterName: 'sampleRowFilter.sampleRowCodes',
- filterLabel: "<s:text name="wao.ui.field.SampleRow.code"/>",
- filterValuesField: 'sampleRowsFilterValues.sampleRowCodes',
- },
- {
- filterName: 'sampleRowFilter.programNames',
- filterLabel: "<s:text name="wao.ui.field.SampleRow.programName"/>",
- filterValuesField: 'sampleRowsFilterValues.programNames',
- },
- {
- filterName: 'sampleRowFilter.fishingZoneFacadeNames',
- filterLabel: "<s:text name="wao.ui.field.FishingZone.facadeName"/>",
- filterValuesField: 'sampleRowsFilterValues.fishingZoneFacadeNames',
- },
- {
- filterName: 'sampleRowFilter.fishingZoneSectorNames',
- filterLabel: "<s:text name="wao.ui.field.FishingZone.sectorName"/>",
- filterValuesField: 'sampleRowsFilterValues.fishingZoneSectorNames',
- },
- {
- filterName: 'sampleRowFilter.fishingGearDcfIds',
- filterLabel: "<s:text name="wao.ui.entity.fishingGearDCF"/>",
- filterValuesField: 'sampleRowsFilterValues.fishingGearDcfs',
- },
- {
- filterName: 'sampleRowFilter.targetSpeciesDcfIds',
- filterLabel: "<s:text name="wao.ui.entity.targetSpeciesDCF"/>",
- filterValuesField: 'sampleRowsFilterValues.targetSpeciesDcfs',
- },
- {
- filterName: 'boatFilter.boatIds',
- filterLabel: "<s:text name="wao.ui.entity.Boat"/>",
- filterValuesField: 'boatsFilterValues.boats',
- minimumInputLength: 3
- },
- {
- filterName: 'boatFilter.districtIds',
- filterLabel: "<s:text name="wao.ui.field.Boat.district"/>",
- filterValuesField: 'boatsFilterValues.districts'
- },
- {
- filterName: 'observerIds',
- filterLabel: "<s:text name="wao.ui.misc.observer"/>",
- filterValuesField: 'observers'
- },
- {
- filterName: 'contactStates',
- filterLabel: "<s:text name="wao.ui.field.Contact.contactState"/>",
- filterValuesField: 'contactStates'
- },
- {
- filterName: 'companyAcceptations',
- filterLabel: "<s:text name="wao.ui.field.Contact.validationCompany"/>",
- filterValuesField: 'companyAcceptations'
- },
- {
- filterName: 'programAcceptations',
- filterLabel: "<s:text name="wao.ui.field.Contact.validationProgram"/>",
- filterValuesField: 'programAcceptations'
- },
- {
- filterName: 'observedDataControls',
- filterLabel: "<s:text name="wao.ui.field.Contact.observedDataControl"/>",
- filterValuesField: 'observedDataControls'
- },
- {
- filterName: 'dataReliabilities',
- filterLabel: "<s:text name="wao.ui.field.Contact.dataReliability"/>",
- filterValuesField: 'dataReliabilities'
- }
- ];
-
- filter = <s:property value="filter" escapeHtml="false"/>;
-
- contactsFilterController2 = new FilterController2(contactsFilterMappings, filter, WAO.OBSMER_CONTACTS_FILTER_VALUES_JSON_URL, $('#contacts-filters-form fieldset.extra-filters'));
- contactsFilterController2.init();
-
$('#switch-compact-full-view').click(function () {
$('#switch-compact-full-view').toggleClass('full-view').toggleClass('compact-view');
$('table.contacts-list').toggleClass('full-view').toggleClass('compact-view');
@@ -155,73 +66,8 @@
<content tag="mainClass">large</content>
<content tag="contactsMenuItemClass">active</content>
-<s:form method="GET" id="contacts-filters-form" cssClass="filters-form">
+<%@include file="contacts-filter.jsp"%>
- <fieldset>
-
- <s:textfield name="filter.periodFrom"
- label="%{getText('wao.ui.form.periodFrom')}"
- placeholder="%{getFilterPeriodFromPlaceholder()}"
- cssClass="input-small"/>
-
- <s:textfield name="filter.periodTo"
- label="%{getText('wao.ui.form.period.to')}"
- placeholder="%{getFilterPeriodToPlaceholder()}"
- cssClass="input-small"/>
-
- <s:checkbox name="filter.filterOnObservationBeginDate"
- label="%{getText('wao.ui.form.filterOnObservationBeginDate')}"/>
-
- </fieldset>
-
- <fieldset class="extra-filters">
-
- </fieldset>
-
- <fieldset>
-
- <s:checkbox name="filter.mammalsObservationOnly"
- label="%{getText('wao.ui.misc.observations')}"/>
-
- <s:checkbox name="filter.mammalsCaptureOnly"
- label="%{getText('wao.ui.field.Contact.mammalsCapture')}"/>
-
- <s:checkbox name="filter.commentDefinedOnly"
- label="%{getText('wao.ui.field.Contact.comment')}"/>
-
- <s:checkbox name="filter.commentCompanyDefinedOnly"
- label="%{getText('wao.ui.field.Contact.commentCompany')}"/>
-
- <s:checkbox name="filter.commentAdminDefinedOnly"
- label="%{getText('wao.ui.field.Contact.commentAdmin')}"/>
-
- </fieldset>
-
- <fieldset>
-
- <s:checkbox name="filter.sortedByBoardingDate"
- label="%{getText('wao.ui.form.sortByTideBegin')}"/>
-
- </fieldset>
-
- <div class="form-actions">
-
- <s:submit type="button" cssClass="btn btn-primary">
- <i class="icon-filter"></i> <s:text name="wao.ui.action.filter"/>
- </s:submit>
-
- <s:submit action="reset-contacts-filter" type="button" cssClass="btn">
- <i class="icon-reset"></i> <s:text name="wao.ui.action.reset"/>
- </s:submit>
-
- <s:submit action="export-contacts" type="button" cssClass="btn">
- <i class="icon-download"></i> <s:text name="wao.ui.action.csvExport"/>
- </s:submit>
-
- </div>
-
-</s:form>
-
<h3>
<s:text name="wao.ui.contacts.title">
<s:param value="%{pagination.nbRecords}"/>
Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/synthesis.jsp
===================================================================
--- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/synthesis.jsp 2014-05-27 12:49:58 UTC (rev 1982)
+++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/synthesis.jsp 2014-05-27 13:00:46 UTC (rev 1983)
@@ -55,6 +55,8 @@
<content tag="mainClass"></content>
+ <%@include file="contacts-filter.jsp"%>
+
<article>
<h2>
<s:text name="SynthesisId.GRAPH_SAMPLING"/>
1
0
r1982 - in trunk/wao-web/src/main: resources/fr/ifremer/wao/web/action/obsmer webapp/WEB-INF/content/obsmer
by bleny＠users.forge.codelutin.com May 27, 2014
by bleny＠users.forge.codelutin.com May 27, 2014
May 27, 2014
Author: bleny
Date: 2014-05-27 14:49:58 +0200 (Tue, 27 May 2014)
New Revision: 1982
Url: http://forge.codelutin.com/projects/wao/repository/revisions/1982
Log:
refs #4487 use new filters in contacts
Added:
trunk/wao-web/src/main/resources/fr/ifremer/wao/web/action/obsmer/ContactsAction-conversion.properties
Modified:
trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp
Copied: trunk/wao-web/src/main/resources/fr/ifremer/wao/web/action/obsmer/ContactsAction-conversion.properties (from rev 1977, trunk/wao-web/src/main/resources/fr/ifremer/wao/web/action/obsmer/BoatsAction-conversion.properties)
===================================================================
--- trunk/wao-web/src/main/resources/fr/ifremer/wao/web/action/obsmer/ContactsAction-conversion.properties (rev 0)
+++ trunk/wao-web/src/main/resources/fr/ifremer/wao/web/action/obsmer/ContactsAction-conversion.properties 2014-05-27 12:49:58 UTC (rev 1982)
@@ -0,0 +1 @@
+filter=org.nuiton.web.struts2.converters.JsonConverter
Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp
===================================================================
--- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp 2014-05-27 09:34:43 UTC (rev 1981)
+++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp 2014-05-27 12:49:58 UTC (rev 1982)
@@ -32,9 +32,95 @@
$(document).ready(function () {
- var contactsFilterController = new FilterController(WAO.OBSMER_CONTACTS_FILTER_VALUES_JSON_URL, $('#contacts-filters-form'));
- contactsFilterController.init();
+// var contactsFilterController = new FilterController(WAO.OBSMER_CONTACTS_FILTER_VALUES_JSON_URL, $('#contacts-filters-form'));
+// contactsFilterController.init();
+ var contactsFilterMappings = [
+ <s:if test="authenticatedWaoUser.authorizedToViewOtherCompanies">
+ {
+ filterName: 'sampleRowFilter.companyIds',
+ filterLabel: "<s:text name="wao.ui.entity.Company"/>",
+ filterValuesField: 'sampleRowsFilterValues.companies',
+ },
+ </s:if>
+ {
+ filterName: 'sampleRowFilter.sampleRowCodes',
+ filterLabel: "<s:text name="wao.ui.field.SampleRow.code"/>",
+ filterValuesField: 'sampleRowsFilterValues.sampleRowCodes',
+ },
+ {
+ filterName: 'sampleRowFilter.programNames',
+ filterLabel: "<s:text name="wao.ui.field.SampleRow.programName"/>",
+ filterValuesField: 'sampleRowsFilterValues.programNames',
+ },
+ {
+ filterName: 'sampleRowFilter.fishingZoneFacadeNames',
+ filterLabel: "<s:text name="wao.ui.field.FishingZone.facadeName"/>",
+ filterValuesField: 'sampleRowsFilterValues.fishingZoneFacadeNames',
+ },
+ {
+ filterName: 'sampleRowFilter.fishingZoneSectorNames',
+ filterLabel: "<s:text name="wao.ui.field.FishingZone.sectorName"/>",
+ filterValuesField: 'sampleRowsFilterValues.fishingZoneSectorNames',
+ },
+ {
+ filterName: 'sampleRowFilter.fishingGearDcfIds',
+ filterLabel: "<s:text name="wao.ui.entity.fishingGearDCF"/>",
+ filterValuesField: 'sampleRowsFilterValues.fishingGearDcfs',
+ },
+ {
+ filterName: 'sampleRowFilter.targetSpeciesDcfIds',
+ filterLabel: "<s:text name="wao.ui.entity.targetSpeciesDCF"/>",
+ filterValuesField: 'sampleRowsFilterValues.targetSpeciesDcfs',
+ },
+ {
+ filterName: 'boatFilter.boatIds',
+ filterLabel: "<s:text name="wao.ui.entity.Boat"/>",
+ filterValuesField: 'boatsFilterValues.boats',
+ minimumInputLength: 3
+ },
+ {
+ filterName: 'boatFilter.districtIds',
+ filterLabel: "<s:text name="wao.ui.field.Boat.district"/>",
+ filterValuesField: 'boatsFilterValues.districts'
+ },
+ {
+ filterName: 'observerIds',
+ filterLabel: "<s:text name="wao.ui.misc.observer"/>",
+ filterValuesField: 'observers'
+ },
+ {
+ filterName: 'contactStates',
+ filterLabel: "<s:text name="wao.ui.field.Contact.contactState"/>",
+ filterValuesField: 'contactStates'
+ },
+ {
+ filterName: 'companyAcceptations',
+ filterLabel: "<s:text name="wao.ui.field.Contact.validationCompany"/>",
+ filterValuesField: 'companyAcceptations'
+ },
+ {
+ filterName: 'programAcceptations',
+ filterLabel: "<s:text name="wao.ui.field.Contact.validationProgram"/>",
+ filterValuesField: 'programAcceptations'
+ },
+ {
+ filterName: 'observedDataControls',
+ filterLabel: "<s:text name="wao.ui.field.Contact.observedDataControl"/>",
+ filterValuesField: 'observedDataControls'
+ },
+ {
+ filterName: 'dataReliabilities',
+ filterLabel: "<s:text name="wao.ui.field.Contact.dataReliability"/>",
+ filterValuesField: 'dataReliabilities'
+ }
+ ];
+
+ filter = <s:property value="filter" escapeHtml="false"/>;
+
+ contactsFilterController2 = new FilterController2(contactsFilterMappings, filter, WAO.OBSMER_CONTACTS_FILTER_VALUES_JSON_URL, $('#contacts-filters-form fieldset.extra-filters'));
+ contactsFilterController2.init();
+
$('#switch-compact-full-view').click(function () {
$('#switch-compact-full-view').toggleClass('full-view').toggleClass('compact-view');
$('table.contacts-list').toggleClass('full-view').toggleClass('compact-view');
@@ -88,127 +174,12 @@
</fieldset>
- <fieldset>
+ <fieldset class="extra-filters">
- <s:select name="filter.sampleRowFilter.sampleRowCodes"
- label="%{getText('wao.ui.field.SampleRow.code')}"
- list="filterValues.sampleRowsFilterValues.sampleRowCodes"
- listKey="value"
- listValue="label"
- multiple="true"
- dataBinding="sampleRowsFilterValues.sampleRowCodes"/>
-
- <s:select name="filter.sampleRowFilter.programNames"
- label="%{getText('wao.ui.field.SampleRow.programName')}"
- list="filterValues.sampleRowsFilterValues.programNames"
- listKey="value"
- listValue="label"
- multiple="true"
- dataBinding="sampleRowsFilterValues.programNames"/>
-
- <s:select name="filter.sampleRowFilter.fishingZoneFacadeNames"
- label="%{getText('wao.ui.field.FishingZone.facadeName')}"
- list="filterValues.sampleRowsFilterValues.fishingZoneFacadeNames"
- listKey="value"
- listValue="label"
- multiple="true"
- dataBinding="sampleRowsFilterValues.fishingZoneFacadeNames"/>
-
- <s:select name="filter.sampleRowFilter.fishingZoneSectorNames"
- label="%{getText('wao.ui.field.FishingZone.sectorName')}"
- list="filterValues.sampleRowsFilterValues.fishingZoneSectorNames"
- listKey="value"
- listValue="label"
- multiple="true"
- dataBinding="sampleRowsFilterValues.fishingZoneSectorNames"/>
-
</fieldset>
<fieldset>
- <s:select name="filter.boatFilter.registrationCode"
- label="%{getText('wao.ui.field.Contact.boat')}"
- list="filterValues.boatRegistrationCodes"
- listKey="value"
- listValue="label"
- multiple="true"
- dataBinding="boatRegistrationCodes"/>
-
- <s:select name="filter.boatFilter.districtIds"
- label="%{getText('wao.ui.field.Boat.district')}"
- list="filterValues.boatsFilterValues.districts"
- listKey="value"
- listValue="label"
- multiple="true"
- dataBinding="boatsFilterValues.districts"/>
-
- </fieldset>
-
- <fieldset>
-
- <s:if test="authenticatedWaoUser.authorizedToViewOtherCompanies">
-
- <s:select name="filter.sampleRowFilter.companyIds"
- label="%{getText('wao.ui.entity.Company')}"
- list="filterValues.sampleRowsFilterValues.companies"
- listKey="value"
- listValue="label"
- multiple="true"
- dataBinding="sampleRowsFilterValues.companies"/>
-
- </s:if>
-
- <s:select name="filter.observerIds"
- label="%{getText('wao.ui.misc.observer')}"
- list="filterValues.observers"
- listKey="value"
- listValue="label"
- multiple="true"
- dataBinding="observers"/>
-
- <s:select name="filter.contactStates"
- label="%{getText('wao.ui.field.Contact.contactState')}"
- list="filterValues.contactStates"
- listKey="value"
- listValue="label"
- multiple="true"
- dataBinding="contactStates"/>
-
- <s:select name="filter.companyAcceptations"
- label="%{getText('wao.ui.field.Contact.validationCompany')}"
- list="filterValues.companyAcceptations"
- listKey="value"
- listValue="label"
- multiple="true"
- dataBinding="companyAcceptations"/>
-
- <s:select name="filter.programAcceptations"
- label="%{getText('wao.ui.field.Contact.validationProgram')}"
- list="filterValues.programAcceptations"
- listKey="value"
- listValue="label"
- multiple="true"
- dataBinding="programAcceptations"/>
- </fieldset>
-
- <fieldset>
-
- <s:select name="filter.observedDataControls"
- label="%{getText('wao.ui.field.Contact.observedDataControl')}"
- list="filterValues.observedDataControls"
- listKey="value"
- listValue="label"
- multiple="true"
- dataBinding="observedDataControls"/>
-
- <s:select name="filter.dataReliabilities"
- label="%{getText('wao.ui.field.Contact.dataReliability')}"
- list="filterValues.dataReliabilities"
- listKey="value"
- listValue="label"
- multiple="true"
- dataBinding="dataReliabilities"/>
-
<s:checkbox name="filter.mammalsObservationOnly"
label="%{getText('wao.ui.misc.observations')}"/>
@@ -223,6 +194,7 @@
<s:checkbox name="filter.commentAdminDefinedOnly"
label="%{getText('wao.ui.field.Contact.commentAdmin')}"/>
+
</fieldset>
<fieldset>
1
0
r1981 - in trunk: wao-persistence/src/main/java/fr/ifremer/wao/entity wao-services/src/main/java/fr/ifremer/wao/services/service wao-services/src/main/resources/i18n wao-web/src/main/resources/fr/ifremer/wao/services/service wao-web/src/main/resources/i18n wao-web/src/main/webapp/WEB-INF/content/obsmer
by bleny＠users.forge.codelutin.com May 27, 2014
by bleny＠users.forge.codelutin.com May 27, 2014
May 27, 2014
Author: bleny
Date: 2014-05-27 11:34:43 +0200 (Tue, 27 May 2014)
New Revision: 1981
Url: http://forge.codelutin.com/projects/wao/repository/revisions/1981
Log:
refs #4493 add boardings counts
Modified:
trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactTopiaDao.java
trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSynthesis.java
trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SynthesisService.java
trunk/wao-services/src/main/resources/i18n/wao-services_en_GB.properties
trunk/wao-services/src/main/resources/i18n/wao-services_fr_FR.properties
trunk/wao-web/src/main/resources/fr/ifremer/wao/services/service/ObsMerSynthesis-conversion.properties
trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties
trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties
trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/synthesis.jsp
Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactTopiaDao.java
===================================================================
--- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactTopiaDao.java 2014-05-27 08:04:11 UTC (rev 1980)
+++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactTopiaDao.java 2014-05-27 09:34:43 UTC (rev 1981)
@@ -36,10 +36,15 @@
import org.nuiton.topia.persistence.pager.TopiaPagerBean;
import org.nuiton.util.PagerBeanUtil;
+import java.util.Arrays;
import java.util.Calendar;
import java.util.Collection;
import java.util.Date;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.LinkedList;
import java.util.List;
+import java.util.Map;
import java.util.SortedMap;
import java.util.TreeMap;
@@ -49,7 +54,7 @@
public List<Contact> findAll(ContactsFilter filter, boolean sort) {
- HqlAndParametersBuilder<Contact> query = toSampleRowHqlAndParametersBuilder(filter);
+ HqlAndParametersBuilder<Contact> query = toContactHqlAndParametersBuilder(filter);
if (sort) {
if (filter.isSortedByBoardingDate()) {
@@ -67,7 +72,7 @@
public List<Contact> find(ContactsFilter filter, TopiaPagerBean pager) {
- HqlAndParametersBuilder<Contact> query = toSampleRowHqlAndParametersBuilder(filter);
+ HqlAndParametersBuilder<Contact> query = toContactHqlAndParametersBuilder(filter);
// Note: pager alrady contains the sort
List<Contact> boats = find(query.getHql(), query.getHqlParameters(), pager);
@@ -76,7 +81,7 @@
public long count(ContactsFilter filter) {
- HqlAndParametersBuilder<Contact> query = toSampleRowHqlAndParametersBuilder(filter);
+ HqlAndParametersBuilder<Contact> query = toContactHqlAndParametersBuilder(filter);
long count = count("select count(topiaId) " + query.getHql(), query.getHqlParameters());
@@ -87,7 +92,7 @@
int pageSize,
int pageIndex) {
- HqlAndParametersBuilder<Contact> query = toSampleRowHqlAndParametersBuilder(filter);
+ HqlAndParametersBuilder<Contact> query = toContactHqlAndParametersBuilder(filter);
TopiaPagerBean pager = newPager(query.getHql(), query.getHqlParameters(), pageSize);
pager.setPageIndex(pageIndex);
@@ -102,7 +107,7 @@
return pager;
}
- protected HqlAndParametersBuilder<Contact> toSampleRowHqlAndParametersBuilder(ContactsFilter filter) {
+ protected HqlAndParametersBuilder<Contact> toContactHqlAndParametersBuilder(ContactsFilter filter) {
HqlAndParametersBuilder<Contact> query = newHqlAndParametersBuilder();
@@ -234,7 +239,7 @@
public SortedMap<Date, Integer> getActualObservationsByMonths(Date periodFromMonth, Date periodToMonth, ContactsFilter filter) {
- HqlAndParametersBuilder<Contact> query = toSampleRowHqlAndParametersBuilder(filter);
+ HqlAndParametersBuilder<Contact> query = toContactHqlAndParametersBuilder(filter);
query.addEquals(Contact.PROPERTY_STATE, ContactState.OBSERVATION_DONE.ordinal());
List<Contact> contacts = findAll(query.getHql(), query.getHqlParameters());
@@ -257,4 +262,60 @@
return actualObservationsMyMonths;
}
+
+ public Map<Boat, LinkedHashMap<String, List<Date>>> getBoardingBoats(ContactsFilter filter) {
+
+ HqlAndParametersBuilder<Contact> hqlAndParametersBuilder = toContactHqlAndParametersBuilder(filter);
+
+ hqlAndParametersBuilder.addEquals(Contact.PROPERTY_STATE, ContactState.OBSERVATION_DONE.ordinal());
+ hqlAndParametersBuilder.addLowerOrEquals(Contact.PROPERTY_SAMPLE_ROW + "." + SampleRow.PROPERTY_AVERAGE_TIDE_TIME, 2.);
+ hqlAndParametersBuilder.setOrderByArguments("boat.name", "sampleRow.code", "observationBeginDate");
+
+ String hql = hqlAndParametersBuilder.getHql();
+
+ hql = "select c.boat, c.sampleRow.code, c.observationBeginDate " + hql;
+
+ List<Object[]> boardingsByBoat = findAll(hql, hqlAndParametersBuilder.getHqlParameters());
+
+ if (log.isDebugEnabled()) {
+ for (Object[] row : boardingsByBoat) {
+ log.debug("result in boardingsByBoat " + Arrays.toString(row));
+ }
+ }
+
+ // results like (first column is a boat entity)
+ // [AN TUAZ COZ, 2010_0043, 2009-11-19 00:00:00.0]
+ // [AN TUAZ COZ, 2010_0043, 2009-11-20 00:00:00.0]
+ // [APHRODITE, 2009_0185, 2009-09-24 00:00:00.0]
+ // [APHRODITE, 2009_0186, 2009-05-26 00:00:00.0]
+ // [APHRODITE, 2009_0186, 2009-06-23 00:00:00.0]
+ // [APHRODITE, 2009_0186, 2009-07-23 00:00:00.0]
+ // [ARC EN CIEL, 2009_0172, 2009-09-23 00:00:00.0]
+ // [ARC EN CIEL, 2009_0200, 2010-01-16 00:00:00.0]
+ // [ARC EN CIEL, 2009_0200, 2010-01-17 00:00:00.0]
+ // [ARC EN CIEL, 2009_0200, 2010-02-13 00:00:00.0]
+
+ Map<Boat, LinkedHashMap<String, List<Date>>> data = new HashMap<>();
+
+ for (Object[] row : boardingsByBoat) {
+ Boat boat = (Boat) row[0];
+ String sampleRowCode = (String) row[1];
+ Date tideBeginDate = (Date) row[2];
+
+ LinkedHashMap<String, List<Date>> value = data.get(boat);
+ if (value == null) {
+ value = new LinkedHashMap<>();
+ data.put(boat, value);
+ }
+
+ List<Date> dates = value.get(sampleRowCode);
+ if (dates == null) {
+ dates = new LinkedList<Date>();
+ value.put(sampleRowCode, dates);
+ }
+ dates.add(tideBeginDate);
+ }
+
+ return data;
+ }
}
Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSynthesis.java
===================================================================
--- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSynthesis.java 2014-05-27 08:04:11 UTC (rev 1980)
+++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSynthesis.java 2014-05-27 09:34:43 UTC (rev 1981)
@@ -1,16 +1,77 @@
package fr.ifremer.wao.services.service;
+import fr.ifremer.wao.entity.Boat;
import fr.ifremer.wao.services.utils.BarChartData;
public class ObsMerSynthesis {
protected BarChartData expectedVsActualObservationsByMonthsBarChartData;
+ protected BarChartData boardingBoatsBarChartData;
+
+ protected int maxBoardingValue;
+
+ protected Boat maxBoardingBoat;
+
+ protected int boardingsCount;
+
+ protected int invalidBoardingsCount;
+
+ protected int validBoardingsCount;
+
+ public BarChartData getExpectedVsActualObservationsByMonthsBarChartData() {
+ return expectedVsActualObservationsByMonthsBarChartData;
+ }
+
public void setExpectedVsActualObservationsByMonthsBarChartData(BarChartData expectedVsActualObservationsByMonthsBarChartData) {
this.expectedVsActualObservationsByMonthsBarChartData = expectedVsActualObservationsByMonthsBarChartData;
}
- public BarChartData getExpectedVsActualObservationsByMonthsBarChartData() {
- return expectedVsActualObservationsByMonthsBarChartData;
+ public BarChartData getBoardingBoatsBarChartData() {
+ return boardingBoatsBarChartData;
}
+
+ public void setBoardingBoatsBarChartData(BarChartData boardingBoatsBarChartData) {
+ this.boardingBoatsBarChartData = boardingBoatsBarChartData;
+ }
+
+ public int getMaxBoardingValue() {
+ return maxBoardingValue;
+ }
+
+ public void setMaxBoardingValue(int maxBoardingValue) {
+ this.maxBoardingValue = maxBoardingValue;
+ }
+
+ public Boat getMaxBoardingBoat() {
+ return maxBoardingBoat;
+ }
+
+ public void setMaxBoardingBoat(Boat maxBoardingBoat) {
+ this.maxBoardingBoat = maxBoardingBoat;
+ }
+
+ public int getBoardingsCount() {
+ return boardingsCount;
+ }
+
+ public void setBoardingsCount(int boardingsCount) {
+ this.boardingsCount = boardingsCount;
+ }
+
+ public int getInvalidBoardingsCount() {
+ return invalidBoardingsCount;
+ }
+
+ public void setInvalidBoardingsCount(int invalidBoardingsCount) {
+ this.invalidBoardingsCount = invalidBoardingsCount;
+ }
+
+ public int getValidBoardingsCount() {
+ return validBoardingsCount;
+ }
+
+ public void setValidBoardingsCount(int validBoardingsCount) {
+ this.validBoardingsCount = validBoardingsCount;
+ }
}
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-05-27 08:04:11 UTC (rev 1980)
+++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SynthesisService.java 2014-05-27 09:34:43 UTC (rev 1981)
@@ -2,8 +2,10 @@
import fr.ifremer.wao.ContactsFilter;
import fr.ifremer.wao.WaoUtils;
+import fr.ifremer.wao.entity.Boat;
import fr.ifremer.wao.entity.ContactTopiaDao;
import fr.ifremer.wao.entity.SampleRowTopiaDao;
+import fr.ifremer.wao.entity.SynthesisId;
import fr.ifremer.wao.services.AuthenticatedWaoUser;
import fr.ifremer.wao.services.utils.BarChartData;
import fr.ifremer.wao.services.utils.ChartDataAxis;
@@ -11,9 +13,12 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.nuiton.i18n.I18n;
+import org.nuiton.util.DateUtil;
import java.util.Calendar;
import java.util.Date;
+import java.util.LinkedHashMap;
+import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.SortedMap;
@@ -36,9 +41,10 @@
ObsMerSynthesis obsMerSynthesis = new ObsMerSynthesis();
- BarChartData expectedVsActualObservationsByMonthsBarChartData = getExpectedVsActualObservationsByMonthsBarChartData(filter);
- obsMerSynthesis.setExpectedVsActualObservationsByMonthsBarChartData(expectedVsActualObservationsByMonthsBarChartData);
+ setExpectedVsActualObservationsByMonthsBarChartData(obsMerSynthesis, filter);
+ setBoardingBoatsData(obsMerSynthesis, filter);
+
return obsMerSynthesis;
}
@@ -47,7 +53,7 @@
* Un graphique avec, pour chaque mois, deux barres qui représentent l'effort demandé
* vs l'effort réalisé.
*/
- protected BarChartData getExpectedVsActualObservationsByMonthsBarChartData(ContactsFilter filter) {
+ protected void setExpectedVsActualObservationsByMonthsBarChartData(ObsMerSynthesis obsMerSynthesis, ContactsFilter filter) {
Locale locale = serviceContext.getLocale();
@@ -94,7 +100,8 @@
actualObservationsMyMonthsBarChartDataSeries.addValue(tick, value);
}
- BarChartData expectedVsActualObservationsByMonthsBarChartData = new BarChartData("");
+ BarChartData expectedVsActualObservationsByMonthsBarChartData =
+ new BarChartData(I18n.l(locale, SynthesisId.GRAPH_SAMPLING.getI18nKey()));
ChartDataAxis yAxis = expectedVsActualObservationsByMonthsBarChartData.getYAxis();
yAxis.setLabel(I18n.l(locale, "wao.synthesis.observationsCount"));
@@ -103,7 +110,124 @@
expectedVsActualObservationsByMonthsBarChartData.addDotChartDataSeries(expectedObservationsByMonthsBarChartDataSeries);
expectedVsActualObservationsByMonthsBarChartData.addDotChartDataSeries(actualObservationsMyMonthsBarChartDataSeries);
- return expectedVsActualObservationsByMonthsBarChartData;
+ obsMerSynthesis.setExpectedVsActualObservationsByMonthsBarChartData(expectedVsActualObservationsByMonthsBarChartData);
}
+
+ /**
+ * We need to select the boats and for each one, the number of boardings
+ * done. The number of boardings is calculated with the number of contacts
+ * finished linked with each boat. The {@code fromDate} is used to filter
+ * results since this date. For observer view, only results for his
+ * company is needed.
+ *
+ * @return a BoardingResult which contains the number of boats for boardings
+ * and for invalid boardings from 1 to {@code MAX_BOARDINGS}, the boat with
+ * the max boarding and its value.
+ */
+ protected void setBoardingBoatsData(ObsMerSynthesis obsMerSynthesis, ContactsFilter filter) {
+
+ Locale locale = serviceContext.getLocale();
+
+ ContactTopiaDao dao = getContactDao();
+
+ Map<Boat, LinkedHashMap<String, List<Date>>> data = dao.getBoardingBoats(filter);
+
+ Map<String, Integer> mapBoarding = new LinkedHashMap<>();
+
+ // Prepare map which contains for each entry the number of boardings
+ // for the key and the number of boats for the value.
+
+ int maxBoardingCount = -1;
+ Boat maxBoardingBoat = null;
+
+ int invalidBoardingTotal = 0;
+ int boardingTotal = 0;
+
+ for (Map.Entry<Boat, LinkedHashMap<String, List<Date>>> entry : data.entrySet()) {
+ Boat boat = entry.getKey();
+ LinkedHashMap<String, List<Date>> codesAndTides = entry.getValue();
+
+ if (log.isDebugEnabled()) {
+ StringBuilder logMessage = new StringBuilder();
+ logMessage.append("in data, for boat ").append(boat.getName()).append(" tides are :");
+ for (Map.Entry<String, List<Date>> codeAndTides : codesAndTides.entrySet()) {
+ logMessage.append(codeAndTides.getKey()).append(" -> ").append(codeAndTides.getValue());
+ }
+ log.debug(logMessage.toString());
+ }
+
+ int boardingCount = 0;
+ int invalidBoardingCount = 0;
+
+ for (Map.Entry<String, List<Date>> codeAndTides : codesAndTides.entrySet()) {
+ List<Date> tides = codeAndTides.getValue();
+
+ boardingCount += tides.size();
+
+ Date lastTideBeginDate = null;
+ for (Date tideBeginDate : tides) {
+
+ if (lastTideBeginDate != null && // prevent NPE for first iteration
+ DateUtil.getDifferenceInMonths(lastTideBeginDate, tideBeginDate) <= 3) {
+
+ invalidBoardingCount += 1;
+ }
+
+ lastTideBeginDate = tideBeginDate;
+ }
+ }
+
+ invalidBoardingTotal += invalidBoardingCount;
+ boardingTotal += boardingCount;
+
+ // update max
+ if (boardingCount > maxBoardingCount) {
+ maxBoardingCount = boardingCount;
+ maxBoardingBoat = boat;
+ }
+
+ // update mapBoarding
+ String key = String.valueOf(boardingCount);
+
+ Integer oldValue = mapBoarding.get(key);
+ if (oldValue == null) {
+ oldValue = 0;
+ }
+ // add one more boat for "key" number of boardings
+ mapBoarding.put(key, oldValue + 1);
+
+ if (log.isTraceEnabled()) {
+ log.trace(boat + " made " + boardingCount + " boardings");
+ log.trace("boat " + boat.getName() + " did " + invalidBoardingCount
+ + " invalid boardings on " + boardingCount);
+ }
+ }
+
+ BarChartData.BarChartDataSeries numberOfBoatsWithBoardingsBarChartDataSeries =
+ new BarChartData.BarChartDataSeries();
+ numberOfBoatsWithBoardingsBarChartDataSeries.setLabel(I18n.l(locale, "wao.ui.chart.numberOfBoatsWithBoardings"));
+
+ for (Map.Entry<String, Integer> entry : mapBoarding.entrySet()) {
+ numberOfBoatsWithBoardingsBarChartDataSeries.addValue(entry.getKey(), entry.getValue());
+ }
+
+ BarChartData boardingBoatsBarChartData =
+ new BarChartData(I18n.l(locale, SynthesisId.GRAPH_BOARDING.getI18nKey()));
+
+ ChartDataAxis yAxis = boardingBoatsBarChartData.getYAxis();
+ yAxis.setLabel(I18n.l(locale, "wao.ui.chart.numberBoats"));
+ yAxis.setStep(10);
+
+ boardingBoatsBarChartData.addDotChartDataSeries(numberOfBoatsWithBoardingsBarChartDataSeries);
+
+ obsMerSynthesis.setMaxBoardingValue(maxBoardingCount);
+ obsMerSynthesis.setMaxBoardingBoat(maxBoardingBoat);
+ obsMerSynthesis.setBoardingsCount(boardingTotal);
+ obsMerSynthesis.setInvalidBoardingsCount(invalidBoardingTotal);
+ obsMerSynthesis.setValidBoardingsCount(boardingTotal - invalidBoardingTotal);
+
+ obsMerSynthesis.setBoardingBoatsBarChartData(boardingBoatsBarChartData);
+
+ }
}
Modified: trunk/wao-services/src/main/resources/i18n/wao-services_en_GB.properties
===================================================================
--- trunk/wao-services/src/main/resources/i18n/wao-services_en_GB.properties 2014-05-27 08:04:11 UTC (rev 1980)
+++ trunk/wao-services/src/main/resources/i18n/wao-services_en_GB.properties 2014-05-27 09:34:43 UTC (rev 1981)
@@ -87,5 +87,7 @@
wao.synthesis.estimated=Estimated
wao.synthesis.observationsCount=Observations count
wao.synthesis.planned=Planned
+wao.ui.chart.numberBoats=Number of boats
+wao.ui.chart.numberOfBoatsWithBoardings=Number of boats with x boardings
wao.validation.sampleRow.conflictOnObserver=Observer %s cannot be associated to the line %s because he has to observer, on the same day, for row %s
wao.validation.sampleRow.observerNotInCompany=Observer %s doesn't work for company %s
Modified: trunk/wao-services/src/main/resources/i18n/wao-services_fr_FR.properties
===================================================================
--- trunk/wao-services/src/main/resources/i18n/wao-services_fr_FR.properties 2014-05-27 08:04:11 UTC (rev 1980)
+++ trunk/wao-services/src/main/resources/i18n/wao-services_fr_FR.properties 2014-05-27 09:34:43 UTC (rev 1981)
@@ -84,5 +84,7 @@
wao.synthesis.estimated=Estimé
wao.synthesis.observationsCount=Nombre d'observations
wao.synthesis.planned=Planifié
+wao.ui.chart.numberBoats=Nombre de navires
+wao.ui.chart.numberOfBoatsWithBoardings=Nombres de navires avec x embarquements
wao.validation.sampleRow.conflictOnObserver=L'observateur %s ne peut être associé à la ligne %s car il doit observer, le même jour, pour la ligne %s
wao.validation.sampleRow.observerNotInCompany=L'observateur %s ne fait pas parti de la société %s
Modified: trunk/wao-web/src/main/resources/fr/ifremer/wao/services/service/ObsMerSynthesis-conversion.properties
===================================================================
--- trunk/wao-web/src/main/resources/fr/ifremer/wao/services/service/ObsMerSynthesis-conversion.properties 2014-05-27 08:04:11 UTC (rev 1980)
+++ trunk/wao-web/src/main/resources/fr/ifremer/wao/services/service/ObsMerSynthesis-conversion.properties 2014-05-27 09:34:43 UTC (rev 1981)
@@ -1 +1,2 @@
expectedVsActualObservationsByMonthsBarChartData=fr.ifremer.wao.web.converter.BarChartDataConverter
+boardingBoatsBarChartData=fr.ifremer.wao.web.converter.BarChartDataConverter
Modified: trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties
===================================================================
--- trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-05-27 08:04:11 UTC (rev 1980)
+++ trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-05-27 09:34:43 UTC (rev 1981)
@@ -120,10 +120,6 @@
wao.ui.cartography.help=Click on the graphs to get the details.
wao.ui.cartography.title=Dispatching of the contacts among boat districts
wao.ui.cartography.title.company=Dispatching of the contacts among boat districts for company %s
-wao.ui.chart.boardingsSince=Queries since %s
-wao.ui.chart.numberBoats=No. boats
-wao.ui.chart.numberObservations=No. observations
-wao.ui.chart.numberOfBoatsWithBoardings=Number of boats with x observations
wao.ui.chooseUserProfile=Choose your user profile
wao.ui.contact.creation=Creation of a contact
wao.ui.contact.edition=Edition of contact
Modified: trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties
===================================================================
--- trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-05-27 08:04:11 UTC (rev 1980)
+++ trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-05-27 09:34:43 UTC (rev 1981)
@@ -120,10 +120,6 @@
wao.ui.cartography.help=Cliquez sur les graphiques pour avoir le détail.
wao.ui.cartography.title=Répartition des contacts par quartier des navires
wao.ui.cartography.title.company=Répartition des contacts par quartier des navires pour la société %s
-wao.ui.chart.boardingsSince=Nombre de sollicitations depuis le %s
-wao.ui.chart.numberBoats=Nb navires
-wao.ui.chart.numberObservations=Nb observations
-wao.ui.chart.numberOfBoatsWithBoardings=Nombre de navires avec x embarquements
wao.ui.chooseUserProfile=Choisissez votre rôle
wao.ui.contact.creation=Création d'un contact
wao.ui.contact.edition=Modification du contact
Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/synthesis.jsp
===================================================================
--- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/synthesis.jsp 2014-05-27 08:04:11 UTC (rev 1980)
+++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/synthesis.jsp 2014-05-27 09:34:43 UTC (rev 1981)
@@ -46,6 +46,7 @@
$(document).ready(function() {
$.jqplot('expected-vs-actual-observations-by-months-chart', <s:property value="synthesis.expectedVsActualObservationsByMonthsBarChartData" escapeHtml="false"/>);
+ $.jqplot('boarding-boats-chart', <s:property value="synthesis.boardingBoatsBarChartData" escapeHtml="false"/>);
});
@@ -62,5 +63,64 @@
<div id="expected-vs-actual-observations-by-months-chart" class="chart"></div>
</article>
+ <article>
+ <h2>
+ <s:text name="SynthesisId.GRAPH_BOARDING"/>
+ </h2>
+ <div id="boarding-boats-chart" class="chart"></div>
+
+ <p>
+ <s:text name="wao.ui.synthesis.boarding.description"/>
+ </p>
+
+ <p>
+ <s:text name="wao.ui.synthesis.boarding.mostUsedBoat">
+ <s:param value="%{synthesis.maxBoardingValue}"/>
+ <s:param value="%{synthesis.maxBoardingBoat.name}"/>
+ <s:param value="%{synthesis.maxBoardingBoat.immatriculation}"/>
+ </s:text>
+ </p>
+
+ <p>
+ <s:text name="wao.ui.synthesis.boarding.boardingCount">
+ <s:param value="%{synthesis.invalidBoardingsCount}"/>
+ <s:param value="%{synthesis.boardingsCount}"/>
+ <%--
+ <s:param value="%{synthesis.validBoardingsCount}"/>
+ --%>
+ </s:text>
+ </p>
+
+ </article>
+
+ <article>
+ <h2>
+ <s:text name="SynthesisId.IND_COMPLIANCE_BOARDING"/>
+ </h2>
+
+ </article>
+
+ <article>
+ <h2>
+ <s:text name="SynthesisId.IND_CONTACT_STATE"/>
+ </h2>
+
+ </article>
+
+ <article>
+ <h2>
+ <s:text name="SynthesisId.IND_ALLEGRO_REACTIVITY"/>
+ </h2>
+
+ </article>
+
+ <article>
+ <h2>
+ <s:text name="SynthesisId.IND_DATA_RELIABILITY"/>
+ </h2>
+
+ </article>
+
+
</html>
1
0
May 27, 2014
Jenkins build became unstable: wao-ci » Wao :: Services #192
by admin+ci-codelutin.com＠codelutin.com May 27, 2014
by admin+ci-codelutin.com＠codelutin.com May 27, 2014
May 27, 2014
r1980 - in trunk/wao-services: . src/main/java/fr/ifremer/wao/services/service src/main/java/fr/ifremer/wao/services/service/administration
by bleny＠users.forge.codelutin.com May 27, 2014
by bleny＠users.forge.codelutin.com May 27, 2014
May 27, 2014
Author: bleny
Date: 2014-05-27 10:04:11 +0200 (Tue, 27 May 2014)
New Revision: 1980
Url: http://forge.codelutin.com/projects/wao/repository/revisions/1980
Log:
fix some build issues
Modified:
trunk/wao-services/pom.xml
trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerContactsService.java
trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/ReferentialService.java
Modified: trunk/wao-services/pom.xml
===================================================================
--- trunk/wao-services/pom.xml 2014-05-26 16:08:16 UTC (rev 1979)
+++ trunk/wao-services/pom.xml 2014-05-27 08:04:11 UTC (rev 1980)
@@ -36,6 +36,11 @@
</dependency>
<dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>com.github.spullara.mustache.java</groupId>
<artifactId>compiler</artifactId>
</dependency>
Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerContactsService.java
===================================================================
--- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerContactsService.java 2014-05-26 16:08:16 UTC (rev 1979)
+++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerContactsService.java 2014-05-27 08:04:11 UTC (rev 1980)
@@ -202,6 +202,11 @@
updateContactCommand.setCreation(false);
+ String mainObserverId = contact.getMainObserver().getTopiaId();
+ updateContactCommand.setMainObserverId(mainObserverId);
+ Set<String> secondaryObserversTopiaIds = contact.getSecondaryObserversTopiaIds();
+ updateContactCommand.setSecondaryObserverIds(secondaryObserversTopiaIds);
+
} else {
contact = new ContactImpl();
@@ -213,11 +218,6 @@
updateContactCommand.setCreation(true);
}
- String mainObserverId = contact.getMainObserver().getTopiaId();
- updateContactCommand.setMainObserverId(mainObserverId);
- Set<String> secondaryObserversTopiaIds = contact.getSecondaryObserversTopiaIds();
- updateContactCommand.setSecondaryObserverIds(secondaryObserversTopiaIds);
-
return updateContactCommand;
}
Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/ReferentialService.java
===================================================================
--- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/ReferentialService.java 2014-05-26 16:08:16 UTC (rev 1979)
+++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/ReferentialService.java 2014-05-27 08:04:11 UTC (rev 1980)
@@ -567,7 +567,7 @@
/**
* @param region may be null, and all ports will be returned
- * @returns all the ports that are in a region
+ * @return all the ports that are in a region
*/
public List<TerrestrialLocation> getAllPorts(TerrestrialLocation region) {
1
0