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

[Git][ultreiaio/ird-observe][develop] Move to version 9.3.0-RC-1-SNAPSHOT
by Tony CHEMIT (＠tchemit) Dec. 8, 2023

Dec. 8, 2023

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 300332c3 by Tony Chemit at 2023-12-08T16:04:18+01:00 Move to version 9.3.0-RC-1-SNAPSHOT - - - - - 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/300332c3b9094f5771cb71211… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/300332c3b9094f5771cb71211… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] improve HighlightIfEquals18nReferentialValue (add warning if not error, nor ok) - see #2811
by Tony CHEMIT (＠tchemit) Dec. 8, 2023

Dec. 8, 2023

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: e6513e5c by Tony Chemit at 2023-12-08T15:59:03+01:00 improve HighlightIfEquals18nReferentialValue (add warning if not error, nor ok) - see #2811 - - - - - 4 changed files: - core/persistence/report/src/main/resources/META-INF/report/default/ps/psLogbookTrip.report - src/site/markdown/report/embedded-column-renderers.md - toolkit/api-report/src/main/java/fr/ird/observe/report/renderers/HighlightIfEquals18nReferentialValue.java - toolkit/api-report/src/main/resources/fr/ird/observe/report/renderers/HighlightIfEquals18nReferentialValue.js Changes: ===================================== core/persistence/report/src/main/resources/META-INF/report/default/ps/psLogbookTrip.report ===================================== @@ -76,7 +76,7 @@ Left Join t.advancedSamplingAcquisitionStatus advancedSamplingAcquisitionStatus Where t.id In :tripId \ Order By vessel.code,t.startDate,t.endDate columnRenderers.1.type=HighlightIfEquals18nReferentialValue -columnRenderers.1.parameters=14,15,16,17,18,19,20,21|fr.ird.referential.ps.common.AcquisitionStatus#1464000000000#999 +columnRenderers.1.parameters=14,15,16,17,18,19,20,21|fr.ird.referential.ps.common.AcquisitionStatus#1464000000000#999|fr.ird.referential.ps.common.AcquisitionStatus#1464000000000#001 columnRenderers.2.type=HighlightIfAbsoluteDeltaIsPositive columnRenderers.2.parameters=10|11|0.0001|0.5 columnRenderers.3.type=HighlightIfAbsoluteDeltaIsPositive ===================================== src/site/markdown/report/embedded-column-renderers.md ===================================== @@ -57,5 +57,5 @@ Exemple d'utilisation : ```properties report.xxx.columnRenderers.1.type=HighlightIfEquals18nReferentialValue -report.xxx.columnRenderers.1.parameters=14,15,16,17,18,19,20,21|fr.ird.referential.ps.common.AcquisitionStatus#1464000000000#999 +report.xxx.columnRenderers.1.parameters=14,15,16,17,18,19,20,21|fr.ird.referential.ps.common.AcquisitionStatus#1464000000000#999|fr.ird.referential.ps.common.AcquisitionStatus#1464000000000#000|fr.ird.referential.ps.common.AcquisitionStatus#1464000000000#001 ``` ===================================== toolkit/api-report/src/main/java/fr/ird/observe/report/renderers/HighlightIfEquals18nReferentialValue.java ===================================== @@ -50,12 +50,12 @@ public class HighlightIfEquals18nReferentialValue implements ColumnRendererConsu @Override public int parametersCount() { - return 2; + return 3; } @Override public String parametersSyntax() { - return "column1,column2,...,columnN|id"; + return "column1,column2,...,columnN|idError|idOk"; } @Override @@ -66,15 +66,17 @@ public class HighlightIfEquals18nReferentialValue implements ColumnRendererConsu for (String s : split2) { columns.add(Integer.parseInt(s)); } - String id = split[1]; - return new Parameters(columns, id); + String idError = split[1]; + String idOk = split[2]; + return new Parameters(columns, idError, idOk); } @Override public Parameters createParameters(ReportRequestExecutor requestExecutor, String parameters) { Parameters result = ColumnRendererConsumer.super.createParameters(requestExecutor, parameters); - String label = requestExecutor.getReferentialLabel(result.getId()); - return result.setLabel(label); + String labelError = requestExecutor.getReferentialLabel(result.getIdError()); + String labelOk = requestExecutor.getReferentialLabel(result.getIdOk()); + return result.setLabel(labelError, labelOk); } @Override @@ -82,8 +84,14 @@ public class HighlightIfEquals18nReferentialValue implements ColumnRendererConsu table.addHighlighter(new ColorHighlighter((renderer, adapter) -> { Object value = adapter.getValue(); int column = adapter.convertColumnIndexToModel(adapter.column); - return parameters.getColumns().contains(column) && Objects.equals(value, parameters.getLabel()); + return parameters.getColumns().contains(column) && Objects.equals(value, parameters.getLabelError()); }, Color.RED, Color.BLACK)); + + table.addHighlighter(new ColorHighlighter((renderer, adapter) -> { + Object value = adapter.getValue(); + int column = adapter.convertColumnIndexToModel(adapter.column); + return parameters.getColumns().contains(column) && !Objects.equals(value, parameters.getLabelError()) && !Objects.equals(value, parameters.getLabelOk()); + }, Color.ORANGE, Color.BLACK)); } @Override @@ -93,24 +101,30 @@ public class HighlightIfEquals18nReferentialValue implements ColumnRendererConsu @Override public String htmlInitCode(Parameters parameters) { - return String.format("init%s(%s, '%s', result, data);\n", parameters.name(), parameters.getColumns(), parameters.getLabel()); + return String.format("init%s(%s, '%s', '%s', result, data);\n", parameters.name(), parameters.getColumns(), parameters.getLabelError(), parameters.getLabelOk()); } public static final class Parameters implements ColumnRendererParameters { private final Set<Integer> columns; - private final String id; - private final String label; + private final String idError; + private final String idOk; + private final String labelError; + private final String labelOk; - public Parameters(Set<Integer> columns, String id, String label) { + public Parameters(Set<Integer> columns, String idError, String idOk, String labelError, String labelOk) { this.columns = columns; - this.id = id; - this.label = label; + this.idError = idError; + this.idOk = idOk; + this.labelError = labelError; + this.labelOk = labelOk; } - public Parameters(Set<Integer> columns, String id) { + public Parameters(Set<Integer> columns, String idError, String idOk) { this.columns = columns; - this.id = id; - this.label = null; + this.idError = idError; + this.idOk = idOk; + this.labelError = null; + this.labelOk = null; } @Override @@ -122,16 +136,24 @@ public class HighlightIfEquals18nReferentialValue implements ColumnRendererConsu return columns; } - public String getId() { - return id; + public String getIdError() { + return idError; + } + + public String getIdOk() { + return idOk; + } + + public String getLabelError() { + return labelError; } - public String getLabel() { - return label; + public String getLabelOk() { + return labelOk; } - public Parameters setLabel(String label) { - return new Parameters(columns, id, label); + public Parameters setLabel(String labelError, String labelOk) { + return new Parameters(columns, idError, idOk, labelError, labelOk); } } } ===================================== toolkit/api-report/src/main/resources/fr/ird/observe/report/renderers/HighlightIfEquals18nReferentialValue.js ===================================== @@ -19,24 +19,22 @@ * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ -function HighlightIfEquals18nReferentialValue(cell, label) { - if (!!!cell) { +function HighlightIfEquals18nReferentialValue(cell, labelError, labelOk) { + if (!!!cell || cell === labelOk) { return; } - if (cell === label) { - return { - 'data-cell-content': cell, - 'class': 'gridjs-td cellError', - }; - } + return { + 'data-cell-content': cell, + 'class': 'gridjs-td ' + (cell === labelError ? "cellError" : "cellWarning"), + }; } -function initHighlightIfEquals18nReferentialValue(columns, label, result, json) { +function initHighlightIfEquals18nReferentialValue(columns, labelError, labelOk, result, json) { for (let j = 0; j < columns.length; j++) { let column = columns[j]; result [column] = { name: result [column], - attributes: cell => HighlightIfEquals18nReferentialValue(cell, label) + attributes: cell => HighlightIfEquals18nReferentialValue(cell, labelError, labelOk) }; } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/e6513e5cc5b556636b75adebe… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/e6513e5cc5b556636b75adebe… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 4 commits: [toolkit-api-report] Review i18n API
by Tony CHEMIT (＠tchemit) Dec. 8, 2023

