Merge branch 'MDL-66701_master' of git://github.com/dmonllao/moodle

This commit is contained in:
Jun Pataleta 2019-11-07 15:41:45 +08:00
commit cf29a4857a
6 changed files with 26 additions and 4 deletions

View file

@ -89,7 +89,14 @@ class insight implements \renderable, \templatable {
$data->modelid = $this->model->get_id();
$data->contextid = $this->context->id;
$data->predictionid = $predictiondata->id;
$data->insightname = format_string($target->get_name());
$targetname = $target->get_name();
$data->insightname = format_string($targetname);
$targetinfostr = $targetname->get_identifier() . 'info';
if (get_string_manager()->string_exists($targetinfostr, $targetname->get_component())) {
$data->insightdescription = get_string($targetinfostr, $targetname->get_component());
}
$data->showpredictionheading = true;
if (!$target->is_linear()) {

View file

@ -92,7 +92,14 @@ class insights_list implements \renderable, \templatable {
$data = new \stdClass();
$data->modelid = $this->model->get_id();
$data->contextid = $this->context->id;
$data->insightname = format_string($target->get_name());
$targetname = $target->get_name();
$data->insightname = format_string($targetname);
$targetinfostr = $targetname->get_identifier() . 'info';
if (get_string_manager()->string_exists($targetinfostr, $targetname->get_component())) {
$data->insightdescription = get_string($targetinfostr, $targetname->get_component());
}
$data->showpredictionheading = true;
if (!$target->is_linear()) {

View file

@ -90,6 +90,8 @@
<h2 class="mb-2">{{insightname}}</h2>
{{{insightdescription}}}
{{> report_insights/bulk_actions }}
<table class="generaltable insights-list mt-3">

View file

@ -106,7 +106,9 @@
<div class="insight-container" data-context-id="{{contextid}}" data-model-id="{{modelid}}">
<h2 class="mb-2">{{{insightname}}}</h2>
<h2 class="mb-2">{{insightname}}</h2>
{{{insightdescription}}}
{{^noinsights}}
{{#nostaticmodelnotification}}
@ -168,4 +170,4 @@
</div>
{{/noinsights}}
</div>
</div>