Commit fc9ca479 authored by Roque's avatar Roque

erp5_officejs: minor graph refactoring

parent b1dcfe05
...@@ -72,7 +72,6 @@ ...@@ -72,7 +72,6 @@
serie.drawPoints = true; serie.drawPoints = true;
serie.strokeWidth = 0; serie.strokeWidth = 0;
} }
console.log("serie", serie);
graph_data_and_parameter.series[trace.title || ''] = serie; graph_data_and_parameter.series[trace.title || ''] = serie;
} }
for (i = 0; i < data.length; i = i + 1) { for (i = 0; i < data.length; i = i + 1) {
...@@ -195,7 +194,11 @@ ...@@ -195,7 +194,11 @@
graph_data_and_parameter; graph_data_and_parameter;
container = gadget.element.querySelector(".graph-content"); container = gadget.element.querySelector(".graph-content");
if (modification_dict.value.new_format) {
graph_data_and_parameter = formatGraphDict(modification_dict.value); graph_data_and_parameter = formatGraphDict(modification_dict.value);
} else {
graph_data_and_parameter = getGraphDataAndParameterFromConfiguration(modification_dict.value);
}
gadget.property_dict.graph = new Dygraph(container, gadget.property_dict.graph = new Dygraph(container,
graph_data_and_parameter.dygraph_data, graph_data_and_parameter.dygraph_data,
graph_data_and_parameter.dygraph_parameter_dict); graph_data_and_parameter.dygraph_parameter_dict);
......
...@@ -242,7 +242,7 @@ ...@@ -242,7 +242,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>1016.32471.45294.12919</string> </value> <value> <string>1016.58116.20617.24900</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -262,7 +262,7 @@ ...@@ -262,7 +262,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1715371703.99</float> <float>1716991783.66</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
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