Dec. 8, 2023

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: a5ffcc7d by Tony Chemit at 2023-12-08T15:01:06+01:00 [toolkit-api-report] Review i18n API - - - - - f5dbc4d4 by Tony Chemit at 2023-12-08T15:23:47+01:00 [core-persistence-report] include i18n in each report definition - - - - - 94819d99 by Tony Chemit at 2023-12-08T15:23:47+01:00 [i18n] clean it - - - - - 6ca418c5 by Tony Chemit at 2023-12-08T15:23:55+01:00 Merge branch 'feature/issue-2599' into develop Rendre le fichier de définition des rapports multilingue - See #2599 - - - - - 30 changed files: - client/runner/pom.xml - − core/persistence/report/.mvn/i18n/parse-java - core/persistence/report/pom.xml - − core/persistence/report/src/main/i18n/getters/java.getter - − core/persistence/report/src/main/java/fr/ird/observe/persistence/report/ReportI18nKeys.java - core/persistence/report/src/main/resources/META-INF/report/default/ll/llCommonTripGearUseFeatures.ini - core/persistence/report/src/main/resources/META-INF/report/default/ll/llCommonTripGearUseFeatures.report - core/persistence/report/src/main/resources/META-INF/report/default/ps/psCommonTripGearUseFeatures.report - core/persistence/report/src/main/resources/META-INF/report/default/ps/psLogbookTrip.report - core/persistence/report/src/main/resources/META-INF/report/default/ps/psObservationCatch.report - core/persistence/report/src/main/resources/META-INF/report/default/ps/psObservationCatchTotalCountByGroupPerReasonForDiscard.report - core/persistence/report/src/main/resources/META-INF/report/default/ps/psObservationCatchTotalCountByGroupPerSpeciesFate.report - core/persistence/report/src/main/resources/META-INF/report/default/ps/psObservationCatchWeightByGroupPerReasonForDiscard.report - core/persistence/report/src/main/resources/META-INF/report/default/ps/psObservationCatchWeightByGroupPerSpeciesFate.report - core/persistence/report/src/main/resources/META-INF/report/default/ps/psObservationLengthsDistribution.report - core/services/i18n/pom.xml - core/services/i18n/src/main/i18n/translations/services_en_GB.properties - core/services/i18n/src/main/i18n/translations/services_es_ES.properties - core/services/i18n/src/main/i18n/translations/services_fr_FR.properties - server/runner/pom.xml - toolkit/api-report/src/main/java/fr/ird/observe/report/ReportRequestExecutor.java - toolkit/api-report/src/main/java/fr/ird/observe/report/ReportRequestExecutorI18nContext.java - toolkit/api-report/src/main/java/fr/ird/observe/report/definition/ReportDefinition.java - toolkit/api-report/src/main/java/fr/ird/observe/report/definition/ReportDefinitionsBuilderPropertiesSupport.java - − toolkit/api-report/src/main/java/fr/ird/observe/report/definition/ReportI18nItemDefinition.java - toolkit/api-report/src/main/java/fr/ird/observe/report/definition/ReportI18nItemArrayDefinition.java → toolkit/api-report/src/main/java/fr/ird/observe/report/definition/i18n/ReportI18NNamedStringDefinition.java - toolkit/api-report/src/main/java/fr/ird/observe/report/json/ReportI18nItemDefinitionAdapter.java → toolkit/api-report/src/main/java/fr/ird/observe/report/definition/i18n/ReportI18nDefinition.java - toolkit/api-report/src/main/java/fr/ird/observe/report/ReportI18nKeysProducer.java → toolkit/api-report/src/main/java/fr/ird/observe/report/definition/i18n/ReportI18nObjectDefinition.java - toolkit/api-report/src/main/java/fr/ird/observe/report/json/ReportI18nItemArrayDefinitionAdapter.java → toolkit/api-report/src/main/java/fr/ird/observe/report/definition/i18n/ReportI18nStringArrayDefinition.java - toolkit/api-report/src/main/java/fr/ird/observe/report/definition/ReportI18nIDefinitionSupport.java → toolkit/api-report/src/main/java/fr/ird/observe/report/definition/i18n/ReportI18nStringDefinition.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/d597c79bbdf23cac480b865a… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/d597c79bbdf23cac480b865a… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 6 commits: [toolkit-api-report] Review builder, now we are loading a file per report, for...
by Tony CHEMIT (＠tchemit) Dec. 8, 2023

