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

[Git][ultreiaio/ird-observe][feature/issue_2755] stash
by Tony CHEMIT (＠tchemit) Nov. 16, 2023

Nov. 16, 2023

Tony CHEMIT pushed to branch feature/issue_2755 at ultreiaio / ird-observe Commits: 45538604 by Tony Chemit at 2023-11-16T18:49:02+01:00 stash - - - - - 7 changed files: - client/datasource/actions/src/main/resources/report/html/default/report.html → client/datasource/actions/src/main/i18n/templates/reportHtmlExport_en_GB.ftl - + client/datasource/actions/src/main/i18n/templates/reportHtmlExport_es_ES.ftl - + client/datasource/actions/src/main/i18n/templates/reportHtmlExport_fr_FR.ftl - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/report/ResultJsonModel.java → client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/report/HtmlExportModel.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/report/ReportModel.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/report/ResultTableModel.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/report/actions/ExportToHtml.java Changes: ===================================== client/datasource/actions/src/main/resources/report/html/default/report.html → client/datasource/actions/src/main/i18n/templates/reportHtmlExport_en_GB.ftl ===================================== @@ -74,7 +74,7 @@ } new gridjs.Grid(config).render(container); } - var json = ${json}; + var json = ${data}; </script> </head> <body> ===================================== client/datasource/actions/src/main/i18n/templates/reportHtmlExport_es_ES.ftl ===================================== @@ -0,0 +1,21 @@ +<#-- + #%L + ObServe Client :: DataSource :: Actions + %% + Copyright (C) 2008 - 2023 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% +--> ===================================== client/datasource/actions/src/main/i18n/templates/reportHtmlExport_fr_FR.ftl ===================================== @@ -0,0 +1,263 @@ +<#-- @ftlvariable name=".data_model" type="fr.ird.observe.client.datasource.actions.report.HtmlExportModel" --> +<!DOCTYPE html> + + +<html lang="en"> +<head> + <link href="https://unpkg.com/gridjs/dist/theme/mermaid.min.css" rel="stylesheet"/> + <title>Report...</title> + <script src="https://unpkg.com/gridjs/dist/gridjs.umd.js"></script> + <style> + .config-panel { + padding: 10px; + margin: 10px 0; + background: #fcfcfc; + border: 1px solid #e9e9e9; + display: inline-block; + } + + .config-panel label { + margin-right: 10px; + } + + td.gridjs-td { + background-color: transparent; + } + + tr:nth-child(even) { + background-color: #dddddd; + } + </style> + <script type="application/javascript"> + const config = { + language: { + 'search': { + 'placeholder': '🔍 Recherche...' + } + } + }; + const json = ${.data_model.json}; + </script> +</head> +<body> +<h1>Rapport ${.data_model.selectedReport.name}</h1> +<h2>Configuration</h2> +<h3>Données sélectionnées :</h3> +<ul> + <li> + <#assign selectDataModel = .data_model.selectDataModel.selectionDataModel /> + <#assign selectDataCount = selectDataModel.getSelectedCount() /> + + <#if selectDataCount == 1> 1 marée <#else> ${selectDataCount} marées</#if>. + <ul> + <#list selectDataModel.getSelectedLabels() as key, value> + <li> + ${key} + <ul> + <#list value as trip> + <li>${trip}</li> + </#list> + </ul> + </li> + </#list> + </ul> + </li> +</ul> +<h3>Rapport sélectionné :</h3> + +<#assign selectedReport = .data_model.selectedReport /> +<p><b>${selectedReport.name}</b></p> +<#list selectedReport.getVariables() as variable> + <li> + Variable ${variable.name} : ${variable.selectedValue}. + </li> +</#list> +<h2>Résultat</h2> + +<div class="config-panel"> + <label><input id="search" type="checkbox" class="action" checked/> Search</label> + <label><input id="resizable" type="checkbox" class="action" checked/> Colonnes redimensionnables</label> + <label><input id="sort" type="checkbox" class="action" checked/> Sorting</label> + <label><input id="pagination" type="checkbox" class="action"/> Pagination</label> + <label>Page size<input id="paginationSize" type="number" disabled value="20"/></label> +</div> +<div id="wrapperParent"> + <div id="wrapper"></div> +</div> +<script type="application/javascript"> + const gridContainerParent = document.getElementById("wrapperParent"); + const searchOption = document.getElementById("search"); + const resizableOption = document.getElementById("resizable"); + const paginationOption = document.getElementById("pagination"); + const paginationSizeOption = document.getElementById("paginationSize"); + const sortOption = document.getElementById("sort"); + + // FIXME Use options value from the very beginning :) + + let grid = new gridjs.Grid({ + search: true, resizable: true, sort: true, + language: config.language, data: [] + }); + + function initGrid(json, container) { + let config = {data: json.data.data}; + if (!!json.columnNames) { + config.columns = json.columnNames; + } else { + config.columns = null; + } + grid.updateConfig(config).render(container); + } + + initGrid(json, document.getElementById("wrapper")); + + function toggle(source) { + let newValue = source.checked; + let option = source.id; + switch (option) { + case "search": + toggleSearch(newValue); + break; + case "resizable": + toggleResizable(newValue); + break; + case "pagination": + togglePagination(newValue); + break; + case "paginationSize": + changePaginationSize(newValue); + break; + case "sort": + toggleSort(newValue); + break; + } + } + + function toggleSearch(newValue) { + console.info("Toggle search to: " + newValue); + let newConfig = { + language: config.language, + data: grid.config.data, + columns: grid.config.columns, + resizable: resizableOption.checked, + pagination: paginationOption.checked ? {limit: paginationSizeOption.value} : false, + sort: sortOption.checked + }; + if (newValue) { + newConfig.search = true; + } + updateGrid(newConfig); + } + + function toggleResizable(newValue) { + console.info("Toggle resizable to: " + newValue); + let newConfig = { + language: config.language, + data: grid.config.data, + columns: grid.config.columns, + search: searchOption.checked, + pagination: paginationOption.checked ? {limit: paginationSizeOption.value} : false, + sort: sortOption.checked + }; + if (newValue) { + newConfig.resizable = true; + } + updateGrid(newConfig); + } + + function toggleSort(newValue) { + console.info("Toggle sort to: " + newValue); + let newConfig = { + language: config.language, + data: grid.config.data, + columns: grid.config.columns, + search: searchOption.checked, + pagination: paginationOption.checked ? {limit: paginationSizeOption.value} : false, + resizable: resizableOption.checked + }; + if (newValue) { + newConfig.sort = true; + } + updateGrid(newConfig); + } + + function togglePagination(newValue) { + console.info("Toggle pagination to: " + newValue); + let newConfig = { + language: config.language, + data: grid.config.data, + columns: grid.config.columns, + search: searchOption.checked, + resizable: resizableOption.checked, + sort: sortOption.checked, + }; + if (newValue) { + newConfig.pagination = { + limit: paginationSizeOption.value + }; + paginationSizeOption["disabled"] = null; + } else { + + paginationSizeOption.disabled = true; + } + + + updateGrid(newConfig); + } + + function changePaginationSize(newValue) { + console.info("Change pagination size to: " + newValue); + let newConfig = { + language: config.language, + data: grid.config.data, + columns: grid.config.columns, + search: searchOption.checked, + resizable: resizableOption.checked, + sort: sortOption.checked, + pagination: { + limit: paginationSizeOption.value + } + }; + updateGrid(newConfig); + } + + function updateGrid(newConfig) { + gridContainerParent.innerHTML = "<div id=\"wrapper\"></div>"; + console.info(newConfig); + setTimeout(() => { + grid = new gridjs.Grid(newConfig).render(document.getElementById("wrapper")); + }, 200); + } + + let actions = document.getElementsByClassName("action"); + for (const action of document.getElementsByClassName("action")) { + action.addEventListener("click", function (event) { + toggle(this); + }); + } + paginationSizeOption.addEventListener("change", function (event) { + toggle(this); + }); +</script> +</body> +</html> ===================================== client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/report/ResultJsonModel.java → client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/report/HtmlExportModel.java ===================================== @@ -22,6 +22,10 @@ package fr.ird.observe.client.datasource.actions.report; * #L% */ +import com.google.gson.Gson; +import fr.ird.observe.client.datasource.actions.config.SelectDataModel; +import fr.ird.observe.report.Report; +import io.ultreia.java4all.application.template.spi.GenerateTemplate; import io.ultreia.java4all.util.matrix.DataMatrix; import java.util.List; @@ -34,24 +38,52 @@ import java.util.List; * @author Tony Chemit - dev(a)tchemit.fr * @since 9.3.0 */ -public class ResultJsonModel { +@GenerateTemplate(template = "reportHtmlExport.ftl") +public class HtmlExportModel { + /** + * Selected report. + */ + private final transient Report selectedReport; + /** + * Selected data model. + */ + private final transient SelectDataModel selectDataModel; private final List<String> columnNames; private final List<String> rowNames; private final DataMatrix data; private final boolean withColumnHeader; private final boolean withRowHeader; + private final transient String json; - public ResultJsonModel(List<String> columnNames, + public HtmlExportModel(Gson gson, + Report selectedReport, + SelectDataModel selectDataModel, + List<String> columnNames, List<String> rowNames, DataMatrix data, boolean withColumnHeader, boolean withRowHeader) { + this.selectedReport = selectedReport; + this.selectDataModel = selectDataModel; this.columnNames = columnNames; this.rowNames = rowNames; this.data = data; this.withColumnHeader = withColumnHeader; this.withRowHeader = withRowHeader; + this.json = gson.toJson(this); + } + + public String getJson() { + return json; + } + + public Report getSelectedReport() { + return selectedReport; + } + + public SelectDataModel getSelectDataModel() { + return selectDataModel; } public List<String> getColumnNames() { ===================================== client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/report/ReportModel.java ===================================== @@ -601,6 +601,11 @@ public class ReportModel extends AdminActionModel { } } + public HtmlExportModel toJsonModel() { + + return new HtmlExportModel(getClientConfig().getGsonSupplier().get(), getSelectedReport(), selectDataModel, getResultModel().getColumnNames(), getResultModel().getRowNames(), getResultModel().getData(), getResultModel().isWithColumnHeader(), getResultModel().isWithRowHeader()); + } + private Map<String, FilterableComboBox<?>> initVariableComponents(ReportUI ui, Report report) { Map<String, FilterableComboBox<?>> result = new TreeMap<>(); JPanel variablesPanel = ui.getReportVariableSelectorPanel(); ===================================== client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/report/ResultTableModel.java ===================================== @@ -236,6 +236,26 @@ public class ResultTableModel extends AbstractTableModel { return data == null ? null : data.getValue(columnIndex, rowIndex); } + public List<String> getColumnNames() { + return columnNames; + } + + public List<String> getRowNames() { + return rowNames; + } + + public DataMatrix getData() { + return data; + } + + public boolean isWithColumnHeader() { + return withColumnHeader; + } + + public boolean isWithRowHeader() { + return withRowHeader; + } + public String getClipboardContent(boolean copyRowHeaders, boolean copyColumnHeaders) { return getDataContent(copyRowHeaders, copyColumnHeaders, true, '\t'); } @@ -264,8 +284,4 @@ public class ResultTableModel extends AbstractTableModel { result += data.getClipboardContent(copyRowHeaders || !withRowHeader, true, escapeCell, separator); return result; } - - public ResultJsonModel toJsonModel() { - return new ResultJsonModel(columnNames, rowNames, data, withColumnHeader, withRowHeader); - } } ===================================== client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/report/actions/ExportToHtml.java ===================================== @@ -22,13 +22,12 @@ package fr.ird.observe.client.datasource.actions.report.actions; * #L% */ -import com.google.common.base.Charsets; -import com.google.common.io.Resources; import fr.ird.observe.client.datasource.actions.ObserveKeyStrokesActions; import fr.ird.observe.client.datasource.actions.actions.AdminTabUIActionSupport; +import fr.ird.observe.client.datasource.actions.report.HtmlExportModel; +import fr.ird.observe.client.datasource.actions.report.HtmlExportModelTemplate; import fr.ird.observe.client.datasource.actions.report.ReportModel; import fr.ird.observe.client.datasource.actions.report.ReportUI; -import fr.ird.observe.client.datasource.actions.report.ResultJsonModel; import fr.ird.observe.client.util.UIHelper; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -79,20 +78,14 @@ public class ExportToHtml extends AdminTabUIActionSupport<ReportUI> { // generate data file Path dataFile = exportDirectory.resolve("data.json"); log.info("Generate data file for report ({}) at {}", reportId, dataFile); - ResultJsonModel dataModel = stepModel.getResultModel().toJsonModel(); - String dataContent = getClientConfig().getGsonSupplier().get().toJson(dataModel); + HtmlExportModel dataModel = stepModel.toJsonModel(); + String dataContent = dataModel.getJson(); Files.writeString(dataFile, dataContent); -// // generate javascript file -// Path jsFile = exportDirectory.resolve("report.js"); -// log.info("Generate js file for report ({}) at {}", reportId, jsFile); -// String jsContent = Resources.asCharSource(Resources.getResource("report/html/default/report.js"), Charsets.UTF_8).read(); -// Files.writeString(jsFile, jsContent); - // generate html file Path htmlFile = exportDirectory.resolve("report.html"); log.info("Generate html file for report ({}) at {}", reportId, htmlFile); - String fileContent = Resources.asCharSource(Resources.getResource("report/html/default/report.html"), Charsets.UTF_8).read().replace("${json}", dataContent); + String fileContent = HtmlExportModelTemplate.generate(dataModel); Files.writeString(htmlFile, fileContent); // open html file View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/455386042bf6ae7140dabc8a2… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/455386042bf6ae7140dabc8a2… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch feature/issue_2755
by Tony CHEMIT (＠tchemit) Nov. 15, 2023

