This is an automated email from the git hooks/post-receive script. New commit to branch feature/2264 in repository wao. See http://git.codelutin.com/wao.git commit 8503b961dc8b854c1cbff4f6931692d720a7db28 Author: Brendan Le Ny <bleny@codelutin.com> Date: Tue Dec 23 11:47:02 2014 +0100 Correction des tests --- .../src/main/java/fr/ifremer/wao/entity/Organisations.java | 12 ++++++++++++ .../service/csv/operations/OrganisationParserFormatter.java | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/wao-persistence/src/main/java/fr/ifremer/wao/entity/Organisations.java b/wao-persistence/src/main/java/fr/ifremer/wao/entity/Organisations.java index 30efc81..d2951df 100644 --- a/wao-persistence/src/main/java/fr/ifremer/wao/entity/Organisations.java +++ b/wao-persistence/src/main/java/fr/ifremer/wao/entity/Organisations.java @@ -13,6 +13,10 @@ public class Organisations { return Ordering.natural().onResultOf(getFullName()); } + public static Function<Organisation, String> getName() { + return new GetName<>(); + } + protected static class GetFullName<T extends Organisation> implements Function<T, String> { @Override @@ -20,4 +24,12 @@ public class Organisations { return input.getFullName(); } } + + protected static class GetName<T extends Organisation> implements Function<T, String> { + + @Override + public String apply(T input) { + return input.getName(); + } + } } diff --git a/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/OrganisationParserFormatter.java b/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/OrganisationParserFormatter.java index 58ac330..472f0a2 100644 --- a/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/OrganisationParserFormatter.java +++ b/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/OrganisationParserFormatter.java @@ -63,7 +63,7 @@ public class OrganisationParserFormatter implements ValueParserFormatter<Organis @Override public Organisation parse(String organisationName) throws ParseException { if (indexedOrganisations == null) { - indexedOrganisations = Maps.uniqueIndex(organisations, Organisations.getFullName()); + indexedOrganisations = Maps.uniqueIndex(organisations, Organisations.getName()); } Organisation organisation = null; if (StringUtils.isNotBlank(organisationName)) { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.

