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

branch develop updated (b05a2c3 -> 4661866)
by codelutin.com scm 08 Dec '14

08 Dec '14

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository wao. See http://git.codelutin.com/wao.git from b05a2c3 Pour le calcul des jours de mers, on se base sur tous les contacts de la ligne et pas seulement ceux sur la période sinon il manque les marées commencées avant le premier mois (fixes #6246) new 4661866 On permet l'import des espèces depuis tous les programmes (scléro n'est pas dispo) (refs #5973) The 1 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 46618669aaf0c6b7eb846d8dc9350ab1b2901092 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Mon Dec 8 15:10:41 2014 +0100 On permet l'import des espèces depuis tous les programmes (scléro n'est pas dispo) (refs #5973) Summary of changes: .../administration/referential-management.jsp | 24 ++++++++++------------ 1 file changed, 11 insertions(+), 13 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (159153c -> b05a2c3)
by codelutin.com scm 08 Dec '14

08 Dec '14

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository wao. See http://git.codelutin.com/wao.git from 159153c Correction d'un bogue suscité par l'utilisation de instanceof sur des entités Hibernate new 1d50585 Correction d'une NPE si un plan comporte un mois sans effort (fixes #6249) new b05a2c3 Pour le calcul des jours de mers, on se base sur tous les contacts de la ligne et pas seulement ceux sur la période sinon il manque les marées commencées avant le premier mois (fixes #6246) The 2 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 b05a2c3e6fcff5ccdc3d735924cef376430e013f Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Mon Dec 8 14:35:09 2014 +0100 Pour le calcul des jours de mers, on se base sur tous les contacts de la ligne et pas seulement ceux sur la période sinon il manque les marées commencées avant le premier mois (fixes #6246) commit 1d50585a3dbfba28b06a9fbdbf7e7f9792af560c Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Mon Dec 8 11:51:56 2014 +0100 Correction d'une NPE si un plan comporte un mois sans effort (fixes #6249) Summary of changes: .../services/service/ObsMerSamplingPlanService.java | 15 ++------------- .../ifremer/wao/services/service/SamplingPlan.java | 20 +++++++++++--------- 2 files changed, 13 insertions(+), 22 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2

branch develop updated (2379fdd -> 159153c)
by codelutin.com scm 04 Dec '14

