Author: bleny Date: 2011-04-18 14:38:15 +0000 (Mon, 18 Apr 2011) New Revision: 1213 Log: add landing date in import-export Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/ContactImportExportModel.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/ContactImportExportModel.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/ContactImportExportModel.java 2011-04-18 14:34:52 UTC (rev 1212) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/ContactImportExportModel.java 2011-04-18 14:38:15 UTC (rev 1213) @@ -229,14 +229,14 @@ modelBuilder.newColumnForImportExport("PLAN_CODE", Contact.PROPERTY_SAMPLE_ROW, new SampleRowParserFormatter(sampleRows)); - if (ObsProgram.OBSMER.equals(obsProgram)) { + if (obsProgram == ObsProgram.OBSMER) { modelBuilder.newColumnForImportExport("CONTACT_QUALITE_DONNEE", "dataReliability", new Common.ToStringParserFormatter<DataReliability>(DataReliability.values())); modelBuilder.newColumnForImportExport("CONTACT_OBSERVATION_MAMMIFERE", Contact.PROPERTY_MAMMALS_OBSERVATION, Common.BOOLEAN); modelBuilder.newColumnForImportExport("CONTACT_CAPTURE_ACCIDENTELLE", Contact.PROPERTY_MAMMALS_CAPTURE, Common.BOOLEAN); } - if (ObsProgram.OBSVENTE.equals(obsProgram)) { + if (obsProgram == ObsProgram.OBSVENTE) { ValueGetterSetter<Contact, LocationType> locationTypeGetter = new Common.ValueSaver<Contact, LocationType>(); modelBuilder.newMandatoryColumn("CONTACT_LIEU_TYPE", new Common.ToStringParserFormatter<LocationType>(LocationType.values()), locationTypeGetter); modelBuilder.newColumnForExport("CONTACT_LIEU_TYPE", new ValueGetter<Contact, String>() { @@ -258,6 +258,10 @@ modelBuilder.newColumnForImportExport("CONTACT_ECHANTILLONNAGE_COMPLET", Contact.PROPERTY_COMPLETE_SAMPLING, Common.BOOLEAN); } + if (obsProgram == ObsProgram.OBSDEB) { + modelBuilder.newColumnForImportExport("CONTACT_DATE_DEBARQUEMENT", Contact.PROPERTY_LANDING_DATE, Common.DAY_TIME); + } + return modelBuilder; }