This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 9f2540842305fa52a7c4ece06ccab8cb293584e5 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Apr 9 18:20:29 2015 +0200 refs #6913 modification du fichier des rapports --- .../src/main/filters/observe-reports.properties | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/observe-business/src/main/filters/observe-reports.properties b/observe-business/src/main/filters/observe-reports.properties index 1d3b498..e313a53 100644 --- a/observe-business/src/main/filters/observe-reports.properties +++ b/observe-business/src/main/filters/observe-reports.properties @@ -80,7 +80,7 @@ report.dailySetAndCatch.request.1=0,0|row|\ 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),Nombre visit\u00e9s,Nombre p\u00each\u00e9s,Nombre mis \u00e0 l\u2019eau,R\u00e9cup\u00e9r\u00e9 sans p\u00eache,Nombre de tortues associ\u00e9es +report.dcpUsage.columns=Type de DCP (Tableau 8),Nombre visit\u00e9s,Nombre p\u00each\u00e9s,Nombre mis \u00e0 l\u2019eau seuls,Nombre renforc\u00e9s par radeau balis\u00e9,R\u00e9cup\u00e9r\u00e9 sans p\u00eache,Nombre de tortues associ\u00e9es report.dcpUsage.repeatVariable.typeObjetId=java.lang.String|Select to.id From ObjectTypeImpl to Where to In (Select to From ObjectTypeImpl to, TripSeineImpl m, RouteImpl r, ActivitySeineImpl a, FloatingObjectImpl dcp \ Where \ m.id = :tripId \ @@ -142,10 +142,22 @@ report.dcpUsage.request.5=4,0|row|\ and a in elements(r.activitySeine) \ and dcp in elements(a.floatingObject) \ and dcp.objectType.id = :typeObjetId \ - and dcp.objectOperation.code = 4 + and ( dcp.objectFate.code = 8 and dcp.objectOperation.code != 1 ) report.dcpUsage.request.5.repeat=typeObjetId|column -report.dcpUsage.request.6=5,0|row| \ +report.dcpUsage.request.6=5,0|row|\ + Select Count(dcp) \ + From TripSeineImpl m, RouteImpl r, ActivitySeineImpl a, FloatingObjectImpl dcp \ + Where \ + m.id = :tripId \ + and r in elements(m.route) \ + and a in elements(r.activitySeine) \ + and dcp in elements(a.floatingObject) \ + and dcp.objectType.id = :typeObjetId \ + and dcp.objectOperation.code = 4 +report.dcpUsage.request.6.repeat=typeObjetId|column + +report.dcpUsage.request.7=6,0|row| \ Select Sum(efo.count) \ From TripSeineImpl m, RouteImpl r, ActivitySeineImpl a, FloatingObjectImpl dcp, ObjectObservedSpeciesImpl efo \ Where \ @@ -160,7 +172,7 @@ report.dcpUsage.request.6=5,0|row| \ Where ef2.speciesGroup = gef2 \ and gef2.id = 'fr.ird.observe.entities.referentiel.SpeciesGroup#1239832683690#0.24333033683679461' \ ) -report.dcpUsage.request.6.repeat=typeObjetId|column +report.dcpUsage.request.7.repeat=typeObjetId|column ################################################################################ ## Nombre des cal\u00e9es selon le type d'association -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.