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

[Git][ultreiaio/ird-observe][develop] 4 commits: update pom
by Tony CHEMIT (＠tchemit) Jan. 19, 2024

Jan. 19, 2024

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 4baf29d1 by Tony Chemit at 2024-01-19T09:56:32+01:00 update pom - - - - - 87e405f4 by Tony Chemit at 2024-01-19T09:56:32+01:00 [toolkit-maven-plugin] Add more actions in GenerateMigrationScriptRunner - - - - - 05d00725 by Tony Chemit at 2024-01-19T09:56:32+01:00 [toolkit-persistence] Open MigrationVersionResourceExecutor.isPg method - - - - - ba0ecc73 by Tony Chemit at 2024-01-19T09:56:32+01:00 [client-actions] Pouvoir rejourer l'assistant d'appairement des activités - Closes #2831 - - - - - 14 changed files: - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminTabUIHandler.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/pairing/ActivityPairingUIHandler.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/pairing/actions/Prepare.java - client/datasource/editor/spi/pom.xml - pom.xml - toolkit/persistence/src/main/java/org/nuiton/topia/service/migration/resources/MigrationVersionResourceExecutor.java - + toolkit/plugin/src/main/java/fr/ird/observe/toolkit/maven/plugin/persistence/DropTableTask.java - + toolkit/plugin/src/main/java/fr/ird/observe/toolkit/maven/plugin/persistence/DropTableTasks.java - + toolkit/plugin/src/main/java/fr/ird/observe/toolkit/maven/plugin/persistence/ExtractSchemaTask.java - + toolkit/plugin/src/main/java/fr/ird/observe/toolkit/maven/plugin/persistence/ExtractTableTask.java - toolkit/plugin/src/main/java/fr/ird/observe/toolkit/maven/plugin/persistence/GenerateMigrationScriptRunner.java - toolkit/plugin/src/main/java/fr/ird/observe/toolkit/maven/plugin/persistence/MigrationScriptTask.java - + toolkit/plugin/src/main/java/fr/ird/observe/toolkit/maven/plugin/persistence/RenameForeignKeyTask.java - + toolkit/plugin/src/main/java/fr/ird/observe/toolkit/maven/plugin/persistence/RenameForeignKeyTasks.java Changes: ===================================== client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminTabUIHandler.java ===================================== @@ -193,7 +193,7 @@ public class AdminTabUIHandler<U extends AdminTabUI> implements WithClientUICont protected void onComingFromNextStepAdjust() { AdminUIModel model = ui.getModel(); - if (model.containsOperation(AdminStep.VALIDATE) || + if (model.containsOperation(AdminStep.VALIDATE) || model.containsOperation(AdminStep.ACTIVITY_PAIRING) || (model.containsOperation(AdminStep.CONSOLIDATE) && !model.containsOperation(AdminStep.EXPORT_DATA))) { if (model.getStepState(AdminStep.CONSOLIDATE) == WizardState.SUCCESSED) { // set back to pending consolidate step @@ -203,6 +203,9 @@ public class AdminTabUIHandler<U extends AdminTabUI> implements WithClientUICont model.setStepState(AdminStep.VALIDATE, WizardState.PENDING); // reset report model model.getValidateModel().reset(); + } else if (model.getStepState(AdminStep.ACTIVITY_PAIRING) == WizardState.NEED_FIX || model.getStepState(AdminStep.ACTIVITY_PAIRING) == WizardState.SUCCESSED) { + // set back to pending activity pairing step + model.setStepState(AdminStep.ACTIVITY_PAIRING, WizardState.PENDING); } } } ===================================== client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/pairing/ActivityPairingUIHandler.java ===================================== @@ -37,5 +37,6 @@ public class ActivityPairingUIHandler extends AdminTabUIHandler<ActivityPairingU super.afterInit(ui); setAutoStart(ui.getPrepare()); hideFixedPanelLabel(ui); + ui.remove(ui.getDescriptionContainer()); } } ===================================== client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/pairing/actions/Prepare.java ===================================== @@ -87,7 +87,6 @@ public class Prepare extends ActivityPairingUIActionSupport { } break; } - ui.getModel().setWasDone(true); stepModel.recomputeSelectedValues(); return WizardState.NEED_FIX; } ===================================== client/datasource/editor/spi/pom.xml ===================================== @@ -154,6 +154,18 @@ <scope>test</scope> </dependency> </dependencies> + <build> + <pluginManagement> + <plugins> + <plugin> + <artifactId>maven-plugin-plugin</artifactId> + <configuration> + <goalPrefix>client-datasource-editor-spi</goalPrefix> + </configuration> + </plugin> + </plugins> + </pluginManagement> + </build> <profiles> <profile> <id>reporting</id> ===================================== pom.xml ===================================== @@ -23,7 +23,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2023.59</version> + <version>2024.01</version> </parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> ===================================== toolkit/persistence/src/main/java/org/nuiton/topia/service/migration/resources/MigrationVersionResourceExecutor.java ===================================== @@ -261,7 +261,7 @@ public class MigrationVersionResourceExecutor implements AutoCloseable { return classLoader; } - protected boolean isPG() { + public boolean isPG() { return PGTopiaSqlDllSupportImpl.CLASSIFIER.equals(classifier); } ===================================== toolkit/plugin/src/main/java/fr/ird/observe/toolkit/maven/plugin/persistence/DropTableTask.java ===================================== @@ -0,0 +1,51 @@ +package fr.ird.observe.toolkit.maven.plugin.persistence; + +/*- + * #%L + * ObServe Toolkit :: Maven plugin + * %% + * Copyright (C) 2008 - 2024 IRD, 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% + */ + +/** + * Created at 12/01/2024. + * + * @author Tony Chemit - dev(a)tchemit.fr + * @since 9.3.0 + */ +public class DropTableTask { + + private String schemaName; + private String[] tableName; + + public String getSchemaName() { + return schemaName; + } + + public void setSchemaName(String schemaName) { + this.schemaName = schemaName; + } + + public String[] getTableName() { + return tableName; + } + + public void setTableName(String[] tableName) { + this.tableName = tableName; + } +} ===================================== toolkit/plugin/src/main/java/fr/ird/observe/toolkit/maven/plugin/persistence/DropTableTasks.java ===================================== @@ -0,0 +1,66 @@ +package fr.ird.observe.toolkit.maven.plugin.persistence; + +/*- + * #%L + * ObServe Toolkit :: Maven plugin + * %% + * Copyright (C) 2008 - 2024 IRD, 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 java.util.LinkedList; +import java.util.List; + +/** + * Created at 12/01/2024. + * + * @author Tony Chemit - dev(a)tchemit.fr + * @since 9.3.0 + */ +public class DropTableTasks { + private String prefix; + private List<DropTableTask> tasks = List.of(); + + public String getPrefix() { + return prefix; + } + + public void setPrefix(String prefix) { + this.prefix = prefix; + } + + public List<DropTableTask> getTasks() { + return tasks; + } + + public void setTasks(List<DropTableTask> tasks) { + this.tasks = tasks; + } + + public List<String> toSql(boolean h2) { + String addCascadeClause = h2 ? "" : " CASCADE"; + List<String> statements = new LinkedList<>(); + for (DropTableTask task : getTasks()) { + String schemaName = task.getSchemaName(); + for (String name : task.getTableName()) { + String tableName = name.toLowerCase(); + statements.add(String.format("DROP TABLE %s.%s%s;", schemaName, tableName, addCascadeClause)); + } + } + return statements; + } +} ===================================== toolkit/plugin/src/main/java/fr/ird/observe/toolkit/maven/plugin/persistence/ExtractSchemaTask.java ===================================== @@ -0,0 +1,51 @@ +package fr.ird.observe.toolkit.maven.plugin.persistence; + +/*- + * #%L + * ObServe Toolkit :: Maven plugin + * %% + * Copyright (C) 2008 - 2024 IRD, 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% + */ + +/** + * Created at 12/01/2024. + * + * @author Tony Chemit - dev(a)tchemit.fr + * @since + */ +public class ExtractSchemaTask { + + private String schemaName; + private String prefix; + + public String getSchemaName() { + return schemaName; + } + + public void setSchemaName(String schemaName) { + this.schemaName = schemaName; + } + + public String getPrefix() { + return prefix; + } + + public void setPrefix(String prefix) { + this.prefix = prefix; + } +} ===================================== toolkit/plugin/src/main/java/fr/ird/observe/toolkit/maven/plugin/persistence/ExtractTableTask.java ===================================== @@ -0,0 +1,60 @@ +package fr.ird.observe.toolkit.maven.plugin.persistence; + +/*- + * #%L + * ObServe Toolkit :: Maven plugin + * %% + * Copyright (C) 2008 - 2024 IRD, 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% + */ + +/** + * Created at 12/01/2024. + * + * @author Tony Chemit - dev(a)tchemit.fr + * @since 9.3.0 + */ +public class ExtractTableTask { + + private String schemaName; + private String prefix; + private String[] tableName; + + public String getSchemaName() { + return schemaName; + } + + public void setSchemaName(String schemaName) { + this.schemaName = schemaName; + } + + public String getPrefix() { + return prefix; + } + + public void setPrefix(String prefix) { + this.prefix = prefix; + } + + public String[] getTableName() { + return tableName; + } + + public void setTableName(String[] tableName) { + this.tableName = tableName; + } +} ===================================== toolkit/plugin/src/main/java/fr/ird/observe/toolkit/maven/plugin/persistence/GenerateMigrationScriptRunner.java ===================================== @@ -96,14 +96,14 @@ public class GenerateMigrationScriptRunner extends PersistenceRunner { } PersistenceScriptHelper.write(scriptPath, context, String.format("empty-%%s-%s", scriptSuffix), "", true); - for (MigrationScriptTask.ExtractSchemaTask task : task.getSchemaTasks()) { + for (ExtractSchemaTask task : task.getSchemaTasks()) { String prefix = task.getPrefix(); String schemaName = task.getSchemaName(); String baseName = String.format("%s_%%s-%s-%s", prefix, schemaName, scriptSuffix); ScriptSplitter.SplitSimpleResult filterOnSchema = ScriptSplitter.filterSchema(context, schemaName); PersistenceScriptHelper.write(scriptPath, filterOnSchema, baseName, "-schema", false); } - for (MigrationScriptTask.ExtractTableTask task : task.getTableTasks()) { + for (ExtractTableTask task : task.getTableTasks()) { String prefix = task.getPrefix(); String schemaName = task.getSchemaName(); for (String name : task.getTableName()) { @@ -113,6 +113,13 @@ public class GenerateMigrationScriptRunner extends PersistenceRunner { PersistenceScriptHelper.write(scriptPath, filterOnSchema, baseName, "-table", false); } } + for (DropTableTasks task : task.getDropTableTasks()) { + String baseName = String.format("%s_drop-tasks-%s", Objects.requireNonNull(task.getPrefix()), scriptSuffix); + PersistenceScriptHelper.writeScript(scriptPath.resolve(baseName), task.toSql(h2)); + } + for (RenameForeignKeyTasks task : task.getRenameForeignKeyTasks()) { + String baseName = String.format("%s_rename-foreign-key-%s", Objects.requireNonNull(task.getPrefix()), scriptSuffix); + PersistenceScriptHelper.writeScript(scriptPath.resolve(baseName), task.toSql(h2)); + } } - } ===================================== toolkit/plugin/src/main/java/fr/ird/observe/toolkit/maven/plugin/persistence/MigrationScriptTask.java ===================================== @@ -23,6 +23,7 @@ package fr.ird.observe.toolkit.maven.plugin.persistence; */ import java.util.List; +import java.util.Objects; /** * Created on 24/11/2021. @@ -34,59 +35,8 @@ public class MigrationScriptTask { private List<ExtractSchemaTask> schemaTasks = List.of(); private List<ExtractTableTask> tableTasks = List.of(); - - public static class ExtractSchemaTask { - - private String schemaName; - private String prefix; - - public String getSchemaName() { - return schemaName; - } - - public void setSchemaName(String schemaName) { - this.schemaName = schemaName; - } - - public String getPrefix() { - return prefix; - } - - public void setPrefix(String prefix) { - this.prefix = prefix; - } - } - - public static class ExtractTableTask { - - private String schemaName; - private String prefix; - private String[] tableName; - - public String getSchemaName() { - return schemaName; - } - - public void setSchemaName(String schemaName) { - this.schemaName = schemaName; - } - - public String getPrefix() { - return prefix; - } - - public void setPrefix(String prefix) { - this.prefix = prefix; - } - - public String[] getTableName() { - return tableName; - } - - public void setTableName(String[] tableName) { - this.tableName = tableName; - } - } + private List<DropTableTasks> dropTableTasks = List.of(); + private List<RenameForeignKeyTasks> renameForeignKeyTasks = List.of(); public List<ExtractSchemaTask> getSchemaTasks() { return schemaTasks; @@ -103,4 +53,20 @@ public class MigrationScriptTask { public void setTableTasks(List<ExtractTableTask> tableTasks) { this.tableTasks = tableTasks; } + + public List<DropTableTasks> getDropTableTasks() { + return dropTableTasks; + } + + public void setDropTableTasks(List<DropTableTasks> dropTableTasks) { + this.dropTableTasks = Objects.requireNonNull(dropTableTasks); + } + + public List<RenameForeignKeyTasks> getRenameForeignKeyTasks() { + return renameForeignKeyTasks; + } + + public void setRenameForeignKeyTasks(List<RenameForeignKeyTasks> renameForeignKeyTasks) { + this.renameForeignKeyTasks = renameForeignKeyTasks; + } } ===================================== toolkit/plugin/src/main/java/fr/ird/observe/toolkit/maven/plugin/persistence/RenameForeignKeyTask.java ===================================== @@ -0,0 +1,74 @@ +package fr.ird.observe.toolkit.maven.plugin.persistence; + +/*- + * #%L + * ObServe Toolkit :: Maven plugin + * %% + * Copyright (C) 2008 - 2024 IRD, 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% + */ + +/** + * Created at 12/01/2024. + * + * @author Tony Chemit - dev(a)tchemit.fr + * @since 9.3.0 + */ +public class RenameForeignKeyTask { + private static final String RENAME_FOREIGN_KEY = "-- Rename foreign key %1$s.%2$s.%3$s → %4$s\n" + + "ALTER TABLE %1$s.%2$s ADD COLUMN %4$s VARCHAR(255);\n" + + "ALTER TABLE %1$s.%2$s ADD CONSTRAINT fk_%1$s_%2$s_%4$s FOREIGN KEY (%4$s) REFERENCES %1$s.%4$s;\n" + + "CREATE INDEX idx_%1$s_%2$s_%4$s ON %1$s.%2$s(%4$s);\n" + + "UPDATE %1$s.%2$s SET %4$s = REPLACE(set, '.%3$s', '.%4$s');\n" + + "ALTER TABLE %1$s.%2$s ALTER COLUMN %4$s SET NOT NULL;\n" + + "ALTER TABLE %1$s.%2$s DROP COLUMN %3$s%5$s;"; + private static final String RENAME_FOREIGN_KEY_WITH_IDX = "-- Rename foreign key %1$s.%2$s.%3$s → %4$s (and %3$s_idx → %4$s_idx)\n" + + "ALTER TABLE %1$s.%2$s ADD COLUMN %4$s VARCHAR(255);\n" + + "ALTER TABLE %1$s.%2$s ADD COLUMN %4$s_idx INTEGER;\n" + + "ALTER TABLE %1$s.%2$s ADD CONSTRAINT fk_%1$s_%2$s_%4$s FOREIGN KEY (%4$s) REFERENCES %1$s.%4$s;\n" + + "CREATE INDEX idx_%1$s_%2$s_%4$s ON %1$s.%2$s(%4$s);\n" + + "UPDATE %1$s.%2$s SET %4$s = REPLACE(set, '.%3$s', '.%4$s'), %4$s_idx = %3$s_idx;\n" + + "ALTER TABLE %1$s.%2$s ALTER COLUMN %4$s SET NOT NULL;\n" + + "ALTER TABLE %1$s.%2$s ALTER COLUMN %4$s_idx SET NOT NULL;\n" + + "ALTER TABLE %1$s.%2$s DROP COLUMN %3$s%5$s;\n" + + "ALTER TABLE %1$s.%2$s DROP COLUMN %3$s_idx%5$s;"; + private final String schemaName; + private final String tableName; + private final boolean useIndex; + + public RenameForeignKeyTask(String schemaName, String tableName, boolean useIndex) { + this.schemaName = schemaName; + this.tableName = tableName; + this.useIndex = useIndex; + } + + public String getSchemaName() { + return schemaName; + } + + public String getTableName() { + return tableName; + } + + public boolean isUseIndex() { + return useIndex; + } + + public String toSql(boolean h2, String oldColumnName, String newColumnName) { + return String.format(isUseIndex() ? RENAME_FOREIGN_KEY_WITH_IDX : RENAME_FOREIGN_KEY, getSchemaName(), getTableName(), oldColumnName, newColumnName, h2 ? "" : " CASCADE"); + } +} ===================================== toolkit/plugin/src/main/java/fr/ird/observe/toolkit/maven/plugin/persistence/RenameForeignKeyTasks.java ===================================== @@ -0,0 +1,73 @@ +package fr.ird.observe.toolkit.maven.plugin.persistence; + +/*- + * #%L + * ObServe Toolkit :: Maven plugin + * %% + * Copyright (C) 2008 - 2024 IRD, 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 java.util.LinkedList; +import java.util.List; + +/** + * Created at 12/01/2024. + * + * @author Tony Chemit - dev(a)tchemit.fr + * @since 9.3.0 + */ +public class RenameForeignKeyTasks { + private final String prefix; + private final String oldColumnName; + private final String newColumnName; + private List<RenameForeignKeyTask> tasks = List.of(); + + public RenameForeignKeyTasks(String prefix, String oldColumnName, String newColumnName) { + this.prefix = prefix; + this.oldColumnName = oldColumnName; + this.newColumnName = newColumnName; + } + + public String getPrefix() { + return prefix; + } + + public String getOldColumnName() { + return oldColumnName; + } + + public String getNewColumnName() { + return newColumnName; + } + + public List<RenameForeignKeyTask> getTasks() { + return tasks; + } + + public void setTasks(List<RenameForeignKeyTask> tasks) { + this.tasks = tasks; + } + + public List<String> toSql(boolean h2) { + List<String> statements = new LinkedList<>(); + for (RenameForeignKeyTask task : getTasks()) { + statements.add(task.toSql(h2, getOldColumnName(), getNewColumnName())); + } + return statements; + } +} View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/4d23a36c687aeaa4d08b6329… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/4d23a36c687aeaa4d08b6329… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Deleted 31 commits: [model] Rename Set to FishingSet
by Tony CHEMIT (＠tchemit) Jan. 19, 2024

