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

branch release/5.0-RC1 deleted (was d8bdca7)
by codelutin.com scm 26 Jan '15

26 Jan '15

This is an automated email from the git hooks/post-receive script. New change to branch release/5.0-RC1 in repository wao. See http://git.codelutin.com/wao.git was d8bdca7 [jgitflow-maven-plugin]updating poms for branch'release/5.0-RC1' with non-snapshot versions The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

annotated tag wao-5.0-RC1 created (now 5d79dd0)
by codelutin.com scm 26 Jan '15

26 Jan '15

This is an automated email from the git hooks/post-receive script. New change to annotated tag wao-5.0-RC1 in repository wao. See http://git.codelutin.com/wao.git at 5d79dd0 (tag) tagging 8c8e421c42e2bd3cd8453f57adcf8a1377b41aa8 (commit) replaces wao-4.2.2 tagged by Maven Release on Mon Jan 26 10:08:54 2015 +0000 - Log ----------------------------------------------------------------- [jgitflow-maven-plugin]tagging release 5.0-RC1 ----------------------------------------------------------------------- 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

branch release/5.0-RC1 updated (696e106 -> d8bdca7)
by codelutin.com scm 26 Jan '15

26 Jan '15

This is an automated email from the git hooks/post-receive script. New change to branch release/5.0-RC1 in repository wao. See http://git.codelutin.com/wao.git from 696e106 [jgitflow-maven-plugin]updating poms for branch '5.0-RC1' with snapshot versions adds 8e70298 Utilisation de la dernière version de pom adds ce0ced0 Ajout des entêtes manquants adds d8bdca7 [jgitflow-maven-plugin]updating poms for branch'release/5.0-RC1' with non-snapshot versions No new revisions were added by this update. Summary of changes: pom.xml | 4 ++-- wao-persistence/pom.xml | 2 +- .../java/fr/ifremer/wao/AbstractWaoTopiaDao.java | 21 +++++++++++++++++++++ .../wao/entity/IndividualMeasurementStrategy.java | 21 +++++++++++++++++++++ .../java/fr/ifremer/wao/entity/LaboratoryImpl.java | 21 +++++++++++++++++++++ .../java/fr/ifremer/wao/entity/Organisations.java | 21 +++++++++++++++++++++ .../wao/entity/SclerochronologySamplingContext.java | 21 +++++++++++++++++++++ .../main/java/fr/ifremer/wao/entity/Specieses.java | 21 +++++++++++++++++++++ wao-services/pom.xml | 2 +- .../service/IllegalSampleReceptionException.java | 21 +++++++++++++++++++++ .../service/IllegalSampleSizeException.java | 21 +++++++++++++++++++++ .../service/IllegalSampleSubmissionException.java | 21 +++++++++++++++++++++ .../service/IllegalSampleTreatmentException.java | 21 +++++++++++++++++++++ ...ssingIndividualMeasurementStrategyException.java | 21 +++++++++++++++++++++ .../service/MissingSampleReceptionException.java | 21 +++++++++++++++++++++ .../service/MissingSampleSizeException.java | 21 +++++++++++++++++++++ .../service/MissingSampleSubmissionException.java | 21 +++++++++++++++++++++ ...ingSclerochronologySamplingContextException.java | 21 +++++++++++++++++++++ .../services/service/MissingSpeciesException.java | 21 +++++++++++++++++++++ .../service/administration/LaboratoriesService.java | 21 +++++++++++++++++++++ .../administration/OrganisationsService.java | 21 +++++++++++++++++++++ .../service/administration/WaoUsersList.java | 21 +++++++++++++++++++++ .../services/service/csv/SpeciesImportModel.java | 21 +++++++++++++++++++++ .../csv/operations/SpeciesParserFormatter.java | 21 +++++++++++++++++++++ .../services/service/SclerochronologyFixtures.java | 21 +++++++++++++++++++++ .../SclerochronologySamplingPlanServiceTest.java | 21 +++++++++++++++++++++ .../ifremer/wao/services/service/WaoFixtures.java | 21 +++++++++++++++++++++ wao-web/pom.xml | 2 +- .../action/administration/ImportSpeciesAction.java | 21 +++++++++++++++++++++ .../SamplingPlanAction-conversion.properties | 20 ++++++++++++++++++++ 30 files changed, 550 insertions(+), 5 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch master updated (3376104 -> 8c8e421)
by codelutin.com scm 26 Jan '15

26 Jan '15

