mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-14 04:30:15 +01:00
Code Issues Projects Releases Wiki Activity

MDL-53539 tool_lp: Fix percentage displays for template statistics

Browse Source
This commit is contained in:
Jun Pataleta 2016-03-18 16:13:29 +08:00 committed by Frederic Massart
parent fe0ea87906
commit f9090dff7c
2 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
admin/tool/lp/classes/external/template_statistics_exporter.php vendored
View File

@ -63,15 +63,24 @@ class template_statistics_exporter extends exporter {
'linkedcompetencypercentage' => array(
'type' => PARAM_FLOAT
),
'linkedcompetencypercentageformatted' => array(
'type' => PARAM_RAW
),
'linkedcompetencycount' => array(
'type' => PARAM_INT
),
'completedplanpercentage' => array(
'type' => PARAM_FLOAT
),
'completedplanpercentageformatted' => array(
'type' => PARAM_RAW
),
'proficientusercompetencyplanpercentage' => array(
'type' => PARAM_FLOAT
),
'proficientusercompetencyplanpercentageformatted' => array(
'type' => PARAM_RAW
),
'leastproficient' => array(
'type' => competency_exporter::read_properties_definition(),
'multiple' => true
@ -89,19 +98,23 @@ class template_statistics_exporter extends exporter {
$linkedcompetencycount = 0;
}
$linkedcompetencypercentage = 0;
$linkedcompetencypercentageformatted = '';
if ($this->data->competencycount > 0) {
$linkedcompetencypercentage = format_float(
((float) $linkedcompetencycount / (float) $this->data->competencycount) * 100.0);
$linkedcompetencypercentage = ((float) $linkedcompetencycount / (float) $this->data->competencycount) * 100.0;
$linkedcompetencypercentageformatted = format_float($linkedcompetencypercentage);
}
$completedplanpercentage = 0;
$completedplanpercentageformatted = '';
if ($this->data->plancount > 0) {
$completedplanpercentage = format_float(
((float) $this->data->completedplancount / (float) $this->data->plancount) * 100.0);
$completedplanpercentage = ((float) $this->data->completedplancount / (float) $this->data->plancount) * 100.0;
$completedplanpercentageformatted = format_float($completedplanpercentage);
}
$proficientusercompetencyplanpercentage = 0;
$proficientusercompetencyplanpercentageformatted = '';
if ($this->data->usercompetencyplancount > 0) {
$proficientusercompetencyplanpercentage = format_float(
((float) $this->data->proficientusercompetencyplancount / (float) $this->data->usercompetencyplancount) * 100.0);
$proficientusercompetencyplanpercentage = ((float) $this->data->proficientusercompetencyplancount /
(float) $this->data->usercompetencyplancount) * 100.0;
$proficientusercompetencyplanpercentageformatted = format_float($proficientusercompetencyplanpercentage);
}
$competencies = array();
$contextcache = array();
@ -116,8 +129,11 @@ class template_statistics_exporter extends exporter {
return array(
'linkedcompetencycount' => $linkedcompetencycount,
'linkedcompetencypercentage' => $linkedcompetencypercentage,
'linkedcompetencypercentageformatted' => $linkedcompetencypercentageformatted,
'completedplanpercentage' => $completedplanpercentage,
'completedplanpercentageformatted' => $completedplanpercentageformatted,
'proficientusercompetencyplanpercentage' => $proficientusercompetencyplanpercentage,
'proficientusercompetencyplanpercentageformatted' => $proficientusercompetencyplanpercentageformatted,
'leastproficient' => $competencies,
'leastproficientcount' => count($competencies)
);

8
admin/tool/lp/templates/template_statistics.mustache
View File

@ -52,7 +52,7 @@
</div>
<div class="progress">
<div class="bar" style="width: {{linkedcompetencypercentage}}%;">
{{linkedcompetencypercentage}} %
{{linkedcompetencypercentageformatted}} %
</div>
</div>
</div>
@ -63,7 +63,7 @@
</div>
<div class="progress">
<div class="bar" style="width: {{completedplanpercentage}}%;">
{{completedplanpercentage}} %
{{completedplanpercentageformatted}} %
</div>
</div>
</div>
@ -71,11 +71,11 @@
{{#usercompetencyplancount}}
<div>
<div class="progresstext">
{{#str}}averageproficiencyrate, tool_lp, {{proficientusercompetencyplanpercentage}} {{/str}}
{{#str}}averageproficiencyrate, tool_lp, {{proficientusercompetencyplanpercentageformatted}} {{/str}}
</div>
<div class="progress">
<div class="bar" style="width: {{proficientusercompetencyplanpercentage}}%;">
{{proficientusercompetencyplanpercentage}} %
{{proficientusercompetencyplanpercentageformatted}} %
</div>
</div>
</div>