Jan. 19, 2024

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe WARNING: The push did not contain any new commits, but force pushed to delete the commits and changes below. Deleted commits: e7aeced7 by Tony Chemit at 2024-01-18T18:09:30+01:00 [model] Rename Set to FishingSet - - - - - a37a3497 by Tony Chemit at 2024-01-18T18:09:31+01:00 [model] Update fixtures - - - - - d5c0aa7d by Tony Chemit at 2024-01-18T18:09:31+01:00 [doc] Update report documentations (queries using FishingSet) - - - - - 0d936c01 by Tony Chemit at 2024-01-18T18:09:31+01:00 [core-api] Update dto - - - - - 2dd2a2a4 by Tony Chemit at 2024-01-18T18:09:31+01:00 [core-api] Update decorators - - - - - 73e211ee by Tony Chemit at 2024-01-18T18:09:31+01:00 [core-api] Update validators - - - - - 4a5c1e9e by Tony Chemit at 2024-01-18T18:09:31+01:00 [core-api] Update tree mapping - - - - - 20a02e28 by Tony Chemit at 2024-01-18T18:09:31+01:00 [core-api] Update validation - - - - - bbe67d5b by Tony Chemit at 2024-01-18T18:09:31+01:00 [core-api] Update services - - - - - b4991b3d by Tony Chemit at 2024-01-18T18:09:31+01:00 [core-persistence] Update entities - - - - - 0ddba8fb by Tony Chemit at 2024-01-18T18:09:31+01:00 [core-persistence] Update decorators - - - - - 3309e75e by Tony Chemit at 2024-01-18T18:09:31+01:00 [core-persistence] Add migration - - - - - 3ef20aa5 by Tony Chemit at 2024-01-18T18:09:31+01:00 [core-persistence] Update report definitions - - - - - 36789f59 by Tony Chemit at 2024-01-18T18:09:31+01:00 [core-persistence] Update consolidation conde - - - - - b84d5d20 by Tony Chemit at 2024-01-18T18:09:31+01:00 [core-persistence] Update resources - - - - - a3259078 by Tony Chemit at 2024-01-18T18:09:31+01:00 [core-persistence] Update tests - - - - - 29f0a842 by Tony Chemit at 2024-01-18T18:09:31+01:00 [core-services] Update i18n - - - - - b61e9c4b by Tony Chemit at 2024-01-18T18:09:31+01:00 [core-services] Update TripServiceLocal - - - - - 656ec1a1 by Tony Chemit at 2024-01-18T18:09:31+01:00 [core-services] Update tests fixtures - - - - - 875ed5c9 by Tony Chemit at 2024-01-18T18:09:31+01:00 [server] Update mapping - - - - - b2edff40 by Tony Chemit at 2024-01-18T18:09:31+01:00 [server] Update public API documentation - - - - - 7429fe4e by Tony Chemit at 2024-01-18T18:09:32+01:00 [client] Update default swing Preferences - - - - - 4feaf720 by Tony Chemit at 2024-01-18T18:09:32+01:00 [client] Update data source editor SPI - - - - - 5027d02e by Tony Chemit at 2024-01-18T18:09:32+01:00 [client] Update ps module - - - - - fe56c852 by Tony Chemit at 2024-01-18T18:09:32+01:00 [client] Update ll module - - - - - 03edbf52 by Tony Chemit at 2024-01-18T18:09:32+01:00 [client] clean DataSourceEditor.jaxx file - - - - - f37f5060 by Tony Chemit at 2024-01-18T18:09:32+01:00 [client] update pg scripts - - - - - 447d46c8 by Tony Chemit at 2024-01-18T18:09:32+01:00 [client] update i18n - - - - - 4d709b5e by Tony Chemit at 2024-01-18T18:09:32+01:00 [client] update consolidation action - - - - - 1b752348 by Tony Chemit at 2024-01-18T18:09:32+01:00 [client] update runner tests - - - - - f399f889 by Tony Chemit at 2024-01-19T07:08:02+01:00 Merge branch 'feature/issue-2829' into develop Renommer les entités Set en FishingSet - Closes #2829 - - - - - 30 changed files: - client/core/src/main/resources/observe-swing-preferences.properties - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/actions/Start.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/DataSourceEditor.jaxx - client/datasource/editor/ll/src/main/capabilities/fr/ird/observe/client/datasource/editor/ll/data/logbook/ActivityUI.capabilities - + client/datasource/editor/ll/src/main/capabilities/fr/ird/observe/client/datasource/editor/ll/data/logbook/FishingSetUI.capabilities - − client/datasource/editor/ll/src/main/capabilities/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetUI.capabilities - client/datasource/editor/ll/src/main/capabilities/fr/ird/observe/client/datasource/editor/ll/data/observation/ActivityUI.capabilities - + client/datasource/editor/ll/src/main/capabilities/fr/ird/observe/client/datasource/editor/ll/data/observation/FishingSetUI.capabilities - − client/datasource/editor/ll/src/main/capabilities/fr/ird/observe/client/datasource/editor/ll/data/observation/SetUI.capabilities - client/datasource/editor/ll/src/main/i18n/getters/java.getter - client/datasource/editor/ll/src/main/i18n/getters/jaxx.getter - client/datasource/editor/ll/src/main/i18n/getters/navigation.getter - client/datasource/editor/ll/src/main/i18n/getters/validation-messages.getter - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/ActivityUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/ActivityUI.jcss - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/ActivityUIHandler.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetBaitsCompositionUI.jaxx → client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/FishingSetBaitsCompositionUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetBaitsCompositionUI.jcss → client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/FishingSetBaitsCompositionUI.jcss - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetBaitsCompositionUIModelStates.java → client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/FishingSetBaitsCompositionUIModelStates.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetBranchlinesCompositionUI.jaxx → client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/FishingSetBranchlinesCompositionUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetBranchlinesCompositionUI.jcss → client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/FishingSetBranchlinesCompositionUI.jcss - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetBranchlinesCompositionUIModelStates.java → client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/FishingSetBranchlinesCompositionUIModelStates.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetCatchUI.jaxx → client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/FishingSetCatchUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetCatchUI.jcss → client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/FishingSetCatchUI.jcss - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetCatchUIHandler.java → client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/FishingSetCatchUIHandler.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetCatchUIModelStates.java → client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/FishingSetCatchUIModelStates.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetCatchUITableModel.java → client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/FishingSetCatchUITableModel.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetFloatlinesCompositionUI.jaxx → client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/FishingSetFloatlinesCompositionUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetFloatlinesCompositionUI.jcss → client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/FishingSetFloatlinesCompositionUI.jcss - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetFloatlinesCompositionUIModelStates.java → client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/FishingSetFloatlinesCompositionUIModelStates.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/4d23a36c687aeaa4d08b6329… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/4d23a36c687aeaa4d08b6329… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Deleted branch feature/issue-2830
by Tony CHEMIT (＠tchemit) Jan. 19, 2024