This is an automated email from the git hooks/post-receive script. New commit to branch feature/2264 in repository wao. See http://git.codelutin.com/wao.git commit 737b88f5b6b56641dce670396b91d1a34657789a Author: Brendan Le Ny <bleny@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 --- .../java/fr/ifremer/wao/entity/ContactState.java | 1 + .../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 | 56 +++++++++++++++++++++ .../{ObsMerContactsList.java => ContactsList.java} | 8 ++- .../wao/services/service/ContactsService.java | 10 +++- .../wao/services/service/InitWaoService.java | 9 ++-- .../wao/services/service/SynthesisService.java | 2 +- .../wao/services/service/WaoServiceSupport.java | 8 +++ .../service/csv/ContactImportExportModel.java | 32 ++++++++---- .../wao/services/service/ContactsServiceTest.java | 52 +++++++++++++++---- .../services/service/SclerochronologyFixtures.java | 18 +++++++ .../import/contacts-sclerochronologie.csv | 2 + .../fr/ifremer/wao/web/action/ContactsAction.java | 4 +- 15 files changed, 185 insertions(+), 36 deletions(-) diff --git a/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactState.java b/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactState.java index b273c0e..9e2a96f 100644 --- a/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactState.java +++ b/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactState.java @@ -83,6 +83,7 @@ public enum ContactState { ImmutableSetMultimap.<ObsProgram, ContactState>builder() .putAll(ObsProgram.OBSMER, ALL_CONTACT_STATES) .putAll(ObsProgram.OBSVENTE, ImmutableSet.of(OBSERVATION_EXPECTED, OBSERVATION_DONE, OBSERVATION_CANCELLED)) + .putAll(ObsProgram.SCLEROCHRONOLOGY, ImmutableSet.of(OBSERVATION_EXPECTED, OBSERVATION_DONE, OBSERVATION_CANCELLED)) .build(); protected String i18nKey; diff --git a/wao-persistence/src/main/java/fr/ifremer/wao/entity/SclerochronologySamplingContext.java b/wao-persistence/src/main/java/fr/ifremer/wao/entity/SclerochronologySamplingContext.java index 68648a3..0897a9c 100644 --- a/wao-persistence/src/main/java/fr/ifremer/wao/entity/SclerochronologySamplingContext.java +++ b/wao-persistence/src/main/java/fr/ifremer/wao/entity/SclerochronologySamplingContext.java @@ -35,4 +35,18 @@ public enum SclerochronologySamplingContext implements I18nAble { public String getI18nKey() { return i18nKey; } + + public boolean isScientificCampaign() { + return SCIENTIFIC_CAMPAIGN == this; + } + + public String getDedicatedBoatRegistrationCode() { + String dedicatedBoatRegistrationCode; + if (isScientificCampaign()) { + dedicatedBoatRegistrationCode = "SCLEROCAM"; + } else { + dedicatedBoatRegistrationCode = "SCLEROPRO"; + } + return dedicatedBoatRegistrationCode; + } } diff --git a/wao-persistence/src/main/resources/db/migration/V5_0__add_species,_add_laboratories,_add_sclerochronology.sql b/wao-persistence/src/main/resources/db/migration/V5_0__add_species,_add_laboratories,_add_sclerochronology.sql index 96ab55c..24e0ddc 100644 --- a/wao-persistence/src/main/resources/db/migration/V5_0__add_species,_add_laboratories,_add_sclerochronology.sql +++ b/wao-persistence/src/main/resources/db/migration/V5_0__add_species,_add_laboratories,_add_sclerochronology.sql @@ -74,3 +74,8 @@ alter table SampleRow add column species character varying(255) references Speci alter table SampleRow add column sclerochronologySamplingContext character varying(255); alter table SampleRow add column individualMeasurementStrategy character varying(255); alter table SampleRow add column sclerochronologySamplingContextInfo text; + +alter table Contact add column sampleSize integer; +alter table Contact add column sampleSubmission timestamp without time zone; +alter table Contact add column sampleReception timestamp without time zone; +alter table Contact add column sampleTreatment timestamp without time zone; diff --git a/wao-persistence/src/main/xmi/wao-model.zargo b/wao-persistence/src/main/xmi/wao-model.zargo index 5535ef4..69b2317 100644 Binary files a/wao-persistence/src/main/xmi/wao-model.zargo and b/wao-persistence/src/main/xmi/wao-model.zargo differ diff --git a/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatsService.java b/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatsService.java index da286422a..1deab18 100644 --- a/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatsService.java +++ b/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatsService.java @@ -41,6 +41,9 @@ import fr.ifremer.wao.entity.ContactTopiaDao; import fr.ifremer.wao.entity.ElligibleBoat; import fr.ifremer.wao.entity.ElligibleBoatTopiaDao; import fr.ifremer.wao.entity.ObsProgram; +import fr.ifremer.wao.entity.SampleRow; +import fr.ifremer.wao.entity.SclerochronologySamplingContext; +import fr.ifremer.wao.entity.ShipOwner; import fr.ifremer.wao.services.AuthenticatedWaoUser; import fr.ifremer.wao.services.service.csv.BoatImportExportModel; import org.apache.commons.collections4.CollectionUtils; @@ -302,4 +305,57 @@ public class BoatsService extends WaoServiceSupport { commit(); } + + /** + * Dans la sclérochronologie, on utilise pas les navires du référentiel mais des navires + * fictifs représentant respectivement un navire de l'Ifremer ou un navire d'un professionnel. + */ + public Boat getBoatToUseForSclerochronologySampleRow(SampleRow sampleRow) { + + String dedicatedBoatRegistrationCode = sampleRow.getSclerochronologySamplingContext().getDedicatedBoatRegistrationCode(); + + Boat boat = getBoatDao().forRegistrationCodeEquals(dedicatedBoatRegistrationCode).findUnique(); + + return boat; + + } + + public void createBoatsForSclerochronologyIfNecessary() { + + BoatTopiaDao dao = getBoatDao(); + + for (SclerochronologySamplingContext sclerochronologySamplingContext : SclerochronologySamplingContext.values()) { + + String dedicatedBoatRegistrationCode = sclerochronologySamplingContext.getDedicatedBoatRegistrationCode(); + + boolean exists = dao.forRegistrationCodeEquals(dedicatedBoatRegistrationCode).exists(); + + if ( ! exists) { + + getFictiveShipownerForSclerochronology(); + + dao.create(Boat.PROPERTY_REGISTRATION_CODE, dedicatedBoatRegistrationCode, + Boat.PROPERTY_SHIP_OWNER, getFictiveShipownerForSclerochronology(), + Boat.PROPERTY_NAME, "" + ); + } + + } + + commit(); + } + + protected ShipOwner getFictiveShipownerForSclerochronology() { + + final String FICTIVE_SHIP_OWNER_CODE = "SCLERO"; + + ShipOwner shipOwner = getShipOwnerDao().forCodeEquals(FICTIVE_SHIP_OWNER_CODE).findUniqueOrNull(); + + if (shipOwner == null) { + shipOwner = getShipOwnerDao().create(ShipOwner.PROPERTY_CODE, FICTIVE_SHIP_OWNER_CODE); + } + + return shipOwner; + + } } diff --git a/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerContactsList.java b/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsList.java similarity index 91% rename from wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerContactsList.java rename to wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsList.java index 24d7581..af984d0 100644 --- a/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerContactsList.java +++ b/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsList.java @@ -22,11 +22,9 @@ package fr.ifremer.wao.services.service; */ import fr.ifremer.wao.entity.Contact; +import org.nuiton.util.pagination.PaginationResult; import java.io.Serializable; -import java.util.List; - -import org.nuiton.util.pagination.PaginationResult; /** * Created on 4/3/14. @@ -34,9 +32,9 @@ import org.nuiton.util.pagination.PaginationResult; * @author Tony Chemit <chemit@codelutin.com> * @since 4.0 */ -public class ObsMerContactsList implements Serializable { +public class ContactsList implements Serializable { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 2L; protected PaginationResult<Contact> contacts; diff --git a/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsService.java b/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsService.java index b2d5cd5..fc7c3fc 100644 --- a/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsService.java +++ b/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsService.java @@ -207,7 +207,7 @@ public class ContactsService extends WaoServiceSupport { } - public ObsMerContactsList getContactsList(AuthenticatedWaoUser authenticatedWaoUser, + public ContactsList getContactsList(AuthenticatedWaoUser authenticatedWaoUser, ContactsFilter filter, PaginationParameter queryPager) { @@ -226,7 +226,7 @@ public class ContactsService extends WaoServiceSupport { ContactsFilterValues filterValues = getContactsFilterValues(authenticatedWaoUser, filter); - ObsMerContactsList contactsList = new ObsMerContactsList(); + ContactsList contactsList = new ContactsList(); contactsList.setContacts(contacts); contactsList.setFilterValues(filterValues); return contactsList; @@ -431,6 +431,12 @@ public class ContactsService extends WaoServiceSupport { } + if (obsProgram.isSclerochronology()) { + SampleRow sampleRow = updateContactCommand.getContact().getSampleRow(); + Boat boat = getBoatsService().getBoatToUseForSclerochronologySampleRow(sampleRow); + updateContactCommand.getContact().setBoat(boat); + } + try { validate(authenticatedWaoUser, updateContactCommand); } catch (ContactNotUpdatableException e) { diff --git a/wao-services/src/main/java/fr/ifremer/wao/services/service/InitWaoService.java b/wao-services/src/main/java/fr/ifremer/wao/services/service/InitWaoService.java index 8013668..626e790 100644 --- a/wao-services/src/main/java/fr/ifremer/wao/services/service/InitWaoService.java +++ b/wao-services/src/main/java/fr/ifremer/wao/services/service/InitWaoService.java @@ -26,7 +26,6 @@ import com.google.common.collect.ImmutableSet; import fr.ifremer.wao.BoatsFilter; import fr.ifremer.wao.ContactsFilter; import fr.ifremer.wao.entity.ObsProgram; -import fr.ifremer.wao.services.service.administration.ReferentialService; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -38,9 +37,9 @@ public class InitWaoService extends WaoServiceSupport { public void init() { - ReferentialService referentialService = getReferentialService(); + getReferentialService().initialImport(); - referentialService.initialImport(); + getBoatsService().createBoatsForSclerochronologyIfNecessary(); // pré-chargement des caches @@ -50,8 +49,8 @@ public class InitWaoService extends WaoServiceSupport { log.info("début du pré-chargement des caches"); } - BoatsService boatsService = newService(BoatsService.class); - ContactsService contactsService = newService(ContactsService.class); + BoatsService boatsService = getBoatsService(); + ContactsService contactsService = getContactsService(); for (ObsProgram obsProgram : ImmutableSet.of(ObsProgram.OBSMER, ObsProgram.OBSVENTE)) { BoatsFilter boatsFilter = boatsService.newEmptyBoatsFilter(); diff --git a/wao-services/src/main/java/fr/ifremer/wao/services/service/SynthesisService.java b/wao-services/src/main/java/fr/ifremer/wao/services/service/SynthesisService.java index d5f4a12..c84c6d0 100644 --- a/wao-services/src/main/java/fr/ifremer/wao/services/service/SynthesisService.java +++ b/wao-services/src/main/java/fr/ifremer/wao/services/service/SynthesisService.java @@ -69,7 +69,7 @@ public class SynthesisService extends WaoServiceSupport { public ContactsFilter newFilter(AuthenticatedWaoUser authenticatedWaoUser) { - ContactsService contactsService = newService(ContactsService.class); + ContactsService contactsService = getContactsService(); ContactsFilter newFilter = contactsService.newContactFilter(authenticatedWaoUser); diff --git a/wao-services/src/main/java/fr/ifremer/wao/services/service/WaoServiceSupport.java b/wao-services/src/main/java/fr/ifremer/wao/services/service/WaoServiceSupport.java index ebc60f9..8730e99 100644 --- a/wao-services/src/main/java/fr/ifremer/wao/services/service/WaoServiceSupport.java +++ b/wao-services/src/main/java/fr/ifremer/wao/services/service/WaoServiceSupport.java @@ -211,4 +211,12 @@ public abstract class WaoServiceSupport implements WaoService { public LaboratoriesService getLaboratoriesService() { return newService(LaboratoriesService.class); } + + protected BoatsService getBoatsService() { + return newService(BoatsService.class); + } + + protected ContactsService getContactsService() { + return newService(ContactsService.class); + } } diff --git a/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ContactImportExportModel.java b/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ContactImportExportModel.java index a1c4c41..487c7e7 100644 --- a/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ContactImportExportModel.java +++ b/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ContactImportExportModel.java @@ -161,9 +161,9 @@ public class ContactImportExportModel implements ImportExportModel<Contact> { } } ); - modelBuilder.newIgnoredColumn("CONTACT_OBSERVATEURS_SOCIETE"); + modelBuilder.newIgnoredColumn("CONTACT_OBSERVATEURS_ORGANISATION"); modelBuilder.newColumnForExport( - "CONTACT_OBSERVATEURS_SOCIETE", + "CONTACT_OBSERVATEURS_ORGANISATION", new ValueGetter<Contact, Organisation>() { @Override public Organisation get(Contact contact) { @@ -176,19 +176,29 @@ public class ContactImportExportModel implements ImportExportModel<Contact> { modelBuilder.newColumnForImportExport("CONTACT_ETAT", Contact.PROPERTY_CONTACT_STATE, new ContactStateParserFormatter(locale, obsProgram)); modelBuilder.newColumnForImportExport("CONTACT_DEBUT_OBSERVATION", Contact.PROPERTY_OBSERVATION_BEGIN_DATE, new DayTimeParserFormatter(locale)); modelBuilder.newColumnForImportExport("CONTACT_FIN_OBSERVATION", Contact.PROPERTY_OBSERVATION_END_DATE, new DayTimeParserFormatter(locale)); - modelBuilder.newColumnForImportExport("CONTACT_SAISIE_DONNEES", Contact.PROPERTY_DATA_INPUT_DATE, new DayParserFormatter(locale)); + if (obsProgram.isObsMer() || obsProgram.isObsVente()) { + modelBuilder.newColumnForImportExport("CONTACT_SAISIE_DONNEES", Contact.PROPERTY_DATA_INPUT_DATE, new DayParserFormatter(locale)); + } + if (obsProgram.isSclerochronology()) { + modelBuilder.newColumnForImportExport("CONTACT_NOMBRE_INDIVIDUS", Contact.PROPERTY_SAMPLE_SIZE, Common.PRIMITIVE_INTEGER); + modelBuilder.newColumnForImportExport("CONTACT_DATE_ENVOI_ECHANTILLON", Contact.PROPERTY_SAMPLE_SUBMISSION, new DayParserFormatter(locale)); + modelBuilder.newColumnForImportExport("CONTACT_DATE_RECEPTION_ECHANTILLON", Contact.PROPERTY_SAMPLE_RECEPTION, new DayParserFormatter(locale)); + modelBuilder.newColumnForImportExport("CONTACT_DATE_TRAITEMENT_ECHANTILLON", Contact.PROPERTY_SAMPLE_TREATMENT, new DayParserFormatter(locale)); + } modelBuilder.newColumnForImportExport("CONTACT_COMMENTAIRE_OBSERVATEUR", Contact.PROPERTY_COMMENT); modelBuilder.newColumnForImportExport("CONTACT_COMMENTAIRE_COORDINATEUR", Contact.PROPERTY_COMMENT_COORDINATOR); modelBuilder.newColumnForImportExport("CONTACT_COMMENTAIRE_PROGRAMME", Contact.PROPERTY_COMMENT_ADMIN); + if (obsProgram.isObsMer() || obsProgram.isObsVente()) { + modelBuilder.newColumnForImportExport("NAVIRE_IMMATRICULATION", Contact.PROPERTY_BOAT, new BoatParserFormatter(boats, locale)); + modelBuilder.newIgnoredColumn("NAVIRE_NOM"); + modelBuilder.newColumnForExport("NAVIRE_NOM", new ValueGetter<Contact, String>() { - modelBuilder.newColumnForImportExport("NAVIRE_IMMATRICULATION", Contact.PROPERTY_BOAT, new BoatParserFormatter(boats, locale)); - modelBuilder.newIgnoredColumn("NAVIRE_NOM"); - modelBuilder.newColumnForExport("NAVIRE_NOM", new ValueGetter<Contact, String>() { - @Override - public String get(Contact contact) { - return contact.getBoat().getName(); - } - }); + @Override + public String get(Contact contact) { + return contact.getBoat().getName(); + } + }); + } modelBuilder.newColumnForImportExport("CONTACT_VALIDATION_SOCIETE", Contact.PROPERTY_VALIDATION_COMPANY, Common.BOOLEAN); modelBuilder.newColumnForImportExport("CONTACT_VALIDATION_PROGRAMME", Contact.PROPERTY_VALIDATION_PROGRAM, Common.BOOLEAN); diff --git a/wao-services/src/test/java/fr/ifremer/wao/services/service/ContactsServiceTest.java b/wao-services/src/test/java/fr/ifremer/wao/services/service/ContactsServiceTest.java index ed7f169..946d207 100644 --- a/wao-services/src/test/java/fr/ifremer/wao/services/service/ContactsServiceTest.java +++ b/wao-services/src/test/java/fr/ifremer/wao/services/service/ContactsServiceTest.java @@ -22,7 +22,9 @@ package fr.ifremer.wao.services.service; */ import fr.ifremer.wao.ContactsFilter; +import fr.ifremer.wao.entity.Contact; import fr.ifremer.wao.services.AbstractWaoServiceTest; +import fr.ifremer.wao.services.AuthenticatedWaoUser; import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -41,12 +43,15 @@ public class ContactsServiceTest extends AbstractWaoServiceTest { protected ContactsService service; - protected ObsMerFixtures fixtures; + protected ObsMerFixtures obsMerfixtures; + + protected SclerochronologyFixtures sclerochronologyFixtures; @Before public void setUp() { service = newService(ContactsService.class); - fixtures = new ObsMerFixtures(newServiceContext()); + obsMerfixtures = new ObsMerFixtures(newServiceContext()); + sclerochronologyFixtures = new SclerochronologyFixtures(newServiceContext()); } protected boolean isDatabaseWithReferential() { @@ -56,26 +61,26 @@ public class ContactsServiceTest extends AbstractWaoServiceTest { @Test public void testGetContactsFilterValues() { - ContactsFilter filter = service.newContactFilter(fixtures.admin()); + ContactsFilter filter = service.newContactFilter(obsMerfixtures.admin()); - ContactsFilterValues filterValues = service.getContactsFilterValues(fixtures.admin(), filter); + ContactsFilterValues filterValues = service.getContactsFilterValues(obsMerfixtures.admin(), filter); } @Test public void testGetContactsList() { - ContactsFilter filter = service.newContactFilter(fixtures.admin()); + ContactsFilter filter = service.newContactFilter(obsMerfixtures.admin()); PaginationParameter pager = service.newContactsPaginationParameter(0, 50); - ObsMerContactsList contactsList = service.getContactsList(fixtures.admin(), filter, pager); + ContactsList contactsList = service.getContactsList(obsMerfixtures.admin(), filter, pager); } @Test public void testImportContacts() { - fixtures.samplingPlan(); - fixtures.jmichmuche(); - fixtures.navires(); + obsMerfixtures.samplingPlan(); + obsMerfixtures.jmichmuche(); + obsMerfixtures.navires(); // today must be after the observation end date applicationContext.setDate(DateUtil.createDate(1, 2, 2011)); @@ -85,7 +90,7 @@ public class ContactsServiceTest extends AbstractWaoServiceTest { Assert.assertEquals(0, service.getContactDao().count()); input = getClass().getResourceAsStream("/import/contacts.csv"); - service.importContacts(fixtures.admin(), input); + service.importContacts(obsMerfixtures.admin(), input); Assert.assertEquals(2, service.getContactDao().count()); } catch (ImportErrorException e) { if (log.isDebugEnabled()) { @@ -97,4 +102,31 @@ public class ContactsServiceTest extends AbstractWaoServiceTest { } } + @Test + public void testImportsSclerochronologyContacts() { + AuthenticatedWaoUser bob = sclerochronologyFixtures.bob(); + applicationContext.setDate(DateUtil.createDate(0, 0, 12, 15, 1, 2015)); + sclerochronologyFixtures.samplingPlan(); + applicationContext.setDate(DateUtil.createDate(0, 0, 12, 15, 2, 2015)); + InputStream input = null; + try { + input = getClass().getResourceAsStream("/import/contacts-sclerochronologie.csv"); + service.importContacts(sclerochronologyFixtures.admin(), input); + } catch (ImportErrorException e) { + if (log.isDebugEnabled()) { + log.debug("unexpected exception raised", e); + } + Assert.fail("exception should not be raised"); + } finally { + IOUtils.closeQuietly(input); + } + + ContactsFilter filter = service.newContactFilter(bob); + ContactsList contactsList = service.getContactsList(bob, filter, PaginationParameter.of(0, 20)); + Assert.assertEquals(1, contactsList.getContacts().getCount()); + for (Contact contact : contactsList.getContacts().getElements()) { + Assert.assertNotNull(contact.getBoat()); + } + } + } diff --git a/wao-services/src/test/java/fr/ifremer/wao/services/service/SclerochronologyFixtures.java b/wao-services/src/test/java/fr/ifremer/wao/services/service/SclerochronologyFixtures.java index 5c97dd3..b3a2c70 100644 --- a/wao-services/src/test/java/fr/ifremer/wao/services/service/SclerochronologyFixtures.java +++ b/wao-services/src/test/java/fr/ifremer/wao/services/service/SclerochronologyFixtures.java @@ -70,4 +70,22 @@ public class SclerochronologyFixtures extends WaoFixtures { IOUtils.closeQuietly(input); } } + + public AuthenticatedWaoUser bob() { + return newAuthenticatedWaoUser("bob", ObsProgram.SCLEROCHRONOLOGY, UserRole.OBSERVER, oceanet()); + } + + public void contacts() { + bob(); + samplingPlan(); + InputStream input = null; + try { + input = getClass().getResourceAsStream("/import/contacts-sclerochronologie.csv"); + serviceContext.newService(ContactsService.class).importContacts(admin(), input); + } catch (ImportErrorException e) { + throw new WaoTechnicalException(e); + } finally { + IOUtils.closeQuietly(input); + } + } } diff --git a/wao-services/src/test/resources/import/contacts-sclerochronologie.csv b/wao-services/src/test/resources/import/contacts-sclerochronologie.csv new file mode 100644 index 0000000..4e0288b --- /dev/null +++ b/wao-services/src/test/resources/import/contacts-sclerochronologie.csv @@ -0,0 +1,2 @@ +CONTACT_ID;CONTACT_DATE_CREATION;CONTACT_OBSERVATEUR_PRINCIPAL;CONTACT_OBSERVATEURS_SECONDAIRES;CONTACT_OBSERVATEURS_NOMS;CONTACT_OBSERVATEURS_ORGANISATION;CONTACT_ETAT;CONTACT_DEBUT_OBSERVATION;CONTACT_FIN_OBSERVATION;CONTACT_NOMBRE_INDIVIDUS;CONTACT_DATE_ENVOI_ECHANTILLON;CONTACT_DATE_RECEPTION_ECHANTILLON;CONTACT_DATE_TRAITEMENT_ECHANTILLON;CONTACT_COMMENTAIRE_OBSERVATEUR;CONTACT_COMMENTAIRE_COORDINATEUR;CONTACT_COMMENTAIRE_PROGRAMME;CONTACT_VALIDATION_SOCIETE;CONTACT_VALIDATION_PROGR [...] +;22/01/2015 03:00;bob;;;OCEANET;Observation réalisée;16/01/2015 09:00;16/01/2015 17:00;53;17/01/2015;19/01/2015;21/01/2015;;;;Y;Y;2015_S0001;CAMPAGNE 22 diff --git a/wao-web/src/main/java/fr/ifremer/wao/web/action/ContactsAction.java b/wao-web/src/main/java/fr/ifremer/wao/web/action/ContactsAction.java index 43f7a16..d1fbc5a 100644 --- a/wao-web/src/main/java/fr/ifremer/wao/web/action/ContactsAction.java +++ b/wao-web/src/main/java/fr/ifremer/wao/web/action/ContactsAction.java @@ -32,7 +32,7 @@ import fr.ifremer.wao.entity.FishingZone; import fr.ifremer.wao.entity.SampleRow; import fr.ifremer.wao.services.service.ContactsFilterValues; import fr.ifremer.wao.services.service.ContactsService; -import fr.ifremer.wao.services.service.ObsMerContactsList; +import fr.ifremer.wao.services.service.ContactsList; import fr.ifremer.wao.web.WaoJspActionSupport; import org.apache.commons.lang3.time.DateUtils; import org.nuiton.i18n.I18n; @@ -70,7 +70,7 @@ public class ContactsAction extends WaoJspActionSupport implements Preparable { /** * List of contacts according to the input pager and filter. */ - protected ObsMerContactsList contactsList; + protected ContactsList contactsList; public void setService(ContactsService service) { this.service = service; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.

