diff --git a/dta.zip b/dta.zip index 3dc4044545d887c632ab5dd8f94f236ef472dcb1..584b43be9a249b7909d4f5d6c23209410e437f2a 100644 Binary files a/dta.zip and b/dta.zip differ diff --git a/dta/utils/view.php b/dta/utils/view.php index 2d0b46902f739b8b8b46129c6479b507bbb418ce..a5a4b87329adfb486f89109d8ed0de0daae166cd 100644 --- a/dta/utils/view.php +++ b/dta/utils/view.php @@ -56,7 +56,7 @@ class ViewSubmissionUtils { $html .= $summary->unknownCount() . get_string("unknown_state", self::COMPONENT_NAME) . "<br>"; } - $html .= get_string("success_competencies", self::COMPONENT_NAME) . $summary->successfulTestCompetencyProfile . "<br>"; + $html .= get_string("success_competencies", self::COMPONENT_NAME) . $summary->successfultestcompetencies . "<br>"; return html_writer::div($html, "dtaSubmissionSummary"); } @@ -209,10 +209,11 @@ class ViewSubmissionUtils { $showncompetencies = explode(";", $summary->successfultestcompetencies); $overallcompetencies = explode(";", $summary->overalltestcompetencies); - $index=1; - foreach ($overallcompetencies as $comp) { + for ($index=1, $size=count($overallcompetencies; $index<=$size; $index++) { + $comp=$overallcompetencies[$index]; + $shown=$showncompetencies[$index]; // If the competency was actually assessed by the assignment and tests, add a row in the table. - if($comp!="0") { +// if($comp!="0") { // New copy of base attributes array. $resultrowattributes = $tablerowattributes; $tmp = ""; @@ -220,13 +221,12 @@ class ViewSubmissionUtils { $tmp = ""; $tmp .= html_writer::tag("td", - floatval($showncompetencies[$index])/floatval ($comp) . "% - (" . $showncompetencies[$index] . " / " . $comp . ")", + floatval($shown)/floatval ($comp) . "% + (" . $shown . " / " . $comp . ")", $resultrowattributes); $body .= html_writer::tag("tr", $tmp, $resultrowattributes); - } - $index = $index + 1; +// } } $body = html_writer::tag("tbody", $body); $html .= html_writer::tag("table", $header . $body, ["class" => "dtaTable"]);