Jan. 19, 2024

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

1 0

[Git][ultreiaio/ird-observe] Pushed new branch feature/issue-2830-old
by Tony CHEMIT (＠tchemit) Jan. 19, 2024

Jan. 19, 2024

Tony CHEMIT pushed new branch feature/issue-2830-old at ultreiaio / ird-observe -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/tree/feature/issue-2830-old You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][feature/issue-2830] 32 commits: [model] Rename Set to FishingSet
by Tony CHEMIT (＠tchemit) Jan. 19, 2024

Jan. 19, 2024

Tony CHEMIT pushed to branch feature/issue-2830 at ultreiaio / ird-observe Commits: e7aeced7 by Tony Chemit at 2024-01-18T18:09:30+01:00 [model] Rename Set to FishingSet - - - - - a37a3497 by Tony Chemit at 2024-01-18T18:09:31+01:00 [model] Update fixtures - - - - - d5c0aa7d by Tony Chemit at 2024-01-18T18:09:31+01:00 [doc] Update report documentations (queries using FishingSet) - - - - - 0d936c01 by Tony Chemit at 2024-01-18T18:09:31+01:00 [core-api] Update dto - - - - - 2dd2a2a4 by Tony Chemit at 2024-01-18T18:09:31+01:00 [core-api] Update decorators - - - - - 73e211ee by Tony Chemit at 2024-01-18T18:09:31+01:00 [core-api] Update validators - - - - - 4a5c1e9e by Tony Chemit at 2024-01-18T18:09:31+01:00 [core-api] Update tree mapping - - - - - 20a02e28 by Tony Chemit at 2024-01-18T18:09:31+01:00 [core-api] Update validation - - - - - bbe67d5b by Tony Chemit at 2024-01-18T18:09:31+01:00 [core-api] Update services - - - - - b4991b3d by Tony Chemit at 2024-01-18T18:09:31+01:00 [core-persistence] Update entities - - - - - 0ddba8fb by Tony Chemit at 2024-01-18T18:09:31+01:00 [core-persistence] Update decorators - - - - - 3309e75e by Tony Chemit at 2024-01-18T18:09:31+01:00 [core-persistence] Add migration - - - - - 3ef20aa5 by Tony Chemit at 2024-01-18T18:09:31+01:00 [core-persistence] Update report definitions - - - - - 36789f59 by Tony Chemit at 2024-01-18T18:09:31+01:00 [core-persistence] Update consolidation conde - - - - - b84d5d20 by Tony Chemit at 2024-01-18T18:09:31+01:00 [core-persistence] Update resources - - - - - a3259078 by Tony Chemit at 2024-01-18T18:09:31+01:00 [core-persistence] Update tests - - - - - 29f0a842 by Tony Chemit at 2024-01-18T18:09:31+01:00 [core-services] Update i18n - - - - - b61e9c4b by Tony Chemit at 2024-01-18T18:09:31+01:00 [core-services] Update TripServiceLocal - - - - - 656ec1a1 by Tony Chemit at 2024-01-18T18:09:31+01:00 [core-services] Update tests fixtures - - - - - 875ed5c9 by Tony Chemit at 2024-01-18T18:09:31+01:00 [server] Update mapping - - - - - b2edff40 by Tony Chemit at 2024-01-18T18:09:31+01:00 [server] Update public API documentation - - - - - 7429fe4e by Tony Chemit at 2024-01-18T18:09:32+01:00 [client] Update default swing Preferences - - - - - 4feaf720 by Tony Chemit at 2024-01-18T18:09:32+01:00 [client] Update data source editor SPI - - - - - 5027d02e by Tony Chemit at 2024-01-18T18:09:32+01:00 [client] Update ps module - - - - - fe56c852 by Tony Chemit at 2024-01-18T18:09:32+01:00 [client] Update ll module - - - - - 03edbf52 by Tony Chemit at 2024-01-18T18:09:32+01:00 [client] clean DataSourceEditor.jaxx file - - - - - f37f5060 by Tony Chemit at 2024-01-18T18:09:32+01:00 [client] update pg scripts - - - - - 447d46c8 by Tony Chemit at 2024-01-18T18:09:32+01:00 [client] update i18n - - - - - 4d709b5e by Tony Chemit at 2024-01-18T18:09:32+01:00 [client] update consolidation action - - - - - 1b752348 by Tony Chemit at 2024-01-18T18:09:32+01:00 [client] update runner tests - - - - - f399f889 by Tony Chemit at 2024-01-19T07:08:02+01:00 Merge branch 'feature/issue-2829' into develop Renommer les entités Set en FishingSet - Closes #2829 - - - - - 077d8436 by Tony Chemit at 2024-01-19T09:27:29+01:00 stash - - - - - 30 changed files: - client/core/src/main/resources/observe-swing-preferences.properties - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/actions/Start.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/pairing/ps/RootNodeBuilder.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/DataSourceEditor.jaxx - client/datasource/editor/ll/src/main/capabilities/fr/ird/observe/client/datasource/editor/ll/data/logbook/ActivityUI.capabilities - + client/datasource/editor/ll/src/main/capabilities/fr/ird/observe/client/datasource/editor/ll/data/logbook/FishingSetUI.capabilities - − client/datasource/editor/ll/src/main/capabilities/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetUI.capabilities - client/datasource/editor/ll/src/main/capabilities/fr/ird/observe/client/datasource/editor/ll/data/observation/ActivityUI.capabilities - + client/datasource/editor/ll/src/main/capabilities/fr/ird/observe/client/datasource/editor/ll/data/observation/FishingSetUI.capabilities - − client/datasource/editor/ll/src/main/capabilities/fr/ird/observe/client/datasource/editor/ll/data/observation/SetUI.capabilities - client/datasource/editor/ll/src/main/i18n/getters/java.getter - client/datasource/editor/ll/src/main/i18n/getters/jaxx.getter - client/datasource/editor/ll/src/main/i18n/getters/navigation.getter - client/datasource/editor/ll/src/main/i18n/getters/validation-messages.getter - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/ActivityUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/ActivityUI.jcss - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/ActivityUIHandler.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/ActivityUIModelStates.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetBaitsCompositionUI.jaxx → client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/FishingSetBaitsCompositionUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetBaitsCompositionUI.jcss → client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/FishingSetBaitsCompositionUI.jcss - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetBaitsCompositionUIModelStates.java → client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/FishingSetBaitsCompositionUIModelStates.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetBranchlinesCompositionUI.jaxx → client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/FishingSetBranchlinesCompositionUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetBranchlinesCompositionUI.jcss → client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/FishingSetBranchlinesCompositionUI.jcss - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetBranchlinesCompositionUIModelStates.java → client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/FishingSetBranchlinesCompositionUIModelStates.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetCatchUI.jaxx → client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/FishingSetCatchUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetCatchUI.jcss → client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/FishingSetCatchUI.jcss - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetCatchUIHandler.java → client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/FishingSetCatchUIHandler.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetCatchUIModelStates.java → client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/FishingSetCatchUIModelStates.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetCatchUITableModel.java → client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/FishingSetCatchUITableModel.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetFloatlinesCompositionUI.jaxx → client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/FishingSetFloatlinesCompositionUI.jaxx The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/2c85b8aa6855fe6c6f386d6c… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/2c85b8aa6855fe6c6f386d6c… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 31 commits: [model] Rename Set to FishingSet
by Tony CHEMIT (＠tchemit) Jan. 19, 2024

