Skip to content

dream
dream
Commit fbe81eeb authored by Jérome Perrin's avatar Jérome Perrin
Browse files
Options

update static version

parent 542adac4
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 128 deletions
dream/platform/static/dream/Output_viewChart.html deleted 100644 → 0
View file @ 542adac4
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>Graph</title>
<script src="../lib/rsvp.min.js" type="text/javascript"></script>
<script src="../lib/renderjs.min.js" type="text/javascript"></script>
<script src="../lib/jquery.js" type="text/javascript"></script>
<script src="../lib/jquery.flot.js"></script>
<script src="../lib/jquery.flot.stack.js"></script>
<script src="mixin_gadget.js" type="text/javascript"></script>
<script src="Output_viewChart.js" type="text/javascript"></script>
</head>
<body>
<div class="graph_container" style="width: 100%;height:300px"></div>
</body>
</html>
dream/platform/static/dream/Output_viewChart.js deleted 100644 → 0
View file @ 542adac4
/*global rJS, jQuery, initGadgetMixin, console */
/*jslint unparam: true */
(function(window, rJS, $, initGadgetMixin) {
"use strict";
var gadget_klass = rJS(window);
initGadgetMixin(gadget_klass);
gadget_klass.declareAcquiredMethod("aq_getAttachment", "jio_getAttachment").declareMethod("render", function(options) {
var jio_key = options.id, gadget = this;
gadget.props.jio_key = jio_key;
gadget.props.result = options.result;
return gadget.aq_getAttachment({
_id: gadget.props.jio_key,
_attachment: "body.json"
}).push(function(simulation_json) {
var json_data = JSON.parse(simulation_json);
gadget.props.data = json_data.result.result_list[options.result][options.action_definition.configuration.output_id];
});
}).declareMethod("startService", function() {
// XXX Manually calculate width and height when resizing
$.plot(this.props.element.querySelector(".graph_container"), this.props.data.series, this.props.data.options);
});
})(window, rJS, jQuery, initGadgetMixin);
\ No newline at end of file
dream/platform/static/dream/Output_viewGraph.html
View file @ fbe81eeb
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
<script src="../lib/jquery.js" type="text/javascript"></script> <script src="../lib/jquery.js" type="text/javascript"></script>
<script src="../lib/jquery.flot.js"></script> <script src="../lib/jquery.flot.js"></script>
<script src="../lib/jquery.flot.stack.js"></script> <script src="../lib/jquery.flot.stack.js"></script>
<script src="../lib/jquery.flot.time.js"></script>
<script src="mixin_gadget.js" type="text/javascript"></script> <script src="mixin_gadget.js" type="text/javascript"></script>
<script src="Output_viewGraph.js" type="text/javascript"></script> <script src="Output_viewGraph.js" type="text/javascript"></script>
</head> </head>
......
dream/platform/static/dream/Output_viewGraph.js
View file @ fbe81eeb
...@@ -2,86 +2,6 @@ ...@@ -2,86 +2,6 @@
/*jslint unparam: true */ /*jslint unparam: true */
(function(window, rJS, $, initGadgetMixin) { (function(window, rJS, $, initGadgetMixin) {
"use strict"; "use strict";
function getRequestedValue(object, key) {
var value = 0;
if (object.results[key] !== undefined) {
if (object.results[key].avg !== undefined) {
value = object.results[key].avg;
} else {
value = object.results[key];
}
}
return value;
}
function graph_widget(output_data, config) {
/* FIXME: does not support more than one replic (Buffer family).
* + see george email to integrate without the need of an EG
*/
var conf_data = config.data, ticks = [], counter = 1, series = [], options = {}, key, data = {};
for (key in conf_data) {
if (conf_data.hasOwnProperty(key)) {
data[key] = [];
}
}
$.each(output_data.elementList.sort(function(a, b) {
return a.id < b.id ? -1 : 1;
}), function(idx, obj) {
var reqKey, request, i;
// if the obj is of the requested family
if (obj.family === config.family) {
if (config.plot === "bars") {
for (reqKey in conf_data) {
if (conf_data.hasOwnProperty(reqKey)) {
request = 0;
for (i = 0; i <= conf_data[reqKey].length - 1; i += 1) {
request += getRequestedValue(obj, conf_data[reqKey][i]);
}
data[reqKey].push([ counter, request ]);
}
}
ticks.push([ counter, obj.id ]);
counter += 1;
} else if (config.plot === "line") {
series.push({
label: obj.name || obj.id,
data: obj.results.wip_stat_list
});
}
}
});
if (config.plot === "bars") {
for (key in data) {
if (data.hasOwnProperty(key)) {
series.push({
label: key,
data: data[key]
});
}
}
options = {
xaxis: {
minTickSize: 1,
ticks: ticks
},
yaxis: {
max: 100
},
series: {
bars: {
show: true,
barWidth: .7,
align: "center"
},
stack: true
}
};
}
console.log("series");
console.log(series);
console.log("options");
console.log(options);
return [ series, options ];
}
var gadget_klass = rJS(window); var gadget_klass = rJS(window);
initGadgetMixin(gadget_klass); initGadgetMixin(gadget_klass);
gadget_klass.declareAcquiredMethod("aq_getAttachment", "jio_getAttachment").declareMethod("render", function(options) { gadget_klass.declareAcquiredMethod("aq_getAttachment", "jio_getAttachment").declareMethod("render", function(options) {
...@@ -92,16 +12,11 @@ ...@@ -92,16 +12,11 @@
_id: gadget.props.jio_key, _id: gadget.props.jio_key,
_attachment: "body.json" _attachment: "body.json"
}).push(function(simulation_json) { }).push(function(simulation_json) {
console.log("rendering view graph"); var json_data = JSON.parse(simulation_json);
var json_data = JSON.parse(simulation_json), config = json_data.application_configuration.output[options.action].configuration; gadget.props.data = json_data.result.result_list[options.result][options.action_definition.configuration.output_id];
console.log(config);
console.log(json_data.result.result_list[gadget.props.result]);
gadget.props.result_list = graph_widget(json_data.result.result_list[gadget.props.result], config);
}); });
}).declareMethod("startService", function() { }).declareMethod("startService", function() {
console.log("service graph");
console.log(this.props.result_list);
// XXX Manually calculate width and height when resizing // XXX Manually calculate width and height when resizing
$.plot(this.props.element.querySelector(".graph_container"), this.props.result_list[0], this.props.result_list[1]); $.plot(this.props.element.querySelector(".graph_container"), this.props.data.series, this.props.data.options);
}); });
})(window, rJS, jQuery, initGadgetMixin); })(window, rJS, jQuery, initGadgetMixin);
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7