This is an automated email from the git hooks/post-receive script. New commit to branch feature/2264 in repository wao. See http://git.codelutin.com/wao.git commit 2a485b8a1f2764cfd900b2b1f2a4e8a1cbadd50c Author: Brendan Le Ny <bleny@codelutin.com> Date: Wed Dec 24 10:57:32 2014 +0100 Ouverture de l'accès à l'onglet « Contacts » --- wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp b/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp index 7f9a39f..3a308f1 100644 --- a/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp +++ b/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp @@ -138,15 +138,13 @@ </li> </s:if> </s:if> - <s:if test=" ! sclerochronology"> - <s:if test="authenticatedWaoUser.authorizedToViewContacts"> - <li class="<decorator:getProperty property="page.contactsMenuItemClass"/>"> - <s:url namespace="/%{obsProgram.name().toLowerCase()}" action="contacts" id="contactsUrl" /> - <s:a href="%{contactsUrl}"> - <i class="fa fa-stack-exchange"></i> <s:text name="wao.ui.page.Contacts.title" /> - </s:a> - </li> - </s:if> + <s:if test="authenticatedWaoUser.authorizedToViewContacts"> + <li class="<decorator:getProperty property="page.contactsMenuItemClass"/>"> + <s:url namespace="/%{obsProgram.name().toLowerCase()}" action="contacts" id="contactsUrl" /> + <s:a href="%{contactsUrl}"> + <i class="fa fa-stack-exchange"></i> <s:text name="wao.ui.page.Contacts.title" /> + </s:a> + </li> </s:if> <s:if test=" ! sclerochronology"> <s:if test="authenticatedWaoUser.authorizedToViewSynthesis"> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.

