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
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:
| ... | ... | @@ -1069,8 +1069,14 @@ Select vessel.code,\ |
| 1069 | 1069 | concat(day(t.endDate), '/', month(t.endDate), '/', year(t.endDate)), \
|
| 1070 | 1070 | departureHarbour.label2, \
|
| 1071 | 1071 | landingHarbour.label2, \
|
| 1072 | - 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, \
|
|
| 1073 | - 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, \
|
|
| 1072 | + case departureWellContentStatus.id when 'fr.ird.referential.ps.logbook.WellContentStatus#1464000000000#01' then 'Oui' \
|
|
| 1073 | + when 'fr.ird.referential.ps.logbook.WellContentStatus#1464000000000#02' then 'Non' \
|
|
| 1074 | + when 'fr.ird.referential.ps.logbook.WellContentStatus#1464000000000#03' then 'Inconnu' \
|
|
| 1075 | + else 'Non Renseigné' end, \
|
|
| 1076 | + case landingWellContentStatus.id when 'fr.ird.referential.ps.logbook.WellContentStatus#1464000000000#01' then 'Oui' \
|
|
| 1077 | + when 'fr.ird.referential.ps.logbook.WellContentStatus#1464000000000#02' then 'Non' \
|
|
| 1078 | + when 'fr.ird.referential.ps.logbook.WellContentStatus#1464000000000#03' then 'Inconnu' \
|
|
| 1079 | + else 'Non Renseigné' end, \
|
|
| 1074 | 1080 | t.timeAtSea, \
|
| 1075 | 1081 | t.fishingTime, \
|
| 1076 | 1082 | (select Sum(l.weight) from t.landing l), \
|
| ... | ... | @@ -19,7 +19,7 @@ |
| 19 | 19 | # <http://www.gnu.org/licenses/gpl-3.0.html>.
|
| 20 | 20 | # #L%
|
| 21 | 21 | ###
|
| 22 | -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
|
|
| 22 | +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
|
|
| 23 | 23 | 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
|
| 24 | 24 | result.columns=22
|
| 25 | 25 | result.rows=2
|