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

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

Dec. 26, 2014

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 Dec. 26, 2014

Dec. 26, 2014

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 Dec. 26, 2014

Dec. 26, 2014

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

branch develop updated (dfad235 -> 1f3474a)
by codelutin.com scm Dec. 26, 2014

Dec. 26, 2014

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 dfad235 Corrections pour éviter la notion d'organisation (fixes #6295) new 1f3474a Correction du calcul du réal en jours de mer dans ObsMer 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 1f3474aeb14051af5fba437f16f00e3dae3073cc Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Fri Dec 26 11:40:00 2014 +0100 Correction du calcul du réal en jours de mer dans ObsMer Summary of changes: .../java/fr/ifremer/wao/services/service/ObsMerSamplingPlanBuilder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 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 (912ef1e -> 8de096c)
by codelutin.com scm Dec. 26, 2014

Dec. 26, 2014

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 912ef1e Ébauche du formulaire de modification d'un contact scléro new 068d1a2 Tableau des contacts pour scléro et forme du formulaire (pas encore de validation adéquat) new 5d6b2f2 Passage du plan scléro en nombre d'individus (totaux manquants) new 8de096c Ajout des totaux en individus dans le plan The 3 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 8de096c5589af53138cfecf4afde0169df650c91 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Fri Dec 26 12:05:25 2014 +0100 Ajout des totaux en individus dans le plan commit 5d6b2f229d296dce252cbd15e0b23804eef48fde Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Fri Dec 26 11:39:06 2014 +0100 Passage du plan scléro en nombre d'individus (totaux manquants) commit 068d1a2dc4068527ec7571f9c0bf819785d19fc4 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Fri Dec 26 10:13:42 2014 +0100 Tableau des contacts pour scléro et forme du formulaire (pas encore de validation adéquat) Summary of changes: .../service/ObsMerSamplingPlanService.java | 27 --- .../ifremer/wao/services/service/SamplingPlan.java | 19 +- .../wao/services/service/SamplingPlanService.java | 22 +++ .../service/SclerochronologySamplingPlan.java | 39 +++- .../SclerochronologySamplingPlanBuilder.java | 218 +++++++++++---------- .../SclerochronologySamplingPlanService.java | 6 +- .../SclerochronologySamplingPlanServiceTest.java | 32 +++ .../wao/entity/Contact-conversion.properties | 5 +- .../main/resources/i18n/wao-web_en_GB.properties | 10 +- .../main/resources/i18n/wao-web_fr_FR.properties | 10 +- .../src/main/webapp/WEB-INF/content/contacts.jsp | 155 +++++++++++---- .../webapp/WEB-INF/content/edit-contact-input.jsp | 3 +- .../content/sclerochronology/sampling-plan.jsp | 10 +- 13 files changed, 354 insertions(+), 202 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 3

branch feature/2264 created (now 912ef1e)
by codelutin.com scm Dec. 24, 2014

Dec. 24, 2014

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 at 912ef1e Ébauche du formulaire de modification d'un contact scléro This branch includes the following new commits: new 8503b96 Correction des tests new 8c8c2a5 Utilisation d'une constante disponible depuis le refactoring de Wao 4.1 new 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 new 7ab5f4e Correction d'un lien pour la création d'un utilisateur new 2a485b8 Ouverture de l'accès à l'onglet « Contacts » new 529a0b8 On rétrograde la version de struts car on a plus les traces en cas d'erreur new a6674c1 Activivation de la création d'un contact sous scléro new 912ef1e Ébauche du formulaire de modification d'un contact scléro The 8 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 912ef1e1fd070bec6fcc878afbfcffea2aa902d6 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Wed Dec 24 16:31:14 2014 +0100 Ébauche du formulaire de modification d'un contact scléro commit a6674c177f99316a6ee72ab3d5ff2fc791cf749b Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Wed Dec 24 15:48:50 2014 +0100 Activivation de la création d'un contact sous scléro commit 529a0b8ea58bb2efd9fda20fc6fcf4f698b15e0c Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Wed Dec 24 15:47:17 2014 +0100 On rétrograde la version de struts car on a plus les traces en cas d'erreur commit 2a485b8a1f2764cfd900b2b1f2a4e8a1cbadd50c Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Wed Dec 24 10:57:32 2014 +0100 Ouverture de l'accès à l'onglet « Contacts » commit 7ab5f4e43329ad91505e74b4f9a153856768615d Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Wed Dec 24 10:57:10 2014 +0100 Correction d'un lien pour la création d'un utilisateur commit 737b88f5b6b56641dce670396b91d1a34657789a Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Tue Dec 23 16:40:25 2014 +0100 Dans le modèle, on ajoute les champs scléro sur l'entité Contact, dans les tests, on ajoute un import d'un contact commit 8c8c2a53b1b10f66f0d49118457635de039e897f Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Tue Dec 23 11:49:53 2014 +0100 Utilisation d'une constante disponible depuis le refactoring de Wao 4.1 commit 8503b961dc8b854c1cbff4f6931692d720a7db28 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Tue Dec 23 11:47:02 2014 +0100 Correction des tests -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 8