This is an automated email from the git hooks/post-receive script. New change to branch master in repository wao. See http://git.codelutin.com/wao.git from 3376104 Merge branch 'release/4.2.2' adds dfd0132 Ajout du référentiel d'espèces cibles dans le modèle (refs #5973)) adds 69befc9 Introduction de la notion de laboratoire et d'organisation dans le modèle, on lie l'utilisateur à l'organisation et la ligne du plan à l'organisation (refs #2262) adds be716c0 Déclaration du programme Sclérochronologie adds 8cb8b78 [jgitflow-maven-plugin]updating poms for 4.2.3-SNAPSHOT development adds 7996659 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 42f1885 Merge branch 'master' into develop adds f005d30 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds aae647d Merge branch 'develop' of https://git.codelutin.com/wao into develop adds 2379fdd POM en 4.3-SNAPSHOT adds 368edb5 On permet de mettre l'utilisateur dans un laboratoire et non plus seulement dans une société adds 8a9d440 Liste des laboratoires, création, modification et suppression d'un laboratoire adds f7a23fa Ajout de la notion de laboratoire Ifremer (fixes #2262) adds 759d2d0 Pour les tests, ajout d'un fichier d'exemple adds 4fc2981 Ajout d'un service d'import des espèces adds 0715813 Ajout de l'interface utilisateur d'import du référentiel des espèces adds 296e68e Ajout d'un référentiel d'espèces cibles (refs #5973) adds 368202f Tri bundle adds 159153c Correction d'un bogue suscité par l'utilisation de instanceof sur des entités Hibernate adds 1d50585 Correction d'une NPE si un plan comporte un mois sans effort (fixes #6249) adds b05a2c3 Pour le calcul des jours de mers, on se base sur tous les contacts de la ligne et pas seulement ceux sur la période sinon il manque les marées commencées avant le premier mois (fixes #6246) adds 4661866 On permet l'import des espèces depuis tous les programmes (scléro n'est pas dispo) (refs #5973) adds 16e03e3 Correction de divers problèmes suite à l'introduction des laboratoires (refs #2262, fixes #6272) adds f97f22e Ajout d'une valeur i18n manquante adds 1b9676d Mise à jour des dépendances adds 27f2c02 POM en 5.0-SNAPSHOT, conformément à la feuille de route adds 0206540 Utilisation du code permanent comme clé du référentiel des espèces (et non le aphiaId) (fixes #5973) adds 6b7a0f0 Fusion du référentiel des espèces cibles dans develop (fixes #5973) adds ff4a960 Simplification bête adds 12328c6 La version 4.3 n'aura pas lieu, on renomme la migration adds 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 adds fd59834 Modification du modèle de la ligne du plan, introduction du service et de la vue pour le plan scléro, migration adds 2c6e908 Dans l'écran de gestion des référentiels, on n'affiche que ce qui est pertinent pour scléro adds 675f001 Suppression d'un fichier obsdeb adds f4a83c2 Import du plan d'échantillonnage scléro adds fde3c64 On gère les filtres dans le plan scléro adds 321824f Ajout des champs scléro dans le formulaire de modification d'une ligne du plan adds 626b064 Les filtres du plan sont désormais effectifs adds 5bcc4c2 Dans le plan scléro, on ajoute une colonne pour l'espèce adds 50588e1 On adapte la génération de la liste des modifications pour considérer les changements sur une ligne scléro adds a182c8a Impact des données de test suite à changement de modèle CSV adds 1a11c49 Correction du message généré quand on compare les organisations (qui ne sont plus forcément des sociétés) adds 44b8232 Pour les coordinateurs et les observateurs, on affiche que les lignes du plan d'échantillonnage de l'organisation adds e2e361a Dans la scléro, on utilise pas la notion de Profession adds 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 adds f01d75b On renomme un modèle CSV (plus de ObsDeb) adds 36c1b90 Dans la liste déroulante, afficher la société avant le labo pour grouper adds 85b06c7 Changer les intitulés pour « Laboratoire Ifremer », changer « Organisation » pour « Société / Laboratoire » adds 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 adds 141f8e2 On garde un libellé « Société » pour obsmer et obsvente de le formulaire de modification d'une ligne du plan adds dfad235 Corrections pour éviter la notion d'organisation (fixes #6295) adds 1f3474a Correction du calcul du réal en jours de mer dans ObsMer adds 6dac550 On gère l'absence de AphiaId (fixes #5973) adds 5c5786f Correction clé bundle i18n adds 6b25c5a Correction NPE adds 6687a87 Correction appel i18n dans JSP adds 90b80fd Correction de l'import du plan scléro (refs #2263) adds 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 adds 5597bb5 C'est le coordinateur qui doit renseigner la date de réception et la date de traitement adds 790797e Gestion des contacts Scléro (fixes #2264) adds 920bef6 On ignore un test qui pose problème adds dfaa79d Correction d'une NPE potentielle adds 109f65b Correction clé bundle adds 0a84939 Synthèses pour la scléro OK mais on est toujours en mois en non en trimestres adds 38ed029 Nom de variable adds 1342d6f Passage de la synthèse scléro en trimestres adds 16a9054 Filtres pour la synthèse scléro adds 9480d83 Synthèses pour la sclérochronologie (fixes #2265) adds 15c4c06 Correction d'une NPE à l'export du plan scléro (fixes #6486) adds 29a6950 On évite un échappement (fixes #6488) adds 5bd58fb Correction du lien pour créer un utilisateur dans la liste des sociétés (fixes #6492) adds b1d3b08 On supprime les filtres sur les commentaires dans l'onglet synthèses (fixes #6493) adds 47e2e0a On affiche les boutons volants au dessus du bandeau d'avertissement (fixes #6494)) adds 1305cc5 On partage les informations entre laboratoires adds 94e7bd8 On permet la création de contacts que pour les membres du labo affecté à la ligne adds 7987520 mend adds 085fa9e Ne pas masquer la vue entre labo appartenant à la même société (fixes #6490) adds 95de1fb Correction OGNL (refs #6393) adds 153e83d Correction d'un décalage provoqué par une textarea trop large (fixes #6487) adds 660b269 On supprime les appels à findByTopiaId adds 880fd0a Correction du formulaire de création de ligne ObsVente (fixes #6500) adds 15eeaed On enlève des override inutiles adds cada707 Utilisation de topia 3.0-SNAPSHOT adds 529a73a Utilisation de ToPIA stable adds 21ef218 Début de gestion des utilisateurs associés au labo dans le formulaire de modification d'un labo adds e526ee6 Introduction d'une propriété slf4jJclScope dans le POM pour contourner https://issues.apache.org/jira/browse/MTOMCAT-257 adds d1a3a75 Les membres d'un laboratoire peuvent être modifiés depuis le formulaire de modification d'un laboratoire adds 6e20d44 On permet de modifier les membres d'un labo directement depuis le formulaire de modification du labo (fixes #6489) adds 696e106 [jgitflow-maven-plugin]updating poms for branch '5.0-RC1' with snapshot versions adds 8e70298 Utilisation de la dernière version de pom adds ce0ced0 Ajout des entêtes manquants adds d8bdca7 [jgitflow-maven-plugin]updating poms for branch'release/5.0-RC1' with non-snapshot versions adds 8c8e421 Merge branch 'release/5.0-RC1' No new revisions were added by this update. Summary of changes: pom.xml | 22 +- wao-persistence/pom.xml | 2 +- ...{WaoException.java => AbstractWaoTopiaDao.java} | 32 +- .../main/java/fr/ifremer/wao/SampleRowsFilter.java | 68 ++- .../fr/ifremer/wao/WaoTopiaPersistenceContext.java | 10 +- .../src/main/java/fr/ifremer/wao/WaoUtils.java | 62 ++- .../java/fr/ifremer/wao/entity/BoatTopiaDao.java | 2 +- .../main/java/fr/ifremer/wao/entity/Companies.java | 9 +- .../java/fr/ifremer/wao/entity/CompanyImpl.java | 10 + .../java/fr/ifremer/wao/entity/ContactImpl.java | 26 -- .../java/fr/ifremer/wao/entity/ContactState.java | 1 + .../fr/ifremer/wao/entity/ContactTopiaDao.java | 40 +- ...rol.java => IndividualMeasurementStrategy.java} | 36 +- .../entity/{GeoPoint.java => LaboratoryImpl.java} | 20 +- .../java/fr/ifremer/wao/entity/ObsProgram.java | 7 +- .../fr/ifremer/wao/entity/OrganisationImpl.java | 8 +- .../entity/{WaoUsers.java => Organisations.java} | 28 +- .../java/fr/ifremer/wao/entity/SampleRowImpl.java | 35 +- .../fr/ifremer/wao/entity/SampleRowLogImpl.java | 94 ++++- .../fr/ifremer/wao/entity/SampleRowTopiaDao.java | 35 +- .../entity/SclerochronologySamplingContext.java | 73 ++++ .../wao/entity/{Dcf5Codes.java => Specieses.java} | 15 +- .../java/fr/ifremer/wao/entity/WaoUserImpl.java | 6 + .../fr/ifremer/wao/entity/WaoUserTopiaDao.java | 2 +- .../main/java/fr/ifremer/wao/entity/WaoUsers.java | 16 + ...ies,_add_laboratories,_add_sclerochronology.sql | 81 ++++ .../i18n/wao-persistence_en_GB.properties | 8 + .../i18n/wao-persistence_fr_FR.properties | 8 + wao-persistence/src/main/xmi/wao-model.properties | 21 +- wao-persistence/src/main/xmi/wao-model.zargo | Bin 59661 -> 62318 bytes wao-services/pom.xml | 2 +- .../ifremer/wao/services/AuthenticatedWaoUser.java | 19 +- .../fr/ifremer/wao/services/ObsMerFixtures.java | 222 ---------- .../wao/services/service/BoatsFilterValues.java | 10 +- .../ifremer/wao/services/service/BoatsService.java | 69 ++- .../{ObsMerContactsList.java => ContactsList.java} | 8 +- .../wao/services/service/ContactsService.java | 469 +++++++++++++-------- ...n.java => IllegalSampleReceptionException.java} | 6 +- ...eption.java => IllegalSampleSizeException.java} | 6 +- ....java => IllegalSampleSubmissionException.java} | 6 +- ...n.java => IllegalSampleTreatmentException.java} | 6 +- .../wao/services/service/InitWaoService.java | 9 +- ...ismatchContactMainObserverCompanyException.java | 12 +- ...chContactSecondaryObserverCompanyException.java | 12 +- ...ingIndividualMeasurementStrategyException.java} | 6 +- ...n.java => MissingSampleReceptionException.java} | 6 +- ...eption.java => MissingSampleSizeException.java} | 6 +- ....java => MissingSampleSubmissionException.java} | 6 +- ...gSclerochronologySamplingContextException.java} | 6 +- ...Exception.java => MissingSpeciesException.java} | 6 +- .../service/ObsMerSamplingPlanBuilder.java | 2 +- .../service/ObsMerSamplingPlanService.java | 40 +- .../services/service/SampleRowsFilterValues.java | 106 +++-- .../ifremer/wao/services/service/SamplingPlan.java | 60 +-- .../wao/services/service/SamplingPlanService.java | 197 ++++++--- .../service/SclerochronologySamplingPlan.java | 179 ++++++++ ...va => SclerochronologySamplingPlanBuilder.java} | 200 ++++----- ...va => SclerochronologySamplingPlanService.java} | 15 +- .../fr/ifremer/wao/services/service/Synthesis.java | 5 +- .../wao/services/service/SynthesisService.java | 68 +-- .../services/service/UpdateSampleRowCommand.java | 93 +++- .../wao/services/service/WaoServiceSupport.java | 33 ++ .../service/administration/CompaniesService.java | 38 +- .../administration/LaboratoriesService.java | 112 +++++ .../service/administration/NewsService.java | 4 +- ... => OrganisationNameMustBeUniqueException.java} | 2 +- .../administration/OrganisationsService.java | 115 +++++ .../service/administration/ReferentialService.java | 122 +++--- .../administration/UpdateWaoUserCommand.java | 41 +- .../service/administration/WaoUsersList.java | 65 +++ .../service/administration/WaoUsersService.java | 65 +-- .../service/csv/ContactImportExportModel.java | 46 +- ...del.java => SamplingPlanImportExportModel.java} | 63 ++- .../services/service/csv/SpeciesImportModel.java | 55 +++ ...atter.java => OrganisationParserFormatter.java} | 48 ++- ...rFormatter.java => SpeciesParserFormatter.java} | 57 ++- .../resources/i18n/wao-services_en_GB.properties | 16 +- .../resources/i18n/wao-services_fr_FR.properties | 14 +- .../wao/services/service/BoatsServiceTest.java | 1 - .../wao/services/service/ContactsServiceTest.java | 96 ++++- .../wao/services/service/ObsMerFixtures.java | 93 ++++ .../service/ObsMerSamplingPlanServiceTest.java | 1 - .../services/service/SclerochronologyFixtures.java | 138 ++++++ .../SclerochronologySamplingPlanServiceTest.java | 198 +++++++++ .../ifremer/wao/services/service/WaoFixtures.java | 140 ++++++ .../administration/ReferentialServiceTest.java | 16 + ...java => SamplingPlanImportExportModelTest.java} | 6 +- .../import/contacts-sclerochronologie.csv | 2 + .../src/test/resources/import/echantillonnage.csv | 20 +- wao-services/src/test/resources/import/especes.csv | 5 + .../resources/import/plan-sclerochronologie.csv | 6 + .../test/resources/import/samplingPlan-obsdeb.csv | 3 - wao-web/pom.xml | 5 +- .../fr/ifremer/wao/web/WaoJspActionSupport.java | 4 + .../wao/web/action/AbstractImportCsvAction.java | 8 +- .../fr/ifremer/wao/web/action/ContactsAction.java | 4 +- .../wao/web/action/CreateContactAction.java | 6 +- .../ifremer/wao/web/action/EditContactAction.java | 60 ++- .../wao/web/action/EditSampleRowAction.java | 15 +- .../action/SampleRowsFilterValuesJsonAction.java | 34 +- .../wao/web/action/ValidateContactJsonAction.java | 96 ++--- ...panyAction.java => DeleteLaboratoryAction.java} | 25 +- .../action/administration/EditCompanyAction.java | 6 +- .../administration/EditLaboratoryAction.java | 125 ++++++ .../action/administration/EditWaoUserAction.java | 20 +- ...rtBoatsAction.java => ImportSpeciesAction.java} | 11 +- ...ompaniesAction.java => LaboratoriesAction.java} | 18 +- .../web/action/administration/WaoUsersAction.java | 25 +- .../SamplingPlanAction.java | 12 +- .../wao/entity/Contact-conversion.properties | 5 +- .../SamplingPlanAction-conversion.properties | 2 +- .../main/resources/i18n/wao-web_en_GB.properties | 36 +- .../main/resources/i18n/wao-web_fr_FR.properties | 38 +- .../WEB-INF/content/administration/companies.jsp | 4 +- .../content/administration/edit-laboratory.jsp | 77 ++++ .../content/administration/edit-wao-user.jsp | 20 +- .../{companies.jsp => laboratories.jsp} | 34 +- .../administration/referential-management.jsp | 80 ++-- .../WEB-INF/content/administration/wao-users.jsp | 26 +- .../main/webapp/WEB-INF/content/boat-details.jsp | 40 +- .../src/main/webapp/WEB-INF/content/contacts.jsp | 225 +++++++--- .../webapp/WEB-INF/content/edit-contact-input.jsp | 158 ++++--- .../WEB-INF/content/edit-sample-row-input.jsp | 127 ++++-- .../WEB-INF/content/obsmer/sampling-plan.jsp | 8 +- .../WEB-INF/content/obsvente/sampling-plan.jsp | 8 +- .../sampling-plan.jsp | 135 ++---- .../src/main/webapp/WEB-INF/content/synthesis.jsp | 309 +++++++------- .../src/main/webapp/WEB-INF/decorators/layout.jsp | 28 +- wao-web/src/main/webapp/wao.css | 4 +- 129 files changed, 4176 insertions(+), 1917 deletions(-) copy wao-persistence/src/main/java/fr/ifremer/wao/{WaoException.java => AbstractWaoTopiaDao.java} (50%) copy wao-persistence/src/main/java/fr/ifremer/wao/entity/{ObservedDataControl.java => IndividualMeasurementStrategy.java} (56%) copy wao-persistence/src/main/java/fr/ifremer/wao/entity/{GeoPoint.java => LaboratoryImpl.java} (73%) copy wao-web/src/main/webapp/wao-screen.css => wao-persistence/src/main/java/fr/ifremer/wao/entity/OrganisationImpl.java (85%) copy wao-persistence/src/main/java/fr/ifremer/wao/entity/{WaoUsers.java => Organisations.java} (61%) create mode 100644 wao-persistence/src/main/java/fr/ifremer/wao/entity/SclerochronologySamplingContext.java copy wao-persistence/src/main/java/fr/ifremer/wao/entity/{Dcf5Codes.java => Specieses.java} (71%) create mode 100644 wao-persistence/src/main/resources/db/migration/V5_0__add_species,_add_laboratories,_add_sclerochronology.sql delete mode 100644 wao-services/src/main/java/fr/ifremer/wao/services/ObsMerFixtures.java rename wao-services/src/main/java/fr/ifremer/wao/services/service/{ObsMerContactsList.java => ContactsList.java} (91%) copy wao-services/src/main/java/fr/ifremer/wao/services/service/{IllegalAcceptationException.java => IllegalSampleReceptionException.java} (82%) copy wao-services/src/main/java/fr/ifremer/wao/services/service/{IllegalAcceptationException.java => IllegalSampleSizeException.java} (82%) copy wao-services/src/main/java/fr/ifremer/wao/services/service/{IllegalAcceptationException.java => IllegalSampleSubmissionException.java} (81%) copy wao-services/src/main/java/fr/ifremer/wao/services/service/{IllegalAcceptationException.java => IllegalSampleTreatmentException.java} (82%) copy wao-services/src/main/java/fr/ifremer/wao/services/service/{MissingFishingZonesException.java => MissingIndividualMeasurementStrategyException.java} (79%) copy wao-services/src/main/java/fr/ifremer/wao/services/service/{IllegalAcceptationException.java => MissingSampleReceptionException.java} (82%) copy wao-services/src/main/java/fr/ifremer/wao/services/service/{IllegalAcceptationException.java => MissingSampleSizeException.java} (82%) copy wao-services/src/main/java/fr/ifremer/wao/services/service/{IllegalAcceptationException.java => MissingSampleSubmissionException.java} (81%) copy wao-services/src/main/java/fr/ifremer/wao/services/service/{MissingFishingZonesException.java => MissingSclerochronologySamplingContextException.java} (79%) copy wao-services/src/main/java/fr/ifremer/wao/services/service/{NoEffortDefinedException.java => MissingSpeciesException.java} (82%) 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/{ObsMerSamplingPlanBuilder.java => SclerochronologySamplingPlanBuilder.java} (57%) copy wao-services/src/main/java/fr/ifremer/wao/services/service/{ObsVenteSamplingPlanService.java => SclerochronologySamplingPlanService.java} (81%) create mode 100644 wao-services/src/main/java/fr/ifremer/wao/services/service/administration/LaboratoriesService.java rename wao-services/src/main/java/fr/ifremer/wao/services/service/administration/{CompanyNameMustBeUniqueException.java => OrganisationNameMustBeUniqueException.java} (92%) create mode 100644 wao-services/src/main/java/fr/ifremer/wao/services/service/administration/OrganisationsService.java 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} (74%) create mode 100644 wao-services/src/main/java/fr/ifremer/wao/services/service/csv/SpeciesImportModel.java copy wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/{CompanyParserFormatter.java => OrganisationParserFormatter.java} (50%) rename wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/{CompanyParserFormatter.java => SpeciesParserFormatter.java} (50%) 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 rename wao-services/src/test/java/fr/ifremer/wao/services/service/csv/{ObsMerObsVenteSamplingPlanImportExportModelTest.java => SamplingPlanImportExportModelTest.java} (90%) create mode 100644 wao-services/src/test/resources/import/contacts-sclerochronologie.csv create mode 100644 wao-services/src/test/resources/import/especes.csv 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/administration/{DeleteCompanyAction.java => DeleteLaboratoryAction.java} (68%) create mode 100644 wao-web/src/main/java/fr/ifremer/wao/web/action/administration/EditLaboratoryAction.java copy wao-web/src/main/java/fr/ifremer/wao/web/action/administration/{ImportBoatsAction.java => ImportSpeciesAction.java} (80%) copy wao-web/src/main/java/fr/ifremer/wao/web/action/administration/{CompaniesAction.java => LaboratoriesAction.java} (69%) copy wao-web/src/main/java/fr/ifremer/wao/web/action/{obsvente => sclerochronology}/SamplingPlanAction.java (72%) copy wao-web/src/main/resources/fr/ifremer/wao/web/action/{obsmer => sclerochronology}/SamplingPlanAction-conversion.properties (95%) create mode 100644 wao-web/src/main/webapp/WEB-INF/content/administration/edit-laboratory.jsp copy wao-web/src/main/webapp/WEB-INF/content/administration/{companies.jsp => laboratories.jsp} (71%) copy wao-web/src/main/webapp/WEB-INF/content/{obsvente => sclerochronology}/sampling-plan.jsp (75%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch develop updated (6e20d44 -> 238d604)
by codelutin.com scm 26 Jan '15