Jan. 19, 2024

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: e7aeced7 by Tony Chemit at 2024-01-18T18:09:30+01:00 [model] Rename Set to FishingSet - - - - - a37a3497 by Tony Chemit at 2024-01-18T18:09:31+01:00 [model] Update fixtures - - - - - d5c0aa7d by Tony Chemit at 2024-01-18T18:09:31+01:00 [doc] Update report documentations (queries using FishingSet) - - - - - 0d936c01 by Tony Chemit at 2024-01-18T18:09:31+01:00 [core-api] Update dto - - - - - 2dd2a2a4 by Tony Chemit at 2024-01-18T18:09:31+01:00 [core-api] Update decorators - - - - - 73e211ee by Tony Chemit at 2024-01-18T18:09:31+01:00 [core-api] Update validators - - - - - 4a5c1e9e by Tony Chemit at 2024-01-18T18:09:31+01:00 [core-api] Update tree mapping - - - - - 20a02e28 by Tony Chemit at 2024-01-18T18:09:31+01:00 [core-api] Update validation - - - - - bbe67d5b by Tony Chemit at 2024-01-18T18:09:31+01:00 [core-api] Update services - - - - - b4991b3d by Tony Chemit at 2024-01-18T18:09:31+01:00 [core-persistence] Update entities - - - - - 0ddba8fb by Tony Chemit at 2024-01-18T18:09:31+01:00 [core-persistence] Update decorators - - - - - 3309e75e by Tony Chemit at 2024-01-18T18:09:31+01:00 [core-persistence] Add migration - - - - - 3ef20aa5 by Tony Chemit at 2024-01-18T18:09:31+01:00 [core-persistence] Update report definitions - - - - - 36789f59 by Tony Chemit at 2024-01-18T18:09:31+01:00 [core-persistence] Update consolidation conde - - - - - b84d5d20 by Tony Chemit at 2024-01-18T18:09:31+01:00 [core-persistence] Update resources - - - - - a3259078 by Tony Chemit at 2024-01-18T18:09:31+01:00 [core-persistence] Update tests - - - - - 29f0a842 by Tony Chemit at 2024-01-18T18:09:31+01:00 [core-services] Update i18n - - - - - b61e9c4b by Tony Chemit at 2024-01-18T18:09:31+01:00 [core-services] Update TripServiceLocal - - - - - 656ec1a1 by Tony Chemit at 2024-01-18T18:09:31+01:00 [core-services] Update tests fixtures - - - - - 875ed5c9 by Tony Chemit at 2024-01-18T18:09:31+01:00 [server] Update mapping - - - - - b2edff40 by Tony Chemit at 2024-01-18T18:09:31+01:00 [server] Update public API documentation - - - - - 7429fe4e by Tony Chemit at 2024-01-18T18:09:32+01:00 [client] Update default swing Preferences - - - - - 4feaf720 by Tony Chemit at 2024-01-18T18:09:32+01:00 [client] Update data source editor SPI - - - - - 5027d02e by Tony Chemit at 2024-01-18T18:09:32+01:00 [client] Update ps module - - - - - fe56c852 by Tony Chemit at 2024-01-18T18:09:32+01:00 [client] Update ll module - - - - - 03edbf52 by Tony Chemit at 2024-01-18T18:09:32+01:00 [client] clean DataSourceEditor.jaxx file - - - - - f37f5060 by Tony Chemit at 2024-01-18T18:09:32+01:00 [client] update pg scripts - - - - - 447d46c8 by Tony Chemit at 2024-01-18T18:09:32+01:00 [client] update i18n - - - - - 4d709b5e by Tony Chemit at 2024-01-18T18:09:32+01:00 [client] update consolidation action - - - - - 1b752348 by Tony Chemit at 2024-01-18T18:09:32+01:00 [client] update runner tests - - - - - f399f889 by Tony Chemit at 2024-01-19T07:08:02+01:00 Merge branch 'feature/issue-2829' into develop Renommer les entités Set en FishingSet - Closes #2829 - - - - - 30 changed files: - client/core/src/main/resources/observe-swing-preferences.properties - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/actions/Start.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/DataSourceEditor.jaxx - client/datasource/editor/ll/src/main/capabilities/fr/ird/observe/client/datasource/editor/ll/data/logbook/ActivityUI.capabilities - + client/datasource/editor/ll/src/main/capabilities/fr/ird/observe/client/datasource/editor/ll/data/logbook/FishingSetUI.capabilities - − client/datasource/editor/ll/src/main/capabilities/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetUI.capabilities - client/datasource/editor/ll/src/main/capabilities/fr/ird/observe/client/datasource/editor/ll/data/observation/ActivityUI.capabilities - + client/datasource/editor/ll/src/main/capabilities/fr/ird/observe/client/datasource/editor/ll/data/observation/FishingSetUI.capabilities - − client/datasource/editor/ll/src/main/capabilities/fr/ird/observe/client/datasource/editor/ll/data/observation/SetUI.capabilities - client/datasource/editor/ll/src/main/i18n/getters/java.getter - client/datasource/editor/ll/src/main/i18n/getters/jaxx.getter - client/datasource/editor/ll/src/main/i18n/getters/navigation.getter - client/datasource/editor/ll/src/main/i18n/getters/validation-messages.getter - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/ActivityUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/ActivityUI.jcss - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/ActivityUIHandler.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetBaitsCompositionUI.jaxx → client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/FishingSetBaitsCompositionUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetBaitsCompositionUI.jcss → client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/FishingSetBaitsCompositionUI.jcss - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetBaitsCompositionUIModelStates.java → client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/FishingSetBaitsCompositionUIModelStates.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetBranchlinesCompositionUI.jaxx → client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/FishingSetBranchlinesCompositionUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetBranchlinesCompositionUI.jcss → client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/FishingSetBranchlinesCompositionUI.jcss - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetBranchlinesCompositionUIModelStates.java → client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/FishingSetBranchlinesCompositionUIModelStates.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetCatchUI.jaxx → client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/FishingSetCatchUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetCatchUI.jcss → client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/FishingSetCatchUI.jcss - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetCatchUIHandler.java → client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/FishingSetCatchUIHandler.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetCatchUIModelStates.java → client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/FishingSetCatchUIModelStates.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetCatchUITableModel.java → client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/FishingSetCatchUITableModel.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetFloatlinesCompositionUI.jaxx → client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/FishingSetFloatlinesCompositionUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetFloatlinesCompositionUI.jcss → client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/FishingSetFloatlinesCompositionUI.jcss - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetFloatlinesCompositionUIModelStates.java → client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/FishingSetFloatlinesCompositionUIModelStates.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/4d23a36c687aeaa4d08b6329… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/4d23a36c687aeaa4d08b6329… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Deleted branch feature/issue-2829
by Tony CHEMIT (＠tchemit) Jan. 19, 2024

