- Observe-commits - mailman.cloud.codelutin.com

[Git][ultreiaio/ird-observe][develop] 6 commits: Amélioration de certains labels communs
by Tony CHEMIT 01 Feb '19

01 Feb '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 5c6aa985 by tchemit at 2019-01-30T15:32:28Z Amélioration de certains labels communs - - - - - af02b037 by tchemit at 2019-01-30T15:32:58Z suppression de JComment et utilisation de BigTextEditor à la place - - - - - 8f2757ba by tchemit at 2019-01-31T14:30:26Z update pom - - - - - 4b2681d2 by tchemit at 2019-01-31T17:51:57Z fix some validation - - - - - 694cd9ca by tchemit at 2019-01-31T17:52:40Z Use new Jaxx BeanScope mecanism + then clean jaxx files - - - - - f64638f4 by tchemit at 2019-02-01T13:31:47Z fix i18n - - - - - 30 changed files: - client-core/src/main/i18n/getters/java.getter - client-core/src/main/i18n/getters/jaxx.getter - client-core/src/main/java/fr/ird/observe/client/ui/ObserveCommon.jcss - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/api/AbstractContentUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/edit/DeleteEditDataUIActionSupport.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/edit/SaveEditDataUIActionSupport.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/open/DeleteOpenDataUIActionSupport.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/open/SaveOpenDataUIActionSupport.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/simple/SaveSimpleDataUIActionSupport.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/table/SaveTableDataUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/api/ref/SaveReferentialUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/api/ref/ShowReferentialUniqueKeyUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/GenerateTripLonglineHomeIdUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/content/Common.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/api/ContentUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/api/ContentUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/ContentUIInitializer.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/ContentUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/edit/ContentEditUIInitializer.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/open/ContentOpenableUIInitializer.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/simple/ContentSimpleUIInitializer.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/table/ContentTableUIInitializer.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/ref/ContentI18nReferenceUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/api/ref/ContentI18nReferenceUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/api/ref/ContentReferenceUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/api/ref/ContentReferenceUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/ref/ContentReferenceUIInitializer.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/ref/ContentReferenceUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/CommonTable.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/common/GearUseFeaturesLonglineUI.jaxx The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/af6a6279827d5c4aedb82007fb… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/af6a6279827d5c4aedb82007fb… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] 2 commits: add missing i18n key
by Tony CHEMIT 01 Feb '19