04 Dec '14

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository wao. See http://git.codelutin.com/wao.git from 2379fdd POM en 4.3-SNAPSHOT new 368edb5 On permet de mettre l'utilisateur dans un laboratoire et non plus seulement dans une société new 8a9d440 Liste des laboratoires, création, modification et suppression d'un laboratoire new f7a23fa Ajout de la notion de laboratoire Ifremer (fixes #2262) new 759d2d0 Pour les tests, ajout d'un fichier d'exemple new 4fc2981 Ajout d'un service d'import des espèces new 0715813 Ajout de l'interface utilisateur d'import du référentiel des espèces new 296e68e Ajout d'un référentiel d'espèces cibles (refs #5973) new 368202f Tri bundle new 159153c Correction d'un bogue suscité par l'utilisation de instanceof sur des entités Hibernate The 9 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 159153cd5a22762d30dce0564dc828478230ec63 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Thu Dec 4 15:24:09 2014 +0100 Correction d'un bogue suscité par l'utilisation de instanceof sur des entités Hibernate commit 368202f343177e4b963838adfc5b3357e6815d17 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Thu Dec 4 15:23:58 2014 +0100 Tri bundle commit 296e68e04635a8f8f9de9412098b6e6ff9688b7a Merge: f7a23fa 0715813 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Thu Dec 4 15:09:13 2014 +0100 Ajout d'un référentiel d'espèces cibles (refs #5973) commit f7a23face43333e21c40740a0b100f93c7e5425b Merge: 2379fdd 8a9d440 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Thu Dec 4 15:08:06 2014 +0100 Ajout de la notion de laboratoire Ifremer (fixes #2262) commit 8a9d440f78fb7eaad409410c2140396b437b68ec Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Thu Dec 4 15:05:11 2014 +0100 Liste des laboratoires, création, modification et suppression d'un laboratoire commit 368edb58da440be4e7425fc224006e754cded078 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Thu Dec 4 10:53:24 2014 +0100 On permet de mettre l'utilisateur dans un laboratoire et non plus seulement dans une société commit 0715813fe4309dcefc4d6a8aabd5c4c18c8abcd8 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Tue Dec 2 17:59:07 2014 +0100 Ajout de l'interface utilisateur d'import du référentiel des espèces commit 4fc29810f4a401498baba3ef8c7e3fb28bea5825 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Tue Dec 2 17:22:50 2014 +0100 Ajout d'un service d'import des espèces commit 759d2d00c668c55f378c3c3f5a40a76cf3e8ef9a Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Tue Dec 2 14:08:22 2014 +0100 Pour les tests, ajout d'un fichier d'exemple Summary of changes: .../java/fr/ifremer/wao/AbstractWaoTopiaDao.java | 16 +++++ .../java/fr/ifremer/wao/entity/CompanyImpl.java | 10 +++ .../java/fr/ifremer/wao/entity/LaboratoryImpl.java | 12 ++++ .../java/fr/ifremer/wao/entity/WaoUserImpl.java | 8 +-- .../V4_3__add_species,_add_laboratories.sql | 1 + wao-persistence/src/main/xmi/wao-model.zargo | Bin 61426 -> 61366 bytes .../ifremer/wao/services/AuthenticatedWaoUser.java | 6 +- .../fr/ifremer/wao/services/ObsMerFixtures.java | 4 +- .../wao/services/service/WaoServiceSupport.java | 15 +++++ .../service/administration/CompaniesService.java | 36 ++++------- .../administration/LaboratoriesService.java | 71 +++++++++++++++++++++ ... => OrganisationNameMustBeUniqueException.java} | 2 +- .../administration/OrganisationsService.java | 55 ++++++++++++++++ .../service/administration/ReferentialService.java | 44 ++++++++++++- .../administration/UpdateWaoUserCommand.java | 32 +++++----- .../service/administration/WaoUsersService.java | 28 ++++---- .../services/service/csv/SpeciesImportModel.java | 24 +++++++ .../administration/ReferentialServiceTest.java | 16 +++++ wao-services/src/test/resources/import/especes.csv | 5 ++ .../fr/ifremer/wao/web/WaoJspActionSupport.java | 4 ++ ...panyAction.java => DeleteLaboratoryAction.java} | 25 ++++---- .../action/administration/EditCompanyAction.java | 6 +- ...ompanyAction.java => EditLaboratoryAction.java} | 48 +++++++------- .../action/administration/EditWaoUserAction.java | 16 +++-- .../action/administration/ImportSpeciesAction.java | 18 ++++++ ...ompaniesAction.java => LaboratoriesAction.java} | 18 +++--- .../web/action/administration/WaoUsersAction.java | 14 ++-- .../main/resources/i18n/wao-web_en_GB.properties | 13 +++- .../main/resources/i18n/wao-web_fr_FR.properties | 13 +++- .../content/administration/edit-laboratory.jsp | 67 +++++++++++++++++++ .../content/administration/edit-wao-user.jsp | 16 ++--- .../{companies.jsp => laboratories.jsp} | 34 +++++----- .../administration/referential-management.jsp | 18 ++++++ .../src/main/webapp/WEB-INF/decorators/layout.jsp | 8 +++ 34 files changed, 548 insertions(+), 155 deletions(-) create mode 100644 wao-persistence/src/main/java/fr/ifremer/wao/AbstractWaoTopiaDao.java create mode 100644 wao-persistence/src/main/java/fr/ifremer/wao/entity/LaboratoryImpl.java create mode 100644 wao-services/src/main/java/fr/ifremer/wao/services/service/administration/LaboratoriesService.java rename wao-services/src/main/java/fr/ifremer/wao/services/service/administration/{CompanyNameMustBeUniqueException.java => OrganisationNameMustBeUniqueException.java} (92%) create mode 100644 wao-services/src/main/java/fr/ifremer/wao/services/service/administration/OrganisationsService.java create mode 100644 wao-services/src/main/java/fr/ifremer/wao/services/service/csv/SpeciesImportModel.java create mode 100644 wao-services/src/test/resources/import/especes.csv copy wao-web/src/main/java/fr/ifremer/wao/web/action/administration/{DeleteCompanyAction.java => DeleteLaboratoryAction.java} (68%) copy wao-web/src/main/java/fr/ifremer/wao/web/action/administration/{EditCompanyAction.java => EditLaboratoryAction.java} (55%) create mode 100644 wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportSpeciesAction.java copy wao-web/src/main/java/fr/ifremer/wao/web/action/administration/{CompaniesAction.java => LaboratoriesAction.java} (69%) create mode 100644 wao-web/src/main/webapp/WEB-INF/content/administration/edit-laboratory.jsp copy wao-web/src/main/webapp/WEB-INF/content/administration/{companies.jsp => laboratories.jsp} (71%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 9

