Tony CHEMIT pushed to branch develop-9.0.x at ultreiaio / ird-observe Commits: 2f1f273f by Tony Chemit at 2022-12-02T13:15:31+01:00 Rapport LB - Vérification croisée des débarquements, colonnes cuves vides erronées - Closes #2551 - - - - - 2 changed files: - core/api/dto/src/main/resources/observe-reports.properties - core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ReportService-psLogbookTrip.properties Changes: ===================================== core/api/dto/src/main/resources/observe-reports.properties ===================================== @@ -1069,8 +1069,14 @@ Select vessel.code,\ concat(day(t.endDate), '/', month(t.endDate), '/', year(t.endDate)), \ departureHarbour.label2, \ landingHarbour.label2, \ - case when departureWellContentStatus.id = 'fr.ird.referential.ps.common.AcquisitionStatus#1464000000000#001' then 'Oui' when departureWellContentStatus.id = 'fr.ird.referential.ps.common.AcquisitionStatus#1464000000000#002' then 'Non' when departureWellContentStatus.id = 'fr.ird.referential.ps.common.AcquisitionStatus#1464000000000#003' then 'Inconnu' else 'Non Renseigné' end, \ - case when landingWellContentStatus.id = 'fr.ird.referential.ps.common.AcquisitionStatus#1464000000000#001' then 'Oui' when landingWellContentStatus.id = 'fr.ird.referential.ps.common.AcquisitionStatus#1464000000000#002' then 'Non' when departureWellContentStatus.id = 'fr.ird.referential.ps.common.AcquisitionStatus#1464000000000#003' then 'Inconnu' else 'Non Renseigné' end, \ + case departureWellContentStatus.id when 'fr.ird.referential.ps.logbook.WellContentStatus#1464000000000#01' then 'Oui' \ + when 'fr.ird.referential.ps.logbook.WellContentStatus#1464000000000#02' then 'Non' \ + when 'fr.ird.referential.ps.logbook.WellContentStatus#1464000000000#03' then 'Inconnu' \ + else 'Non Renseigné' end, \ + case landingWellContentStatus.id when 'fr.ird.referential.ps.logbook.WellContentStatus#1464000000000#01' then 'Oui' \ + when 'fr.ird.referential.ps.logbook.WellContentStatus#1464000000000#02' then 'Non' \ + when 'fr.ird.referential.ps.logbook.WellContentStatus#1464000000000#03' then 'Inconnu' \ + else 'Non Renseigné' end, \ t.timeAtSea, \ t.fishingTime, \ (select Sum(l.weight) from t.landing l), \ ===================================== core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ReportService-psLogbookTrip.properties ===================================== @@ -19,7 +19,7 @@ # <http://www.gnu.org/licenses/gpl-3.0.html>. # #L% ### -result.0=483^CAP BOJADOR^30/3/2019^8/4/2019^ABIDJAN^ABIDJAN^Non Renseigné^Non Renseigné^null^null^134.0^null^4.99^null^Réalisé^Statut inconnu^Statut inconnu^Statut inconnu^Statut inconnu^Statut inconnu^Statut inconnu^Statut inconnu +result.0=483^CAP BOJADOR^30/3/2019^8/4/2019^ABIDJAN^ABIDJAN^Inconnu^Inconnu^null^null^134.0^null^4.99^null^Réalisé^Statut inconnu^Statut inconnu^Statut inconnu^Statut inconnu^Statut inconnu^Statut inconnu^Statut inconnu result.1=891^BERNICA^10/11/2019^6/12/2019^SEYCHELLES^SEYCHELLES^Non Renseigné^Non Renseigné^null^null^null^null^null^null^Réalisé^Statut inconnu^Statut inconnu^Statut inconnu^Statut inconnu^Statut inconnu^Statut inconnu^Statut inconnu result.columns=22 result.rows=2 View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/2f1f273f1b9373e3b2b53b7874... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/2f1f273f1b9373e3b2b53b7874... You're receiving this email because of your account on gitlab.com.