01 Feb '19

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 0db4772e by tchemit at 2019-02-01T12:21:08Z add missing i18n key - - - - - 75a404fc by tchemit at 2019-02-01T12:24:48Z La migration v3 vers v7 ne passe pas (fichier mal localisé) - Closes #1209 - - - - - 23 changed files: - persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_3_1.java - persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_3_10.java - persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_3_11.java - persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_3_12.java - persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_3_14.java - persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_3_15.java - persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_3_16.java - persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_3_5.java - persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_3_7.java - persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_3_8.java - persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_3_9.java - persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0.java - persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_1.java - persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_2.java - persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_4.java - persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC2.java - persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC3.java - persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC4.java - persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC6.java - persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC7.java - + persistence/src/main/java/fr/ird/observe/persistence/migration/old/LegacyMigrationVersionResource.java - pom.xml - validation/src/main/i18n/getters/validation-messages.getter Changes: ===================================== persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_3_1.java ===================================== @@ -10,12 +10,12 @@ package fr.ird.observe.persistence.migration.old; * it under the terms of the GNU 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 General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. @@ -25,8 +25,8 @@ package fr.ird.observe.persistence.migration.old; import com.google.auto.service.AutoService; import org.apache.commons.lang3.tuple.Pair; import org.nuiton.topia.persistence.support.TopiaSqlQuery; -import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor; import org.nuiton.topia.service.migration.resources.MigrationVersionResource; +import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor; import org.nuiton.version.Versions; import java.sql.Connection; @@ -44,7 +44,7 @@ import java.util.List; * @since 3.1 */ @AutoService(MigrationVersionResource.class) -public class DataSourceMigrationForVersion_3_1 extends MigrationVersionResource { +public class DataSourceMigrationForVersion_3_1 extends LegacyMigrationVersionResource { public DataSourceMigrationForVersion_3_1() { super(Versions.valueOf("3.1")); ===================================== persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_3_10.java ===================================== @@ -10,12 +10,12 @@ package fr.ird.observe.persistence.migration.old; * it under the terms of the GNU 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 General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. @@ -23,8 +23,8 @@ package fr.ird.observe.persistence.migration.old; */ import com.google.auto.service.AutoService; -import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor; import org.nuiton.topia.service.migration.resources.MigrationVersionResource; +import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor; import org.nuiton.version.Versions; /** @@ -34,7 +34,7 @@ import org.nuiton.version.Versions; * @since 3.10 */ @AutoService(MigrationVersionResource.class) -public class DataSourceMigrationForVersion_3_10 extends MigrationVersionResource { +public class DataSourceMigrationForVersion_3_10 extends LegacyMigrationVersionResource { public DataSourceMigrationForVersion_3_10() { super(Versions.valueOf("3.10")); ===================================== persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_3_11.java ===================================== @@ -10,12 +10,12 @@ package fr.ird.observe.persistence.migration.old; * it under the terms of the GNU 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 General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. @@ -23,8 +23,8 @@ package fr.ird.observe.persistence.migration.old; */ import com.google.auto.service.AutoService; -import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor; import org.nuiton.topia.service.migration.resources.MigrationVersionResource; +import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor; import org.nuiton.version.Versions; /** @@ -34,7 +34,7 @@ import org.nuiton.version.Versions; * @since 3.11 */ @AutoService(MigrationVersionResource.class) -public class DataSourceMigrationForVersion_3_11 extends MigrationVersionResource { +public class DataSourceMigrationForVersion_3_11 extends LegacyMigrationVersionResource { public DataSourceMigrationForVersion_3_11() { super(Versions.valueOf("3.11")); ===================================== persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_3_12.java ===================================== @@ -10,12 +10,12 @@ package fr.ird.observe.persistence.migration.old; * it under the terms of the GNU 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 General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. @@ -23,8 +23,8 @@ package fr.ird.observe.persistence.migration.old; */ import com.google.auto.service.AutoService; -import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor; import org.nuiton.topia.service.migration.resources.MigrationVersionResource; +import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor; import org.nuiton.version.Versions; /** @@ -34,7 +34,7 @@ import org.nuiton.version.Versions; * @since 3.12 */ @AutoService(MigrationVersionResource.class) -public class DataSourceMigrationForVersion_3_12 extends MigrationVersionResource { +public class DataSourceMigrationForVersion_3_12 extends LegacyMigrationVersionResource { public DataSourceMigrationForVersion_3_12() { super(Versions.valueOf("3.12")); ===================================== persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_3_14.java ===================================== @@ -10,12 +10,12 @@ package fr.ird.observe.persistence.migration.old; * it under the terms of the GNU 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 General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. @@ -23,8 +23,8 @@ package fr.ird.observe.persistence.migration.old; */ import com.google.auto.service.AutoService; -import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor; import org.nuiton.topia.service.migration.resources.MigrationVersionResource; +import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor; import org.nuiton.version.Versions; /** @@ -34,7 +34,7 @@ import org.nuiton.version.Versions; * @since 3.14 */ @AutoService(MigrationVersionResource.class) -public class DataSourceMigrationForVersion_3_14 extends MigrationVersionResource { +public class DataSourceMigrationForVersion_3_14 extends LegacyMigrationVersionResource { public DataSourceMigrationForVersion_3_14() { super(Versions.valueOf("3.14")); ===================================== persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_3_15.java ===================================== @@ -10,12 +10,12 @@ package fr.ird.observe.persistence.migration.old; * it under the terms of the GNU 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 General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. @@ -23,8 +23,8 @@ package fr.ird.observe.persistence.migration.old; */ import com.google.auto.service.AutoService; -import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor; import org.nuiton.topia.service.migration.resources.MigrationVersionResource; +import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor; import org.nuiton.version.Versions; /** @@ -34,7 +34,7 @@ import org.nuiton.version.Versions; * @since 3.15 */ @AutoService(MigrationVersionResource.class) -public class DataSourceMigrationForVersion_3_15 extends MigrationVersionResource { +public class DataSourceMigrationForVersion_3_15 extends LegacyMigrationVersionResource { public DataSourceMigrationForVersion_3_15() { super(Versions.valueOf("3.15")); ===================================== persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_3_16.java ===================================== @@ -10,12 +10,12 @@ package fr.ird.observe.persistence.migration.old; * it under the terms of the GNU 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 General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. @@ -23,10 +23,10 @@ package fr.ird.observe.persistence.migration.old; */ import com.google.auto.service.AutoService; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; -import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor; +import org.apache.logging.log4j.Logger; import org.nuiton.topia.service.migration.resources.MigrationVersionResource; +import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor; import org.nuiton.version.Versions; import java.sql.PreparedStatement; @@ -43,7 +43,7 @@ import java.util.Set; */ @SuppressWarnings("SqlDialectInspection") @AutoService(MigrationVersionResource.class) -public class DataSourceMigrationForVersion_3_16 extends MigrationVersionResource { +public class DataSourceMigrationForVersion_3_16 extends LegacyMigrationVersionResource { /** Logger. */ private static final Logger log = LogManager.getLogger(DataSourceMigrationForVersion_3_16.class); ===================================== persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_3_5.java ===================================== @@ -10,12 +10,12 @@ package fr.ird.observe.persistence.migration.old; * it under the terms of the GNU 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 General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. @@ -23,8 +23,8 @@ package fr.ird.observe.persistence.migration.old; */ import com.google.auto.service.AutoService; -import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor; import org.nuiton.topia.service.migration.resources.MigrationVersionResource; +import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor; import org.nuiton.version.Versions; import java.util.Set; @@ -36,7 +36,7 @@ import java.util.Set; * @since 4.0 */ @AutoService(MigrationVersionResource.class) -public class DataSourceMigrationForVersion_3_5 extends MigrationVersionResource { +public class DataSourceMigrationForVersion_3_5 extends LegacyMigrationVersionResource { private static final String[] TABLES = new String[]{ "ParametrageTaillePoidsFaune", ===================================== persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_3_7.java ===================================== @@ -10,12 +10,12 @@ package fr.ird.observe.persistence.migration.old; * it under the terms of the GNU 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 General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. @@ -23,8 +23,8 @@ package fr.ird.observe.persistence.migration.old; */ import com.google.auto.service.AutoService; -import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor; import org.nuiton.topia.service.migration.resources.MigrationVersionResource; +import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor; import org.nuiton.version.Versions; /** @@ -34,7 +34,7 @@ import org.nuiton.version.Versions; * @since 3.7 */ @AutoService(MigrationVersionResource.class) -public class DataSourceMigrationForVersion_3_7 extends MigrationVersionResource { +public class DataSourceMigrationForVersion_3_7 extends LegacyMigrationVersionResource { public DataSourceMigrationForVersion_3_7() { super(Versions.valueOf("3.7")); ===================================== persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_3_8.java ===================================== @@ -10,12 +10,12 @@ package fr.ird.observe.persistence.migration.old; * it under the terms of the GNU 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 General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. @@ -23,8 +23,8 @@ package fr.ird.observe.persistence.migration.old; */ import com.google.auto.service.AutoService; -import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor; import org.nuiton.topia.service.migration.resources.MigrationVersionResource; +import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor; import org.nuiton.version.Versions; /** @@ -34,7 +34,7 @@ import org.nuiton.version.Versions; * @since 3.8 */ @AutoService(MigrationVersionResource.class) -public class DataSourceMigrationForVersion_3_8 extends MigrationVersionResource { +public class DataSourceMigrationForVersion_3_8 extends LegacyMigrationVersionResource { public DataSourceMigrationForVersion_3_8() { super(Versions.valueOf("3.8")); ===================================== persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_3_9.java ===================================== @@ -10,12 +10,12 @@ package fr.ird.observe.persistence.migration.old; * it under the terms of the GNU 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 General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. @@ -23,8 +23,8 @@ package fr.ird.observe.persistence.migration.old; */ import com.google.auto.service.AutoService; -import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor; import org.nuiton.topia.service.migration.resources.MigrationVersionResource; +import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor; import org.nuiton.version.Versions; /** @@ -34,7 +34,7 @@ import org.nuiton.version.Versions; * @since 3.9 */ @AutoService(MigrationVersionResource.class) -public class DataSourceMigrationForVersion_3_9 extends MigrationVersionResource { +public class DataSourceMigrationForVersion_3_9 extends LegacyMigrationVersionResource { public DataSourceMigrationForVersion_3_9() { super(Versions.valueOf("3.9")); ===================================== persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0.java ===================================== @@ -10,12 +10,12 @@ package fr.ird.observe.persistence.migration.old; * it under the terms of the GNU 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 General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. @@ -23,8 +23,8 @@ package fr.ird.observe.persistence.migration.old; */ import com.google.auto.service.AutoService; -import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor; import org.nuiton.topia.service.migration.resources.MigrationVersionResource; +import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor; import org.nuiton.version.Versions; /** @@ -34,7 +34,7 @@ import org.nuiton.version.Versions; * @since 4.0 */ @AutoService(MigrationVersionResource.class) -public class DataSourceMigrationForVersion_4_0 extends MigrationVersionResource { +public class DataSourceMigrationForVersion_4_0 extends LegacyMigrationVersionResource { public DataSourceMigrationForVersion_4_0() { super(Versions.valueOf("4.0")); ===================================== persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_1.java ===================================== @@ -10,12 +10,12 @@ package fr.ird.observe.persistence.migration.old; * it under the terms of the GNU 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 General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. @@ -28,8 +28,8 @@ import com.google.common.collect.Multimap; import fr.ird.observe.entities.seine.GearUseFeaturesMeasurementSeine; import fr.ird.observe.entities.seine.GearUseFeaturesSeine; import fr.ird.observe.persistence.ObserveTopiaIdFactory; -import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor; import org.nuiton.topia.service.migration.resources.MigrationVersionResource; +import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor; import org.nuiton.version.Versions; import java.sql.PreparedStatement; @@ -47,7 +47,7 @@ import java.util.Set; */ @SuppressWarnings("SqlDialectInspection") @AutoService(MigrationVersionResource.class) -public class DataSourceMigrationForVersion_4_0_1 extends MigrationVersionResource { +public class DataSourceMigrationForVersion_4_0_1 extends LegacyMigrationVersionResource { public DataSourceMigrationForVersion_4_0_1() { super(Versions.valueOf("4.0.1")); ===================================== persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_2.java ===================================== @@ -10,12 +10,12 @@ package fr.ird.observe.persistence.migration.old; * it under the terms of the GNU 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 General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. @@ -23,8 +23,8 @@ package fr.ird.observe.persistence.migration.old; */ import com.google.auto.service.AutoService; -import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor; import org.nuiton.topia.service.migration.resources.MigrationVersionResource; +import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor; import org.nuiton.version.Versions; /** @@ -34,7 +34,7 @@ import org.nuiton.version.Versions; * @since 4.0.1 */ @AutoService(MigrationVersionResource.class) -public class DataSourceMigrationForVersion_4_0_2 extends MigrationVersionResource { +public class DataSourceMigrationForVersion_4_0_2 extends LegacyMigrationVersionResource { public DataSourceMigrationForVersion_4_0_2() { super(Versions.valueOf("4.0.2")); ===================================== persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_4.java ===================================== @@ -10,12 +10,12 @@ package fr.ird.observe.persistence.migration.old; * it under the terms of the GNU 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 General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. @@ -23,8 +23,8 @@ package fr.ird.observe.persistence.migration.old; */ import com.google.auto.service.AutoService; -import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor; import org.nuiton.topia.service.migration.resources.MigrationVersionResource; +import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor; import org.nuiton.version.Versions; /** @@ -34,7 +34,7 @@ import org.nuiton.version.Versions; * @since 4.0.1 */ @AutoService(MigrationVersionResource.class) -public class DataSourceMigrationForVersion_4_0_4 extends MigrationVersionResource { +public class DataSourceMigrationForVersion_4_0_4 extends LegacyMigrationVersionResource { public DataSourceMigrationForVersion_4_0_4() { super(Versions.valueOf("4.0.4")); ===================================== persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC2.java ===================================== @@ -10,12 +10,12 @@ package fr.ird.observe.persistence.migration.old; * it under the terms of the GNU 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 General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. @@ -24,8 +24,8 @@ package fr.ird.observe.persistence.migration.old; import com.google.auto.service.AutoService; import org.nuiton.topia.persistence.support.TopiaSqlQuery; -import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor; import org.nuiton.topia.service.migration.resources.MigrationVersionResource; +import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor; import org.nuiton.version.Versions; import java.sql.Connection; @@ -42,7 +42,7 @@ import java.util.Set; */ @SuppressWarnings("SqlDialectInspection") @AutoService(MigrationVersionResource.class) -public class DataSourceMigrationForVersion_4_0_RC2 extends MigrationVersionResource { +public class DataSourceMigrationForVersion_4_0_RC2 extends LegacyMigrationVersionResource { public DataSourceMigrationForVersion_4_0_RC2() { super(Versions.valueOf("4.0-RC2")); ===================================== persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC3.java ===================================== @@ -10,12 +10,12 @@ package fr.ird.observe.persistence.migration.old; * it under the terms of the GNU 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 General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. @@ -23,10 +23,10 @@ package fr.ird.observe.persistence.migration.old; */ import com.google.auto.service.AutoService; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; -import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor; +import org.apache.logging.log4j.Logger; import org.nuiton.topia.service.migration.resources.MigrationVersionResource; +import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor; import org.nuiton.version.Versions; import java.sql.Connection; @@ -44,7 +44,7 @@ import java.util.Set; */ @SuppressWarnings("SqlDialectInspection") @AutoService(MigrationVersionResource.class) -public class DataSourceMigrationForVersion_4_0_RC3 extends MigrationVersionResource { +public class DataSourceMigrationForVersion_4_0_RC3 extends LegacyMigrationVersionResource { private static final Logger log = LogManager.getLogger(DataSourceMigrationForVersion_4_0_RC3.class); ===================================== persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC4.java ===================================== @@ -10,12 +10,12 @@ package fr.ird.observe.persistence.migration.old; * it under the terms of the GNU 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 General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. @@ -23,8 +23,8 @@ package fr.ird.observe.persistence.migration.old; */ import com.google.auto.service.AutoService; -import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor; import org.nuiton.topia.service.migration.resources.MigrationVersionResource; +import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor; import org.nuiton.version.Versions; /** @@ -34,7 +34,7 @@ import org.nuiton.version.Versions; * @since 4.0-RC4 */ @AutoService(MigrationVersionResource.class) -public class DataSourceMigrationForVersion_4_0_RC4 extends MigrationVersionResource { +public class DataSourceMigrationForVersion_4_0_RC4 extends LegacyMigrationVersionResource { public DataSourceMigrationForVersion_4_0_RC4() { super(Versions.valueOf("4.0-RC4")); ===================================== persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC6.java ===================================== @@ -10,12 +10,12 @@ package fr.ird.observe.persistence.migration.old; * it under the terms of the GNU 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 General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. @@ -23,8 +23,8 @@ package fr.ird.observe.persistence.migration.old; */ import com.google.auto.service.AutoService; -import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor; import org.nuiton.topia.service.migration.resources.MigrationVersionResource; +import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor; import org.nuiton.version.Versions; /** @@ -34,7 +34,7 @@ import org.nuiton.version.Versions; * @since 4.0-RC6 */ @AutoService(MigrationVersionResource.class) -public class DataSourceMigrationForVersion_4_0_RC6 extends MigrationVersionResource { +public class DataSourceMigrationForVersion_4_0_RC6 extends LegacyMigrationVersionResource { public DataSourceMigrationForVersion_4_0_RC6() { super(Versions.valueOf("4.0-RC6")); ===================================== persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC7.java ===================================== @@ -23,8 +23,8 @@ package fr.ird.observe.persistence.migration.old; */ import com.google.auto.service.AutoService; -import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor; import org.nuiton.topia.service.migration.resources.MigrationVersionResource; +import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor; import org.nuiton.version.Versions; /** @@ -34,7 +34,7 @@ import org.nuiton.version.Versions; * @since 4.0-RC7 */ @AutoService(MigrationVersionResource.class) -public class DataSourceMigrationForVersion_4_0_RC7 extends MigrationVersionResource { +public class DataSourceMigrationForVersion_4_0_RC7 extends LegacyMigrationVersionResource { public DataSourceMigrationForVersion_4_0_RC7() { super(Versions.valueOf("4.0-RC7")); ===================================== persistence/src/main/java/fr/ird/observe/persistence/migration/old/LegacyMigrationVersionResource.java ===================================== @@ -0,0 +1,47 @@ +package fr.ird.observe.persistence.migration.old; + +/* + * #%L + * ObServe :: Persistence + * %% + * Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import org.nuiton.topia.service.migration.resources.MigrationVersionResource; +import org.nuiton.topia.service.migration.resources.MigrationVersionResourceScriptLayout; +import org.nuiton.version.Version; + +/** + * Created on 01/02/19. + * + * @author Tony Chemit - dev(a)tchemit.fr + * @since 7 + */ +public abstract class LegacyMigrationVersionResource extends MigrationVersionResource { + public LegacyMigrationVersionResource(Version version) { + super(version, new LegacyMigrationVersionResourceScriptLayout()); + } + + static class LegacyMigrationVersionResourceScriptLayout implements MigrationVersionResourceScriptLayout { + @Override + public String getScriptPath(Version version, String rank, String prefix, String classifier) { + String migrationScript = String.format("%s-%s.sql", prefix, classifier); + return String.format("/db/migration/old/%s/V%s_%s_%s", version, version.getValidName(), rank, migrationScript); + } + } +} ===================================== pom.xml ===================================== @@ -165,7 +165,7 @@ <lib.version.h2>1.4.196</lib.version.h2>   - <lib.version.java4all.topia>1.1.10</lib.version.java4all.topia> + <lib.version.java4all.topia>1.1.11</lib.version.java4all.topia>   ===================================== validation/src/main/i18n/getters/validation-messages.getter ===================================== @@ -47,6 +47,7 @@ observe.validation.set.endSetTimeStamp.after.endPursingTimeStamp observe.validation.set.size.supportVesselName observe.validation.set.startTime.after.time observe.validation.setLongline.baitsComposition.uniqueKey +observe.validation.setLongline.branchlinesComposition.uniqueKey observe.validation.setLongline.duplicated.homeId observe.validation.setLongline.duplicated.number observe.validation.setLongline.floatlinesComposition.uniqueKey View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/7ce42d932f7e815e33ff991863… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/7ce42d932f7e815e33ff991863… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Fix trip map style
by Tony CHEMIT 28 Jan '19