Dec. 8, 2023

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: c2f1fbed by Tony Chemit at 2023-12-08T11:44:04+01:00 [toolkit-api-report] Review builder, now we are loading a file per report, for detection, use a generated file with mapping of embedded reports - - - - - de0e255d by Tony Chemit at 2023-12-08T11:44:04+01:00 [toolkit-maven-plugin] Add mojo to generate the embedded reports list file - - - - - 7ce2337c by Tony Chemit at 2023-12-08T11:44:04+01:00 [core-persistence-report] Split reports (one file per report) + generate reports list file - - - - - 64e02e7d by Tony Chemit at 2023-12-08T11:44:04+01:00 [core-services-test] Use the DefaultByClassPathReportDefinitionBuilder in services tests - - - - - b00a6359 by Tony Chemit at 2023-12-08T11:44:04+01:00 [client] Remove reportFile configuration option and now use directly the reportDirectory - - - - - d597c79b by Tony Chemit at 2023-12-08T11:45:04+01:00 Merge branch 'feature/issue-2962' into develop Séparer le fichier des reports en plusieurs fichiers - Closes #2962 - - - - - 30 changed files: - client/configuration/pom.xml - client/configuration/src/main/config/Client.ini - client/configuration/src/main/i18n/getters/config.getter - client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientResources.java - client/core/src/main/java/fr/ird/observe/client/main/body/ClientConfigUI.java - client/datasource/actions/src/main/i18n/getters/java.getter - 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/actions/ChooseFileReport.java - client/runner/src/main/i18n/translations/client-runner_en_GB.properties - client/runner/src/main/i18n/translations/client-runner_es_ES.properties - client/runner/src/main/i18n/translations/client-runner_fr_FR.properties - core/persistence/report/pom.xml - + core/persistence/report/src/main/resources/META-INF/report/default/ll/llCommonTripGearUseFeatures.ini - + core/persistence/report/src/main/resources/META-INF/report/default/ll/llCommonTripGearUseFeatures.report - + core/persistence/report/src/main/resources/META-INF/report/default/ll/llLanding.report - + core/persistence/report/src/main/resources/META-INF/report/default/ll/llLogbookActivities.report - + core/persistence/report/src/main/resources/META-INF/report/default/ll/llLogbookCatches.report - + core/persistence/report/src/main/resources/META-INF/report/default/ll/llLogbookSamplesOnActivity.report - + core/persistence/report/src/main/resources/META-INF/report/default/ll/llLogbookSamplesOnBoth.report - + core/persistence/report/src/main/resources/META-INF/report/default/ll/llLogbookSamplesOnTrip.report - + core/persistence/report/src/main/resources/META-INF/report/default/ps/psCommonTripGearUseFeatures.report - + core/persistence/report/src/main/resources/META-INF/report/default/ps/psLocalmarketBatch.report - + core/persistence/report/src/main/resources/META-INF/report/default/ps/psLocalmarketSample.report - + core/persistence/report/src/main/resources/META-INF/report/default/ps/psLocalmarketSurvey.report - + core/persistence/report/src/main/resources/META-INF/report/default/ps/psLogbookActivity.report - + core/persistence/report/src/main/resources/META-INF/report/default/ps/psLogbookSampleMeasures.report - + core/persistence/report/src/main/resources/META-INF/report/default/ps/psLogbookSampleSet.report - + core/persistence/report/src/main/resources/META-INF/report/default/ps/psLogbookSampleSpeciesMeasures.report - + core/persistence/report/src/main/resources/META-INF/report/default/ps/psLogbookSampleSpeciesMeasuresCount.report The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/d5392cdd7e6c8f220b21ec33… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/d5392cdd7e6c8f220b21ec33… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Deleted branch feature/issue-2962
by Tony CHEMIT (＠tchemit) Dec. 8, 2023