26 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 6e20d44 On permet de modifier les membres d'un labo directement depuis le formulaire de modification du labo (fixes #6489) new 9f8ac82 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 696e106 [jgitflow-maven-plugin]updating poms for branch '5.0-RC1' with snapshot versions new 8e70298 Utilisation de la dernière version de pom new ce0ced0 Ajout des entêtes manquants new d8bdca7 [jgitflow-maven-plugin]updating poms for branch'release/5.0-RC1' with non-snapshot versions new 8c8e421 Merge branch 'release/5.0-RC1' new 72836a5 Merge branch 'master' into develop new 238d604 [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 7 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 238d604a61d25d1cc246e9580dc03b86261f7df3 Author: Maven Release <maven-release(a)codelutin.com> Date: Mon Jan 26 10:08:56 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 72836a566ba576b1332488e6889f38a97682f1a8 Merge: 9f8ac82 8c8e421 Author: Maven Release <maven-release(a)codelutin.com> Date: Mon Jan 26 10:08:56 2015 +0000 Merge branch 'master' into develop commit 9f8ac825bdc505411111fcd31ed3cd60295a971b Author: Maven Release <maven-release(a)codelutin.com> Date: Mon Jan 26 10:08:55 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 8c8e421c42e2bd3cd8453f57adcf8a1377b41aa8 Merge: 3376104 d8bdca7 Author: Maven Release <maven-release(a)codelutin.com> Date: Mon Jan 26 10:08:54 2015 +0000 Merge branch 'release/5.0-RC1' commit d8bdca7f2122b97125c61927896fe168726b693f Author: Maven Release <maven-release(a)codelutin.com> Date: Mon Jan 26 10:05:50 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/5.0-RC1' with non-snapshot versions commit ce0ced08822bf954495e7bfe9ce81d867215a991 Author: Maven Release <maven-release(a)codelutin.com> Date: Mon Jan 26 10:05:29 2015 +0000 Ajout des entêtes manquants commit 8e702988cfff694fc26aab2b0c9e642a8bbcbf01 Author: Maven Release <maven-release(a)codelutin.com> Date: Mon Jan 26 09:58:02 2015 +0000 Utilisation de la dernière version de pom Summary of changes: pom.xml | 2 +- .../java/fr/ifremer/wao/AbstractWaoTopiaDao.java | 21 +++++++++++++++++++++ .../wao/entity/IndividualMeasurementStrategy.java | 21 +++++++++++++++++++++ .../java/fr/ifremer/wao/entity/LaboratoryImpl.java | 21 +++++++++++++++++++++ .../java/fr/ifremer/wao/entity/Organisations.java | 21 +++++++++++++++++++++ .../wao/entity/SclerochronologySamplingContext.java | 21 +++++++++++++++++++++ .../main/java/fr/ifremer/wao/entity/Specieses.java | 21 +++++++++++++++++++++ .../service/IllegalSampleReceptionException.java | 21 +++++++++++++++++++++ .../service/IllegalSampleSizeException.java | 21 +++++++++++++++++++++ .../service/IllegalSampleSubmissionException.java | 21 +++++++++++++++++++++ .../service/IllegalSampleTreatmentException.java | 21 +++++++++++++++++++++ ...ssingIndividualMeasurementStrategyException.java | 21 +++++++++++++++++++++ .../service/MissingSampleReceptionException.java | 21 +++++++++++++++++++++ .../service/MissingSampleSizeException.java | 21 +++++++++++++++++++++ .../service/MissingSampleSubmissionException.java | 21 +++++++++++++++++++++ ...ingSclerochronologySamplingContextException.java | 21 +++++++++++++++++++++ .../services/service/MissingSpeciesException.java | 21 +++++++++++++++++++++ .../service/administration/LaboratoriesService.java | 21 +++++++++++++++++++++ .../administration/OrganisationsService.java | 21 +++++++++++++++++++++ .../service/administration/WaoUsersList.java | 21 +++++++++++++++++++++ .../services/service/csv/SpeciesImportModel.java | 21 +++++++++++++++++++++ .../csv/operations/SpeciesParserFormatter.java | 21 +++++++++++++++++++++ .../services/service/SclerochronologyFixtures.java | 21 +++++++++++++++++++++ .../SclerochronologySamplingPlanServiceTest.java | 21 +++++++++++++++++++++ .../ifremer/wao/services/service/WaoFixtures.java | 21 +++++++++++++++++++++ .../action/administration/ImportSpeciesAction.java | 21 +++++++++++++++++++++ .../SamplingPlanAction-conversion.properties | 20 ++++++++++++++++++++ 27 files changed, 546 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 7

