From f998374ee67bd58f64b94b8634daf5a599926b60 Mon Sep 17 00:00:00 2001
From: Boxiang Sun <boxiang.sun@nexedi.com>
Date: Mon, 4 Sep 2017 14:42:07 +0000
Subject: [PATCH] erp5_officejs_support_request_ui: Show two spin button when
loading two charts.
---
.../gadget_supportrequest_homepage_css.css | 6 ++++++
.../gadget_supportrequest_homepage_css.xml | 4 ++--
.../gadget_supportrequest_homepage_html.xml | 2 +-
.../gadget_supportrequest_homepage_js.js | 10 ++++++++++
.../gadget_supportrequest_homepage_js.xml | 4 ++--
5 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/bt5/erp5_officejs_support_request_ui/PathTemplateItem/web_page_module/gadget_supportrequest_homepage_css.css b/bt5/erp5_officejs_support_request_ui/PathTemplateItem/web_page_module/gadget_supportrequest_homepage_css.css
index 8b3296d96c..ae21b9abed 100644
--- a/bt5/erp5_officejs_support_request_ui/PathTemplateItem/web_page_module/gadget_supportrequest_homepage_css.css
+++ b/bt5/erp5_officejs_support_request_ui/PathTemplateItem/web_page_module/gadget_supportrequest_homepage_css.css
@@ -17,4 +17,10 @@
#wrap2 iframe {
height: 100%;
+}
+
+.gadget-content .ui-field-contain .graph-spinner {
+ position: relative;
+ top: 100px;
+ width: 120px;
}
\ No newline at end of file
diff --git a/bt5/erp5_officejs_support_request_ui/PathTemplateItem/web_page_module/gadget_supportrequest_homepage_css.xml b/bt5/erp5_officejs_support_request_ui/PathTemplateItem/web_page_module/gadget_supportrequest_homepage_css.xml
index 8214f6d77d..90c7aa688d 100644
--- a/bt5/erp5_officejs_support_request_ui/PathTemplateItem/web_page_module/gadget_supportrequest_homepage_css.xml
+++ b/bt5/erp5_officejs_support_request_ui/PathTemplateItem/web_page_module/gadget_supportrequest_homepage_css.xml
@@ -242,7 +242,7 @@
</item>
<item>
<key> <string>serial</string> </key>
- <value> <string>961.52407.42575.23859</string> </value>
+ <value> <string>961.56640.36441.6519</string> </value>
</item>
<item>
<key> <string>state</string> </key>
@@ -260,7 +260,7 @@
</tuple>
<state>
<tuple>
- <float>1504527393.27</float>
+ <float>1504536008.68</float>
<string>UTC</string>
</tuple>
</state>
diff --git a/bt5/erp5_officejs_support_request_ui/PathTemplateItem/web_page_module/gadget_supportrequest_homepage_html.xml b/bt5/erp5_officejs_support_request_ui/PathTemplateItem/web_page_module/gadget_supportrequest_homepage_html.xml
index 80e9c9bb71..163f7515a9 100644
--- a/bt5/erp5_officejs_support_request_ui/PathTemplateItem/web_page_module/gadget_supportrequest_homepage_html.xml
+++ b/bt5/erp5_officejs_support_request_ui/PathTemplateItem/web_page_module/gadget_supportrequest_homepage_html.xml
@@ -252,7 +252,7 @@
</tuple>
<state>
<tuple>
- <float>1504526707.1</float>
+ <float>1504535744.76</float>
<string>UTC</string>
</tuple>
</state>
diff --git a/bt5/erp5_officejs_support_request_ui/PathTemplateItem/web_page_module/gadget_supportrequest_homepage_js.js b/bt5/erp5_officejs_support_request_ui/PathTemplateItem/web_page_module/gadget_supportrequest_homepage_js.js
index 8c899d5b9b..85c94d8a0c 100644
--- a/bt5/erp5_officejs_support_request_ui/PathTemplateItem/web_page_module/gadget_supportrequest_homepage_js.js
+++ b/bt5/erp5_officejs_support_request_ui/PathTemplateItem/web_page_module/gadget_supportrequest_homepage_js.js
@@ -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) {
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;
diff --git a/bt5/erp5_officejs_support_request_ui/PathTemplateItem/web_page_module/gadget_supportrequest_homepage_js.xml b/bt5/erp5_officejs_support_request_ui/PathTemplateItem/web_page_module/gadget_supportrequest_homepage_js.xml
index de73f5e27e..98725bca84 100644
--- a/bt5/erp5_officejs_support_request_ui/PathTemplateItem/web_page_module/gadget_supportrequest_homepage_js.xml
+++ b/bt5/erp5_officejs_support_request_ui/PathTemplateItem/web_page_module/gadget_supportrequest_homepage_js.xml
@@ -236,7 +236,7 @@
</item>
<item>
<key> <string>serial</string> </key>
- <value> <string>961.56651.42335.12800</string> </value>
+ <value> <string>961.56777.60794.21230</string> </value>
</item>
<item>
<key> <string>state</string> </key>
@@ -254,7 +254,7 @@
</tuple>
<state>
<tuple>
- <float>1504528133.07</float>
+ <float>1504535750.54</float>
<string>UTC</string>
</tuple>
</state>
--
2.30.9