Jan. 19, 2024

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

1 0

[Git][ultreiaio/ird-observe][feature/issue-2829] 31 commits: [client-actions] Pouvoir rejourer l'assistant d'appairement des activités - Closes #2831
by Tony CHEMIT (＠tchemit) Jan. 18, 2024

Jan. 18, 2024

Tony CHEMIT pushed to branch feature/issue-2829 at ultreiaio / ird-observe Commits: 4d23a36c by Tony Chemit at 2024-01-18T18:09:20+01:00 [client-actions] Pouvoir rejourer l'assistant d'appairement des activités - Closes #2831 - - - - - e7aeced7 by Tony Chemit at 2024-01-18T18:09:30+01:00 [model] Rename Set to FishingSet - - - - - a37a3497 by Tony Chemit at 2024-01-18T18:09:31+01:00 [model] Update fixtures - - - - - d5c0aa7d by Tony Chemit at 2024-01-18T18:09:31+01:00 [doc] Update report documentations (queries using FishingSet) - - - - - 0d936c01 by Tony Chemit at 2024-01-18T18:09:31+01:00 [core-api] Update dto - - - - - 2dd2a2a4 by Tony Chemit at 2024-01-18T18:09:31+01:00 [core-api] Update decorators - - - - - 73e211ee by Tony Chemit at 2024-01-18T18:09:31+01:00 [core-api] Update validators - - - - - 4a5c1e9e by Tony Chemit at 2024-01-18T18:09:31+01:00 [core-api] Update tree mapping - - - - - 20a02e28 by Tony Chemit at 2024-01-18T18:09:31+01:00 [core-api] Update validation - - - - - bbe67d5b by Tony Chemit at 2024-01-18T18:09:31+01:00 [core-api] Update services - - - - - b4991b3d by Tony Chemit at 2024-01-18T18:09:31+01:00 [core-persistence] Update entities - - - - - 0ddba8fb by Tony Chemit at 2024-01-18T18:09:31+01:00 [core-persistence] Update decorators - - - - - 3309e75e by Tony Chemit at 2024-01-18T18:09:31+01:00 [core-persistence] Add migration - - - - - 3ef20aa5 by Tony Chemit at 2024-01-18T18:09:31+01:00 [core-persistence] Update report definitions - - - - - 36789f59 by Tony Chemit at 2024-01-18T18:09:31+01:00 [core-persistence] Update consolidation conde - - - - - b84d5d20 by Tony Chemit at 2024-01-18T18:09:31+01:00 [core-persistence] Update resources - - - - - a3259078 by Tony Chemit at 2024-01-18T18:09:31+01:00 [core-persistence] Update tests - - - - - 29f0a842 by Tony Chemit at 2024-01-18T18:09:31+01:00 [core-services] Update i18n - - - - - b61e9c4b by Tony Chemit at 2024-01-18T18:09:31+01:00 [core-services] Update TripServiceLocal - - - - - 656ec1a1 by Tony Chemit at 2024-01-18T18:09:31+01:00 [core-services] Update tests fixtures - - - - - 875ed5c9 by Tony Chemit at 2024-01-18T18:09:31+01:00 [server] Update mapping - - - - - b2edff40 by Tony Chemit at 2024-01-18T18:09:31+01:00 [server] Update public API documentation - - - - - 7429fe4e by Tony Chemit at 2024-01-18T18:09:32+01:00 [client] Update default swing Preferences - - - - - 4feaf720 by Tony Chemit at 2024-01-18T18:09:32+01:00 [client] Update data source editor SPI - - - - - 5027d02e by Tony Chemit at 2024-01-18T18:09:32+01:00 [client] Update ps module - - - - - fe56c852 by Tony Chemit at 2024-01-18T18:09:32+01:00 [client] Update ll module - - - - - 03edbf52 by Tony Chemit at 2024-01-18T18:09:32+01:00 [client] clean DataSourceEditor.jaxx file - - - - - f37f5060 by Tony Chemit at 2024-01-18T18:09:32+01:00 [client] update pg scripts - - - - - 447d46c8 by Tony Chemit at 2024-01-18T18:09:32+01:00 [client] update i18n - - - - - 4d709b5e by Tony Chemit at 2024-01-18T18:09:32+01:00 [client] update consolidation action - - - - - 1b752348 by Tony Chemit at 2024-01-18T18:09:32+01:00 [client] update runner tests - - - - - 30 changed files: - client/core/src/main/resources/observe-swing-preferences.properties - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminTabUIHandler.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/actions/Start.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/pairing/ActivityPairingUIHandler.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/pairing/actions/Prepare.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/DataSourceEditor.jaxx - client/datasource/editor/ll/src/main/capabilities/fr/ird/observe/client/datasource/editor/ll/data/logbook/ActivityUI.capabilities - + client/datasource/editor/ll/src/main/capabilities/fr/ird/observe/client/datasource/editor/ll/data/logbook/FishingSetUI.capabilities - − client/datasource/editor/ll/src/main/capabilities/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetUI.capabilities - client/datasource/editor/ll/src/main/capabilities/fr/ird/observe/client/datasource/editor/ll/data/observation/ActivityUI.capabilities - + client/datasource/editor/ll/src/main/capabilities/fr/ird/observe/client/datasource/editor/ll/data/observation/FishingSetUI.capabilities - − client/datasource/editor/ll/src/main/capabilities/fr/ird/observe/client/datasource/editor/ll/data/observation/SetUI.capabilities - client/datasource/editor/ll/src/main/i18n/getters/java.getter - client/datasource/editor/ll/src/main/i18n/getters/jaxx.getter - client/datasource/editor/ll/src/main/i18n/getters/navigation.getter - client/datasource/editor/ll/src/main/i18n/getters/validation-messages.getter - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/ActivityUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/ActivityUI.jcss - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/ActivityUIHandler.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetBaitsCompositionUI.jaxx → client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/FishingSetBaitsCompositionUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetBaitsCompositionUI.jcss → client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/FishingSetBaitsCompositionUI.jcss - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetBaitsCompositionUIModelStates.java → client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/FishingSetBaitsCompositionUIModelStates.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetBranchlinesCompositionUI.jaxx → client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/FishingSetBranchlinesCompositionUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetBranchlinesCompositionUI.jcss → client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/FishingSetBranchlinesCompositionUI.jcss - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetBranchlinesCompositionUIModelStates.java → client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/FishingSetBranchlinesCompositionUIModelStates.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetCatchUI.jaxx → client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/FishingSetCatchUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetCatchUI.jcss → client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/FishingSetCatchUI.jcss - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetCatchUIHandler.java → client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/FishingSetCatchUIHandler.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetCatchUIModelStates.java → client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/FishingSetCatchUIModelStates.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetCatchUITableModel.java → client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/FishingSetCatchUITableModel.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/3ee835e01668f2cedc4d5cee… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/3ee835e01668f2cedc4d5cee… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] [client-actions] Pouvoir rejourer l'assistant d'appairement des activités - Closes #2831
by Tony CHEMIT (＠tchemit) Jan. 18, 2024

