fix error at the end of non phased test

InnovaLangues · Sep 29, 2015 · 37a0277 · 37a0277
1 parent cd2e6b8
commit 37a0277
Show file tree

Hide file tree

Showing 2 changed files with 67 additions and 54 deletions.
diff --git 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
@@ -1,64 +1,73 @@
-{% if session.globalScoreShow %}
-<div class="col-md-12">
-	<div class="panel panel-default">
-	  <div class="panel-body text-center">
-	    <h4><span class="glyphicon glyphicon-thumbs-up"></span> {{ session.globalScoreWording }} </h4>
-	    {% if levelFeedback is not null %}
-	    	{{ levelFeedback }}
-	    {% else %}
-	        -
-	    {% endif %}
-	  </div>
-	</div>
-</div>
-{% endif %}
-
-<div class="col-md-4">
-	<div class="panel panel-default">
-		<div class="panel-body text-center">
-		 	<h4><span class=" glyphicon glyphicon-headphones"></span> Compréhension de l'oral</h4>
-			{% if coFeedback is not null %}
-				{{ coFeedback }}
+{% if session.test.phased %}
+	{% if session.globalScoreShow %}
+	<div class="col-md-12">
+		<div class="panel panel-default">
+		  <div class="panel-body text-center">
+		    <h4><span class="glyphicon glyphicon-thumbs-up"></span> {{ session.globalScoreWording }} </h4>
+		    {% if levelFeedback is not null %}
+		    	{{ levelFeedback }}
 		    {% else %}
 		        -
 		    {% endif %}
+		  </div>
 		</div>
 	</div>
-</div>
+	{% endif %}
 
-<div class="col-md-4">
-	<div class="panel panel-default">
-		<div class="panel-body text-center">
-		 	<h4><span class="glyphicon glyphicon-book"></span> Compréhension de l'écrit</h4>
-			{% if ceFeedback is not null %}	    		
-				{{ ceFeedback }}
-		    {% else %}
-		        -
-		    {% endif %}
+	<div class="col-md-4">
+		<div class="panel panel-default">
+			<div class="panel-body text-center">
+			 	<h4><span class=" glyphicon glyphicon-headphones"></span> Compréhension de l'oral</h4>
+				{% if coFeedback is not null %}
+					{{ coFeedback }}
+			    {% else %}
+			        -
+			    {% endif %}
+			</div>
 		</div>
 	</div>
-</div>
-<div class="col-md-4">
-	<div class="panel panel-default">
-		<div class="panel-body text-center">
-		 	<h4><span class="glyphicon glyphicon-pencil"></span> Expression écrite courte</h4>
-			{% if eecFeedback is not null %}
-				{{ eecFeedback }}
-		    {% else %}
-		        -
-		    {% endif %}
+
+	<div class="col-md-4">
+		<div class="panel panel-default">
+			<div class="panel-body text-center">
+			 	<h4><span class="glyphicon glyphicon-book"></span> Compréhension de l'écrit</h4>
+				{% if ceFeedback is not null %}	    		
+					{{ ceFeedback }}
+			    {% else %}
+			        -
+			    {% endif %}
+			</div>
 		</div>
 	</div>
-</div>
-
-{% if ceFeedback is null %}
-<div class="col-md-12">
-	<div class="panel panel-default">
-		<div class="panel-body text-center">
-		Attention, le résultat en comprehension de l'écrit a bien été pris en compte mais ne peut pas être affiché pour le moment
+	<div class="col-md-4">
+		<div class="panel panel-default">
+			<div class="panel-body text-center">
+			 	<h4><span class="glyphicon glyphicon-pencil"></span> Expression écrite courte</h4>
+				{% if eecFeedback is not null %}
+					{{ eecFeedback }}
+			    {% else %}
+			        -
+			    {% endif %}
+			</div>
 		</div>
 	</div>
-</div>
-{% endif %}
-
 
+	{% if ceFeedback is null %}
+	<div class="col-md-12">
+		<div class="panel panel-default">
+			<div class="panel-body text-center">
+			Attention, le résultat en comprehension de l'écrit a bien été pris en compte mais ne peut pas être affiché pour le moment
+			</div>
+		</div>
+	</div>
+	{% endif %}
+
+{% else %}
+	<div class="col-md-12">
+		<div class="panel panel-default">
+			<div class="panel-body text-center">
+			Les résultats ne sont pas calculés pour ce type de test. 
+			</div>
+		</div>
+	</div>
+{% endif %}