mahara-contributors team mailing list archive

[Mahara Bot <1778451@xxxxxxxxxxxxxxxxxx>]

Reviewed:  https://reviews.mahara.org/9000
Committed: https://git.mahara.org/mahara/mahara/commit/7b9303eb875ed46b8f9d32c80aac032ef30d88b2
Submitter: Cecilia Vela Gurovic (ceciliavg@xxxxxxxxxxxxxxx)
Branch:    17.10_STABLE

commit 7b9303eb875ed46b8f9d32c80aac032ef30d88b2
Author: Cecilia Vela Gurovic <ceciliavg@xxxxxxxxxxxxxxx>
Date:   Fri Jun 29 13:01:33 2018 +1200

Bug 1778451: Show legend in charts

Use correct variable in template when creating the legend for charts.

In Chart.js legendTemplate uses var 'datasets'
or 'segments' depending on the type of charts
type Doughnut/PolarArea/Pie use segments
type Line/Radar/Bar use datasets

We have to check which one is defined in the Chart object before
modifying the legend template

Also delayed the updating of page by .5 secs so not to clash with
chart jsons stuff

behatnotneeded

Change-Id: Id3ef35a5037ac2c30d342279e0af7052584f7d16
(cherry picked from commit d09994c2b7df4a30f8336a5f55638767f9607f87)
(cherry picked from commit c07156122d6dc32a2bb398635b1cd0b04521b101)

-- 
You received this bug notification because you are a member of Mahara
Contributors, which is subscribed to Mahara.
Matching subscriptions: Subscription for all Mahara Contributors -- please ask on #mahara-dev or mahara.org forum before editing or unsubscribing it!
https://bugs.launchpad.net/bugs/1778451

Title:
  user statistics sendjasonrequest error

Status in Mahara:
  Fix Committed
Status in Mahara 17.10 series:
  Fix Committed
Status in Mahara 18.04 series:
  Fix Committed

Bug description:
  in admin/users/statistics.php, just loading the page will make a few
  errors show in the browsers console.

  sendjsonrequest() callback failed:  
  ReferenceError
  ​
  columnNumber: 133
  ​
  fileName: "http://maharatest/js/chartjs/Chart.min.js?v=8242 line 10 > Function"
  ​
  lineNumber: 3
  ​
  message: "datasets is not defined"
  ​
  stack: "anonymous@http://maharatest/js/chartjs/Chart.min.js?v=8242 line 10 > Function:3:133\ne@http://maharatest/js/chartjs/Chart.min.js?v=8242:10:5200\ns.template@http://maharatest/js/chartjs/Chart.min.js?v=8242:10:5260\ngenerateLegend@http://maharatest/js/chartjs/Chart.min.js?v=8242:10:11904\nfetch_graph_data/<@http://maharatest/js/mahara.js?v=8242:922:38\nsendjsonrequest/<@http://maharatest/js/mahara.js?v=8242:362:17\ni@http://maharatest/js/jquery/jquery.js?v=8242:2:27060\nadd@http://maharatest/js/jquery/jquery.js?v=8242:2:27364\nsendjsonrequest@http://maharatest/js/mahara.js?v=8242:345:5\nfetch_graph_data@http://maharatest/js/mahara.js?v=8242:903:5\n@http://maharatest/admin/users/statistics.php:455:13\ni@http://maharatest/js/jquery/jquery.js?v=8242:2:27060\nfireWith@http://maharatest/js/jquery/jquery.js?v=8242:2:27828\nready@http://maharatest/js/jquery/jquery.js?v=8242:2:29619\nJ@http://maharatest/js/jquery/jquery.js?v=8242:2:29804\n";
  ​

To manage notifications about this bug go to:
https://bugs.launchpad.net/mahara/+bug/1778451/+subscriptions