branch feature/5973 deleted (was 0715813)
by codelutin.com scm 04 Dec '14

04 Dec '14

This is an automated email from the git hooks/post-receive script. New change to branch feature/5973 in repository wao. See http://git.codelutin.com/wao.git was 0715813 Ajout de l'interface utilisateur d'import du référentiel des espèces This change permanently discards the following revisions: discards 0715813 Ajout de l'interface utilisateur d'import du référentiel des espèces discards 4fc2981 Ajout d'un service d'import des espèces discards 759d2d0 Pour les tests, ajout d'un fichier d'exemple -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch develop updated (f005d30 -> 2379fdd)
by codelutin.com scm 02 Dec '14

02 Dec '14

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository wao. See http://git.codelutin.com/wao.git from f005d30 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds dfd0132 Ajout du référentiel d'espèces cibles dans le modèle (refs #5973)) adds 69befc9 Introduction de la notion de laboratoire et d'organisation dans le modèle, on lie l'utilisateur à l'organisation et la ligne du plan à l'organisation (refs #2262) adds be716c0 Déclaration du programme Sclérochronologie new aae647d Merge branch 'develop' of https://git.codelutin.com/wao into develop new 2379fdd POM en 4.3-SNAPSHOT The 2 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 2379fdd1613661dcf0558679e069c1c15dcefe45 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Tue Dec 2 18:02:44 2014 +0100 POM en 4.3-SNAPSHOT commit aae647d7212ff0e9dd8bb1060c0ca2a6d0a03e73 Merge: be716c0 f005d30 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Tue Dec 2 18:00:45 2014 +0100 Merge branch 'develop' of https://git.codelutin.com/wao into develop Summary of changes: pom.xml | 2 +- wao-persistence/pom.xml | 2 +- .../fr/ifremer/wao/entity/ContactTopiaDao.java | 4 +- .../java/fr/ifremer/wao/entity/ObsProgram.java | 7 ++- .../fr/ifremer/wao/entity/OrganisationImpl.java | 8 ++- .../java/fr/ifremer/wao/entity/SampleRowImpl.java | 20 +++++++ .../fr/ifremer/wao/entity/SampleRowLogImpl.java | 4 +- .../fr/ifremer/wao/entity/SampleRowTopiaDao.java | 2 +- .../java/fr/ifremer/wao/entity/WaoUserImpl.java | 10 ++++ .../fr/ifremer/wao/entity/WaoUserTopiaDao.java | 2 +- .../V4_3__add_species,_add_laboratories.sql | 58 +++++++++++++++++++++ .../i18n/wao-persistence_en_GB.properties | 1 + .../i18n/wao-persistence_fr_FR.properties | 1 + wao-persistence/src/main/xmi/wao-model.properties | 2 +- wao-persistence/src/main/xmi/wao-model.zargo | Bin 59661 -> 61426 bytes wao-services/pom.xml | 2 +- .../service/administration/WaoUsersService.java | 4 +- ...bsMerObsVenteSamplingPlanImportExportModel.java | 2 +- wao-web/pom.xml | 2 +- 19 files changed, 117 insertions(+), 16 deletions(-) copy wao-web/src/main/webapp/wao-screen.css => wao-persistence/src/main/java/fr/ifremer/wao/entity/OrganisationImpl.java (85%) create mode 100644 wao-persistence/src/main/resources/db/migration/V4_3__add_species,_add_laboratories.sql -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2

branch feature/5973 created (now 0715813)
by codelutin.com scm 02 Dec '14

02 Dec '14

This is an automated email from the git hooks/post-receive script. New change to branch feature/5973 in repository wao. See http://git.codelutin.com/wao.git at 0715813 Ajout de l'interface utilisateur d'import du référentiel des espèces This branch includes the following new commits: new dfd0132 Ajout du référentiel d'espèces cibles dans le modèle (refs #5973)) new 69befc9 Introduction de la notion de laboratoire et d'organisation dans le modèle, on lie l'utilisateur à l'organisation et la ligne du plan à l'organisation (refs #2262) new be716c0 Déclaration du programme Sclérochronologie new 759d2d0 Pour les tests, ajout d'un fichier d'exemple new 4fc2981 Ajout d'un service d'import des espèces new 0715813 Ajout de l'interface utilisateur d'import du référentiel des espèces The 6 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 0715813fe4309dcefc4d6a8aabd5c4c18c8abcd8 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Tue Dec 2 17:59:07 2014 +0100 Ajout de l'interface utilisateur d'import du référentiel des espèces commit 759d2d00c668c55f378c3c3f5a40a76cf3e8ef9a Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Tue Dec 2 14:08:22 2014 +0100 Pour les tests, ajout d'un fichier d'exemple commit 4fc29810f4a401498baba3ef8c7e3fb28bea5825 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Tue Dec 2 17:22:50 2014 +0100 Ajout d'un service d'import des espèces commit be716c0c1830dab6dcd0ccf123d68a8594173a36 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Tue Dec 2 17:33:56 2014 +0100 Déclaration du programme Sclérochronologie commit 69befc97b92f3e6d1b5ff64c91f3c1d407aee303 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Tue Dec 2 16:56:23 2014 +0100 Introduction de la notion de laboratoire et d'organisation dans le modèle, on lie l'utilisateur à l'organisation et la ligne du plan à l'organisation (refs #2262) commit dfd013261b71d8a9b1b91ee68a05c0ee5cacd27a Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Tue Dec 2 15:16:32 2014 +0100 Ajout du référentiel d'espèces cibles dans le modèle (refs #5973)) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 6

