From 912e0cda9d431b7edd6a2cbbcd470324b4da9074 Mon Sep 17 00:00:00 2001 From: saksham115 Date: Wed, 20 Sep 2017 11:31:52 +0530 Subject: Inlining of the graphs JIRA: STORPERF-141 Change-Id: I94e82bab9796ae2e966435cb9c5b9f3651d82c06 Signed-off-by: saksham115 --- .../src/templates/plot_multi_data.html | 166 +++++++++------------ .../src/templates/plot_tables.html | 145 +++++++++--------- 2 files changed, 145 insertions(+), 166 deletions(-) diff --git a/docker/storperf-reporting/src/templates/plot_multi_data.html b/docker/storperf-reporting/src/templates/plot_multi_data.html index a07e3d5..3e64538 100644 --- a/docker/storperf-reporting/src/templates/plot_multi_data.html +++ b/docker/storperf-reporting/src/templates/plot_multi_data.html @@ -10,55 +10,6 @@ - @@ -66,15 +17,6 @@ ul { {% include 'header.html' %}
Loading...
-
@@ -151,18 +93,32 @@ ul { if(document.getElementById('list-' + key + '-' + test ) == null){ for( item in report_data[key][test] ){ var state = report_data[key][test][item]["steady_state"]; - text += "
  • " + item + " (steady state: " + state +")
    • "; + text += "
  • " + item + " (steady state: " + state +")"; + text += "
    • "; + text += '
    '; } text += "" var div = document.getElementById("li-" + key + "-" + test); div.innerHTML += text; } } + + function close_graph(key,test,item){ + document.getElementById('close-'+key+'-'+test+'-'+item).style.display = "none"; + document.getElementById('modal-text-'+ key + '-' + test + '-' + item).innerHTML = ""; + + } + function create_modal(key,test,item){ - var modal = document.getElementById('myModal'); - var modal_div = document.getElementById('modal-text'); - modal_div.innerHTML += "

    "; + var modal = document.getElementById('modal-'+key+'-'+test+'-'+item); + var modal_div = document.getElementById('modal-text-'+ key + '-' + test + '-' + item); + modal_div.innerHTML += "

    "; + var close_btn = document.getElementById('close-'+key+'-'+test+'-'+item); + close_btn.style.display = "block"; data = report_data[key][test][item]; var x = []; var y = []; @@ -255,7 +211,7 @@ ul { type: 'scatter' }; var plot_data = [trace1,trace2,trace3,trace4,trace5]; - Plotly.newPlot('graph',plot_data,layout); + Plotly.newPlot('graph-'+key+'-'+test+'-'+item,plot_data,layout); modal.style.display = "block"; table = ""; table += "Steady State Determination Data"; @@ -266,21 +222,50 @@ ul { table += ""; table += "
    Allowed Maximum Slope Excursion: " + 0.1*average + " Measured Maximum Slope Excursion: " + data["slope"] + "
    "; - document.getElementById("report").innerHTML = table; - - } - function create_block_report(){ + document.getElementById("report-" + key + "-" + test + "-" + item).innerHTML = table; + } function create_block_report(){ var ele = document.getElementById("block_report"); var text = ""; - text += "