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

branch feature/2263 deleted (was e2e361a)
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/2263 in repository wao. See http://git.codelutin.com/wao.git was e2e361a Dans la scléro, on utilise pas la notion de Profession This change permanently discards the following revisions: discards e2e361a Dans la scléro, on utilise pas la notion de Profession discards 44b8232 Pour les coordinateurs et les observateurs, on affiche que les lignes du plan d'échantillonnage de l'organisation discards 1a11c49 Correction du message généré quand on compare les organisations (qui ne sont plus forcément des sociétés) discards a182c8a Impact des données de test suite à changement de modèle CSV discards 50588e1 On adapte la génération de la liste des modifications pour considérer les changements sur une ligne scléro discards 5bcc4c2 Dans le plan scléro, on ajoute une colonne pour l'espèce discards 626b064 Les filtres du plan sont désormais effectifs discards 321824f Ajout des champs scléro dans le formulaire de modification d'une ligne du plan discards fde3c64 On gère les filtres dans le plan scléro discards f4a83c2 Import du plan d'échantillonnage scléro discards 675f001 Suppression d'un fichier obsdeb discards 2c6e908 Dans l'écran de gestion des référentiels, on n'affiche que ce qui est pertinent pour scléro discards fd59834 Modification du modèle de la ligne du plan, introduction du service et de la vue pour le plan scléro, migration discards 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 -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch develop updated (6b7a0f0 -> 12328c6)
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 6b7a0f0 Fusion du référentiel des espèces cibles dans develop (fixes #5973) new ff4a960 Simplification bête new 12328c6 La version 4.3 n'aura pas lieu, on renomme la migration 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 12328c6721c4a5da21e09757434c9279bb7c3d9e Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Thu Dec 18 17:43:52 2014 +0100 La version 4.3 n'aura pas lieu, on renomme la migration commit ff4a960c8a89b331a0ce19ef36efa287c5b2d88c Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Thu Dec 18 17:21:52 2014 +0100 Simplification bête Summary of changes: ...sql => V5_0__add_species,_add_laboratories.sql} | 0 .../service/administration/ReferentialService.java | 80 +++++++--------------- 2 files changed, 25 insertions(+), 55 deletions(-) rename wao-persistence/src/main/resources/db/migration/{V4_3__add_species,_add_laboratories.sql => V5_0__add_species,_add_laboratories.sql} (100%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2

branch feature/2263 updated (44b8232 -> e2e361a)
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/2263 in repository wao. See http://git.codelutin.com/wao.git from 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 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 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 Summary of changes: .../main/java/fr/ifremer/wao/entity/SampleRowImpl.java | 15 ++++++++------- .../fr/ifremer/wao/services/service/SamplingPlan.java | 14 +++++++++----- .../ifremer/wao/services/service/SamplingPlanService.java | 11 +++++------ .../csv/ObsMerObsVenteSamplingPlanImportExportModel.java | 4 +++- 4 files changed, 25 insertions(+), 19 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/2263 updated (a182c8a -> 44b8232)
by codelutin.com scm Dec. 19, 2014

Dec. 19, 2014

This is an automated email from the git hooks/post-receive script. New change to branch feature/2263 in repository wao. See http://git.codelutin.com/wao.git from 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 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 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) Summary of changes: .../fr/ifremer/wao/entity/SampleRowLogImpl.java | 2 +- .../ifremer/wao/services/AuthenticatedWaoUser.java | 5 +++ .../wao/services/service/SamplingPlanService.java | 37 ++++++++++++++-------- .../services/service/UpdateSampleRowCommand.java | 28 ++++++++-------- .../wao/services/service/ObsMerFixtures.java | 4 +-- .../services/service/SclerochronologyFixtures.java | 10 +++++- .../SclerochronologySamplingPlanServiceTest.java | 11 +++++++ .../ifremer/wao/services/service/WaoFixtures.java | 27 ++++++++++++++-- .../main/resources/i18n/wao-web_en_GB.properties | 1 + .../main/resources/i18n/wao-web_fr_FR.properties | 1 + .../WEB-INF/content/edit-sample-row-input.jsp | 8 ++--- 11 files changed, 96 insertions(+), 38 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2

branch feature/2263 updated (5bcc4c2 -> a182c8a)
by codelutin.com scm Dec. 19, 2014

Dec. 19, 2014

This is an automated email from the git hooks/post-receive script. New change to branch feature/2263 in repository wao. See http://git.codelutin.com/wao.git from 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 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 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 Summary of changes: .../fr/ifremer/wao/entity/SampleRowLogImpl.java | 94 ++++++++++++++++++---- .../SclerochronologySamplingPlanServiceTest.java | 53 +++++++++++- .../ifremer/wao/services/service/WaoFixtures.java | 28 ++++--- .../src/test/resources/import/echantillonnage.csv | 2 +- 4 files changed, 150 insertions(+), 27 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 (1b9676d -> 6b7a0f0)
by codelutin.com scm Dec. 18, 2014

Dec. 18, 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 1b9676d Mise à jour des dépendances new 27f2c02 POM en 5.0-SNAPSHOT, conformément à la feuille de route new 0206540 Utilisation du code permanent comme clé du référentiel des espèces (et non le aphiaId) (fixes #5973) new 6b7a0f0 Fusion du référentiel des espèces cibles dans develop (fixes #5973) 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 6b7a0f0f3d55eff1c42950ce370f742588127dec Merge: 27f2c02 0206540 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Thu Dec 18 17:09:16 2014 +0100 Fusion du référentiel des espèces cibles dans develop (fixes #5973) commit 27f2c02b206e0b549db266cc3503ef394ca0157d Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Thu Dec 18 17:07:04 2014 +0100 POM en 5.0-SNAPSHOT, conformément à la feuille de route commit 02065406afa483bbbe542eaf5e0655174ada1bbd Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Thu Dec 18 17:05:15 2014 +0100 Utilisation du code permanent comme clé du référentiel des espèces (et non le aphiaId) (fixes #5973) Summary of changes: pom.xml | 2 +- wao-persistence/pom.xml | 2 +- wao-services/pom.xml | 2 +- .../wao/services/service/administration/ReferentialService.java | 6 +++--- wao-web/pom.xml | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 3

branch feature/2263 updated (f4a83c2 -> 5bcc4c2)
by codelutin.com scm Dec. 18, 2014

Dec. 18, 2014

This is an automated email from the git hooks/post-receive script. New change to branch feature/2263 in repository wao. See http://git.codelutin.com/wao.git from 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 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 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 Summary of changes: .../main/java/fr/ifremer/wao/SampleRowsFilter.java | 68 ++++++++++--- .../java/fr/ifremer/wao/entity/BoatTopiaDao.java | 2 +- .../fr/ifremer/wao/entity/SampleRowTopiaDao.java | 16 ++- .../ifremer/wao/services/service/BoatsService.java | 6 +- .../wao/services/service/ContactsService.java | 2 +- .../services/service/SampleRowsFilterValues.java | 88 ++++++++++++----- .../wao/services/service/SamplingPlanService.java | 22 +++-- .../service/SclerochronologySamplingPlan.java | 11 +++ .../services/service/UpdateSampleRowCommand.java | 51 ++++++++++ .../resources/i18n/wao-services_en_GB.properties | 2 +- .../services/service/SclerochronologyFixtures.java | 15 +++ .../SclerochronologySamplingPlanServiceTest.java | 24 +++++ .../wao/web/action/EditSampleRowAction.java | 17 +--- .../action/SampleRowsFilterValuesJsonAction.java | 34 ++++++- .../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 | 108 ++++++++++++++------- .../WEB-INF/content/obsmer/sampling-plan.jsp | 6 +- .../WEB-INF/content/obsvente/sampling-plan.jsp | 6 +- .../content/sclerochronology/sampling-plan.jsp | 26 ++--- .../src/main/webapp/WEB-INF/content/synthesis.jsp | 4 +- 21 files changed, 391 insertions(+), 121 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 4

branch develop updated (f97f22e -> 1b9676d)
by codelutin.com scm Dec. 18, 2014

Dec. 18, 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 f97f22e Ajout d'une valeur i18n manquante new 1b9676d Mise à jour des dépendances 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 1b9676dcc7e85755463c53be997ef5d4a3663db8 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Thu Dec 18 15:32:37 2014 +0100 Mise à jour des dépendances Summary of changes: pom.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/2263 created (now f4a83c2)
by codelutin.com scm Dec. 18, 2014

Dec. 18, 2014

This is an automated email from the git hooks/post-receive script. New change to branch feature/2263 in repository wao. See http://git.codelutin.com/wao.git at f4a83c2 Import du plan d'échantillonnage scléro This branch includes the following new commits: 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 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 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 -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 5

annotated tag wao-4.2.3 created (now 30c2d63)
by codelutin.com scm Dec. 15, 2014

Dec. 15, 2014

This is an automated email from the git hooks/post-receive script. New change to annotated tag wao-4.2.3 in repository wao. See http://git.codelutin.com/wao.git at 30c2d63 (tag) tagging 80fabee9a08c560888c8e4243c138e5ef6e93642 (commit) replaces wao-4.2.2 tagged by Maven Release on Mon Dec 15 15:33:55 2014 +0000 - Log ----------------------------------------------------------------- Tagging version 4.2.3 ----------------------------------------------------------------------- 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