Dec. 8, 2023

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

1 0

[Git][ultreiaio/ird-observe][feature/issue-2962] 10 commits: [toolkit-api-report] Fix new json adapter (See #2599)
by Tony CHEMIT (＠tchemit) Dec. 8, 2023

Dec. 8, 2023

Tony CHEMIT pushed to branch feature/issue-2962 at ultreiaio / ird-observe Commits: defe4bce by Tony Chemit at 2023-12-07T17:58:18+01:00 [toolkit-api-report] Fix new json adapter (See #2599) - - - - - f7e26769 by Tony Chemit at 2023-12-07T17:58:23+01:00 Correction de la condition de création d'activités ficitives sur l'import avdth - - - - - 2551e5e5 by Tony Chemit at 2023-12-08T11:43:43+01:00 Add nice method in MojoRunnable in execute a simple Runnable - - - - - 04e62ee0 by Tony Chemit at 2023-12-08T11:43:47+01:00 add SuppressWarnings - - - - - d5392cdd by Tony Chemit at 2023-12-08T11:43:52+01:00 [core-persistence-report] fix ReportI18nKeys keys - See #2599 - - - - - c2f1fbed by Tony Chemit at 2023-12-08T11:44:04+01:00 [toolkit-api-report] Review builder, now we are loading a file per report, for detection, use a generated file with mapping of embedded reports - - - - - de0e255d by Tony Chemit at 2023-12-08T11:44:04+01:00 [toolkit-maven-plugin] Add mojo to generate the embedded reports list file - - - - - 7ce2337c by Tony Chemit at 2023-12-08T11:44:04+01:00 [core-persistence-report] Split reports (one file per report) + generate reports list file - - - - - 64e02e7d by Tony Chemit at 2023-12-08T11:44:04+01:00 [core-services-test] Use the DefaultByClassPathReportDefinitionBuilder in services tests - - - - - b00a6359 by Tony Chemit at 2023-12-08T11:44:04+01:00 [client] Remove reportFile configuration option and now use directly the reportDirectory - - - - - 30 changed files: - client/configuration/pom.xml - client/configuration/src/main/config/Client.ini - client/configuration/src/main/i18n/getters/config.getter - client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientResources.java - client/core/src/main/java/fr/ird/observe/client/main/body/ClientConfigUI.java - client/datasource/actions/src/main/i18n/getters/java.getter - 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/actions/ChooseFileReport.java - client/runner/src/main/i18n/translations/client-runner_en_GB.properties - client/runner/src/main/i18n/translations/client-runner_es_ES.properties - client/runner/src/main/i18n/translations/client-runner_fr_FR.properties - core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/ImportDataContext.java - core/persistence/report/pom.xml - core/persistence/report/src/main/java/fr/ird/observe/persistence/report/ReportI18nKeys.java - + core/persistence/report/src/main/resources/META-INF/report/default/ll/llCommonTripGearUseFeatures.ini - + core/persistence/report/src/main/resources/META-INF/report/default/ll/llCommonTripGearUseFeatures.report - + core/persistence/report/src/main/resources/META-INF/report/default/ll/llLanding.report - + core/persistence/report/src/main/resources/META-INF/report/default/ll/llLogbookActivities.report - + core/persistence/report/src/main/resources/META-INF/report/default/ll/llLogbookCatches.report - + core/persistence/report/src/main/resources/META-INF/report/default/ll/llLogbookSamplesOnActivity.report - + core/persistence/report/src/main/resources/META-INF/report/default/ll/llLogbookSamplesOnBoth.report - + core/persistence/report/src/main/resources/META-INF/report/default/ll/llLogbookSamplesOnTrip.report - + core/persistence/report/src/main/resources/META-INF/report/default/ps/psCommonTripGearUseFeatures.report - + core/persistence/report/src/main/resources/META-INF/report/default/ps/psLocalmarketBatch.report - + core/persistence/report/src/main/resources/META-INF/report/default/ps/psLocalmarketSample.report - + core/persistence/report/src/main/resources/META-INF/report/default/ps/psLocalmarketSurvey.report - + core/persistence/report/src/main/resources/META-INF/report/default/ps/psLogbookActivity.report - + core/persistence/report/src/main/resources/META-INF/report/default/ps/psLogbookSampleMeasures.report - + core/persistence/report/src/main/resources/META-INF/report/default/ps/psLogbookSampleSet.report The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/64e01109b25df513415b59ad… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/64e01109b25df513415b59ad… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 5 commits: [toolkit-api-report] Fix new json adapter (See #2599)
by Tony CHEMIT (＠tchemit) Dec. 8, 2023

Dec. 8, 2023

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: defe4bce by Tony Chemit at 2023-12-07T17:58:18+01:00 [toolkit-api-report] Fix new json adapter (See #2599) - - - - - f7e26769 by Tony Chemit at 2023-12-07T17:58:23+01:00 Correction de la condition de création d'activités ficitives sur l'import avdth - - - - - 2551e5e5 by Tony Chemit at 2023-12-08T11:43:43+01:00 Add nice method in MojoRunnable in execute a simple Runnable - - - - - 04e62ee0 by Tony Chemit at 2023-12-08T11:43:47+01:00 add SuppressWarnings - - - - - d5392cdd by Tony Chemit at 2023-12-08T11:43:52+01:00 [core-persistence-report] fix ReportI18nKeys keys - See #2599 - - - - - 7 changed files: - core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/ImportDataContext.java - core/persistence/report/pom.xml - core/persistence/report/src/main/java/fr/ird/observe/persistence/report/ReportI18nKeys.java - toolkit/api-report/src/main/java/fr/ird/observe/report/json/ReportI18nItemArrayDefinitionAdapter.java - toolkit/api-report/src/main/java/fr/ird/observe/report/json/ReportI18nItemDefinitionAdapter.java - toolkit/api-report/src/main/java/fr/ird/observe/report/renderers/HighlightIfEquals18nReferentialValue.java - toolkit/plugin/src/main/java/fr/ird/observe/toolkit/maven/plugin/MojoRunnable.java Changes: ===================================== core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/ImportDataContext.java ===================================== @@ -143,6 +143,6 @@ public class ImportDataContext extends ImportReferentialContext { } public void computeCanCreateActivity() { - canCreateActivity = !trip.isLocalmarketFilled() && activityPkToId.isEmpty(); + canCreateActivity = activityPkToId.isEmpty(); } } ===================================== core/persistence/report/pom.xml ===================================== @@ -49,6 +49,10 @@ <artifactId>toolkit-persistence</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>io.ultreia.java4all.i18n</groupId> + <artifactId>i18n-runtime</artifactId> + </dependency> <dependency> <groupId>io.ultreia.java4all</groupId> <artifactId>java-lang</artifactId> @@ -81,7 +85,7 @@ <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-api</artifactId> - <scope>test</scope> + <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> ===================================== core/persistence/report/src/main/java/fr/ird/observe/persistence/report/ReportI18nKeys.java ===================================== @@ -42,21 +42,68 @@ public class ReportI18nKeys implements ReportI18nKeysProducer { public ReportI18nKeys() { Map<String, String> mapping = new TreeMap<>(); - mapping.put("yes", I18n.n("boolean.true")); - mapping.put("no", I18n.n("boolean.false")); - mapping.put("Null", I18n.n("boolean.null")); - mapping.put("unknown", I18n.n("observe.Common.unknown")); - mapping.put("notFilled", I18n.n("observe.Common.notFilled")); - mapping.put("undefined", I18n.n("observe.Common.undefined")); - mapping.put("all", I18n.n("observe.Common.all")); - mapping.put("noCode", I18n.n("observe.Common.no.code")); - mapping.put("count", I18n.n("observe.Common.count")); - mapping.put("totalWeight", I18n.n("observe.Common.totalWeightInTons")); - mapping.put("species", I18n.n("observe.Common.species")); - mapping.put("freeSchoolTypeTotal", I18n.n("observe.Common.freeSchoolTypeTotal")); - mapping.put("objectSchoolTypeTotal", I18n.n("observe.Common.objectSchoolTypeTotal")); - mapping.put("lengthClass", I18n.n("observe.Common.lengthClass")); + mapping.put("@yes@", I18n.n("boolean.true")); + mapping.put("@no@", I18n.n("boolean.false")); + mapping.put("@Null@", I18n.n("boolean.null")); + mapping.put("@unknown@", I18n.n("observe.Common.unknown")); + mapping.put("@notFilled@", I18n.n("observe.Common.notFilled")); + mapping.put("@undefined@", I18n.n("observe.Common.undefined")); + mapping.put("@all@", I18n.n("observe.Common.all")); + mapping.put("@noCode@", I18n.n("observe.Common.no.code")); + mapping.put("@count@", I18n.n("observe.Common.count")); + mapping.put("@totalWeight@", I18n.n("observe.Common.totalWeightInTons")); + mapping.put("@species@", I18n.n("observe.Common.species")); + mapping.put("@freeSchoolTypeTotal@", I18n.n("observe.Common.freeSchoolTypeTotal")); + mapping.put("@objectSchoolTypeTotal@", I18n.n("observe.Common.objectSchoolTypeTotal")); + mapping.put("@lengthClass@", I18n.n("observe.Common.lengthClass")); this.mapping = Collections.unmodifiableMap(mapping); + /* FIXME Use this in each report requires it +i18n.noCode=Aucun code +i18n.noCode.en=No code +i18n.noCode.es=No code ? +i18n.yes=Oui +i18n.yes.en=Yes +i18n.yes.es=Si +i18n.no=Non +i18n.no.en=No +i18n.no.es=No +i18n.Null=Indéterminé +i18n.Null.en=Undefined +i18n.Null.es=Indeterminado +i18n.unknown=Inconnu +i18n.unknown.en=Unknown +i18n.unknown.es=desconocido +i18n.notFilled=Non renseigné +i18n.notFilled.en=Not filled +i18n.notFilled.es= +i18n.undefined=Non défini +i18n.undefined.en=Undefined +i18n.undefined.es=indeterminado +i18n.all=Tous +i18n.all.en=All +i18n.all.es= +i18n.noCode=Aucun code +i18n.noCode.en=No code +i18n.noCode.es= +i18n.count=Effectif +i18n.count.en=Count +i18n.count.es= +i18n.totalWeight=Poids total (t) +i18n.totalWeight.en=Total weight (t) +i18n.totalWeight.es= +i18n.species=Espèce +i18n.species.en=Species +i18n.species.es=Especie +i18n.freeSchoolTypeTotal=Total BL +i18n.freeSchoolTypeTotal.en=Free school type total +i18n.freeSchoolTypeTotal.es= +i18n.objectSchoolTypeTotal=Total BO +i18n.objectSchoolTypeTotal.en=Object school type total +i18n.objectSchoolTypeTotal.es= +i18n.lengthClass=Classe de taille (cm) +i18n.lengthClass.en=Length class (cm) +i18n.lengthClass.es= + */ } public Map<String, String> mapping() { ===================================== toolkit/api-report/src/main/java/fr/ird/observe/report/json/ReportI18nItemArrayDefinitionAdapter.java ===================================== @@ -24,6 +24,7 @@ package fr.ird.observe.report.json; import com.google.auto.service.AutoService; import com.google.gson.JsonDeserializationContext; +import com.google.gson.JsonElement; import com.google.gson.JsonObject; import fr.ird.observe.report.definition.ReportI18nItemArrayDefinition; import fr.ird.observe.report.definition.ReportI18nItemDefinition; @@ -44,7 +45,8 @@ public class ReportI18nItemArrayDefinitionAdapter extends ReportI18nDefinitionSu @Override protected String[] deserialize(JsonDeserializationContext context, JsonObject jsonObject, String labelType) { - return context.deserialize(jsonObject.get(labelType), String[].class); + JsonElement jsonElement = jsonObject.get(labelType); + return jsonElement == null ? null : context.deserialize(jsonElement, String[].class); } @Override ===================================== toolkit/api-report/src/main/java/fr/ird/observe/report/json/ReportI18nItemDefinitionAdapter.java ===================================== @@ -24,6 +24,7 @@ package fr.ird.observe.report.json; import com.google.auto.service.AutoService; import com.google.gson.JsonDeserializationContext; +import com.google.gson.JsonElement; import com.google.gson.JsonObject; import fr.ird.observe.report.definition.ReportI18nItemDefinition; import io.ultreia.java4all.util.json.JsonAdapter; @@ -43,7 +44,8 @@ public class ReportI18nItemDefinitionAdapter extends ReportI18nDefinitionSupport @Override protected String deserialize(JsonDeserializationContext context, JsonObject jsonObject, String labelType) { - return jsonObject.get(labelType).getAsString(); + JsonElement jsonElement = jsonObject.get(labelType); + return jsonElement == null ? null : jsonElement.getAsString(); } @Override ===================================== toolkit/api-report/src/main/java/fr/ird/observe/report/renderers/HighlightIfEquals18nReferentialValue.java ===================================== @@ -43,6 +43,7 @@ import static fr.ird.observe.report.renderers.HighlightIfEquals18nReferentialVal * @author Tony Chemit - dev(a)tchemit.fr * @since 9.3.0 */ +@SuppressWarnings("rawtypes") @AutoService(ColumnRendererConsumer.class) public class HighlightIfEquals18nReferentialValue implements ColumnRendererConsumer<Parameters> { private final static SingletonSupplier<String> HTML_FUNCTION = ColumnRendererConsumer.htmlFunctions(HighlightIfEquals18nReferentialValue.class); ===================================== toolkit/plugin/src/main/java/fr/ird/observe/toolkit/maven/plugin/MojoRunnable.java ===================================== @@ -45,6 +45,15 @@ public abstract class MojoRunnable implements Runnable { private boolean verbose; private Path temporaryPath; + public static MojoRunnable of(Runnable runner) { + return new MojoRunnable() { + @Override + public void run() { + Objects.requireNonNull(runner).run(); + } + }; + } + public I18nKeySet getGetterFile() { return getterFile; } @@ -81,14 +90,14 @@ public abstract class MojoRunnable implements Runnable { Objects.requireNonNull(temporaryPath); } - public void setTemporaryPath(Path temporaryPath) { - this.temporaryPath = temporaryPath; - } - public Path getTemporaryPath() { return temporaryPath; } + public void setTemporaryPath(Path temporaryPath) { + this.temporaryPath = temporaryPath; + } + public void prepare(MojoRunnable parentRunner) { setLog(parentRunner.log); setGetterFile(parentRunner.getterFile); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/22dcf3c7700c89fb0848ed80… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/22dcf3c7700c89fb0848ed80… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 10 commits: [toolkit-api-report] Introduce WithRequest and...
by Tony CHEMIT (＠tchemit) Dec. 7, 2023

Dec. 7, 2023

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 8735d717 by Tony Chemit at 2023-12-06T14:29:14+01:00 [toolkit-api-report] Introduce WithRequest and ReportRequestExecutorI18nContext to be able to translate anything in hql requests and in some parameters - - - - - bd80057f by Tony Chemit at 2023-12-06T14:29:14+01:00 [toolkit-persistence] Adapt DefaultReportRequestExecutor to use new i18n API - - - - - 51a80bb7 by Tony Chemit at 2023-12-06T14:29:14+01:00 [core-persistence-report] Implements ReportI18nKeysProducer to add default i18n mapping used in embedded reports and adapt reports definition file (using new i18n API) [core-services-i18n] update then i18n bundle - - - - - 892a74e7 by Tony Chemit at 2023-12-06T14:29:14+01:00 [core-services-test] Update report fixtures - - - - - 1a8b3696 by Tony Chemit at 2023-12-06T14:29:14+01:00 [toolkit-api-report] Introduce a way to translate report meta-data (such as name, description, columnsHeader and rowsHeader) - - - - - 6f106303 by Tony Chemit at 2023-12-06T14:29:14+01:00 [client-datasource-actions] Use new I18n API in Report on ui and export template - - - - - 74dea2b0 by Tony Chemit at 2023-12-06T14:29:14+01:00 [client-datasource-actions] Use reportDefinition id instead of his name to compute reportRenderers - - - - - b3ffff3f by Tony Chemit at 2023-12-06T14:29:14+01:00 [core-persistence-report] Add new properties in report definition file to fill english and spanish translations - - - - - 28a8c734 by Tony Chemit at 2023-12-06T14:29:14+01:00 [client-datasource-actions] Use now a separated file for report html export css style - - - - - 22dcf3c7 by Tony Chemit at 2023-12-06T14:30:41+01:00 Merge branch 'feature/issue-2599' into develop Rendre le fichier de définition des rapports multilingue - See #2599 - - - - - 21 changed files: - 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/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/ReportUIHandler.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/report/ResultTableModel.java - + client/datasource/actions/src/main/resources/fr/ird/observe/client/datasource/actions/report/HtmlExportModel.css - client/runner/pom.xml - + core/persistence/report/.mvn/i18n/parse-java - + core/persistence/report/src/main/i18n/getters/java.getter - + core/persistence/report/src/main/java/fr/ird/observe/persistence/report/ReportI18nKeys.java - core/persistence/report/src/main/resources/observe-reports.properties - core/services/i18n/pom.xml - core/services/i18n/src/main/i18n/translations/services_en_GB.properties - core/services/i18n/src/main/i18n/translations/services_es_ES.properties - core/services/i18n/src/main/i18n/translations/services_fr_FR.properties - core/services/local/src/test/java/fr/ird/observe/services/local/service/ReportServiceLocalReadTest.java - core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ReportService-llLanding.properties - core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ReportService-llLogbookActivities.properties - core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ReportService-llLogbookCatches.properties The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/cf3e20b00a8104e1dc934e03… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/cf3e20b00a8104e1dc934e03… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch feature/issue-2962
by Tony CHEMIT (＠tchemit) Dec. 7, 2023

Dec. 7, 2023

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

1 0

[Git][ultreiaio/ird-observe] Deleted branch feature/issue-2599
by Tony CHEMIT (＠tchemit) Dec. 6, 2023

Dec. 6, 2023

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

1 0