You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by fs...@apache.org on 2016/01/16 20:20:51 UTC
svn commit: r1725021 [1/4] - in /jmeter/trunk/bin/report-template/content:
css/dashboard.css css/legends.css js/dashboard-commons.js
js/dashboard.js.fmkr js/graph.js.fmkr pages/OverTime.html.fmkr
pages/ResponseTimes.html.fmkr pages/Throughput.html.fmkr
Author: fschumacher
Date: Sat Jan 16 19:20:51 2016
New Revision: 1725021
URL: http://svn.apache.org/viewvc?rev=1725021&view=rev
Log:
Spacepolice
Modified:
jmeter/trunk/bin/report-template/content/css/dashboard.css
jmeter/trunk/bin/report-template/content/css/legends.css
jmeter/trunk/bin/report-template/content/js/dashboard-commons.js
jmeter/trunk/bin/report-template/content/js/dashboard.js.fmkr
jmeter/trunk/bin/report-template/content/js/graph.js.fmkr
jmeter/trunk/bin/report-template/content/pages/OverTime.html.fmkr
jmeter/trunk/bin/report-template/content/pages/ResponseTimes.html.fmkr
jmeter/trunk/bin/report-template/content/pages/Throughput.html.fmkr
Modified: jmeter/trunk/bin/report-template/content/css/dashboard.css
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/report-template/content/css/dashboard.css?rev=1725021&r1=1725020&r2=1725021&view=diff
==============================================================================
--- jmeter/trunk/bin/report-template/content/css/dashboard.css (original)
+++ jmeter/trunk/bin/report-template/content/css/dashboard.css Sat Jan 16 19:20:51 2016
@@ -16,33 +16,33 @@
*/
#stats td, th
{
-
- width: 9%;//140px;
- height: 30px;
+
+ width: 9%;//140px;
+ height: 30px;
}
#stats td
{
- text-align: center;
+ text-align: center;
}
#stats th
{
- font-weight:bold;
+ font-weight:bold;
}
.blue
{
- background-color: #dff0d8;
+ background-color: #dff0d8;
}
#errors td, th
{
- text-align: center;
- width: 400px;
- height: 30px;
+ text-align: center;
+ width: 400px;
+ height: 30px;
}
#errors td
{
-
+
}
#errors th
{
- font-weight:bold;
-}
\ No newline at end of file
+ font-weight:bold;
+}
Modified: jmeter/trunk/bin/report-template/content/css/legends.css
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/report-template/content/css/legends.css?rev=1725021&r1=1725020&r2=1725021&view=diff
==============================================================================
--- jmeter/trunk/bin/report-template/content/css/legends.css (original)
+++ jmeter/trunk/bin/report-template/content/css/legends.css Sat Jan 16 19:20:51 2016
@@ -16,16 +16,15 @@
*/
.legend {
margin-left: -40px;
- font-size: 12px;
- display: inline;
- font-family: 'Open Sans';
- font-weight: bold;
+ font-size: 12px;
+ display: inline;
+ font-family: 'Open Sans';
+ font-weight: bold;
}
.panel-footer
{
-
-
+
}
.subLegend
@@ -41,22 +40,22 @@
.legend li label {
margin-left: 1px;
- margin-right: 10px;
- color: black;
- font-family: Open sans;
- /*width: 200px;*/
+ margin-right: 10px;
+ color: black;
+ font-family: Open sans;
+ /*width: 200px;*/
}
li
{
- list-style-type:none;
- display: inline-block;
+ list-style-type:none;
+ display: inline-block;
}
.nav-third-level
{
- font-size: 12px;
+ font-size: 12px;
}
.legend-disabled {
- border-color: #818181 !important;
-}
\ No newline at end of file
+ border-color: #818181 !important;
+}
Modified: jmeter/trunk/bin/report-template/content/js/dashboard-commons.js
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/report-template/content/js/dashboard-commons.js?rev=1725021&r1=1725020&r2=1725021&view=diff
==============================================================================
--- jmeter/trunk/bin/report-template/content/js/dashboard-commons.js (original)
+++ jmeter/trunk/bin/report-template/content/js/dashboard-commons.js Sat Jan 16 19:20:51 2016
@@ -19,7 +19,7 @@
* The spaced argument defines whether a space character is introduced.
*/
function formatUnit(value, unit, spaced){
- return spaced ? value + " " + unit : value + unit;
+ return spaced ? value + " " + unit : value + unit;
}
/*
@@ -28,74 +28,74 @@ function formatUnit(value, unit, spaced)
* E.g : duration = 20000100, returns "45 min 20 sec 100 ms"
*/
function formatDuration(duration, spaced) {
- var type = $.type(duration);
- if (type === "string")
- return duration;
+ var type = $.type(duration);
+ if (type === "string")
+ return duration;
- // Calculate each part of the string
- var days = Math.floor(duration / 86400000); // 1000 * 60 * 60 * 24 = 1 day
- duration %= 8640000;
+ // Calculate each part of the string
+ var days = Math.floor(duration / 86400000); // 1000 * 60 * 60 * 24 = 1 day
+ duration %= 8640000;
- var hours = Math.floor(duration / 3600000); // 1000 * 60 *60 = 1 hour
- duration %= 3600000;
+ var hours = Math.floor(duration / 3600000); // 1000 * 60 *60 = 1 hour
+ duration %= 3600000;
- var minutes = Math.floor(duration / 60000); // 1000 * 60 = 1 minute
- duration %= 60000;
+ var minutes = Math.floor(duration / 60000); // 1000 * 60 = 1 minute
+ duration %= 60000;
- var seconds = Math.floor(duration / 1000); // 1 second
- duration %= 1000;
+ var seconds = Math.floor(duration / 1000); // 1 second
+ duration %= 1000;
- // Add non zero part.
- var formatArray = [];
- if (days > 0)
- formatArray.push(formatUnit(days, "day(s)", spaced));
+ // Add non zero part.
+ var formatArray = [];
+ if (days > 0)
+ formatArray.push(formatUnit(days, "day(s)", spaced));
- if (hours > 0)
- formatArray.push(formatUnit(hours, "hour(s)", spaced));
+ if (hours > 0)
+ formatArray.push(formatUnit(hours, "hour(s)", spaced));
- if (minutes > 0)
- formatArray.push(formatUnit(minutes,"min", spaced));
+ if (minutes > 0)
+ formatArray.push(formatUnit(minutes,"min", spaced));
- if (seconds > 0)
- formatArray.push(formatUnit(seconds, "sec", spaced));
+ if (seconds > 0)
+ formatArray.push(formatUnit(seconds, "sec", spaced));
- if (duration > 0)
- formatArray.push(formatUnit(duration, "ms", spaced));
+ if (duration > 0)
+ formatArray.push(formatUnit(duration, "ms", spaced));
- // Build the string
- return formatArray.join(" ");
+ // Build the string
+ return formatArray.join(" ");
}
/*
* Gets axis label for the specified granularity
*/
function getElapsedTimeLabel(granularity) {
- return "Elapsed Time (granularity: " + formatDuration(granularity) + ")";
+ return "Elapsed Time (granularity: " + formatDuration(granularity) + ")";
}
//Get the property value of an object using the specified key
//Returns the property value if all properties in the key exist; undefined
//otherwise.
function getProperty(key, obj) {
- return key.split('.').reduce(function(prop, subprop){
- return prop && prop[subprop];
- }, obj);
+ return key.split('.').reduce(function(prop, subprop){
+ return prop && prop[subprop];
+ }, obj);
}
/*
* Removes quotes from the specified string
*/
function unquote(str, quoteChar) {
- quoteChar = quoteChar || '"';
- if (str.length > 0 && str[0] === quoteChar && str[str.length - 1] === quoteChar)
- return str.slice(1, str.length - 1);
- else
- return str;
+ quoteChar = quoteChar || '"';
+ if (str.length > 0 && str[0] === quoteChar && str[str.length - 1] === quoteChar)
+ return str.slice(1, str.length - 1);
+ else
+ return str;
};
/*
* This comparison function evaluates abscissas to sort array of coordinates.
*/
function compareByXCoordinate(coord1, coord2) {
- return coord2[0] - coord1[0];
+ return coord2[0] - coord1[0];
}
Modified: jmeter/trunk/bin/report-template/content/js/dashboard.js.fmkr
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/report-template/content/js/dashboard.js.fmkr?rev=1725021&r1=1725020&r2=1725021&view=diff
==============================================================================
--- jmeter/trunk/bin/report-template/content/js/dashboard.js.fmkr (original)
+++ jmeter/trunk/bin/report-template/content/js/dashboard.js.fmkr Sat Jan 16 19:20:51 2016
@@ -21,149 +21,149 @@ var filtersOnlySampleSeries = ${filtersO
/*
* Populates the table identified by id parameter with the specified data and
* format
- *
+ *
*/
function createTable(table, info, formatter, defaultSorts, seriesIndex) {
- var tableRef = table[0];
+ var tableRef = table[0];
- // Create header and populate it with data.titles array
- var header = tableRef.createTHead();
- var newRow = header.insertRow(-1);
- for (var index = 0; index < info.titles.length; index++) {
- var cell = document.createElement('th');
- cell.innerHTML = info.titles[index];
- newRow.appendChild(cell);
- }
-
- var tBody;
-
- // Create overall body if defined
- if(info.overall){
- tBody = document.createElement('tbody');
- tBody.className = "tablesorter-no-sort";
- tableRef.appendChild(tBody);
- var newRow = tBody.insertRow(-1);
- var data = info.overall.data;
- for(var index=0;index < data.length; index++){
- var cell = newRow.insertCell(-1);
- cell.innerHTML = formatter ? formatter(index, data[index]): data[index];
- }
- }
-
- // Create regular body
- tBody = document.createElement('tbody');
- tableRef.appendChild(tBody);
-
- var regexp;
- if(seriesFilter)
- regexp = new RegExp(seriesFilter, 'i');
-
- // Populate body with data.items array
- for(var index=0; index < info.items.length; index++){
- var item = info.items[index];
- if((!regexp || filtersOnlySampleSeries && !info.supportsControllersDiscrimination || regexp.test(item.data[seriesIndex]))
- &&
- (!showControllersOnly || !info.supportsControllersDiscrimination || item.isController)){
- var newRow = tBody.insertRow(-1);
- for(var col=0; col < item.data.length; col++){
- var cell = newRow.insertCell(-1);
- cell.innerHTML = formatter ? formatter(col, item.data[col]) : item.data[col];
- }
- }
- }
-
- // Add support of columns sort
- table.tablesorter({sortList : defaultSorts});
+ // Create header and populate it with data.titles array
+ var header = tableRef.createTHead();
+ var newRow = header.insertRow(-1);
+ for (var index = 0; index < info.titles.length; index++) {
+ var cell = document.createElement('th');
+ cell.innerHTML = info.titles[index];
+ newRow.appendChild(cell);
+ }
+
+ var tBody;
+
+ // Create overall body if defined
+ if(info.overall){
+ tBody = document.createElement('tbody');
+ tBody.className = "tablesorter-no-sort";
+ tableRef.appendChild(tBody);
+ var newRow = tBody.insertRow(-1);
+ var data = info.overall.data;
+ for(var index=0;index < data.length; index++){
+ var cell = newRow.insertCell(-1);
+ cell.innerHTML = formatter ? formatter(index, data[index]): data[index];
+ }
+ }
+
+ // Create regular body
+ tBody = document.createElement('tbody');
+ tableRef.appendChild(tBody);
+
+ var regexp;
+ if(seriesFilter)
+ regexp = new RegExp(seriesFilter, 'i');
+
+ // Populate body with data.items array
+ for(var index=0; index < info.items.length; index++){
+ var item = info.items[index];
+ if((!regexp || filtersOnlySampleSeries && !info.supportsControllersDiscrimination || regexp.test(item.data[seriesIndex]))
+ &&
+ (!showControllersOnly || !info.supportsControllersDiscrimination || item.isController)){
+ var newRow = tBody.insertRow(-1);
+ for(var col=0; col < item.data.length; col++){
+ var cell = newRow.insertCell(-1);
+ cell.innerHTML = formatter ? formatter(col, item.data[col]) : item.data[col];
+ }
+ }
+ }
+
+ // Add support of columns sort
+ table.tablesorter({sortList : defaultSorts});
}
$(document).ready(function() {
-
- // Customize table sorter default options
- $.extend( $.tablesorter.defaults, {
+
+ // Customize table sorter default options
+ $.extend( $.tablesorter.defaults, {
theme: 'blue',
cssInfoBlock: "tablesorter-no-sort",
widthFixed: true,
widgets: ['zebra']
});
-
- var data = ${requestsSummary!"{}"};
- var dataset = [
- {
- "label" : "KO",
- "data" : data.KoPercent,
- "color" : "red"
- },
- {
- "label" : "OK",
- "data" : data.OkPercent,
- "color" : "blue"
- }];
- $.plot($("#flot-requests-summary"), dataset, {
- series : {
- pie : {
- show : true,
- radius : 1,
- label : {
- show : true,
- radius : 3 / 4,
- formatter : function(label, series) {
- return '<div style="font-size:8pt;text-align:center;padding:2px;color:white;">'
- + label
- + '<br/>'
- + Math.round(series.percent)
- + '%</div>';
- },
- background : {
- opacity : 0.5,
- color : '#000'
- }
- }
- }
- },
- legend : {
- show : true
- }
- });
-
- // Creates APDEX table
- createTable($("#apdexTable"), ${apdexSummary!"{}"}, function(index, item){
- switch(index){
- case 0:
- item = item.toFixed(3);
- break;
- case 1:
- case 2:
- item = formatDuration(item);
- break;
- }
- return item;
- }, [[0, 0]], 3);
-
- // Create statistics table
- createTable($("#statisticsTable"), ${statisticsSummary!"{}"}, function(index, item){
- switch(index){
- case 3:
- item = item.toFixed(2) + '%';
- break;
- case 4:
- case 5:
- case 6:
- case 7:
- case 8:
- item = item.toFixed(2);
- break;
- }
- return item;
- }, [[3, 1]], 0);
-
- // Create error table
- createTable($("#errorsTable"), ${errorsSummary!"{}"}, function(index, item){
- switch(index){
- case 2:
- case 3:
- item = item.toFixed(2) + '%';
- break;
- }
- return item;
- }, [[1, 1]]);
+
+ var data = ${requestsSummary!"{}"};
+ var dataset = [
+ {
+ "label" : "KO",
+ "data" : data.KoPercent,
+ "color" : "red"
+ },
+ {
+ "label" : "OK",
+ "data" : data.OkPercent,
+ "color" : "blue"
+ }];
+ $.plot($("#flot-requests-summary"), dataset, {
+ series : {
+ pie : {
+ show : true,
+ radius : 1,
+ label : {
+ show : true,
+ radius : 3 / 4,
+ formatter : function(label, series) {
+ return '<div style="font-size:8pt;text-align:center;padding:2px;color:white;">'
+ + label
+ + '<br/>'
+ + Math.round(series.percent)
+ + '%</div>';
+ },
+ background : {
+ opacity : 0.5,
+ color : '#000'
+ }
+ }
+ }
+ },
+ legend : {
+ show : true
+ }
+ });
+
+ // Creates APDEX table
+ createTable($("#apdexTable"), ${apdexSummary!"{}"}, function(index, item){
+ switch(index){
+ case 0:
+ item = item.toFixed(3);
+ break;
+ case 1:
+ case 2:
+ item = formatDuration(item);
+ break;
+ }
+ return item;
+ }, [[0, 0]], 3);
+
+ // Create statistics table
+ createTable($("#statisticsTable"), ${statisticsSummary!"{}"}, function(index, item){
+ switch(index){
+ case 3:
+ item = item.toFixed(2) + '%';
+ break;
+ case 4:
+ case 5:
+ case 6:
+ case 7:
+ case 8:
+ item = item.toFixed(2);
+ break;
+ }
+ return item;
+ }, [[3, 1]], 0);
+
+ // Create error table
+ createTable($("#errorsTable"), ${errorsSummary!"{}"}, function(index, item){
+ switch(index){
+ case 2:
+ case 3:
+ item = item.toFixed(2) + '%';
+ break;
+ }
+ return item;
+ }, [[1, 1]]);
});