Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 5d39a28d by Tony Chemit at 2022-12-16T18:52:53+01:00 Persistence - Add BusinessProject inside the PersistenceBusinessProject (to be able to transform reference type to dto type) - - - - - dfcc3711 by Tony Chemit at 2022-12-16T18:53:45+01:00 Report - improve DataMatrixDimension and DataMatrixPoint code (they are immutable objects). - - - - - 49f6f862 by Tony Chemit at 2022-12-16T18:53:45+01:00 Report - introduce ReportRequestExecutor.isVariableUsed method to use the same code (we previously had two different code for this. - - - - - de9199cb by Tony Chemit at 2022-12-16T18:53:45+01:00 Report - add TimeLog instance in ReportRequestExecutor to avoid override in DefaultReportRequestExecutor some methods to just add TimeLog. - - - - - a8482770 by Tony Chemit at 2022-12-16T18:53:45+01:00 Report - move ReportRequest.extractParams to ReportRequestExecutor (better place, and the ReportRequest is part of the report model, it should contains no logic at all) - - - - - ca3c92e4 by Tony Chemit at 2022-12-16T18:54:02+01:00 Report - clean ReportRequest code - - - - - 92d2b917 by Tony Chemit at 2022-12-16T18:54:02+01:00 Report - introduce ReportVariableValueAware for report variable with type that are not a full entity dto (to replace the very weak code used for speciesFeate.discard) - - - - - 142550de by Tony Chemit at 2022-12-16T18:54:07+01:00 Report API - Code review and some nice new features : * improve ReportVariable (have now ReportVariableSupport base class then ReportVariable and ReportRepeatVariable as implementation) * improve code of ReportRequestExecutor * now we can manage to populate variables with dependencies on other variables - - - - - 7d34b597 by Tony Chemit at 2022-12-16T18:54:11+01:00 Report UI - Code review and some nice new features : * review handler and model code (was pretty a mess (thanks to K.M and S.B...) * variables can now depend on others \o/ - - - - - e3552734 by Tony Chemit at 2022-12-16T18:55:10+01:00 Report - Introduce SpeciesFateDiscardModeDto to replace the discard (as boolean) in reports : * psObservationCatchWeightByGroupAndSpeciesFateDiscardPerAssociation * psObservationCatchTotalCountByGroupAndSpeciesFateDiscardPerAssociation - - - - - 09ee315a by Tony Chemit at 2022-12-16T18:55:15+01:00 Report - Improve psObservationCatch report (show only speciesGroup with data and species within the selected group really used in data) - - - - - a4e260fa by Tony Chemit at 2022-12-16T18:55:19+01:00 Report - Improve psObservationLengthsDistribution report (make variable sizeMeasureType depends on selected variable species) - - - - - 6bb96b87 by Tony Chemit at 2022-12-16T19:32:04+01:00 Merge branch 'feature/issue_2577' into develop Améliorer les variables dans les rapports pour proposer les variables suivantes en filtrant sur la variable précédente - Closes #2577 - - - - - 30 changed files: - 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 - core/api/dto/src/main/i18n/getters/java.getter - + core/api/dto/src/main/java/fr/ird/observe/dto/data/ps/observation/SpeciesFateDiscardModeDto.java - core/api/dto/src/main/resources/observe-reports.properties - core/api/dto/src/test/java/fr/ird/observe/dto/report/ReportBuilderTest.java - core/api/dto/src/test/resources/fixtures/api.properties - core/api/dto/src/test/resources/fr/ird/observe/dto/report/observe-reports-test.properties - core/api/services/src/main/i18n/getters/labels.getter - core/api/services/src/main/resources/META-INF/i18n/Observe-labels.properties - core/persistence/java/src/main/java/fr/ird/observe/entities/ObserveTopiaPersistenceContext.java - core/persistence/java/src/main/java/fr/ird/observe/spi/report/ComputeLocalmarketSampleWellAndSpeciesMeasure.java - core/persistence/java/src/main/java/fr/ird/observe/spi/report/ComputeLocalmarketSurveyPart.java - core/persistence/java/src/main/java/fr/ird/observe/spi/report/ComputeMeasurementsLongline.java - core/persistence/java/src/main/java/fr/ird/observe/spi/report/ComputeMeasurementsSeine.java - core/persistence/java/src/test/resources/fixtures/persistence.properties - 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/test/src/main/java/fr/ird/observe/services/service/ReportFixture.java - core/services/test/src/main/java/fr/ird/observe/services/service/report/ps/PsObservationCatchTotalCountByGroupAndSpeciesFateDiscardPerAssociationReportFixture.java - core/services/test/src/main/java/fr/ird/observe/services/service/report/ps/PsObservationCatchWeightByGroupAndSpeciesFateDiscardPerAssociationReportFixture.java - core/services/test/src/main/java/fr/ird/observe/services/service/report/ps/PsObservationLengthsDistributionReportFixture.java - core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ReportService-psObservationCatch.properties - model/src/main/models/Observe/dto/00-common.model - model/src/main/models/Observe/dto/20-data-ps-observation.model - model/src/main/models/Observe/dto/class/decorator.properties - model/src/main/models/Observe/dto/class/i18nLabels.properties - model/src/main/models/Observe/dto/class/skip.properties - toolkit/api/src/main/java/fr/ird/observe/dto/report/DataMatrixDimension.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/6831b437cdf32876865cf03a2... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/6831b437cdf32876865cf03a2... You're receiving this email because of your account on gitlab.com.