Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 568fb6ac by tchemit at 2019-04-30T11:16:37Z Bug requête tableau synthèse DCP - Closes #1244 - - - - - 1d93b093 by tchemit at 2019-04-30T11:16:38Z update pom - - - - - 3 changed files: - pom.xml - services-local/src/test/java/fr/ird/observe/services/local/service/actions/report/ReportDcpUsageTest.java - services/src/main/resources/observe-reports.properties Changes: ===================================== pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2019.8.14</version> + <version>2019.8.15</version> </parent> <groupId>fr.ird.observe</groupId> ===================================== services-local/src/test/java/fr/ird/observe/services/local/service/actions/report/ReportDcpUsageTest.java ===================================== @@ -45,8 +45,8 @@ public class ReportDcpUsageTest extends AbstractReportServiceLocalTest { Assert.assertNotNull(report); assertReportName( report, - "Utilisation des DCP", - "Tableau récapitulatif du nombre de DCP visités selon l’action effectuée (visites avec et sans pêche, mis à l’eau, récuperation), et tortues observées" + "Utilisation des FOB", + "Tableau récapitulatif du nombre de FOB visités selon l’action effectuée (visites avec et sans pêche, mis à l’eau, récuperation), et tortues observées" ); /* @@ -56,15 +56,15 @@ public class ReportDcpUsageTest extends AbstractReportServiceLocalTest { report, -1, 11, - new String[]{"Type de DCP (Tableau 8)", - "Visités", + new String[]{"Type de FOB (Tableau 8)", + "Visités sans pêche", "Pêchés", "Mis à l’eau seuls", - "Modifications ou renforcements", - "Retaits", + "Modifiés ou renforcés", + "Retirés", "Abandonnés (sans balise ou non détruit ou non coulé)", "Coulés", - "Remplacements", + "Remplacés", "Autre (péciser dans les notes)", "Tortues associées" } ===================================== services/src/main/resources/observe-reports.properties ===================================== @@ -119,12 +119,12 @@ report.dailySetAndCatch.request.1=0,0|row|\ Group By r.date \ Order By r.date ################################################################################ -## Utilisation des DCP +## Utilisation des FOB ################################################################################ report.dcpUsage.modelType=PS -report.dcpUsage.name=Utilisation des DCP -report.dcpUsage.description=Tableau r\u00e9capitulatif du nombre de DCP visit\u00e9s selon l\u2019action effectu\u00e9e (visites avec et sans p\u00eache, mis \u00e0 l\u2019eau, r\u00e9cuperation), et tortues observ\u00e9es -report.dcpUsage.columns=Type de DCP (Tableau 8),Visit\u00e9s,P\u00each\u00e9s,Mis \u00e0 l\u2019eau seuls,Modifications ou renforcements,Retaits,Abandonn\u00e9s (sans balise ou non d\u00e9truit ou non coul\u00e9),Coul\u00e9s,Remplacements,Autre (p\u00e9ciser dans les notes),Tortues associ\u00e9es +report.dcpUsage.name=Utilisation des FOB +report.dcpUsage.description=Tableau r\u00e9capitulatif du nombre de FOB visit\u00e9s selon l\u2019action effectu\u00e9e (visites avec et sans p\u00eache, mis \u00e0 l\u2019eau, r\u00e9cuperation), et tortues observ\u00e9es +report.dcpUsage.columns=Type de FOB (Tableau 8),Visit\u00e9s sans p\u00eache,P\u00each\u00e9s,Mis \u00e0 l\u2019eau seuls,Modifi\u00e9s ou renforc\u00e9s,Retir\u00e9s,Abandonn\u00e9s (sans balise ou non d\u00e9truit ou non coul\u00e9),Coul\u00e9s,Remplac\u00e9s,Autre (p\u00e9ciser dans les notes),Tortues associ\u00e9es report.dcpUsage.repeatVariable.typeObjetId=java.lang.String|\ Select distinct (om.standardCode) \ From ObjectMaterialImpl om \ @@ -137,13 +137,14 @@ report.dcpUsage.repeatVariable.typeObjetId=java.lang.String|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = om.standardCode Or dcp.computedWhenArrivingSimplifiedObjectType = om.standardCode) \ + and (dcp.computedWhenArrivingSimplifiedObjectType = om.standardCode Or dcp.computedWhenLeavingSimplifiedObjectType = om.standardCode) \ ) > 0 report.dcpUsage.request.1=0,0|row|\ - Select concat(str(to.standardCode) , ' - ', to.label2) \ - From ObjectMaterialImpl to \ + Select concat(str(om.standardCode) , ' - ', om.label2) \ + From ObjectMaterialImpl om \ Where \ - to.standardCode = :typeObjetId + om.standardCode = :typeObjetId \ + And om.status != 0 report.dcpUsage.request.1.repeat=typeObjetId|column # visite report.dcpUsage.request.2=1,0|row|\ @@ -154,8 +155,9 @@ report.dcpUsage.request.2=1,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ - and dcp.objectOperation.id = 'fr.ird.referential.ps.observation.ObjectOperation#0#2' + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ + and dcp.objectOperation.id = 'fr.ird.referential.ps.observation.ObjectOperation#0#2' \ + and a.vesselActivitySeine.id != 'fr.ird.referential.ps.observation.VesselActivitySeine#1239832675369#0.12552908048322586' report.dcpUsage.request.2.repeat=typeObjetId|column # peche report.dcpUsage.request.3=2,0|row|\ @@ -166,8 +168,8 @@ report.dcpUsage.request.3=2,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ - and (dcp.objectOperation.id = 'fr.ird.referential.ps.observation.ObjectOperation#0#3' Or a.vesselActivitySeine.id = 'fr.ird.referential.ps.common.VesselActivitySeine#1239832675369#0.12552908048322586') + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ + and (dcp.objectOperation.id = 'fr.ird.referential.ps.observation.ObjectOperation#0#3' Or a.vesselActivitySeine.id = 'fr.ird.referential.ps.observation.VesselActivitySeine#1239832675369#0.12552908048322586') report.dcpUsage.request.3.repeat=typeObjetId|column # mis a l'eau report.dcpUsage.request.4=3,0|row|\ @@ -178,10 +180,10 @@ report.dcpUsage.request.4=3,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId \ and dcp.objectOperation.id = 'fr.ird.referential.ps.observation.ObjectOperation#0#1' report.dcpUsage.request.4.repeat=typeObjetId|column -# modification ou rneforcement +# modification ou renforcement #FIXME Supprime de la requete du dessous #FIXME and dcp.objectFate.id = 'fr.ird.referential.ps.ObjectFate#1396860761530#0.8869464242156488' \ report.dcpUsage.request.5=4,0|row|\ @@ -192,7 +194,7 @@ report.dcpUsage.request.5=4,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ and dcp.objectOperation.id = 'fr.ird.referential.ps.observation.ObjectOperation#0#8' report.dcpUsage.request.5.repeat=typeObjetId|column # Retrait @@ -204,7 +206,7 @@ report.dcpUsage.request.6=5,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ and dcp.objectOperation.id = 'fr.ird.referential.ps.observation.ObjectOperation#0#4' report.dcpUsage.request.6.repeat=typeObjetId|column # abondonne @@ -216,7 +218,7 @@ report.dcpUsage.request.7=6,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ and dcp.objectOperation.id = 'fr.ird.referential.ps.observation.ObjectOperation#0#5' report.dcpUsage.request.7.repeat=typeObjetId|column # coule @@ -228,7 +230,7 @@ report.dcpUsage.request.8=7,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ and dcp.objectOperation.id = 'fr.ird.referential.ps.observation.ObjectOperation#0#7' report.dcpUsage.request.8.repeat=typeObjetId|column # remplacement @@ -240,7 +242,7 @@ report.dcpUsage.request.9=8,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ and dcp.objectOperation.id = 'fr.ird.referential.ps.observation.ObjectOperation#0#09' report.dcpUsage.request.9.repeat=typeObjetId|column # autre @@ -252,7 +254,7 @@ report.dcpUsage.request.10=9,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ and dcp.objectOperation.id = 'fr.ird.referential.ps.observation.ObjectOperation#0#10' report.dcpUsage.request.10.repeat=typeObjetId|column # tortues @@ -265,7 +267,7 @@ report.dcpUsage.request.11=10,0|row| \ Join dcp.objectObservedSpecies efo \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ and efo.species.speciesGroup.id = 'fr.ird.referential.common.SpeciesGroup#1239832683690#0.24333033683679461' report.dcpUsage.request.11.repeat=typeObjetId|column View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/1513125bae3c62ec0b4603034a5... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/1513125bae3c62ec0b4603034a5... You're receiving this email because of your account on gitlab.com.
participants (1)
-
Tony CHEMIT