28 Jan '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 6c4a24ad by tchemit at 2019-01-28T11:54:49Z Fix trip map style - - - - - af6a6279 by tchemit at 2019-01-28T13:20:09Z [PS] bug calcul des données - Closes #1201 - - - - - 29 changed files: - client-core/src/main/map/style.xml - client-core/src/main/i18n/templates/about_en_GB.ftl → observe-i18n/src/main/i18n/templates/about_en_GB.ftl - client-core/src/main/i18n/templates/about_es_ES.ftl → observe-i18n/src/main/i18n/templates/about_es_ES.ftl - client-core/src/main/i18n/templates/about_fr_FR.ftl → observe-i18n/src/main/i18n/templates/about_fr_FR.ftl - client-core/src/main/i18n/templates/connexionTestResult_en_GB.ftl → observe-i18n/src/main/i18n/templates/connexionTestResult_en_GB.ftl - client-core/src/main/i18n/templates/connexionTestResult_es_ES.ftl → observe-i18n/src/main/i18n/templates/connexionTestResult_es_ES.ftl - client-core/src/main/i18n/templates/connexionTestResult_fr_FR.ftl → observe-i18n/src/main/i18n/templates/connexionTestResult_fr_FR.ftl - client-core/src/main/i18n/templates/dataSourceConnectionReport_en_GB.ftl → observe-i18n/src/main/i18n/templates/dataSourceConnectionReport_en_GB.ftl - client-core/src/main/i18n/templates/dataSourceConnectionReport_es_ES.ftl → observe-i18n/src/main/i18n/templates/dataSourceConnectionReport_es_ES.ftl - client-core/src/main/i18n/templates/dataSourceConnectionReport_fr_FR.ftl → observe-i18n/src/main/i18n/templates/dataSourceConnectionReport_fr_FR.ftl - client-core/src/main/i18n/templates/dataSourceInformation_en_GB.ftl → observe-i18n/src/main/i18n/templates/dataSourceInformation_en_GB.ftl - client-core/src/main/i18n/templates/dataSourceInformation_es_ES.ftl → observe-i18n/src/main/i18n/templates/dataSourceInformation_es_ES.ftl - client-core/src/main/i18n/templates/dataSourceInformation_fr_FR.ftl → observe-i18n/src/main/i18n/templates/dataSourceInformation_fr_FR.ftl - client-core/src/main/i18n/templates/dataSourcePolicy_en_GB.ftl → observe-i18n/src/main/i18n/templates/dataSourcePolicy_en_GB.ftl - client-core/src/main/i18n/templates/dataSourcePolicy_es_ES.ftl → observe-i18n/src/main/i18n/templates/dataSourcePolicy_es_ES.ftl - client-core/src/main/i18n/templates/dataSourcePolicy_fr_FR.ftl → observe-i18n/src/main/i18n/templates/dataSourcePolicy_fr_FR.ftl - client-core/src/main/i18n/templates/dataSourceSelectModeResume_en_GB.ftl → observe-i18n/src/main/i18n/templates/dataSourceSelectModeResume_en_GB.ftl - client-core/src/main/i18n/templates/dataSourceSelectModeResume_es_ES.ftl → observe-i18n/src/main/i18n/templates/dataSourceSelectModeResume_es_ES.ftl - client-core/src/main/i18n/templates/dataSourceSelectModeResume_fr_FR.ftl → observe-i18n/src/main/i18n/templates/dataSourceSelectModeResume_fr_FR.ftl - client-core/src/main/i18n/templates/initStorage_en_GB.ftl → observe-i18n/src/main/i18n/templates/initStorage_en_GB.ftl - client-core/src/main/i18n/templates/initStorage_es_ES.ftl → observe-i18n/src/main/i18n/templates/initStorage_es_ES.ftl - client-core/src/main/i18n/templates/initStorage_fr_FR.ftl → observe-i18n/src/main/i18n/templates/initStorage_fr_FR.ftl - client-core/src/main/i18n/templates/storageModelDataSourceConfiguration_en_GB.ftl → observe-i18n/src/main/i18n/templates/storageModelDataSourceConfiguration_en_GB.ftl - client-core/src/main/i18n/templates/storageModelDataSourceConfiguration_es_ES.ftl → observe-i18n/src/main/i18n/templates/storageModelDataSourceConfiguration_es_ES.ftl - client-core/src/main/i18n/templates/storageModelDataSourceConfiguration_fr_FR.ftl → observe-i18n/src/main/i18n/templates/storageModelDataSourceConfiguration_fr_FR.ftl - client-core/src/main/i18n/templates/validationReport_en_GB.ftl → observe-i18n/src/main/i18n/templates/validationReport_en_GB.ftl - client-core/src/main/i18n/templates/validationReport_es_ES.ftl → observe-i18n/src/main/i18n/templates/validationReport_es_ES.ftl - client-core/src/main/i18n/templates/validationReport_fr_FR.ftl → observe-i18n/src/main/i18n/templates/validationReport_fr_FR.ftl - validation/src/main/i18n/getters/validation-messages.getter Changes: ===================================== client-core/src/main/map/style.xml ===================================== @@ -88,7 +88,7 @@ </NamedLayer> <NamedLayer> - <Name>Trip longline obs zone</Name> + <Name>Trip longline observation zone</Name> <UserStyle> <IsDefault>true</IsDefault> <Title>SLD Cook Book: Simple Line</Title> @@ -168,7 +168,7 @@ </NamedLayer> <NamedLayer> - <Name>Trip longline obs line</Name> + <Name>Trip longline observation line</Name> <UserStyle> <IsDefault>true</IsDefault> <Title>SLD Cook Book: Simple Line</Title> ===================================== client-core/src/main/i18n/templates/about_en_GB.ftl → observe-i18n/src/main/i18n/templates/about_en_GB.ftl ===================================== @@ -1,6 +1,6 @@ <#-- #%L - ObServe :: Client core + ObServe :: I18n %% Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io %% ===================================== client-core/src/main/i18n/templates/about_es_ES.ftl → observe-i18n/src/main/i18n/templates/about_es_ES.ftl ===================================== @@ -1,6 +1,6 @@ <#-- #%L - ObServe :: Client core + ObServe :: I18n %% Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io %% ===================================== client-core/src/main/i18n/templates/about_fr_FR.ftl → observe-i18n/src/main/i18n/templates/about_fr_FR.ftl ===================================== @@ -1,6 +1,6 @@ <#-- #%L - ObServe :: Client core + ObServe :: I18n %% Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io %% ===================================== client-core/src/main/i18n/templates/connexionTestResult_en_GB.ftl → observe-i18n/src/main/i18n/templates/connexionTestResult_en_GB.ftl ===================================== @@ -1,6 +1,6 @@ <#-- #%L - ObServe :: Client core + ObServe :: I18n %% Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io %% ===================================== client-core/src/main/i18n/templates/connexionTestResult_es_ES.ftl → observe-i18n/src/main/i18n/templates/connexionTestResult_es_ES.ftl ===================================== @@ -1,6 +1,6 @@ <#-- #%L - ObServe :: Client core + ObServe :: I18n %% Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io %% ===================================== client-core/src/main/i18n/templates/connexionTestResult_fr_FR.ftl → observe-i18n/src/main/i18n/templates/connexionTestResult_fr_FR.ftl ===================================== @@ -1,6 +1,6 @@ <#-- #%L - ObServe :: Client core + ObServe :: I18n %% Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io %% ===================================== client-core/src/main/i18n/templates/dataSourceConnectionReport_en_GB.ftl → observe-i18n/src/main/i18n/templates/dataSourceConnectionReport_en_GB.ftl ===================================== @@ -1,6 +1,6 @@ <#-- #%L - ObServe :: Client core + ObServe :: I18n %% Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io %% ===================================== client-core/src/main/i18n/templates/dataSourceConnectionReport_es_ES.ftl → observe-i18n/src/main/i18n/templates/dataSourceConnectionReport_es_ES.ftl ===================================== @@ -1,6 +1,6 @@ <#-- #%L - ObServe :: Client core + ObServe :: I18n %% Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io %% ===================================== client-core/src/main/i18n/templates/dataSourceConnectionReport_fr_FR.ftl → observe-i18n/src/main/i18n/templates/dataSourceConnectionReport_fr_FR.ftl ===================================== @@ -1,6 +1,6 @@ <#-- #%L - ObServe :: Client core + ObServe :: I18n %% Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io %% ===================================== client-core/src/main/i18n/templates/dataSourceInformation_en_GB.ftl → observe-i18n/src/main/i18n/templates/dataSourceInformation_en_GB.ftl ===================================== @@ -1,6 +1,6 @@ <#-- #%L - ObServe :: Client core + ObServe :: I18n %% Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io %% ===================================== client-core/src/main/i18n/templates/dataSourceInformation_es_ES.ftl → observe-i18n/src/main/i18n/templates/dataSourceInformation_es_ES.ftl ===================================== @@ -1,6 +1,6 @@ <#-- #%L - ObServe :: Client core + ObServe :: I18n %% Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io %% ===================================== client-core/src/main/i18n/templates/dataSourceInformation_fr_FR.ftl → observe-i18n/src/main/i18n/templates/dataSourceInformation_fr_FR.ftl ===================================== @@ -1,6 +1,6 @@ <#-- #%L - ObServe :: Client core + ObServe :: I18n %% Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io %% ===================================== client-core/src/main/i18n/templates/dataSourcePolicy_en_GB.ftl → observe-i18n/src/main/i18n/templates/dataSourcePolicy_en_GB.ftl ===================================== @@ -1,6 +1,6 @@ <#-- #%L - ObServe :: Client core + ObServe :: I18n %% Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io %% ===================================== client-core/src/main/i18n/templates/dataSourcePolicy_es_ES.ftl → observe-i18n/src/main/i18n/templates/dataSourcePolicy_es_ES.ftl ===================================== @@ -1,6 +1,6 @@ <#-- #%L - ObServe :: Client core + ObServe :: I18n %% Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io %% ===================================== client-core/src/main/i18n/templates/dataSourcePolicy_fr_FR.ftl → observe-i18n/src/main/i18n/templates/dataSourcePolicy_fr_FR.ftl ===================================== @@ -1,6 +1,6 @@ <#-- #%L - ObServe :: Client core + ObServe :: I18n %% Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io %% ===================================== client-core/src/main/i18n/templates/dataSourceSelectModeResume_en_GB.ftl → observe-i18n/src/main/i18n/templates/dataSourceSelectModeResume_en_GB.ftl ===================================== @@ -1,6 +1,6 @@ <#-- #%L - ObServe :: Client core + ObServe :: I18n %% Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io %% ===================================== client-core/src/main/i18n/templates/dataSourceSelectModeResume_es_ES.ftl → observe-i18n/src/main/i18n/templates/dataSourceSelectModeResume_es_ES.ftl ===================================== @@ -1,6 +1,6 @@ <#-- #%L - ObServe :: Client core + ObServe :: I18n %% Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io %% ===================================== client-core/src/main/i18n/templates/dataSourceSelectModeResume_fr_FR.ftl → observe-i18n/src/main/i18n/templates/dataSourceSelectModeResume_fr_FR.ftl ===================================== @@ -1,6 +1,6 @@ <#-- #%L - ObServe :: Client core + ObServe :: I18n %% Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io %% ===================================== client-core/src/main/i18n/templates/initStorage_en_GB.ftl → observe-i18n/src/main/i18n/templates/initStorage_en_GB.ftl ===================================== @@ -1,6 +1,6 @@ <#-- #%L - ObServe :: Client core + ObServe :: I18n %% Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io %% ===================================== client-core/src/main/i18n/templates/initStorage_es_ES.ftl → observe-i18n/src/main/i18n/templates/initStorage_es_ES.ftl ===================================== @@ -1,6 +1,6 @@ <#-- #%L - ObServe :: Client core + ObServe :: I18n %% Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io %% ===================================== client-core/src/main/i18n/templates/initStorage_fr_FR.ftl → observe-i18n/src/main/i18n/templates/initStorage_fr_FR.ftl ===================================== @@ -1,6 +1,6 @@ <#-- #%L - ObServe :: Client core + ObServe :: I18n %% Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io %% ===================================== client-core/src/main/i18n/templates/storageModelDataSourceConfiguration_en_GB.ftl → observe-i18n/src/main/i18n/templates/storageModelDataSourceConfiguration_en_GB.ftl ===================================== @@ -1,6 +1,6 @@ <#-- #%L - ObServe :: Client core + ObServe :: I18n %% Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io %% ===================================== client-core/src/main/i18n/templates/storageModelDataSourceConfiguration_es_ES.ftl → observe-i18n/src/main/i18n/templates/storageModelDataSourceConfiguration_es_ES.ftl ===================================== @@ -1,6 +1,6 @@ <#-- #%L - ObServe :: Client core + ObServe :: I18n %% Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io %% ===================================== client-core/src/main/i18n/templates/storageModelDataSourceConfiguration_fr_FR.ftl → observe-i18n/src/main/i18n/templates/storageModelDataSourceConfiguration_fr_FR.ftl ===================================== @@ -1,6 +1,6 @@ <#-- #%L - ObServe :: Client core + ObServe :: I18n %% Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io %% ===================================== client-core/src/main/i18n/templates/validationReport_en_GB.ftl → observe-i18n/src/main/i18n/templates/validationReport_en_GB.ftl ===================================== @@ -1,6 +1,6 @@ <#-- #%L - ObServe :: Client core + ObServe :: I18n %% Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io %% ===================================== client-core/src/main/i18n/templates/validationReport_es_ES.ftl → observe-i18n/src/main/i18n/templates/validationReport_es_ES.ftl ===================================== @@ -1,6 +1,6 @@ <#-- #%L - ObServe :: Client core + ObServe :: I18n %% Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io %% ===================================== client-core/src/main/i18n/templates/validationReport_fr_FR.ftl → observe-i18n/src/main/i18n/templates/validationReport_fr_FR.ftl ===================================== @@ -1,6 +1,6 @@ <#-- #%L - ObServe :: Client core + ObServe :: I18n %% Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io %% ===================================== validation/src/main/i18n/getters/validation-messages.getter ===================================== @@ -68,7 +68,6 @@ observe.validation.set.endSetTimeStamp.after.endPursingTimeStamp observe.validation.set.size.supportVesselName observe.validation.set.startTime.after.time observe.validation.setLongline.baitsComposition.uniqueKey -observe.validation.setLongline.branchlinesComposition.uniqueKey observe.validation.setLongline.duplicated.homeId observe.validation.setLongline.duplicated.number observe.validation.setLongline.floatlinesComposition.uniqueKey View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/5d31ae03a6068571d40add8a52… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/5d31ae03a6068571d40add8a52… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] [PS] bug calcul des données - Closes #1201
by Tony CHEMIT 28 Jan '19

