Author: pmouawad
Date: Wed Sep 14 21:42:04 2016
New Revision: 1760797
URL: http://svn.apache.org/viewvc?rev=1760797&view=rev
Log:
Bug 60135 - Report / Dashboard : Active Threads Over Time should be in OverTime
section
Bugzilla Id: 60135
Modified:
jmeter/trunk/bin/report-template/content/pages/OverTime.html.fmkr
jmeter/trunk/bin/report-template/content/pages/ResponseTimes.html.fmkr
jmeter/trunk/xdocs/changes.xml
Modified: jmeter/trunk/bin/report-template/content/pages/OverTime.html.fmkr
URL:
http://svn.apache.org/viewvc/jmeter/trunk/bin/report-template/content/pages/OverTime.html.fmkr?rev=1760797&r1=1760796&r2=1760797&view=diff
==============================================================================
--- jmeter/trunk/bin/report-template/content/pages/OverTime.html.fmkr (original)
+++ jmeter/trunk/bin/report-template/content/pages/OverTime.html.fmkr Wed Sep
14 21:42:04 2016
@@ -78,6 +78,11 @@
</a>
</li>
<li>
+ <a
href="OverTime.html#activeThreadsOverTime"
onclick="$('#bodyActiveThreadsOverTime').collapse('show');">
+ Active Threads Over Time
+ </a>
+ </li>
+ <li>
<a
href="OverTime.html#bytesThroughputOverTime"
onclick="$('#bodyBytesThroughputOverTime').collapse('show');">
Bytes Throughput Over Time
</a>
@@ -171,8 +176,8 @@
<!-- /.row -->
<div class="row" id="graphContainer">
- <!-- /.col-lg-6 -->
- <div class="col-lg-12 portlet" id="responseTimesOverTime">
+ <!-- /.col-lg-6 -->
+ <div class="col-lg-12 portlet" id="responseTimesOverTime">
<div class="panel panel-default">
<div class="panel-heading portlet-header">
<i class="fa fa-bar-chart-o fa-fw" ></i>
@@ -269,6 +274,55 @@
<!-- /.panel -->
</div>
<!-- /.col-lg-12 -->
+
+ <div class="col-lg-12 portlet" id="activeThreadsOverTime">
+ <div class="panel panel-default" >
+ <div class="panel-heading portlet-header">
+ <i class="fa fa-bar-chart-o fa-fw"> </i> <span
type="button" class="span-title dropdown-toggle click-title"
data-toggle="collapse" href="#bodyActiveThreadsOverTime" aria-expanded="true"
aria-controls="bodyActiveThreadsOverTime">Active Threads Over Time</span>
+ <div class="pull-right">
+ <div class="btn-group">
+ <a class="drag btn btn-link btn-xs">
+ <i class="glyphicon
glyphicon-resize-vertical"></i>
+ </a>
+ <button type="button" class="btn btn-link
btn-xs dropdown-toggle" data-toggle="dropdown">
+ <i class="fa fa-wrench"></i>
+ </button>
+ <ul class="dropdown-menu dropdown-user">
+ <li><a href="#activeThreadsOverTime"
onClick="checkAll('choicesActiveThreadsOverTime');">Display all samples</a>
+ </li>
+ <li><a href="#activeThreadsOverTime"
onClick="uncheckAll('choicesActiveThreadsOverTime');">Hide all samples</a>
+ </li>
+ <li><a href="#activeThreadsOverTime"
onclick="exportToPNG('flotActiveThreadsOverTime', this);">Save as PNG</a></li>
+ </ul>
+ <button type="button" class="btn btn-link
btn-xs dropdown-toggle" data-toggle="collapse"
href="#bodyActiveThreadsOverTime" aria-expanded="true"
aria-controls="bodyActiveThreadsOverTime">
+ <i class="fa fa-chevron-down"></i>
+ </button>
+ </div>
+ </div>
+ </div>
+ <!-- /.panel-heading -->
+ <div class="collapse out portlet-content"
id="bodyActiveThreadsOverTime">
+ <div class="panel-body"
id="collapseActiveThreadsOverTime">
+ <div class="flot-chart">
+ <div class="flot-chart-content"
id="flotActiveThreadsOverTime" style="float: left; width:80%;"></div>
+ <div style="float:left;margin-left:5px">
+ <p>Zoom :</p>
+ <div
id="overviewActiveThreadsOverTime" style="width:190px;height:100px;"></div>
+ </div>
+ </div>
+ </div>
+ <div class="panel-footer"
id="footerActiveThreadsOverTime">
+ <p id="legendActiveThreadsOverTime"
hidden></p>
+ <ul id="choicesActiveThreadsOverTime"
class="legend">
+
+ </ul>
+ </div>
+ </div>
+ <!-- /.panel-body -->
+ </div>
+ <!-- /.panel -->
+ </div>
+
<div class="col-lg-12 portlet" id="bytesThroughputOverTime">
<div class="panel panel-default">
Modified: jmeter/trunk/bin/report-template/content/pages/ResponseTimes.html.fmkr
URL:
http://svn.apache.org/viewvc/jmeter/trunk/bin/report-template/content/pages/ResponseTimes.html.fmkr?rev=1760797&r1=1760796&r2=1760797&view=diff
==============================================================================
--- jmeter/trunk/bin/report-template/content/pages/ResponseTimes.html.fmkr
(original)
+++ jmeter/trunk/bin/report-template/content/pages/ResponseTimes.html.fmkr Wed
Sep 14 21:42:04 2016
@@ -86,11 +86,6 @@
</a>
</li>
<li>
- <a
href="ResponseTimes.html#activeThreadsOverTime"
onclick="$('#bodyActiveThreadsOverTime').collapse('show');">
- Active Threads Over Time
- </a>
- </li>
- <li>
<a
href="ResponseTimes.html#timeVsThreads"
onclick="$('#bodyTimeVsThreads').collapse('show');">Time Vs Threads</a>
</li>
<li>
@@ -240,53 +235,6 @@
</div>
<!-- /.panel-body -->
</div>
- <!-- /.panel -->
- </div>
- <div class="col-lg-12 portlet" id="activeThreadsOverTime">
- <div class="panel panel-default" >
- <div class="panel-heading portlet-header">
- <i class="fa fa-bar-chart-o fa-fw"> </i> <span
type="button" class="span-title dropdown-toggle click-title"
data-toggle="collapse" href="#bodyActiveThreadsOverTime" aria-expanded="true"
aria-controls="bodyActiveThreadsOverTime">Active Threads Over Time</span>
- <div class="pull-right">
- <div class="btn-group">
- <a class="drag btn btn-link btn-xs">
- <i class="glyphicon
glyphicon-resize-vertical"></i>
- </a>
- <button type="button" class="btn btn-link
btn-xs dropdown-toggle" data-toggle="dropdown">
- <i class="fa fa-wrench"></i>
- </button>
- <ul class="dropdown-menu dropdown-user">
- <li><a href="#activeThreadsOverTime"
onClick="checkAll('choicesActiveThreadsOverTime');">Display all samples</a>
- </li>
- <li><a href="#activeThreadsOverTime"
onClick="uncheckAll('choicesActiveThreadsOverTime');">Hide all samples</a>
- </li>
- <li><a href="#activeThreadsOverTime"
onclick="exportToPNG('flotActiveThreadsOverTime', this);">Save as PNG</a></li>
- </ul>
- <button type="button" class="btn btn-link
btn-xs dropdown-toggle" data-toggle="collapse"
href="#bodyActiveThreadsOverTime" aria-expanded="true"
aria-controls="bodyActiveThreadsOverTime">
- <i class="fa fa-chevron-down"></i>
- </button>
- </div>
- </div>
- </div>
- <!-- /.panel-heading -->
- <div class="collapse out portlet-content"
id="bodyActiveThreadsOverTime">
- <div class="panel-body"
id="collapseActiveThreadsOverTime">
- <div class="flot-chart">
- <div class="flot-chart-content"
id="flotActiveThreadsOverTime" style="float: left; width:80%;"></div>
- <div style="float:left;margin-left:5px">
- <p>Zoom :</p>
- <div
id="overviewActiveThreadsOverTime" style="width:190px;height:100px;"></div>
- </div>
- </div>
- </div>
- <div class="panel-footer"
id="footerActiveThreadsOverTime">
- <p id="legendActiveThreadsOverTime"
hidden></p>
- <ul id="choicesActiveThreadsOverTime"
class="legend">
-
- </ul>
- </div>
- </div>
- <!-- /.panel-body -->
- </div>
<!-- /.panel -->
</div>
<div class="col-lg-12 portlet" id="timeVsThreads">
Modified: jmeter/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1760797&r1=1760796&r2=1760797&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Wed Sep 14 21:42:04 2016
@@ -223,6 +223,7 @@ Summary
<li><bug>60105</bug>Report / Dashboard : Report requires Transaction
Controller "generate parent sample" option to be checked , fix related
issues</li>
<li><bug>60107</bug>Report / Dashboard : In StatisticSummary,
TransactionController SampleResult makes Total line wrong</li>
<li><bug>60110</bug>Report / Dashboard : In Response Time Percentiles,
slider is useless</li>
+ <li><bug>60135</bug>Report / Dashboard : Active Threads Over Time should
be in OverTime section</li>
</ul>
<!-- =================== Thanks =================== -->