[ANN] - Wao 5.0-RC1 released
by codelutin.com Release Notification 26 Jan '15

26 Jan '15

The Wao team is pleased to announce the wao-5.0-RC1 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 supprimer filtre commentaire ... dans synthèse Issue: 6493. Thanks to Vincent BADTS. Resolved by bleny. o Ajouter un bouton [Associer un utilisateur existant] dans l'écran de visualisation d'un labo Issue: 6489. Thanks to Vincent BADTS. Resolved by bleny. Fixed Bugs: o Erreur sur demo à la création d'une ligne du plan sur obsvente Issue: 6500. Thanks to Vincent BADTS. Resolved by bleny. o cf message erreur en haut de l'écran Issue: 6272. Thanks to Vincent BADTS. Resolved by bleny. o Anomalie chargement référentiel espèces Issue: 6481. Thanks to Vincent BADTS. Resolved by bleny. o Erreur export plan d'échantillonnage Issue: 6486. Thanks to Vincent BADTS. Resolved by bleny. o problème affichage caractères dans société Issue: 6488. Thanks to Vincent BADTS. Resolved by bleny. o erreur à la création d'un nouvel utilisateur pour une société Issue: 6492. Thanks to Vincent BADTS. Resolved by bleny. o ne pas masquer la vue entre labo appartenant à la même société Issue: 6490. Thanks to Vincent BADTS. Resolved by bleny. o [ERGO] décallage image Issue: 6487. Thanks to Vincent BADTS. Resolved by bleny. o impossible de supprimer un observateur secondaire dans un contact Issue: 6491. Thanks to Vincent BADTS. Resolved by bleny. o Les filtres dans synthèse sont vides Issue: 6482. Thanks to Vincent BADTS. Resolved by bleny. Changes: o Nouvelle version avec tickets 6246, 6249 Issue: 6296. Thanks to Anne-Sophie Cornou. Resolved by bleny. o on peut pas tester la vue estimée/réalisée dans le plan car le bandeau rouge câche l'icône... Issue: 6494. Thanks to Vincent BADTS. Resolved by bleny. o Gérer la notion de laboratoire comme sous partie de la société Issue: 6295. Thanks to Anne-Sophie Cornou. Resolved by bleny. Downloads --------- For a manual installation, you can download files here: http://forge.codelutin.com/projects/wao/files * wao-5.0-RC1.war - http://forge.codelutin.com/attachments/download/2792 Maven artifacts --------------- Artifacts are deployed in nuiton maven repository http://maven.nuiton.org/other-releases/ Have fun! -Wao team