28 Jan '19

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 7ce42d93 by tchemit at 2019-01-28T13:18:12Z [PS] bug calcul des données - Closes #1201 - - - - - 28 changed files: - client-core/src/main/i18n/templates/about_en_GB.ftl → observe-i18n/src/main/i18n/templates/about_en_GB.ftl - client-core/src/main/i18n/templates/about_es_ES.ftl → observe-i18n/src/main/i18n/templates/about_es_ES.ftl - client-core/src/main/i18n/templates/about_fr_FR.ftl → observe-i18n/src/main/i18n/templates/about_fr_FR.ftl - client-core/src/main/i18n/templates/connexionTestResult_en_GB.ftl → observe-i18n/src/main/i18n/templates/connexionTestResult_en_GB.ftl - client-core/src/main/i18n/templates/connexionTestResult_es_ES.ftl → observe-i18n/src/main/i18n/templates/connexionTestResult_es_ES.ftl - client-core/src/main/i18n/templates/connexionTestResult_fr_FR.ftl → observe-i18n/src/main/i18n/templates/connexionTestResult_fr_FR.ftl - client-core/src/main/i18n/templates/dataSourceConnectionReport_en_GB.ftl → observe-i18n/src/main/i18n/templates/dataSourceConnectionReport_en_GB.ftl - client-core/src/main/i18n/templates/dataSourceConnectionReport_es_ES.ftl → observe-i18n/src/main/i18n/templates/dataSourceConnectionReport_es_ES.ftl - client-core/src/main/i18n/templates/dataSourceConnectionReport_fr_FR.ftl → observe-i18n/src/main/i18n/templates/dataSourceConnectionReport_fr_FR.ftl - client-core/src/main/i18n/templates/dataSourceInformation_en_GB.ftl → observe-i18n/src/main/i18n/templates/dataSourceInformation_en_GB.ftl - client-core/src/main/i18n/templates/dataSourceInformation_es_ES.ftl → observe-i18n/src/main/i18n/templates/dataSourceInformation_es_ES.ftl - client-core/src/main/i18n/templates/dataSourceInformation_fr_FR.ftl → observe-i18n/src/main/i18n/templates/dataSourceInformation_fr_FR.ftl - client-core/src/main/i18n/templates/dataSourcePolicy_en_GB.ftl → observe-i18n/src/main/i18n/templates/dataSourcePolicy_en_GB.ftl - client-core/src/main/i18n/templates/dataSourcePolicy_es_ES.ftl → observe-i18n/src/main/i18n/templates/dataSourcePolicy_es_ES.ftl - client-core/src/main/i18n/templates/dataSourcePolicy_fr_FR.ftl → observe-i18n/src/main/i18n/templates/dataSourcePolicy_fr_FR.ftl - client-core/src/main/i18n/templates/dataSourceSelectModeResume_en_GB.ftl → observe-i18n/src/main/i18n/templates/dataSourceSelectModeResume_en_GB.ftl - client-core/src/main/i18n/templates/dataSourceSelectModeResume_es_ES.ftl → observe-i18n/src/main/i18n/templates/dataSourceSelectModeResume_es_ES.ftl - client-core/src/main/i18n/templates/dataSourceSelectModeResume_fr_FR.ftl → observe-i18n/src/main/i18n/templates/dataSourceSelectModeResume_fr_FR.ftl - client-core/src/main/i18n/templates/initStorage_en_GB.ftl → observe-i18n/src/main/i18n/templates/initStorage_en_GB.ftl - client-core/src/main/i18n/templates/initStorage_es_ES.ftl → observe-i18n/src/main/i18n/templates/initStorage_es_ES.ftl - client-core/src/main/i18n/templates/initStorage_fr_FR.ftl → observe-i18n/src/main/i18n/templates/initStorage_fr_FR.ftl - client-core/src/main/i18n/templates/storageModelDataSourceConfiguration_en_GB.ftl → observe-i18n/src/main/i18n/templates/storageModelDataSourceConfiguration_en_GB.ftl - client-core/src/main/i18n/templates/storageModelDataSourceConfiguration_es_ES.ftl → observe-i18n/src/main/i18n/templates/storageModelDataSourceConfiguration_es_ES.ftl - client-core/src/main/i18n/templates/storageModelDataSourceConfiguration_fr_FR.ftl → observe-i18n/src/main/i18n/templates/storageModelDataSourceConfiguration_fr_FR.ftl - client-core/src/main/i18n/templates/validationReport_en_GB.ftl → observe-i18n/src/main/i18n/templates/validationReport_en_GB.ftl - client-core/src/main/i18n/templates/validationReport_es_ES.ftl → observe-i18n/src/main/i18n/templates/validationReport_es_ES.ftl - client-core/src/main/i18n/templates/validationReport_fr_FR.ftl → observe-i18n/src/main/i18n/templates/validationReport_fr_FR.ftl - validation/src/main/i18n/getters/validation-messages.getter Changes: ===================================== client-core/src/main/i18n/templates/about_en_GB.ftl → observe-i18n/src/main/i18n/templates/about_en_GB.ftl ===================================== @@ -1,6 +1,6 @@ <#-- #%L - ObServe :: Client core + ObServe :: I18n %% Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io %% ===================================== client-core/src/main/i18n/templates/about_es_ES.ftl → observe-i18n/src/main/i18n/templates/about_es_ES.ftl ===================================== @@ -1,6 +1,6 @@ <#-- #%L - ObServe :: Client core + ObServe :: I18n %% Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io %% ===================================== client-core/src/main/i18n/templates/about_fr_FR.ftl → observe-i18n/src/main/i18n/templates/about_fr_FR.ftl ===================================== @@ -1,6 +1,6 @@ <#-- #%L - ObServe :: Client core + ObServe :: I18n %% Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io %% ===================================== client-core/src/main/i18n/templates/connexionTestResult_en_GB.ftl → observe-i18n/src/main/i18n/templates/connexionTestResult_en_GB.ftl ===================================== @@ -1,6 +1,6 @@ <#-- #%L - ObServe :: Client core + ObServe :: I18n %% Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io %% ===================================== client-core/src/main/i18n/templates/connexionTestResult_es_ES.ftl → observe-i18n/src/main/i18n/templates/connexionTestResult_es_ES.ftl ===================================== @@ -1,6 +1,6 @@ <#-- #%L - ObServe :: Client core + ObServe :: I18n %% Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io %% ===================================== client-core/src/main/i18n/templates/connexionTestResult_fr_FR.ftl → observe-i18n/src/main/i18n/templates/connexionTestResult_fr_FR.ftl ===================================== @@ -1,6 +1,6 @@ <#-- #%L - ObServe :: Client core + ObServe :: I18n %% Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io %% ===================================== client-core/src/main/i18n/templates/dataSourceConnectionReport_en_GB.ftl → observe-i18n/src/main/i18n/templates/dataSourceConnectionReport_en_GB.ftl ===================================== @@ -1,6 +1,6 @@ <#-- #%L - ObServe :: Client core + ObServe :: I18n %% Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io %% ===================================== client-core/src/main/i18n/templates/dataSourceConnectionReport_es_ES.ftl → observe-i18n/src/main/i18n/templates/dataSourceConnectionReport_es_ES.ftl ===================================== @@ -1,6 +1,6 @@ <#-- #%L - ObServe :: Client core + ObServe :: I18n %% Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io %% ===================================== client-core/src/main/i18n/templates/dataSourceConnectionReport_fr_FR.ftl → observe-i18n/src/main/i18n/templates/dataSourceConnectionReport_fr_FR.ftl ===================================== @@ -1,6 +1,6 @@ <#-- #%L - ObServe :: Client core + ObServe :: I18n %% Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io %% ===================================== client-core/src/main/i18n/templates/dataSourceInformation_en_GB.ftl → observe-i18n/src/main/i18n/templates/dataSourceInformation_en_GB.ftl ===================================== @@ -1,6 +1,6 @@ <#-- #%L - ObServe :: Client core + ObServe :: I18n %% Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io %% ===================================== client-core/src/main/i18n/templates/dataSourceInformation_es_ES.ftl → observe-i18n/src/main/i18n/templates/dataSourceInformation_es_ES.ftl ===================================== @@ -1,6 +1,6 @@ <#-- #%L - ObServe :: Client core + ObServe :: I18n %% Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io %% ===================================== client-core/src/main/i18n/templates/dataSourceInformation_fr_FR.ftl → observe-i18n/src/main/i18n/templates/dataSourceInformation_fr_FR.ftl ===================================== @@ -1,6 +1,6 @@ <#-- #%L - ObServe :: Client core + ObServe :: I18n %% Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io %% ===================================== client-core/src/main/i18n/templates/dataSourcePolicy_en_GB.ftl → observe-i18n/src/main/i18n/templates/dataSourcePolicy_en_GB.ftl ===================================== @@ -1,6 +1,6 @@ <#-- #%L - ObServe :: Client core + ObServe :: I18n %% Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io %% ===================================== client-core/src/main/i18n/templates/dataSourcePolicy_es_ES.ftl → observe-i18n/src/main/i18n/templates/dataSourcePolicy_es_ES.ftl ===================================== @@ -1,6 +1,6 @@ <#-- #%L - ObServe :: Client core + ObServe :: I18n %% Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io %% ===================================== client-core/src/main/i18n/templates/dataSourcePolicy_fr_FR.ftl → observe-i18n/src/main/i18n/templates/dataSourcePolicy_fr_FR.ftl ===================================== @@ -1,6 +1,6 @@ <#-- #%L - ObServe :: Client core + ObServe :: I18n %% Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io %% ===================================== client-core/src/main/i18n/templates/dataSourceSelectModeResume_en_GB.ftl → observe-i18n/src/main/i18n/templates/dataSourceSelectModeResume_en_GB.ftl ===================================== @@ -1,6 +1,6 @@ <#-- #%L - ObServe :: Client core + ObServe :: I18n %% Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io %% ===================================== client-core/src/main/i18n/templates/dataSourceSelectModeResume_es_ES.ftl → observe-i18n/src/main/i18n/templates/dataSourceSelectModeResume_es_ES.ftl ===================================== @@ -1,6 +1,6 @@ <#-- #%L - ObServe :: Client core + ObServe :: I18n %% Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io %% ===================================== client-core/src/main/i18n/templates/dataSourceSelectModeResume_fr_FR.ftl → observe-i18n/src/main/i18n/templates/dataSourceSelectModeResume_fr_FR.ftl ===================================== @@ -1,6 +1,6 @@ <#-- #%L - ObServe :: Client core + ObServe :: I18n %% Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io %% ===================================== client-core/src/main/i18n/templates/initStorage_en_GB.ftl → observe-i18n/src/main/i18n/templates/initStorage_en_GB.ftl ===================================== @@ -1,6 +1,6 @@ <#-- #%L - ObServe :: Client core + ObServe :: I18n %% Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io %% ===================================== client-core/src/main/i18n/templates/initStorage_es_ES.ftl → observe-i18n/src/main/i18n/templates/initStorage_es_ES.ftl ===================================== @@ -1,6 +1,6 @@ <#-- #%L - ObServe :: Client core + ObServe :: I18n %% Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io %% ===================================== client-core/src/main/i18n/templates/initStorage_fr_FR.ftl → observe-i18n/src/main/i18n/templates/initStorage_fr_FR.ftl ===================================== @@ -1,6 +1,6 @@ <#-- #%L - ObServe :: Client core + ObServe :: I18n %% Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io %% ===================================== client-core/src/main/i18n/templates/storageModelDataSourceConfiguration_en_GB.ftl → observe-i18n/src/main/i18n/templates/storageModelDataSourceConfiguration_en_GB.ftl ===================================== @@ -1,6 +1,6 @@ <#-- #%L - ObServe :: Client core + ObServe :: I18n %% Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io %% ===================================== client-core/src/main/i18n/templates/storageModelDataSourceConfiguration_es_ES.ftl → observe-i18n/src/main/i18n/templates/storageModelDataSourceConfiguration_es_ES.ftl ===================================== @@ -1,6 +1,6 @@ <#-- #%L - ObServe :: Client core + ObServe :: I18n %% Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io %% ===================================== client-core/src/main/i18n/templates/storageModelDataSourceConfiguration_fr_FR.ftl → observe-i18n/src/main/i18n/templates/storageModelDataSourceConfiguration_fr_FR.ftl ===================================== @@ -1,6 +1,6 @@ <#-- #%L - ObServe :: Client core + ObServe :: I18n %% Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io %% ===================================== client-core/src/main/i18n/templates/validationReport_en_GB.ftl → observe-i18n/src/main/i18n/templates/validationReport_en_GB.ftl ===================================== @@ -1,6 +1,6 @@ <#-- #%L - ObServe :: Client core + ObServe :: I18n %% Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io %% ===================================== client-core/src/main/i18n/templates/validationReport_es_ES.ftl → observe-i18n/src/main/i18n/templates/validationReport_es_ES.ftl ===================================== @@ -1,6 +1,6 @@ <#-- #%L - ObServe :: Client core + ObServe :: I18n %% Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io %% ===================================== client-core/src/main/i18n/templates/validationReport_fr_FR.ftl → observe-i18n/src/main/i18n/templates/validationReport_fr_FR.ftl ===================================== @@ -1,6 +1,6 @@ <#-- #%L - ObServe :: Client core + ObServe :: I18n %% Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io %% ===================================== validation/src/main/i18n/getters/validation-messages.getter ===================================== @@ -47,7 +47,6 @@ observe.validation.set.endSetTimeStamp.after.endPursingTimeStamp observe.validation.set.size.supportVesselName observe.validation.set.startTime.after.time observe.validation.setLongline.baitsComposition.uniqueKey -observe.validation.setLongline.branchlinesComposition.uniqueKey observe.validation.setLongline.duplicated.homeId observe.validation.setLongline.duplicated.number observe.validation.setLongline.floatlinesComposition.uniqueKey View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/7ce42d932f7e815e33ff991863a… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/7ce42d932f7e815e33ff991863a… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 4 commits: [V8][DATA MODEL] Ajout de champs (fix sql request)- Closes #1185
by Tony CHEMIT 27 Jan '19

