diff --git a/main/exercice/exercise.class.php b/main/exercice/exercise.class.php index 9ddf1b5184..01d4b947bb 100644 --- a/main/exercice/exercise.class.php +++ b/main/exercice/exercise.class.php @@ -794,7 +794,6 @@ class Exercise if ($addAll) { $numberOfQuestions = 999; } - if (!empty($numberOfQuestions)) { $elements = Testcategory::getNElementsFromArray($categoryQuestionList, $numberOfQuestions, $randomizeQuestions); if (!empty($elements)) { @@ -836,7 +835,6 @@ class Exercise $courseId = $this->course_id; // Setting category order. - switch ($questionSelectionType) { case EX_Q_SELECTION_ORDERED: // 1 case EX_Q_SELECTION_RANDOM: // 2 diff --git a/main/inc/Entity/Repository/TrackExerciseRepository.php b/main/inc/Entity/Repository/TrackExerciseRepository.php index fb1ec71ddc..f62fd5e3ab 100644 --- a/main/inc/Entity/Repository/TrackExerciseRepository.php +++ b/main/inc/Entity/Repository/TrackExerciseRepository.php @@ -14,6 +14,8 @@ class TrackExerciseRepository extends EntityRepository { /** * @param int $exerciseId + * @param int $courseId + * @param int $sessionId * @return array */ public function getAverageScorePerForm($exerciseId, $courseId, $sessionId) @@ -35,6 +37,13 @@ class TrackExerciseRepository extends EntityRepository return $qb->getQuery()->getArrayResult(); } + /** + * @param int $exerciseId + * @param int $courseId + * @param int $sessionId + * @param int $distributionId + * @return array + */ public function getResults($exerciseId, $courseId, $sessionId, $distributionId) { $qb = $this->createQueryBuilder('e'); diff --git a/main/template/minedu/admin/questionmanager/exercise_distribution/stats.tpl b/main/template/minedu/admin/questionmanager/exercise_distribution/stats.tpl index e94e5b3e0f..09c4c63e62 100644 --- a/main/template/minedu/admin/questionmanager/exercise_distribution/stats.tpl +++ b/main/template/minedu/admin/questionmanager/exercise_distribution/stats.tpl @@ -13,9 +13,8 @@ {{ item.title }} - - {{ item.average }} + {{ item.average | number_format(3) }} {% endfor %} diff --git a/src/ChamiloLMS/Controller/Admin/QuestionManager/ExerciseDistributionController.php b/src/ChamiloLMS/Controller/Admin/QuestionManager/ExerciseDistributionController.php index cd1ed55d26..651c71e449 100644 --- a/src/ChamiloLMS/Controller/Admin/QuestionManager/ExerciseDistributionController.php +++ b/src/ChamiloLMS/Controller/Admin/QuestionManager/ExerciseDistributionController.php @@ -33,9 +33,9 @@ class ExerciseDistributionController extends CommonController $em = $this->getManager(); $course = $this->getCourse(); - if (empty($course)) { - // throw new \Exception('Could not get a valid course.'); - } + /*if (empty($course)) { + throw new \Exception('Could not get a valid course.'); + }*/ $criteria = array('exerciseId' => $exerciseId); $quizDistributionList = $this->getRepository()->findBy($criteria);