branch develop updated (0e7cf12 -> dfad235)
by codelutin.com scm Dec. 23, 2014

Dec. 23, 2014

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 0e7cf12 Correction d'un WARN struts en ajoutant un champs manquant dans l'action new f01d75b On renomme un modèle CSV (plus de ObsDeb) new 36c1b90 Dans la liste déroulante, afficher la société avant le labo pour grouper new 85b06c7 Changer les intitulés pour « Laboratoire Ifremer », changer « Organisation » pour « Société / Laboratoire » new 7c33594 Dans la liste des utilisateurs, ajouter une colonne pour le labo ; dans la liste déroulante, afficher la société avant le labo pour grouper new 141f8e2 On garde un libellé « Société » pour obsmer et obsvente de le formulaire de modification d'une ligne du plan new dfad235 Corrections pour éviter la notion d'organisation (fixes #6295) 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 dfad2351a30af4b4aef2a0add3365bacf4e96c79 Merge: f01d75b 141f8e2 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Tue Dec 23 10:50:07 2014 +0100 Corrections pour éviter la notion d'organisation (fixes #6295) commit 141f8e230ea90d4a6fa8602a1b4bb7197a6b3e47 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Tue Dec 23 10:46:45 2014 +0100 On garde un libellé « Société » pour obsmer et obsvente de le formulaire de modification d'une ligne du plan commit 7c3359487b0aa84d328639927371fa584b3f1ffa Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Tue Dec 23 10:02:04 2014 +0100 Dans la liste des utilisateurs, ajouter une colonne pour le labo ; dans la liste déroulante, afficher la société avant le labo pour grouper commit 85b06c7c83051065930f2712b550b958b0a13141 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Mon Dec 22 17:37:49 2014 +0100 Changer les intitulés pour « Laboratoire Ifremer », changer « Organisation » pour « Société / Laboratoire » commit 36c1b90a89025996229d2b25d644f4ebe6b88c8c Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Mon Dec 22 17:26:58 2014 +0100 Dans la liste déroulante, afficher la société avant le labo pour grouper commit f01d75ba154f807d7f113eefd5ee0712b0171850 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Mon Dec 22 16:59:28 2014 +0100 On renomme un modèle CSV (plus de ObsDeb) Summary of changes: .../main/java/fr/ifremer/wao/entity/Companies.java | 2 +- .../java/fr/ifremer/wao/entity/LaboratoryImpl.java | 4 +- .../java/fr/ifremer/wao/entity/Organisations.java | 10 ++--- .../main/java/fr/ifremer/wao/entity/WaoUsers.java | 16 ++++++++ .../wao/services/service/SamplingPlanService.java | 6 +-- .../administration/OrganisationsService.java | 9 ++--- .../service/administration/WaoUsersList.java | 44 ++++++++++++++++++++++ .../service/administration/WaoUsersService.java | 19 +++++----- ...del.java => SamplingPlanImportExportModel.java} | 14 +++---- .../operations/OrganisationParserFormatter.java | 2 +- ...java => SamplingPlanImportExportModelTest.java} | 6 +-- .../web/action/administration/WaoUsersAction.java | 13 +++---- .../main/resources/i18n/wao-web_en_GB.properties | 1 + .../main/resources/i18n/wao-web_fr_FR.properties | 7 ++-- .../WEB-INF/content/administration/wao-users.jsp | 24 ++++++++++-- .../WEB-INF/content/edit-sample-row-input.jsp | 7 +++- 16 files changed, 132 insertions(+), 52 deletions(-) create mode 100644 wao-services/src/main/java/fr/ifremer/wao/services/service/administration/WaoUsersList.java rename wao-services/src/main/java/fr/ifremer/wao/services/service/csv/{ObsMerObsVenteSamplingPlanImportExportModel.java => SamplingPlanImportExportModel.java} (94%) rename wao-services/src/test/java/fr/ifremer/wao/services/service/csv/{ObsMerObsVenteSamplingPlanImportExportModelTest.java => SamplingPlanImportExportModelTest.java} (90%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 6

branch develop updated (ddc9f4e -> 0e7cf12)
by codelutin.com scm Dec. 22, 2014

Dec. 22, 2014

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 ddc9f4e Ajout du plan d'échantillonnage pour le programme sclérochronologie (fixes #2263) adds bf80c88 fusion de deux migrations dans un même fichier suite à une fusion de branche de fonctionnalité adds d2305ae Correction d'une clause catch pour un import CSV adds 0e7cf12 Correction d'un WARN struts en ajoutant un champs manquant dans l'action No new revisions were added by this update. Summary of changes: ...pecies,_add_laboratories,_add_sclerochronology.sql} | 17 +++++++++++++++++ .../resources/db/migration/V5_0__sclerochronology.sql | 18 ------------------ .../service/administration/ReferentialService.java | 3 +-- .../wao/web/action/AbstractImportCsvAction.java | 8 +++++++- 4 files changed, 25 insertions(+), 21 deletions(-) rename wao-persistence/src/main/resources/db/migration/{V5_0__add_species,_add_laboratories.sql => V5_0__add_species,_add_laboratories,_add_sclerochronology.sql} (73%) delete mode 100644 wao-persistence/src/main/resources/db/migration/V5_0__sclerochronology.sql -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch feature/lucene created (now edbe89d)
by codelutin.com scm Dec. 22, 2014