27 Jan '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 2c49f8b1 by tchemit at 2019-01-27T10:12:05Z [V8][DATA MODEL] Ajout de champs (fix sql request)- Closes #1185 - - - - - 1202bd6f by tchemit at 2019-01-27T10:15:51Z Use nouvelle api de Topia - - - - - 1f255939 by tchemit at 2019-01-27T10:16:26Z Utilisation de la dernière version de jaxx pour passer sur java > 9 - - - - - 5d31ae03 by tchemit at 2019-01-27T10:17:57Z Use last topia and jaxx lib - - - - - 30 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/observation/FloatingObjectTransmittingBuoyOperationUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/observation/FloatingObjectTransmittingBuoyOperationUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/observation/FloatingObjectTransmittingBuoyOperationUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/CountryUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/DataQualityUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/FpaZoneUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/GearCaracteristicTypeUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/GearCaracteristicUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/GearUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/HarbourUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/LengthLengthParameterUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/LengthMeasureMethodUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/LengthWeightParameterUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/OceanUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/OrganismUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/PersonUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/ProgramUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/SexUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/ShipOwnerUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/SizeMeasureTypeUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/SpeciesGroupReleaseModeUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/SpeciesGroupUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/SpeciesListUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/SpeciesUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/VesselSizeCategoryUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/VesselTypeUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/VesselUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/WeightMeasureMethodUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/WeightMeasureTypeUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/WindUI.jaxx The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/dfacf85db2d628ddc809f6c5f9… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/dfacf85db2d628ddc809f6c5f9… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 7 commits: Déplacement de groupes de données - See #918
by Tony CHEMIT 27 Jan '19

