Commit f998374e authored by Boxiang Sun's avatar Boxiang Sun Committed by Tristan Cavelier

erp5_officejs_support_request_ui: Show two spin button when loading two charts.

parent 81c62f71
...@@ -18,3 +18,9 @@ ...@@ -18,3 +18,9 @@
#wrap2 iframe { #wrap2 iframe {
height: 100%; height: 100%;
} }
.gadget-content .ui-field-contain .graph-spinner {
position: relative;
top: 100px;
width: 120px;
}
\ No newline at end of file
...@@ -242,7 +242,7 @@ ...@@ -242,7 +242,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>961.52407.42575.23859</string> </value> <value> <string>961.56640.36441.6519</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -260,7 +260,7 @@ ...@@ -260,7 +260,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1504527393.27</float> <float>1504536008.68</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
...@@ -252,7 +252,7 @@ ...@@ -252,7 +252,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1504526707.1</float> <float>1504535744.76</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
...@@ -74,6 +74,16 @@ ...@@ -74,6 +74,16 @@
) )
]); ]);
}) })
.push(function (result) {
var bar_chart = document.getElementById("wrap1"),
pie_chart = document.getElementById("wrap2"),
loader = document.getElementsByClassName("graph-spinner");
loader[0].style.display = "none";
loader[1].style.display = "none";
bar_chart.style.display = "block";
pie_chart.style.display = "block";
return result;
})
.push(function (result_list) { .push(function (result_list) {
var sp_data = result_list[0], graph_gadget_1 = result_list[1], graph_gadget_2 = result_list[2]; var sp_data = result_list[0], graph_gadget_1 = result_list[1], graph_gadget_2 = result_list[2];
gadget.property_dict.graph_widget = graph_gadget_1; gadget.property_dict.graph_widget = graph_gadget_1;
......
...@@ -236,7 +236,7 @@ ...@@ -236,7 +236,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>961.56651.42335.12800</string> </value> <value> <string>961.56777.60794.21230</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -254,7 +254,7 @@ ...@@ -254,7 +254,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1504528133.07</float> <float>1504535750.54</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