Nov. 15, 2023

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

1 0

[Git][ultreiaio/ird-observe][pages] Site checkin for project ObServe (version 9.2.1)
by Tony CHEMIT (＠tchemit) Nov. 14, 2023

Nov. 14, 2023

Tony CHEMIT pushed to branch pages at ultreiaio / ird-observe Commits: 4417bcf0 by Tony Chemit at 2023-11-14T17:48:18+01:00 Site checkin for project ObServe (version 9.2.1) - - - - - 8 changed files: - − 9.2.1-SNAPSHOT/CHANGELOG.html - − 9.2.1-SNAPSHOT/avdth/index.html - − 9.2.1-SNAPSHOT/changelog.html - − 9.2.1-SNAPSHOT/ci-management.html - − 9.2.1-SNAPSHOT/client/changelog.html - − 9.2.1-SNAPSHOT/client/ci-management.html - − 9.2.1-SNAPSHOT/client/client-configuration/changelog.html - − 9.2.1-SNAPSHOT/client/client-configuration/ci-management.html The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/4417bcf0b5fd87aa1d4e25ac3… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/4417bcf0b5fd87aa1d4e25ac3… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Deleted branch release/9.2.1
by Tony CHEMIT (＠tchemit) Nov. 14, 2023

Nov. 14, 2023

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

1 0

[Git][ultreiaio/ird-observe][develop] 5 commits: [jgitflow-maven-plugin]updating poms for branch'release/9.2.1' with non-snapshot versions[skip ci]
by Tony CHEMIT (＠tchemit) Nov. 14, 2023

Nov. 14, 2023

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 26e27715 by Tony Chemit at 2023-11-14T16:52:35+01:00 [jgitflow-maven-plugin]updating poms for branch'release/9.2.1' with non-snapshot versions[skip ci] - - - - - 92131097 by Tony Chemit at 2023-11-14T17:11:52+01:00 [jgitflow-maven-plugin]merging 'release/9.2.1' into 'master' - - - - - ce079ce4 by Tony Chemit at 2023-11-14T17:11:57+01:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 550888fb by Tony Chemit at 2023-11-14T17:11:58+01:00 [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - 90eab29a by Tony Chemit at 2023-11-14T17:11:59+01:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 0 changed files: Changes: View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/cd4f3685afb7205bc80732a1… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/cd4f3685afb7205bc80732a1… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new tag v9.2.1
by Tony CHEMIT (＠tchemit) Nov. 14, 2023

Nov. 14, 2023

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

1 0

[Git][ultreiaio/ird-observe][release/9.2.1] [jgitflow-maven-plugin]updating poms for branch'release/9.2.1' with non-snapshot versions[skip ci]
by Tony CHEMIT (＠tchemit) Nov. 14, 2023

Nov. 14, 2023

Tony CHEMIT pushed to branch release/9.2.1 at ultreiaio / ird-observe Commits: 26e27715 by Tony Chemit at 2023-11-14T16:52:35+01:00 [jgitflow-maven-plugin]updating poms for branch'release/9.2.1' with non-snapshot versions[skip ci] - - - - - 30 changed files: - client/configuration/pom.xml - client/core/pom.xml - client/datasource/actions/pom.xml - client/datasource/editor/api-test/pom.xml - client/datasource/editor/api/pom.xml - client/datasource/editor/common/pom.xml - client/datasource/editor/ll/pom.xml - client/datasource/editor/pom.xml - client/datasource/editor/ps/pom.xml - client/datasource/editor/spi/pom.xml - client/datasource/pom.xml - client/pom.xml - client/runner/pom.xml - core/api/dto-consolidation/pom.xml - core/api/dto-decoration/pom.xml - core/api/dto-validation/pom.xml - core/api/dto/pom.xml - core/api/pom.xml - core/api/services/pom.xml - core/api/tree/pom.xml - core/api/validation/pom.xml - core/persistence/avdth/pom.xml - core/persistence/consolidation/pom.xml - core/persistence/decoration/pom.xml - core/persistence/java/pom.xml - core/persistence/migration/pom.xml - core/persistence/pom.xml - core/persistence/report/pom.xml - core/persistence/resources/pom.xml - core/persistence/test/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/26e2771596b4482aead2517da… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/26e2771596b4482aead2517da… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][master] 16 commits: [jgitflow-maven-plugin]updating poms for 9.2.1-SNAPSHOT development[skip ci]
by Tony CHEMIT (＠tchemit) Nov. 14, 2023

Nov. 14, 2023