Dec. 22, 2014

This is an automated email from the git hooks/post-receive script. New change to branch feature/lucene in repository wao. See http://git.codelutin.com/wao.git at edbe89d Reprise des tests lucene de la banche lucene sur SVN This branch includes the following new commits: new bf80c88 fusion de deux migrations dans un même fichier suite à une fusion de branche de fonctionnalité new d2305ae Correction d'une clause catch pour un import CSV new 0e7cf12 Correction d'un WARN struts en ajoutant un champs manquant dans l'action new edbe89d Reprise des tests lucene de la banche lucene sur SVN 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 edbe89dd199254a0d764ebb170c69fe7a6e6aa5f Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Mon Dec 22 15:37:11 2014 +0100 Reprise des tests lucene de la banche lucene sur SVN commit 0e7cf1248e9b2d4c021834d779c93701c55c8292 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Mon Dec 22 15:05:35 2014 +0100 Correction d'un WARN struts en ajoutant un champs manquant dans l'action commit d2305ae7858bd60907534017231e93f20eeffffd Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Mon Dec 22 15:05:13 2014 +0100 Correction d'une clause catch pour un import CSV commit bf80c884a6c39493a8058818cb93f8ae2fa8d242 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Mon Dec 22 14:46:26 2014 +0100 fusion de deux migrations dans un même fichier suite à une fusion de branche de fonctionnalité -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 4

branch develop updated (12328c6 -> ddc9f4e)
by codelutin.com scm Dec. 22, 2014

