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@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@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@codelutin.com>.