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

branch develop updated (790797e -> 920bef6)
by codelutin.com scm 13 Jan '15

13 Jan '15

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 790797e Gestion des contacts Scléro (fixes #2264) new 920bef6 On ignore un test qui pose problème 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 920bef60fd59d8fd2da4aed8a446b03ffd07c96b Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Tue Jan 13 17:33:34 2015 +0100 On ignore un test qui pose problème Summary of changes: .../wao/services/service/SclerochronologySamplingPlanServiceTest.java | 2 ++ 1 file changed, 2 insertions(+) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (b660ae2 -> 790797e)
by codelutin.com scm 13 Jan '15

13 Jan '15

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 b660ae2 Dans les plans, on propose toujours l'action de création d'un contact (fixes #6398) adds 8503b96 Correction des tests adds 8c8c2a5 Utilisation d'une constante disponible depuis le refactoring de Wao 4.1 adds 737b88f Dans le modèle, on ajoute les champs scléro sur l'entité Contact, dans les tests, on ajoute un import d'un contact adds 7ab5f4e Correction d'un lien pour la création d'un utilisateur adds 2a485b8 Ouverture de l'accès à l'onglet « Contacts » adds 529a0b8 On rétrograde la version de struts car on a plus les traces en cas d'erreur adds a6674c1 Activivation de la création d'un contact sous scléro adds 912ef1e Ébauche du formulaire de modification d'un contact scléro adds 068d1a2 Tableau des contacts pour scléro et forme du formulaire (pas encore de validation adéquat) adds 5d6b2f2 Passage du plan scléro en nombre d'individus (totaux manquants) adds 8de096c Ajout des totaux en individus dans le plan adds ca4479f On supprime les notions de nombre d'observations du plan scléro adds cceafbe Filtres scléro pour l'onglet Contacts adds e3d91c2 Correction filtre organisation de l'onglet contact adds 166ecae Remaniement de la validation des contacts (séparation en méthodes du service) adds 9e55adb Ajout d'une règle de validation pour le nombre d'individus échantilonnés adds e491dea css pour le tableau des contacts adds e7ed94d Ajout de la validation sur la chronologie des différentes dates des contacts scléro new 5597bb5 C'est le coordinateur qui doit renseigner la date de réception et la date de traitement new 790797e Gestion des contacts Scléro (fixes #2264) 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 790797ebf0b311736c7c5d662572e67634364230 Merge: b660ae2 5597bb5 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Tue Jan 13 17:22:23 2015 +0100 Gestion des contacts Scléro (fixes #2264) commit 5597bb5a0670dd50aefcfe96c9957ecb38336d54 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Tue Jan 13 17:20:53 2015 +0100 C'est le coordinateur qui doit renseigner la date de réception et la date de traitement Summary of changes: pom.xml | 2 +- .../java/fr/ifremer/wao/entity/ContactState.java | 1 + .../fr/ifremer/wao/entity/ContactTopiaDao.java | 4 +- .../entity/SclerochronologySamplingContext.java | 14 + ...ies,_add_laboratories,_add_sclerochronology.sql | 5 + wao-persistence/src/main/xmi/wao-model.zargo | Bin 61993 -> 62318 bytes .../ifremer/wao/services/service/BoatsService.java | 59 ++- .../{ObsMerContactsList.java => ContactsList.java} | 8 +- .../wao/services/service/ContactsService.java | 435 +++++++++++++-------- .../service/IllegalSampleReceptionException.java | 10 + .../service/IllegalSampleSizeException.java | 10 + .../service/IllegalSampleSubmissionException.java | 10 + .../service/IllegalSampleTreatmentException.java | 10 + .../wao/services/service/InitWaoService.java | 9 +- ...ismatchContactMainObserverCompanyException.java | 12 +- ...chContactSecondaryObserverCompanyException.java | 12 +- .../service/MissingSampleReceptionException.java | 10 + .../service/MissingSampleSizeException.java | 10 + .../service/MissingSampleSubmissionException.java | 10 + .../service/ObsMerSamplingPlanService.java | 27 -- .../services/service/SampleRowsFilterValues.java | 18 +- .../ifremer/wao/services/service/SamplingPlan.java | 19 +- .../wao/services/service/SamplingPlanService.java | 22 ++ .../service/SclerochronologySamplingPlan.java | 64 ++- .../SclerochronologySamplingPlanBuilder.java | 192 ++++----- .../SclerochronologySamplingPlanService.java | 6 +- .../wao/services/service/SynthesisService.java | 2 +- .../services/service/UpdateSampleRowCommand.java | 2 +- .../wao/services/service/WaoServiceSupport.java | 8 + .../service/csv/ContactImportExportModel.java | 34 +- .../resources/i18n/wao-services_en_GB.properties | 9 +- .../resources/i18n/wao-services_fr_FR.properties | 9 +- .../wao/services/service/ContactsServiceTest.java | 95 ++++- .../services/service/SclerochronologyFixtures.java | 44 +++ .../SclerochronologySamplingPlanServiceTest.java | 32 ++ .../import/contacts-sclerochronologie.csv | 2 + .../fr/ifremer/wao/web/action/ContactsAction.java | 4 +- .../wao/web/action/CreateContactAction.java | 6 +- .../ifremer/wao/web/action/EditContactAction.java | 55 ++- .../wao/web/action/ValidateContactJsonAction.java | 96 +++-- .../wao/entity/Contact-conversion.properties | 5 +- .../main/resources/i18n/wao-web_en_GB.properties | 15 +- .../main/resources/i18n/wao-web_fr_FR.properties | 15 +- .../WEB-INF/content/administration/wao-users.jsp | 2 +- .../src/main/webapp/WEB-INF/content/contacts.jsp | 223 ++++++++--- .../webapp/WEB-INF/content/edit-contact-input.jsp | 158 +++++--- .../content/sclerochronology/sampling-plan.jsp | 26 +- .../src/main/webapp/WEB-INF/decorators/layout.jsp | 16 +- 48 files changed, 1219 insertions(+), 618 deletions(-) rename wao-services/src/main/java/fr/ifremer/wao/services/service/{ObsMerContactsList.java => ContactsList.java} (91%) create mode 100644 wao-services/src/main/java/fr/ifremer/wao/services/service/IllegalSampleReceptionException.java create mode 100644 wao-services/src/main/java/fr/ifremer/wao/services/service/IllegalSampleSizeException.java create mode 100644 wao-services/src/main/java/fr/ifremer/wao/services/service/IllegalSampleSubmissionException.java create mode 100644 wao-services/src/main/java/fr/ifremer/wao/services/service/IllegalSampleTreatmentException.java create mode 100644 wao-services/src/main/java/fr/ifremer/wao/services/service/MissingSampleReceptionException.java create mode 100644 wao-services/src/main/java/fr/ifremer/wao/services/service/MissingSampleSizeException.java create mode 100644 wao-services/src/main/java/fr/ifremer/wao/services/service/MissingSampleSubmissionException.java create mode 100644 wao-services/src/test/resources/import/contacts-sclerochronologie.csv -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

01/02: C'est le coordinateur qui doit renseigner la date de réception et la date de traitement
by codelutin.com scm 13 Jan '15

13 Jan '15

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository wao. See http://git.codelutin.com/wao.git commit 5597bb5a0670dd50aefcfe96c9957ecb38336d54 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Tue Jan 13 17:20:53 2015 +0100 C'est le coordinateur qui doit renseigner la date de réception et la date de traitement --- wao-web/src/main/webapp/WEB-INF/content/edit-contact-input.jsp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wao-web/src/main/webapp/WEB-INF/content/edit-contact-input.jsp b/wao-web/src/main/webapp/WEB-INF/content/edit-contact-input.jsp index 1793618..a8ce752 100644 --- a/wao-web/src/main/webapp/WEB-INF/content/edit-contact-input.jsp +++ b/wao-web/src/main/webapp/WEB-INF/content/edit-contact-input.jsp @@ -361,13 +361,13 @@ <s:textfield name="updateContactCommand.contact.sampleReception" label="%{getText('wao.ui.field.Contact.sampleReception')}" placeholder="%{getDatePlaceholder()}" - disabled="%{!#editObservationReport}" + disabled="%{!#editObservationReport || !authenticatedWaoUser.coordinator}" cssClass="date"/> <s:textfield name="updateContactCommand.contact.sampleTreatment" label="%{getText('wao.ui.field.Contact.sampleTreatment')}" placeholder="%{getDatePlaceholder()}" - disabled="%{!#editObservationReport}" + disabled="%{!#editObservationReport || !authenticatedWaoUser.coordinator}" cssClass="date"/> </s:if> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

[ANN] - Wao 4.2.4 released
by codelutin.com Release Notification 13 Jan '15

13 Jan '15

The Wao team is pleased to announce the wao-4.2.4 release! Application pour le suivi contractuels d'observations scientifiques de la pêche Documentation of the project can be found here: http://doc.codelutin.com/wao Changes ------- Changes in this version include: New features: o [REFRENTIEL] mise à jour des tables de référence pour les DOM Issue: 6452. Thanks to Vincent BADTS. Resolved by vbadts. Fixed Bugs: o Impossible de créer un contact à partir du plan d'échantillonnage Issue: 6398. Thanks to Anne-Sophie Cornou. Resolved by ascornou. Downloads --------- For a manual installation, you can download files here: http://forge.codelutin.com/projects/wao/files * wao-4.2.4.war - http://forge.codelutin.com/attachments/download/2729 Maven artifacts --------------- Artifacts are deployed in nuiton maven repository http://maven.nuiton.org/other-releases/ Have fun! -Wao team

1 0

branch develop updated (90b80fd -> b660ae2)
by codelutin.com scm 13 Jan '15

13 Jan '15

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 90b80fd Correction de l'import du plan scléro (refs #2263) new b660ae2 Dans les plans, on propose toujours l'action de création d'un contact (fixes #6398) 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 b660ae29fc62b9767109124ece9cd08e616c91c7 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Tue Jan 13 16:41:18 2015 +0100 Dans les plans, on propose toujours l'action de création d'un contact (fixes #6398) Summary of changes: .../src/main/java/fr/ifremer/wao/services/service/SamplingPlan.java | 5 ----- wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp | 2 +- wao-web/src/main/webapp/WEB-INF/content/obsvente/sampling-plan.jsp | 2 +- .../main/webapp/WEB-INF/content/sclerochronology/sampling-plan.jsp | 2 +- 4 files changed, 3 insertions(+), 8 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch 4.2.4 created (now 383fa00)
by codelutin.com scm 13 Jan '15

13 Jan '15

This is an automated email from the git hooks/post-receive script. New change to branch 4.2.4 in repository wao. See http://git.codelutin.com/wao.git at 383fa00 Dans les plans, on propose toujours l'action de création d'un contact (fixes #6398) This branch includes the following new commits: new d243dca POM en 4.2.4 SNAPSHOT new 383fa00 Dans les plans, on propose toujours l'action de création d'un contact (fixes #6398) 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 383fa00e57ecb7d693dfc714b7fa8a46185e7dd9 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Tue Jan 13 16:41:18 2015 +0100 Dans les plans, on propose toujours l'action de création d'un contact (fixes #6398) Conflicts: wao-web/src/main/webapp/WEB-INF/content/sclerochronology/sampling-plan.jsp commit d243dca40f2c8aa4b5e362e30bad0dbd916c5a11 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Tue Jan 13 16:39:12 2015 +0100 POM en 4.2.4 SNAPSHOT -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2

branch develop updated (1f3474a -> 90b80fd)
by codelutin.com scm 13 Jan '15

13 Jan '15

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 1f3474a Correction du calcul du réal en jours de mer dans ObsMer new 6dac550 On gère l'absence de AphiaId (fixes #5973) new 5c5786f Correction clé bundle i18n new 6b25c5a Correction NPE new 6687a87 Correction appel i18n dans JSP new 90b80fd Correction de l'import du plan scléro (refs #2263) 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 90b80fd972944e5860dcef1855f9595227d28b79 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Tue Jan 13 15:45:08 2015 +0100 Correction de l'import du plan scléro (refs #2263) commit 6687a87764387fa173a1b9633e166b194c355d32 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Tue Jan 13 15:44:53 2015 +0100 Correction appel i18n dans JSP commit 6b25c5a920da5fac639388a4cf1a23c9c6ac2cd4 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Tue Jan 13 15:30:06 2015 +0100 Correction NPE commit 5c5786f3e6cb01ed7cbc6147e221ad2279a8bc54 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Tue Jan 13 15:09:24 2015 +0100 Correction clé bundle i18n commit 6dac5501bce39a2d923245907cbb2a004274007f Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Tue Jan 13 15:08:33 2015 +0100 On gère l'absence de AphiaId (fixes #5973) Summary of changes: .../src/main/java/fr/ifremer/wao/entity/Companies.java | 2 +- .../src/main/java/fr/ifremer/wao/entity/Organisations.java | 12 ++++++++++++ .../wao/services/service/UpdateSampleRowCommand.java | 3 ++- .../wao/services/service/csv/SpeciesImportModel.java | 14 ++++++++++++-- .../csv/operations/OrganisationParserFormatter.java | 2 +- wao-services/src/test/resources/import/especes.csv | 4 ++-- wao-web/src/main/resources/i18n/wao-web_fr_FR.properties | 2 +- .../WEB-INF/content/administration/edit-laboratory.jsp | 8 ++++++-- 8 files changed, 37 insertions(+), 10 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 5

branch feature/2264 updated (e491dea -> e7ed94d)
by codelutin.com scm 26 Dec '14

26 Dec '14

This is an automated email from the git hooks/post-receive script. New change to branch feature/2264 in repository wao. See http://git.codelutin.com/wao.git from e491dea css pour le tableau des contacts new e7ed94d Ajout de la validation sur la chronologie des différentes dates des contacts scléro 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 e7ed94d647a75b250e07330197eaa12c47a69ac0 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Fri Dec 26 18:30:19 2014 +0100 Ajout de la validation sur la chronologie des différentes dates des contacts scléro Summary of changes: .../wao/services/service/ContactsService.java | 58 +++++++++++++++++++++- .../service/IllegalSampleReceptionException.java | 10 ++++ .../service/IllegalSampleSubmissionException.java | 10 ++++ .../service/IllegalSampleTreatmentException.java | 10 ++++ .../service/MissingSampleReceptionException.java | 10 ++++ .../service/MissingSampleSubmissionException.java | 10 ++++ .../resources/i18n/wao-services_en_GB.properties | 5 ++ .../resources/i18n/wao-services_fr_FR.properties | 5 ++ .../ifremer/wao/web/action/EditContactAction.java | 15 ++++++ .../wao/web/action/ValidateContactJsonAction.java | 15 ++++++ .../main/resources/i18n/wao-web_en_GB.properties | 7 +++ .../main/resources/i18n/wao-web_fr_FR.properties | 7 +++ 12 files changed, 160 insertions(+), 2 deletions(-) create mode 100644 wao-services/src/main/java/fr/ifremer/wao/services/service/IllegalSampleReceptionException.java create mode 100644 wao-services/src/main/java/fr/ifremer/wao/services/service/IllegalSampleSubmissionException.java create mode 100644 wao-services/src/main/java/fr/ifremer/wao/services/service/IllegalSampleTreatmentException.java create mode 100644 wao-services/src/main/java/fr/ifremer/wao/services/service/MissingSampleReceptionException.java create mode 100644 wao-services/src/main/java/fr/ifremer/wao/services/service/MissingSampleSubmissionException.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/2264 updated (cceafbe -> e491dea)
by codelutin.com scm 26 Dec '14

26 Dec '14

This is an automated email from the git hooks/post-receive script. New change to branch feature/2264 in repository wao. See http://git.codelutin.com/wao.git from cceafbe Filtres scléro pour l'onglet Contacts new e3d91c2 Correction filtre organisation de l'onglet contact new 166ecae Remaniement de la validation des contacts (séparation en méthodes du service) new 9e55adb Ajout d'une règle de validation pour le nombre d'individus échantilonnés new e491dea css pour le tableau des contacts 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 e491dea4243fd4a6ab3d06859a8cb17defc014f1 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Fri Dec 26 16:34:25 2014 +0100 css pour le tableau des contacts commit 9e55adbaee72973770f08c5a2776ee0e5d9a3d3f Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Fri Dec 26 16:33:20 2014 +0100 Ajout d'une règle de validation pour le nombre d'individus échantilonnés commit 166ecae2b55bb45e0173748e135a913e37528a82 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Fri Dec 26 16:13:07 2014 +0100 Remaniement de la validation des contacts (séparation en méthodes du service) commit e3d91c2b66fb6bf04f47cc15c730df08f48d34f8 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Fri Dec 26 14:37:53 2014 +0100 Correction filtre organisation de l'onglet contact Summary of changes: .../wao/services/service/ContactsService.java | 291 +++++++++++---------- .../service/IllegalSampleSizeException.java | 10 + .../service/MissingSampleSizeException.java | 10 + .../resources/i18n/wao-services_en_GB.properties | 2 + .../resources/i18n/wao-services_fr_FR.properties | 2 + .../ifremer/wao/web/action/EditContactAction.java | 30 +-- .../wao/web/action/ValidateContactJsonAction.java | 77 ++---- .../src/main/webapp/WEB-INF/content/contacts.jsp | 11 +- .../webapp/WEB-INF/content/edit-contact-input.jsp | 2 + 9 files changed, 227 insertions(+), 208 deletions(-) create mode 100644 wao-services/src/main/java/fr/ifremer/wao/services/service/IllegalSampleSizeException.java create mode 100644 wao-services/src/main/java/fr/ifremer/wao/services/service/MissingSampleSizeException.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 4

branch feature/2264 updated (8de096c -> cceafbe)
by codelutin.com scm 26 Dec '14

26 Dec '14

This is an automated email from the git hooks/post-receive script. New change to branch feature/2264 in repository wao. See http://git.codelutin.com/wao.git from 8de096c Ajout des totaux en individus dans le plan new ca4479f On supprime les notions de nombre d'observations du plan scléro new cceafbe Filtres scléro pour l'onglet Contacts 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 cceafbecc5173a9a0f7192c2d805dd5be807b334 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Fri Dec 26 14:34:39 2014 +0100 Filtres scléro pour l'onglet Contacts commit ca4479f20c4424c1232b8c32b396480c999a1f7e Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Fri Dec 26 13:56:49 2014 +0100 On supprime les notions de nombre d'observations du plan scléro Summary of changes: .../service/SclerochronologySamplingPlan.java | 31 ++++++++--- .../SclerochronologySamplingPlanBuilder.java | 42 +-------------- .../src/main/webapp/WEB-INF/content/contacts.jsp | 61 ++++++++++++++-------- 3 files changed, 67 insertions(+), 67 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2