branch feature/7146 updated (a94638e -> 72b755f)
This is an automated email from the git hooks/post-receive script. New change to branch feature/7146 in repository observe. See http://git.codelutin.com/observe.git from a94638e refs #7146 : Liste des activités avec des comments (71.4 ms ==> 26.535 ms) new ff36434 refs #7146 : Liste de toutes les activités et leurs positions (47.026 ms ==> 21.662 ms) new 72b755f refs #7146 : Nombre de calées et captures journalières d'une marée (33.262 ms ==> 11.52 ms) The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 72b755fcb173b86f453f03ad8af6d9367d2e346c Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue May 26 15:55:39 2015 +0200 refs #7146 : Nombre de calées et captures journalières d'une marée (33.262 ms ==> 11.52 ms) commit ff36434053f5da6673d43dde11b2dc7e35bd63a1 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue May 26 15:45:53 2015 +0200 refs #7146 : Liste de toutes les activités et leurs positions (47.026 ms ==> 21.662 ms) Summary of changes: .../src/main/filters/observe-reports.properties | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/7146 in repository observe. See http://git.codelutin.com/observe.git commit ff36434053f5da6673d43dde11b2dc7e35bd63a1 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue May 26 15:45:53 2015 +0200 refs #7146 : Liste de toutes les activités et leurs positions (47.026 ms ==> 21.662 ms) --- observe-business/src/main/filters/observe-reports.properties | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/observe-business/src/main/filters/observe-reports.properties b/observe-business/src/main/filters/observe-reports.properties index ce8c88d..7464814 100644 --- a/observe-business/src/main/filters/observe-reports.properties +++ b/observe-business/src/main/filters/observe-reports.properties @@ -47,12 +47,12 @@ report.allActivitys.description=Afficher toutes les activit\u00e9s et leurs posi report.allActivitys.columns=Jour - Heure observation, Latitude, Longitude, Activit\u00e9, Commentaire report.allActivitys.request.1=0,0|row|\ Select concat(day(r.date), '/', month(r.date), '/', year(r.date), ' ', hour(a.time), ':', minute(a.time)), a.latitude, a.longitude, ab.label2, a.comment \ - From TripSeineImpl m, RouteImpl r, ActivitySeineImpl a, VesselActivitySeineImpl ab \ + From TripSeineImpl m \ + Join m.route r \ + Join r.activitySeine a \ + Join a.vesselActivitySeine ab \ Where \ m.id = :tripId \ - and r in elements(m.route) \ - and a in elements(r.activitySeine) \ - and ab = a.vesselActivitySeine \ Order By r.date, a.time ################################################################################ -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/7146 in repository observe. See http://git.codelutin.com/observe.git commit 72b755fcb173b86f453f03ad8af6d9367d2e346c Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue May 26 15:55:39 2015 +0200 refs #7146 : Nombre de calées et captures journalières d'une marée (33.262 ms ==> 11.52 ms) --- observe-business/src/main/filters/observe-reports.properties | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/observe-business/src/main/filters/observe-reports.properties b/observe-business/src/main/filters/observe-reports.properties index 7464814..740f352 100644 --- a/observe-business/src/main/filters/observe-reports.properties +++ b/observe-business/src/main/filters/observe-reports.properties @@ -64,13 +64,13 @@ report.dailySetAndCatch.description=Afficher le nombre de cal\u00e9es et les cap report.dailySetAndCatch.columns=Jour observation,Nombre de cal\u00e9es ,Captures thon report.dailySetAndCatch.request.1=0,0|row|\ Select concat(day(r.date), '/', month(r.date), '/', year(r.date)), Count(distinct a), Sum(ct.catchWeight) \ - From TripSeineImpl m, RouteImpl r, ActivitySeineImpl a \ - left join a.setSeine.targetCatch as ct \ + From TripSeineImpl m \ + Join m.route r \ + Join r.activitySeine a \ + Join a.setSeine s \ + left join s.targetCatch as ct \ Where \ m.id = :tripId \ - and r in elements(m.route) \ - and a in elements(r.activitySeine) \ - and a.setSeine is not null \ Group By r.date \ Order By r.date -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
participants (1)
-
codelutin.com scm