Commit 5d2a6b37 authored by Romain Courteaud's avatar Romain Courteaud

erp5_officejs_support_request_ui: render the 2 graphs in parallel

parent a4994f47
...@@ -181,9 +181,9 @@ ...@@ -181,9 +181,9 @@
graph_gadget_1 = result_list[1], graph_gadget_1 = result_list[1],
graph_gadget_2 = result_list[2], graph_gadget_2 = result_list[2],
count_by_state_and_date_range = sp_data.count_by_state_and_date_range; count_by_state_and_date_range = sp_data.count_by_state_and_date_range;
gadget.property_dict.graph_widget = graph_gadget_1; return RSVP.all([
return RSVP.all([graph_gadget_1.render( // render first graph
{ graph_gadget_1.render({
value: { value: {
data: [ data: [
{ {
...@@ -222,48 +222,44 @@ ...@@ -222,48 +222,44 @@
title: "Support Request Pipe" title: "Support Request Pipe"
} }
} }
} }),
),
sp_data, // render second graph
graph_gadget_2 graph_gadget_2.render({
]); value:
}) {
.push(function (result_list) { data: [
var sp_data = result_list[1], graph_gadget = result_list[2]; {
gadget.property_dict.graph_widget = graph_gadget; value_dict: {
return graph_gadget.render({ 0: [
value: sp_data.state_title_by_state_id.validated,
{ sp_data.state_title_by_state_id.submitted,
data: [ sp_data.state_title_by_state_id.suspended,
{ sp_data.state_title_by_state_id.invalidated
value_dict: { ],
0: [ 1: [
sp_data.state_title_by_state_id.validated, sp_data.count_by_state.validated || 0,
sp_data.state_title_by_state_id.submitted, sp_data.count_by_state.submitted || 0,
sp_data.state_title_by_state_id.suspended, sp_data.count_by_state.suspended || 0,
sp_data.state_title_by_state_id.invalidated sp_data.count_by_state.invalidated || 0
], ]
1: [ },
sp_data.count_by_state.validated || 0, colors: ['#d48265', '#61a0a8', '#c23531', '#2f4554'],
sp_data.count_by_state.submitted || 0, type: "pie",
sp_data.count_by_state.suspended || 0, title: "Support Request"
sp_data.count_by_state.invalidated || 0 }
], ],
layout: {
axis_dict : {
0: {"title": "date"},
1: {"title": "value", "value_type": "number"}
}, },
colors: ['#d48265', '#61a0a8', '#c23531', '#2f4554'], title: "Last Month Activity"
type: "pie",
title: "Support Request"
} }
],
layout: {
axis_dict : {
0: {"title": "date"},
1: {"title": "value", "value_type": "number"}
},
title: "Last Month Activity"
} }
} })
});
]);
}); });
}) })
.declareService(function () { .declareService(function () {
......
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