Skip to content

erp5
erp5
Commit 5d2a6b37 authored by Romain Courteaud's avatar Romain Courteaud
1 Browse files
Options

erp5_officejs_support_request_ui: render the 2 graphs in parallel

parent a4994f47
Pipeline #9346 failed with stage
    in 0 seconds
    Hide whitespace changes
    Inline Side-by-side
    Showing with 204 additions and 194 deletions
    bt5/erp5_officejs_support_request_ui/PathTemplateItem/web_page_module/gadget_supportrequest_homepage_js.js
    View file @ 5d2a6b37
    ......@@ -181,9 +181,9 @@
    graph_gadget_1 = result_list[1],
    graph_gadget_2 = result_list[2],
    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([graph_gadget_1.render(
    {
    return RSVP.all([
    // render first graph
    graph_gadget_1.render({
    value: {
    data: [
    {
    ......@@ -222,48 +222,44 @@
    title: "Support Request Pipe"
    }
    }
    }
    ),
    sp_data,
    graph_gadget_2
    ]);
    })
    .push(function (result_list) {
    var sp_data = result_list[1], graph_gadget = result_list[2];
    gadget.property_dict.graph_widget = graph_gadget;
    return graph_gadget.render({
    value:
    {
    data: [
    {
    value_dict: {
    0: [
    sp_data.state_title_by_state_id.validated,
    sp_data.state_title_by_state_id.submitted,
    sp_data.state_title_by_state_id.suspended,
    sp_data.state_title_by_state_id.invalidated
    ],
    1: [
    sp_data.count_by_state.validated || 0,
    sp_data.count_by_state.submitted || 0,
    sp_data.count_by_state.suspended || 0,
    sp_data.count_by_state.invalidated || 0
    ],
    }),
    // render second graph
    graph_gadget_2.render({
    value:
    {
    data: [
    {
    value_dict: {
    0: [
    sp_data.state_title_by_state_id.validated,
    sp_data.state_title_by_state_id.submitted,
    sp_data.state_title_by_state_id.suspended,
    sp_data.state_title_by_state_id.invalidated
    ],
    1: [
    sp_data.count_by_state.validated || 0,
    sp_data.count_by_state.submitted || 0,
    sp_data.count_by_state.suspended || 0,
    sp_data.count_by_state.invalidated || 0
    ]
    },
    colors: ['#d48265', '#61a0a8', '#c23531', '#2f4554'],
    type: "pie",
    title: "Support Request"
    }
    ],
    layout: {
    axis_dict : {
    0: {"title": "date"},
    1: {"title": "value", "value_type": "number"}
    },
    colors: ['#d48265', '#61a0a8', '#c23531', '#2f4554'],
    type: "pie",
    title: "Support Request"
    title: "Last Month Activity"
    }
    ],
    layout: {
    axis_dict : {
    0: {"title": "date"},
    1: {"title": "value", "value_type": "number"}
    },
    title: "Last Month Activity"
    }
    }
    });
    })
    ]);
    });
    })
    .declareService(function () {
    ......
    bt5/erp5_officejs_support_request_ui/PathTemplateItem/web_page_module/gadget_supportrequest_homepage_js.xml
    View file @ 5d2a6b37
    ......@@ -75,7 +75,9 @@
    </item>
    <item>
    <key> <string>content_type</string> </key>
    <value> <string>application/javascript</string> </value>
    <value>
    <none/>
    </value>
    </item>
    <item>
    <key> <string>default_reference</string> </key>
    ......@@ -158,171 +160,183 @@
    </record>
    <record id="3" aka="AAAAAAAAAAM=">
    <pickle>
    <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
    <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
    </pickle>
    <pickle>
    <tuple>
    <none/>
    <list>
    <dictionary>
    <item>
    <key> <string>action</string> </key>
    <value> <string>publish_alive</string> </value>
    </item>
    <item>
    <key> <string>actor</string> </key>
    <value> <string>zope</string> </value>
    </item>
    <item>
    <key> <string>comment</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>error_message</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>time</string> </key>
    <value>
    <object>
    <klass>
    <global name="DateTime" module="DateTime.DateTime"/>
    </klass>
    <tuple>
    <none/>
    </tuple>
    <state>
    <tuple>
    <float>1489423030.53</float>
    <string>UTC</string>
    </tuple>
    </state>
    </object>
    </value>
    </item>
    <item>
    <key> <string>validation_state</string> </key>
    <value> <string>published_alive</string> </value>
    </item>
    </dictionary>
    </list>
    </tuple>
    <dictionary>
    <item>
    <key> <string>_log</string> </key>
    <value>
    <list>
    <dictionary>
    <item>
    <key> <string>action</string> </key>
    <value> <string>publish_alive</string> </value>
    </item>
    <item>
    <key> <string>actor</string> </key>
    <value> <string>zope</string> </value>
    </item>
    <item>
    <key> <string>comment</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>error_message</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>time</string> </key>
    <value>
    <object>
    <klass>
    <global name="DateTime" module="DateTime.DateTime"/>
    </klass>
    <tuple>
    <none/>
    </tuple>
    <state>
    <tuple>
    <float>1489423030.53</float>
    <string>UTC</string>
    </tuple>
    </state>
    </object>
    </value>
    </item>
    <item>
    <key> <string>validation_state</string> </key>
    <value> <string>published_alive</string> </value>
    </item>
    </dictionary>
    </list>
    </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    <record id="4" aka="AAAAAAAAAAQ=">
    <pickle>
    <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
    <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
    </pickle>
    <pickle>
    <tuple>
    <none/>
    <list>
    <dictionary>
    <item>
    <key> <string>action</string> </key>
    <value> <string>edit</string> </value>
    </item>
    <item>
    <key> <string>actor</string> </key>
    <value> <string>zope</string> </value>
    </item>
    <item>
    <key> <string>comment</string> </key>
    <value>
    <none/>
    </value>
    </item>
    <item>
    <key> <string>error_message</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>serial</string> </key>
    <value> <string>962.25743.31377.26094</string> </value>
    </item>
    <item>
    <key> <string>state</string> </key>
    <value> <string>current</string> </value>
    </item>
    <item>
    <key> <string>time</string> </key>
    <value>
    <object>
    <klass>
    <global name="DateTime" module="DateTime.DateTime"/>
    </klass>
    <tuple>
    <none/>
    </tuple>
    <state>
    <tuple>
    <float>1542008780.46</float>
    <string>GMT+9</string>
    </tuple>
    </state>
    </object>
    </value>
    </item>
    </dictionary>
    </list>
    </tuple>
    <dictionary>
    <item>
    <key> <string>_log</string> </key>
    <value>
    <list>
    <dictionary>
    <item>
    <key> <string>action</string> </key>
    <value> <string>edit</string> </value>
    </item>
    <item>
    <key> <string>actor</string> </key>
    <value> <string>zope</string> </value>
    </item>
    <item>
    <key> <string>comment</string> </key>
    <value>
    <none/>
    </value>
    </item>
    <item>
    <key> <string>error_message</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>serial</string> </key>
    <value> <string>983.46010.49549.22528</string> </value>
    </item>
    <item>
    <key> <string>state</string> </key>
    <value> <string>current</string> </value>
    </item>
    <item>
    <key> <string>time</string> </key>
    <value>
    <object>
    <klass>
    <global name="DateTime" module="DateTime.DateTime"/>
    </klass>
    <tuple>
    <none/>
    </tuple>
    <state>
    <tuple>
    <float>1588755553.56</float>
    <string>UTC</string>
    </tuple>
    </state>
    </object>
    </value>
    </item>
    </dictionary>
    </list>
    </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    <record id="5" aka="AAAAAAAAAAU=">
    <pickle>
    <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
    <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
    </pickle>
    <pickle>
    <tuple>
    <none/>
    <list>
    <dictionary>
    <item>
    <key> <string>action</string> </key>
    <value> <string>detect_converted_file</string> </value>
    </item>
    <item>
    <key> <string>actor</string> </key>
    <value> <string>zope</string> </value>
    </item>
    <item>
    <key> <string>comment</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>error_message</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>external_processing_state</string> </key>
    <value> <string>converted</string> </value>
    </item>
    <item>
    <key> <string>serial</string> </key>
    <value> <string>0.0.0.0</string> </value>
    </item>
    <item>
    <key> <string>time</string> </key>
    <value>
    <object>
    <klass>
    <global name="DateTime" module="DateTime.DateTime"/>
    </klass>
    <tuple>
    <none/>
    </tuple>
    <state>
    <tuple>
    <float>1489422556.63</float>
    <string>UTC</string>
    </tuple>
    </state>
    </object>
    </value>
    </item>
    </dictionary>
    </list>
    </tuple>
    <dictionary>
    <item>
    <key> <string>_log</string> </key>
    <value>
    <list>
    <dictionary>
    <item>
    <key> <string>action</string> </key>
    <value> <string>detect_converted_file</string> </value>
    </item>
    <item>
    <key> <string>actor</string> </key>
    <value> <string>zope</string> </value>
    </item>
    <item>
    <key> <string>comment</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>error_message</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>external_processing_state</string> </key>
    <value> <string>converted</string> </value>
    </item>
    <item>
    <key> <string>serial</string> </key>
    <value> <string>0.0.0.0</string> </value>
    </item>
    <item>
    <key> <string>time</string> </key>
    <value>
    <object>
    <klass>
    <global name="DateTime" module="DateTime.DateTime"/>
    </klass>
    <tuple>
    <none/>
    </tuple>
    <state>
    <tuple>
    <float>1489422556.63</float>
    <string>UTC</string>
    </tuple>
    </state>
    </object>
    </value>
    </item>
    </dictionary>
    </list>
    </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    </ZopeData>
    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