svn commit: r1836014 - in /jmeter/trunk: bin/report-template/content/js/graph.js.fmkr xdocs/changes.xml

[pm...@apache.org]

Author: pmouawad
Date: Mon Jul 16 10:11:27 2018
New Revision: 1836014

URL: http://svn.apache.org/viewvc?rev=1836014&view=rev
Log:
Bug 62542 - Report / Dashboard : Display more information on filters when graph is empty
Bugzilla Id: 62542

Modified:
    jmeter/trunk/bin/report-template/content/js/graph.js.fmkr
    jmeter/trunk/xdocs/changes.xml

Modified: jmeter/trunk/bin/report-template/content/js/graph.js.fmkr
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/report-template/content/js/graph.js.fmkr?rev=1836014&r1=1836013&r2=1836014&view=diff
==============================================================================
--- jmeter/trunk/bin/report-template/content/js/graph.js.fmkr (original)
+++ jmeter/trunk/bin/report-template/content/js/graph.js.fmkr Mon Jul 16 10:11:27 2018
@@ -86,10 +86,23 @@ var responseTimePercentilesInfos = {
         }
 };
 
+/**
+ * @param elementId Id of element where we display message
+ */
+function setEmptyGraph(elementId) {
+    $(function() {
+        $(elementId).text("No graph series with filter="+seriesFilter);
+    });
+}
+
 // Response times percentiles
 function refreshResponseTimePercentiles() {
     var infos = responseTimePercentilesInfos;
     prepareSeries(infos.data);
+    if(infos.data.result.series.length == 0) {
+        setEmptyGraph("#bodyResponseTimePercentiles");
+        return;
+    }
     if (isGraph($("#flotResponseTimesPercentiles"))){
         infos.createGraph();
     } else {
@@ -156,6 +169,10 @@ var responseTimeDistributionInfos = {
 function refreshResponseTimeDistribution() {
     var infos = responseTimeDistributionInfos;
     prepareSeries(infos.data);
+    if(infos.data.result.series.length == 0) {
+        setEmptyGraph("#bodyResponseTimeDistribution");
+        return;
+    }
     if (isGraph($("#flotResponseTimeDistribution"))){
         infos.createGraph();
     }else{
@@ -372,6 +389,10 @@ var timeVsThreadsInfos = {
 function refreshTimeVsThreads(){
     var infos = timeVsThreadsInfos;
     prepareSeries(infos.data);
+    if(infos.data.result.series.length == 0) {
+        setEmptyGraph("#bodyTimeVsThreads");
+        return;
+    }
     if(isGraph($("#flotTimesVsThreads"))){
         infos.createGraph();
     }else{
@@ -523,6 +544,10 @@ var responseTimesOverTimeInfos = {
 function refreshResponseTimeOverTime(fixTimestamps) {
     var infos = responseTimesOverTimeInfos;
     prepareSeries(infos.data);
+    if(infos.data.result.series.length == 0) {
+        setEmptyGraph("#bodyResponseTimeOverTime");
+        return;
+    }
     if(fixTimestamps) {
         fixTimeStamps(infos.data.result.series, ${(timeZoneOffset?c)!0});
     }
@@ -600,6 +625,10 @@ var latenciesOverTimeInfos = {
 function refreshLatenciesOverTime(fixTimestamps) {
     var infos = latenciesOverTimeInfos;
     prepareSeries(infos.data);
+    if(infos.data.result.series.length == 0) {
+        setEmptyGraph("#bodyLatenciesOverTime");
+        return;
+    }
     if(fixTimestamps) {
         fixTimeStamps(infos.data.result.series, ${(timeZoneOffset?c)!0});
     }
@@ -677,6 +706,10 @@ var connectTimeOverTimeInfos = {
 function refreshConnectTimeOverTime(fixTimestamps) {
     var infos = connectTimeOverTimeInfos;
     prepareSeries(infos.data);
+    if(infos.data.result.series.length == 0) {
+        setEmptyGraph("#bodyConnectTimeOverTime");
+        return;
+    }
     if(fixTimestamps) {
         fixTimeStamps(infos.data.result.series, ${(timeZoneOffset?c)!0});
     }
@@ -1129,6 +1162,10 @@ var transactionsPerSecondInfos = {
 function refreshTransactionsPerSecond(fixTimestamps) {
     var infos = transactionsPerSecondInfos;
     prepareSeries(infos.data);
+    if(infos.data.result.series.length == 0) {
+        setEmptyGraph("#bodyTransactionsPerSecond");
+        return;
+    }
     if(fixTimestamps) {
         fixTimeStamps(infos.data.result.series, ${(timeZoneOffset?c)!0});
     }

Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1836014&r1=1836013&r2=1836014&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Mon Jul 16 10:11:27 2018
@@ -134,6 +134,7 @@ this behaviour, set <code>httpclient.res
     <li><bug>62243</bug>Dashboard : make option "<code>--forceDeleteResultFile</code>"/"<code>-f</code>" option delete folder referenced by "<code>-o</code>" option</li>
     <li><bug>62367</bug>HTML Report Generator: Add Graph Total Transactions per Second. Contributed mainly by Martha Laks (laks.martha at gmail.com)</li>
     <li><bug>62166</bug>Report/Dashboard: Provide ability to register custom graphs and metrics in the JMeter Dashboard. Contributed by Ubik Load Pack (support at ubikloadpack.com)</li>
+    <li><bug>62542</bug>Report/Dashboard : Display more information on filters when graph is empty. Contributed by Ubik Load Pack (support at ubikloadpack.com)</li>
     <li><bug>62426</bug>Optimize performance of report generation. Based on feedback by Allen (444104595 at qq.com)</li>
 </ul>