27 Jan '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: f343f884 by tchemit at 2019-01-24T11:45:57Z Déplacement de groupes de données - See #918 - - - - - f43e8050 by tchemit at 2019-01-24T12:08:17Z move some code from api to data - - - - - 5bd47ad2 by tchemit at 2019-01-24T13:36:12Z fix id - - - - - 9b8b4d3b by tchemit at 2019-01-24T13:55:33Z close edit before delete - - - - - c11f0a03 by tchemit at 2019-01-26T22:08:04Z on open remove all previous messages - - - - - a2f34d9d by tchemit at 2019-01-26T22:59:21Z improve and fix some api on ui (to make NonStandalone Table ui works at last)... - - - - - dfacf85d by tchemit at 2019-01-27T06:48:26Z Improve service API (any parent id is now removed from API (it can be found via parent association API) - - - - - 30 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/ObserveCommon.jcss - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/open/DeleteOpenDataUIActionSupport.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/open/OpenOpenDataUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/delete/DeleteActivityLonglineLogbookUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/delete/DeleteActivityLonglineObsUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/delete/DeleteSampleLonglineLogbookUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/delete/DeleteSetLonglineLogbookUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/delete/DeleteSetLonglineObsUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/delete/DeleteTripLonglineLandingUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/move/MoveMultipleTripLonglineSampleLogbookUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/move/MoveSingleActivityLonglineSampleLogbookUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/move/MoveSingleTripLonglineSampleLogbookUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/save/CopyValuesAndSaveSetLonglineLogbookUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/save/SaveTripLonglineLandingUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/save/SaveTripLonglineSampleLogbookUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/delete/DeleteActivitySeineUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/delete/DeleteFloatingObjectSeineUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/delete/DeleteRouteSeineUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/delete/DeleteSetSeineUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/content/api/EditableContentUI.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/edit/ContentEditUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/open/ContentOpenableUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/simple/ContentSimpleUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/simple/ContentSimpleUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/table/ContentTableMeta.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/table/ContentTableModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/table/ContentTableUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/table/ContentTableUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/table/ContentTableUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/table/popup/AutoSelectWithMoveUpAndDownShowPopupAction.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/40b9934a03644d8232582e7989… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/40b9934a03644d8232582e7989… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Introduce OpenTable (to be continued...)
by Tony CHEMIT 24 Jan '19

