[Wao-commits] 03/08: Dans le modèle, on ajoute les champs scléro sur l'entité Contact, dans les tests, on ajoute un import d'un contact

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>.