diff --git a/src/Innova/SelfBundle/Manager/ScoreManager.php b/src/Innova/SelfBundle/Manager/ScoreManager.php index d12853a6..f4657c47 100644 --- a/src/Innova/SelfBundle/Manager/ScoreManager.php +++ b/src/Innova/SelfBundle/Manager/ScoreManager.php @@ -37,10 +37,14 @@ public function getScoreBySkillByLevelForComponent(Test $test, Session $session, public function calculateScoreByTest(Test $test, Session $session, User $user) { - $traces = $this->traceRepo->findBy(array('user' => $user, 'test' => $test, 'session' => $session)); - $scores = $this->getScoresFromTraces($traces); + if ($test->getPhased()) { + $traces = $this->traceRepo->findBy(array('user' => $user, 'test' => $test, 'session' => $session)); + $scores = $this->getScoresFromTraces($traces); - return $scores; + return $scores; + } + + return; } public function orientateToStep(User $user, Session $session, Component $component) diff --git a/src/Innova/SelfBundle/Resources/views/Player/common/score.html.twig b/src/Innova/SelfBundle/Resources/views/Player/common/score.html.twig index 09ae74a4..e1ae806e 100644 --- a/src/Innova/SelfBundle/Resources/views/Player/common/score.html.twig +++ b/src/Innova/SelfBundle/Resources/views/Player/common/score.html.twig @@ -1,64 +1,73 @@ -{% if session.globalScoreShow %} -