24 Jan '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 40b9934a by tchemit at 2019-01-24T09:22:03Z Introduce OpenTable (to be continued...) - - - - - 30 changed files: - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/opentable/CloseOpenTableDataUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/opentable/CreateOpenTableDataUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/opentable/DeleteOpenTableDataUIActionSupport.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/opentable/DeleteOpenTableEntryUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/opentable/NewOpenTableEntryUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/opentable/OpenOpenTableDataUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/opentable/ResetOpenTableEntryUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/opentable/SaveOpenTableDataUIActionSupport.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/opentable/SaveOpenTableEntryUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/delete/DeleteTripLonglineSampleLogbookUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/save/SaveTripLonglineSampleLogbookUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/content/CommonSafe.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/api/ContentUIHandler.java - + client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/opentable/ContentOpenTableModel.java - + client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/opentable/ContentOpenTableUI.jaxx - + client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/opentable/ContentOpenTableUI.jcss - + client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/opentable/ContentOpenTableUIHandler.java - + client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/opentable/ContentOpenTableUIInitializer.java - + client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/opentable/ContentOpenTableUIModel.java - + client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/opentable/action/ContentOpenTableUIEntryActionSupport.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/simple/ContentSimpleUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/table/ContentTableMeta.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/table/ContentTableModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/table/ContentTableUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/table/ContentTableUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/table/popup/AutoSelectWithMoveUpAndDownShowPopupAction.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/table/popup/InlineTableAutotSelectRowAndShowPopupAction.java → client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/table/popup/InlineTableAutoSelectRowAndShowPopupAction.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/table/EditableList.java → client-core/src/main/java/fr/ird/observe/client/ui/content/api/ui/table/EditableList.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/table/EditableTableModelSupport.java → client-core/src/main/java/fr/ird/observe/client/ui/content/api/ui/table/EditableTableModelSupport.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/table/EditableTableWithCacheTableModelSupport.java → client-core/src/main/java/fr/ird/observe/client/ui/content/api/ui/table/EditableTableWithCacheTableModelSupport.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/40b9934a03644d8232582e7989e… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/40b9934a03644d8232582e7989e… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Use Ctrl-Tab instead of Tab to select in a ComboBox - Closes #1200
by Tony CHEMIT 22 Jan '19

22 Jan '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: d6a11f38 by tchemit at 2019-01-22T16:38:55Z Use Ctrl-Tab instead of Tab to select in a ComboBox - Closes #1200 - - - - - 1 changed file: - pom.xml Changes: ===================================== pom.xml ===================================== @@ -162,7 +162,7 @@   -  + <lib.version.java4all.jaxx>3.0-alpha-48</lib.version.java4all.jaxx>    View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/d6a11f3849cd002694af20dcc1c… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/d6a11f3849cd002694af20dcc1c… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 3 commits: select combobox in dialog
by Tony CHEMIT 22 Jan '19

22 Jan '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 617ae27b by tchemit at 2019-01-22T14:15:59Z select combobox in dialog - - - - - 346b1b61 by tchemit at 2019-01-22T14:16:28Z Can't select related observed activity if logbook activity has no coordinate - - - - - 3d237aed by tchemit at 2019-01-22T16:38:32Z Use Ctrl-Tab instead of Tab to select in a ComboBox - Coses #1200 - - - - - 3 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/ChooseRelatedObservedActivityUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/logbook/ActivityLonglineLogbookUI.jcss - pom.xml Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/ChooseRelatedObservedActivityUIAction.java ===================================== @@ -116,7 +116,15 @@ public class ChooseRelatedObservedActivityUIAction extends AbstractContentUIActi pairingConfig.getLonglineActivityPairingMaxTime(), pairingConfig.getLonglineActivityPairingMaxDistance()))); panel.add(BorderLayout.CENTER, editor); - JOptionPane pane = new JOptionPane(panel, JOptionPane.QUESTION_MESSAGE, JOptionPane.DEFAULT_OPTION, null, options, options[0]); + JOptionPane pane = new JOptionPane(panel, JOptionPane.QUESTION_MESSAGE, JOptionPane.DEFAULT_OPTION, null, options, options[0]) { + @Override + public void selectInitialValue() { + if (editor.getData().size() == 1) { + editor.setSelectedItem(editor.getData().get(0)); + } + editor.requestFocusInWindow(); + } + }; JButton jButton = UsageUIHandlerSupport.findButton(pane, continueActionText); Objects.requireNonNull(jButton); ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/logbook/ActivityLonglineLogbookUI.jcss ===================================== @@ -132,6 +132,6 @@ #chooseRelatedObservedActivity { visible:{!model.isReadingMode()}; - enabled:{model.isValid()}; + enabled:{model.isValid() && bean.getLatitude() != null && bean.getLongitude() != null && bean.getQuadrant() != null}; _observeAction:{ChooseRelatedObservedActivityUIAction.ACTION_NAME}; } ===================================== pom.xml ===================================== @@ -162,7 +162,7 @@   -  + <lib.version.java4all.jaxx>3.0-alpha-48</lib.version.java4all.jaxx>    View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/990dc64cf1382586cfe6c2661a… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/990dc64cf1382586cfe6c2661a… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] update pom and some libs
by Tony CHEMIT 22 Jan '19