Dec. 22, 2014

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 12328c6 La version 4.3 n'aura pas lieu, on renomme la migration new 6bf8157 Ouverture de l'accès au programme Scléro pour le compte 'admin', correction du formulaire d'administration des utilisateurs pour ne pas pouvoir utiliser la notion d'invité et de professionnel new fd59834 Modification du modèle de la ligne du plan, introduction du service et de la vue pour le plan scléro, migration new 2c6e908 Dans l'écran de gestion des référentiels, on n'affiche que ce qui est pertinent pour scléro new 675f001 Suppression d'un fichier obsdeb new f4a83c2 Import du plan d'échantillonnage scléro new fde3c64 On gère les filtres dans le plan scléro new 321824f Ajout des champs scléro dans le formulaire de modification d'une ligne du plan new 626b064 Les filtres du plan sont désormais effectifs new 5bcc4c2 Dans le plan scléro, on ajoute une colonne pour l'espèce new 50588e1 On adapte la génération de la liste des modifications pour considérer les changements sur une ligne scléro new a182c8a Impact des données de test suite à changement de modèle CSV new 1a11c49 Correction du message généré quand on compare les organisations (qui ne sont plus forcément des sociétés) new 44b8232 Pour les coordinateurs et les observateurs, on affiche que les lignes du plan d'échantillonnage de l'organisation new e2e361a Dans la scléro, on utilise pas la notion de Profession new ddc9f4e Ajout du plan d'échantillonnage pour le programme sclérochronologie (fixes #2263) The 15 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 ddc9f4ef1d0a4ca7258ee1e143b03415822f5743 Merge: 12328c6 e2e361a Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Mon Dec 22 14:36:19 2014 +0100 Ajout du plan d'échantillonnage pour le programme sclérochronologie (fixes #2263) commit e2e361a595fc675c909553ec5aea137a804a2eb7 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Mon Dec 22 11:15:09 2014 +0100 Dans la scléro, on utilise pas la notion de Profession commit 44b82321eb517d338f8e5d1faa327e6523b60bb6 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Fri Dec 19 14:58:17 2014 +0100 Pour les coordinateurs et les observateurs, on affiche que les lignes du plan d'échantillonnage de l'organisation commit 1a11c491eb88690a423def59c6a278948ad0a43b Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Fri Dec 19 12:04:50 2014 +0100 Correction du message généré quand on compare les organisations (qui ne sont plus forcément des sociétés) commit a182c8a6bb2769f803bc54491143330e4cb9b2a3 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Fri Dec 19 11:48:38 2014 +0100 Impact des données de test suite à changement de modèle CSV commit 50588e180aed02fe197bbb2242e5f0e771e6afb6 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Fri Dec 19 11:44:13 2014 +0100 On adapte la génération de la liste des modifications pour considérer les changements sur une ligne scléro commit 5bcc4c289cf3ff8473efda00a0a1af960f537de5 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Thu Dec 18 16:59:10 2014 +0100 Dans le plan scléro, on ajoute une colonne pour l'espèce commit 626b064a5985fa0ac36176bfc71e7091e7271220 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Thu Dec 18 16:56:26 2014 +0100 Les filtres du plan sont désormais effectifs commit 321824f7e06ca6331d81be51c38b135eed7962a6 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Thu Dec 18 16:37:42 2014 +0100 Ajout des champs scléro dans le formulaire de modification d'une ligne du plan commit fde3c645ee6d1671b268b802f58d3fa5e3833fa8 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Thu Dec 18 15:09:42 2014 +0100 On gère les filtres dans le plan scléro commit f4a83c25404158e2e637ef5c7e34e85a70319154 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Thu Dec 18 11:36:37 2014 +0100 Import du plan d'échantillonnage scléro commit 675f00192651555d766d6237e3268c0b57b01305 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Thu Dec 18 10:27:01 2014 +0100 Suppression d'un fichier obsdeb commit 2c6e908c8db51c57862224a7a2ec9b69fd233573 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Thu Dec 18 09:59:41 2014 +0100 Dans l'écran de gestion des référentiels, on n'affiche que ce qui est pertinent pour scléro commit fd59834846ebbb3791bedd46b9a6884483e60643 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Mon Dec 15 15:49:36 2014 +0100 Modification du modèle de la ligne du plan, introduction du service et de la vue pour le plan scléro, migration commit 6bf81571ac6d97cd7abdd5161eec6fcceb9ba17f Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Mon Dec 15 10:45:50 2014 +0100 Ouverture de l'accès au programme Scléro pour le compte 'admin', correction du formulaire d'administration des utilisateurs pour ne pas pouvoir utiliser la notion d'invité et de professionnel Summary of changes: .../main/java/fr/ifremer/wao/SampleRowsFilter.java | 68 ++++++- .../java/fr/ifremer/wao/entity/BoatTopiaDao.java | 2 +- .../main/java/fr/ifremer/wao/entity/Companies.java | 9 +- .../wao/entity/IndividualMeasurementStrategy.java | 39 ++++ .../java/fr/ifremer/wao/entity/Organisations.java | 23 +++ .../java/fr/ifremer/wao/entity/SampleRowImpl.java | 15 +- .../fr/ifremer/wao/entity/SampleRowLogImpl.java | 94 +++++++-- .../fr/ifremer/wao/entity/SampleRowTopiaDao.java | 16 +- .../entity/SclerochronologySamplingContext.java | 38 ++++ .../main/java/fr/ifremer/wao/entity/Specieses.java | 19 ++ .../db/migration/V5_0__sclerochronology.sql | 18 ++ .../i18n/wao-persistence_en_GB.properties | 7 + .../i18n/wao-persistence_fr_FR.properties | 7 + wao-persistence/src/main/xmi/wao-model.properties | 2 +- wao-persistence/src/main/xmi/wao-model.zargo | Bin 61366 -> 61993 bytes .../ifremer/wao/services/AuthenticatedWaoUser.java | 5 + .../fr/ifremer/wao/services/ObsMerFixtures.java | 222 --------------------- .../ifremer/wao/services/service/BoatsService.java | 6 +- .../wao/services/service/ContactsService.java | 2 +- ...singIndividualMeasurementStrategyException.java | 10 + ...ngSclerochronologySamplingContextException.java | 10 + .../services/service/MissingSpeciesException.java | 10 + .../services/service/SampleRowsFilterValues.java | 88 +++++--- .../ifremer/wao/services/service/SamplingPlan.java | 14 +- .../wao/services/service/SamplingPlanService.java | 135 +++++++++---- .../service/SclerochronologySamplingPlan.java | 118 +++++++++++ ...va => SclerochronologySamplingPlanBuilder.java} | 38 ++-- ...va => SclerochronologySamplingPlanService.java} | 9 +- .../services/service/UpdateSampleRowCommand.java | 79 ++++++-- .../wao/services/service/WaoServiceSupport.java | 5 + .../administration/OrganisationsService.java | 18 ++ .../service/administration/ReferentialService.java | 9 + .../administration/UpdateWaoUserCommand.java | 9 + .../service/csv/ContactImportExportModel.java | 12 +- ...bsMerObsVenteSamplingPlanImportExportModel.java | 46 +++-- ...atter.java => OrganisationParserFormatter.java} | 48 ++--- .../csv/operations/SpeciesParserFormatter.java | 51 +++++ .../resources/i18n/wao-services_en_GB.properties | 5 + .../resources/i18n/wao-services_fr_FR.properties | 5 + .../wao/services/service/BoatsServiceTest.java | 1 - .../wao/services/service/ContactsServiceTest.java | 1 - .../wao/services/service/ObsMerFixtures.java | 93 +++++++++ .../service/ObsMerSamplingPlanServiceTest.java | 1 - .../services/service/SclerochronologyFixtures.java | 73 +++++++ .../SclerochronologySamplingPlanServiceTest.java | 135 +++++++++++++ .../ifremer/wao/services/service/WaoFixtures.java | 119 +++++++++++ .../src/test/resources/import/echantillonnage.csv | 20 +- .../resources/import/plan-sclerochronologie.csv | 6 + .../test/resources/import/samplingPlan-obsdeb.csv | 3 - .../wao/web/action/EditSampleRowAction.java | 15 +- .../action/SampleRowsFilterValuesJsonAction.java | 34 +++- .../action/administration/ImportSpeciesAction.java | 4 +- .../SamplingPlanAction.java | 12 +- .../SamplingPlanAction-conversion.properties | 1 + .../main/resources/i18n/wao-web_en_GB.properties | 5 + .../main/resources/i18n/wao-web_fr_FR.properties | 5 + .../content/administration/edit-wao-user.jsp | 4 +- .../administration/referential-management.jsp | 94 ++++----- .../main/webapp/WEB-INF/content/boat-details.jsp | 2 +- .../src/main/webapp/WEB-INF/content/contacts.jsp | 2 +- .../WEB-INF/content/edit-sample-row-input.jsp | 116 +++++++---- .../WEB-INF/content/obsmer/sampling-plan.jsp | 6 +- .../WEB-INF/content/obsvente/sampling-plan.jsp | 6 +- .../sampling-plan.jsp | 107 +++------- .../src/main/webapp/WEB-INF/content/synthesis.jsp | 4 +- .../src/main/webapp/WEB-INF/decorators/layout.jsp | 50 ++--- 66 files changed, 1580 insertions(+), 650 deletions(-) create mode 100644 wao-persistence/src/main/java/fr/ifremer/wao/entity/IndividualMeasurementStrategy.java create mode 100644 wao-persistence/src/main/java/fr/ifremer/wao/entity/Organisations.java create mode 100644 wao-persistence/src/main/java/fr/ifremer/wao/entity/SclerochronologySamplingContext.java create mode 100644 wao-persistence/src/main/java/fr/ifremer/wao/entity/Specieses.java create mode 100644 wao-persistence/src/main/resources/db/migration/V5_0__sclerochronology.sql delete mode 100644 wao-services/src/main/java/fr/ifremer/wao/services/ObsMerFixtures.java create mode 100644 wao-services/src/main/java/fr/ifremer/wao/services/service/MissingIndividualMeasurementStrategyException.java create mode 100644 wao-services/src/main/java/fr/ifremer/wao/services/service/MissingSclerochronologySamplingContextException.java create mode 100644 wao-services/src/main/java/fr/ifremer/wao/services/service/MissingSpeciesException.java create mode 100644 wao-services/src/main/java/fr/ifremer/wao/services/service/SclerochronologySamplingPlan.java copy wao-services/src/main/java/fr/ifremer/wao/services/service/{ObsVenteSamplingPlanBuilder.java => SclerochronologySamplingPlanBuilder.java} (86%) copy wao-services/src/main/java/fr/ifremer/wao/services/service/{ObsVenteSamplingPlanService.java => SclerochronologySamplingPlanService.java} (88%) rename wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/{CompanyParserFormatter.java => OrganisationParserFormatter.java} (50%) create mode 100644 wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/SpeciesParserFormatter.java create mode 100644 wao-services/src/test/java/fr/ifremer/wao/services/service/ObsMerFixtures.java create mode 100644 wao-services/src/test/java/fr/ifremer/wao/services/service/SclerochronologyFixtures.java create mode 100644 wao-services/src/test/java/fr/ifremer/wao/services/service/SclerochronologySamplingPlanServiceTest.java create mode 100644 wao-services/src/test/java/fr/ifremer/wao/services/service/WaoFixtures.java create mode 100644 wao-services/src/test/resources/import/plan-sclerochronologie.csv delete mode 100644 wao-services/src/test/resources/import/samplingPlan-obsdeb.csv copy wao-web/src/main/java/fr/ifremer/wao/web/action/{obsvente => sclerochronology}/SamplingPlanAction.java (72%) create mode 100644 wao-web/src/main/resources/fr/ifremer/wao/web/action/sclerochronology/SamplingPlanAction-conversion.properties copy wao-web/src/main/webapp/WEB-INF/content/{obsvente => sclerochronology}/sampling-plan.jsp (80%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 15