This is an automated email from the git hooks/post-receive script. New commit to branch feature/2264 in repository wao. See http://git.codelutin.com/wao.git commit a6674c177f99316a6ee72ab3d5ff2fc791cf749b Author: Brendan Le Ny <bleny@codelutin.com> Date: Wed Dec 24 15:48:50 2014 +0100 Activivation de la création d'un contact sous scléro --- .../fr/ifremer/wao/entity/ContactTopiaDao.java | 4 +- .../ifremer/wao/services/service/BoatsService.java | 5 +- .../wao/services/service/ContactsService.java | 72 ++++++++++++++-------- .../services/service/SampleRowsFilterValues.java | 18 ++++-- .../services/service/UpdateSampleRowCommand.java | 2 +- .../wao/services/service/ContactsServiceTest.java | 26 ++++++++ .../services/service/SclerochronologyFixtures.java | 15 +++++ .../wao/web/action/CreateContactAction.java | 6 +- .../ifremer/wao/web/action/EditContactAction.java | 2 +- .../content/sclerochronology/sampling-plan.jsp | 16 +---- 10 files changed, 114 insertions(+), 52 deletions(-) diff --git a/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactTopiaDao.java b/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactTopiaDao.java index fd5ba51..fa642d2 100644 --- a/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactTopiaDao.java +++ b/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactTopiaDao.java @@ -199,9 +199,9 @@ public class ContactTopiaDao extends AbstractContactTopiaDao<Contact> { } - public Contact findMostRecentContactOrNull(ObsProgram obsProgram, String boatId, String companyId) { + public Contact findMostRecentContactOrNull(ObsProgram obsProgram, Boat boat, String companyId) { TopiaQueryBuilderAddCriteriaOrRunQueryStep<Contact> query = newQueryBuilder(); - query.addTopiaIdEquals(Contact.PROPERTY_BOAT, boatId); + query.addEquals(Contact.PROPERTY_BOAT, boat); query.addTopiaIdEquals(Contact.PROPERTY_SAMPLE_ROW + "." + SampleRow.PROPERTY_ORGANISATION, companyId); query.addEquals(Contact.PROPERTY_SAMPLE_ROW + "." + SampleRow.PROPERTY_OBS_PROGRAM, obsProgram); query.setOrderByArguments(Contact.PROPERTY_CREATION_DATE + " desc"); diff --git a/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatsService.java b/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatsService.java index 1deab18..71458de 100644 --- a/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatsService.java +++ b/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatsService.java @@ -202,7 +202,7 @@ public class BoatsService extends WaoServiceSupport { BoatInfos boatInfos = getBoatInfos(boatId, companyId); - Contact mostRecentContact = getContactDao().findMostRecentContactOrNull(obsProgram, boatId, companyId); + Contact mostRecentContact = getContactDao().findMostRecentContactOrNull(obsProgram, boatInfos.getBoat(), companyId); ContactsFilter filter = new ContactsFilter(); filter.getSampleRowFilter().setObsProgram(obsProgram); @@ -336,7 +336,8 @@ public class BoatsService extends WaoServiceSupport { dao.create(Boat.PROPERTY_REGISTRATION_CODE, dedicatedBoatRegistrationCode, Boat.PROPERTY_SHIP_OWNER, getFictiveShipownerForSclerochronology(), - Boat.PROPERTY_NAME, "" + Boat.PROPERTY_NAME, "", + Boat.PROPERTY_ACTIVE, true ); } diff --git a/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsService.java b/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsService.java index fc7c3fc..c7aafc3 100644 --- a/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsService.java +++ b/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsService.java @@ -104,10 +104,17 @@ public class ContactsService extends WaoServiceSupport { ContactsFilter newContactsFilter = newEmptyContactsFilter(obsProgram); - // DO NOT REMOVE THIS + // ATTENTION, il s'agit de sécu if (authenticatedWaoUser.isCoordinatorOrObserver()) { - String authenticatedWaoUserCompanyTopiaId = authenticatedWaoUser.getWaoUser().getCompany().getTopiaId(); - newContactsFilter.getSampleRowFilter().setOrganisationIds(ImmutableSet.of(authenticatedWaoUserCompanyTopiaId)); + // quand on appartient à une organisation (société ou labo), par défaut on ne peut voir + // que les lignes de cette même organisation + Organisation organisationToFilterOn = authenticatedWaoUser.getOrganisation(); + if (obsProgram.isObsMer() || obsProgram.isObsVente()) { + // dans ce cas, on est plus souple : si on appartient à des labos différents mais à + // la même société, on peut voir tout ce qui concerne la société tous labos confondus + organisationToFilterOn = authenticatedWaoUser.getOrganisation().getCompany(); + } + newContactsFilter.getSampleRowFilter().setOrganisationIds(ImmutableSet.of(organisationToFilterOn.getTopiaId())); } if (authenticatedWaoUser.isProfessional()) { @@ -929,10 +936,10 @@ public class ContactsService extends WaoServiceSupport { boolean addBoatToObserversAllegroWallet = false; - if (obsProgram == ObsProgram.OBSMER) { + if (obsProgram.isObsMer()) { addBoatToObserversAllegroWallet = contactState == ContactState.OBSERVATION_DONE || contactState == ContactState.OBSERVATION_EXPECTED; - } else if (obsProgram == ObsProgram.OBSVENTE) { + } else if (obsProgram.isObsVente()) { addBoatToObserversAllegroWallet = ContactState.OBSERVATION_DONE == contactState; } @@ -1034,46 +1041,61 @@ public class ContactsService extends WaoServiceSupport { } } - public Contact createContact(AuthenticatedWaoUser authenticatedWaoUser, String sampleRowId, String boatId) { - + public Contact createContact(AuthenticatedWaoUser authenticatedWaoUser, String sampleRowId, Optional<String> optionalBoatId) { + if (log.isInfoEnabled()) { - log.info(authenticatedWaoUser.getWaoUser() + " is creating a contact for " + sampleRowId + " and " + boatId); + log.info(authenticatedWaoUser.getWaoUser() + " is creating a contact for " + sampleRowId + " and " + optionalBoatId); } - UpdateContactCommand updateContactCommand = newUpdateContactCommandForCreation(authenticatedWaoUser); + SampleRow sampleRow = getSampleRowDao().forTopiaIdEquals(sampleRowId).findUnique(); + ObsProgram obsProgram = sampleRow.getObsProgram(); - Boat boat = getBoatDao().findByTopiaId(boatId); - Preconditions.checkState(boat.isActive(), "boat must be active"); + Boat boat; + if (obsProgram.isSclerochronology()) { + boat = getBoatsService().getBoatToUseForSclerochronologySampleRow(sampleRow); + } else { + Preconditions.checkArgument(optionalBoatId.isPresent(), "boatId must be provided for contact creation"); + String boatId = optionalBoatId.get(); + boat = getBoatDao().forTopiaIdEquals(boatId).findUnique(); + } - SampleRow sampleRow = getSampleRowDao().findByTopiaId(sampleRowId); - ObsProgram obsProgram = sampleRow.getObsProgram(); + Preconditions.checkState(boat.isActive(), "boat must be active"); - WaoUser observer = authenticatedWaoUser.getWaoUser(); - Contact mostRecentContactOrNull = getContactDao().findMostRecentContactOrNull(obsProgram, boatId, observer.getCompany().getTopiaId()); + WaoUser mainObserver = authenticatedWaoUser.getWaoUser(); Preconditions.checkState( - mostRecentContactOrNull == null || mostRecentContactOrNull.getContactState().isFinalState(), - "contact already exists"); + getPossibleObservers(sampleRow).contains(mainObserver), + authenticatedWaoUser + " is not allowed to create a contact for row " + sampleRow); + + if (obsProgram.isObsMer() || obsProgram.isObsVente()) { + Contact mostRecentContactOrNull = getContactDao().findMostRecentContactOrNull(obsProgram, boat, mainObserver.getCompany().getTopiaId()); + Preconditions.checkState( + mostRecentContactOrNull == null || mostRecentContactOrNull.getContactState().isFinalState(), + "contact already exists"); + } Date now = serviceContext.getNow(); + UpdateContactCommand updateContactCommand = newUpdateContactCommandForCreation(authenticatedWaoUser); Contact newContact = updateContactCommand.getContact(); newContact.setDataReliability(DataReliability.UNKNOWN); newContact.setBoat(boat); - newContact.setMainObserver(observer); newContact.setSampleRow(sampleRow); newContact.setCreationDate(now); + newContact.setMainObserver(mainObserver); // initial contact state depends on the program - if (obsProgram == ObsProgram.OBSMER) { + if (obsProgram.isObsMer()) { newContact.setContactState(ContactState.CONTACT_START); - } else if (obsProgram == ObsProgram.OBSVENTE) { + } else if (obsProgram.isObsVente() || obsProgram.isSclerochronology()) { newContact.setContactState(ContactState.OBSERVATION_EXPECTED); + } else { + throw new UnsupportedOperationException("program " + obsProgram); } // we can suppose a new contact default values are the one // expected in the sampling plan - if (newContact.getObsProgram() == ObsProgram.OBSVENTE) { + if (newContact.getObsProgram().isObsVente()) { // we hope in this contact, user used expected sampling strategy newContact.setSamplingStrategy(sampleRow.getSamplingStrategy()); } @@ -1083,14 +1105,14 @@ public class ContactsService extends WaoServiceSupport { // of data by trying to pre-fill some field using data given // in a previous entered contact - if (newContact.getObsProgram() == ObsProgram.OBSVENTE) { + if (newContact.getObsProgram().isObsVente()) { // try to pre-fill some field for user-experience // let's try to find a recent similar contact Map<String, Object> properties = new HashMap<>(); properties.put(Contact.PROPERTY_SAMPLE_ROW + "." + SampleRow.PROPERTY_OBS_PROGRAM, newContact.getObsProgram()); properties.put(Contact.PROPERTY_SAMPLE_ROW, sampleRow); - properties.put(Contact.PROPERTY_MAIN_OBSERVER, observer); + properties.put(Contact.PROPERTY_MAIN_OBSERVER, mainObserver); List<Contact> candidates = getContactDao().forProperties(properties).findAll(); @@ -1134,9 +1156,9 @@ public class ContactsService extends WaoServiceSupport { * Pour un contact donné, tous les utilisateurs qui peuvent être sélectionnés en tant qu' * observateurs (principale ou secondaire). */ - public SortedSet<WaoUser> getPossibleObservers(Contact contact) { + public SortedSet<WaoUser> getPossibleObservers(SampleRow sampleRow) { - Organisation organisation = contact.getSampleRow().getOrganisation(); + Organisation organisation = sampleRow.getOrganisation(); Set<Organisation> organisationsUserMustBeInToBeAnObserver = getOrganisationsService().getOrganisationsBelongingsTo(organisation); diff --git a/wao-services/src/main/java/fr/ifremer/wao/services/service/SampleRowsFilterValues.java b/wao-services/src/main/java/fr/ifremer/wao/services/service/SampleRowsFilterValues.java index 4184fc4..824701d 100644 --- a/wao-services/src/main/java/fr/ifremer/wao/services/service/SampleRowsFilterValues.java +++ b/wao-services/src/main/java/fr/ifremer/wao/services/service/SampleRowsFilterValues.java @@ -84,16 +84,22 @@ public class SampleRowsFilterValues extends AbstractFilterValues { protected void addSampleRow(SampleRow sampleRow, boolean fromBoatFilter) { boolean sampleRowMatchesObsProgram = obsProgram.equals(sampleRow.getObsProgram()); - boolean sampleRowMatchesCompany = true; + boolean sampleRowMatchesOrganisation = true; if (optionalCompanyId.isPresent()) { - String sampleRowCompanyId = null; - if (sampleRow.getCompany() != null) { - sampleRowCompanyId = sampleRow.getCompany().getTopiaId(); + String sampleRowOrganisationId = null; + if (sampleRow.getOrganisation() != null) { + sampleRowOrganisationId = sampleRow.getOrganisation().getTopiaId(); } - sampleRowMatchesCompany = optionalCompanyId.get().equals(sampleRowCompanyId); + sampleRowMatchesOrganisation = optionalCompanyId.get().equals(sampleRowOrganisationId); } - if (sampleRowMatchesObsProgram && sampleRowMatchesCompany) { + // par exemple, dans le cas du filtre navire, la présente méthode est appelée pour toutes les + // lignes pour lesquelles la navire est éligible, or on ne veut les données que pour les lignes + // du programme sous lequel l'utilisateur est connecté et on ne veux que les lignes du plan + // affecté à sa société (alors que l'admin voit tout) + boolean addSampleRow = sampleRowMatchesObsProgram + && sampleRowMatchesOrganisation; + if (addSampleRow) { for (FishingZone fishingZone : sampleRow.getFishingZone()) { fishingZoneFacadeNames.add(FilterOption.forString(fishingZone.getFacadeName())); diff --git a/wao-services/src/main/java/fr/ifremer/wao/services/service/UpdateSampleRowCommand.java b/wao-services/src/main/java/fr/ifremer/wao/services/service/UpdateSampleRowCommand.java index 3641d36..b3f58e7 100644 --- a/wao-services/src/main/java/fr/ifremer/wao/services/service/UpdateSampleRowCommand.java +++ b/wao-services/src/main/java/fr/ifremer/wao/services/service/UpdateSampleRowCommand.java @@ -114,7 +114,7 @@ public class UpdateSampleRowCommand implements Serializable{ public String getOrganisationId() { String organisationId = null; - if (sampleRow.getCompany() != null) { + if (sampleRow.getOrganisation() != null) { organisationId = sampleRow.getOrganisation().getTopiaId(); } return organisationId; diff --git a/wao-services/src/test/java/fr/ifremer/wao/services/service/ContactsServiceTest.java b/wao-services/src/test/java/fr/ifremer/wao/services/service/ContactsServiceTest.java index 946d207..003b07b 100644 --- a/wao-services/src/test/java/fr/ifremer/wao/services/service/ContactsServiceTest.java +++ b/wao-services/src/test/java/fr/ifremer/wao/services/service/ContactsServiceTest.java @@ -21,8 +21,11 @@ package fr.ifremer.wao.services.service; * #L% */ +import com.google.common.base.Optional; +import com.google.common.collect.Iterables; import fr.ifremer.wao.ContactsFilter; import fr.ifremer.wao.entity.Contact; +import fr.ifremer.wao.entity.SampleRow; import fr.ifremer.wao.services.AbstractWaoServiceTest; import fr.ifremer.wao.services.AuthenticatedWaoUser; import org.apache.commons.io.IOUtils; @@ -129,4 +132,27 @@ public class ContactsServiceTest extends AbstractWaoServiceTest { } } + @Test + public void testCreateSclerochronologyContact() { + AuthenticatedWaoUser alex = sclerochronologyFixtures.alex(); + applicationContext.setDate(DateUtil.createDate(0, 0, 12, 15, 1, 2015)); + + SampleRow sampleRow = sclerochronologyFixtures.sampleRow3(); + String sampleRowId = sampleRow.getTopiaId(); + applicationContext.setDate(DateUtil.createDate(0, 0, 12, 15, 2, 2015)); + + Contact contact = service.createContact(alex, sampleRowId, Optional.<String>absent()); + + Assert.assertTrue(contact.isPersisted()); + Assert.assertEquals( + "Le contact aurait dû être rattaché au navire dédié selon le contexte de la ligne du plan", + sampleRow.getSclerochronologySamplingContext().getDedicatedBoatRegistrationCode(), + contact.getBoat().getRegistrationCode()); + + ContactsFilter filter = service.newContactFilter(alex); + ContactsList contactsList = service.getContactsList(alex, filter, PaginationParameter.of(0, 5)); + Assert.assertEquals(1, contactsList.getContacts().getCount()); + Assert.assertEquals(contact, Iterables.getOnlyElement(contactsList.getContacts().getElements())); + + } } diff --git a/wao-services/src/test/java/fr/ifremer/wao/services/service/SclerochronologyFixtures.java b/wao-services/src/test/java/fr/ifremer/wao/services/service/SclerochronologyFixtures.java index b3a2c70..57b818c 100644 --- a/wao-services/src/test/java/fr/ifremer/wao/services/service/SclerochronologyFixtures.java +++ b/wao-services/src/test/java/fr/ifremer/wao/services/service/SclerochronologyFixtures.java @@ -3,6 +3,7 @@ package fr.ifremer.wao.services.service; import fr.ifremer.wao.WaoTechnicalException; import fr.ifremer.wao.entity.Laboratory; import fr.ifremer.wao.entity.ObsProgram; +import fr.ifremer.wao.entity.SampleRow; import fr.ifremer.wao.entity.UserRole; import fr.ifremer.wao.services.AuthenticatedWaoUser; import fr.ifremer.wao.services.WaoServiceContext; @@ -71,10 +72,24 @@ public class SclerochronologyFixtures extends WaoFixtures { } } + public SampleRow sampleRow1() { + samplingPlan(); + return serviceContext.getPersistenceContext().getSampleRowDao().forCodeEquals("2015_S0001").findUnique(); + } + + public SampleRow sampleRow3() { + samplingPlan(); + return serviceContext.getPersistenceContext().getSampleRowDao().forCodeEquals("2015_S0003").findUnique(); + } + public AuthenticatedWaoUser bob() { return newAuthenticatedWaoUser("bob", ObsProgram.SCLEROCHRONOLOGY, UserRole.OBSERVER, oceanet()); } + public AuthenticatedWaoUser alex() { + return newAuthenticatedWaoUser("alex", ObsProgram.SCLEROCHRONOLOGY, UserRole.OBSERVER, emh()); + } + public void contacts() { bob(); samplingPlan(); diff --git a/wao-web/src/main/java/fr/ifremer/wao/web/action/CreateContactAction.java b/wao-web/src/main/java/fr/ifremer/wao/web/action/CreateContactAction.java index 3403117..4698660 100644 --- a/wao-web/src/main/java/fr/ifremer/wao/web/action/CreateContactAction.java +++ b/wao-web/src/main/java/fr/ifremer/wao/web/action/CreateContactAction.java @@ -21,6 +21,8 @@ package fr.ifremer.wao.web.action; * #L% */ +import com.google.common.base.Optional; +import com.google.common.base.Strings; import fr.ifremer.wao.entity.Contact; import fr.ifremer.wao.services.service.ContactsService; import fr.ifremer.wao.web.WaoJspActionSupport; @@ -34,7 +36,7 @@ public class CreateContactAction extends WaoJspActionSupport { protected ContactsService service; - protected String boatId; + protected Optional<String> boatId = Optional.absent(); protected String sampleRowId; @@ -43,7 +45,7 @@ public class CreateContactAction extends WaoJspActionSupport { } public void setBoatId(String boatId) { - this.boatId = boatId; + this.boatId = Optional.fromNullable(Strings.emptyToNull(boatId)); } public void setSampleRowId(String sampleRowId) { diff --git a/wao-web/src/main/java/fr/ifremer/wao/web/action/EditContactAction.java b/wao-web/src/main/java/fr/ifremer/wao/web/action/EditContactAction.java index 4a5ca9a..e408c20 100644 --- a/wao-web/src/main/java/fr/ifremer/wao/web/action/EditContactAction.java +++ b/wao-web/src/main/java/fr/ifremer/wao/web/action/EditContactAction.java @@ -200,7 +200,7 @@ public class EditContactAction extends WaoJspActionSupport implements Preparable addActionError(t("wao.ui.error.unknownContactId")); } - SortedSet<WaoUser> sortedWaoUsers = service.getPossibleObservers(updateContactCommand.getContact()); + SortedSet<WaoUser> sortedWaoUsers = service.getPossibleObservers(updateContactCommand.getContact().getSampleRow()); observers = new LinkedHashMap<>(); for (WaoUser waoUser : sortedWaoUsers) { observers.put(waoUser.getTopiaId(), waoUser.getFullName()); diff --git 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 index 3511394..0082bc8 100644 --- 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 @@ -382,16 +382,6 @@ <i class="icon-filter"></i> <s:text name="wao.ui.action.zoomOnSampleRowPeriod" /> </s:a> </li> - <s:if test="authenticatedWaoUser.authorizedToViewBoats && elligibleBoatsProvided"> - <li> - <s:url action="boats!applyFilter" id="viewElligibleBoatsUrl"> - <s:param name="filter.elligibleForSampleRowsFilter.sampleRowCodes" value="code" /> - </s:url> - <s:a href="%{viewElligibleBoatsUrl}"> - <i class="fa fa-anchor"></i> <s:text name="wao.ui.action.viewElligibleBoats" /> - </s:a> - </li> - </s:if> <s:if test="authenticatedWaoUser.authorizedToViewContacts && sampleRowContactCounts > 0"> <li> <s:url action="contacts!applyFilter" id="viewAssociatedContactsUrl"> @@ -406,10 +396,10 @@ </s:if> <s:if test="authenticatedWaoUser.authorizedToCreateContact && newContactCreatable"> <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>.