22 Jan '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 990dc64c by tchemit at 2019-01-22T09:56:10Z update pom and some libs - - - - - 2 changed files: - pom.xml - validation/src/main/i18n/getters/validation-messages.getter Changes: ===================================== pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2019.8.1</version> + <version>2019.8.2</version> </parent> <groupId>fr.ird.observe</groupId> @@ -155,7 +155,11 @@ <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format> <buildDate>${maven.build.timestamp}</buildDate> - <observeToolkitVersion>4.10-SNAPSHOT</observeToolkitVersion> + <observeToolkitVersion>4.10</observeToolkitVersion> + <lib.version.nuiton.validation>3.1</lib.version.nuiton.validation> +  + <lib.version.h2>1.4.196</lib.version.h2> +    @@ -163,11 +167,8 @@    - <lib.version.nuiton.validation>3.1</lib.version.nuiton.validation> - <xworkVersion>2.3.35</xworkVersion> +   -  - <lib.version.h2>1.4.196</lib.version.h2>  <license.licenseName>gpl_v3</license.licenseName> @@ -211,7 +212,6 @@ <artifactId>common-dto</artifactId> <version>${observeToolkitVersion}</version> </dependency> - <dependency> <groupId>fr.ird.observe.toolkit</groupId> <artifactId>common-service</artifactId> @@ -228,33 +228,6 @@ <version>${observeToolkitVersion}</version> </dependency> - <dependency> - <groupId>org.hashids</groupId> - <artifactId>hashids</artifactId> - <version>1.0.3</version> - </dependency> - - <dependency> - <groupId>org.apache.struts.xwork</groupId> - <artifactId>xwork-core</artifactId> - <version>${xworkVersion}</version> - <exclusions> - <exclusion> - <groupId>javassist</groupId> - <artifactId>javassist</artifactId> - </exclusion> - <exclusion> - <groupId>asm</groupId> - <artifactId>asm-tree</artifactId> - </exclusion> - <exclusion> - <groupId>asm</groupId> - <artifactId>asm</artifactId> - </exclusion> - - </exclusions> - </dependency> - <dependency> <groupId>com.esotericsoftware.yamlbeans</groupId> <artifactId>yamlbeans</artifactId> @@ -263,11 +236,10 @@ </dependency> <dependency> - <groupId>commons-fileupload</groupId> - <artifactId>commons-fileupload</artifactId> - <version>1.4</version> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-runtime</artifactId> + <version>2.3.1</version> </dependency> - </dependencies> </dependencyManagement> ===================================== validation/src/main/i18n/getters/validation-messages.getter ===================================== @@ -1 +1,103 @@ +observe.validation.activity.duplicated.time +observe.validation.activity.null.dcp +observe.validation.activity.required.observedSystem.for.nonTargetCatch +observe.validation.activityLongline.endDate.after.currentTrip.startDate +observe.validation.activityLongline.endDate.before.currentTrip.endDate +observe.validation.activityLongline.startDate.after.currentTrip.startDate +observe.validation.activityLongline.startDate.before.currentTrip.endDate +observe.validation.catchLongline.required.count.when.acquisitionModeIsGrouped +observe.validation.catchLongline.required.position +observe.validation.field.mandatory +observe.validation.floatingObject.invalid.parts +observe.validation.floatingObject.required.comment.for.balise1 +observe.validation.floatingObject.required.comment.for.balise2 +observe.validation.floatingObject.size.supportVesselName +observe.validation.landingPartLongline.bound.categoryWeight +observe.validation.landingPartLongline.required.weightMeasureMethod +observe.validation.lengthFormula.endDate.before.startDate +observe.validation.lengthLengthParameter.invalid.inputOutputFormula +observe.validation.lengthLengthParameter.invalid.outputInputFormula +observe.validation.lengthLengthParameter.invalid.uniqueKey +observe.validation.lengthWeightParameter.invalid.lengthWeightFormula +observe.validation.lengthWeightParameter.invalid.uniqueKey +observe.validation.lengthWeightParameter.invalid.weightLengthFormula +observe.validation.nonTargetCatch.missing.observedSystem +observe.validation.nonTargetCatch.required.weightOrNombreEstime +observe.validation.nonTargetCatch.required.weightOrTailleMoyen +observe.validation.nonTargetCatch.uniqueKey +observe.validation.nonTargetSample.required.weight.or.taille +observe.validation.objectMaterial.invalid.validation +observe.validation.objectObservedSpecies.positive.count +observe.validation.referential.disabled +observe.validation.referential.label1.untranslated +observe.validation.referential.label3.untranslated +observe.validation.referentiel.bad.parentCode +observe.validation.referentiel.null.uri +observe.validation.referentiel.status.desactivated +observe.validation.referentiel.untranslated.label1 +observe.validation.referentiel.untranslated.label3 +observe.validation.required.haulingEndLatitude +observe.validation.required.haulingEndLongitude +observe.validation.required.haulingStartLatitude +observe.validation.required.haulingStartLongitude +observe.validation.required.latitude +observe.validation.required.longitude +observe.validation.required.quadrant +observe.validation.required.settingEndLatitude +observe.validation.required.settingEndLongitude +observe.validation.route.activityFinDeVeille.notAvailable +observe.validation.route.duplicated.date +observe.validation.route.invalid.date +observe.validation.route.invalid.endLogValue.maximum +observe.validation.route.invalid.endLogValue.minimum +observe.validation.route.invalid.quadrant +observe.validation.route.invalid.startLogValue +observe.validation.route.invalid.time +observe.validation.route.missing.activityFinDeVeille +observe.validation.route.positive.startLogValue +observe.validation.route.unclosed.activity +observe.validation.samplePart.required.sizeMeasureType.for.length +observe.validation.samplePart.required.weightMeasureType.for.weight +observe.validation.schoolEstimate.species.uniqueKey +observe.validation.set.bound.delay +observe.validation.set.delay.too.long +observe.validation.set.endDate.after.endPursingDate +observe.validation.set.endPursingDate.after.date +observe.validation.set.endPursingTimeStamp.after.startTime +observe.validation.set.endSetTimeStamp.after.endPursingTimeStamp +observe.validation.set.size.supportVesselName +observe.validation.set.startTime.after.time +observe.validation.setLongline.baitsComposition.uniqueKey +observe.validation.setLongline.branchlinesComposition.uniqueKey +observe.validation.setLongline.duplicated.homeId +observe.validation.setLongline.duplicated.number +observe.validation.setLongline.floatlinesComposition.uniqueKey +observe.validation.setLongline.haulingStartTimeStamp.before.haulingEndTimeStamp +observe.validation.setLongline.hooksComposition.uniqueKey +observe.validation.setLongline.settingEndTimeStamp.before.haulingStartTimeStamp +observe.validation.setLongline.settingStartTimeStamp.before.settingEndTimeStamp +observe.validation.species.length.bound +observe.validation.species.weight.bound +observe.validation.targetCatch.uniqueKey +observe.validation.targetDiscarded.uniqueKey +observe.validation.targetLength.bound.length +observe.validation.targetLength.bound.weight +observe.validation.targetLength.positive.length +observe.validation.targetLength.positive.weight +observe.validation.targetLength.required.taille +observe.validation.targetLength.required.weight.or.taille +observe.validation.tdr.deployementStart.before.fishingStart +observe.validation.tdr.fishingEnd.before.deployementEnd +observe.validation.tdr.fishingStart.before.fishingEnd +observe.validation.tdr.required.position +observe.validation.trip.endDate.after.now +observe.validation.trip.endDate.after.startDate +observe.validation.trip.invalid.date +observe.validation.trip.invalid.endDate +observe.validation.trip.invalid.formsUrl +observe.validation.trip.invalid.loch +observe.validation.trip.invalid.reportsUrl +observe.validation.trip.invalid.startDate +observe.validation.trip.startDate.after.now observe.validation.tripLongline.unclosed.activity +observe.validation.tripSeine.unclosed.route View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/990dc64cf1382586cfe6c2661a7… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/990dc64cf1382586cfe6c2661a7… You're receiving this email because of your account on gitlab.com.

1 0