branch develop updated (8cb8b78 -> f005d30)
by codelutin.com scm 12 Nov '14

12 Nov '14

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository wao. See http://git.codelutin.com/wao.git from 8cb8b78 [jgitflow-maven-plugin]updating poms for 4.2.3-SNAPSHOT development new 7996659 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new 8ed5935 [jgitflow-maven-plugin]updating poms for branch'release/4.2.2' with non-snapshot versions new 3376104 Merge branch 'release/4.2.2' new 42f1885 Merge branch 'master' into develop new f005d30 [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 5 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 f005d3045621d22a70e020f94e1612839cb9dc89 Author: Maven Release <maven-release(a)codelutin.com> Date: Wed Nov 12 11:24:32 2014 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 42f1885991ea2539309f69298493e0816fe3a7c9 Merge: 7996659 3376104 Author: Maven Release <maven-release(a)codelutin.com> Date: Wed Nov 12 11:24:32 2014 +0000 Merge branch 'master' into develop commit 799665952399eb5af3d678f9efd6f2aab7562361 Author: Maven Release <maven-release(a)codelutin.com> Date: Wed Nov 12 11:24:31 2014 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 33761047bcc8747a53068a132222b38e8bcd1ec0 Merge: d2cb61f 8ed5935 Author: Maven Release <maven-release(a)codelutin.com> Date: Wed Nov 12 11:24:30 2014 +0000 Merge branch 'release/4.2.2' commit 8ed593575212a2cda345fa77820d3bfd25bfbad0 Author: Maven Release <maven-release(a)codelutin.com> Date: Wed Nov 12 11:22:19 2014 +0000 [jgitflow-maven-plugin]updating poms for branch'release/4.2.2' with non-snapshot versions Summary of changes: -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 5

branch release/4.2.2 deleted (was 8ed5935)
by codelutin.com scm 12 Nov '14

12 Nov '14

This is an automated email from the git hooks/post-receive script. New change to branch release/4.2.2 in repository wao. See http://git.codelutin.com/wao.git was 8ed5935 [jgitflow-maven-plugin]updating poms for branch'release/4.2.2' with non-snapshot versions The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

annotated tag wao-4.2.2 created (now 58b7c90)
by codelutin.com scm 12 Nov '14

12 Nov '14

This is an automated email from the git hooks/post-receive script. New change to annotated tag wao-4.2.2 in repository wao. See http://git.codelutin.com/wao.git at 58b7c90 (tag) tagging 33761047bcc8747a53068a132222b38e8bcd1ec0 (commit) replaces wao-4.2.1 tagged by Maven Release on Wed Nov 12 11:24:31 2014 +0000 - Log ----------------------------------------------------------------- [jgitflow-maven-plugin]tagging release 4.2.2 ----------------------------------------------------------------------- No new revisions were added by this update. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch release/4.2.2 updated (1ee6819 -> 8ed5935)
by codelutin.com scm 12 Nov '14

12 Nov '14

This is an automated email from the git hooks/post-receive script. New change to branch release/4.2.2 in repository wao. See http://git.codelutin.com/wao.git from 1ee6819 Dans le mail de demande d'ajout au portefeuille de l'observateur, on précise le programme dans le corps du mail (fixes #6049)) adds 8ed5935 [jgitflow-maven-plugin]updating poms for branch'release/4.2.2' with non-snapshot versions No new revisions were added by this update. Summary of changes: pom.xml | 2 +- wao-persistence/pom.xml | 2 +- wao-services/pom.xml | 2 +- wao-web/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0