This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See http://git.codelutin.com/observe.git from 70d655b Tout sur develop (mais il reste encore à gerer les traductions des messages) See #7493 Merge branch 'feature/7493' into develop new 4a0089a implantation du service de generation des rapport + test (refs #7498) new a43149f implantation du service de generation des rapport + test (refs #7498) new 9f49fbf implantation du service de generation des rapport + test (refs #7498) new dd58708 Merge sur develop (termine #7498) The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit dd58708693aa0e18c8fb86466417a53c7543fceb Merge: 70d655b 9f49fbf Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Sep 3 16:19:32 2015 +0200 Merge sur develop (termine #7498) commit 9f49fbf654ccbba2f3f57256cee2332414b1be24 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Sep 3 10:12:20 2015 +0200 implantation du service de generation des rapport + test (refs #7498) commit a43149fa3931cd617db1157a6f9454b72308c11a Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Sep 3 10:11:26 2015 +0200 implantation du service de generation des rapport + test (refs #7498) commit 4a0089a1c8b27b0884ef95df4b9eb73aa7154af0 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Sep 3 10:09:52 2015 +0200 implantation du service de generation des rapport + test (refs #7498) Summary of changes: .../fr/ird/observe/AbstractObserveTopiaDao.java | 18 + observe-services-api/pom.xml | 24 +- .../src/main/filters/observe-reports.properties | 8 +- .../service/actions}/report/ReportBuilder.java | 17 +- .../service/actions/report/ReportService.java | 20 + .../service/actions}/report/model/DataMatrix.java | 2 +- .../service/actions}/report/model/Report.java | 15 +- .../actions}/report/model/ReportOperation.java | 20 +- .../actions}/report/model/ReportRequest.java | 63 +- .../actions}/report/model/ReportVariable.java | 27 +- .../report/model/operations/ExecuteRequests.java | 45 +- .../report/model/operations/GroupByLength.java | 20 +- .../report/model/operations/SumColumn.java | 25 +- .../report/model/operations/SumIntColumn.java | 25 +- .../report/model/operations/SumIntRow.java | 25 +- .../actions}/report/model/operations/SumRow.java | 25 +- ...es.service.actions.report.model.ReportOperation | 6 + .../service/actions/report/ReportBuilderTest.java | 130 +++ .../actions/report/observe-reports-test.properties | 27 + .../service/actions/report/ReportServiceTopia.java | 207 +++++ .../report/AbstractReportServiceTopiaTest.java | 150 ++-- .../actions/report/ReportAccessoryCatch2Test.java | 199 +++++ .../report/ReportAccessoryCatchByGroup2Test.java | 68 ++ .../report/ReportAccessoryCatchByGroupTest.java | 100 +++ .../actions/report/ReportAccessoryCatchTest.java | 156 ++++ .../report/ReportActivityWithCommentTest.java | 348 ++++++++ .../actions/report/ReportAllActivitysTest.java | 943 +++++++++++++++++++++ .../actions/report/ReportDailySetAndCatchTest.java | 61 +- .../service/actions/report/ReportDcpUsageTest.java | 67 +- .../report/ReportSetByAssociation2Test.java | 14 +- .../actions/report/ReportSetByAssociationTest.java | 26 +- .../report/ReportTargetCatchByAssociationTest.java | 66 +- .../ReportTargetDiscardedByAssociationTest.java | 66 +- 33 files changed, 2655 insertions(+), 358 deletions(-) create mode 100644 observe-entities/src/main/java/fr/ird/observe/AbstractObserveTopiaDao.java copy {observe-business => observe-services-api}/src/main/filters/observe-reports.properties (99%) copy {observe-business/src/main/java/fr/ird/observe => observe-services-api/src/main/java/fr/ird/observe/services/service/actions}/report/ReportBuilder.java (97%) create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/ReportService.java copy {observe-business/src/main/java/fr/ird/observe => observe-services-api/src/main/java/fr/ird/observe/services/service/actions}/report/model/DataMatrix.java (99%) copy {observe-business/src/main/java/fr/ird/observe => observe-services-api/src/main/java/fr/ird/observe/services/service/actions}/report/model/Report.java (88%) copy {observe-business/src/main/java/fr/ird/observe => observe-services-api/src/main/java/fr/ird/observe/services/service/actions}/report/model/ReportOperation.java (82%) copy {observe-business/src/main/java/fr/ird/observe => observe-services-api/src/main/java/fr/ird/observe/services/service/actions}/report/model/ReportRequest.java (86%) copy {observe-business/src/main/java/fr/ird/observe => observe-services-api/src/main/java/fr/ird/observe/services/service/actions}/report/model/ReportVariable.java (71%) copy {observe-business/src/main/java/fr/ird/observe => observe-services-api/src/main/java/fr/ird/observe/services/service/actions}/report/model/operations/ExecuteRequests.java (70%) copy {observe-business/src/main/java/fr/ird/observe => observe-services-api/src/main/java/fr/ird/observe/services/service/actions}/report/model/operations/GroupByLength.java (83%) copy {observe-business/src/main/java/fr/ird/observe => observe-services-api/src/main/java/fr/ird/observe/services/service/actions}/report/model/operations/SumColumn.java (84%) copy {observe-business/src/main/java/fr/ird/observe => observe-services-api/src/main/java/fr/ird/observe/services/service/actions}/report/model/operations/SumIntColumn.java (84%) copy {observe-business/src/main/java/fr/ird/observe => observe-services-api/src/main/java/fr/ird/observe/services/service/actions}/report/model/operations/SumIntRow.java (84%) copy {observe-business/src/main/java/fr/ird/observe => observe-services-api/src/main/java/fr/ird/observe/services/service/actions}/report/model/operations/SumRow.java (84%) create mode 100644 observe-services-api/src/main/resources/META-INF/services/fr.ird.observe.services.service.actions.report.model.ReportOperation create mode 100644 observe-services-api/src/test/java/fr/ird/observe/services/service/actions/report/ReportBuilderTest.java create mode 100644 observe-services-api/src/test/resources/fr/ird/observe/services/service/actions/report/observe-reports-test.properties create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/report/ReportServiceTopia.java copy observe-business/src/test/java/fr/ird/observe/its/report/AbstractReportIT.java => observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/AbstractReportServiceTopiaTest.java (60%) create mode 100644 observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportAccessoryCatch2Test.java create mode 100644 observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportAccessoryCatchByGroup2Test.java create mode 100644 observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportAccessoryCatchByGroupTest.java create mode 100644 observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportAccessoryCatchTest.java create mode 100644 observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportActivityWithCommentTest.java create mode 100644 observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportAllActivitysTest.java copy observe-business/src/test/java/fr/ird/observe/its/report/dailySetAndCatch/ReportIT.java => observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportDailySetAndCatchTest.java (53%) copy observe-business/src/test/java/fr/ird/observe/its/report/dcpUsage/ReportIT.java => observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportDcpUsageTest.java (55%) copy observe-business/src/test/java/fr/ird/observe/its/report/setByAssociation/Report2IT.java => observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportSetByAssociation2Test.java (85%) copy observe-business/src/test/java/fr/ird/observe/its/report/setByAssociation/ReportIT.java => observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportSetByAssociationTest.java (83%) copy observe-business/src/test/java/fr/ird/observe/its/report/targetCatchByAssociation/ReportIT.java => observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportTargetCatchByAssociationTest.java (56%) copy observe-business/src/test/java/fr/ird/observe/its/report/targetDiscardedByAssociation/ReportIT.java => observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportTargetDiscardedByAssociationTest.java (55%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.