1 0

branch release/5.0-RC1 created (now 696e106)
by codelutin.com scm 26 Jan '15

26 Jan '15

This is an automated email from the git hooks/post-receive script. New change to branch release/5.0-RC1 in repository wao. See http://git.codelutin.com/wao.git at 696e106 [jgitflow-maven-plugin]updating poms for branch '5.0-RC1' with snapshot versions This branch includes the following new commits: new 696e106 [jgitflow-maven-plugin]updating poms for branch '5.0-RC1' with snapshot versions 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 696e106d4d863032b5c40e82df48b79ae2ff7a34 Author: Maven Release <maven-release(a)codelutin.com> Date: Mon Jan 26 09:55:09 2015 +0000 [jgitflow-maven-plugin]updating poms for branch '5.0-RC1' with snapshot versions -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch release/4.2.3 deleted (was 80fabee)
by codelutin.com scm 26 Jan '15

26 Jan '15

This is an automated email from the git hooks/post-receive script. New change to branch release/4.2.3 in repository wao. See http://git.codelutin.com/wao.git was 80fabee dans la branche de release, on fixe la version du pom The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch develop updated (cada707 -> 6e20d44)
by codelutin.com scm 26 Jan '15

26 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 cada707 Utilisation de topia 3.0-SNAPSHOT new 529a73a Utilisation de ToPIA stable new 21ef218 Début de gestion des utilisateurs associés au labo dans le formulaire de modification d'un labo new e526ee6 Introduction d'une propriété slf4jJclScope dans le POM pour contourner https://issues.apache.org/jira/browse/MTOMCAT-257 new d1a3a75 Les membres d'un laboratoire peuvent être modifiés depuis le formulaire de modification d'un laboratoire new 6e20d44 On permet de modifier les membres d'un labo directement depuis le formulaire de modification du labo (fixes #6489) 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 6e20d44f0958e194d34cc4bf8ed03d6ebdcfd185 Merge: 529a73a d1a3a75 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Mon Jan 26 10:41:20 2015 +0100 On permet de modifier les membres d'un labo directement depuis le formulaire de modification du labo (fixes #6489) commit d1a3a75f36699fa6a8c373f8fad5b056447b4c11 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Mon Jan 26 10:39:19 2015 +0100 Les membres d'un laboratoire peuvent être modifiés depuis le formulaire de modification d'un laboratoire commit e526ee669959f482e5892fe99f5c00bd3be9ff2c Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Mon Jan 26 10:33:35 2015 +0100 Introduction d'une propriété slf4jJclScope dans le POM pour contourner https://issues.apache.org/jira/browse/MTOMCAT-257 commit 21ef218a63326a56f330355bf83d195e5afce6fa Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Fri Jan 23 12:01:58 2015 +0100 Début de gestion des utilisateurs associés au labo dans le formulaire de modification d'un labo commit 529a73a52fab8e2b4471c243834302f8bd696495 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Mon Jan 26 10:16:26 2015 +0100 Utilisation de ToPIA stable Summary of changes: pom.xml | 6 ++-- .../administration/LaboratoriesService.java | 22 ++++++++++++++- wao-web/pom.xml | 3 +- .../administration/EditLaboratoryAction.java | 32 ++++++++++++++++++++-- .../main/resources/i18n/wao-web_en_GB.properties | 1 + .../main/resources/i18n/wao-web_fr_FR.properties | 1 + .../content/administration/edit-laboratory.jsp | 6 ++++ 7 files changed, 65 insertions(+), 6 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 5

branch develop updated (880fd0a -> cada707)
by codelutin.com scm 23 Jan '15

23 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 880fd0a Correction du formulaire de création de ligne ObsVente (fixes #6500) new 15eeaed On enlève des override inutiles new cada707 Utilisation de topia 3.0-SNAPSHOT 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 cada70740086ac57f7f78aa5922252392f726bbf Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Fri Jan 23 11:59:44 2015 +0100 Utilisation de topia 3.0-SNAPSHOT commit 15eeaed8f5046d9324b95ecc1094f917dc6d7797 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Fri Jan 23 11:58:39 2015 +0100 On enlève des override inutiles Summary of changes: pom.xml | 2 +- .../fr/ifremer/wao/WaoTopiaPersistenceContext.java | 10 ++++----- .../java/fr/ifremer/wao/entity/ContactImpl.java | 26 ---------------------- 3 files changed, 5 insertions(+), 33 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2