openstack
/
openstack-health
Code Issues Proposed changes

Merge "Fix tool tip error and break out json data"

This commit is contained in:
Jenkins 2015-09-17 03:13:58 +00:00 committed by Gerrit Code Review
parent 7cee0cfb40 d84a3ae61b
commit 4323d5969b
2 changed files with 51 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
doc/source/mockups/front_page.html
View File

@ -8,6 +8,7 @@
<style type="text/css">
${demo.css}
</style>
<script src="project.json"></script>
<script src="http://code.highcharts.com/stock/highstock.js"></script>
<script src="http://code.highcharts.com/highcharts.js"></script>
<script src="http://code.highcharts.com/highcharts-more.js"></script>
@ -23,57 +24,8 @@ ${demo.css}
<div id="dial4" style="width: 300px; height: 200px; float: left"></div>
<div id="dial5" style="width: 300px; height: 200px; float: left"></div>
<script type="text/javascript">
var mock_text = '{ "timedata": [ { "datetime": "02 Jun 2015", "project_data":'+
' [ { "project": "glance", "pass": 100, "fail": 50 },'+
'{ "project": "cinder", "pass": 150, "fail": 25 },'+
'{ "project": "swift", "pass": 200, "fail": 0 },'+
'{ "project": "neutron", "pass": 230, "fail": 10 },'+
'{ "project": "nova", "pass": 300, "fail": 0 }'+
'] },'+
'{ "datetime": "03 Jun 2015", "project_data": ['+
'{ "project": "glance", "pass": 110, "fail": 40 },'+
'{ "project": "cinder", "pass": 160, "fail": 15 },'+
'{ "project": "swift", "pass": 195, "fail": 5 },'+
'{ "project": "neutron", "pass": 225, "fail": 15 },'+
'{ "project": "nova", "pass": 300, "fail": 5 }'+
'] },'+
'{ "datetime": "04 Jun 2015", "project_data": ['+
'{ "project": "glance", "pass": 100, "fail": 50 },'+
'{ "project": "cinder", "pass": 150, "fail": 25 },'+
'{ "project": "swift", "pass": 200, "fail": 0 },'+
'{ "project": "neutron", "pass": 230, "fail": 10 },'+
'{ "project": "nova", "pass": 300, "fail": 5 }'+
'] },'+
'{ "datetime": "05 Jun 2015", "project_data": ['+
'{ "project": "glance", "pass": 125, "fail": 25 },'+
'{ "project": "cinder", "pass": 160, "fail": 15 },'+
'{ "project": "swift", "pass": 200, "fail": 0 },'+
'{ "project": "neutron", "pass": 230, "fail": 10 },'+
'{ "project": "nova", "pass": 305, "fail": 5 }'+
'] },'+
'{ "datetime": "06 Jun 2015", "project_data": ['+
'{ "project": "glance", "pass": 115, "fail": 0 },'+
'{ "project": "cinder", "pass": 160, "fail": 5 },'+
'{ "project": "swift", "pass": 220, "fail": 30 },'+
'{ "project": "neutron", "pass": 230, "fail": 20 },'+
'{ "project": "nova", "pass": 310, "fail": 0 }'+
'] },'+
'{ "datetime": "07 Jun 2015", "project_data": ['+
'{ "project": "glance", "pass": 115, "fail": 0 },'+
'{ "project": "cinder", "pass": 160, "fail": 5 },'+
'{ "project": "swift", "pass": 220, "fail": 30 },'+
'{ "project": "neutron", "pass": 230, "fail": 20 },'+
'{ "project": "nova", "pass": 310, "fail": 0 }'+
'] },'+
'{ "datetime": "08 Jun 2015", "project_data": ['+
'{ "project": "glance", "pass": 115, "fail": 0 },'+
'{ "project": "cinder", "pass": 160, "fail": 5 },'+
'{ "project": "swift", "pass": 220, "fail": 30 },'+
'{ "project": "neutron", "pass": 230, "fail": 20 },'+
'{ "project": "nova", "pass": 310, "fail": 0 }'+
'] } ] }';
var data = JSON.parse(mock_text);
var data = JSON.parse(project_data);
$(function () {
@ -95,9 +47,6 @@ $(function () {
color: '#808080'
}]
},
tooltip: {
valueSuffix: '°C'
},
legend: {
layout: 'vertical',
align: 'right',

49
doc/source/mockups/project.json Normal file
View File

@ -0,0 +1,49 @@
project_data = '{ "timedata": [ { "datetime": "02 Jun 2015", "project_data":'+
' [ { "project": "glance", "pass": 100, "fail": 50 },'+
'{ "project": "cinder", "pass": 150, "fail": 25 },'+
'{ "project": "swift", "pass": 200, "fail": 0 },'+
'{ "project": "neutron", "pass": 230, "fail": 10 },'+
'{ "project": "nova", "pass": 300, "fail": 0 }'+
'] },'+
'{ "datetime": "03 Jun 2015", "project_data": ['+
'{ "project": "glance", "pass": 110, "fail": 40 },'+
'{ "project": "cinder", "pass": 160, "fail": 15 },'+
'{ "project": "swift", "pass": 195, "fail": 5 },'+
'{ "project": "neutron", "pass": 225, "fail": 15 },'+
'{ "project": "nova", "pass": 300, "fail": 5 }'+
'] },'+
'{ "datetime": "04 Jun 2015", "project_data": ['+
'{ "project": "glance", "pass": 100, "fail": 50 },'+
'{ "project": "cinder", "pass": 150, "fail": 25 },'+
'{ "project": "swift", "pass": 200, "fail": 0 },'+
'{ "project": "neutron", "pass": 230, "fail": 10 },'+
'{ "project": "nova", "pass": 300, "fail": 5 }'+
'] },'+
'{ "datetime": "05 Jun 2015", "project_data": ['+
'{ "project": "glance", "pass": 125, "fail": 25 },'+
'{ "project": "cinder", "pass": 160, "fail": 15 },'+
'{ "project": "swift", "pass": 200, "fail": 0 },'+
'{ "project": "neutron", "pass": 230, "fail": 10 },'+
'{ "project": "nova", "pass": 305, "fail": 5 }'+
'] },'+
'{ "datetime": "06 Jun 2015", "project_data": ['+
'{ "project": "glance", "pass": 115, "fail": 0 },'+
'{ "project": "cinder", "pass": 160, "fail": 5 },'+
'{ "project": "swift", "pass": 220, "fail": 30 },'+
'{ "project": "neutron", "pass": 230, "fail": 20 },'+
'{ "project": "nova", "pass": 310, "fail": 0 }'+
'] },'+
'{ "datetime": "07 Jun 2015", "project_data": ['+
'{ "project": "glance", "pass": 115, "fail": 0 },'+
'{ "project": "cinder", "pass": 160, "fail": 5 },'+
'{ "project": "swift", "pass": 220, "fail": 30 },'+
'{ "project": "neutron", "pass": 230, "fail": 20 },'+
'{ "project": "nova", "pass": 310, "fail": 0 }'+
'] },'+
'{ "datetime": "08 Jun 2015", "project_data": ['+
'{ "project": "glance", "pass": 115, "fail": 0 },'+
'{ "project": "cinder", "pass": 160, "fail": 5 },'+
'{ "project": "swift", "pass": 220, "fail": 30 },'+
'{ "project": "neutron", "pass": 230, "fail": 20 },'+
'{ "project": "nova", "pass": 310, "fail": 0 }'+
'] } ] }';