This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository wao. See http://git.codelutin.com/wao.git commit 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) 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(-) diff --cc wao-web/src/main/webapp/WEB-INF/content/sclerochronology/sampling-plan.jsp index c461d38,3ae34b5..edb945f --- a/wao-web/src/main/webapp/WEB-INF/content/sclerochronology/sampling-plan.jsp +++ b/wao-web/src/main/webapp/WEB-INF/content/sclerochronology/sampling-plan.jsp @@@ -404,12 -394,12 +394,12 @@@ </s:a> </li> </s:if> - <s:if test="authenticatedWaoUser.authorizedToCreateContact && newContactCreatable"> + <s:if test="authenticatedWaoUser.authorizedToCreateContact"> <li> - <s:url action="boats!applyFilter" id="createAssociatedContactUrl"> - <s:param name="startBoatSelectionForSampleRowId" value="sampleRowId" /> + <s:url action="create-contact" id="createContactUrl"> + <s:param name="sampleRowId" value="sampleRowId" /> </s:url> - <s:a href="%{createAssociatedContactUrl}"> + <s:a href="%{createContactUrl}"> <i class="icon-plus"></i> <s:text name="wao.ui.action.createAssociatedContact" /> </s:a> </li> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.