Jan. 18, 2024

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 4d23a36c by Tony Chemit at 2024-01-18T18:09:20+01:00 [client-actions] Pouvoir rejourer l'assistant d'appairement des activités - Closes #2831 - - - - - 3 changed files: - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminTabUIHandler.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/pairing/ActivityPairingUIHandler.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/pairing/actions/Prepare.java Changes: ===================================== client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminTabUIHandler.java ===================================== @@ -193,7 +193,7 @@ public class AdminTabUIHandler<U extends AdminTabUI> implements WithClientUICont protected void onComingFromNextStepAdjust() { AdminUIModel model = ui.getModel(); - if (model.containsOperation(AdminStep.VALIDATE) || + if (model.containsOperation(AdminStep.VALIDATE) || model.containsOperation(AdminStep.ACTIVITY_PAIRING) || (model.containsOperation(AdminStep.CONSOLIDATE) && !model.containsOperation(AdminStep.EXPORT_DATA))) { if (model.getStepState(AdminStep.CONSOLIDATE) == WizardState.SUCCESSED) { // set back to pending consolidate step @@ -203,6 +203,9 @@ public class AdminTabUIHandler<U extends AdminTabUI> implements WithClientUICont model.setStepState(AdminStep.VALIDATE, WizardState.PENDING); // reset report model model.getValidateModel().reset(); + } else if (model.getStepState(AdminStep.ACTIVITY_PAIRING) == WizardState.NEED_FIX || model.getStepState(AdminStep.ACTIVITY_PAIRING) == WizardState.SUCCESSED) { + // set back to pending activity pairing step + model.setStepState(AdminStep.ACTIVITY_PAIRING, WizardState.PENDING); } } } ===================================== client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/pairing/ActivityPairingUIHandler.java ===================================== @@ -37,5 +37,6 @@ public class ActivityPairingUIHandler extends AdminTabUIHandler<ActivityPairingU super.afterInit(ui); setAutoStart(ui.getPrepare()); hideFixedPanelLabel(ui); + ui.remove(ui.getDescriptionContainer()); } } ===================================== client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/pairing/actions/Prepare.java ===================================== @@ -87,7 +87,6 @@ public class Prepare extends ActivityPairingUIActionSupport { } break; } - ui.getModel().setWasDone(true); stepModel.recomputeSelectedValues(); return WizardState.NEED_FIX; } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/4d23a36c687aeaa4d08b6329f… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/4d23a36c687aeaa4d08b6329f… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch feature/issue-2830
by Tony CHEMIT (＠tchemit) Jan. 18, 2024

Jan. 18, 2024

Tony CHEMIT pushed new branch feature/issue-2830 at ultreiaio / ird-observe -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/tree/feature/issue-2830 You're receiving this email because of your account on gitlab.com.

1 0