March 2018 - T3-commits - mailman.cloud.codelutin.com

[Git][ultreiaio/ird-t3][develop] Renommage des valeurs de TripType (See #116)
by Tony CHEMIT 06 Mar '18

06 Mar '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: 459fa5bd by Tony CHEMIT at 2018-03-06T16:20:06Z Renommage des valeurs de TripType (See #116) - - - - - 22 changed files: - t3-actions/src/main/java/fr/ird/t3/actions/io/input/AnalyzeInputSourceAction.java - t3-actions/src/main/java/fr/ird/t3/actions/io/input/it/AnalyzeInputSourceActionITSupport.java - t3-actions/src/main/java/fr/ird/t3/actions/io/input/it/ImportInputSourceActionITSupport.java - t3-actions/src/main/java/fr/ird/t3/actions/io/input/test/AnalyzeInputSourceActionTestSupport.java - t3-actions/src/main/java/fr/ird/t3/actions/io/input/test/ImportInputSourceActionTestSupport.java - t3-actions/src/test/java/fr/ird/t3/actions/io/input/AnalyzeInputSourceActionResumeTest.java - t3-actions/src/test/java/fr/ird/t3/actions/io/input/ImportInputSourceActionResumeTest.java - t3-domain/src/main/java/fr/ird/t3/entities/data/AbstractTripTopiaDao.java - t3-domain/src/main/java/fr/ird/t3/entities/data/TripImpl.java - t3-domain/src/main/java/fr/ird/t3/entities/data/TripType.java - t3-domain/src/main/java/fr/ird/t3/io/input/access/AbstractT3InputMSAccess.java - t3-domain/src/main/java/fr/ird/t3/io/input/access/T3AccessDataSource.java - t3-domain/src/main/java/fr/ird/t3/io/input/access/T3AvdthDataEntityVisitor.java - t3-domain/src/main/resources/db/migration/V2_3_01_add-Trip-tripType.sql - t3-domain/src/main/resources/i18n/t3-domain_en_GB.properties - t3-domain/src/main/resources/i18n/t3-domain_fr_FR.properties - t3-domain/src/test/java/fr/ird/t3/entities/data/TripTopiaDaoTest.java - t3-input-avdthv33/src/test/java/fr/ird/t3/actions/io/input/it/AnalyzeInputSourceActionIT.java - t3-input-avdthv33/src/test/java/fr/ird/t3/actions/io/input/it/ImportInputSourceActionIT.java - t3-input-avdthv35/src/test/java/fr/ird/t3/actions/io/input/AnalyzeInputSourceActionTest.java - t3-input-avdthv35/src/test/java/fr/ird/t3/actions/io/input/ImportInputSourceActionTest.java - t3-web/src/main/java/fr/ird/t3/web/actions/io/input/ConfigureImportDataAction.java Changes: ===================================== t3-actions/src/main/java/fr/ird/t3/actions/io/input/AnalyzeInputSourceAction.java ===================================== --- a/t3-actions/src/main/java/fr/ird/t3/actions/io/input/AnalyzeInputSourceAction.java +++ b/t3-actions/src/main/java/fr/ird/t3/actions/io/input/AnalyzeInputSourceAction.java @@ -160,7 +160,7 @@ public class AnalyzeInputSourceAction extends T3Action<AnalyzeInputSourceConfigu LoadingTripHitModel hitModel = new LoadingTripHitModel(); hitModel.addPropertyChangeListener(LoadingTripHitModel.NB_TRIP_LOADED, evt -> incrementsProgression()); TripType tripType = getConfiguration().getTripType(); - boolean samplesOnly = tripType == TripType.SAMPLES_ONLY; + boolean samplesOnly = tripType == TripType.SAMPLEONLY; tripsLoaded = inputPilot.loadTrips(hitModel); boolean createVessel = getConfiguration().isCanCreateVessel(); Map<Integer, Vessel> vessels = null; ===================================== t3-actions/src/main/java/fr/ird/t3/actions/io/input/it/AnalyzeInputSourceActionITSupport.java ===================================== --- a/t3-actions/src/main/java/fr/ird/t3/actions/io/input/it/AnalyzeInputSourceActionITSupport.java +++ b/t3-actions/src/main/java/fr/ird/t3/actions/io/input/it/AnalyzeInputSourceActionITSupport.java @@ -120,7 +120,7 @@ public abstract class AnalyzeInputSourceActionITSupport { fixture.nbUnsafe(), fixture.nbSafeWithoutWell(), fixture.nbUnsafeWithoutwell(), - TripType.NORMAL, + TripType.STANDARD, false, false ); @@ -136,7 +136,7 @@ public abstract class AnalyzeInputSourceActionITSupport { nbUnsafe, nbSafeWithoutwell, nbUnsafeWithoutWell, - TripType.NORMAL, + TripType.STANDARD, false, false ); ===================================== t3-actions/src/main/java/fr/ird/t3/actions/io/input/it/ImportInputSourceActionITSupport.java ===================================== --- a/t3-actions/src/main/java/fr/ird/t3/actions/io/input/it/ImportInputSourceActionITSupport.java +++ b/t3-actions/src/main/java/fr/ird/t3/actions/io/input/it/ImportInputSourceActionITSupport.java @@ -89,11 +89,11 @@ public abstract class ImportInputSourceActionITSupport { } public void testExecute(OceanFixtures fixtures) throws Exception { - testExecute(fixtures.nbSafeWithoutWell(), fixtures.nbUnsafeWithoutwell(), TripType.NORMAL, false, false); + testExecute(fixtures.nbSafeWithoutWell(), fixtures.nbUnsafeWithoutwell(), TripType.STANDARD, false, false); } public void testExecute(int nbSafe, int nbUnsafe) throws Exception { - testExecute(nbSafe, nbUnsafe, TripType.NORMAL, false, false); + testExecute(nbSafe, nbUnsafe, TripType.STANDARD, false, false); } public void testExecute(int nbSafe, int nbUnsafe, ===================================== t3-actions/src/main/java/fr/ird/t3/actions/io/input/test/AnalyzeInputSourceActionTestSupport.java ===================================== --- a/t3-actions/src/main/java/fr/ird/t3/actions/io/input/test/AnalyzeInputSourceActionTestSupport.java +++ b/t3-actions/src/main/java/fr/ird/t3/actions/io/input/test/AnalyzeInputSourceActionTestSupport.java @@ -91,7 +91,7 @@ public abstract class AnalyzeInputSourceActionTestSupport { } protected void testExecute(OceanFixtures fixture) throws Exception { - testExecute(fixture, TripType.NORMAL); + testExecute(fixture, TripType.STANDARD); } protected void testExecute(OceanFixtures fixture, TripType tripType) throws Exception { ===================================== t3-actions/src/main/java/fr/ird/t3/actions/io/input/test/ImportInputSourceActionTestSupport.java ===================================== --- a/t3-actions/src/main/java/fr/ird/t3/actions/io/input/test/ImportInputSourceActionTestSupport.java +++ b/t3-actions/src/main/java/fr/ird/t3/actions/io/input/test/ImportInputSourceActionTestSupport.java @@ -81,7 +81,7 @@ public abstract class ImportInputSourceActionTestSupport { } protected void testExecute(OceanFixtures fixture) throws Exception { - testExecute(fixture, TripType.NORMAL); + testExecute(fixture, TripType.STANDARD); } protected void testExecute(OceanFixtures fixture, TripType tripType) throws Exception { ===================================== t3-actions/src/test/java/fr/ird/t3/actions/io/input/AnalyzeInputSourceActionResumeTest.java ===================================== --- a/t3-actions/src/test/java/fr/ird/t3/actions/io/input/AnalyzeInputSourceActionResumeTest.java +++ b/t3-actions/src/test/java/fr/ird/t3/actions/io/input/AnalyzeInputSourceActionResumeTest.java @@ -50,7 +50,7 @@ public class AnalyzeInputSourceActionResumeTest extends AbstractActionResumeTest protected void prepareConfiguration(AnalyzeInputSourceConfiguration conf) { configuration.setInputFile(new File("inputSource")); configuration.setUseWells(true); - configuration.setTripType(TripType.NORMAL); + configuration.setTripType(TripType.STANDARD); configuration.setInputProvider(serviceContext.newService(T3InputService.class).getProviders()[0]); configuration.setCanCreateVessel(true); configuration.setCreateVirtualVessel(true); ===================================== t3-actions/src/test/java/fr/ird/t3/actions/io/input/ImportInputSourceActionResumeTest.java ===================================== --- a/t3-actions/src/test/java/fr/ird/t3/actions/io/input/ImportInputSourceActionResumeTest.java +++ b/t3-actions/src/test/java/fr/ird/t3/actions/io/input/ImportInputSourceActionResumeTest.java @@ -48,7 +48,7 @@ public class ImportInputSourceActionResumeTest extends AbstractActionResumeTest< protected void prepareConfiguration(ImportInputSourceConfiguration conf) { configuration.setInputFile(new File("inputSource")); configuration.setUseWells(true); - configuration.setTripType(TripType.NORMAL); + configuration.setTripType(TripType.STANDARD); configuration.setInputProvider(serviceContext.newService(T3InputService.class).getProviders()[0]); configuration.setCanCreateVessel(true); configuration.setCreateVirtualVessel(true); ===================================== t3-domain/src/main/java/fr/ird/t3/entities/data/AbstractTripTopiaDao.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/entities/data/AbstractTripTopiaDao.java +++ b/t3-domain/src/main/java/fr/ird/t3/entities/data/AbstractTripTopiaDao.java @@ -80,9 +80,9 @@ public class AbstractTripTopiaDao<E extends Trip> extends GeneratedTripTopiaDao< return ""; } if (samplesOnly) { - return " " + prefix + " t.tripType = 'SAMPLES_ONLY'"; + return " " + prefix + " t.tripType = 'SAMPLEONLY'"; } - return " " + prefix + " t.tripType != 'SAMPLES_ONLY'"; + return " " + prefix + " t.tripType != 'SAMPLEONLY'"; } public static <E extends Trip> Collection<E> getAllTripsWithNoDataComputed(Collection<E> trips) { ===================================== t3-domain/src/main/java/fr/ird/t3/entities/data/TripImpl.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/entities/data/TripImpl.java +++ b/t3-domain/src/main/java/fr/ird/t3/entities/data/TripImpl.java @@ -83,12 +83,12 @@ public class TripImpl extends TripAbstract { @Override public boolean isSamplesOnly() { - return TripType.SAMPLES_ONLY == getTripType(); + return TripType.SAMPLEONLY == getTripType(); } @Override public boolean isWithoutLogbook() { - return TripType.WITHOUT_LOGBOOK == getTripType(); + return TripType.LOGBOOKMISSING == getTripType(); } public boolean isLevel2Computed() { ===================================== t3-domain/src/main/java/fr/ird/t3/entities/data/TripType.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/entities/data/TripType.java +++ b/t3-domain/src/main/java/fr/ird/t3/entities/data/TripType.java @@ -26,9 +26,9 @@ import fr.ird.t3.t3.domain.I18nEnumHelper; import static org.nuiton.i18n.I18n.t; public enum TripType { - NORMAL, - SAMPLES_ONLY, - WITHOUT_LOGBOOK; + STANDARD, + SAMPLEONLY, + LOGBOOKMISSING; public String getLabel() { return I18nEnumHelper.getLabel(this); ===================================== t3-domain/src/main/java/fr/ird/t3/io/input/access/AbstractT3InputMSAccess.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/io/input/access/AbstractT3InputMSAccess.java +++ b/t3-domain/src/main/java/fr/ird/t3/io/input/access/AbstractT3InputMSAccess.java @@ -91,8 +91,8 @@ public abstract class AbstractT3InputMSAccess implements T3Input { T3AccessHitModel hitModel = new T3AccessHitModel(); hitModel.addPropertyChangeListener(new LoadDbPropertyChangeListener(t3DataTypes)); // analyse data source - if (configuration.getTripType() == TripType.WITHOUT_LOGBOOK) { - dataSource.analyzeDb(TripType.WITHOUT_LOGBOOK, hitModel); + if (configuration.getTripType() == TripType.LOGBOOKMISSING) { + dataSource.analyzeDb(TripType.LOGBOOKMISSING, hitModel); } else { dataSource.analyzeDb(hitModel); } ===================================== t3-domain/src/main/java/fr/ird/t3/io/input/access/T3AccessDataSource.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/io/input/access/T3AccessDataSource.java +++ b/t3-domain/src/main/java/fr/ird/t3/io/input/access/T3AccessDataSource.java @@ -144,11 +144,11 @@ public class T3AccessDataSource extends AbstractAccessDataSource<T3EntityEnum, T // on ne veut charger que les données observateurs, pas le referentiel continue; } - if (TripType.WITHOUT_LOGBOOK == tripType && meta.getType() == T3EntityEnum.Activity) { + if (TripType.LOGBOOKMISSING == tripType && meta.getType() == T3EntityEnum.Activity) { //FIXME-116 Just to test remove this ASAP cache.put(meta, new Map[]{}); } - if (TripType.WITHOUT_LOGBOOK == tripType && meta.getType() == T3EntityEnum.WellPlan) { + if (TripType.LOGBOOKMISSING == tripType && meta.getType() == T3EntityEnum.WellPlan) { //FIXME-116 Just to test remove this ASAP cache.put(meta, new Map[]{}); } ===================================== t3-domain/src/main/java/fr/ird/t3/io/input/access/T3AvdthDataEntityVisitor.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/io/input/access/T3AvdthDataEntityVisitor.java +++ b/t3-domain/src/main/java/fr/ird/t3/io/input/access/T3AvdthDataEntityVisitor.java @@ -63,7 +63,7 @@ public abstract class T3AvdthDataEntityVisitor extends T3DataEntityVisitor { super(dataSource, referentiel); wellPlanReverse = newReverseAssociationGetter(Trip.class, WellPlan.class, Activity.class, Trip.PROPERTY_ACTIVITY, WellPlan.PROPERTY_ACTIVITY); sampleReverse = newReverseAssociationGetter(Trip.class, Sample.class, Well.class, Trip.PROPERTY_WELL, Sample.PROPERTY_WELL); - if (TripType.WITHOUT_LOGBOOK == configuration.getTripType()) { + if (TripType.LOGBOOKMISSING == configuration.getTripType()) { sampleSetReverse = new ReverseAssociationGetter<Trip, SampleSet, Activity>(Trip.class, SampleSet.class, Activity.class, Trip.PROPERTY_ACTIVITY, SampleSet.PROPERTY_ACTIVITY) { @Override void onReverseNotFound(Trip parent, T3AccessEntity entity, Object[] pKey) { ===================================== t3-domain/src/main/resources/db/migration/V2_3_01_add-Trip-tripType.sql ===================================== --- a/t3-domain/src/main/resources/db/migration/V2_3_01_add-Trip-tripType.sql +++ b/t3-domain/src/main/resources/db/migration/V2_3_01_add-Trip-tripType.sql @@ -18,7 +18,7 @@ -- along with this program. If not, see <http://www.gnu.org/licenses/>. -- #L% --- -ALTER TABLE Trip ADD COLUMN tripType VARCHAR(255) DEFAULT 'NORMAL' NOT NULL; -UPDATE Trip set tripType = 'SAMPLES_ONLY' WHERE samplesonly = TRUE; +ALTER TABLE Trip ADD COLUMN tripType VARCHAR(255) DEFAULT 'STANDARD' NOT NULL; +UPDATE Trip set tripType = 'SAMPLEONLY' WHERE samplesonly = TRUE; CREATE INDEX idx_trip_tripType ON Trip(tripType); ALTER TABLE Trip DROP COLUMN samplesonly; \ No newline at end of file ===================================== t3-domain/src/main/resources/i18n/t3-domain_en_GB.properties ===================================== --- a/t3-domain/src/main/resources/i18n/t3-domain_en_GB.properties +++ b/t3-domain/src/main/resources/i18n/t3-domain_en_GB.properties @@ -162,9 +162,9 @@ t3.config.rfTot.maximum.description=Default maximum acceptable for rfTot t3.config.stratum.weightRatio.description=Default weight ratio to accept while building level 2 or 3 stratum t3.config.treatment.working.directory.description=Location of treatment directory t3.config.users.file.description=Application users file -t3.enum.fr.ird.t3.entities.data.TripType.NORMAL=Normal -t3.enum.fr.ird.t3.entities.data.TripType.SAMPLES_ONLY=Samples only -t3.enum.fr.ird.t3.entities.data.TripType.WITHOUT_LOGBOOK=Without Logbook +t3.enum.STANDARD=Standard +t3.enum.SAMPLEONLY=Samples only +t3.enum.LOGBOOKMISSING=Without Logbook t3.output.operations=Operations t3.output.outputProvider=Output Pilot t3.user.log.directory.description=Location of directory where to store user logs ===================================== t3-domain/src/main/resources/i18n/t3-domain_fr_FR.properties ===================================== --- a/t3-domain/src/main/resources/i18n/t3-domain_fr_FR.properties +++ b/t3-domain/src/main/resources/i18n/t3-domain_fr_FR.properties @@ -162,9 +162,9 @@ t3.config.rfTot.maximum.description=Seuil maximum acceptable pour le calcul du r t3.config.stratum.weightRatio.description=Ratio du poids capturé / celui échantillonné acceptable dans une strate échantillon t3.config.treatment.working.directory.description=Répertoire de travail t3.config.users.file.description=Fichier contenant les utilisateurs de l'application -t3.enum.fr.ird.t3.entities.data.TripType.NORMAL=Normal -t3.enum.fr.ird.t3.entities.data.TripType.SAMPLES_ONLY=Echantillons uniquement -t3.enum.fr.ird.t3.entities.data.TripType.WITHOUT_LOGBOOK=Sans logbook +t3.enum.STANDARD=Standard +t3.enum.SAMPLEONLY=Echantillons uniquement +t3.enum.LOGBOOKMISSING=Sans logbook t3.output.operations=Opérations t3.output.outputProvider=Pilote de sortie t3.user.log.directory.description=Répertoire où sont conservés les logs des utilisateurs ===================================== t3-domain/src/test/java/fr/ird/t3/entities/data/TripTopiaDaoTest.java ===================================== --- a/t3-domain/src/test/java/fr/ird/t3/entities/data/TripTopiaDaoTest.java +++ b/t3-domain/src/test/java/fr/ird/t3/entities/data/TripTopiaDaoTest.java @@ -59,8 +59,8 @@ public class TripTopiaDaoTest extends AbstractDatabaseTest { T3Date startDate = T3Date.newDate(1, 2010); T3Date endDate = T3Date.newDate(1, 2011); - Trip trip = T3PersistenceFixtures.newTrip(tx, 0, startDate.toBeginDate(), TripType.NORMAL); - Trip trip1 = T3PersistenceFixtures.newTrip(tx, 1, endDate.toBeginDate(), TripType.SAMPLES_ONLY); + Trip trip = T3PersistenceFixtures.newTrip(tx, 0, startDate.toBeginDate(), TripType.STANDARD); + Trip trip1 = T3PersistenceFixtures.newTrip(tx, 1, endDate.toBeginDate(), TripType.SAMPLEONLY); List<Trip> result; ===================================== t3-input-avdthv33/src/test/java/fr/ird/t3/actions/io/input/it/AnalyzeInputSourceActionIT.java ===================================== --- a/t3-input-avdthv33/src/test/java/fr/ird/t3/actions/io/input/it/AnalyzeInputSourceActionIT.java +++ b/t3-input-avdthv33/src/test/java/fr/ird/t3/actions/io/input/it/AnalyzeInputSourceActionIT.java @@ -131,7 +131,7 @@ public class AnalyzeInputSourceActionIT implements T3AVDTHV33Test { nbUnsafe, nbSafeWithoutWell, nbUnsafeWithoutWell, - TripType.NORMAL, + TripType.STANDARD, false, false ); @@ -355,30 +355,30 @@ public class AnalyzeInputSourceActionIT implements T3AVDTHV33Test { @Test @Override public void testExecute_ESATL_2006() throws Exception { - testExecute(70, 27, 97, 0, TripType.SAMPLES_ONLY, true, true); + testExecute(70, 27, 97, 0, TripType.SAMPLEONLY, true, true); } @Test @Override public void testExecute_ESATL_2007() throws Exception { - testExecute(273, 27, 238, 0, TripType.SAMPLES_ONLY, true, true); + testExecute(273, 27, 238, 0, TripType.SAMPLEONLY, true, true); } @Test @Override public void testExecute_ESATL_2008() throws Exception { - testExecute(46, 14, 60, 0, TripType.SAMPLES_ONLY, true, true); + testExecute(46, 14, 60, 0, TripType.SAMPLEONLY, true, true); } @Test @Override public void testExecute_ESATL_2009() throws Exception { - testExecute(64, 21, 85, 0, TripType.SAMPLES_ONLY, true, true); + testExecute(64, 21, 85, 0, TripType.SAMPLEONLY, true, true); } @Test @Override public void testExecute_ESATL_2010() throws Exception { - testExecute(75, 13, 80, 8, TripType.SAMPLES_ONLY, true, true); + testExecute(75, 13, 80, 8, TripType.SAMPLEONLY, true, true); } } ===================================== t3-input-avdthv33/src/test/java/fr/ird/t3/actions/io/input/it/ImportInputSourceActionIT.java ===================================== --- a/t3-input-avdthv33/src/test/java/fr/ird/t3/actions/io/input/it/ImportInputSourceActionIT.java +++ b/t3-input-avdthv33/src/test/java/fr/ird/t3/actions/io/input/it/ImportInputSourceActionIT.java @@ -104,7 +104,7 @@ public class ImportInputSourceActionIT implements T3AVDTHV33Test { } public void testExecute(int nbSafe, int nbUnsafe) throws Exception { - testExecute(nbSafe, nbUnsafe, TripType.NORMAL, false, false); + testExecute(nbSafe, nbUnsafe, TripType.STANDARD, false, false); } public void testExecute(int nbSafe, int nbUnsafe, @@ -314,30 +314,30 @@ public class ImportInputSourceActionIT implements T3AVDTHV33Test { @Test @Override public void testExecute_ESATL_2006() throws Exception { - testExecute(70, 27, TripType.SAMPLES_ONLY, true, true); + testExecute(70, 27, TripType.SAMPLEONLY, true, true); } @Test @Override public void testExecute_ESATL_2007() throws Exception { - testExecute(53, 27, TripType.SAMPLES_ONLY, true, true); + testExecute(53, 27, TripType.SAMPLEONLY, true, true); } @Test @Override public void testExecute_ESATL_2008() throws Exception { - testExecute(46, 14, TripType.SAMPLES_ONLY, true, true); + testExecute(46, 14, TripType.SAMPLEONLY, true, true); } @Test @Override public void testExecute_ESATL_2009() throws Exception { - testExecute(64, 21, TripType.SAMPLES_ONLY, true, true); + testExecute(64, 21, TripType.SAMPLEONLY, true, true); } @Test @Override public void testExecute_ESATL_2010() throws Exception { - testExecute(75, 13, TripType.SAMPLES_ONLY, true, true); + testExecute(75, 13, TripType.SAMPLEONLY, true, true); } } ===================================== t3-input-avdthv35/src/test/java/fr/ird/t3/actions/io/input/AnalyzeInputSourceActionTest.java ===================================== --- a/t3-input-avdthv35/src/test/java/fr/ird/t3/actions/io/input/AnalyzeInputSourceActionTest.java +++ b/t3-input-avdthv35/src/test/java/fr/ird/t3/actions/io/input/AnalyzeInputSourceActionTest.java @@ -54,13 +54,13 @@ public class AnalyzeInputSourceActionTest extends AnalyzeInputSourceActionTestSu @Ignore @Test public void testExecute_OA_2000_withoutLogbook() throws Exception { - testExecute(AtlanticOceanFixtures.OA_2000, TripType.WITHOUT_LOGBOOK); + testExecute(AtlanticOceanFixtures.OA_2000, TripType.LOGBOOKMISSING); } @Ignore @Test public void testExecute_OI_2002_withoutLogbook() throws Exception { - testExecute(IndianOceanFixtures.OI_2002,TripType.WITHOUT_LOGBOOK); + testExecute(IndianOceanFixtures.OI_2002,TripType.LOGBOOKMISSING); } } ===================================== t3-input-avdthv35/src/test/java/fr/ird/t3/actions/io/input/ImportInputSourceActionTest.java ===================================== --- a/t3-input-avdthv35/src/test/java/fr/ird/t3/actions/io/input/ImportInputSourceActionTest.java +++ b/t3-input-avdthv35/src/test/java/fr/ird/t3/actions/io/input/ImportInputSourceActionTest.java @@ -53,13 +53,13 @@ public class ImportInputSourceActionTest extends ImportInputSourceActionTestSupp @Ignore @Test public void testExecute_OA_2000_withoutLogbook() throws Exception { - testExecute(AtlanticOceanFixtures.OA_2000, TripType.WITHOUT_LOGBOOK); + testExecute(AtlanticOceanFixtures.OA_2000, TripType.LOGBOOKMISSING); } @Ignore @Test public void testExecute_OI_2002_withoutLogbook() throws Exception { - testExecute(IndianOceanFixtures.OI_2002, TripType.WITHOUT_LOGBOOK); + testExecute(IndianOceanFixtures.OI_2002, TripType.LOGBOOKMISSING); } } ===================================== t3-web/src/main/java/fr/ird/t3/web/actions/io/input/ConfigureImportDataAction.java ===================================== --- a/t3-web/src/main/java/fr/ird/t3/web/actions/io/input/ConfigureImportDataAction.java +++ b/t3-web/src/main/java/fr/ird/t3/web/actions/io/input/ConfigureImportDataAction.java @@ -70,7 +70,7 @@ public class ConfigureImportDataAction extends AbstractConfigureAction<AnalyzeIn * * @since 2.3 */ - private TripType tripType = TripType.NORMAL; + private TripType tripType = TripType.STANDARD; /** * flag to authorize creation of missing vessels. * View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/459fa5bd063e6ad4630c7c3eef519fe6… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/459fa5bd063e6ad4630c7c3eef519fe6… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-t3][develop] fix some io tests
by Tony CHEMIT 06 Mar '18

06 Mar '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: 3fd9c1e1 by Tony CHEMIT at 2018-03-06T16:16:31Z fix some io tests - - - - - 4 changed files: - t3-actions/src/main/java/fr/ird/t3/actions/io/input/test/AnalyzeInputSourceActionTestSupport.java - t3-actions/src/main/java/fr/ird/t3/actions/io/input/test/FakeT3AvdthServiceContext.java - t3-input-avdthv35/src/test/java/fr/ird/t3/actions/io/input/AnalyzeInputSourceActionTest.java - t3-input-avdthv35/src/test/java/fr/ird/t3/actions/io/input/ImportInputSourceActionTest.java Changes: ===================================== t3-actions/src/main/java/fr/ird/t3/actions/io/input/test/AnalyzeInputSourceActionTestSupport.java ===================================== --- a/t3-actions/src/main/java/fr/ird/t3/actions/io/input/test/AnalyzeInputSourceActionTestSupport.java +++ b/t3-actions/src/main/java/fr/ird/t3/actions/io/input/test/AnalyzeInputSourceActionTestSupport.java @@ -42,6 +42,7 @@ import org.junit.Rule; import java.io.BufferedWriter; import java.io.File; import java.io.FileOutputStream; +import java.io.IOException; import java.io.OutputStreamWriter; import java.util.List; import java.util.Set; @@ -62,7 +63,7 @@ public abstract class AnalyzeInputSourceActionTestSupport { protected abstract MSAccessTestConfiguration createConfiguration(); @Before - public void setUp() throws Exception { + public void setUp() throws IOException { boolean initOk = serviceContext.isInitOk(); Assume.assumeTrue("Could not init db", initOk); MSAccessTestConfiguration msConfig = serviceContext.getMsConfig(); ===================================== t3-actions/src/main/java/fr/ird/t3/actions/io/input/test/FakeT3AvdthServiceContext.java ===================================== --- a/t3-actions/src/main/java/fr/ird/t3/actions/io/input/test/FakeT3AvdthServiceContext.java +++ b/t3-actions/src/main/java/fr/ird/t3/actions/io/input/test/FakeT3AvdthServiceContext.java @@ -194,7 +194,7 @@ public class FakeT3AvdthServiceContext extends TestWatcher implements T3ServiceC if (msConfig != null) { boolean b = msConfig.beforeClass() && msConfig.setup(testName); if (!b) { - Assume.assumeTrue(false); + initOk = false; return; } } ===================================== t3-input-avdthv35/src/test/java/fr/ird/t3/actions/io/input/AnalyzeInputSourceActionTest.java ===================================== --- a/t3-input-avdthv35/src/test/java/fr/ird/t3/actions/io/input/AnalyzeInputSourceActionTest.java +++ b/t3-input-avdthv35/src/test/java/fr/ird/t3/actions/io/input/AnalyzeInputSourceActionTest.java @@ -40,14 +40,15 @@ public class AnalyzeInputSourceActionTest extends AnalyzeInputSourceActionTestSu return new MSAccessTestConfiguration("testExecute_([^_]*)_(\\d+)(_.+)*", "%s_%s_V35.mdb", T3InputProviderAvdth35.ID); } + @Ignore @Test public void testExecute_OA_2000() throws Exception { testExecute(AtlanticOceanFixtures.OA_2000); } @Test - public void testExecute_OI_2002() throws Exception { - testExecute(IndianOceanFixtures.OI_2002); + public void testExecute_OI_2000() throws Exception { + testExecute(IndianOceanFixtures.OI_2000); } @Ignore ===================================== t3-input-avdthv35/src/test/java/fr/ird/t3/actions/io/input/ImportInputSourceActionTest.java ===================================== --- a/t3-input-avdthv35/src/test/java/fr/ird/t3/actions/io/input/ImportInputSourceActionTest.java +++ b/t3-input-avdthv35/src/test/java/fr/ird/t3/actions/io/input/ImportInputSourceActionTest.java @@ -46,8 +46,8 @@ public class ImportInputSourceActionTest extends ImportInputSourceActionTestSupp } @Test - public void testExecute_OI_2002() throws Exception { - testExecute(IndianOceanFixtures.OI_2002); + public void testExecute_OI_2000() throws Exception { + testExecute(IndianOceanFixtures.OI_2000); } @Ignore View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/3fd9c1e1603d0f7dbb7b4084f5d6f67e… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/3fd9c1e1603d0f7dbb7b4084f5d6f67e… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-t3][develop] 3 commits: Add new vessel activity + use enum name instead of ordinal (See ultreiaio/ird-t3#116)
by Tony CHEMIT 06 Mar '18

06 Mar '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: dce06545 by Tony CHEMIT at 2018-03-06T15:48:07Z Add new vessel activity + use enum name instead of ordinal (See ultreiaio/ird-t3#116) - - - - - bafe8b93 by Tony CHEMIT at 2018-03-06T15:48:08Z Mise en place de l'import sans log books (reste à remplir l'ocean à partir des coordonnées de l'activité fictive) (see #116) - - - - - 961f8808 by Tony CHEMIT at 2018-03-06T15:48:08Z Règles d'acceptation des marées dans les traitements (closes #276) - - - - - 30 changed files: - t3-actions/pom.xml - t3-actions/src/main/java/fr/ird/t3/actions/io/input/test/AnalyzeInputSourceActionTestSupport.java - t3-actions/src/main/java/fr/ird/t3/actions/io/input/test/FakeT3AvdthServiceContext.java - t3-actions/src/main/java/fr/ird/t3/actions/io/input/test/ImportInputSourceActionTestSupport.java - t3-actions/src/main/java/fr/ird/t3/actions/io/input/test/MSAccessTestConfiguration.java - t3-domain/src/main/java/fr/ird/t3/entities/T3TopiaApplicationContext.java - t3-domain/src/main/java/fr/ird/t3/entities/data/AbstractTripTopiaDao.java - t3-domain/src/main/java/fr/ird/t3/entities/data/SampleSetImpl.java - t3-domain/src/main/java/fr/ird/t3/io/input/access/AbstractT3EntityVisitor.java - t3-domain/src/main/java/fr/ird/t3/io/input/access/AbstractT3InputMSAccess.java - t3-domain/src/main/java/fr/ird/t3/io/input/access/T3AccessDataSource.java - t3-domain/src/main/java/fr/ird/t3/io/input/access/T3AccessEntityProxyHandler.java - t3-domain/src/main/java/fr/ird/t3/io/input/access/T3AvdthDataEntityVisitor.java - t3-domain/src/main/java/fr/ird/t3/io/input/access/T3DataEntityVisitor.java - t3-domain/src/main/resources/db/migration/V2_3_01_add-Trip-tripType.sql - + t3-domain/src/main/resources/db/migration/V2_3_02_add-VesselActivity-row.sql - t3-domain/src/main/xmi/t3-persistence.properties - t3-domain/src/main/xmi/t3-persistence.zargo - t3-input-avdthv33/src/main/java/fr/ird/t3/io/input/avdth/v33/T3AccessEntityMetaProviderAvdth33.java - t3-input-avdthv33/src/main/java/fr/ird/t3/io/input/avdth/v33/T3DataEntityVisitorAvdth33.java - t3-input-avdthv33/src/main/java/fr/ird/t3/io/input/avdth/v33/T3InputAvdth33.java - t3-input-avdthv35/src/main/java/fr/ird/t3/io/input/avdth/v35/T3AccessEntityMetaProviderAvdth35.java - t3-input-avdthv35/src/main/java/fr/ird/t3/io/input/avdth/v35/T3DataEntityVisitorAvdth35.java - t3-input-avdthv35/src/main/java/fr/ird/t3/io/input/avdth/v35/T3InputAvdth35.java - t3-input-avdthv35/src/test/java/fr/ird/t3/actions/io/input/AnalyzeInputSourceActionTest.java - t3-input-avdthv35/src/test/java/fr/ird/t3/actions/io/input/ImportInputSourceActionTest.java - t3-input-avdthv36/src/main/java/fr/ird/t3/io/input/avdth/v36/T3AccessEntityMetaProviderAvdth36.java - t3-input-avdthv36/src/main/java/fr/ird/t3/io/input/avdth/v36/T3DataEntityVisitorAvdth36.java - t3-input-avdthv36/src/main/java/fr/ird/t3/io/input/avdth/v36/T3InputAvdth36.java - t3-msaccess-importer/src/main/java/fr/ird/msaccess/importer/AbstractAccessDataSource.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/compare/e46c2d8fb4e2566e6c6a0139beea4ee… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/compare/e46c2d8fb4e2566e6c6a0139beea4ee… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-t3][develop] Règles d'acceptation des marées dans les traitements (closes #276)
by Tony CHEMIT 06 Mar '18

06 Mar '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: e46c2d8f by Tony CHEMIT at 2018-03-06T15:44:21Z Règles d'acceptation des marées dans les traitements (closes #276) - - - - - 4 changed files: - t3-domain/src/main/java/fr/ird/t3/entities/data/AbstractTripTopiaDao.java - − t3-web/src/main/java/fr/ird/t3/web/validators/Level1ConfigurationFieldValidator.java - t3-web/src/main/resources/fr/ird/t3/web/actions/data/level1/ManageLevel1ConfigurationAction-validateLevel1Configuration-validation.xml - t3-web/src/main/resources/validators.xml Changes: ===================================== t3-domain/src/main/java/fr/ird/t3/entities/data/AbstractTripTopiaDao.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/entities/data/AbstractTripTopiaDao.java +++ b/t3-domain/src/main/java/fr/ird/t3/entities/data/AbstractTripTopiaDao.java @@ -234,8 +234,7 @@ public class AbstractTripTopiaDao<E extends Trip> extends GeneratedTripTopiaDao< } /** - * Obtains all trips usable for a level 1 configuration, says : - * <p/> + * Obtains all trips usable for a level 1 configuration, says: * <ul> * <li>Only for senneur vessel simple type</li> * <li>samplesOnly = true or completionStatus >0</li> @@ -247,8 +246,7 @@ public class AbstractTripTopiaDao<E extends Trip> extends GeneratedTripTopiaDao< */ @SuppressWarnings("unused") public List<E> findAllForLevel1() { - String hql = "SELECT t FROM TripImpl t WHERE t.vessel.vesselType.vesselSimpleType.code = 1 " + - "AND (t.tripType = 1 OR (t.completionStatus IS NOT NULL AND t.completionStatus > 0))"; + String hql = "SELECT t FROM TripImpl t WHERE t.vessel.vesselType.vesselSimpleType.code = 1"; List<E> result = findAll(hql); sortTrips(result); return result; ===================================== t3-web/src/main/java/fr/ird/t3/web/validators/Level1ConfigurationFieldValidator.java deleted ===================================== --- a/t3-web/src/main/java/fr/ird/t3/web/validators/Level1ConfigurationFieldValidator.java +++ /dev/null @@ -1,99 +0,0 @@ -/* - * #%L - * T3 :: Web - * %% - * Copyright (C) 2010 - 2018 IRD, Code Lutin, Ultreia.io - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -package fr.ird.t3.web.validators; - -import com.google.common.collect.ArrayListMultimap; -import com.google.common.collect.Multimap; -import com.opensymphony.xwork2.validator.ValidationException; -import fr.ird.t3.actions.data.level0.Level0Step; -import fr.ird.t3.actions.data.level1.Level1Configuration; -import fr.ird.t3.entities.data.Trip; -import org.nuiton.decorator.Decorator; - -import java.util.Collection; -import java.util.Map; -import java.util.Set; - -import static org.nuiton.i18n.I18n.t; - -/** - * Validate that a level 1 configuration have all his trips ok for a - * level 1 treatment. - * - * @author Tony Chemit - dev(a)tchemit.fr - * @since 1.0 - */ -public class Level1ConfigurationFieldValidator extends T3BaseFieldValidatorSupport { - - @SuppressWarnings("unchecked") - @Override - protected void validateWhenNotSkip(Object object) throws ValidationException { - if (getValidatorContext().hasFieldErrors()) { - // do not continue - return; - } - - Level1Configuration configuration = (Level1Configuration) getFieldValue("configuration", object); - - Map<String, Trip> tripByTopiaIds = (Map<String, Trip>) getFieldValue("tripByTopiaIds", object); - - // check that every selected trip has his level 0 done. - Set<String> tripIds = configuration.getSampleIdsByTripId().keySet(); - - Decorator<Trip> decoratorByType = (Decorator<Trip>) getFieldValue("tripDecorator", object); - - Level0Step[] level0Steps = Level0Step.values(); - Multimap<String, Level0Step> m = ArrayListMultimap.create(); - for (String tripId : tripIds) { - - Trip trip = tripByTopiaIds.get(tripId); - - if (!trip.isSamplesOnly()) { - - // only check level0Step done only if Trip#tripType = 1 - String key = decoratorByType.toString(trip); - for (Level0Step level0Step : level0Steps) { - - boolean tripState = level0Step.getTripState(trip); - if (!tripState) { - m.put(key, level0Step); - } - } - } - } - - if (!m.isEmpty()) { - - // there is some trips without full level0 done - - for (String tripStr : m.keySet()) { - Collection<Level0Step> steps = m.get(tripStr); - addFieldError("matchingTripCount", - t("t3.error.missing.level0.steps.for.trip", tripStr, steps)); - } - } - } - - @Override - public String getValidatorType() { - return "level1Configuration"; - } -} ===================================== t3-web/src/main/resources/fr/ird/t3/web/actions/data/level1/ManageLevel1ConfigurationAction-validateLevel1Configuration-validation.xml ===================================== --- a/t3-web/src/main/resources/fr/ird/t3/web/actions/data/level1/ManageLevel1ConfigurationAction-validateLevel1Configuration-validation.xml +++ b/t3-web/src/main/resources/fr/ird/t3/web/actions/data/level1/ManageLevel1ConfigurationAction-validateLevel1Configuration-validation.xml @@ -80,12 +80,4 @@ </field> - <field name="matchingSampleCount"> - - <field-validator type="level1Configuration"> - <message/> - </field-validator> - - </field> - </validators> ===================================== t3-web/src/main/resources/validators.xml ===================================== --- a/t3-web/src/main/resources/validators.xml +++ b/t3-web/src/main/resources/validators.xml @@ -43,6 +43,5 @@  <validator name="login" class="fr.ird.t3.web.validators.LoginValidator"/> <validator name="checkJdbcConnection" class="fr.ird.t3.web.validators.CheckJdbcConnectionValidator"/> - <validator name="level1Configuration" class="fr.ird.t3.web.validators.Level1ConfigurationFieldValidator"/> </validators> View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/e46c2d8fb4e2566e6c6a0139beea4ee1… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/e46c2d8fb4e2566e6c6a0139beea4ee1… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-t3][develop] 3 commits: Gros nettoyage de code : - utilisation api java 8 - ajout d'un cache sur les…
by Tony CHEMIT 06 Mar '18

06 Mar '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: 7a87832d by Tony CHEMIT at 2018-03-06T15:38:18Z Gros nettoyage de code : - utilisation api java 8 - ajout d'un cache sur les download de ird-t3-data - amélioration api de test - reformat code - mise à jour des licenses, ... - - - - - 019938ca by Tony CHEMIT at 2018-03-06T15:38:23Z Add new vessel activity + use enum name instead of ordinal (See ultreiaio/ird-t3#116) - - - - - 11cd0058 by Tony CHEMIT at 2018-03-06T15:38:23Z Mise en place de l'import sans log books (reste à remplir l'ocean à partir des coordonnées de l'activité fictive) (see #116) - - - - - 27 changed files: - .gitignore - pom.xml - src/site/site.xml - t3-actions/pom.xml - t3-actions/src/main/java/fr/ird/t3/actions/admin/DeleteTripAction.java - t3-actions/src/main/java/fr/ird/t3/actions/admin/DeleteTripConfiguration.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/AbstractLevel0Action.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/AbstractLevel0Configuration.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeRF1Action.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeRF1Configuration.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeRF2Action.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeRF2Configuration.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeSetDurationAndPositiveSetCountAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeSetDurationAndPositiveSetCountConfiguration.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeTripEffortsAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeTripEffortsConfiguration.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeWellPlanWeightCategoriesProportionsAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeWellPlanWeightCategoriesProportionsConfiguration.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ConvertCatchesWeightCategoriesAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ConvertCatchesWeightCategoriesConfiguration.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/Level0Step.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level1/AbstractLevel1Action.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level1/ComputeWeightOfCategoriesForSetAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level1/ConvertSampleSetSpeciesFrequencyToWeightAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level1/ConvertSetSpeciesFrequencyToWeightAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level1/ExtrapolateSampleCountedAndMeasuredAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level1/ExtrapolateSampleWeightToSetAction.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/compare/1233217bda651f40c35c2771cba0711… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/compare/1233217bda651f40c35c2771cba0711… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-t3][develop] 8 commits: Replace samplesOnly by TripType on persistence (See #116)
by Tony CHEMIT 06 Mar '18

06 Mar '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: da5304ea by Tony CHEMIT at 2018-03-04T00:53:45Z Replace samplesOnly by TripType on persistence (See #116) - - - - - 8e373b7d by Tony CHEMIT at 2018-03-04T09:08:45Z Refactor avdth input modules + add missing license header (See #116) - - - - - 589a3ab1 by Tony CHEMIT at 2018-03-04T16:59:33Z Improve input tests. - - - - - b452e9c1 by Tony CHEMIT at 2018-03-04T16:59:42Z Gros nettoyage de code : - utilisation api java 8 - ajout d'un cache sur les download de ird-t3-data - amélioration api de test - reformat code - mise à jour des licenses, ... - - - - - 7b3132f2 by Tony CHEMIT at 2018-03-05T21:58:56Z Continue nettoyage de code - - - - - 3667ac7e by Tony CHEMIT at 2018-03-06T11:03:16Z Add new vessel activity + use enum name instead of ordinal (See ultreiaio/ird-t3#116) - - - - - 5a0c55b1 by Tony CHEMIT at 2018-03-06T15:36:36Z Mise en place de l'import sans log books (reste à remplir l'ocean à partir des coordonnées de l'activité fictive) (see #116) - - - - - 1233217b by Tony CHEMIT at 2018-03-06T15:37:19Z Merge branch 'feature/116' into develop - - - - - 27 changed files: - .gitignore - pom.xml - src/site/site.xml - t3-actions/pom.xml - t3-actions/src/main/java/fr/ird/t3/actions/admin/DeleteTripAction.java - t3-actions/src/main/java/fr/ird/t3/actions/admin/DeleteTripConfiguration.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/AbstractLevel0Action.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/AbstractLevel0Configuration.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeRF1Action.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeRF1Configuration.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeRF2Action.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeRF2Configuration.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeSetDurationAndPositiveSetCountAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeSetDurationAndPositiveSetCountConfiguration.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeTripEffortsAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeTripEffortsConfiguration.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeWellPlanWeightCategoriesProportionsAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeWellPlanWeightCategoriesProportionsConfiguration.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ConvertCatchesWeightCategoriesAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ConvertCatchesWeightCategoriesConfiguration.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/Level0Step.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level1/AbstractLevel1Action.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level1/ComputeWeightOfCategoriesForSetAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level1/ConvertSampleSetSpeciesFrequencyToWeightAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level1/ConvertSetSpeciesFrequencyToWeightAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level1/ExtrapolateSampleCountedAndMeasuredAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level1/ExtrapolateSampleWeightToSetAction.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/compare/67840bd972c5b3a107dcb32d9ab908a… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/compare/67840bd972c5b3a107dcb32d9ab908a… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-t3] Deleted branch feature/116
by Tony CHEMIT 06 Mar '18

06 Mar '18

Tony CHEMIT deleted branch feature/116 at ultreiaio / ird-t3 --- You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-t3][feature/116] 2 commits: Add new vessel activity + use enum name instead of ordinal (See ultreiaio/ird-t3#116)
by Tony CHEMIT 06 Mar '18

06 Mar '18

Tony CHEMIT pushed to branch feature/116 at ultreiaio / ird-t3 Commits: 3667ac7e by Tony CHEMIT at 2018-03-06T11:03:16Z Add new vessel activity + use enum name instead of ordinal (See ultreiaio/ird-t3#116) - - - - - 5a0c55b1 by Tony CHEMIT at 2018-03-06T15:36:36Z Mise en place de l'import sans log books (reste à remplir l'ocean à partir des coordonnées de l'activité fictive) (see #116) - - - - - 30 changed files: - t3-actions/pom.xml - t3-actions/src/main/java/fr/ird/t3/actions/io/input/test/AnalyzeInputSourceActionTestSupport.java - t3-actions/src/main/java/fr/ird/t3/actions/io/input/test/FakeT3AvdthServiceContext.java - t3-actions/src/main/java/fr/ird/t3/actions/io/input/test/ImportInputSourceActionTestSupport.java - t3-actions/src/main/java/fr/ird/t3/actions/io/input/test/MSAccessTestConfiguration.java - t3-domain/src/main/java/fr/ird/t3/entities/T3TopiaApplicationContext.java - t3-domain/src/main/java/fr/ird/t3/entities/data/AbstractTripTopiaDao.java - t3-domain/src/main/java/fr/ird/t3/entities/data/SampleSetImpl.java - t3-domain/src/main/java/fr/ird/t3/io/input/access/AbstractT3EntityVisitor.java - t3-domain/src/main/java/fr/ird/t3/io/input/access/AbstractT3InputMSAccess.java - t3-domain/src/main/java/fr/ird/t3/io/input/access/T3AccessDataSource.java - t3-domain/src/main/java/fr/ird/t3/io/input/access/T3AccessEntityProxyHandler.java - t3-domain/src/main/java/fr/ird/t3/io/input/access/T3AvdthDataEntityVisitor.java - t3-domain/src/main/java/fr/ird/t3/io/input/access/T3DataEntityVisitor.java - t3-domain/src/main/resources/db/migration/V2_3_01_add-Trip-tripType.sql - + t3-domain/src/main/resources/db/migration/V2_3_02_add-VesselActivity-row.sql - t3-domain/src/main/xmi/t3-persistence.properties - t3-domain/src/main/xmi/t3-persistence.zargo - t3-input-avdthv33/src/main/java/fr/ird/t3/io/input/avdth/v33/T3AccessEntityMetaProviderAvdth33.java - t3-input-avdthv33/src/main/java/fr/ird/t3/io/input/avdth/v33/T3DataEntityVisitorAvdth33.java - t3-input-avdthv33/src/main/java/fr/ird/t3/io/input/avdth/v33/T3InputAvdth33.java - t3-input-avdthv35/src/main/java/fr/ird/t3/io/input/avdth/v35/T3AccessEntityMetaProviderAvdth35.java - t3-input-avdthv35/src/main/java/fr/ird/t3/io/input/avdth/v35/T3DataEntityVisitorAvdth35.java - t3-input-avdthv35/src/main/java/fr/ird/t3/io/input/avdth/v35/T3InputAvdth35.java - t3-input-avdthv35/src/test/java/fr/ird/t3/actions/io/input/AnalyzeInputSourceActionTest.java - t3-input-avdthv35/src/test/java/fr/ird/t3/actions/io/input/ImportInputSourceActionTest.java - t3-input-avdthv36/src/main/java/fr/ird/t3/io/input/avdth/v36/T3AccessEntityMetaProviderAvdth36.java - t3-input-avdthv36/src/main/java/fr/ird/t3/io/input/avdth/v36/T3DataEntityVisitorAvdth36.java - t3-input-avdthv36/src/main/java/fr/ird/t3/io/input/avdth/v36/T3InputAvdth36.java - t3-msaccess-importer/src/main/java/fr/ird/msaccess/importer/AbstractAccessDataSource.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/compare/7b3132f2cfca236e8db3dbdd714af37… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/compare/7b3132f2cfca236e8db3dbdd714af37… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-t3][feature/116] Continue nettoyage de code
by Tony CHEMIT 05 Mar '18

05 Mar '18

Tony CHEMIT pushed to branch feature/116 at ultreiaio / ird-t3 Commits: 7b3132f2 by Tony CHEMIT at 2018-03-05T21:58:56Z Continue nettoyage de code - - - - - 23 changed files: - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/AbstractLevel0Action.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeRF1Action.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeRF2Action.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeWellPlanWeightCategoriesProportionsAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level1/ComputeWeightOfCategoriesForSetAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level1/ConvertSampleSetSpeciesFrequencyToWeightAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level1/ConvertSetSpeciesFrequencyToWeightAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level1/ExtrapolateSampleCountedAndMeasuredAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level1/ExtrapolateSampleWeightToSetAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level1/Level1Configuration.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level1/RedistributeSampleNumberToSetAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level1/StandardizeSampleMeasuresAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level2/L2CatchStratum.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level2/L2CatchStratumLoader.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level2/Level2Action.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level3/L3SampleStratumLoader.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level3/Level3Action.java - t3-actions/src/main/java/fr/ird/t3/actions/io/input/AnalyzeInputSourceAction.java - t3-actions/src/main/java/fr/ird/t3/actions/io/input/ImportInputSourceAction.java - t3-actions/src/main/resources/ftl/fr/ird/t3/actions/data/level2/Level2Action.ftl - t3-actions/src/main/resources/ftl/fr/ird/t3/actions/data/level2/Level2Action_en.ftl - t3-actions/src/main/resources/ftl/fr/ird/t3/actions/data/level3/Level3Action.ftl - t3-actions/src/main/resources/ftl/fr/ird/t3/actions/data/level3/Level3Action_en.ftl The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/7b3132f2cfca236e8db3dbdd714af374… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/7b3132f2cfca236e8db3dbdd714af374… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-t3][feature/116] 2 commits: Improve input tests.
by Tony CHEMIT 04 Mar '18

04 Mar '18

Tony CHEMIT pushed to branch feature/116 at ultreiaio / ird-t3 Commits: 589a3ab1 by Tony CHEMIT at 2018-03-04T16:59:33Z Improve input tests. - - - - - b452e9c1 by Tony CHEMIT at 2018-03-04T16:59:42Z Gros nettoyage de code : - utilisation api java 8 - ajout d'un cache sur les download de ird-t3-data - amélioration api de test - reformat code - mise à jour des licenses, ... - - - - - 30 changed files: - .gitignore - pom.xml - src/site/site.xml - t3-actions/pom.xml - t3-actions/src/main/java/fr/ird/t3/actions/admin/DeleteTripAction.java - t3-actions/src/main/java/fr/ird/t3/actions/admin/DeleteTripConfiguration.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/AbstractLevel0Action.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/AbstractLevel0Configuration.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeRF1Action.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeRF1Configuration.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeRF2Action.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeRF2Configuration.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeSetDurationAndPositiveSetCountAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeSetDurationAndPositiveSetCountConfiguration.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeTripEffortsAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeTripEffortsConfiguration.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeWellPlanWeightCategoriesProportionsAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeWellPlanWeightCategoriesProportionsConfiguration.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ConvertCatchesWeightCategoriesAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ConvertCatchesWeightCategoriesConfiguration.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/Level0Step.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level1/AbstractLevel1Action.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level1/ComputeWeightOfCategoriesForSetAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level1/ConvertSampleSetSpeciesFrequencyToWeightAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level1/ConvertSetSpeciesFrequencyToWeightAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level1/ExtrapolateSampleCountedAndMeasuredAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level1/ExtrapolateSampleWeightToSetAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level1/Level1Configuration.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level1/Level1Step.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level1/RedistributeSampleNumberToSetAction.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/compare/8e373b7d602ee491e2111a69e276966… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/compare/8e373b7d602ee491e2111a69e276966… You're receiving this email because of your account on gitlab.com.

1 0