branch feature/7146 updated (c4e11be -> a94638e)
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 c4e11be [jgitflow-maven-plugin]Updating develop poms back to pre merge state new bdd95e3 refs #7146 : add time log new a94638e refs #7146 : Liste des activités avec des comments (71.4 ms ==> 26.535 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 a94638e38e5aa1c67e2f9d8a9d27d10f14493ce2 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue May 26 15:28:42 2015 +0200 refs #7146 : Liste des activités avec des comments (71.4 ms ==> 26.535 ms) commit bdd95e369442214f1ec0c66126c4b4198f8c8b93 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue May 26 15:26:11 2015 +0200 refs #7146 : add time log Summary of changes: observe-business/src/main/filters/observe-reports.properties | 8 ++++---- .../main/java/fr/ird/observe/ui/admin/report/ReportUIHandler.java | 5 +++++ 2 files changed, 9 insertions(+), 4 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 bdd95e369442214f1ec0c66126c4b4198f8c8b93 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue May 26 15:26:11 2015 +0200 refs #7146 : add time log --- .../main/java/fr/ird/observe/ui/admin/report/ReportUIHandler.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/admin/report/ReportUIHandler.java b/observe-swing/src/main/java/fr/ird/observe/ui/admin/report/ReportUIHandler.java index 250850f..770d58c 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/admin/report/ReportUIHandler.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/admin/report/ReportUIHandler.java @@ -45,6 +45,7 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.decorator.Decorator; import org.nuiton.decorator.JXPathDecorator; import org.nuiton.topia.persistence.TopiaEntity; +import org.nuiton.util.TimeLog; import javax.swing.DefaultListCellRenderer; import javax.swing.JComboBox; @@ -77,6 +78,7 @@ public class ReportUIHandler extends AdminTabUIHandler { /** Logger */ private static final Log log = LogFactory.getLog(ReportUIHandler.class); + private static final TimeLog timeLog = new TimeLog(ReportUIHandler.class, 0, 1000); final Runnable revalidateTabUI = new Runnable() { @Override @@ -437,10 +439,13 @@ public class ReportUIHandler extends AdminTabUIHandler { Map<String, Object> variables = model.getVariables(); variables.put(ReportExecute.TRIP_ID_VARIABLE, mareeId); + long startTime = TimeLog.getTime(); data = execute.execute(variables); + timeLog.log(startTime, "execute", report.getName()); if (log.isInfoEnabled()) { log.info("Result to dispaly:\n" + data.getClipbordContent(true, true)); } + } catch (Exception e) { if (log.isErrorEnabled()) { log.error("Could not obtain report data", e); -- 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 a94638e38e5aa1c67e2f9d8a9d27d10f14493ce2 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue May 26 15:28:42 2015 +0200 refs #7146 : Liste des activités avec des comments (71.4 ms ==> 26.535 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 434dda1..ce8c88d 100644 --- a/observe-business/src/main/filters/observe-reports.properties +++ b/observe-business/src/main/filters/observe-reports.properties @@ -29,13 +29,13 @@ report.activityWithComment.description=Afficher les activit\u00e9s avec comment report.activityWithComment.columns=Jour - Heure observation, Latitude, Longitude, Activit\u00e9, Commentaire report.activityWithComment.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 a.comment is not null \ - 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>.
participants (1)
-
codelutin.com scm