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

[Git][ultreiaio/ird-t3][develop] [N0] Marée Echantillons seulement et gestion de l'UI du N0 (Closes #85)
by Tony CHEMIT 20 Feb '18

20 Feb '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: 896731cf by Tony CHEMIT at 2018-02-20T15:44:56+01:00 [N0] Marée Echantillons seulement et gestion de l'UI du N0 (Closes #85) - - - - - 3 changed files: - t3-domain/src/main/java/fr/ird/t3/entities/reference/AbstractVesselSimpleTypeTopiaDao.java - t3-domain/src/test/java/fr/ird/t3/entities/reference/VesselSimpleTypeTopiaDaoTest.java - t3-web/src/main/java/fr/ird/t3/web/actions/data/level0/AbstractLevel0ConfigureAction.java Changes: ===================================== t3-domain/src/main/java/fr/ird/t3/entities/reference/AbstractVesselSimpleTypeTopiaDao.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/entities/reference/AbstractVesselSimpleTypeTopiaDao.java +++ b/t3-domain/src/main/java/fr/ird/t3/entities/reference/AbstractVesselSimpleTypeTopiaDao.java @@ -21,9 +21,10 @@ package fr.ird.t3.entities.reference; +import org.nuiton.topia.persistence.TopiaException; + import java.util.HashSet; import java.util.Set; -import org.nuiton.topia.persistence.TopiaException; /** * {@link VesselSimpleType} user dao operations. @@ -36,10 +37,11 @@ public class AbstractVesselSimpleTypeTopiaDao<E extends VesselSimpleType> extend /** * Obtains all vessel simple types used by all trips in the database. * + * @param sampleOnly if null no filter else filter on value * @return the set of used vessel simple types in trips in the database * @throws TopiaException if any problem while querying the database */ - public Set<E> findAllUsedInTrip() throws TopiaException { + public Set<E> findAllUsedInTrip(Boolean sampleOnly) throws TopiaException { // TopiaQuery query = createQuery("vst") // .addFrom(Trip.class, "t") @@ -48,7 +50,8 @@ public class AbstractVesselSimpleTypeTopiaDao<E extends VesselSimpleType> extend // Vessel.PROPERTY_VESSEL_TYPE + "." + // VesselType.PROPERTY_VESSEL_SIMPLE_TYPE + " = vst.id"); - String hql = "SELECT DISTINCT(vst) FROM VesselSimpleTypeImpl vst, TripImpl t WHERE t.vessel.vesselType.vesselSimpleType = vst.id"; + String sampleOnlyFilter = sampleOnly == null ? "" : (" AND t.sampleOnly = " + sampleOnly); + String hql = "SELECT DISTINCT(vst) FROM VesselSimpleTypeImpl vst, TripImpl t WHERE t.vessel.vesselType.vesselSimpleType = vst.id" + sampleOnlyFilter; return new HashSet<>(findAll(hql)); // return T3EntityHelper.querytoSet(hql, this); } ===================================== t3-domain/src/test/java/fr/ird/t3/entities/reference/VesselSimpleTypeTopiaDaoTest.java ===================================== --- a/t3-domain/src/test/java/fr/ird/t3/entities/reference/VesselSimpleTypeTopiaDaoTest.java +++ b/t3-domain/src/test/java/fr/ird/t3/entities/reference/VesselSimpleTypeTopiaDaoTest.java @@ -55,7 +55,7 @@ public class VesselSimpleTypeTopiaDaoTest extends AbstractDatabaseTest { Trip trip = tx.getTripDao().create( Trip.PROPERTY_VESSEL, vessel ); - Set<VesselSimpleType> result = dao.findAllUsedInTrip(); + Set<VesselSimpleType> result = dao.findAllUsedInTrip(null); Assert.assertNotNull(result); Assert.assertEquals(1, result.size()); Assert.assertEquals(vesselSimpleType, result.iterator().next()); ===================================== t3-web/src/main/java/fr/ird/t3/web/actions/data/level0/AbstractLevel0ConfigureAction.java ===================================== --- a/t3-web/src/main/java/fr/ird/t3/web/actions/data/level0/AbstractLevel0ConfigureAction.java +++ b/t3-web/src/main/java/fr/ird/t3/web/actions/data/level0/AbstractLevel0ConfigureAction.java @@ -67,7 +67,7 @@ public abstract class AbstractLevel0ConfigureAction<C extends AbstractLevel0Conf @InjectDecoratedBeans(beanType = VesselSimpleType.class) protected Map<String, String> vesselSimpleTypes; - @InjectDecoratedBeans(beanType = Country.class) + @InjectDecoratedBeans(beanType = Country.class, pathIds = "configuration.") protected Map<String, String> fleets; protected AbstractLevel0ConfigureAction(Class<C> configurationType) { @@ -142,7 +142,7 @@ public abstract class AbstractLevel0ConfigureAction<C extends AbstractLevel0Conf T3Date maxDate = tripDAO.getLastLandingDate(); config.setMaxDate(maxDate); config.setEndDate(maxDate); - config.setVesselSimpleTypes(sortToList(vesselSimpleTypeDAO.findAllUsedInTrip())); + config.setVesselSimpleTypes(sortToList(vesselSimpleTypeDAO.findAllUsedInTrip(false))); config.setFleets(sortToList(countryDAO.findAllFleetUsedInTrip())); if (log.isInfoEnabled()) { View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/896731cf2ee1936293340e4c2e25c732… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/896731cf2ee1936293340e4c2e25c732… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-t3][develop] Use ird-t3-data 1.2
by Tony CHEMIT 20 Feb '18

20 Feb '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: 0e572a52 by Tony CHEMIT at 2018-02-20T15:11:14+01:00 Use ird-t3-data 1.2 - - - - - 1 changed file: - pom.xml Changes: ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -99,8 +99,8 @@ <organizationId>ultreiaio</organizationId> <projectId>ird-t3</projectId> <applicationName>t3</applicationName> + <t3-data.version>1.2</t3-data.version> - <t3-data.version>1.2-SNAPSHOT</t3-data.version> <env>dev</env>  View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/0e572a52db71bf2193b35601e80c1fbc… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/0e572a52db71bf2193b35601e80c1fbc… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-t3][develop] Let's go to version 2.1
by Tony CHEMIT 20 Feb '18

20 Feb '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: ac92b53b by Tony CHEMIT at 2018-02-20T13:11:39+01:00 Let's go to version 2.1 - - - - - 21 changed files: - CONTRIBUTING.md - pom.xml - t3-actions/pom.xml - t3-domain/pom.xml - t3-domain/src/main/java/fr/ird/t3/services/migration/T3MigrationCallbackV3_0.java → t3-domain/src/main/java/fr/ird/t3/services/migration/T3MigrationCallbackV2_1.java - t3-domain/src/main/resources/db/migration/V3_0_01_add-Harbour-country-link.sql → t3-domain/src/main/resources/db/migration/V2_1_01_add-Harbour-country-link.sql - t3-domain/src/main/resources/db/migration/V3_0_02_remove-LocalMarketPackaging-status.sql → t3-domain/src/main/resources/db/migration/V2_1_02_remove-LocalMarketPackaging-status.sql - t3-domain/src/main/resources/db/migration/V3_0_03_fix-LocalMarketPackagingType-ids.sql → t3-domain/src/main/resources/db/migration/V2_1_03_fix-LocalMarketPackagingType-ids.sql - t3-domain/src/main/resources/db/migration/V3_0_04_rename-SampleWell-table.sql → t3-domain/src/main/resources/db/migration/V2_1_04_rename-SampleWell-table.sql - t3-domain/src/main/resources/db/migration/V3_0_05_rename-SampleSpecies-fields.sql → t3-domain/src/main/resources/db/migration/V2_1_05_rename-SampleSpecies-fields.sql - t3-domain/src/main/resources/db/migration/V3_0_06_referential-i18n.sql → t3-domain/src/main/resources/db/migration/V2_1_06_referential-i18n.sql - t3-domain/src/main/xmi/t3-persistence.properties - t3-input-avdthv33/pom.xml - t3-input-avdthv35/pom.xml - t3-input-avdthv36/pom.xml - t3-installer/pom.xml - t3-msaccess-importer/pom.xml - t3-output-balbayav32/pom.xml - t3-test/pom.xml - t3-web/pom.xml - t3/pom.xml Changes: ===================================== CONTRIBUTING.md ===================================== --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,39 +1,3 @@ -# Release (without stage) +# How does it works ? -``` -wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/close-milestone.sh | bash -wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/create-stage.sh | bash -wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/close-and-release-stage.sh | sed 's/$1/frirdt3/' | bash -wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/update-changelog.sh | bash -wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/create-milestone.sh | bash -``` - -# Release (with stage) - -Create stage - -``` -wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/close-milestone.sh | bash -wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/create-stage.sh | bash -wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/close-stage.sh | sed 's/$1/frirdt3/' | bash -wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/update-staging-changelog.sh | sed 's/$1/frirdt3/' | bash -wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/create-milestone.sh | bash -``` - -And to release stage - -``` -wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/release-stage.sh | sed 's/$1/frirdt3/' | bash -``` - -# Regenerate changelog - -``` -wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/update-changelog.sh | bash -``` - -# Generate site - -``` -mvn clean verify site -DperformRelease scm-publish:publish-scm -``` \ No newline at end of file +See [Ultreiaio/scripts](https://gitlab.com/ultreiaio/scripts/blob/master/README.…. ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ <groupId>fr.ird.t3</groupId> <artifactId>ird-t3</artifactId> - <version>2.0.2-SNAPSHOT</version> + <version>2.1-SNAPSHOT</version> <packaging>pom</packaging> <name>T3 :: Pom</name> ===================================== t3-actions/pom.xml ===================================== --- a/t3-actions/pom.xml +++ b/t3-actions/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.t3</groupId> <artifactId>ird-t3</artifactId> - <version>2.0.2-SNAPSHOT</version> + <version>2.1-SNAPSHOT</version> </parent> <artifactId>t3-actions</artifactId> ===================================== t3-domain/pom.xml ===================================== --- a/t3-domain/pom.xml +++ b/t3-domain/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.t3</groupId> <artifactId>ird-t3</artifactId> - <version>2.0.2-SNAPSHOT</version> + <version>2.1-SNAPSHOT</version> </parent> <artifactId>t3-domain</artifactId> ===================================== t3-domain/src/main/java/fr/ird/t3/services/migration/T3MigrationCallbackV3_0.java → t3-domain/src/main/java/fr/ird/t3/services/migration/T3MigrationCallbackV2_1.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/services/migration/T3MigrationCallbackV3_0.java +++ b/t3-domain/src/main/java/fr/ird/t3/services/migration/T3MigrationCallbackV2_1.java @@ -35,30 +35,20 @@ import java.util.List; * @author Tony Chemit - dev(a)tchemit.fr */ @AutoService(TopiaMigrationCallbackByClassNG.MigrationCallBackForVersion.class) -public class T3MigrationCallbackV3_0 extends T3MigrationCallbackSupport { +public class T3MigrationCallbackV2_1 extends T3MigrationCallbackSupport { - public T3MigrationCallbackV3_0() { - super(Versions.valueOf("3.0")); + public T3MigrationCallbackV2_1() { + super(Versions.valueOf("2.1")); } @Override protected void prepareMigrationScript(TopiaSqlSupport sqlSupport, List<String> queries, boolean showSql, boolean showProgression) throws TopiaException { - addScript("01", "add-Harbour-country-link", queries); addScript("02", "remove-LocalMarketPackaging-status", queries); addScript("03", "fix-LocalMarketPackagingType-ids", queries); addScript("04", "rename-SampleWell-table", queries); addScript("05", "rename-SampleSpecies-fields", queries); addScript("06", "referential-i18n", queries); -// addScript("07", "", queries); -// addScript("08", "", queries); -// addScript("09", "", queries); -// addScript("10", "", queries); -// addScript("11", "", queries); -// addScript("12", "", queries); -// addScript("13", "", queries); -// addScript("14", "", queries); - } } ===================================== t3-domain/src/main/resources/db/migration/V3_0_01_add-Harbour-country-link.sql → t3-domain/src/main/resources/db/migration/V2_1_01_add-Harbour-country-link.sql ===================================== ===================================== t3-domain/src/main/resources/db/migration/V3_0_02_remove-LocalMarketPackaging-status.sql → t3-domain/src/main/resources/db/migration/V2_1_02_remove-LocalMarketPackaging-status.sql ===================================== ===================================== t3-domain/src/main/resources/db/migration/V3_0_03_fix-LocalMarketPackagingType-ids.sql → t3-domain/src/main/resources/db/migration/V2_1_03_fix-LocalMarketPackagingType-ids.sql ===================================== ===================================== t3-domain/src/main/resources/db/migration/V3_0_04_rename-SampleWell-table.sql → t3-domain/src/main/resources/db/migration/V2_1_04_rename-SampleWell-table.sql ===================================== ===================================== t3-domain/src/main/resources/db/migration/V3_0_05_rename-SampleSpecies-fields.sql → t3-domain/src/main/resources/db/migration/V2_1_05_rename-SampleSpecies-fields.sql ===================================== ===================================== t3-domain/src/main/resources/db/migration/V3_0_06_referential-i18n.sql → t3-domain/src/main/resources/db/migration/V2_1_06_referential-i18n.sql ===================================== ===================================== t3-domain/src/main/xmi/t3-persistence.properties ===================================== --- a/t3-domain/src/main/xmi/t3-persistence.properties +++ b/t3-domain/src/main/xmi/t3-persistence.properties @@ -22,7 +22,7 @@ model.tagValue.notGenerateToString=true model.tagValue.generateOperatorForDAOHelper=true model.tagValue.constantPrefix=PROPERTY_ -model.tagValue.version=3.0 +model.tagValue.version=2.1 model.tagValue.indexForeignKeys=true fr.ird.t3.entities.data.Trip.attribute.activity.stereotype=ordered ===================================== t3-input-avdthv33/pom.xml ===================================== --- a/t3-input-avdthv33/pom.xml +++ b/t3-input-avdthv33/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.t3</groupId> <artifactId>ird-t3</artifactId> - <version>2.0.2-SNAPSHOT</version> + <version>2.1-SNAPSHOT</version> </parent> <artifactId>t3-input-avdthv33</artifactId> ===================================== t3-input-avdthv35/pom.xml ===================================== --- a/t3-input-avdthv35/pom.xml +++ b/t3-input-avdthv35/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.t3</groupId> <artifactId>ird-t3</artifactId> - <version>2.0.2-SNAPSHOT</version> + <version>2.1-SNAPSHOT</version> </parent> <artifactId>t3-input-avdthv35</artifactId> ===================================== t3-input-avdthv36/pom.xml ===================================== --- a/t3-input-avdthv36/pom.xml +++ b/t3-input-avdthv36/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.t3</groupId> <artifactId>ird-t3</artifactId> - <version>2.0.2-SNAPSHOT</version> + <version>2.1-SNAPSHOT</version> </parent> <artifactId>t3-input-avdthv36</artifactId> ===================================== t3-installer/pom.xml ===================================== --- a/t3-installer/pom.xml +++ b/t3-installer/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.t3</groupId> <artifactId>ird-t3</artifactId> - <version>2.0.2-SNAPSHOT</version> + <version>2.1-SNAPSHOT</version> </parent> <artifactId>t3-installer</artifactId> ===================================== t3-msaccess-importer/pom.xml ===================================== --- a/t3-msaccess-importer/pom.xml +++ b/t3-msaccess-importer/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.t3</groupId> <artifactId>ird-t3</artifactId> - <version>2.0.2-SNAPSHOT</version> + <version>2.1-SNAPSHOT</version> </parent> <artifactId>t3-msaccess-importer</artifactId> ===================================== t3-output-balbayav32/pom.xml ===================================== --- a/t3-output-balbayav32/pom.xml +++ b/t3-output-balbayav32/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.t3</groupId> <artifactId>ird-t3</artifactId> - <version>2.0.2-SNAPSHOT</version> + <version>2.1-SNAPSHOT</version> </parent> <artifactId>t3-output-balbayav32</artifactId> ===================================== t3-test/pom.xml ===================================== --- a/t3-test/pom.xml +++ b/t3-test/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.t3</groupId> <artifactId>ird-t3</artifactId> - <version>2.0.2-SNAPSHOT</version> + <version>2.1-SNAPSHOT</version> </parent> <artifactId>t3-test</artifactId> ===================================== t3-web/pom.xml ===================================== --- a/t3-web/pom.xml +++ b/t3-web/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.t3</groupId> <artifactId>ird-t3</artifactId> - <version>2.0.2-SNAPSHOT</version> + <version>2.1-SNAPSHOT</version> </parent> <artifactId>t3-web</artifactId> ===================================== t3/pom.xml ===================================== --- a/t3/pom.xml +++ b/t3/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.t3</groupId> <artifactId>ird-t3</artifactId> - <version>2.0.2-SNAPSHOT</version> + <version>2.1-SNAPSHOT</version> </parent> <artifactId>t3</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/ac92b53b88b3fdfd4579824b2ce9d770… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/ac92b53b88b3fdfd4579824b2ce9d770… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-t3][develop] 3 commits: Améliorations dans la gestion des profils utilisateurs (Pour la création on…
by Tony CHEMIT 20 Feb '18

20 Feb '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: ce678d47 by Tony CHEMIT at 2018-02-20T12:17:58+01:00 Améliorations dans la gestion des profils utilisateurs (Pour la création on deamdne aussi une confirmation du mot de passe) (See #251) - - - - - f886e0cf by Tony CHEMIT at 2018-02-20T12:18:05+01:00 improve configurations (for migration purpose) - - - - - 4a76939e by Tony CHEMIT at 2018-02-20T12:18:05+01:00 fix migrations + add a test for migraiton - - - - - 8 changed files: - t3-domain/src/main/resources/db/migration/V3_0_03_fix-LocalMarketPackagingType-ids.sql - t3-domain/src/main/resources/db/migration/V3_0_06_referential-i18n.sql - t3-domain/src/main/resources/t3-datadb.properties - t3-domain/src/main/resources/t3-log4j.conf - t3-domain/src/main/xmi/t3-persistence.properties - + t3-domain/src/test/java/fr/ird/t3/services/migration/T3MigrationTest.java - t3-domain/src/test/resources/log4j.properties - t3-web/src/main/webapp/WEB-INF/jsp/admin/userForm.jsp Changes: ===================================== t3-domain/src/main/resources/db/migration/V3_0_03_fix-LocalMarketPackagingType-ids.sql ===================================== --- a/t3-domain/src/main/resources/db/migration/V3_0_03_fix-LocalMarketPackagingType-ids.sql +++ b/t3-domain/src/main/resources/db/migration/V3_0_03_fix-LocalMarketPackagingType-ids.sql @@ -18,14 +18,14 @@ -- along with this program. If not, see <http://www.gnu.org/licenses/>. -- #L% --- -INSERT INTO localmarketpackagingtype (topiaid, topiaversion, topiacreatedate, code, libelle, status) VALUES ('fr.ird.t3.entities.reference.LocalMarketPackagingType#1454009635523#0.1', 0, '2016-01-28 00:00:00', 1, 'Vrac pesé ou non (multispécifique) (sondage)', true); -INSERT INTO localmarketpackagingtype (topiaid, topiaversion, topiacreatedate, code, libelle, status) VALUES ('fr.ird.t3.entities.reference.LocalMarketPackagingType#1454009635523#0.2', 0, '2016-01-28 00:00:00', 2, 'Pesée (monospécifique) (pas de sondage)', true); -INSERT INTO localmarketpackagingtype (topiaid, topiaversion, topiacreatedate, code, libelle, status) VALUES ('fr.ird.t3.entities.reference.LocalMarketPackagingType#1454009635523#0.3', 0, '2016-01-28 00:00:00', 3, 'Espèce unité (monospécifique) (pas de sondage)', true); -INSERT INTO localmarketpackagingtype (topiaid, topiaversion, topiacreatedate, code, libelle, status) VALUES ('fr.ird.t3.entities.reference.LocalMarketPackagingType#1454009635523#0.4', 0, '2016-01-28 00:00:00', 4, 'Paquet non pesé (monospécifique) (pas de sondage)', true); - +-- Trick (we add 1000 to code, we will subtract them later) +INSERT INTO localmarketpackagingtype (topiaid, topiaversion, topiacreatedate, code, libelle, status) VALUES ('fr.ird.t3.entities.reference.LocalMarketPackagingType#1454009635523#0.1', 0, '2016-01-28 00:00:00', 1001, 'Vrac pesé ou non (multispécifique) (sondage)', true); +INSERT INTO localmarketpackagingtype (topiaid, topiaversion, topiacreatedate, code, libelle, status) VALUES ('fr.ird.t3.entities.reference.LocalMarketPackagingType#1454009635523#0.2', 0, '2016-01-28 00:00:00', 1002, 'Pesée (monospécifique) (pas de sondage)', true); +INSERT INTO localmarketpackagingtype (topiaid, topiaversion, topiacreatedate, code, libelle, status) VALUES ('fr.ird.t3.entities.reference.LocalMarketPackagingType#1454009635523#0.3', 0, '2016-01-28 00:00:00', 1003, 'Espèce unité (monospécifique) (pas de sondage)', true); +INSERT INTO localmarketpackagingtype (topiaid, topiaversion, topiacreatedate, code, libelle, status) VALUES ('fr.ird.t3.entities.reference.LocalMarketPackagingType#1454009635523#0.4', 0, '2016-01-28 00:00:00', 1004, 'Paquet non pesé (monospécifique) (pas de sondage)', true); UPDATE Localmarketpackaging SET localmarketpackagingtype = replace(localmarketpackagingtype,'LocalMarketPackaging', 'LocalMarketPackagingType'); - DELETE FROM Localmarketpackagingtype WHERE topiaid = 'fr.ird.t3.entities.reference.LocalMarketPackaging#1454009635523#0.1'; DELETE FROM Localmarketpackagingtype WHERE topiaid = 'fr.ird.t3.entities.reference.LocalMarketPackaging#1454009635523#0.2'; DELETE FROM Localmarketpackagingtype WHERE topiaid = 'fr.ird.t3.entities.reference.LocalMarketPackaging#1454009635523#0.3'; DELETE FROM Localmarketpackagingtype WHERE topiaid = 'fr.ird.t3.entities.reference.LocalMarketPackaging#1454009635523#0.4'; +UPDATE LocalmarketpackagingType SET code = code -1000; \ No newline at end of file ===================================== t3-domain/src/main/resources/db/migration/V3_0_06_referential-i18n.sql ===================================== --- a/t3-domain/src/main/resources/db/migration/V3_0_06_referential-i18n.sql +++ b/t3-domain/src/main/resources/db/migration/V3_0_06_referential-i18n.sql @@ -51,7 +51,6 @@ ALTER TABLE zoneee RENAME COLUMN libelle TO label1; ALTER TABLE zoneee RENAME COLUMN versionlibelle TO versionLabel; ALTER TABLE zonefao RENAME COLUMN libelle TO label1; ALTER TABLE zonefao RENAME COLUMN versionlibelle TO versionLabel; - ALTER TABLE country ADD COLUMN label2 VARCHAR(255); ALTER TABLE schoolType ADD COLUMN label2 VARCHAR(255); ALTER TABLE fishingContext ADD COLUMN label2 VARCHAR(255); @@ -78,7 +77,6 @@ ALTER TABLE ElementaryCatchFate ADD COLUMN label2 VARCHAR(255); ALTER TABLE zoneet ADD COLUMN label2 VARCHAR(255); ALTER TABLE zoneee ADD COLUMN label2 VARCHAR(255); ALTER TABLE zonefao ADD COLUMN label2 VARCHAR(255); - ALTER TABLE country ADD COLUMN label3 VARCHAR(255); ALTER TABLE schoolType ADD COLUMN label3 VARCHAR(255); ALTER TABLE fishingContext ADD COLUMN label3 VARCHAR(255); @@ -105,7 +103,6 @@ ALTER TABLE ElementaryCatchFate ADD COLUMN label3 VARCHAR(255); ALTER TABLE zoneet ADD COLUMN label3 VARCHAR(255); ALTER TABLE zoneee ADD COLUMN label3 VARCHAR(255); ALTER TABLE zonefao ADD COLUMN label3 VARCHAR(255); - ALTER TABLE country ADD COLUMN label4 VARCHAR(255); ALTER TABLE schoolType ADD COLUMN label4 VARCHAR(255); ALTER TABLE fishingContext ADD COLUMN label4 VARCHAR(255); @@ -132,7 +129,6 @@ ALTER TABLE ElementaryCatchFate ADD COLUMN label4 VARCHAR(255); ALTER TABLE zoneet ADD COLUMN label4 VARCHAR(255); ALTER TABLE zoneee ADD COLUMN label4 VARCHAR(255); ALTER TABLE zonefao ADD COLUMN label4 VARCHAR(255); - ALTER TABLE country ADD COLUMN label5 VARCHAR(255); ALTER TABLE schoolType ADD COLUMN label5 VARCHAR(255); ALTER TABLE fishingContext ADD COLUMN label5 VARCHAR(255); @@ -159,7 +155,6 @@ ALTER TABLE ElementaryCatchFate ADD COLUMN label5 VARCHAR(255); ALTER TABLE zoneet ADD COLUMN label5 VARCHAR(255); ALTER TABLE zoneee ADD COLUMN label5 VARCHAR(255); ALTER TABLE zonefao ADD COLUMN label5 VARCHAR(255); - ALTER TABLE country ADD COLUMN label6 VARCHAR(255); ALTER TABLE schoolType ADD COLUMN label6 VARCHAR(255); ALTER TABLE fishingContext ADD COLUMN label6 VARCHAR(255); @@ -186,7 +181,6 @@ ALTER TABLE ElementaryCatchFate ADD COLUMN label6 VARCHAR(255); ALTER TABLE zoneet ADD COLUMN label6 VARCHAR(255); ALTER TABLE zoneee ADD COLUMN label6 VARCHAR(255); ALTER TABLE zonefao ADD COLUMN label6 VARCHAR(255); - ALTER TABLE country ADD COLUMN label7 VARCHAR(255); ALTER TABLE schoolType ADD COLUMN label7 VARCHAR(255); ALTER TABLE fishingContext ADD COLUMN label7 VARCHAR(255); @@ -213,7 +207,6 @@ ALTER TABLE ElementaryCatchFate ADD COLUMN label7 VARCHAR(255); ALTER TABLE zoneet ADD COLUMN label7 VARCHAR(255); ALTER TABLE zoneee ADD COLUMN label7 VARCHAR(255); ALTER TABLE zonefao ADD COLUMN label7 VARCHAR(255); - ALTER TABLE country ADD COLUMN label8 VARCHAR(255); ALTER TABLE schoolType ADD COLUMN label8 VARCHAR(255); ALTER TABLE fishingContext ADD COLUMN label8 VARCHAR(255); @@ -239,4 +232,4 @@ ALTER TABLE localMarketPackaging ADD COLUMN label8 VARCHAR(255); ALTER TABLE ElementaryCatchFate ADD COLUMN label8 VARCHAR(255); ALTER TABLE zoneet ADD COLUMN label8 VARCHAR(255); ALTER TABLE zoneee ADD COLUMN label8 VARCHAR(255); -ALTER TABLE zonefao ADD COLUMN label8 VARCHAR(255); +ALTER TABLE zonefao ADD COLUMN label8 VARCHAR(255); \ No newline at end of file ===================================== t3-domain/src/main/resources/t3-datadb.properties ===================================== --- a/t3-domain/src/main/resources/t3-datadb.properties +++ b/t3-domain/src/main/resources/t3-datadb.properties @@ -37,4 +37,5 @@ hibernate.hikari.registerMbeans=true topia.service.migration=org.nuiton.topia.migration.TopiaMigrationEngine topia.service.migration.callback=fr.ird.t3.services.migration.T3MigrationCallback topia.service.migration.showSql=true +topia.service.migration.showProgression=true ===================================== t3-domain/src/main/resources/t3-log4j.conf ===================================== --- a/t3-domain/src/main/resources/t3-log4j.conf +++ b/t3-domain/src/main/resources/t3-log4j.conf @@ -20,6 +20,7 @@ log4j.appender.file.layout.ConversionPattern=%d{dd MMM yyyy HH:mm:ss} %5p [%t] ( log4j.logger.fr.ird.t3=INFO log4j.logger.fr.ird.t3.services.ioc=WARN log4j.logger.org.nuiton=WARN +log4j.logger.org.nuiton.topia.migration=INFO log4j.logger.org.hibernate.orm.deprecation=ERROR log4j.logger.com.zaxxer.hikari.HikariDataSource=ERROR ===================================== t3-domain/src/main/xmi/t3-persistence.properties ===================================== --- a/t3-domain/src/main/xmi/t3-persistence.properties +++ b/t3-domain/src/main/xmi/t3-persistence.properties @@ -22,7 +22,7 @@ model.tagValue.notGenerateToString=true model.tagValue.generateOperatorForDAOHelper=true model.tagValue.constantPrefix=PROPERTY_ -model.tagValue.version=2.0 +model.tagValue.version=3.0 model.tagValue.indexForeignKeys=true fr.ird.t3.entities.data.Trip.attribute.activity.stereotype=ordered ===================================== t3-domain/src/test/java/fr/ird/t3/services/migration/T3MigrationTest.java ===================================== --- /dev/null +++ b/t3-domain/src/test/java/fr/ird/t3/services/migration/T3MigrationTest.java @@ -0,0 +1,55 @@ +package fr.ird.t3.services.migration; + +/*- + * #%L + * T3 :: Domain + * %% + * 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% + */ + +import fr.ird.t3.entities.T3TopiaApplicationContext; +import fr.ird.t3.entities.user.JdbcConfiguration; +import fr.ird.t3.entities.user.JdbcConfigurationHelper; +import org.junit.Assert; +import org.junit.Ignore; +import org.junit.Test; + +/** + * Created by tchemit on 20/02/2018. + * + * @author Tony Chemit - dev(a)tchemit.fr + */ +@Ignore +public class T3MigrationTest { + + @Test + public void migratePostgres() { + + String url = "jdbc:postgresql:t3"; + String login = "t3-admin"; + String password = "a"; + + JdbcConfiguration jdbcConfiguration = JdbcConfigurationHelper.newJdbcConfiguration(); + jdbcConfiguration.setUrl(url); + jdbcConfiguration.setLogin(login); + jdbcConfiguration.setPassword(password); + try (T3TopiaApplicationContext rootContext = T3TopiaApplicationContext.newDb(jdbcConfiguration)) { + Assert.assertNotNull(rootContext); + } + + } +} ===================================== t3-domain/src/test/resources/log4j.properties ===================================== --- a/t3-domain/src/test/resources/log4j.properties +++ b/t3-domain/src/test/resources/log4j.properties @@ -27,3 +27,4 @@ log4j.appender.stdout.layout.ConversionPattern=%d{dd MMM yyyy HH:mm:ss} %5p [%t] # package level log4j.logger.fr.ird.t3=INFO +log4j.logger.org.nuiton.topia.migration=INFO \ No newline at end of file ===================================== t3-web/src/main/webapp/WEB-INF/jsp/admin/userForm.jsp ===================================== --- a/t3-web/src/main/webapp/WEB-INF/jsp/admin/userForm.jsp +++ b/t3-web/src/main/webapp/WEB-INF/jsp/admin/userForm.jsp @@ -130,15 +130,14 @@ <s:hidden key="userEditAction" label=""/> <s:textfield key="user.login" label="%{getText('t3.common.login')}" size="40" requiredLabel="true"/> - <s:textfield key="user.password" label="%{getText('t3.common.password')}" - size="40" requiredLabel="true"/> + <s:textfield key="user.password" label="%{getText('t3.common.password')}" size="40" requiredLabel="true"/> + <s:textfield name="checkPassword" value="" key="t3.common.checkPassword" size="40" requiredLabel="true"/> <s:checkbox key="user.admin" label="%{getText('t3.common.admin')}"/> </fieldset> <br/> <s:submit action="userForm!doCreate" key="t3.action.create" align="right"/> <s:if test="userIsAdmin"> - <s:submit action="userList" key="t3.label.admin.backToUserList" - align="right"/> + <s:submit action="userList" key="t3.label.admin.backToUserList" align="right"/> </s:if> </s:form> </s:if> View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/compare/53c09a9e30ff1c1e2c391b72310c416… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/compare/53c09a9e30ff1c1e2c391b72310c416… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-t3][develop] 2 commits: improve configurations (for migration purpose)
by Tony CHEMIT 20 Feb '18

20 Feb '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: d2fbcd9e by Tony CHEMIT at 2018-02-20T12:15:18+01:00 improve configurations (for migration purpose) - - - - - 53c09a9e by Tony CHEMIT at 2018-02-20T12:15:43+01:00 fix migrations + add a test for migraiton - - - - - 7 changed files: - t3-domain/src/main/resources/db/migration/V3_0_03_fix-LocalMarketPackagingType-ids.sql - t3-domain/src/main/resources/db/migration/V3_0_06_referential-i18n.sql - t3-domain/src/main/resources/t3-datadb.properties - t3-domain/src/main/resources/t3-log4j.conf - t3-domain/src/main/xmi/t3-persistence.properties - + t3-domain/src/test/java/fr/ird/t3/services/migration/T3MigrationTest.java - t3-domain/src/test/resources/log4j.properties Changes: ===================================== t3-domain/src/main/resources/db/migration/V3_0_03_fix-LocalMarketPackagingType-ids.sql ===================================== --- a/t3-domain/src/main/resources/db/migration/V3_0_03_fix-LocalMarketPackagingType-ids.sql +++ b/t3-domain/src/main/resources/db/migration/V3_0_03_fix-LocalMarketPackagingType-ids.sql @@ -18,14 +18,14 @@ -- along with this program. If not, see <http://www.gnu.org/licenses/>. -- #L% --- -INSERT INTO localmarketpackagingtype (topiaid, topiaversion, topiacreatedate, code, libelle, status) VALUES ('fr.ird.t3.entities.reference.LocalMarketPackagingType#1454009635523#0.1', 0, '2016-01-28 00:00:00', 1, 'Vrac pesé ou non (multispécifique) (sondage)', true); -INSERT INTO localmarketpackagingtype (topiaid, topiaversion, topiacreatedate, code, libelle, status) VALUES ('fr.ird.t3.entities.reference.LocalMarketPackagingType#1454009635523#0.2', 0, '2016-01-28 00:00:00', 2, 'Pesée (monospécifique) (pas de sondage)', true); -INSERT INTO localmarketpackagingtype (topiaid, topiaversion, topiacreatedate, code, libelle, status) VALUES ('fr.ird.t3.entities.reference.LocalMarketPackagingType#1454009635523#0.3', 0, '2016-01-28 00:00:00', 3, 'Espèce unité (monospécifique) (pas de sondage)', true); -INSERT INTO localmarketpackagingtype (topiaid, topiaversion, topiacreatedate, code, libelle, status) VALUES ('fr.ird.t3.entities.reference.LocalMarketPackagingType#1454009635523#0.4', 0, '2016-01-28 00:00:00', 4, 'Paquet non pesé (monospécifique) (pas de sondage)', true); - +-- Trick (we add 1000 to code, we will subtract them later) +INSERT INTO localmarketpackagingtype (topiaid, topiaversion, topiacreatedate, code, libelle, status) VALUES ('fr.ird.t3.entities.reference.LocalMarketPackagingType#1454009635523#0.1', 0, '2016-01-28 00:00:00', 1001, 'Vrac pesé ou non (multispécifique) (sondage)', true); +INSERT INTO localmarketpackagingtype (topiaid, topiaversion, topiacreatedate, code, libelle, status) VALUES ('fr.ird.t3.entities.reference.LocalMarketPackagingType#1454009635523#0.2', 0, '2016-01-28 00:00:00', 1002, 'Pesée (monospécifique) (pas de sondage)', true); +INSERT INTO localmarketpackagingtype (topiaid, topiaversion, topiacreatedate, code, libelle, status) VALUES ('fr.ird.t3.entities.reference.LocalMarketPackagingType#1454009635523#0.3', 0, '2016-01-28 00:00:00', 1003, 'Espèce unité (monospécifique) (pas de sondage)', true); +INSERT INTO localmarketpackagingtype (topiaid, topiaversion, topiacreatedate, code, libelle, status) VALUES ('fr.ird.t3.entities.reference.LocalMarketPackagingType#1454009635523#0.4', 0, '2016-01-28 00:00:00', 1004, 'Paquet non pesé (monospécifique) (pas de sondage)', true); UPDATE Localmarketpackaging SET localmarketpackagingtype = replace(localmarketpackagingtype,'LocalMarketPackaging', 'LocalMarketPackagingType'); - DELETE FROM Localmarketpackagingtype WHERE topiaid = 'fr.ird.t3.entities.reference.LocalMarketPackaging#1454009635523#0.1'; DELETE FROM Localmarketpackagingtype WHERE topiaid = 'fr.ird.t3.entities.reference.LocalMarketPackaging#1454009635523#0.2'; DELETE FROM Localmarketpackagingtype WHERE topiaid = 'fr.ird.t3.entities.reference.LocalMarketPackaging#1454009635523#0.3'; DELETE FROM Localmarketpackagingtype WHERE topiaid = 'fr.ird.t3.entities.reference.LocalMarketPackaging#1454009635523#0.4'; +UPDATE LocalmarketpackagingType SET code = code -1000; \ No newline at end of file ===================================== t3-domain/src/main/resources/db/migration/V3_0_06_referential-i18n.sql ===================================== --- a/t3-domain/src/main/resources/db/migration/V3_0_06_referential-i18n.sql +++ b/t3-domain/src/main/resources/db/migration/V3_0_06_referential-i18n.sql @@ -51,7 +51,6 @@ ALTER TABLE zoneee RENAME COLUMN libelle TO label1; ALTER TABLE zoneee RENAME COLUMN versionlibelle TO versionLabel; ALTER TABLE zonefao RENAME COLUMN libelle TO label1; ALTER TABLE zonefao RENAME COLUMN versionlibelle TO versionLabel; - ALTER TABLE country ADD COLUMN label2 VARCHAR(255); ALTER TABLE schoolType ADD COLUMN label2 VARCHAR(255); ALTER TABLE fishingContext ADD COLUMN label2 VARCHAR(255); @@ -78,7 +77,6 @@ ALTER TABLE ElementaryCatchFate ADD COLUMN label2 VARCHAR(255); ALTER TABLE zoneet ADD COLUMN label2 VARCHAR(255); ALTER TABLE zoneee ADD COLUMN label2 VARCHAR(255); ALTER TABLE zonefao ADD COLUMN label2 VARCHAR(255); - ALTER TABLE country ADD COLUMN label3 VARCHAR(255); ALTER TABLE schoolType ADD COLUMN label3 VARCHAR(255); ALTER TABLE fishingContext ADD COLUMN label3 VARCHAR(255); @@ -105,7 +103,6 @@ ALTER TABLE ElementaryCatchFate ADD COLUMN label3 VARCHAR(255); ALTER TABLE zoneet ADD COLUMN label3 VARCHAR(255); ALTER TABLE zoneee ADD COLUMN label3 VARCHAR(255); ALTER TABLE zonefao ADD COLUMN label3 VARCHAR(255); - ALTER TABLE country ADD COLUMN label4 VARCHAR(255); ALTER TABLE schoolType ADD COLUMN label4 VARCHAR(255); ALTER TABLE fishingContext ADD COLUMN label4 VARCHAR(255); @@ -132,7 +129,6 @@ ALTER TABLE ElementaryCatchFate ADD COLUMN label4 VARCHAR(255); ALTER TABLE zoneet ADD COLUMN label4 VARCHAR(255); ALTER TABLE zoneee ADD COLUMN label4 VARCHAR(255); ALTER TABLE zonefao ADD COLUMN label4 VARCHAR(255); - ALTER TABLE country ADD COLUMN label5 VARCHAR(255); ALTER TABLE schoolType ADD COLUMN label5 VARCHAR(255); ALTER TABLE fishingContext ADD COLUMN label5 VARCHAR(255); @@ -159,7 +155,6 @@ ALTER TABLE ElementaryCatchFate ADD COLUMN label5 VARCHAR(255); ALTER TABLE zoneet ADD COLUMN label5 VARCHAR(255); ALTER TABLE zoneee ADD COLUMN label5 VARCHAR(255); ALTER TABLE zonefao ADD COLUMN label5 VARCHAR(255); - ALTER TABLE country ADD COLUMN label6 VARCHAR(255); ALTER TABLE schoolType ADD COLUMN label6 VARCHAR(255); ALTER TABLE fishingContext ADD COLUMN label6 VARCHAR(255); @@ -186,7 +181,6 @@ ALTER TABLE ElementaryCatchFate ADD COLUMN label6 VARCHAR(255); ALTER TABLE zoneet ADD COLUMN label6 VARCHAR(255); ALTER TABLE zoneee ADD COLUMN label6 VARCHAR(255); ALTER TABLE zonefao ADD COLUMN label6 VARCHAR(255); - ALTER TABLE country ADD COLUMN label7 VARCHAR(255); ALTER TABLE schoolType ADD COLUMN label7 VARCHAR(255); ALTER TABLE fishingContext ADD COLUMN label7 VARCHAR(255); @@ -213,7 +207,6 @@ ALTER TABLE ElementaryCatchFate ADD COLUMN label7 VARCHAR(255); ALTER TABLE zoneet ADD COLUMN label7 VARCHAR(255); ALTER TABLE zoneee ADD COLUMN label7 VARCHAR(255); ALTER TABLE zonefao ADD COLUMN label7 VARCHAR(255); - ALTER TABLE country ADD COLUMN label8 VARCHAR(255); ALTER TABLE schoolType ADD COLUMN label8 VARCHAR(255); ALTER TABLE fishingContext ADD COLUMN label8 VARCHAR(255); @@ -239,4 +232,4 @@ ALTER TABLE localMarketPackaging ADD COLUMN label8 VARCHAR(255); ALTER TABLE ElementaryCatchFate ADD COLUMN label8 VARCHAR(255); ALTER TABLE zoneet ADD COLUMN label8 VARCHAR(255); ALTER TABLE zoneee ADD COLUMN label8 VARCHAR(255); -ALTER TABLE zonefao ADD COLUMN label8 VARCHAR(255); +ALTER TABLE zonefao ADD COLUMN label8 VARCHAR(255); \ No newline at end of file ===================================== t3-domain/src/main/resources/t3-datadb.properties ===================================== --- a/t3-domain/src/main/resources/t3-datadb.properties +++ b/t3-domain/src/main/resources/t3-datadb.properties @@ -37,4 +37,5 @@ hibernate.hikari.registerMbeans=true topia.service.migration=org.nuiton.topia.migration.TopiaMigrationEngine topia.service.migration.callback=fr.ird.t3.services.migration.T3MigrationCallback topia.service.migration.showSql=true +topia.service.migration.showProgression=true ===================================== t3-domain/src/main/resources/t3-log4j.conf ===================================== --- a/t3-domain/src/main/resources/t3-log4j.conf +++ b/t3-domain/src/main/resources/t3-log4j.conf @@ -20,6 +20,7 @@ log4j.appender.file.layout.ConversionPattern=%d{dd MMM yyyy HH:mm:ss} %5p [%t] ( log4j.logger.fr.ird.t3=INFO log4j.logger.fr.ird.t3.services.ioc=WARN log4j.logger.org.nuiton=WARN +log4j.logger.org.nuiton.topia.migration=INFO log4j.logger.org.hibernate.orm.deprecation=ERROR log4j.logger.com.zaxxer.hikari.HikariDataSource=ERROR ===================================== t3-domain/src/main/xmi/t3-persistence.properties ===================================== --- a/t3-domain/src/main/xmi/t3-persistence.properties +++ b/t3-domain/src/main/xmi/t3-persistence.properties @@ -22,7 +22,7 @@ model.tagValue.notGenerateToString=true model.tagValue.generateOperatorForDAOHelper=true model.tagValue.constantPrefix=PROPERTY_ -model.tagValue.version=2.0 +model.tagValue.version=3.0 model.tagValue.indexForeignKeys=true fr.ird.t3.entities.data.Trip.attribute.activity.stereotype=ordered ===================================== t3-domain/src/test/java/fr/ird/t3/services/migration/T3MigrationTest.java ===================================== --- /dev/null +++ b/t3-domain/src/test/java/fr/ird/t3/services/migration/T3MigrationTest.java @@ -0,0 +1,55 @@ +package fr.ird.t3.services.migration; + +/*- + * #%L + * T3 :: Domain + * %% + * 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% + */ + +import fr.ird.t3.entities.T3TopiaApplicationContext; +import fr.ird.t3.entities.user.JdbcConfiguration; +import fr.ird.t3.entities.user.JdbcConfigurationHelper; +import org.junit.Assert; +import org.junit.Ignore; +import org.junit.Test; + +/** + * Created by tchemit on 20/02/2018. + * + * @author Tony Chemit - dev(a)tchemit.fr + */ +@Ignore +public class T3MigrationTest { + + @Test + public void migratePostgres() { + + String url = "jdbc:postgresql:t3"; + String login = "t3-admin"; + String password = "a"; + + JdbcConfiguration jdbcConfiguration = JdbcConfigurationHelper.newJdbcConfiguration(); + jdbcConfiguration.setUrl(url); + jdbcConfiguration.setLogin(login); + jdbcConfiguration.setPassword(password); + try (T3TopiaApplicationContext rootContext = T3TopiaApplicationContext.newDb(jdbcConfiguration)) { + Assert.assertNotNull(rootContext); + } + + } +} ===================================== t3-domain/src/test/resources/log4j.properties ===================================== --- a/t3-domain/src/test/resources/log4j.properties +++ b/t3-domain/src/test/resources/log4j.properties @@ -27,3 +27,4 @@ log4j.appender.stdout.layout.ConversionPattern=%d{dd MMM yyyy HH:mm:ss} %5p [%t] # package level log4j.logger.fr.ird.t3=INFO +log4j.logger.org.nuiton.topia.migration=INFO \ No newline at end of file View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/compare/3688cd0e15bbbf8d26572e633037bec… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/compare/3688cd0e15bbbf8d26572e633037bec… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-t3][develop] Améliorations dans la gestion des profils utilisateurs (Pour la création on…
by Tony CHEMIT 20 Feb '18

20 Feb '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: 3688cd0e by Tony CHEMIT at 2018-02-20T11:23:03+01:00 Améliorations dans la gestion des profils utilisateurs (Pour la création on deamdne aussi une confirmation du mot de passe) - - - - - 1 changed file: - t3-web/src/main/webapp/WEB-INF/jsp/admin/userForm.jsp Changes: ===================================== t3-web/src/main/webapp/WEB-INF/jsp/admin/userForm.jsp ===================================== --- a/t3-web/src/main/webapp/WEB-INF/jsp/admin/userForm.jsp +++ b/t3-web/src/main/webapp/WEB-INF/jsp/admin/userForm.jsp @@ -130,15 +130,14 @@ <s:hidden key="userEditAction" label=""/> <s:textfield key="user.login" label="%{getText('t3.common.login')}" size="40" requiredLabel="true"/> - <s:textfield key="user.password" label="%{getText('t3.common.password')}" - size="40" requiredLabel="true"/> + <s:textfield key="user.password" label="%{getText('t3.common.password')}" size="40" requiredLabel="true"/> + <s:textfield name="checkPassword" value="" key="t3.common.checkPassword" size="40" requiredLabel="true"/> <s:checkbox key="user.admin" label="%{getText('t3.common.admin')}"/> </fieldset> <br/> <s:submit action="userForm!doCreate" key="t3.action.create" align="right"/> <s:if test="userIsAdmin"> - <s:submit action="userList" key="t3.label.admin.backToUserList" - align="right"/> + <s:submit action="userList" key="t3.label.admin.backToUserList" align="right"/> </s:if> </s:form> </s:if> View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/3688cd0e15bbbf8d26572e633037bec4… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/3688cd0e15bbbf8d26572e633037bec4… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-t3][develop] use auto-service
by Tony CHEMIT 20 Feb '18

20 Feb '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: a6239505 by Tony CHEMIT at 2018-02-20T11:15:55+01:00 use auto-service - - - - - 30 changed files: - t3-domain/pom.xml - t3-domain/src/main/java/fr/ird/t3/entities/reference/zone/ZoneETMeta.java - t3-domain/src/main/java/fr/ird/t3/services/ioc/InjectorDAO.java - t3-domain/src/main/java/fr/ird/t3/services/ioc/InjectorDecoratedBeans.java - t3-domain/src/main/java/fr/ird/t3/services/ioc/InjectorEntitiesById.java - t3-domain/src/main/java/fr/ird/t3/services/ioc/InjectorEntityById.java - t3-domain/src/main/java/fr/ird/t3/services/ioc/InjectorFromDAO.java - t3-domain/src/main/java/fr/ird/t3/services/ioc/InjectorInternalDAO.java - t3-domain/src/main/java/fr/ird/t3/services/migration/T3MigrationCallbackV1_0_1.java - t3-domain/src/main/java/fr/ird/t3/services/migration/T3MigrationCallbackV1_1.java - t3-domain/src/main/java/fr/ird/t3/services/migration/T3MigrationCallbackV1_2.java - t3-domain/src/main/java/fr/ird/t3/services/migration/T3MigrationCallbackV1_3.java - t3-domain/src/main/java/fr/ird/t3/services/migration/T3MigrationCallbackV1_3_1.java - t3-domain/src/main/java/fr/ird/t3/services/migration/T3MigrationCallbackV1_3_2.java - t3-domain/src/main/java/fr/ird/t3/services/migration/T3MigrationCallbackV1_4.java - t3-domain/src/main/java/fr/ird/t3/services/migration/T3MigrationCallbackV1_5.java - t3-domain/src/main/java/fr/ird/t3/services/migration/T3MigrationCallbackV1_6.java - t3-domain/src/main/java/fr/ird/t3/services/migration/T3MigrationCallbackV2_0.java - t3-domain/src/main/java/fr/ird/t3/services/migration/T3MigrationCallbackV3_0.java - − t3-domain/src/main/resources/META-INF/services/fr.ird.t3.entities.reference.zone.ZoneStratumAwareMeta - − t3-domain/src/main/resources/META-INF/services/fr.ird.t3.services.ioc.Injector - − t3-domain/src/main/resources/META-INF/services/org.nuiton.topia.migration.TopiaMigrationCallbackByClassNG$MigrationCallBackForVersion - t3-input-avdthv33/pom.xml - t3-input-avdthv33/src/main/java/fr/ird/t3/io/input/avdth/v33/T3InputProviderAvdth33.java - − t3-input-avdthv33/src/main/resources/META-INF/services/fr.ird.t3.io.input.T3InputProvider - t3-input-avdthv35/pom.xml - t3-input-avdthv35/src/main/java/fr/ird/t3/io/input/avdth/v35/T3InputProviderAvdth35.java - − t3-input-avdthv35/src/main/resources/META-INF/services/fr.ird.t3.io.input.T3InputProvider - t3-input-avdthv36/pom.xml - t3-input-avdthv36/src/main/java/fr/ird/t3/io/input/avdth/v36/T3InputProviderAvdth36.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/a6239505d1240451181a85e3b9db70bb… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/a6239505d1240451181a85e3b9db70bb… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-t3][develop] [WIN] Windows/Mauvais affichage des caractères accentués dans le navigateur (See #154)
by Tony CHEMIT 19 Feb '18

19 Feb '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: 021baffa by Tony CHEMIT at 2018-02-19T09:15:21+01:00 [WIN] Windows/Mauvais affichage des caractères accentués dans le navigateur (See #154) - - - - - 1 changed file: - t3-web/src/main/java/fr/ird/t3/web/validators/CheckJdbcConnectionValidator.java Changes: ===================================== t3-web/src/main/java/fr/ird/t3/web/validators/CheckJdbcConnectionValidator.java ===================================== --- a/t3-web/src/main/java/fr/ird/t3/web/validators/CheckJdbcConnectionValidator.java +++ b/t3-web/src/main/java/fr/ird/t3/web/validators/CheckJdbcConnectionValidator.java @@ -24,6 +24,10 @@ import com.opensymphony.xwork2.validator.ValidationException; import fr.ird.t3.entities.T3EntityHelper; import fr.ird.t3.entities.user.JdbcConfiguration; +import java.nio.charset.StandardCharsets; + +import static org.nuiton.i18n.I18n.t; + /** * Check the incoming jdbc configuration connection. * @@ -38,20 +42,14 @@ public class CheckJdbcConnectionValidator extends T3BaseFieldValidatorSupport { if (!getValidatorContext().hasFieldErrors()) { String fieldName = getFieldName(); - JdbcConfiguration db = - (JdbcConfiguration) getFieldValue(fieldName, object); - - // check jdbc connection + JdbcConfiguration db = (JdbcConfiguration) getFieldValue(fieldName, object); try { - T3EntityHelper.checkJDBCConnection(db); - } catch (Exception e) { // can not connect to database - addFieldError( - "database.url", - _("t3.error.invalid.jdbc.connexion", e.getMessage())); + String errorMessage = new String(e.getMessage().getBytes(), StandardCharsets.UTF_8); + addFieldError("database.url", t("t3.error.invalid.jdbc.connexion", errorMessage)); } } } View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/021baffa81402dd53c69d2922104cb3f… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/021baffa81402dd53c69d2922104cb3f… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-t3][develop] 2 commits: reformat code
by Tony CHEMIT 19 Feb '18

19 Feb '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: 6ed5a91e by Tony CHEMIT at 2018-02-19T08:47:14+01:00 reformat code - - - - - 879a47c3 by Tony CHEMIT at 2018-02-19T08:48:51+01:00 Probleme de calcul de rf1 (See #283) - - - - - 1 changed file: - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeRF1Action.java Changes: ===================================== t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeRF1Action.java ===================================== --- a/t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeRF1Action.java +++ b/t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeRF1Action.java @@ -158,7 +158,7 @@ public class ComputeRF1Action extends AbstractLevel0Action<ComputeRF1Configurati } @Override - protected boolean executeAction() throws Exception { + protected boolean executeAction() { Set<Vessel> allVessel = tripsByVessel.keySet(); @@ -174,29 +174,24 @@ public class ComputeRF1Action extends AbstractLevel0Action<ComputeRF1Configurati log.debug("Treat vessel " + vessel.getLabel1()); } - List<Trip> tripsForVessel = - Lists.newArrayList(tripsByVessel.get(vessel)); + List<Trip> tripsForVessel = Lists.newArrayList(tripsByVessel.get(vessel)); TripTopiaDao.sortTrips(tripsForVessel); result |= doExecuteForVessel(vessel, tripsForVessel); } - addInfoMessage(l(locale, "t3.level0.computeRF1.totalCatchWeightRF1", - totalCatchWeightRF1)); - addInfoMessage(l(locale, "t3.level0.computeRF1.totalLandingWeight", - totalLandingWeight)); + addInfoMessage(l(locale, "t3.level0.computeRF1.totalCatchWeightRF1", totalCatchWeightRF1)); + addInfoMessage(l(locale, "t3.level0.computeRF1.totalLandingWeight", totalLandingWeight)); } return result; } - protected boolean doExecuteForVessel(Vessel vessel, - List<Trip> tripList) throws Exception { + protected boolean doExecuteForVessel(Vessel vessel, List<Trip> tripList) { incrementsProgression(); String vesselStr = decorate(vessel); - addInfoMessage(l(locale, "t3.level0.computeRF1.treat.vessel", - vesselStr)); + addInfoMessage(l(locale, "t3.level0.computeRF1.treat.vessel", vesselStr)); if (CollectionUtils.isEmpty(tripList)) { @@ -205,8 +200,7 @@ public class ComputeRF1Action extends AbstractLevel0Action<ComputeRF1Configurati return false; } - addInfoMessage(l(locale, "t3.level0.computeRF1.trips.to.use.for.vessel", - tripList.size(), vesselStr)); + addInfoMessage(l(locale, "t3.level0.computeRF1.trips.to.use.for.vessel", tripList.size(), vesselStr)); // get country of the vessel (always use the fleet country) Country country = vessel.getFleetCountry(); @@ -228,13 +222,12 @@ public class ComputeRF1Action extends AbstractLevel0Action<ComputeRF1Configurati // there is some species to use for rf1 computation StringBuilder sb = new StringBuilder(); - for (Species specy : species) { - sb.append(", ").append(decorate(specy)); + for (Species aSpecies : species) { + sb.append(", ").append(decorate(aSpecies)); } String message = l(locale, "t3.level0.computeRF1.species.to.use", - species.size(), sb.substring(2) - ); + species.size(), sb.substring(2)); if (log.isInfoEnabled()) { log.info(message); } @@ -247,20 +240,15 @@ public class ComputeRF1Action extends AbstractLevel0Action<ComputeRF1Configurati // split trips by complete trips List<CompleteTrip> completeTrips = tripDAO.toCompleteTrip(tripList); - addInfoMessage( - l(locale, "t3.level0.computeRF1.complete.trips.to.use.for.vessel", - completeTrips.size(), vesselStr)); + addInfoMessage(l(locale, "t3.level0.computeRF1.complete.trips.to.use.for.vessel", + completeTrips.size(), vesselStr)); nbCompleteTrips += completeTrips.size(); for (CompleteTrip completeTrip : completeTrips) { // consume the completeTrip - treatCompleteTrip(completeTrip, - species, - minimumRate, - maximumRate - ); + treatCompleteTrip(completeTrip, species, minimumRate, maximumRate); // complete trip was consumed completeTrip.removeTrips(tripList); @@ -288,10 +276,7 @@ public class ComputeRF1Action extends AbstractLevel0Action<ComputeRF1Configurati return true; } - private void treatCompleteTrip(CompleteTrip completeTrip, - Collection<Species> species, - float minimumRate, - float maximumRate) { + private void treatCompleteTrip(CompleteTrip completeTrip, Collection<Species> species, float minimumRate, float maximumRate) { int completionStatus; @@ -306,9 +291,9 @@ public class ComputeRF1Action extends AbstractLevel0Action<ComputeRF1Configurati } applyCompletionStatus(completeTrip, completionStatus); - boolean allwithLogBook = TripTopiaDao.isTripsAllWithLogBook(completeTrip); + boolean allWithLogBook = TripTopiaDao.isTripsAllWithLogBook(completeTrip); - if (!allwithLogBook) { + if (!allWithLogBook) { // there is some trips with no log book // reject all the complete trip @@ -350,8 +335,7 @@ public class ComputeRF1Action extends AbstractLevel0Action<ComputeRF1Configurati completeTrip.getDepartureTrip().getVesselLabel(), DecoratorService.formatDate(completeTrip.getDepartureTrip().getDepartureDate()), DecoratorService.formatDate(completeTrip.getLandingTrip().getLandingDate()), - rf1, - minimumRate); + rf1, minimumRate); addWarningMessage(warnMessage); nbCompleteAcceptedTripsWithBadRF1++; } @@ -363,8 +347,7 @@ public class ComputeRF1Action extends AbstractLevel0Action<ComputeRF1Configurati completeTrip.getDepartureTrip().getVesselLabel(), DecoratorService.formatDate(completeTrip.getDepartureTrip().getDepartureDate()), DecoratorService.formatDate(completeTrip.getLandingTrip().getLandingDate()), - rf1, - maximumRate); + rf1, maximumRate); addWarningMessage(warnMessage); nbCompleteAcceptedTripsWithBadRF1++; } @@ -377,18 +360,13 @@ public class ComputeRF1Action extends AbstractLevel0Action<ComputeRF1Configurati } } - private void applyCompletionStatus(Iterable<Trip> trips, - int completionStatus) { - + private void applyCompletionStatus(Iterable<Trip> trips, int completionStatus) { for (Trip trip : trips) { - trip.setCompletionStatus(completionStatus); } } - private void applyRF1(Float rf1, - CompleteTrip trips, - Collection<Species> species) { + private void applyRF1(Float rf1, CompleteTrip trips, Collection<Species> species) { for (Trip trip : trips) { @@ -400,42 +378,30 @@ public class ComputeRF1Action extends AbstractLevel0Action<ComputeRF1Configurati // means can not apply any rf1 : rf1 must stay at null... rf1ToUse = null; - addWarningMessage( - l(locale, "t3.level0.computeRF1.warning.no.logbook", - tripStr) - ); + addWarningMessage(l(locale, "t3.level0.computeRF1.warning.no.logbook", tripStr)); } trip.applyRf1(rf1ToUse, species); markTripAsTreated(trip); - addInfoMessage( - l(locale, "t3.level0.computeRF1.resume.rf1.for.trip", - tripStr, rf1ToUse) - ); + addInfoMessage(l(locale, "t3.level0.computeRF1.resume.rf1.for.trip", tripStr, rf1ToUse)); } } - protected void updateTotalWeights(CompleteTrip completeTrip, - Collection<Species> species) { + protected void updateTotalWeights(CompleteTrip completeTrip, Collection<Species> species) { - float tripTotalCatchWeightRf1 = - completeTrip.getElementaryCatchTotalWeightRf1(species); + float tripTotalCatchWeightRf1 = completeTrip.getElementaryCatchTotalWeightRf1(species); totalCatchWeightRF1 += tripTotalCatchWeightRf1; - float tripTotalLandingWeight = - completeTrip.getElementaryLandingTotalWeight(species); + float tripTotalLandingWeight = completeTrip.getElementaryLandingTotalWeight(species); totalLandingWeight += tripTotalLandingWeight; if (log.isInfoEnabled()) { - - log.info("After trip " + decorate(completeTrip.getLandingTrip()) + - " tripTotalCatchWeightRf1 = " + tripTotalCatchWeightRf1 + - " tripTotalLandingWeight = " + tripTotalLandingWeight); + log.info(String.format("After trip %s tripTotalCatchWeightRf1 = %s tripTotalLandingWeight = %s", + decorate(completeTrip.getLandingTrip()), tripTotalCatchWeightRf1, tripTotalLandingWeight)); } if (log.isDebugEnabled()) { - log.debug("After trip " + decorate(completeTrip.getLandingTrip()) + - " totalCatchWeightRF1 = " + totalCatchWeightRF1 + - " totalLandingWeight = " + totalLandingWeight); + log.debug(String.format("After trip %s totalCatchWeightRF1 = %s totalLandingWeight = %s", + decorate(completeTrip.getLandingTrip()), totalCatchWeightRF1, totalLandingWeight)); } // for (Trip trip : completeTrip) { // @@ -461,8 +427,7 @@ public class ComputeRF1Action extends AbstractLevel0Action<ComputeRF1Configurati // } } - protected float computeRF1ForCompleteTrip(Iterable<Trip> completeTrip, - Collection<Species> speciesList) { + protected float computeRF1ForCompleteTrip(Iterable<Trip> completeTrip, Collection<Species> speciesList) { // do the computation of rf1 for all trips of the complete trip float sumLanding = 0; @@ -477,10 +442,8 @@ public class ComputeRF1Action extends AbstractLevel0Action<ComputeRF1Configurati log.debug("Start count for trip " + tripStr); } - float elementaryLandingTotalWeight = - trip.getElementaryLandingTotalWeight(speciesList); - float elementaryCatchTotalWeight = - trip.getElementaryCatchTotalWeight(speciesList); + float elementaryLandingTotalWeight = trip.getElementaryLandingTotalWeight(speciesList); + float elementaryCatchTotalWeight = trip.getElementaryCatchTotalWeight(speciesList); if (elementaryCatchTotalWeight == 0 && elementaryLandingTotalWeight > 0) { @@ -488,24 +451,19 @@ public class ComputeRF1Action extends AbstractLevel0Action<ComputeRF1Configurati // Add a warning, seems not possible to have no catches and landing : // the logBookAvaibility flag should be setted to 0. - addWarningMessage( - l(locale, "t3.level0.computeRF1.warning.no.catches.but.some.landings", - tripStr, elementaryLandingTotalWeight) - ); + addWarningMessage(l(locale, "t3.level0.computeRF1.warning.no.catches.but.some.landings", + tripStr, elementaryLandingTotalWeight)); } if (elementaryCatchTotalWeight > 0 && elementaryLandingTotalWeight == 0) { // Special case : no landing - // do not take account of the catch weight - elementaryCatchTotalWeight = 0; + // in fact (see https://gitlab.com/ultreiaio/ird-t3/issues/283) we do not want to loose this catches + //elementaryCatchTotalWeight = 0; - addWarningMessage( - l(locale, "t3.level0.computeRF1.warning.no.landings.but.some.catches", - tripStr, - elementaryLandingTotalWeight) - ); + addWarningMessage(l(locale, "t3.level0.computeRF1.warning.no.landings.but.some.catches", + tripStr, elementaryLandingTotalWeight)); } float localMarketTotalWeight = trip.getFalseFishesWeight(); @@ -536,10 +494,8 @@ public class ComputeRF1Action extends AbstractLevel0Action<ComputeRF1Configurati log.debug("Computed rf1 " + rf1); } - addInfoMessage( - l(locale, "t3.level0.computeRF1.resume.for.complete.trip", + addInfoMessage(l(locale, "t3.level0.computeRF1.resume.for.complete.trip", sumCatch, sumLanding, sumLocalMarket, sumLocalMarketDetailled, rf1)); - return rf1; } View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/compare/334460dbc1efdd9b7d84b493eeeced1… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/compare/334460dbc1efdd9b7d84b493eeeced1… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-t3][develop] Amélioration du log du RF1 (N0.1) (See #2171)
by Tony CHEMIT 19 Feb '18

19 Feb '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: 334460db by Tony CHEMIT at 2018-02-19T08:35:48+01:00 Amélioration du log du RF1 (N0.1) (See #2171) - - - - - 5 changed files: - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeRF1Action.java - t3-actions/src/main/resources/i18n/t3-actions_en_GB.properties - t3-actions/src/main/resources/i18n/t3-actions_fr_FR.properties - t3-domain/src/main/java/fr/ird/t3/entities/data/TripImpl.java - t3-domain/src/main/xmi/t3-persistence.zargo Changes: ===================================== t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeRF1Action.java ===================================== --- a/t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeRF1Action.java +++ b/t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeRF1Action.java @@ -467,13 +467,14 @@ public class ComputeRF1Action extends AbstractLevel0Action<ComputeRF1Configurati // do the computation of rf1 for all trips of the complete trip float sumLanding = 0; float sumCatch = 0; + float sumLocalMarket = 0; + float sumLocalMarketDetailled = 0; for (Trip trip : completeTrip) { String tripStr = decorate(trip, DecoratorService.WITH_ID); if (log.isDebugEnabled()) { - log.debug("Start count for trip " + - tripStr); + log.debug("Start count for trip " + tripStr); } float elementaryLandingTotalWeight = @@ -507,20 +508,24 @@ public class ComputeRF1Action extends AbstractLevel0Action<ComputeRF1Configurati ); } + float localMarketTotalWeight = trip.getFalseFishesWeight(); + float localMarketTotalWeightDetailled = trip.getLocalMarketBatchTotalWeight(speciesList); + addInfoMessage(l(locale, "t3.level0.computeRF1.resume.for.trip", - tripStr, elementaryCatchTotalWeight, - elementaryLandingTotalWeight) - ); + tripStr, elementaryCatchTotalWeight, elementaryLandingTotalWeight, + localMarketTotalWeight, localMarketTotalWeightDetailled)); if (log.isDebugEnabled()) { - log.debug("elementaryLandingTotalWeight = " + - elementaryLandingTotalWeight); - log.debug("elementaryCatchTotalWeight = " + - elementaryCatchTotalWeight); + log.debug("elementaryLandingTotalWeight = " + elementaryLandingTotalWeight); + log.debug("elementaryCatchTotalWeight = " + elementaryCatchTotalWeight); + log.debug("localMarketTotalWeight = " + localMarketTotalWeight); + log.debug("localMarketTotalWeightDetailled = " + localMarketTotalWeightDetailled); } sumLanding += elementaryLandingTotalWeight; sumCatch += elementaryCatchTotalWeight; + sumLocalMarket += localMarketTotalWeight; + sumLocalMarketDetailled += localMarketTotalWeightDetailled; } float rf1 = 1; @@ -533,8 +538,7 @@ public class ComputeRF1Action extends AbstractLevel0Action<ComputeRF1Configurati addInfoMessage( l(locale, "t3.level0.computeRF1.resume.for.complete.trip", - sumCatch, sumLanding, rf1) - ); + sumCatch, sumLanding, sumLocalMarket, sumLocalMarketDetailled, rf1)); return rf1; } ===================================== t3-actions/src/main/resources/i18n/t3-actions_en_GB.properties ===================================== --- a/t3-actions/src/main/resources/i18n/t3-actions_en_GB.properties +++ b/t3-actions/src/main/resources/i18n/t3-actions_en_GB.properties @@ -20,8 +20,8 @@ t3.input.ImportInputSource=Input Data Import t3.level0.action=Level 0 Operation\: %s t3.level0.computeActivitySetDurationAndPositiveSetCount=%s, set duration\: %s, positiveSetCount\: %s t3.level0.computeRF1.complete.trips.to.use.for.vessel=Found %s complete trip(s) for vessel %s -t3.level0.computeRF1.resume.for.complete.trip=Total catches weight %s / Total landing weight %s / RF1 \= %s -t3.level0.computeRF1.resume.for.trip=Trip %s, Total catches weight %s / Total landing weight %s +t3.level0.computeRF1.resume.for.complete.trip=Total catches weight %s / Total landing weight %s / Total local market weight %s / Detailled total local market weight %s / RF1 \= %s +t3.level0.computeRF1.resume.for.trip=Trip %s, Total catches weight %s / Total landing weight %s / Total local market weight %s / Detailled total local market weight %s t3.level0.computeRF1.resume.rf1.for.trip=Trip %s, rf1 to use %s t3.level0.computeRF1.resume.rf2.for.trip=Trip %s, rf2 to use %s t3.level0.computeRF1.species.to.use=Will use %s species \: %s ===================================== t3-actions/src/main/resources/i18n/t3-actions_fr_FR.properties ===================================== --- a/t3-actions/src/main/resources/i18n/t3-actions_fr_FR.properties +++ b/t3-actions/src/main/resources/i18n/t3-actions_fr_FR.properties @@ -20,8 +20,8 @@ t3.input.ImportInputSource=Import de données t3.level0.action=Opération du niveau 0 \: %s t3.level0.computeActivitySetDurationAndPositiveSetCount=%s, durée de calée \: %s, positiveSetCount \: %s t3.level0.computeRF1.complete.trips.to.use.for.vessel=%s marée(s) complète(s) trouvées pour le navire %s -t3.level0.computeRF1.resume.for.complete.trip=Poids total capturé %s / Poids total vendu %s / RF1 \= %s -t3.level0.computeRF1.resume.for.trip=Marée %s, Poids total capturé %s / Poids total vendu %s +t3.level0.computeRF1.resume.for.complete.trip=Poids total capturé %s / Poids total vendu %s / Poids marché local résumé %s / Poids marché local détaillé %s / RF1 \= %s +t3.level0.computeRF1.resume.for.trip=Marée %s, Poids total capturé %s / Poids total vendu %s / Poids marché local résumé %s / Poids marché local détaillé %s t3.level0.computeRF1.resume.rf1.for.trip=Marée %s, rf1 utilisé %s t3.level0.computeRF1.resume.rf2.for.trip=Marée %s, rf2 utilisé %s t3.level0.computeRF1.species.to.use=%s espèces à utiliser \: %s ===================================== 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 @@ -30,10 +30,10 @@ import fr.ird.t3.entities.reference.Ocean; import fr.ird.t3.entities.reference.Species; import fr.ird.t3.entities.reference.Vessel; import fr.ird.t3.entities.reference.VesselImpl; + import java.util.Collection; import java.util.Set; - import static org.nuiton.i18n.I18n.n; /** @@ -191,6 +191,19 @@ public class TripImpl extends TripAbstract { } @Override + public float getLocalMarketBatchTotalWeight(Collection<Species> species) { + float result = 0; + if (isLocalMarketBatchNotEmpty()) { + for (LocalMarketBatch localMarketBatch : getLocalMarketBatch()) { + if (species.contains(localMarketBatch.getSpecies()) && localMarketBatch.getWeight() != null) { + result += localMarketBatch.getWeight(); + } + } + } + return result; + } + + @Override public float getElementaryLandingTotalWeight(Collection<Species> species) { float result = 0; if (!isElementaryLandingEmpty()) { ===================================== t3-domain/src/main/xmi/t3-persistence.zargo ===================================== Binary files a/t3-domain/src/main/xmi/t3-persistence.zargo and b/t3-domain/src/main/xmi/t3-persistence.zargo differ View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/334460dbc1efdd9b7d84b493eeeced1c… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/334460dbc1efdd9b7d84b493eeeced1c… You're receiving this email because of your account on gitlab.com.

1 0