Tony CHEMIT pushed to branch master at ultreiaio / ird-observe Commits: 44f91b51 by Tony Chemit at 2023-10-09T11:14:50+02:00 [jgitflow-maven-plugin]updating poms for 9.2.1-SNAPSHOT development[skip ci] - - - - - bbd8662d by Tony Chemit at 2023-10-09T12:03:03+02:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - b3ce84eb by Tony Chemit at 2023-10-09T12:03:04+02:00 [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - 921c45da by Tony Chemit at 2023-10-09T12:03:06+02:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 3a5523c0 by Tony Chemit at 2023-10-09T12:12:57+02:00 Update changelog for v.9.2.0 [skip CI] - - - - - 8af50c62 by Tony Chemit at 2023-10-18T15:38:30+02:00 Improve cache usage in gears (See #2793) - - - - - 489f0113 by Tony Chemit at 2023-11-13T10:09:00+01:00 update pom - - - - - 1aca8fce by Tony Chemit at 2023-11-13T10:27:06+01:00 Erreur migration 9.1 vers 9.2 de la base centrale AZTI - Closes #2801 - - - - - bf41e7c3 by Tony Chemit at 2023-11-13T11:09:58+01:00 Erreur de migration sur bases AZTI locales - Closes #2800 - - - - - dc95c50b by Tony Chemit at 2023-11-13T12:19:19+01:00 Ajout d'un code à transcoder OPERA vers VesselActivity - Closes #2803 - - - - - 0698ab90 by Tony Chemit at 2023-11-13T12:50:00+01:00 Précisions sur les déductions AVDTH ASSOC vers FloatingObject et ObjectMaterial - Closes #2802 - - - - - 52a731b0 by Tony Chemit at 2023-11-14T16:18:08+01:00 Souci de décalage de lignes sur le rapport Vérification des plans de cuve - Closes #2798 - - - - - d1c1551a by Tony Chemit at 2023-11-14T16:18:08+01:00 Ajout d'un code à transcoder OPERA vers VesselActivity - Closes #2803 - - - - - ba36ec10 by Tony Chemit at 2023-11-14T16:50:29+01:00 Update changelog for v.9.2.1 [skip CI] - - - - - 26e27715 by Tony Chemit at 2023-11-14T16:52:35+01:00 [jgitflow-maven-plugin]updating poms for branch'release/9.2.1' with non-snapshot versions[skip ci] - - - - - 92131097 by Tony Chemit at 2023-11-14T17:11:52+01:00 [jgitflow-maven-plugin]merging 'release/9.2.1' into 'master' - - - - - 30 changed files: - CHANGELOG.md - client/configuration/pom.xml - client/core/pom.xml - client/datasource/actions/pom.xml - client/datasource/editor/api-test/pom.xml - client/datasource/editor/api/pom.xml - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/GearUseFeaturesMeasurementsTableModelSupport.java - client/datasource/editor/common/pom.xml - client/datasource/editor/ll/pom.xml - client/datasource/editor/pom.xml - client/datasource/editor/ps/pom.xml - client/datasource/editor/spi/pom.xml - client/datasource/pom.xml - client/pom.xml - client/runner/pom.xml - core/api/dto-consolidation/pom.xml - core/api/dto-decoration/pom.xml - core/api/dto-validation/pom.xml - core/api/dto/pom.xml - core/api/pom.xml - core/api/services/pom.xml - core/api/tree/pom.xml - core/api/validation/pom.xml - core/persistence/avdth/pom.xml - core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/ImportReferentialContext.java - core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/logbook/FloatingObjectReader.java - core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/referential/interceptors/VesselActivityInterceptor.java - core/persistence/consolidation/pom.xml - core/persistence/decoration/pom.xml - core/persistence/java/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/a66fe707621d03218009c347… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/a66fe707621d03218009c347… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] [jgitflow-maven-plugin]updating poms for 9.2.2-SNAPSHOT development[skip ci]
by Tony CHEMIT (＠tchemit) Nov. 14, 2023

Nov. 14, 2023

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: cd4f3685 by Tony Chemit at 2023-11-14T16:52:18+01:00 [jgitflow-maven-plugin]updating poms for 9.2.2-SNAPSHOT development[skip ci] - - - - - 30 changed files: - client/configuration/pom.xml - client/core/pom.xml - client/datasource/actions/pom.xml - client/datasource/editor/api-test/pom.xml - client/datasource/editor/api/pom.xml - client/datasource/editor/common/pom.xml - client/datasource/editor/ll/pom.xml - client/datasource/editor/pom.xml - client/datasource/editor/ps/pom.xml - client/datasource/editor/spi/pom.xml - client/datasource/pom.xml - client/pom.xml - client/runner/pom.xml - core/api/dto-consolidation/pom.xml - core/api/dto-decoration/pom.xml - core/api/dto-validation/pom.xml - core/api/dto/pom.xml - core/api/pom.xml - core/api/services/pom.xml - core/api/tree/pom.xml - core/api/validation/pom.xml - core/persistence/avdth/pom.xml - core/persistence/consolidation/pom.xml - core/persistence/decoration/pom.xml - core/persistence/java/pom.xml - core/persistence/migration/pom.xml - core/persistence/pom.xml - core/persistence/report/pom.xml - core/persistence/resources/pom.xml - core/persistence/test/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/cd4f3685afb7205bc80732a1b… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/cd4f3685afb7205bc80732a1b… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch release/9.2.1
by Tony CHEMIT (＠tchemit) Nov. 14, 2023

Nov. 14, 2023

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

1 0

[Git][ultreiaio/ird-observe][develop] 3 commits: Souci de décalage de lignes sur le rapport Vérification des plans de cuve - Closes #2798
by Tony CHEMIT (＠tchemit) Nov. 14, 2023

Nov. 14, 2023

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 52a731b0 by Tony Chemit at 2023-11-14T16:18:08+01:00 Souci de décalage de lignes sur le rapport Vérification des plans de cuve - Closes #2798 - - - - - d1c1551a by Tony Chemit at 2023-11-14T16:18:08+01:00 Ajout d'un code à transcoder OPERA vers VesselActivity - Closes #2803 - - - - - ba36ec10 by Tony Chemit at 2023-11-14T16:50:29+01:00 Update changelog for v.9.2.1 [skip CI] - - - - - 5 changed files: - CHANGELOG.md - core/persistence/report/src/main/resources/observe-reports.properties - core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ReportService-psLogbookWellPlanCheck.properties - model/src/main/resources/observe-reports-legacy.properties - src/site/markdown/avdth/referential.md Changes: ===================================== CHANGELOG.md ===================================== The diff for this file was not included because it is too large. ===================================== core/persistence/report/src/main/resources/observe-reports.properties ===================================== @@ -920,6 +920,16 @@ report.psLogbookWellPlanCheck.modelType=PS report.psLogbookWellPlanCheck.name=Livre de bord - Vérification des plan de cuves report.psLogbookWellPlanCheck.description=Livre de bord - Vérification des plan de cuves report.psLogbookWellPlanCheck.columns=Code bateau,Nom bateau,Date départ,Date arrivée,Date de route,Numéro activité,Heure activité,Logbook YFT,Logbook SKJ,Logbook BET,Logbook ALB,Logbook Autres,Plan de cuves YFT,Plan de cuves SKJ,Plan de cuves BET,Plan de cuves ALB,Plan de cuves Autres,Logbook Total,Plan de cuves Total,Différence +report.psLogbookWellPlanCheck.repeatVariable.1.name=activity +report.psLogbookWellPlanCheck.repeatVariable.1.type=fr.ird.observe.entities.data.ps.logbook.Activity +report.psLogbookWellPlanCheck.repeatVariable.1.request=Select a \ +From TripImpl t \ +Join t.routeLogbook r \ +Join r.activity a \ +Join t.vessel vessel \ +Left Join a.vesselActivity vesselActivity \ +Where t.id In :tripId and vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' \ +Order By vessel.code,t.startDate,r.date,a.number,a.time report.psLogbookWellPlanCheck.request.1.location=0,0 report.psLogbookWellPlanCheck.request.1.layout=row report.psLogbookWellPlanCheck.request.1.request=Select vessel.code,\ @@ -928,7 +938,17 @@ concat(day(t.startDate), '/', month(t.startDate), '/', year(t.startDate)), \ concat(day(t.endDate), '/', month(t.endDate), '/', year(t.endDate)), \ concat(day(r.date), '/', month(r.date), '/', year(r.date)), \ a.number, \ -concat(hour(a.time), ':', minute(a.time)), \ +concat(hour(a.time), ':', minute(a.time)) \ +From TripImpl t \ +Join t.routeLogbook r \ +Join r.activity a \ +Join t.vessel vessel \ +Where t.id In :tripId and a = :activity +report.psLogbookWellPlanCheck.request.1.repeat.name=activity +report.psLogbookWellPlanCheck.request.1.repeat.layout=column +report.psLogbookWellPlanCheck.request.2.location=7,0 +report.psLogbookWellPlanCheck.request.2.layout=row +report.psLogbookWellPlanCheck.request.2.request=Select \ Sum(CASE ct.species.id When 'fr.ird.referential.common.Species#1239832685474#0.8943253454598569' Then ct.weight Else 0.0 End), \ Sum(CASE ct.species.id When 'fr.ird.referential.common.Species#1239832685474#0.975344121171992' Then ct.weight Else 0.0 End), \ Sum(CASE ct.species.id When 'fr.ird.referential.common.Species#1239832685475#0.13349466123905152' Then ct.weight Else 0.0 End), \ @@ -942,14 +962,12 @@ From TripImpl t \ Join t.routeLogbook r \ Join r.activity a \ Join a.catches ct \ -Join t.vessel vessel \ -Left Join a.vesselActivity vesselActivity \ -Where t.id In :tripId and vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' \ -Group By vessel.code,vessel.label2,t.startDate,t.endDate,r.date,a.time,a.number \ -Order By vessel.code,t.startDate,r.date,a.time -report.psLogbookWellPlanCheck.request.2.location=12,0 -report.psLogbookWellPlanCheck.request.2.layout=row -report.psLogbookWellPlanCheck.request.2.request=Select \ +Where t.id In :tripId and a = :activity +report.psLogbookWellPlanCheck.request.2.repeat.name=activity +report.psLogbookWellPlanCheck.request.2.repeat.layout=column +report.psLogbookWellPlanCheck.request.3.location=12,0 +report.psLogbookWellPlanCheck.request.3.layout=row +report.psLogbookWellPlanCheck.request.3.request=Select \ Sum(CASE was.species.id When 'fr.ird.referential.common.Species#1239832685474#0.8943253454598569' Then was.weight Else 0.0 End), \ Sum(CASE was.species.id When 'fr.ird.referential.common.Species#1239832685474#0.975344121171992' Then was.weight Else 0.0 End), \ Sum(CASE was.species.id When 'fr.ird.referential.common.Species#1239832685475#0.13349466123905152' Then was.weight Else 0.0 End), \ @@ -963,41 +981,31 @@ From TripImpl t \ Join t.well w \ Join w.wellActivity wa \ Join wa.wellActivitySpecies was \ -Join t.routeLogbook r \ -Join r.activity a \ -Join t.vessel vessel \ -Left Join a.vesselActivity vesselActivity \ -Where t.id In :tripId and wa.activity = a and vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' \ -Group By vessel.code,vessel.label2,t.startDate,t.endDate,r.date,a.time,a.number \ -Order By vessel.code,t.startDate,r.date,a.time -report.psLogbookWellPlanCheck.request.3.location=17,0 -report.psLogbookWellPlanCheck.request.3.layout=row -report.psLogbookWellPlanCheck.request.3.request=Select \ +Where t.id In :tripId and wa.activity = :activity +report.psLogbookWellPlanCheck.request.3.repeat.name=activity +report.psLogbookWellPlanCheck.request.3.repeat.layout=column +report.psLogbookWellPlanCheck.request.4.location=17,0 +report.psLogbookWellPlanCheck.request.4.layout=row +report.psLogbookWellPlanCheck.request.4.request=Select \ Sum(ct.weight) \ From TripImpl t \ Join t.routeLogbook r \ Join r.activity a \ Join a.catches ct \ -Join t.vessel vessel \ -Left Join a.vesselActivity vesselActivity \ -Where t.id In :tripId and vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' \ -Group By vessel.code,vessel.label2,t.startDate,t.endDate,r.date,a.time,a.number \ -Order By vessel.code,t.startDate,r.date,a.time -report.psLogbookWellPlanCheck.request.4.location=18,0 -report.psLogbookWellPlanCheck.request.4.layout=row -report.psLogbookWellPlanCheck.request.4.request=Select \ +Where t.id In :tripId and a = :activity +report.psLogbookWellPlanCheck.request.4.repeat.name=activity +report.psLogbookWellPlanCheck.request.4.repeat.layout=column +report.psLogbookWellPlanCheck.request.5.location=18,0 +report.psLogbookWellPlanCheck.request.5.layout=row +report.psLogbookWellPlanCheck.request.5.request=Select \ Sum(was.weight) \ From TripImpl t \ Join t.well w \ Join w.wellActivity wa \ Join wa.wellActivitySpecies was \ -Join t.routeLogbook r \ -Join r.activity a \ -Join t.vessel vessel \ -Left Join a.vesselActivity vesselActivity \ -Where t.id In :tripId and wa.activity = a and vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' \ -Group By vessel.code,vessel.label2,t.startDate,t.endDate,r.date,a.time,a.number \ -Order By vessel.code,t.startDate,r.date,a.time +Where t.id In :tripId and wa.activity = :activity +report.psLogbookWellPlanCheck.request.5.repeat.name=activity +report.psLogbookWellPlanCheck.request.5.repeat.layout=column report.psLogbookWellPlanCheck.operations.1.type=SubtractColum report.psLogbookWellPlanCheck.operations.1.parameters=17|18|19 report.psLogbookWellPlanCheck.operations.2.type=SumColumn ===================================== core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ReportService-psLogbookWellPlanCheck.properties ===================================== @@ -20,13 +20,16 @@ # #L% ### result.0=483^CAP BOJADOR^30/3/2019^8/4/2019^30/3/2019^1^15:12^0.0^123.0^43.0^0.0^0.0^0.0^0.0^12.0^0.0^0.0^166.0^12.0^154.0 +result.1=483^CAP BOJADOR^30/3/2019^8/4/2019^1/4/2019^1^15:12^null^null^null^null^null^null^null^null^null^null^null^null^- +result.2=483^CAP BOJADOR^30/3/2019^8/4/2019^1/4/2019^1^15:12^null^null^null^null^null^null^null^null^null^null^null^null^- +result.3=Total^null^null^null^null^null^-^0.0^123.0^43.0^0.0^0.0^0.0^0.0^12.0^0.0^0.0^166.0^12.0^- result.columns=20 -result.rows=1 +result.rows=4 syntax.columns=20 syntax.columnsHeader=Code bateau^Nom bateau^Date départ^Date arrivée^Date de route^Numéro activité^Heure activité^Logbook YFT^Logbook SKJ^Logbook BET^Logbook ALB^Logbook Autres^Plan de cuves YFT^Plan de cuves SKJ^Plan de cuves BET^Plan de cuves ALB^Plan de cuves Autres^Logbook Total^Plan de cuves Total^Différence syntax.description=Livre de bord - Vérification des plan de cuves syntax.name=Livre de bord - Vérification des plan de cuves -syntax.nbRequests=4 +syntax.nbRequests=5 syntax.rows=-1 syntax.rowsHeader= tripIds=${PS_COMMON_TRIP},${PS_COMMON_TRIP_MOVE} ===================================== model/src/main/resources/observe-reports-legacy.properties ===================================== @@ -1387,33 +1387,29 @@ Order By vessel.code,t.startDate,t.endDate,w.well,r.date,a.time report.psLogbookWellPlanCheck.modelType=PS report.psLogbookWellPlanCheck.name=Livre de bord - Vérification des plan de cuves report.psLogbookWellPlanCheck.description=Livre de bord - Vérification des plan de cuves -report.psLogbookWellPlanCheck.columns=Code bateau,\ -Nom bateau,\ -Date départ,\ -Date arrivée,\ -Date de route,\ -Numéro activité,\ -Heure activité,\ -Logbook YFT,\ -Logbook SKJ,\ -Logbook BET,\ -Logbook ALB,\ -Logbook Autres,\ -Plan de cuves YFT,\ -Plan de cuves SKJ,\ -Plan de cuves BET,\ -Plan de cuves ALB,\ -Plan de cuves Autres,\ -Logbook Total,\ -Plan de cuves Total,\ -Différence +report.psLogbookWellPlanCheck.columns=Code bateau,Nom bateau,Date départ,Date arrivée,Date de route,Numéro activité,Heure activité,Logbook YFT,Logbook SKJ,Logbook BET,Logbook ALB,Logbook Autres,Plan de cuves YFT,Plan de cuves SKJ,Plan de cuves BET,Plan de cuves ALB,Plan de cuves Autres,Logbook Total,Plan de cuves Total,Différence +report.psLogbookWellPlanCheck.repeatVariable.activity=fr.ird.observe.entities.data.ps.logbook.Activity|Select a \ +From TripImpl t \ +Join t.routeLogbook r \ +Join r.activity a \ +Join t.vessel vessel \ +Left Join a.vesselActivity vesselActivity \ +Where t.id In :tripId and vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' \ +Order By vessel.code,t.startDate,r.date,a.number,a.time report.psLogbookWellPlanCheck.request.1=0,0|row|Select vessel.code,\ vessel.label2,\ concat(day(t.startDate), '/', month(t.startDate), '/', year(t.startDate)), \ concat(day(t.endDate), '/', month(t.endDate), '/', year(t.endDate)), \ concat(day(r.date), '/', month(r.date), '/', year(r.date)), \ a.number, \ -concat(hour(a.time), ':', minute(a.time)), \ +concat(hour(a.time), ':', minute(a.time)) \ +From TripImpl t \ +Join t.routeLogbook r \ +Join r.activity a \ +Join t.vessel vessel \ +Where t.id In :tripId and a = :activity +report.psLogbookWellPlanCheck.request.1.repeat=activity|column +report.psLogbookWellPlanCheck.request.2=7,0|row|Select \ Sum(CASE ct.species.id When 'fr.ird.referential.common.Species#1239832685474#0.8943253454598569' Then ct.weight Else 0.0 End), \ Sum(CASE ct.species.id When 'fr.ird.referential.common.Species#1239832685474#0.975344121171992' Then ct.weight Else 0.0 End), \ Sum(CASE ct.species.id When 'fr.ird.referential.common.Species#1239832685475#0.13349466123905152' Then ct.weight Else 0.0 End), \ @@ -1427,12 +1423,9 @@ From TripImpl t \ Join t.routeLogbook r \ Join r.activity a \ Join a.catches ct \ -Join t.vessel vessel \ -Left Join a.vesselActivity vesselActivity \ -Where t.id In :tripId and vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' \ -Group By vessel.code,vessel.label2,t.startDate,t.endDate,r.date,a.time,a.number \ -Order By vessel.code,t.startDate,r.date,a.time -report.psLogbookWellPlanCheck.request.2=12,0|row|Select \ +Where t.id In :tripId and a = :activity +report.psLogbookWellPlanCheck.request.2.repeat=activity|column +report.psLogbookWellPlanCheck.request.3=12,0|row|Select \ Sum(CASE was.species.id When 'fr.ird.referential.common.Species#1239832685474#0.8943253454598569' Then was.weight Else 0.0 End), \ Sum(CASE was.species.id When 'fr.ird.referential.common.Species#1239832685474#0.975344121171992' Then was.weight Else 0.0 End), \ Sum(CASE was.species.id When 'fr.ird.referential.common.Species#1239832685475#0.13349466123905152' Then was.weight Else 0.0 End), \ @@ -1446,37 +1439,24 @@ From TripImpl t \ Join t.well w \ Join w.wellActivity wa \ Join wa.wellActivitySpecies was \ -Join t.routeLogbook r \ -Join r.activity a \ -Join t.vessel vessel \ -Left Join a.vesselActivity vesselActivity \ -Where t.id In :tripId and wa.activity = a and vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' \ -Group By vessel.code,vessel.label2,t.startDate,t.endDate,r.date,a.time,a.number \ -Order By vessel.code,t.startDate,r.date,a.time -report.psLogbookWellPlanCheck.request.3=17,0|row|Select \ +Where t.id In :tripId and wa.activity = :activity +report.psLogbookWellPlanCheck.request.3.repeat=activity|column +report.psLogbookWellPlanCheck.request.4=17,0|row|Select \ Sum(ct.weight) \ From TripImpl t \ Join t.routeLogbook r \ Join r.activity a \ Join a.catches ct \ -Join t.vessel vessel \ -Left Join a.vesselActivity vesselActivity \ -Where t.id In :tripId and vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' \ -Group By vessel.code,vessel.label2,t.startDate,t.endDate,r.date,a.time,a.number \ -Order By vessel.code,t.startDate,r.date,a.time -report.psLogbookWellPlanCheck.request.4=18,0|row|Select \ +Where t.id In :tripId and a = :activity +report.psLogbookWellPlanCheck.request.4.repeat=activity|column +report.psLogbookWellPlanCheck.request.5=18,0|row|Select \ Sum(was.weight) \ From TripImpl t \ Join t.well w \ Join w.wellActivity wa \ Join wa.wellActivitySpecies was \ -Join t.routeLogbook r \ -Join r.activity a \ -Join t.vessel vessel \ -Left Join a.vesselActivity vesselActivity \ -Where t.id In :tripId and wa.activity = a and vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' \ -Group By vessel.code,vessel.label2,t.startDate,t.endDate,r.date,a.time,a.number \ -Order By vessel.code,t.startDate,r.date,a.time +Where t.id In :tripId and wa.activity = :activity +report.psLogbookWellPlanCheck.request.5.repeat=activity|column report.psLogbookWellPlanCheck.operations.1=SubtractColum:17|18|19 report.psLogbookWellPlanCheck.operations.2=SumColumn:0|6 ############################################ ===================================== src/site/markdown/avdth/referential.md ===================================== @@ -241,6 +241,7 @@ Mapping type d'activité 3. On ajoute en plus un système observé **110** et **setSuccessStatus** à **2**. 4. Si un dcp est trouvé alors on utilise un type d'activité introduit en version *9.1.0* qui permet l'ajout de dcp. 5. Le type d'activité a été ajouté lors de la migration de la version *9.1.0* (avant on utilisait *99*) +6. Si **C_OPERA** est supérieur ou égal à **52**, alors on fait correspondre le référentiel avec le même code (il doit alors être présent dans le référentiel). ### REF_SCHOOL_TYPE View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/2a47f0a8590b1a0905c6a5ce… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/2a47f0a8590b1a0905c6a5ce… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Ajout d'un code à transcoder OPERA vers VesselActivity - Closes #2803
by Tony CHEMIT (＠tchemit) Nov. 14, 2023

Nov. 14, 2023

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 2a47f0a8 by Tony Chemit at 2023-11-14T16:03:45+01:00 Ajout d'un code à transcoder OPERA vers VesselActivity - Closes #2803 - - - - - 1 changed file: - src/site/markdown/avdth/referential.md Changes: ===================================== src/site/markdown/avdth/referential.md ===================================== @@ -241,6 +241,7 @@ Mapping type d'activité 3. On ajoute en plus un système observé **110** et **setSuccessStatus** à **2**. 4. Si un dcp est trouvé alors on utilise un type d'activité introduit en version *9.1.0* qui permet l'ajout de dcp. 5. Le type d'activité a été ajouté lors de la migration de la version *9.1.0* (avant on utilisait *99*) +6. Si **C_OPERA** est supérieur ou égal à **52**, alors on fait correspondre le référentiel avec le même code (il doit alors être présent dans le référentiel). ### REF_SCHOOL_TYPE View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/2a47f0a8590b1a0905c6a5ce7… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/2a47f0a8590b1a0905c6a5ce7… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Souci de décalage de lignes sur le rapport Vérification des plans de cuve - Closes #2798
by Tony CHEMIT (＠tchemit) Nov. 14, 2023

Nov. 14, 2023

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 4c54e1be by Tony Chemit at 2023-11-14T15:57:55+01:00 Souci de décalage de lignes sur le rapport Vérification des plans de cuve - Closes #2798 - - - - - 2 changed files: - core/persistence/report/src/main/resources/observe-reports.properties - core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ReportService-psLogbookWellPlanCheck.properties Changes: ===================================== core/persistence/report/src/main/resources/observe-reports.properties ===================================== @@ -920,6 +920,16 @@ report.psLogbookWellPlanCheck.modelType=PS report.psLogbookWellPlanCheck.name=Livre de bord - Vérification des plan de cuves report.psLogbookWellPlanCheck.description=Livre de bord - Vérification des plan de cuves report.psLogbookWellPlanCheck.columns=Code bateau,Nom bateau,Date départ,Date arrivée,Date de route,Numéro activité,Heure activité,Logbook YFT,Logbook SKJ,Logbook BET,Logbook ALB,Logbook Autres,Plan de cuves YFT,Plan de cuves SKJ,Plan de cuves BET,Plan de cuves ALB,Plan de cuves Autres,Logbook Total,Plan de cuves Total,Différence +report.psLogbookWellPlanCheck.repeatVariable.1.name=activity +report.psLogbookWellPlanCheck.repeatVariable.1.type=fr.ird.observe.entities.data.ps.logbook.Activity +report.psLogbookWellPlanCheck.repeatVariable.1.request=Select a \ +From TripImpl t \ +Join t.routeLogbook r \ +Join r.activity a \ +Join t.vessel vessel \ +Left Join a.vesselActivity vesselActivity \ +Where t.id In :tripId and vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' \ +Order By vessel.code,t.startDate,r.date,a.number,a.time report.psLogbookWellPlanCheck.request.1.location=0,0 report.psLogbookWellPlanCheck.request.1.layout=row report.psLogbookWellPlanCheck.request.1.request=Select vessel.code,\ @@ -928,7 +938,17 @@ concat(day(t.startDate), '/', month(t.startDate), '/', year(t.startDate)), \ concat(day(t.endDate), '/', month(t.endDate), '/', year(t.endDate)), \ concat(day(r.date), '/', month(r.date), '/', year(r.date)), \ a.number, \ -concat(hour(a.time), ':', minute(a.time)), \ +concat(hour(a.time), ':', minute(a.time)) \ +From TripImpl t \ +Join t.routeLogbook r \ +Join r.activity a \ +Join t.vessel vessel \ +Where t.id In :tripId and a = :activity +report.psLogbookWellPlanCheck.request.1.repeat.name=activity +report.psLogbookWellPlanCheck.request.1.repeat.layout=column +report.psLogbookWellPlanCheck.request.2.location=7,0 +report.psLogbookWellPlanCheck.request.2.layout=row +report.psLogbookWellPlanCheck.request.2.request=Select \ Sum(CASE ct.species.id When 'fr.ird.referential.common.Species#1239832685474#0.8943253454598569' Then ct.weight Else 0.0 End), \ Sum(CASE ct.species.id When 'fr.ird.referential.common.Species#1239832685474#0.975344121171992' Then ct.weight Else 0.0 End), \ Sum(CASE ct.species.id When 'fr.ird.referential.common.Species#1239832685475#0.13349466123905152' Then ct.weight Else 0.0 End), \ @@ -942,14 +962,12 @@ From TripImpl t \ Join t.routeLogbook r \ Join r.activity a \ Join a.catches ct \ -Join t.vessel vessel \ -Left Join a.vesselActivity vesselActivity \ -Where t.id In :tripId and vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' \ -Group By vessel.code,vessel.label2,t.startDate,t.endDate,r.date,a.time,a.number \ -Order By vessel.code,t.startDate,r.date,a.time -report.psLogbookWellPlanCheck.request.2.location=12,0 -report.psLogbookWellPlanCheck.request.2.layout=row -report.psLogbookWellPlanCheck.request.2.request=Select \ +Where t.id In :tripId and a = :activity +report.psLogbookWellPlanCheck.request.2.repeat.name=activity +report.psLogbookWellPlanCheck.request.2.repeat.layout=column +report.psLogbookWellPlanCheck.request.3.location=12,0 +report.psLogbookWellPlanCheck.request.3.layout=row +report.psLogbookWellPlanCheck.request.3.request=Select \ Sum(CASE was.species.id When 'fr.ird.referential.common.Species#1239832685474#0.8943253454598569' Then was.weight Else 0.0 End), \ Sum(CASE was.species.id When 'fr.ird.referential.common.Species#1239832685474#0.975344121171992' Then was.weight Else 0.0 End), \ Sum(CASE was.species.id When 'fr.ird.referential.common.Species#1239832685475#0.13349466123905152' Then was.weight Else 0.0 End), \ @@ -963,41 +981,31 @@ From TripImpl t \ Join t.well w \ Join w.wellActivity wa \ Join wa.wellActivitySpecies was \ -Join t.routeLogbook r \ -Join r.activity a \ -Join t.vessel vessel \ -Left Join a.vesselActivity vesselActivity \ -Where t.id In :tripId and wa.activity = a and vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' \ -Group By vessel.code,vessel.label2,t.startDate,t.endDate,r.date,a.time,a.number \ -Order By vessel.code,t.startDate,r.date,a.time -report.psLogbookWellPlanCheck.request.3.location=17,0 -report.psLogbookWellPlanCheck.request.3.layout=row -report.psLogbookWellPlanCheck.request.3.request=Select \ +Where t.id In :tripId and wa.activity = :activity +report.psLogbookWellPlanCheck.request.3.repeat.name=activity +report.psLogbookWellPlanCheck.request.3.repeat.layout=column +report.psLogbookWellPlanCheck.request.4.location=17,0 +report.psLogbookWellPlanCheck.request.4.layout=row +report.psLogbookWellPlanCheck.request.4.request=Select \ Sum(ct.weight) \ From TripImpl t \ Join t.routeLogbook r \ Join r.activity a \ Join a.catches ct \ -Join t.vessel vessel \ -Left Join a.vesselActivity vesselActivity \ -Where t.id In :tripId and vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' \ -Group By vessel.code,vessel.label2,t.startDate,t.endDate,r.date,a.time,a.number \ -Order By vessel.code,t.startDate,r.date,a.time -report.psLogbookWellPlanCheck.request.4.location=18,0 -report.psLogbookWellPlanCheck.request.4.layout=row -report.psLogbookWellPlanCheck.request.4.request=Select \ +Where t.id In :tripId and a = :activity +report.psLogbookWellPlanCheck.request.4.repeat.name=activity +report.psLogbookWellPlanCheck.request.4.repeat.layout=column +report.psLogbookWellPlanCheck.request.5.location=18,0 +report.psLogbookWellPlanCheck.request.5.layout=row +report.psLogbookWellPlanCheck.request.5.request=Select \ Sum(was.weight) \ From TripImpl t \ Join t.well w \ Join w.wellActivity wa \ Join wa.wellActivitySpecies was \ -Join t.routeLogbook r \ -Join r.activity a \ -Join t.vessel vessel \ -Left Join a.vesselActivity vesselActivity \ -Where t.id In :tripId and wa.activity = a and vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' \ -Group By vessel.code,vessel.label2,t.startDate,t.endDate,r.date,a.time,a.number \ -Order By vessel.code,t.startDate,r.date,a.time +Where t.id In :tripId and wa.activity = :activity +report.psLogbookWellPlanCheck.request.5.repeat.name=activity +report.psLogbookWellPlanCheck.request.5.repeat.layout=column report.psLogbookWellPlanCheck.operations.1.type=SubtractColum report.psLogbookWellPlanCheck.operations.1.parameters=17|18|19 report.psLogbookWellPlanCheck.operations.2.type=SumColumn ===================================== core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ReportService-psLogbookWellPlanCheck.properties ===================================== @@ -20,13 +20,16 @@ # #L% ### result.0=483^CAP BOJADOR^30/3/2019^8/4/2019^30/3/2019^1^15:12^0.0^123.0^43.0^0.0^0.0^0.0^0.0^12.0^0.0^0.0^166.0^12.0^154.0 +result.1=483^CAP BOJADOR^30/3/2019^8/4/2019^1/4/2019^1^15:12^null^null^null^null^null^null^null^null^null^null^null^null^- +result.2=483^CAP BOJADOR^30/3/2019^8/4/2019^1/4/2019^1^15:12^null^null^null^null^null^null^null^null^null^null^null^null^- +result.3=Total^null^null^null^null^null^-^0.0^123.0^43.0^0.0^0.0^0.0^0.0^12.0^0.0^0.0^166.0^12.0^- result.columns=20 -result.rows=1 +result.rows=4 syntax.columns=20 syntax.columnsHeader=Code bateau^Nom bateau^Date départ^Date arrivée^Date de route^Numéro activité^Heure activité^Logbook YFT^Logbook SKJ^Logbook BET^Logbook ALB^Logbook Autres^Plan de cuves YFT^Plan de cuves SKJ^Plan de cuves BET^Plan de cuves ALB^Plan de cuves Autres^Logbook Total^Plan de cuves Total^Différence syntax.description=Livre de bord - Vérification des plan de cuves syntax.name=Livre de bord - Vérification des plan de cuves -syntax.nbRequests=4 +syntax.nbRequests=5 syntax.rows=-1 syntax.rowsHeader= tripIds=${PS_COMMON_TRIP},${PS_COMMON_TRIP_MOVE} View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/4c54e1be800b656ca0c1493a0… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/4c54e1be800b656ca0c1493a0… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][pages] Site checkin for project ObServe (version 9.2.1-SNAPSHOT)
by Tony CHEMIT (＠tchemit) Nov. 13, 2023

Nov. 13, 2023

Tony CHEMIT pushed to branch pages at ultreiaio / ird-observe Commits: da37e13c by Tony Chemit at 2023-11-13T16:12:38+01:00 Site checkin for project ObServe (version 9.2.1-SNAPSHOT) - - - - - 8 changed files: - + 9.2.1-SNAPSHOT/CHANGELOG.html - + 9.2.1-SNAPSHOT/architecture-logicielle.html - + 9.2.1-SNAPSHOT/avdth/common.html - + 9.2.1-SNAPSHOT/avdth/index.html - + 9.2.1-SNAPSHOT/avdth/landing.html - + 9.2.1-SNAPSHOT/avdth/local_market.html - + 9.2.1-SNAPSHOT/avdth/logbook.html - + 9.2.1-SNAPSHOT/avdth/referential.html The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/da37e13cf872830846a3698ed… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/da37e13cf872830846a3698ed… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Précisions sur les déductions AVDTH ASSOC vers FloatingObject et ObjectMaterial - Closes #2802
by Tony CHEMIT (＠tchemit) Nov. 13, 2023

Nov. 13, 2023

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 0698ab90 by Tony Chemit at 2023-11-13T12:50:00+01:00 Précisions sur les déductions AVDTH ASSOC vers FloatingObject et ObjectMaterial - Closes #2802 - - - - - 4 changed files: - core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/ImportReferentialContext.java - core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/logbook/FloatingObjectReader.java - src/site/markdown/avdth/logbook.md - src/site/markdown/avdth/referential.md Changes: ===================================== core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/ImportReferentialContext.java ===================================== @@ -131,6 +131,7 @@ public class ImportReferentialContext { private ObjectMaterial objectMaterialANLOG; private ObjectMaterial objectMaterialHALOG; private ObjectMaterial objectMaterialVNLOG; + private ObjectMaterial objectMaterialCarrion; private ObservedSystem observedSystem0; private SpeciesCache speciesCache; private ObservedSystem observedSystem20; @@ -225,6 +226,7 @@ public class ImportReferentialContext { transmittingBuoyType98 = transmittingBuoyType.get("98"); objectMaterialFOB = objectMaterial.get("fr.ird.referential.ps.common.ObjectMaterial#0#1.3"); objectMaterialNLOG = objectMaterial.get("fr.ird.referential.ps.common.ObjectMaterial#0#0.51"); + objectMaterialCarrion = objectMaterial.get("fr.ird.referential.ps.common.ObjectMaterial#0#0.57"); objectMaterialDFAD = objectMaterial.get("fr.ird.referential.ps.common.ObjectMaterial#0#0.2"); objectMaterialALOG = objectMaterial.get("fr.ird.referential.ps.common.ObjectMaterial#0#0.59"); objectMaterialAFAD = objectMaterial.get("fr.ird.referential.ps.common.ObjectMaterial#0#0.46"); @@ -328,6 +330,10 @@ public class ImportReferentialContext { return objectMaterialNLOG; } + public ObjectMaterial getObjectMaterialCarrion() { + return objectMaterialCarrion; + } + public ObjectMaterial getObjectMaterialDFAD() { return objectMaterialDFAD; } ===================================== core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/logbook/FloatingObjectReader.java ===================================== @@ -207,7 +207,7 @@ public class FloatingObjectReader extends DataReader<FloatingObject> { /** * Observed system from {@code ACT_ASSOC} which can create a Floating object. */ - public static final Set<String> OBSERVED_SYTEM_CODES_WITH_DCP = Set.of("20", "21", "22", "23", "24", "25"); + public static final Set<String> OBSERVED_SYTEM_CODES_WITH_DCP = Set.of("20", "21", "22", "23", "24", "25", "81"); /** * We need to remove thoses observed system at the end when writing them to activity. * See <a href="https://gitlab.com/ultreiaio/ird-observe/-/issues/2548">issue 2548</a> @@ -323,6 +323,10 @@ public class FloatingObjectReader extends DataReader<FloatingObject> { if (observedSystem != null) { activity.addObservedSystem(observedSystem); } + // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2802 + if (observedSystemCodes.contains("81")) { + activity.addObservedSystem(dataContext.getObservedSystem20()); + } boolean addBuoyFromObservedSystem = addFloatingObjectMaterials(dataContext, resultSet, @@ -380,12 +384,12 @@ public class FloatingObjectReader extends DataReader<FloatingObject> { addObjectMaterial(vesselActivityCode, objectMaterialUsed, dataContext.getObjectMaterialFOB(), whenArriving, whenLeaving, entity); addDefaultObjectMaterialOnUnknownObjectType = false; } else if (observedSystemCodes.contains("21")) { - // add ObjectMaterial 2-1 NLOG - addObjectMaterial(vesselActivityCode, objectMaterialUsed, dataContext.getObjectMaterialNLOG(), whenArriving, whenLeaving, entity); + // add ObjectMaterial 2-1-1 VNLOG + addObjectMaterial(vesselActivityCode, objectMaterialUsed, dataContext.getObjectMaterialVNLOG(), whenArriving, whenLeaving, entity); addDefaultObjectMaterialOnUnknownObjectType = false; } else if (observedSystemCodes.contains("22")) { - // add ObjectMaterial 2-1 NLOG + 1-1 DFAD - addObjectMaterial(vesselActivityCode, objectMaterialUsed, dataContext.getObjectMaterialNLOG(), whenArriving, whenLeaving, entity); + // add ObjectMaterial 2-1-1 VNLOG + 1-1 DFAD + addObjectMaterial(vesselActivityCode, objectMaterialUsed, dataContext.getObjectMaterialVNLOG(), whenArriving, whenLeaving, entity); addObjectMaterial(vesselActivityCode, objectMaterialUsed, dataContext.getObjectMaterialDFAD(), whenArriving, whenLeaving, entity); addDefaultObjectMaterialOnUnknownObjectType = false; addBuoyFromObservedSystem = true; @@ -394,8 +398,7 @@ public class FloatingObjectReader extends DataReader<FloatingObject> { addObjectMaterial(vesselActivityCode, objectMaterialUsed, dataContext.getObjectMaterialALOG(), whenArriving, whenLeaving, entity); addDefaultObjectMaterialOnUnknownObjectType = false; } else if (observedSystemCodes.contains("24")) { - // add ObjectMaterial 2-2 ALOG + 1-1 DFAD - addObjectMaterial(vesselActivityCode, objectMaterialUsed, dataContext.getObjectMaterialALOG(), whenArriving, whenLeaving, entity); + // add ObjectMaterial 1-1 DFAD addObjectMaterial(vesselActivityCode, objectMaterialUsed, dataContext.getObjectMaterialDFAD(), whenArriving, whenLeaving, entity); addDefaultObjectMaterialOnUnknownObjectType = false; addBuoyFromObservedSystem = true; @@ -403,6 +406,10 @@ public class FloatingObjectReader extends DataReader<FloatingObject> { // add ObjectMaterial 1-2 AFAD addObjectMaterial(vesselActivityCode, objectMaterialUsed, dataContext.getObjectMaterialAFAD(), whenArriving, whenLeaving, entity); addDefaultObjectMaterialOnUnknownObjectType = false; + } else if (observedSystemCodes.contains("81")) { + // add ObjectMaterial 2-1-2-1 Carrion + addObjectMaterial(vesselActivityCode, objectMaterialUsed, dataContext.getObjectMaterialCarrion(), whenArriving, whenLeaving, entity); + addDefaultObjectMaterialOnUnknownObjectType = false; } if (floatingObjectExistsInAvdth) { // simple mapping ===================================== src/site/markdown/avdth/logbook.md ===================================== @@ -138,7 +138,7 @@ Dans **AVDTH**, il existe trois notions à considéder : 1. ```ACTIVITE.C_TYP_OBJET``` donne le type de DCP (la valeur ```NULL``` ou ```999``` indique pas de DCP déclaré dans **AVDTH**) 2. ```ACTIVITE.C_TYP_BALISE``` donne le type de balise (la valeur ```NULL``` ou ```999``` indique pas de bouée délcarée dans **AVDTH**) -3. Les valeurs ```20,21,22,23,24,25``` de la table ```ACT_ASSOC.C_ASSOC``` permettent de définir aussi un DCP (et de renseigner les matériaux associés) +3. Les valeurs ```20,21,22,23,24,25,81``` de la table ```ACT_ASSOC.C_ASSOC``` permettent de définir aussi un DCP (et de renseigner les matériaux associés) On va alors interdire l'ajout d'un DCP, si aucune des trois notions précédentes n'est satisfaite, en clair on ne peut pas ajouté un DPC si : @@ -249,11 +249,12 @@ tableau suivant : | ACT_ASSOC.C_ASSOC | ObjectMaterial | |:------------------|:---------------| | 20 | FOB | -| 21 | NLOG | -| 22 [1](#n_6_1) | NLOG + DFAD | +| 21 | VNLOG | +| 22 [1](#n_6_1) | VNLOG + DFAD | | 23 | ALOG | -| 24 [1](#n_6_1) | ALOG DFAD | +| 24 [1](#n_6_1) | DFAD | | 25 | AFAD | +| 81 | Carrion | * Note 1 <a name="n_6_1"></a> ===================================== src/site/markdown/avdth/referential.md ===================================== @@ -184,7 +184,7 @@ Pour transposer tous les codes **ACT_ASSOC.C_ASSOC** en code **ps_common.Observe | 73 | 73 | | 74 | 74 | | 80 | 80 | -| 81 | 81 | +| 81 | 81 + 20 | | 90 | 90 | | 91 | 91 | | 92 | 92 | View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/0698ab90d0d70c21c34fe07da… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/0698ab90d0d70c21c34fe07da… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Ajout d'un code à transcoder OPERA vers VesselActivity - Closes #2803
by Tony CHEMIT (＠tchemit) Nov. 13, 2023

Nov. 13, 2023

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: dc95c50b by Tony Chemit at 2023-11-13T12:19:19+01:00 Ajout d'un code à transcoder OPERA vers VesselActivity - Closes #2803 - - - - - 2 changed files: - core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/ImportReferentialContext.java - core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/referential/interceptors/VesselActivityInterceptor.java Changes: ===================================== core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/ImportReferentialContext.java ===================================== @@ -539,7 +539,7 @@ public class ImportReferentialContext { } public VesselActivity getVesselActivity(String code) { - String observeVesselActivityCode = VesselActivityInterceptor.CODE_MAPPING.get(code); + String observeVesselActivityCode = VesselActivityInterceptor.getObserveCode(code); VesselActivity result = vesselActivity.get(observeVesselActivityCode); return Objects.requireNonNull(result, String.format("Can't find vessel activity wth code: %s", code)); } ===================================== core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/referential/interceptors/VesselActivityInterceptor.java ===================================== @@ -122,14 +122,32 @@ public class VesselActivityInterceptor extends ReferentialInterceptor<VesselActi } } + /** + * See <a href="https://gitlab.com/ultreiaio/ird-observe/-/issues/2803">2803</a> + * + * @param code the avdth code + * @return the observe code + */ + public static String getObserveCode(String code) { + String realCode = CODE_MAPPING.get(code); + if (realCode == null) { + // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2803 + int codeAsInteger = Integer.parseInt(code); + if (codeAsInteger >= 52) { + realCode = code; + } + } + return Objects.requireNonNull(realCode, String.format("Can't find vessel activity wth code: %s", code)); + } + public VesselActivityInterceptor(AvdthReferentialImportContext context) { super(context, VesselActivity.SPI); } @Override protected VesselActivity read(Map<String, VesselActivity> existingIndex, String code) { - String realCode = CODE_MAPPING.get(code); - VesselActivity entity = super.read(existingIndex, Objects.requireNonNull(realCode)); + String realCode = getObserveCode(code); + VesselActivity entity = super.read(existingIndex, realCode); entity.setCode(code); return entity; } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/dc95c50b12f9c4532d3d44062… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/dc95c50b12f9c4532d3d44062… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Erreur de migration sur bases AZTI locales - Closes #2800
by Tony CHEMIT (＠tchemit) Nov. 13, 2023

Nov. 13, 2023

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: bf41e7c3 by Tony Chemit at 2023-11-13T11:09:58+01:00 Erreur de migration sur bases AZTI locales - Closes #2800 - - - - - 4 changed files: - core/persistence/migration/src/main/java/fr/ird/observe/spi/migration/v9/DataSourceMigrationForVersion_9_1.java - + core/persistence/migration/src/main/resources/db/migration/v9/9.1/10_2_add_referential_common_Country_22-common.sql - + core/persistence/migration/src/main/resources/db/migration/v9/9.1/10_2_add_referential_common_Country_72-common.sql - + core/persistence/migration/src/main/resources/db/migration/v9/9.1/10_2_add_referential_common_Country_finalize-common.sql Changes: ===================================== core/persistence/migration/src/main/java/fr/ird/observe/spi/migration/v9/DataSourceMigrationForVersion_9_1.java ===================================== @@ -302,6 +302,10 @@ public class DataSourceMigrationForVersion_9_1 extends ByMajorMigrationVersionRe executor.addScript("09", "adapt_table-common_vessel-add-fields"); // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2646 executor.addScript("10", "adapt_table-common_vessel-rename-field"); + if (withIds) { + // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2800 + addCountries(executor); + } // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2659 executor.addScript("11", "adapt_table-common_fpazone-add-fields"); if (withIds) { @@ -367,6 +371,22 @@ public class DataSourceMigrationForVersion_9_1 extends ByMajorMigrationVersionRe } } + private void addCountries(MigrationVersionResourceExecutor executor) { + Set<String> existingCodes = executor.findMultipleResultAstSet(SqlQuery.wrap("SELECT topiaId FROM common.Country", resultSet -> resultSet.getString(1))); + Set<String> newCodes = new LinkedHashSet<>(); + if (!existingCodes.contains("fr.ird.referential.common.Country#1239832675593#0.24921769452411147")) { + executor.addScript("10_2", "add_referential_common_Country_22"); + newCodes.add("22"); + } + if (!existingCodes.contains("fr.ird.referential.common.Country#1464000000000#0.00072")) { + executor.addScript("10_2", "add_referential_common_Country_72"); + newCodes.add("72"); + } + if (!newCodes.isEmpty()) { + executor.addScript("10_2", "add_referential_common_Country_finalize"); + } + } + private Map<String, List<WellPlanStructure>> splitByTrip(List<WellPlanStructure> existingWellPlan) { String tripId = null; List<WellPlanStructure> forTrip = null; ===================================== core/persistence/migration/src/main/resources/db/migration/v9/9.1/10_2_add_referential_common_Country_22-common.sql ===================================== @@ -0,0 +1,22 @@ +--- +-- #%L +-- ObServe Core :: Persistence :: Migration +-- %% +-- Copyright (C) 2008 - 2023 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% +--- +INSERT INTO common.country (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, uri, homeid, needcomment, status, label1, label2, label3, label4, label5, label6, label7, label8, iso2code, iso3code) VALUES ('fr.ird.referential.common.Country#1239832675593#0.24921769452411147', 22, '2009-04-15 00:00:00.014000', '2020-03-06 16:01:25.630000', '22', null, null, false, 1, 'Mauritius', 'Maurice', 'Mauricio', null, null, null, null, null, 'MU', 'MUS'); \ No newline at end of file ===================================== core/persistence/migration/src/main/resources/db/migration/v9/9.1/10_2_add_referential_common_Country_72-common.sql ===================================== @@ -0,0 +1,22 @@ +--- +-- #%L +-- ObServe Core :: Persistence :: Migration +-- %% +-- Copyright (C) 2008 - 2023 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% +--- +INSERT INTO common.country (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, uri, homeid, needcomment, status, label1, label2, label3, label4, label5, label6, label7, label8, iso2code, iso3code) VALUES ('fr.ird.referential.common.Country#1464000000000#0.00072', 3, '2018-06-13 18:31:03.000000', '2020-03-06 16:21:07.403000', '72', null, null, false, 1, 'Namibia', 'Namibie', 'Namibia', null, null, null, null, null, 'NA', 'NAM'); \ No newline at end of file ===================================== core/persistence/migration/src/main/resources/db/migration/v9/9.1/10_2_add_referential_common_Country_finalize-common.sql ===================================== @@ -0,0 +1,22 @@ +--- +-- #%L +-- ObServe Core :: Persistence :: Migration +-- %% +-- Copyright (C) 2008 - 2023 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% +--- +UPDATE common.LastUpdateDate SET lastUpdateDate = ${CURRENT_TIMESTAMP} WHERE type ='fr.ird.observe.entities.referential.common.Country'; View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/bf41e7c3772e26fcdd2184dae… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/bf41e7c3772e26fcdd2184dae… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: update pom
by Tony CHEMIT (＠tchemit) Nov. 13, 2023

Nov. 13, 2023

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 489f0113 by Tony Chemit at 2023-11-13T10:09:00+01:00 update pom - - - - - 1aca8fce by Tony Chemit at 2023-11-13T10:27:06+01:00 Erreur migration 9.1 vers 9.2 de la base centrale AZTI - Closes #2801 - - - - - 2 changed files: - core/persistence/migration/src/main/resources/db/migration/v9/9.2/13_issue-2787-common.sql - pom.xml Changes: ===================================== core/persistence/migration/src/main/resources/db/migration/v9/9.2/13_issue-2787-common.sql ===================================== @@ -23,30 +23,50 @@ INSERT INTO common.GearCharacteristic (TOPIAID, TOPIAVERSION, TOPIACREATEDATE, LASTUPDATEDATE, CODE, URI, HOMEID, NEEDCOMMENT, STATUS, LABEL1, LABEL2, LABEL3, LABEL4, LABEL5, LABEL6, LABEL7, LABEL8, UNIT, GEARCHARACTERISTICTYPE) VALUES ('fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}027', 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, '27', null, null, false, 1, 'Electric power', 'Puissance électrique', 'Energia electrica', null, null, null, null, null, 'kW', 'fr.ird.referential.common.GearCharacteristicType#1239832686123#0.3'); -- add characteristic (4, 5, 15 and 27) to gear 2 +DELETE FROM common.gear_allowedGearCharacteristic WHERE gear = 'fr.ird.referential.common.Gear#1239832686125#0.1' AND gearCharacteristic = 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.4'; +DELETE FROM common.gear_allowedGearCharacteristic WHERE gear = 'fr.ird.referential.common.Gear#1239832686125#0.1' AND gearCharacteristic = 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.5'; +DELETE FROM common.gear_allowedGearCharacteristic WHERE gear = 'fr.ird.referential.common.Gear#1239832686125#0.1' AND gearCharacteristic = 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.1'; +DELETE FROM common.gear_allowedGearCharacteristic WHERE gear = 'fr.ird.referential.common.Gear#1239832686125#0.1' AND gearCharacteristic = 'fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}027'; INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.1', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.4'); INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ( 'fr.ird.referential.common.Gear#1239832686125#0.1', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.5'); INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ( 'fr.ird.referential.common.Gear#1239832686125#0.1', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.1'); INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ( 'fr.ird.referential.common.Gear#1239832686125#0.1', 'fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}027'); -- add characteristic (4, 5, 15 and 27) to gear 3 +DELETE FROM common.gear_allowedGearCharacteristic WHERE gear = 'fr.ird.referential.common.Gear#1239832686125#0.2' AND gearCharacteristic = 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.4'; +DELETE FROM common.gear_allowedGearCharacteristic WHERE gear = 'fr.ird.referential.common.Gear#1239832686125#0.2' AND gearCharacteristic = 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.5'; +DELETE FROM common.gear_allowedGearCharacteristic WHERE gear = 'fr.ird.referential.common.Gear#1239832686125#0.2' AND gearCharacteristic = 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.1'; +DELETE FROM common.gear_allowedGearCharacteristic WHERE gear = 'fr.ird.referential.common.Gear#1239832686125#0.2' AND gearCharacteristic = 'fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}027'; INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.2', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.4'); INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.2', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.5'); INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.2', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.1'); INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.2', 'fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}027'); -- add characteristic (4, 5, 15 and 27) to gear 4 +DELETE FROM common.gear_allowedGearCharacteristic WHERE gear = 'fr.ird.referential.common.Gear#1239832686125#0.3' AND gearCharacteristic = 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.4'; +DELETE FROM common.gear_allowedGearCharacteristic WHERE gear = 'fr.ird.referential.common.Gear#1239832686125#0.3' AND gearCharacteristic = 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.5'; +DELETE FROM common.gear_allowedGearCharacteristic WHERE gear = 'fr.ird.referential.common.Gear#1239832686125#0.3' AND gearCharacteristic = 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.1'; +DELETE FROM common.gear_allowedGearCharacteristic WHERE gear = 'fr.ird.referential.common.Gear#1239832686125#0.3' AND gearCharacteristic = 'fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}027'; INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.3', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.4'); INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.3', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.5'); INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.3', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.1'); INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.3', 'fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}027'); -- add characteristic (4, 5, 15 and 27) to gear 5 +DELETE FROM common.gear_allowedGearCharacteristic WHERE gear = 'fr.ird.referential.common.Gear#1239832686125#0.4' AND gearCharacteristic = 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.4'; +DELETE FROM common.gear_allowedGearCharacteristic WHERE gear = 'fr.ird.referential.common.Gear#1239832686125#0.4' AND gearCharacteristic = 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.5'; +DELETE FROM common.gear_allowedGearCharacteristic WHERE gear = 'fr.ird.referential.common.Gear#1239832686125#0.4' AND gearCharacteristic = 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.1'; +DELETE FROM common.gear_allowedGearCharacteristic WHERE gear = 'fr.ird.referential.common.Gear#1239832686125#0.4' AND gearCharacteristic = 'fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}027'; INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.4', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.4'); INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.4', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.5'); --- INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.4', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.1'); +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.4', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.1'); INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.4', 'fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}027'); -- add characteristic (4, 5, 15 and 27) to gear 6 +DELETE FROM common.gear_allowedGearCharacteristic WHERE gear = 'fr.ird.referential.common.Gear#1239832686125#0.5' AND gearCharacteristic = 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.4'; +DELETE FROM common.gear_allowedGearCharacteristic WHERE gear = 'fr.ird.referential.common.Gear#1239832686125#0.5' AND gearCharacteristic = 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.5'; +DELETE FROM common.gear_allowedGearCharacteristic WHERE gear = 'fr.ird.referential.common.Gear#1239832686125#0.5' AND gearCharacteristic = 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.1'; +DELETE FROM common.gear_allowedGearCharacteristic WHERE gear = 'fr.ird.referential.common.Gear#1239832686125#0.5' AND gearCharacteristic = 'fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}027'; INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.5', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.4'); INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.5', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.5'); INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.5', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.1'); ===================================== pom.xml ===================================== @@ -23,7 +23,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2023.45</version> + <version>2023.47</version> </parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> @@ -547,7 +547,7 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-text</artifactId> - <version>1.10.0</version> + <version>${lib.version.commons-text}</version> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/8af50c621b21654c6f252ad7… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/8af50c621b21654c6f252ad7… You're receiving this email because of your account on gitlab.com.

1 0