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

branch develop updated (29a6950 -> b1d3b08)
by codelutin.com scm 20 Jan '15

20 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 29a6950 On évite un échappement (fixes #6488) new 5bd58fb Correction du lien pour créer un utilisateur dans la liste des sociétés (fixes #6492) new b1d3b08 On supprime les filtres sur les commentaires dans l'onglet synthèses (fixes #6493) 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 b1d3b087f97ea09115bc391309c0dc7c7daba346 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Tue Jan 20 16:31:56 2015 +0100 On supprime les filtres sur les commentaires dans l'onglet synthèses (fixes #6493) commit 5bd58fb07a845c7a69a1f5708ea39a1f82fb28d5 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Tue Jan 20 16:27:01 2015 +0100 Correction du lien pour créer un utilisateur dans la liste des sociétés (fixes #6492) Summary of changes: .../src/main/webapp/WEB-INF/content/administration/companies.jsp | 2 +- wao-web/src/main/webapp/WEB-INF/content/synthesis.jsp | 9 --------- 2 files changed, 1 insertion(+), 10 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 (9480d83 -> 29a6950)
by codelutin.com scm 20 Jan '15

20 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 9480d83 Synthèses pour la sclérochronologie (fixes #2265) new 15c4c06 Correction d'une NPE à l'export du plan scléro (fixes #6486) new 29a6950 On évite un échappement (fixes #6488) 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 29a69501cd20f45849fdc3c635046e8f24da6e48 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Tue Jan 20 15:03:06 2015 +0100 On évite un échappement (fixes #6488) commit 15c4c064c10d0cf318d1ca473e2e6cdb2d62e59d Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Tue Jan 20 14:56:41 2015 +0100 Correction d'une NPE à l'export du plan scléro (fixes #6486) Summary of changes: .../wao/services/service/csv/SamplingPlanImportExportModel.java | 7 ++++++- .../services/service/SclerochronologySamplingPlanServiceTest.java | 8 ++++++++ .../src/main/webapp/WEB-INF/content/administration/wao-users.jsp | 2 +- 3 files changed, 15 insertions(+), 2 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 (dfaa79d -> 9480d83)
by codelutin.com scm 14 Jan '15

14 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 dfaa79d Correction d'une NPE potentielle new 109f65b Correction clé bundle new 0a84939 Synthèses pour la scléro OK mais on est toujours en mois en non en trimestres new 38ed029 Nom de variable new 1342d6f Passage de la synthèse scléro en trimestres new 16a9054 Filtres pour la synthèse scléro new 9480d83 Synthèses pour la sclérochronologie (fixes #2265) 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 9480d830a28b872a361fed3d118e4e7a15405232 Merge: dfaa79d 16a9054 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Wed Jan 14 18:13:06 2015 +0100 Synthèses pour la sclérochronologie (fixes #2265) commit 16a9054c7c8c8a5cfa76c7c13fa9fe8494e4e8a3 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Wed Jan 14 18:12:33 2015 +0100 Filtres pour la synthèse scléro commit 1342d6fa60c2fcfa621d1d3d4aeb401494b70129 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Wed Jan 14 18:08:26 2015 +0100 Passage de la synthèse scléro en trimestres commit 38ed0298eb7ca6f2d5c46f0b3e6973fe7172c29a Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Wed Jan 14 15:51:17 2015 +0100 Nom de variable commit 0a84939e86d17c8c65019f1f7c5948f12efd203c Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Wed Jan 14 15:23:56 2015 +0100 Synthèses pour la scléro OK mais on est toujours en mois en non en trimestres commit 109f65b549b48497fd8ce2cfce599c840f898e54 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Wed Jan 14 12:05:30 2015 +0100 Correction clé bundle Summary of changes: .../src/main/java/fr/ifremer/wao/WaoUtils.java | 62 ++++- .../fr/ifremer/wao/entity/ContactTopiaDao.java | 26 +- .../fr/ifremer/wao/entity/SampleRowTopiaDao.java | 19 +- .../wao/services/service/ContactsService.java | 3 +- .../fr/ifremer/wao/services/service/Synthesis.java | 5 +- .../wao/services/service/SynthesisService.java | 66 +++-- .../resources/i18n/wao-services_en_GB.properties | 2 +- .../main/resources/i18n/wao-web_fr_FR.properties | 4 +- .../src/main/webapp/WEB-INF/content/synthesis.jsp | 296 ++++++++++++--------- .../src/main/webapp/WEB-INF/decorators/layout.jsp | 16 +- 10 files changed, 307 insertions(+), 192 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 6

branch develop updated (920bef6 -> dfaa79d)
by codelutin.com scm 14 Jan '15

14 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 920bef6 On ignore un test qui pose problème new dfaa79d Correction d'une NPE potentielle 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 dfaa79d2563988a46f60e8c72ae61ef6a1ef1cf8 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Wed Jan 14 10:01:11 2015 +0100 Correction d'une NPE potentielle Summary of changes: .../fr/ifremer/wao/services/service/BoatsFilterValues.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 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 (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