';
$s .= Display::tag('tr', $header, ['style' => 'text-align:left;']);
// ajout de la 2eme ligne d'entête pour true/falss et les pourcentages de certitude
@@ -1453,9 +1453,10 @@ HTML;
}
$answerList .= '
-
+
';
+ }
if ($freeze) {
$relPath = api_get_path(WEB_CODE_PATH);
echo "
@@ -1481,7 +1482,6 @@ HTML;
return;
}
- }
if (!$only_questions) {
if ($show_title) {
@@ -1514,6 +1514,7 @@ HOTSPOT;
new ".(HOT_SPOT_DELINEATION == $answerType ? 'DelineationQuestion' : 'HotspotQuestion')."({
questionId: $questionId,
exerciseId: $exerciseId,
+ exeId: 0,
selector: '#question_div_' + $questionId + ' .hotspot-image',
for: 'user',
relPath: '$relPath'
@@ -1614,6 +1615,80 @@ HOTSPOT;
return $nbrAnswers;
}
+ /**
+ * Get an HTML string with the list of exercises where the given question
+ * is being used.
+ *
+ * @param int $questionId The iid of the question being observed
+ * @param int $excludeTestId If defined, exclude this (current) test from the list of results
+ *
+ * @return string An HTML string containing a div and a table
+ */
+ public static function showTestsWhereQuestionIsUsed(int $questionId, int $excludeTestId = 0)
+ {
+ $questionId = (int) $questionId;
+ $sql = "SELECT qz.title quiz_title,
+ c.title course_title,
+ s.name session_name,
+ qz.iid as quiz_id,
+ qz.c_id,
+ qz.session_id
+ FROM c_quiz qz,
+ c_quiz_rel_question qq,
+ course c,
+ session s
+ WHERE qz.c_id = c.id AND
+ (qz.session_id = s.id OR qz.session_id = 0) AND
+ qq.exercice_id = qz.iid AND ";
+ if (!empty($excludeTestId)) {
+ $excludeTestId = (int) $excludeTestId;
+ $sql .= " qz.iid != $excludeTestId AND ";
+ }
+ $sql .= " qq.question_id = $questionId
+ GROUP BY qq.iid";
+
+ $result = [];
+ $html = "";
+
+ $sqlResult = Database::query($sql);
+
+ if (Database::num_rows($sqlResult) != 0) {
+ while ($row = Database::fetch_array($sqlResult, 'ASSOC')) {
+ $tmp = [];
+ $tmp[0] = $row['course_title'];
+ $tmp[1] = $row['session_name'];
+ $tmp[2] = $row['quiz_title'];
+ // Send do other test with r=1 to reset current test session variables
+ $urlToQuiz = api_get_path(WEB_CODE_PATH).'exercise/admin.php?'.api_get_cidreq().'&exerciseId='.$row['quiz_id'].'&r=1';
+ $tmp[3] = ''.Display::return_icon('quiz.png', get_lang('Edit')).'';
+ if ((int) $row['session_id'] == 0) {
+ $tmp[1] = '-';
+ }
+
+ $result[] = $tmp;
+ }
+
+ $headers = [
+ get_lang('Course'),
+ get_lang('Session'),
+ get_lang('Quiz'),
+ get_lang('LinkToTestEdition'),
+ ];
+
+ $title = Display::div(
+ get_lang('QuestionAlsoUsedInTheFollowingTests'),
+ [
+ 'class' => 'section-title',
+ 'style' => 'margin-top: 25px; border-bottom: none',
+ ]
+ );
+
+ $html = $title.Display::table($headers, $result);
+ }
+
+ echo $html;
+ }
+
/**
* @param int $exeId
*
@@ -2558,8 +2633,8 @@ HOTSPOT;
$maxNote = api_get_setting('exercise_max_score');
$minNote = api_get_setting('exercise_min_score');
- if ('' != $maxNote && '' != $minNote) {
- if (!empty($weight) && 0 != intval($weight)) {
+ if ($maxNote != '' && $minNote != '') {
+ if (!empty($weight) && (float) $weight !== (float) 0) {
$score = $minNote + ($maxNote - $minNote) * $score / $weight;
} else {
$score = $minNote;
@@ -2583,6 +2658,7 @@ HOTSPOT;
* @param string $decimalSeparator
* @param string $thousandSeparator
* @param bool $roundValues This option rounds the float values into a int using ceil()
+ * @param bool $removeEmptyDecimals
*
* @return string an html with the score modified
*/
@@ -2595,11 +2671,14 @@ HOTSPOT;
$hidePercentageSign = false,
$decimalSeparator = '.',
$thousandSeparator = ',',
- $roundValues = false
+ $roundValues = false,
+ $removeEmptyDecimals = false
) {
if (is_null($score) && is_null($weight)) {
return '-';
}
+ $decimalSeparator = empty($decimalSeparator) ? '.' : $decimalSeparator;
+ $thousandSeparator = empty($thousandSeparator) ? ',' : $thousandSeparator;
if ($use_platform_settings) {
$result = self::convertScoreToPlatformSetting($score, $weight);
@@ -2656,6 +2735,11 @@ HOTSPOT;
$html = $percentage.$percentageSign;
}
} else {
+ if ($removeEmptyDecimals) {
+ if (ScoreDisplay::hasEmptyDecimals($weight)) {
+ $weight = round($weight);
+ }
+ }
$html = $score.' / '.$weight;
}
@@ -3322,7 +3406,7 @@ EOT;
$best_score = 0;
if (!empty($user_results)) {
foreach ($user_results as $result) {
- if (!empty($result['max_score']) && 0 != intval($result['max_score'])) {
+ if (!empty($result['max_score']) && 0 != (float) $result['max_score']) {
$score = $result['score'] / $result['max_score'];
if ($score >= $best_score) {
$best_score = $score;
@@ -4158,12 +4242,18 @@ EOT;
* @param int $exeId
* @param bool $save_user_result save users results (true) or just show the results (false)
* @param string $remainingMessage
+ * @param bool $allowSignature
+ * @param bool $allowExportPdf
+ * @param bool $isExport
*/
public static function displayQuestionListByAttempt(
$objExercise,
$exeId,
$save_user_result = false,
- $remainingMessage = ''
+ $remainingMessage = '',
+ $allowSignature = false,
+ $allowExportPdf = false,
+ $isExport = false
) {
$origin = api_get_origin();
$courseId = api_get_course_int_id();
@@ -4252,11 +4342,13 @@ EOT;
$showTotalScoreAndUserChoicesInLastAttempt = true;
$showTotalScore = true;
$showQuestionScore = true;
+ $attemptResult = [];
if (in_array(
$objExercise->results_disabled,
[
RESULT_DISABLE_SHOW_SCORE_ATTEMPT_SHOW_ANSWERS_LAST_ATTEMPT,
+ RESULT_DISABLE_SHOW_SCORE_ATTEMPT_SHOW_ANSWERS_LAST_ATTEMPT_NO_FEEDBACK,
RESULT_DISABLE_DONT_SHOW_SCORE_ONLY_IF_USER_FINISHES_ATTEMPTS_SHOW_ALWAYS_FEEDBACK,
])
) {
@@ -4281,6 +4373,9 @@ EOT;
$numberAttempts++;
}
$showTotalScore = false;
+ if ($objExercise->results_disabled == RESULT_DISABLE_SHOW_SCORE_ATTEMPT_SHOW_ANSWERS_LAST_ATTEMPT) {
+ $showTotalScore = true;
+ }
$showTotalScoreAndUserChoicesInLastAttempt = false;
if ($numberAttempts >= $objExercise->attempts) {
$showTotalScore = true;
@@ -4288,6 +4383,15 @@ EOT;
$show_only_score = false;
$showTotalScoreAndUserChoicesInLastAttempt = true;
}
+ if ($objExercise->results_disabled == RESULT_DISABLE_SHOW_SCORE_ATTEMPT_SHOW_ANSWERS_LAST_ATTEMPT_NO_FEEDBACK) {
+ $showTotalScore = true;
+ $show_results = true;
+ $show_only_score = false;
+ $showTotalScoreAndUserChoicesInLastAttempt = false;
+ if ($numberAttempts >= $objExercise->attempts) {
+ $showTotalScoreAndUserChoicesInLastAttempt = true;
+ }
+ }
}
if (RESULT_DISABLE_DONT_SHOW_SCORE_ONLY_IF_USER_FINISHES_ATTEMPTS_SHOW_ALWAYS_FEEDBACK ==
@@ -4305,6 +4409,16 @@ EOT;
}
}
+ if ($allowExportPdf && $isExport) {
+ $showTotalScore = false;
+ $showQuestionScore = false;
+ $objExercise->feedback_type = 2;
+ $objExercise->hideComment = true;
+ $objExercise->hideNoAnswer = true;
+ $objExercise->results_disabled = 0;
+ $objExercise->hideExpectedAnswer = true;
+ $show_results = true;
+ }
if ('embeddable' !== $origin &&
!empty($exercise_stat_info['exe_user_id']) &&
!empty($studentInfo)
@@ -4313,7 +4427,9 @@ EOT;
echo $objExercise->showExerciseResultHeader(
$studentInfo,
$exercise_stat_info,
- $save_user_result
+ $save_user_result,
+ $allowSignature,
+ $allowExportPdf
);
}
@@ -4327,7 +4443,6 @@ EOT;
}
$question_list_answers = [];
- $media_list = [];
$category_list = [];
$loadChoiceFromSession = false;
$fromDatabase = true;
@@ -4335,7 +4450,7 @@ EOT;
$exerciseResultCoordinates = null;
$delineationResults = null;
- if (in_array(
+ if (true === $save_user_result && in_array(
$objExercise->getFeedbackType(),
[EXERCISE_FEEDBACK_TYPE_DIRECT, EXERCISE_FEEDBACK_TYPE_POPUP]
)) {
@@ -4394,6 +4509,7 @@ EOT;
$my_total_score = $result['score'];
$my_total_weight = $result['weight'];
+ $scorePassed = self::scorePassed($my_total_score, $my_total_weight);
// Category report
$category_was_added_for_this_test = false;
@@ -4404,8 +4520,34 @@ EOT;
if (!isset($category_list[$objQuestionTmp->category]['total'])) {
$category_list[$objQuestionTmp->category]['total'] = 0;
}
+ if (!isset($category_list[$objQuestionTmp->category]['total_questions'])) {
+ $category_list[$objQuestionTmp->category]['total_questions'] = 0;
+ }
+ if (!isset($category_list[$objQuestionTmp->category]['passed'])) {
+ $category_list[$objQuestionTmp->category]['passed'] = 0;
+ }
+ if (!isset($category_list[$objQuestionTmp->category]['wrong'])) {
+ $category_list[$objQuestionTmp->category]['wrong'] = 0;
+ }
+ if (!isset($category_list[$objQuestionTmp->category]['no_answer'])) {
+ $category_list[$objQuestionTmp->category]['no_answer'] = 0;
+ }
$category_list[$objQuestionTmp->category]['score'] += $my_total_score;
$category_list[$objQuestionTmp->category]['total'] += $my_total_weight;
+ if ($scorePassed) {
+ // Only count passed if score is not empty
+ if (!empty($my_total_score)) {
+ $category_list[$objQuestionTmp->category]['passed']++;
+ }
+ } else {
+ if ($result['user_answered']) {
+ $category_list[$objQuestionTmp->category]['wrong']++;
+ } else {
+ $category_list[$objQuestionTmp->category]['no_answer']++;
+ }
+ }
+
+ $category_list[$objQuestionTmp->category]['total_questions']++;
$category_was_added_for_this_test = true;
}
@@ -4456,25 +4598,21 @@ EOT;
}
}
+ $calculatedScore = [
+ 'result' => self::show_score(
+ $my_total_score,
+ $my_total_weight,
+ false
+ ),
+ 'pass' => $scorePassed,
+ 'score' => $my_total_score,
+ 'weight' => $my_total_weight,
+ 'comments' => $comnt,
+ 'user_answered' => $result['user_answered'],
+ ];
$score = [];
if ($show_results) {
- $scorePassed = $my_total_score >= $my_total_weight;
- if (function_exists('bccomp')) {
- $compareResult = bccomp($my_total_score, $my_total_weight, 3);
- $scorePassed = 1 === $compareResult || 0 === $compareResult;
- }
- $score = [
- 'result' => self::show_score(
- $my_total_score,
- $my_total_weight,
- false
- ),
- 'pass' => $scorePassed,
- 'score' => $my_total_score,
- 'weight' => $my_total_weight,
- 'comments' => $comnt,
- 'user_answered' => $result['user_answered'],
- ];
+ $score = $calculatedScore;
}
if (in_array($objQuestionTmp->type, [FREE_ANSWER, ORAL_EXPRESSION, ANNOTATION])) {
@@ -4492,7 +4630,7 @@ EOT;
$question_content = '';
if ($show_results) {
$question_content = '';
- if (false == $showQuestionScore) {
+ if (false === $showQuestionScore) {
$score = [];
}
@@ -4508,6 +4646,8 @@ EOT;
if ($show_results) {
$question_content .= '
';
}
+ $calculatedScore['question_content'] = $question_content;
+ $attemptResult[] = $calculatedScore;
if ($objExercise->showExpectedChoice()) {
$exercise_content .= Display::div(
Display::panel($question_content),
@@ -4581,13 +4721,15 @@ EOT;
echo $chartMultiAnswer;
}
- if (!empty($category_list) && ($show_results || $show_only_score)) {
+ if (!empty($category_list) &&
+ ($show_results || $show_only_score || RESULT_DISABLE_RADAR == $objExercise->results_disabled)
+ ) {
// Adding total
$category_list['total'] = [
'score' => $total_score,
'total' => $total_weight,
];
- echo TestCategory::get_stats_table_by_attempt($objExercise->id, $category_list);
+ echo TestCategory::get_stats_table_by_attempt($objExercise, $category_list);
}
if ($show_all_but_expected_answer) {
@@ -4669,7 +4811,7 @@ EOT;
)) {
echo Display::page_header(get_lang('Ranking'), null, 'h4');
echo self::displayResultsInRanking(
- $objExercise->iId,
+ $objExercise,
api_get_user_id(),
$courseId,
$sessionId
@@ -4679,23 +4821,59 @@ EOT;
if (!empty($remainingMessage)) {
echo Display::return_message($remainingMessage, 'normal', false);
}
+ $failedAnswersCount = 0;
+ $wrongQuestionHtml = '';
+ $all = '';
+ foreach ($attemptResult as $item) {
+ if (false === $item['pass']) {
+ $failedAnswersCount++;
+ $wrongQuestionHtml .= $item['question_content'].'
';
+ }
+ $all .= $item['question_content'].'
';
+ }
+
+ $passed = self::isPassPercentageAttemptPassed(
+ $objExercise,
+ $total_score,
+ $total_weight
+ );
+
+ $percentage = 0;
+ if (!empty($total_weight)) {
+ $percentage = ($total_score / $total_weight) * 100;
+ }
+
+ return [
+ 'category_list' => $category_list,
+ 'attempts_result_list' => $attemptResult, // array of results
+ 'exercise_passed' => $passed, // boolean
+ 'total_answers_count' => count($attemptResult), // int
+ 'failed_answers_count' => $failedAnswersCount, // int
+ 'failed_answers_html' => $wrongQuestionHtml,
+ 'all_answers_html' => $all,
+ 'total_score' => $total_score,
+ 'total_weight' => $total_weight,
+ 'total_percentage' => $percentage,
+ 'count_pending_questions' => $countPendingQuestions,
+ ];
}
/**
* Display the ranking of results in a exercise.
*
- * @param int $exerciseId
+ * @param Exercise $exercise
* @param int $currentUserId
* @param int $courseId
* @param int $sessionId
*
* @return string
*/
- public static function displayResultsInRanking($exerciseId, $currentUserId, $courseId, $sessionId = 0)
+ public static function displayResultsInRanking($exercise, $currentUserId, $courseId, $sessionId = 0)
{
+ $exerciseId = $exercise->iId;
$data = self::exerciseResultsInRanking($exerciseId, $courseId, $sessionId);
- $table = new HTML_Table(['class' => 'table table-hover table-bordered']);
+ $table = new HTML_Table(['class' => 'table table-hover table-striped table-bordered']);
$table->setHeaderContents(0, 0, get_lang('Position'), ['class' => 'text-right']);
$table->setHeaderContents(0, 1, get_lang('Username'));
$table->setHeaderContents(0, 2, get_lang('Score'), ['class' => 'text-right']);
@@ -4813,12 +4991,11 @@ EOT;
$ribbon = $displayChartDegree ? '' : '';
if ($checkPassPercentage) {
- $isSuccess = self::isSuccessExerciseResult(
- $score, $weight, $objExercise->selectPassPercentage()
- );
+ $passPercentage = $objExercise->selectPassPercentage();
+ $isSuccess = self::isSuccessExerciseResult($score, $weight, $passPercentage);
// Color the final test score if pass_percentage activated
$ribbonTotalSuccessOrError = '';
- if (self::isPassPercentageEnabled($objExercise->selectPassPercentage())) {
+ if (self::isPassPercentageEnabled($passPercentage)) {
if ($isSuccess) {
$ribbonTotalSuccessOrError = ' ribbon-total-success';
} else {
@@ -4850,6 +5027,12 @@ EOT;
return $ribbon;
}
+ public static function isPassPercentageAttemptPassed($objExercise, $score, $weight)
+ {
+ $passPercentage = $objExercise->selectPassPercentage();
+
+ return self::isSuccessExerciseResult($score, $weight, $passPercentage);
+ }
/**
* @param float $score
* @param float $weight
@@ -5261,16 +5444,28 @@ EOT;
return Category::getDownloadCertificateBlock($certificate);
}
+ /**
+ * @param int $exerciseId
+ */
+ public static function getExerciseTitleById($exerciseId)
+ {
+ $em = Database::getManager();
+
+ return $em
+ ->createQuery('SELECT cq.title
+ FROM ChamiloCourseBundle:CQuiz cq
+ WHERE cq.iid = :iid'
+ )
+ ->setParameter('iid', $exerciseId)
+ ->getSingleScalarResult();
+ }
+
/**
* @param int $exeId ID from track_e_exercises
* @param int $userId User ID
* @param int $exerciseId Exercise ID
* @param int $courseId Optional. Coure ID.
*
- * @throws \Doctrine\ORM\ORMException
- * @throws \Doctrine\ORM\OptimisticLockException
- * @throws \Doctrine\ORM\TransactionRequiredException
- *
* @return TrackEExercises|null
*/
public static function recalculateResult($exeId, $userId, $exerciseId, $courseId = 0)
@@ -5360,4 +5555,510 @@ EOT;
return $trackedExercise;
}
+
+ public static function getTotalQuestionAnswered($courseId, $exerciseId, $questionId)
+ {
+ $courseId = (int) $courseId;
+ $exerciseId = (int) $exerciseId;
+ $questionId = (int) $questionId;
+
+ $attemptTable = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ATTEMPT);
+ $trackTable = Database::get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES);
+
+ $sql = "SELECT count(te.exe_id) total
+ FROM $attemptTable t
+ INNER JOIN $trackTable te
+ ON (te.c_id = t.c_id AND t.exe_id = te.exe_id)
+ WHERE
+ t.c_id = $courseId AND
+ exe_exo_id = $exerciseId AND
+ t.question_id = $questionId AND
+ status != 'incomplete'
+ ";
+ $queryTotal = Database::query($sql);
+ $totalRow = Database::fetch_array($queryTotal, 'ASSOC');
+ $total = 0;
+ if ($totalRow) {
+ $total = (int) $totalRow['total'];
+ }
+
+ return $total;
+ }
+
+ public static function getWrongQuestionResults($courseId, $exerciseId, $sessionId = 0, $limit = 10)
+ {
+ $courseId = (int) $courseId;
+ $exerciseId = (int) $exerciseId;
+ $limit = (int) $limit;
+
+ $questionTable = Database::get_course_table(TABLE_QUIZ_QUESTION);
+ $attemptTable = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ATTEMPT);
+ $trackTable = Database::get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES);
+
+ $sessionCondition = '';
+ if (!empty($sessionId)) {
+ $sessionCondition = api_get_session_condition($sessionId, true, false, 'te.session_id');
+ }
+
+ $sql = "SELECT q.question, question_id, count(q.iid) count
+ FROM $attemptTable t
+ INNER JOIN $questionTable q
+ ON (q.c_id = t.c_id AND q.id = t.question_id)
+ INNER JOIN $trackTable te
+ ON (te.c_id = q.c_id AND t.exe_id = te.exe_id)
+ WHERE
+ t.c_id = $courseId AND
+ t.marks != q.ponderation AND
+ exe_exo_id = $exerciseId AND
+ status != 'incomplete'
+ $sessionCondition
+ GROUP BY q.iid
+ ORDER BY count DESC
+ LIMIT $limit
+ ";
+
+ $result = Database::query($sql);
+
+ return Database::store_result($result, 'ASSOC');
+ }
+
+ public static function getExerciseResultsCount($type, $courseId, $exerciseId, $sessionId = 0)
+ {
+ $courseId = (int) $courseId;
+ $exerciseId = (int) $exerciseId;
+
+ $trackTable = Database::get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES);
+
+ $sessionCondition = '';
+ if (!empty($sessionId)) {
+ $sessionCondition = api_get_session_condition($sessionId, true, false, 'te.session_id');
+ }
+
+ $selectCount = 'count(DISTINCT te.exe_id)';
+ $scoreCondition = '';
+ switch ($type) {
+ case 'correct_student':
+ $selectCount = 'count(DISTINCT te.exe_user_id)';
+ $scoreCondition = ' AND exe_result = exe_weighting ';
+ break;
+ case 'wrong_student':
+ $selectCount = 'count(DISTINCT te.exe_user_id)';
+ $scoreCondition = ' AND exe_result != exe_weighting ';
+ break;
+ case 'correct':
+ $scoreCondition = ' AND exe_result = exe_weighting ';
+ break;
+ case 'wrong':
+ $scoreCondition = ' AND exe_result != exe_weighting ';
+ break;
+ }
+
+ $sql = "SELECT $selectCount count
+ FROM $trackTable te
+ WHERE
+ c_id = $courseId AND
+ exe_exo_id = $exerciseId AND
+ status != 'incomplete'
+ $scoreCondition
+ $sessionCondition
+ ";
+ $result = Database::query($sql);
+ $totalRow = Database::fetch_array($result, 'ASSOC');
+ $total = 0;
+ if ($totalRow) {
+ $total = (int) $totalRow['count'];
+ }
+
+ return $total;
+ }
+
+ public static function parseContent($content, $stats, $exercise, $trackInfo, $currentUserId = 0)
+ {
+ $wrongAnswersCount = $stats['failed_answers_count'];
+ $attemptDate = substr($trackInfo['exe_date'], 0, 10);
+
+ $content = str_replace(
+ [
+ '((exercise_error_count))',
+ '((all_answers_html))',
+ '((exercise_title))',
+ '((exercise_attempt_date))',
+ ],
+ [
+ $wrongAnswersCount,
+ $stats['all_answers_html'],
+ $exercise->get_formated_title(),
+ $attemptDate,
+ ],
+ $content
+ );
+
+ $currentUserId = empty($currentUserId) ? api_get_user_id() : (int) $currentUserId;
+
+ $content = AnnouncementManager::parseContent(
+ $currentUserId,
+ $content,
+ api_get_course_id(),
+ api_get_session_id()
+ );
+
+ return $content;
+ }
+
+ public static function sendNotification(
+ $currentUserId,
+ $objExercise,
+ $exercise_stat_info,
+ $courseInfo,
+ $attemptCountToSend,
+ $stats
+ ) {
+ $notifications = api_get_configuration_value('exercise_finished_notification_settings');
+ if (empty($notifications)) {
+ return false;
+ }
+
+ $studentId = $exercise_stat_info['exe_user_id'];
+ $exerciseExtraFieldValue = new ExtraFieldValue('exercise');
+ $wrongAnswersCount = $stats['failed_answers_count'];
+ $exercisePassed = $stats['exercise_passed'];
+ $countPendingQuestions = $stats['count_pending_questions'];
+
+ // If there are no pending questions (Open questions).
+ if (0 === $countPendingQuestions) {
+ /*$extraFieldData = $exerciseExtraFieldValue->get_values_by_handler_and_field_variable(
+ $objExercise->iId,
+ 'signature_mandatory'
+ );
+
+ if ($extraFieldData && isset($extraFieldData['value']) && 1 === (int) $extraFieldData['value']) {
+ if (ExerciseSignaturePlugin::exerciseHasSignatureActivated($objExercise)) {
+ $signature = ExerciseSignaturePlugin::getSignature($studentId, $exercise_stat_info);
+ if (false !== $signature) {
+ //return false;
+ }
+ }
+ }*/
+
+ // Notifications.
+ $extraFieldData = $exerciseExtraFieldValue->get_values_by_handler_and_field_variable(
+ $objExercise->iId,
+ 'notifications'
+ );
+ $exerciseNotification = '';
+ if ($extraFieldData && isset($extraFieldData['value'])) {
+ $exerciseNotification = $extraFieldData['value'];
+ }
+
+ $subject = sprintf(get_lang('WrongAttemptXInCourseX'), $attemptCountToSend, $courseInfo['title']);
+ if ($exercisePassed) {
+ $subject = sprintf(get_lang('ExerciseValidationInCourseX'), $courseInfo['title']);
+ }
+
+ if ($exercisePassed) {
+ $extraFieldData = $exerciseExtraFieldValue->get_values_by_handler_and_field_variable(
+ $objExercise->iId,
+ 'MailSuccess'
+ );
+ } else {
+ $extraFieldData = $exerciseExtraFieldValue->get_values_by_handler_and_field_variable(
+ $objExercise->iId,
+ 'MailAttempt'.$attemptCountToSend
+ );
+ }
+
+ // Blocking exercise.
+ $blockPercentageExtra = $exerciseExtraFieldValue->get_values_by_handler_and_field_variable(
+ $objExercise->iId,
+ 'blocking_percentage'
+ );
+ $blockPercentage = false;
+ if ($blockPercentageExtra && isset($blockPercentageExtra['value']) && $blockPercentageExtra['value']) {
+ $blockPercentage = $blockPercentageExtra['value'];
+ }
+ if ($blockPercentage) {
+ $passBlock = $stats['total_percentage'] > $blockPercentage;
+ if (false === $passBlock) {
+ $extraFieldData = $exerciseExtraFieldValue->get_values_by_handler_and_field_variable(
+ $objExercise->iId,
+ 'MailIsBlockByPercentage'
+ );
+ }
+ }
+
+ $extraFieldValueUser = new ExtraFieldValue('user');
+
+ if ($extraFieldData && isset($extraFieldData['value'])) {
+ $content = $extraFieldData['value'];
+ $content = self::parseContent($content, $stats, $objExercise, $exercise_stat_info, $studentId);
+ if (false === $exercisePassed) {
+ if (0 !== $wrongAnswersCount) {
+ $content .= $stats['failed_answers_html'];
+ }
+ }
+
+ $sendMessage = true;
+ if (!empty($exerciseNotification)) {
+ foreach ($notifications as $name => $notificationList) {
+ if ($exerciseNotification !== $name) {
+ continue;
+ }
+ foreach ($notificationList as $notificationName => $attemptData) {
+ if ('student_check' === $notificationName) {
+ $sendMsgIfInList = isset($attemptData['send_notification_if_user_in_extra_field']) ? $attemptData['send_notification_if_user_in_extra_field'] : '';
+ if (!empty($sendMsgIfInList)) {
+ foreach ($sendMsgIfInList as $skipVariable => $skipValues) {
+ $userExtraFieldValue = $extraFieldValueUser->get_values_by_handler_and_field_variable(
+ $studentId,
+ $skipVariable
+ );
+
+ if (empty($userExtraFieldValue)) {
+ $sendMessage = false;
+ break;
+ } else {
+ $sendMessage = false;
+ if (isset($userExtraFieldValue['value']) &&
+ in_array($userExtraFieldValue['value'], $skipValues)
+ ) {
+ $sendMessage = true;
+ break;
+ }
+ }
+ }
+ }
+ break;
+ }
+ }
+ }
+ }
+
+ // Send to student.
+ if ($sendMessage) {
+ MessageManager::send_message($currentUserId, $subject, $content);
+ }
+ }
+
+ if (!empty($exerciseNotification)) {
+ foreach ($notifications as $name => $notificationList) {
+ if ($exerciseNotification !== $name) {
+ continue;
+ }
+ foreach ($notificationList as $attemptData) {
+ $skipNotification = false;
+ $skipNotificationList = isset($attemptData['send_notification_if_user_in_extra_field']) ? $attemptData['send_notification_if_user_in_extra_field'] : [];
+ if (!empty($skipNotificationList)) {
+ foreach ($skipNotificationList as $skipVariable => $skipValues) {
+ $userExtraFieldValue = $extraFieldValueUser->get_values_by_handler_and_field_variable(
+ $studentId,
+ $skipVariable
+ );
+
+ if (empty($userExtraFieldValue)) {
+ $skipNotification = true;
+ break;
+ } else {
+ if (isset($userExtraFieldValue['value'])) {
+ if (!in_array($userExtraFieldValue['value'], $skipValues)) {
+ $skipNotification = true;
+ break;
+ }
+ } else {
+ $skipNotification = true;
+ break;
+ }
+ }
+ }
+ }
+
+ if ($skipNotification) {
+ continue;
+ }
+
+ $email = isset($attemptData['email']) ? $attemptData['email'] : '';
+ $emailList = explode(',', $email);
+ if (empty($emailList)) {
+ continue;
+ }
+ $attempts = isset($attemptData['attempts']) ? $attemptData['attempts'] : [];
+ foreach ($attempts as $attempt) {
+ $sendMessage = false;
+ if (isset($attempt['attempt']) && $attemptCountToSend !== (int) $attempt['attempt']) {
+ continue;
+ }
+
+ if (!isset($attempt['status'])) {
+ continue;
+ }
+
+ if ($blockPercentage && isset($attempt['is_block_by_percentage'])) {
+ if ($attempt['is_block_by_percentage']) {
+ if ($passBlock) {
+ continue;
+ }
+ } else {
+ if (false === $passBlock) {
+ continue;
+ }
+ }
+ }
+
+ switch ($attempt['status']) {
+ case 'passed':
+ if ($exercisePassed) {
+ $sendMessage = true;
+ }
+ break;
+ case 'failed':
+ if (false === $exercisePassed) {
+ $sendMessage = true;
+ }
+ break;
+ case 'all':
+ $sendMessage = true;
+ break;
+ }
+
+ if ($sendMessage) {
+ $attachments = [];
+ if (isset($attempt['add_pdf']) && $attempt['add_pdf']) {
+ // Get pdf content
+ $pdfExtraData = $exerciseExtraFieldValue->get_values_by_handler_and_field_variable(
+ $objExercise->iId,
+ $attempt['add_pdf']
+ );
+
+ if ($pdfExtraData && isset($pdfExtraData['value'])) {
+ $pdfContent = self::parseContent(
+ $pdfExtraData['value'],
+ $stats,
+ $objExercise,
+ $exercise_stat_info,
+ $studentId
+ );
+
+ @$pdf = new PDF();
+ $filename = get_lang('Exercise');
+ $cssFile = api_get_path(SYS_CSS_PATH).'themes/chamilo/default.css';
+ $pdfPath = @$pdf->content_to_pdf(
+ "$pdfContent",
+ file_get_contents($cssFile),
+ $filename,
+ api_get_course_id(),
+ 'F',
+ false,
+ null,
+ false,
+ true
+ );
+ $attachments[] = ['filename' => $filename, 'path' => $pdfPath];
+ }
+ }
+
+ $content = isset($attempt['content_default']) ? $attempt['content_default'] : '';
+ if (isset($attempt['content'])) {
+ $extraFieldData = $exerciseExtraFieldValue->get_values_by_handler_and_field_variable(
+ $objExercise->iId,
+ $attempt['content']
+ );
+ if ($extraFieldData && isset($extraFieldData['value']) && !empty($extraFieldData['value'])) {
+ $content = $extraFieldData['value'];
+ }
+ }
+
+ if (!empty($content)) {
+ $content = self::parseContent(
+ $content,
+ $stats,
+ $objExercise,
+ $exercise_stat_info,
+ $studentId
+ );
+ foreach ($emailList as $email) {
+ if (empty($email)) {
+ continue;
+ }
+ api_mail_html(
+ null,
+ $email,
+ $subject,
+ $content,
+ null,
+ null,
+ [],
+ $attachments
+ );
+ }
+ }
+
+ if (isset($attempt['post_actions'])) {
+ foreach ($attempt['post_actions'] as $action => $params) {
+ switch ($action) {
+ case 'subscribe_student_to_courses':
+ foreach ($params as $code) {
+ CourseManager::subscribeUser($currentUserId, $code);
+ break;
+ }
+ break;
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+
+ /**
+ * Delete an exercise attempt.
+ *
+ * Log the exe_id deleted with the exe_user_id related.
+ *
+ * @param int $exeId
+ */
+ public static function deleteExerciseAttempt($exeId)
+ {
+ $exeId = (int) $exeId;
+
+ $trackExerciseInfo = self::get_exercise_track_exercise_info($exeId);
+
+ if (empty($trackExerciseInfo)) {
+ return;
+ }
+
+ $tblTrackExercises = Database::get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES);
+ $tblTrackAttempt = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ATTEMPT);
+
+ Database::query("DELETE FROM $tblTrackExercises WHERE exe_id = $exeId");
+ Database::query("DELETE FROM $tblTrackAttempt WHERE exe_id = $exeId");
+
+ Event::addEvent(
+ LOG_EXERCISE_ATTEMPT_DELETE,
+ LOG_EXERCISE_ATTEMPT,
+ $exeId,
+ api_get_utc_datetime()
+ );
+ Event::addEvent(
+ LOG_EXERCISE_ATTEMPT_DELETE,
+ LOG_EXERCISE_AND_USER_ID,
+ $exeId.'-'.$trackExerciseInfo['exe_user_id'],
+ api_get_utc_datetime()
+ );
+ }
+
+ public static function scorePassed($score, $total)
+ {
+ $compareResult = bccomp($score, $total, 3);
+ $scorePassed = 1 === $compareResult || 0 === $compareResult;
+ if (false === $scorePassed) {
+ $epsilon = 0.00001;
+ if (abs($score - $total) < $epsilon) {
+ $scorePassed = true;
+ }
+ }
+
+ return $scorePassed;
+ }
}
diff --git a/public/main/inc/lib/exercise_show_functions.lib.php b/public/main/inc/lib/exercise_show_functions.lib.php
index 38d49d853d..951cb4384e 100644
--- a/public/main/inc/lib/exercise_show_functions.lib.php
+++ b/public/main/inc/lib/exercise_show_functions.lib.php
@@ -1,16 +1,6 @@
';
+ $content = '
';
$content .= '| ';
$content .= '';
+ $hotspotColors[$orderColor].'">';
$content .= ' | ';
$content .= '';
$content .= "$answerId - $answer";
$content .= ' | ';
+ if (false === $exercise->hideComment) {
$content .= '';
if (!$hide_expected_answer) {
$status = Display::label(get_lang('Incorrect'), 'danger');
if ($studentChoice) {
$status = Display::label(get_lang('Correct'), 'success');
- } else {
- if (in_array($resultsDisabled, [
- RESULT_DISABLE_SHOW_ONLY_IN_CORRECT_ANSWER,
- ])
- ) {
- return '';
- }
}
$content .= $status;
+ } else {
+ $content .= ' ';
}
$content .= ' | ';
if (EXERCISE_FEEDBACK_TYPE_EXAM != $feedback_type) {
$content .= '';
if ($studentChoice) {
$content .= ''.nl2br($answerComment).'';
+ } else {
+ $content .= ' ';
}
$content .= ' | ';
} else {
$content .= ' | ';
}
+ }
$content .= '
';
echo $content;
@@ -319,6 +325,9 @@ class ExerciseShowFunctions
$showTotalScoreAndUserChoices,
$export = false
) {
+ if (true === $exercise->hideNoAnswer && empty($studentChoice)) {
+ return '';
+ }
if ($export) {
$answer = strip_tags_blacklist($answer, ['title', 'head']);
// Fix answers that contains this tags
@@ -356,6 +365,11 @@ class ExerciseShowFunctions
$hide_expected_answer = false;
}
break;
+ case RESULT_DISABLE_SHOW_SCORE_ATTEMPT_SHOW_ANSWERS_LAST_ATTEMPT_NO_FEEDBACK:
+ if (false === $showTotalScoreAndUserChoices && empty($studentChoiceInt)) {
+ return '';
+ }
+ break;
}
$icon = in_array($answerType, [UNIQUE_ANSWER, UNIQUE_ANSWER_NO_OPTION]) ? 'radio' : 'checkbox';
@@ -418,6 +432,7 @@ class ExerciseShowFunctions
$showComment = true;
}
+ if (false === $exercise->hideComment) {
if ($showComment) {
echo '';
$color = 'black';
@@ -435,6 +450,7 @@ class ExerciseShowFunctions
} else {
echo ' | | ';
}
+ }
echo '';
}
@@ -486,6 +502,11 @@ class ExerciseShowFunctions
$hide_expected_answer = false;
}
break;
+ case RESULT_DISABLE_SHOW_SCORE_ATTEMPT_SHOW_ANSWERS_LAST_ATTEMPT_NO_FEEDBACK:
+ if (false === $showTotalScoreAndUserChoices && empty($studentChoice)) {
+ return '';
+ }
+ break;
}
$content = '';
@@ -531,6 +552,7 @@ class ExerciseShowFunctions
$content .= '';
}
+ if (false === $exercise->hideComment) {
if (EXERCISE_FEEDBACK_TYPE_EXAM != $feedbackType) {
$content .= '| ';
$color = 'black';
@@ -553,6 +575,7 @@ class ExerciseShowFunctions
}
$content .= ' | ';
}
+ }
$content .= '
';
echo $content;
@@ -645,6 +668,7 @@ class ExerciseShowFunctions
'
';
+ if (false === $exercise->hideComment) {
if (EXERCISE_FEEDBACK_TYPE_EXAM != $feedbackType) {
echo '';
if (isset($newOptions[$studentChoice])) {
@@ -654,6 +678,7 @@ class ExerciseShowFunctions
} else {
echo ' | | ';
}
+ }
echo '';
}
@@ -704,6 +729,11 @@ class ExerciseShowFunctions
$hide_expected_answer = false;
}
break;
+ case RESULT_DISABLE_SHOW_SCORE_ATTEMPT_SHOW_ANSWERS_LAST_ATTEMPT_NO_FEEDBACK:
+ if (false === $showTotalScoreAndUserChoices && empty($studentChoice)) {
+ return '';
+ }
+ break;
}
echo '';
@@ -750,13 +780,17 @@ class ExerciseShowFunctions
echo '';
}
+ if (false === $exercise->hideComment) {
if (EXERCISE_FEEDBACK_TYPE_EXAM != $feedbackType) {
echo '| ';
//@todo replace this harcoded value
- if ($studentChoice || in_array($resultsDisabled, [
+ if ($studentChoice || in_array(
+ $resultsDisabled,
+ [
RESULT_DISABLE_SHOW_ONLY_IN_CORRECT_ANSWER,
RESULT_DISABLE_SHOW_SCORE_AND_EXPECTED_ANSWERS_AND_RANKING,
- ])
+ ]
+ )
) {
$color = 'black';
if ($studentChoice == $answerCorrect) {
@@ -770,6 +804,7 @@ class ExerciseShowFunctions
echo ' | ';
} else {
echo ' | ';
+ }
}
echo '
';
}
diff --git a/src/CoreBundle/Entity/TrackEAttempt.php b/src/CoreBundle/Entity/TrackEAttempt.php
index e76c45d398..7bfad37c37 100644
--- a/src/CoreBundle/Entity/TrackEAttempt.php
+++ b/src/CoreBundle/Entity/TrackEAttempt.php
@@ -118,13 +118,14 @@ class TrackEAttempt
/**
* @var int
*
- * @ORM\Column(name="second_spent", type="integer")
+ * @ORM\Column(name="seconds_spent", type="integer")
*/
- protected $secondSpent;
+ protected $secondsSpent;
public function __construct()
{
- $this->secondSpent = 0;
+ $this->teacherComment = '';
+ $this->secondsSpent = 0;
}
/**
@@ -352,4 +353,16 @@ class TrackEAttempt
{
return $this->id;
}
+
+ public function getSecondsSpent(): int
+ {
+ return $this->secondsSpent;
+ }
+
+ public function setSecondsSpent(int $secondsSpent): TrackEAttempt
+ {
+ $this->secondsSpent = $secondsSpent;
+
+ return $this;
+ }
}
diff --git a/src/CoreBundle/Entity/TrackEAttemptRecording.php b/src/CoreBundle/Entity/TrackEAttemptRecording.php
index 88dc7891d6..bad68ae74d 100644
--- a/src/CoreBundle/Entity/TrackEAttemptRecording.php
+++ b/src/CoreBundle/Entity/TrackEAttemptRecording.php
@@ -269,4 +269,23 @@ class TrackEAttemptRecording
{
return $this->id;
}
+
+ /**
+ * @return int
+ */
+ public function getAnswer()
+ {
+ return $this->answer;
+ }
+
+ /**
+ * @param int $answer
+ */
+ public function setAnswer($answer): self
+ {
+ $this->answer = $answer;
+
+ return $this;
+ }
+
}
diff --git a/src/CoreBundle/Migrations/Schema/V200/Version20180904175500.php b/src/CoreBundle/Migrations/Schema/V200/Version20180904175500.php
index e11e3e975e..853350614e 100644
--- a/src/CoreBundle/Migrations/Schema/V200/Version20180904175500.php
+++ b/src/CoreBundle/Migrations/Schema/V200/Version20180904175500.php
@@ -97,8 +97,8 @@ class Version20180904175500 extends AbstractMigrationChamilo
$this->addSql('CREATE INDEX idx_track_e_attempt_tms ON track_e_attempt (tms)');
}
- if (false === $table->hasColumn('second_spent')) {
- $this->addSql('ALTER TABLE track_e_attempt ADD second_spent INT NOT NULL, CHANGE user_id user_id INT DEFAULT NULL');
+ if (false === $table->hasColumn('seconds_spent')) {
+ $this->addSql('ALTER TABLE track_e_attempt ADD seconds_spent INT NOT NULL, CHANGE user_id user_id INT DEFAULT NULL');
}
if (false === $table->hasForeignKey('FK_A89CC3B691D79BD3')) {
![$(function(){ $('#user_custom_score').click(function() { @@ -434,8 +437,9 @@ function lp_upload_quiz_action_handling() $score, $id ); - - $total += (float) $score; + if ($correct) { + $total += (float) $score; + } $id++; } @@ -558,6 +562,7 @@ function lp_upload_quiz_action_handling() } } } + Display::addFlash(Display::return_message(get_lang('FileImported'))); if (isset($_SESSION['oLP']) && isset($_GET['lp_id'])) { $previous = $_SESSION['oLP']->select_previous_item_id(); @@ -576,8 +581,9 @@ function lp_upload_quiz_action_handling() exit; } else { // header('location: exercise.php?' . api_get_cidreq()); - echo ''; - } + $exerciseUrl = api_get_path(WEB_CODE_PATH). + 'exercise/admin.php?'.api_get_cidreq().'&exerciseId='.$quiz_id.'&session_id='.api_get_session_id(); + api_location($exerciseUrl); } } diff --git a/public/main/inc/ajax/exercise.ajax.php b/public/main/inc/ajax/exercise.ajax.php index 9fb4810ec0..ce83cd5caa 100644 --- a/public/main/inc/ajax/exercise.ajax.php +++ b/public/main/inc/ajax/exercise.ajax.php @@ -584,9 +584,9 @@ switch ($action) { // This variable came from exercise_submit_modal.php. $hotspot_delineation_result = null; if (isset($_SESSION['hotspot_delineation_result']) && - isset($_SESSION['hotspot_delineation_result'][$objExercise->selectId()]) + isset($_SESSION['hotspot_delineation_result'][$objExercise->getId()]) ) { - $hotspot_delineation_result = $_SESSION['hotspot_delineation_result'][$objExercise->selectId()][$my_question_id]; + $hotspot_delineation_result = $_SESSION['hotspot_delineation_result'][$objExercise->getId()][$my_question_id]; } if ('simple' === $type) { @@ -710,7 +710,7 @@ switch ($action) { Session::write('duration_time', [$key => $now]); Event::updateEventExercise( $exeId, - $objExercise->selectId(), + $objExercise->getId(), $total_score, $total_weight, $session_id, diff --git a/public/main/inc/lib/api.lib.php b/public/main/inc/lib/api.lib.php index fb79076d96..3b04e84389 100644 --- a/public/main/inc/lib/api.lib.php +++ b/public/main/inc/lib/api.lib.php @@ -474,6 +474,7 @@ define('RESULT_DISABLE_RANKING', 6); define('RESULT_DISABLE_SHOW_ONLY_IN_CORRECT_ANSWER', 7); define('RESULT_DISABLE_SHOW_SCORE_AND_EXPECTED_ANSWERS_AND_RANKING', 8); define('RESULT_DISABLE_RADAR', 9); +define('RESULT_DISABLE_SHOW_SCORE_ATTEMPT_SHOW_ANSWERS_LAST_ATTEMPT_NO_FEEDBACK', 10); define('EXERCISE_MAX_NAME_SIZE', 80); diff --git a/public/main/inc/lib/events.lib.php b/public/main/inc/lib/events.lib.php index 52fb3ee608..076b046373 100644 --- a/public/main/inc/lib/events.lib.php +++ b/public/main/inc/lib/events.lib.php @@ -2,6 +2,7 @@ /* See license terms in /license.txt */ use Chamilo\CoreBundle\Component\Utils\ChamiloApi; +use Chamilo\CoreBundle\Entity\TrackEAttemptRecording; use ChamiloSession as Session; /** @@ -13,13 +14,13 @@ use ChamiloSession as Session; class Event { /** - * @author Sebastien Piraux old code - * @author Julio Montoya - * * @param int $userId * * @return bool - * @desc Record information for login event when an user identifies himself with username & password + * @desc Record information for login event when an user identifies himself with username & password + * @author Sebastien Piraux old code + * @author Julio Montoya + * */ public static function eventLogin($userId) { @@ -76,13 +77,13 @@ class Event { if (!empty($sessionId)) { $visibility = api_get_session_visibility($sessionId); - if (!empty($visibility) && SESSION_AVAILABLE != $visibility) { + if (!empty($visibility) && $visibility != SESSION_AVAILABLE) { $extraFieldValue = new ExtraFieldValue('session'); $value = $extraFieldValue->get_values_by_handler_and_field_variable( $sessionId, 'disable_log_after_session_ends' ); - if (!empty($value) && isset($value['value']) && 1 == (int) $value['value']) { + if (!empty($value) && isset($value['value']) && (int) $value['value'] == 1) { return false; } } @@ -93,7 +94,7 @@ class Event /** * @author Sebastien Piraux - * @desc Record information for access event for courses + * @desc Record information for access event for courses * * @return bool */ @@ -149,7 +150,7 @@ class Event * @param string $tool name of the tool * * @author Sebastien Piraux - * @desc Record information for access event for tools + * @desc Record information for access event for tools * * $tool can take this values : * Links, Calendar, Document, Announcements, @@ -199,9 +200,15 @@ class Event //$pos = strpos($_SERVER['HTTP_REFERER'],$_configuration['root_web'].$_cid); $coursePath = isset($courseInfo['path']) ? $courseInfo['path'] : null; - $pos = isset($_SERVER['HTTP_REFERER']) ? strpos(strtolower($_SERVER['HTTP_REFERER']), strtolower(api_get_path(WEB_COURSE_PATH).$coursePath)) : false; + $pos = isset($_SERVER['HTTP_REFERER']) ? strpos( + strtolower($_SERVER['HTTP_REFERER']), + strtolower(api_get_path(WEB_COURSE_PATH).$coursePath) + ) : false; // added for "what's new" notification - $pos2 = isset($_SERVER['HTTP_REFERER']) ? strpos(strtolower($_SERVER['HTTP_REFERER']), strtolower(api_get_path(WEB_PATH)."index")) : false; + $pos2 = isset($_SERVER['HTTP_REFERER']) ? strpos( + strtolower($_SERVER['HTTP_REFERER']), + strtolower(api_get_path(WEB_PATH)."index") + ) : false; // end "what's new" notification if (false !== $pos || false !== $pos2) { @@ -265,32 +272,25 @@ class Event $courseId = api_get_course_int_id(); $sessionId = api_get_session_id(); - $sql = "INSERT INTO $table ( - down_user_id, - c_id, - down_doc_path, - down_date, - down_session_id - ) - VALUES ( - $userId, - $courseId, - '$documentUrl', - '$reallyNow', - $sessionId - )"; - Database::query($sql); - - return 1; + return Database::insert( + $table, + [ + 'down_user_id' => $userId, + 'c_id' => $courseId, + 'down_doc_path' => $documentUrl, + 'down_date' => $reallyNow, + 'down_session_id' => $sessionId, + ] + ); } /** * @param int $documentId of document (id in mainDb.document table) * * @author Sebastien Piraux - * @desc Record information for upload event - * used in the works tool to record informations when - * an user upload 1 work + * @desc Record information for upload event + * used in the works tool to record informations when + * an user upload 1 work * * @return int */ @@ -368,21 +368,26 @@ class Event /** * Update the TRACK_E_EXERCICES exercises. + * Record result of user when an exercise was done. * - * @param int exeid id of the attempt - * @param int exo_id exercise id - * @param mixed result score - * @param int weighting ( higher score ) - * @param int duration ( duration of the attempt in seconds ) - * @param int session_id - * @param int learnpath_id (id of the learnpath) - * @param int learnpath_item_id (id of the learnpath_item) + * @param int $exeId + * @param int $exoId + * @param mixed $score + * @param int $weighting + * @param int $sessionId + * @param int $learnpathId + * @param int $learnpathItemId + * @param int $learnpathItemViewId + * @param int $duration + * @param array $questionsList + * @param string $status + * @param array $remindList + * @param null $endDate * * @return bool * * @author Sebastien Piraux * @author Julio Montoya Armas Reworked 2010 - * @desc Record result of user when an exercise was done */ public static function updateEventExercise( $exeId, @@ -403,14 +408,6 @@ class Event return false; } - /* - * Code commented due BT#8423 do not change the score to 0. - * - * Validation in case of fraud with actived control time - if (!ExerciseLib::exercise_time_control_is_valid($exo_id, $learnpath_id, $learnpath_item_id)) { - $score = 0; - } - */ if (!isset($status) || empty($status)) { $status = ''; } else { @@ -471,19 +468,20 @@ class Event /** * Record an event for this attempt at answering an exercise. * - * @param float Score achieved - * @param string Answer given - * @param int Question ID - * @param int Exercise attempt ID a.k.a exe_id (from track_e_exercise) - * @param int Position - * @param int Exercise ID (from c_quiz) - * @param bool update results? - * @param $fileName string Filename (for audio answers - using nanogong) - * @param int User ID The user who's going to get this score. Default value of null means "get from context". - * @param int Course ID (from the "id" column of course table). Default value of null means "get from context". - * @param int Session ID (from the session table). Default value of null means "get from context". - * @param int Learnpath ID (from c_lp table). Default value of null means "get from context". - * @param int Learnpath item ID (from the c_lp_item table). Default value of null means "get from context". + * @param float $score Score achieved + * @param string $answer Answer given + * @param int $question_id + * @param int $exe_id Exercise attempt ID a.k.a exe_id (from track_e_exercise) + * @param int $position + * @param int $exercise_id From c_quiz + * @param bool $updateResults + * @param int $duration Time spent in seconds + * @param string $fileName Filename (for audio answers - using nanogong) + * @param int $user_id The user who's going to get this score. + * @param int $course_id Default value of null means "get from context". + * @param int $session_id Default value of null means "get from context". + * @param int $learnpath_id (from c_lp table). Default value of null means "get from context". + * @param int $learnpath_item_id (from the c_lp_item table). Default value of null means "get from context". * * @return bool Result of the insert query */ @@ -495,6 +493,7 @@ class Event $position, $exercise_id = 0, $updateResults = false, + $questionDuration = 0, $fileName = null, $user_id = null, $course_id = null, @@ -503,12 +502,13 @@ class Event $learnpath_item_id = null ) { global $debug; - $question_id = Database::escape_string($question_id); - $exe_id = Database::escape_string($exe_id); - $position = Database::escape_string($position); - $now = api_get_utc_datetime(); + $questionDuration = (int) $questionDuration; + $question_id = (int) $question_id; + $exe_id = (int) $exe_id; + $position = (int) $position; $course_id = (int) $course_id; - $recording = true == api_get_configuration_value('quiz_answer_extra_recording'); + $now = api_get_utc_datetime(); + $recording = api_get_configuration_value('quiz_answer_extra_recording'); // check user_id or get from context if (empty($user_id)) { @@ -539,7 +539,7 @@ class Event $TBL_TRACK_ATTEMPT = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ATTEMPT); if ($debug) { - error_log("----- entering saveQuestionAttempt() function ------"); + error_log('----- entering saveQuestionAttempt() function ------'); error_log("answer: $answer"); error_log("score: $score"); error_log("question_id : $question_id"); @@ -555,133 +555,130 @@ class Event $answer = 0; } - if (!empty($question_id) && !empty($exe_id) && !empty($user_id)) { - if (is_null($answer)) { - $answer = ''; - } + if (empty($question_id) || empty($exe_id) || empty($user_id)) { + return false; + } - if (is_null($score)) { - $score = 0; - } + if (null === $answer) { + $answer = ''; + } - $attempt = [ - 'user_id' => $user_id, - 'question_id' => $question_id, - 'answer' => $answer, - 'marks' => $score, - 'c_id' => $course_id, - 'session_id' => $session_id, - 'position' => $position, - 'tms' => $now, - 'filename' => !empty($fileName) ? basename($fileName) : $fileName, - 'teacher_comment' => '', - ]; + if (null === $score) { + $score = 0; + } - // Check if attempt exists. - $sql = "SELECT exe_id FROM $TBL_TRACK_ATTEMPT - WHERE - c_id = $course_id AND - session_id = $session_id AND - exe_id = $exe_id AND - user_id = $user_id AND - question_id = $question_id AND - position = $position"; - $result = Database::query($sql); - if (Database::num_rows($result)) { - if ($debug) { - error_log("Attempt already exist: exe_id: $exe_id - user_id:$user_id - question_id:$question_id"); - } - if (false == $updateResults) { - //The attempt already exist do not update use update_event_exercise() instead - return false; - } - } else { - $attempt['exe_id'] = $exe_id; - } + $attempt = [ + 'user_id' => $user_id, + 'question_id' => $question_id, + 'answer' => $answer, + 'marks' => $score, + 'c_id' => $course_id, + 'session_id' => $session_id, + 'position' => $position, + 'tms' => $now, + 'filename' => !empty($fileName) ? basename($fileName) : $fileName, + 'teacher_comment' => '', + 'seconds_spent' => $questionDuration, + ]; - if ($debug) { - error_log("updateResults : $updateResults"); - error_log("Saving question attempt: "); - error_log($sql); + // Check if attempt exists. + $sql = "SELECT exe_id FROM $TBL_TRACK_ATTEMPT + WHERE + c_id = $course_id AND + session_id = $session_id AND + exe_id = $exe_id AND + user_id = $user_id AND + question_id = $question_id AND + position = $position"; + $result = Database::query($sql); + $attemptData = []; + if (Database::num_rows($result)) { + $attemptData = Database::fetch_array($result, 'ASSOC'); + if ($updateResults == false) { + //The attempt already exist do not update use update_event_exercise() instead + return false; } + } else { + $attempt['exe_id'] = $exe_id; + } - $recording_table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ATTEMPT_RECORDING); + if ($debug) { + error_log("updateResults : $updateResults"); + error_log('Saving question attempt:'); + error_log($sql); + } - if (false == $updateResults) { - $attempt_id = Database::insert($TBL_TRACK_ATTEMPT, $attempt); + $recording_table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ATTEMPT_RECORDING); + $em = Database::getManager(); + if (false == $updateResults) { + $attempt_id = Database::insert($TBL_TRACK_ATTEMPT, $attempt); + + if ($attempt_id) { + $recording = new TrackEAttemptRecording(); + $recording + ->setExeId($attempt_id) + ->setQuestionId($question_id) + ->setAnswer($answer) + ->setMarks($score) + ->setAuthor('') + ->setSessionId($session_id) + ; + $em->persist($recording); + $em->flush(); + } + } else { + if (api_get_configuration_value('allow_time_per_question')) { + $attempt['seconds_spent'] = $questionDuration + (int) $attemptData['seconds_spent']; + } + Database::update( + $TBL_TRACK_ATTEMPT, + $attempt, + [ + 'exe_id = ? AND question_id = ? AND user_id = ? ' => [ + $exe_id, + $question_id, + $user_id, + ], + ] + ); - if ($debug) { - error_log("Insert attempt with id #$attempt_id"); - } + if ($recording) { + $attempt_recording = [ + 'exe_id' => $exe_id, + 'question_id' => $question_id, + 'answer' => $answer, + 'marks' => $score, + 'insert_date' => $now, + 'author' => '', + 'session_id' => $session_id, + ]; - if ($recording) { - if ($debug) { - error_log("Saving e attempt recording "); - } - $attempt_recording = [ - 'exe_id' => $attempt_id, - 'question_id' => $question_id, - 'answer' => $answer, - 'marks' => $score, - 'insert_date' => $now, - 'author' => '', - 'session_id' => $session_id, - ]; - Database::insert($recording_table, $attempt_recording); - } - } else { Database::update( - $TBL_TRACK_ATTEMPT, - $attempt, + $recording_table, + $attempt_recording, [ - 'exe_id = ? AND question_id = ? AND user_id = ? ' => [ + 'exe_id = ? AND question_id = ? AND session_id = ? ' => [ $exe_id, $question_id, - $user_id, + $session_id, ], ] ); - - if ($recording) { - $attempt_recording = [ - 'exe_id' => $exe_id, - 'question_id' => $question_id, - 'answer' => $answer, - 'marks' => $score, - 'insert_date' => $now, - 'author' => '', - 'session_id' => $session_id, - ]; - - Database::update( - $recording_table, - $attempt_recording, - [ - 'exe_id = ? AND question_id = ? AND session_id = ? ' => [ - $exe_id, - $question_id, - $session_id, - ], - ] - ); - } - $attempt_id = $exe_id; } - - return $attempt_id; - } else { - return false; + $attempt_id = $exe_id; } + + return $attempt_id; } /** * Record an hotspot spot for this attempt at answering an hotspot question. * * @param int $exeId - * @param int $questionId Question ID - * @param int $answerId Answer ID + * @param int $questionId Question ID + * @param int $answerId Answer ID * @param int $correct - * @param string $coords Coordinates of this point (e.g. 123;324) + * @param string $coords Coordinates of this point (e.g. 123;324) * @param bool $updateResults * @param int $exerciseId * @@ -760,98 +757,6 @@ class Event } } - /** - * Records information for common (or admin) events (in the track_e_default table). - * - * @author Yannick Warnier - * - * @param string $event_type Type of event - * @param string $event_value_type Type of value - * @param mixed $event_value Value (string, or array in the case of user info) - * @param string $datetime Datetime (UTC) (defaults to null) - * @param int $user_id User ID (defaults to null) - * @param int $course_id Course ID (defaults to null) - * @param int $sessionId Session ID - * - * @return bool - * @assert ('','','') === false - */ - public static function addEvent( - $event_type, - $event_value_type, - $event_value, - $datetime = null, - $user_id = null, - $course_id = null, - $sessionId = 0 - ) { - $table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_DEFAULT); - - if (empty($event_type)) { - return false; - } - $event_type = Database::escape_string($event_type); - $event_value_type = Database::escape_string($event_value_type); - if (!empty($course_id)) { - $course_id = (int) $course_id; - } else { - $course_id = api_get_course_int_id(); - } - if (!empty($sessionId)) { - $sessionId = (int) $sessionId; - } else { - $sessionId = api_get_session_id(); - } - - //Clean the user_info - if (LOG_USER_OBJECT == $event_value_type) { - if (is_array($event_value)) { - unset($event_value['complete_name']); - unset($event_value['complete_name_with_username']); - unset($event_value['firstName']); - unset($event_value['lastName']); - unset($event_value['avatar_small']); - unset($event_value['avatar']); - unset($event_value['mail']); - unset($event_value['password']); - unset($event_value['last_login']); - unset($event_value['picture_uri']); - $event_value = serialize($event_value); - } - } - // If event is an array then the $event_value_type should finish with - // the suffix _array for example LOG_WORK_DATA = work_data_array - if (is_array($event_value)) { - $event_value = serialize($event_value); - } - - $event_value = Database::escape_string($event_value); - $sessionId = empty($sessionId) ? api_get_session_id() : (int) $sessionId; - - if (!isset($datetime)) { - $datetime = api_get_utc_datetime(); - } - - $datetime = Database::escape_string($datetime); - - if (!isset($user_id)) { - $user_id = api_get_user_id(); - } - - $params = [ - 'default_user_id' => $user_id, - 'c_id' => $course_id, - 'default_date' => $datetime, - 'default_event_type' => $event_type, - 'default_value_type' => $event_value_type, - 'default_value' => $event_value, - 'session_id' => $sessionId, - ]; - Database::insert($table, $params); - - return true; - } - /** * Gets the last attempt of an exercise based in the exe_id. * @@ -893,19 +798,19 @@ class Event $row = Database::fetch_array($result); return $row['question_id']; - } else { - return false; } + + return false; } /** * Gets how many attempts exists by user, exercise, learning path. * - * @param int user id - * @param int exercise id - * @param int lp id - * @param int lp item id - * @param int lp item view id + * @param int user id + * @param int exercise id + * @param int lp id + * @param int lp item id + * @param int lp item view id * * @return int */ @@ -916,7 +821,7 @@ class Event $lp_item_id, $lp_item_view_id ) { - $stat_table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES); + $table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES); $user_id = (int) $user_id; $exerciseId = (int) $exerciseId; $lp_id = (int) $lp_id; @@ -926,7 +831,7 @@ class Event $sessionId = api_get_session_id(); $sql = "SELECT count(*) as count - FROM $stat_table + FROM $table WHERE exe_exo_id = $exerciseId AND exe_user_id = $user_id AND @@ -937,9 +842,9 @@ class Event c_id = $courseId AND session_id = $sessionId"; - $query = Database::query($sql); - if (Database::num_rows($query) > 0) { - $attempt = Database::fetch_array($query, 'ASSOC'); + $result = Database::query($sql); + if (Database::num_rows($result) > 0) { + $attempt = Database::fetch_array($result, 'ASSOC'); return (int) $attempt['count']; } @@ -947,6 +852,53 @@ class Event return 0; } + public static function getAttemptPosition( + $exeId, + $user_id, + $exerciseId, + $lp_id, + $lp_item_id, + $lp_item_view_id + ) { + $table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES); + $user_id = (int) $user_id; + $exerciseId = (int) $exerciseId; + $lp_id = (int) $lp_id; + $lp_item_id = (int) $lp_item_id; + $lp_item_view_id = (int) $lp_item_view_id; + $courseId = api_get_course_int_id(); + $sessionId = api_get_session_id(); + + $sql = "SELECT exe_id + FROM $table + WHERE + exe_exo_id = $exerciseId AND + exe_user_id = $user_id AND + status = '' AND + orig_lp_id = $lp_id AND + orig_lp_item_id = $lp_item_id AND + orig_lp_item_view_id = $lp_item_view_id AND + c_id = $courseId AND + session_id = $sessionId + ORDER by exe_id + "; + + $result = Database::query($sql); + if (Database::num_rows($result) > 0) { + $position = 1; + while ($row = Database::fetch_array($result, 'ASSOC')) { + if ($row['exe_id'] === $exeId) { + break; + } + $position++; + } + + return $position; + } + + return 0; + } + /** * @param $user_id * @param $exerciseId @@ -985,10 +937,10 @@ class Event if (Database::num_rows($query) > 0) { $attempt = Database::fetch_array($query, 'ASSOC'); - return $attempt['count']; - } else { - return 0; + return (int) $attempt['count']; } + + return 0; } /** @@ -996,6 +948,7 @@ class Event * @param int $lp_id * @param array $course * @param int $session_id + * @param bool $disconnectExerciseResultsFromLp (Replace orig_lp_* variables to null) * * @return bool */ @@ -1003,14 +956,15 @@ class Event $user_id, $lp_id, $course, - $session_id + $session_id, + $disconnectExerciseResultsFromLp = false ) { $lp_view_table = Database::get_course_table(TABLE_LP_VIEW); $lp_item_view_table = Database::get_course_table(TABLE_LP_ITEM_VIEW); $lpInteraction = Database::get_course_table(TABLE_LP_IV_INTERACTION); $lpObjective = Database::get_course_table(TABLE_LP_IV_OBJECTIVE); - if (empty($course)) { + if (empty($course) || empty($user_id)) { return false; } @@ -1065,15 +1019,6 @@ class Event Database::query($sql); } - $sql = "DELETE FROM $lp_view_table - WHERE - c_id = $course_id AND - user_id = $user_id AND - lp_id= $lp_id AND - session_id = $session_id - "; - Database::query($sql); - $sql = "SELECT exe_id FROM $track_e_exercises WHERE exe_user_id = $user_id AND @@ -1081,26 +1026,44 @@ class Event c_id = $course_id AND orig_lp_id = $lp_id"; $result = Database::query($sql); - $exe_list = []; + $exeList = []; while ($row = Database::fetch_array($result, 'ASSOC')) { - $exe_list[] = $row['exe_id']; + $exeList[] = $row['exe_id']; } - if (!empty($exe_list) && is_array($exe_list) && count($exe_list) > 0) { - $exeListString = implode(',', $exe_list); - $sql = "DELETE FROM $track_e_exercises + if (!empty($exeList) && count($exeList) > 0) { + $exeListString = implode(',', $exeList); + if ($disconnectExerciseResultsFromLp) { + $sql = "UPDATE $track_e_exercises + SET orig_lp_id = null, + orig_lp_item_id = null, + orig_lp_item_view_id = null + WHERE exe_id IN ($exeListString)"; + Database::query($sql); + } else { + $sql = "DELETE FROM $track_e_exercises WHERE exe_id IN ($exeListString)"; - Database::query($sql); + Database::query($sql); - $sql = "DELETE FROM $track_attempts + $sql = "DELETE FROM $track_attempts WHERE exe_id IN ($exeListString)"; - Database::query($sql); + Database::query($sql); - $sql = "DELETE FROM $recording_table + $sql = "DELETE FROM $recording_table WHERE exe_id IN ($exeListString)"; - Database::query($sql); + Database::query($sql); + } } + $sql = "DELETE FROM $lp_view_table + WHERE + c_id = $course_id AND + user_id = $user_id AND + lp_id= $lp_id AND + session_id = $session_id + "; + Database::query($sql); + self::addEvent( LOG_LP_ATTEMPT_DELETE, LOG_LP_ID, @@ -1114,6 +1077,98 @@ class Event return true; } + /** + * Records information for common (or admin) events (in the track_e_default table). + * + * @param string $event_type Type of event + * @param string $event_value_type Type of value + * @param mixed $event_value Value (string, or array in the case of user info) + * @param string $datetime Datetime (UTC) (defaults to null) + * @param int $user_id User ID (defaults to null) + * @param int $course_id Course ID (defaults to null) + * @param int $sessionId Session ID + * + * @return bool + * @assert ('','','') === false + * @author Yannick Warnier + * + */ + public static function addEvent( + $event_type, + $event_value_type, + $event_value, + $datetime = null, + $user_id = null, + $course_id = null, + $sessionId = 0 + ) { + $table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_DEFAULT); + + if (empty($event_type)) { + return false; + } + $event_type = Database::escape_string($event_type); + $event_value_type = Database::escape_string($event_value_type); + if (!empty($course_id)) { + $course_id = (int) $course_id; + } else { + $course_id = api_get_course_int_id(); + } + if (!empty($sessionId)) { + $sessionId = (int) $sessionId; + } else { + $sessionId = api_get_session_id(); + } + + //Clean the user_info + if (LOG_USER_OBJECT == $event_value_type) { + if (is_array($event_value)) { + unset($event_value['complete_name']); + unset($event_value['complete_name_with_username']); + unset($event_value['firstName']); + unset($event_value['lastName']); + unset($event_value['avatar_small']); + unset($event_value['avatar']); + unset($event_value['mail']); + unset($event_value['password']); + unset($event_value['last_login']); + unset($event_value['picture_uri']); + $event_value = serialize($event_value); + } + } + // If event is an array then the $event_value_type should finish with + // the suffix _array for example LOG_WORK_DATA = work_data_array + if (is_array($event_value)) { + $event_value = serialize($event_value); + } + + $event_value = Database::escape_string($event_value); + $sessionId = empty($sessionId) ? api_get_session_id() : (int) $sessionId; + + if (!isset($datetime)) { + $datetime = api_get_utc_datetime(); + } + + $datetime = Database::escape_string($datetime); + + if (!isset($user_id)) { + $user_id = api_get_user_id(); + } + + $params = [ + 'default_user_id' => $user_id, + 'c_id' => $course_id, + 'default_date' => $datetime, + 'default_event_type' => $event_type, + 'default_value_type' => $event_value_type, + 'default_value' => $event_value, + 'session_id' => $sessionId, + ]; + Database::insert($table, $params); + + return true; + } + /** * Delete all exercise attempts (included in LP or not). * @@ -1348,13 +1403,13 @@ class Event /** * Gets exercise results (NO Exercises in LPs) from a given user, exercise id, course, session, lp_id, lp_item_id. * - * @param int user id - * @param int exercise id - * @param string course code - * @param int session id - * @param int lp id - * @param int lp item id - * @param string order asc or desc + * @param int user id + * @param int exercise id + * @param int course id + * @param int session id + * @param int lp id + * @param int lp item id + * @param string order asc or desc * * @return array with the results */ @@ -1405,6 +1460,7 @@ class Event if (Database::num_rows($res_revised) > 0) { $row['attempt_revised'] = 1; } + $row['total_percentage'] = ($row['score'] / $row['max_score']) * 100; $list[$row['exe_id']] = $row; $sql = "SELECT * FROM $table_track_attempt WHERE exe_id = $exeId"; @@ -1532,10 +1588,11 @@ class Event /** * Get the last best result from all attempts in exercises per user (out of learning paths). * - * @param int $user_id - * @param int $exercise_id - * @param int $courseId - * @param int $session_id + * @param int $user_id + * @param int $exercise_id + * @param int $courseId + * @param int $session_id + * @param bool $skipLpResults * * @return array */ @@ -1543,24 +1600,31 @@ class Event $user_id, $exercise_id, $courseId, - $session_id = 0 + $session_id = 0, + $skipLpResults = true ) { - $table_track_exercises = Database::get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES); + $table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES); $courseId = (int) $courseId; $exercise_id = (int) $exercise_id; $session_id = (int) $session_id; $user_id = (int) $user_id; - $sql = "SELECT * FROM $table_track_exercises + $sql = "SELECT * FROM $table WHERE status = '' AND c_id = $courseId AND exe_exo_id = $exercise_id AND session_id = $session_id AND - exe_user_id = $user_id AND + exe_user_id = $user_id + "; + + if ($skipLpResults) { + $sql .= ' AND orig_lp_id = 0 AND - orig_lp_item_id = 0 - ORDER BY exe_id"; + orig_lp_item_id = 0 '; + } + + $sql .= ' ORDER BY exe_id '; $res = Database::query($sql); $list = []; @@ -1722,9 +1786,12 @@ class Event } /** - * @param int $exeId + * Get all the track_e_attempt records for a given + * track_e_exercises.exe_id (pk). * - * @return array + * @param int $exeId The exe_id from an exercise attempt record + * + * @return array The complete records from track_e_attempt that match the given exe_id */ public static function getAllExerciseEventByExeId($exeId) { @@ -1746,11 +1813,15 @@ class Event } /** - * @param int $exeId - * @param int $user_id - * @param int $courseId - * @param int $session_id - * @param int $question_id + * Delete one record from the track_e_attempt table (recorded quiz answer) + * and register the deletion event (LOG_QUESTION_RESULT_DELETE) in + * track_e_default. + * + * @param int $exeId The track_e_exercises.exe_id (primary key) + * @param int $user_id The user who answered (already contained in exe_id) + * @param int $courseId The course in which it happened (already contained in exe_id) + * @param int $session_id The session in which it happened (already contained in exe_id) + * @param int $question_id The c_quiz_question.iid */ public static function delete_attempt( $exeId, @@ -1788,10 +1859,13 @@ class Event } /** - * @param $exeId - * @param $user_id + * Delete one record from the track_e_hotspot table based on a given + * track_e_exercises.exe_id. + * + * @param $exeId + * @param $user_id * @param int $courseId - * @param $question_id + * @param $question_id * @param int $sessionId */ public static function delete_attempt_hotspot( @@ -2126,6 +2200,62 @@ class Event return true; } + /** + * Register the logout of the course (usually when logging out of the platform) + * from the track_e_access_complete table. + * + * @param array $logInfo Information stored by local.inc.php + * + * @return bool + */ + public static function registerLog($logInfo) + { + $sessionId = api_get_session_id(); + $courseId = api_get_course_int_id(); + + if (isset($logInfo['c_id']) && !empty($logInfo['c_id'])) { + $courseId = $logInfo['c_id']; + } + + if (isset($logInfo['session_id']) && !empty($logInfo['session_id'])) { + $sessionId = $logInfo['session_id']; + } + + if (!Tracking::minimumTimeAvailable($sessionId, $courseId)) { + return false; + } + + if (false === self::isSessionLogNeedToBeSave($sessionId)) { + return false; + } + + $loginAs = true === (int) Session::read('login_as'); + + $logInfo['user_id'] = isset($logInfo['user_id']) ? $logInfo['user_id'] : api_get_user_id(); + $logInfo['date_reg'] = isset($logInfo['date_reg']) ? $logInfo['date_reg'] : api_get_utc_datetime(); + $logInfo['tool'] = !empty($logInfo['tool']) ? $logInfo['tool'] : ''; + $logInfo['tool_id'] = !empty($logInfo['tool_id']) ? (int) $logInfo['tool_id'] : 0; + $logInfo['tool_id_detail'] = !empty($logInfo['tool_id_detail']) ? (int) $logInfo['tool_id_detail'] : 0; + $logInfo['action'] = !empty($logInfo['action']) ? $logInfo['action'] : ''; + $logInfo['action_details'] = !empty($logInfo['action_details']) ? $logInfo['action_details'] : ''; + $logInfo['ip_user'] = api_get_real_ip(); + $logInfo['user_agent'] = $_SERVER['HTTP_USER_AGENT']; + $logInfo['session_id'] = $sessionId; + $logInfo['c_id'] = $courseId; + $logInfo['ch_sid'] = session_id(); + $logInfo['login_as'] = $loginAs; + $logInfo['info'] = !empty($logInfo['info']) ? $logInfo['info'] : ''; + $logInfo['url'] = $_SERVER['REQUEST_URI']; + $logInfo['current_id'] = isset($logInfo['current_id']) ? $logInfo['current_id'] : Session::read('last_id', 0); + + $id = Database::insert('track_e_access_complete', $logInfo); + if ($id && empty($logInfo['current_id'])) { + Session::write('last_id', $id); + } + + return true; + } + /** * Removes a "fake" time spent on the platform, for example to match the * estimated time he took to author an assignment/work, see configuration @@ -2141,7 +2271,8 @@ class Event * @param int $courseId The course in which to add the time * @param int $userId The user for whom to add the time * @param int $sessionId The session in which to add the time (if any) - * @param string $virtualTime The amount of time to be added, in a hh:mm:ss format. If int, we consider it is expressed in hours. + * @param string $virtualTime The amount of time to be added, in a hh:mm:ss format. If int, we consider it is + * expressed in hours. * * @return true on successful removal, false otherwise */ @@ -2168,7 +2299,7 @@ class Event // @todo make sure this is portable between DBMSes // @todo make sure this is portable between DBMSes if (preg_match('/:/', $virtualTime)) { - list($h, $m, $s) = preg_split('/:/', $virtualTime); + [$h, $m, $s] = preg_split('/:/', $virtualTime); $virtualTime = $h * 3600 + $m * 60 + $s; } else { $virtualTime *= 3600; @@ -2248,59 +2379,49 @@ class Event return false; } - /** - * Register the logout of the course (usually when logging out of the platform) - * from the track_e_access_complete table. - * - * @param array $logInfo Information stored by local.inc.php - * - * @return bool - */ - public static function registerLog($logInfo) + public static function getAttemptQuestionDuration($exeId, $questionId) { - $sessionId = api_get_session_id(); - $courseId = api_get_course_int_id(); - - if (isset($logInfo['c_id']) && !empty($logInfo['c_id'])) { - $courseId = $logInfo['c_id']; - } - - if (isset($logInfo['session_id']) && !empty($logInfo['session_id'])) { - $sessionId = $logInfo['session_id']; - } - - if (!Tracking::minimumTimeAvailable($sessionId, $courseId)) { - return false; - } - - if (false === self::isSessionLogNeedToBeSave($sessionId)) { - return false; + // Check current attempt. + $questionAttempt = self::getQuestionAttemptByExeIdAndQuestion($exeId, $questionId); + $alreadySpent = 0; + if (!empty($questionAttempt) && $questionAttempt['seconds_spent']) { + $alreadySpent = $questionAttempt['seconds_spent']; + } + $now = time(); + $questionStart = Session::read('question_start', []); + if (!empty($questionStart) && + isset($questionStart[$questionId]) && !empty($questionStart[$questionId]) + ) { + $time = $questionStart[$questionId]; + } else { + $diff = 0; + if (!empty($alreadySpent)) { + $diff = $alreadySpent; + } + $time = $questionStart[$questionId] = $now - $diff; + Session::write('question_start', $questionStart); } - $loginAs = true === (int) Session::read('login_as'); + return $now - $time; + } - $logInfo['user_id'] = isset($logInfo['user_id']) ? $logInfo['user_id'] : api_get_user_id(); - $logInfo['date_reg'] = isset($logInfo['date_reg']) ? $logInfo['date_reg'] : api_get_utc_datetime(); - $logInfo['tool'] = !empty($logInfo['tool']) ? $logInfo['tool'] : ''; - $logInfo['tool_id'] = !empty($logInfo['tool_id']) ? (int) $logInfo['tool_id'] : 0; - $logInfo['tool_id_detail'] = !empty($logInfo['tool_id_detail']) ? (int) $logInfo['tool_id_detail'] : 0; - $logInfo['action'] = !empty($logInfo['action']) ? $logInfo['action'] : ''; - $logInfo['action_details'] = !empty($logInfo['action_details']) ? $logInfo['action_details'] : ''; - $logInfo['ip_user'] = api_get_real_ip(); - $logInfo['user_agent'] = $_SERVER['HTTP_USER_AGENT']; - $logInfo['session_id'] = $sessionId; - $logInfo['c_id'] = $courseId; - $logInfo['ch_sid'] = session_id(); - $logInfo['login_as'] = $loginAs; - $logInfo['info'] = !empty($logInfo['info']) ? $logInfo['info'] : ''; - $logInfo['url'] = $_SERVER['REQUEST_URI']; - $logInfo['current_id'] = isset($logInfo['current_id']) ? $logInfo['current_id'] : Session::read('last_id', 0); + public static function getQuestionAttemptByExeIdAndQuestion($exeId, $questionId) + { + $table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ATTEMPT); + $exeId = (int) $exeId; + $questionId = (int) $questionId; - $id = Database::insert('track_e_access_complete', $logInfo); - if ($id && empty($logInfo['current_id'])) { - Session::write('last_id', $id); + $sql = "SELECT * FROM $table + WHERE + exe_id = $exeId AND + question_id = $questionId + ORDER BY position"; + $result = Database::query($sql); + $attempt = []; + if (Database::num_rows($result)) { + $attempt = Database::fetch_array($result, 'ASSOC'); } - return true; + return $attempt; } } diff --git a/public/main/inc/lib/exercise.lib.php b/public/main/inc/lib/exercise.lib.php index 83d2e70416..a4babede03 100644 --- a/public/main/inc/lib/exercise.lib.php +++ b/public/main/inc/lib/exercise.lib.php @@ -147,7 +147,7 @@ class ExerciseLib '; } else { $s .= ' - '; + '; } // Iterate through answers @@ -374,7 +374,7 @@ class ExerciseLib $header .= Display::tag('th', get_lang('Feedback')); } - $s .= ''; + $s .= ''; $s .= Display::tag('tr', $header, ['style' => 'text-align:left;']); // ajout de la 2eme ligne d'entête pour true/falss et les pourcentages de certitude @@ -1453,9 +1453,10 @@ HTML; } $answerList .= ' - + '; + } if ($freeze) { $relPath = api_get_path(WEB_CODE_PATH); echo " @@ -1481,7 +1482,6 @@ HTML; return; } - } if (!$only_questions) { if ($show_title) { @@ -1514,6 +1514,7 @@ HOTSPOT; new ".(HOT_SPOT_DELINEATION == $answerType ? 'DelineationQuestion' : 'HotspotQuestion')."({ questionId: $questionId, exerciseId: $exerciseId, + exeId: 0, selector: '#question_div_' + $questionId + ' .hotspot-image', for: 'user', relPath: '$relPath' @@ -1614,6 +1615,80 @@ HOTSPOT; return $nbrAnswers; } + /** + * Get an HTML string with the list of exercises where the given question + * is being used. + * + * @param int $questionId The iid of the question being observed + * @param int $excludeTestId If defined, exclude this (current) test from the list of results + * + * @return string An HTML string containing a div and a table + */ + public static function showTestsWhereQuestionIsUsed(int $questionId, int $excludeTestId = 0) + { + $questionId = (int) $questionId; + $sql = "SELECT qz.title quiz_title, + c.title course_title, + s.name session_name, + qz.iid as quiz_id, + qz.c_id, + qz.session_id + FROM c_quiz qz, + c_quiz_rel_question qq, + course c, + session s + WHERE qz.c_id = c.id AND + (qz.session_id = s.id OR qz.session_id = 0) AND + qq.exercice_id = qz.iid AND "; + if (!empty($excludeTestId)) { + $excludeTestId = (int) $excludeTestId; + $sql .= " qz.iid != $excludeTestId AND "; + } + $sql .= " qq.question_id = $questionId + GROUP BY qq.iid"; + + $result = []; + $html = ""; + + $sqlResult = Database::query($sql); + + if (Database::num_rows($sqlResult) != 0) { + while ($row = Database::fetch_array($sqlResult, 'ASSOC')) { + $tmp = []; + $tmp[0] = $row['course_title']; + $tmp[1] = $row['session_name']; + $tmp[2] = $row['quiz_title']; + // Send do other test with r=1 to reset current test session variables + $urlToQuiz = api_get_path(WEB_CODE_PATH).'exercise/admin.php?'.api_get_cidreq().'&exerciseId='.$row['quiz_id'].'&r=1'; + $tmp[3] = ''.Display::return_icon('quiz.png', get_lang('Edit')).''; + if ((int) $row['session_id'] == 0) { + $tmp[1] = '-'; + } + + $result[] = $tmp; + } + + $headers = [ + get_lang('Course'), + get_lang('Session'), + get_lang('Quiz'), + get_lang('LinkToTestEdition'), + ]; + + $title = Display::div( + get_lang('QuestionAlsoUsedInTheFollowingTests'), + [ + 'class' => 'section-title', + 'style' => 'margin-top: 25px; border-bottom: none', + ] + ); + + $html = $title.Display::table($headers, $result); + } + + echo $html; + } + /** * @param int $exeId * @@ -2558,8 +2633,8 @@ HOTSPOT; $maxNote = api_get_setting('exercise_max_score'); $minNote = api_get_setting('exercise_min_score'); - if ('' != $maxNote && '' != $minNote) { - if (!empty($weight) && 0 != intval($weight)) { + if ($maxNote != '' && $minNote != '') { + if (!empty($weight) && (float) $weight !== (float) 0) { $score = $minNote + ($maxNote - $minNote) * $score / $weight; } else { $score = $minNote; @@ -2583,6 +2658,7 @@ HOTSPOT; * @param string $decimalSeparator * @param string $thousandSeparator * @param bool $roundValues This option rounds the float values into a int using ceil() + * @param bool $removeEmptyDecimals * * @return string an html with the score modified */ @@ -2595,11 +2671,14 @@ HOTSPOT; $hidePercentageSign = false, $decimalSeparator = '.', $thousandSeparator = ',', - $roundValues = false + $roundValues = false, + $removeEmptyDecimals = false ) { if (is_null($score) && is_null($weight)) { return '-'; } + $decimalSeparator = empty($decimalSeparator) ? '.' : $decimalSeparator; + $thousandSeparator = empty($thousandSeparator) ? ',' : $thousandSeparator; if ($use_platform_settings) { $result = self::convertScoreToPlatformSetting($score, $weight); @@ -2656,6 +2735,11 @@ HOTSPOT; $html = $percentage.$percentageSign; } } else { + if ($removeEmptyDecimals) { + if (ScoreDisplay::hasEmptyDecimals($weight)) { + $weight = round($weight); + } + } $html = $score.' / '.$weight; } @@ -3322,7 +3406,7 @@ EOT; $best_score = 0; if (!empty($user_results)) { foreach ($user_results as $result) { - if (!empty($result['max_score']) && 0 != intval($result['max_score'])) { + if (!empty($result['max_score']) && 0 != (float) $result['max_score']) { $score = $result['score'] / $result['max_score']; if ($score >= $best_score) { $best_score = $score; @@ -4158,12 +4242,18 @@ EOT; * @param int $exeId * @param bool $save_user_result save users results (true) or just show the results (false) * @param string $remainingMessage + * @param bool $allowSignature + * @param bool $allowExportPdf + * @param bool $isExport */ public static function displayQuestionListByAttempt( $objExercise, $exeId, $save_user_result = false, - $remainingMessage = '' + $remainingMessage = '', + $allowSignature = false, + $allowExportPdf = false, + $isExport = false ) { $origin = api_get_origin(); $courseId = api_get_course_int_id(); @@ -4252,11 +4342,13 @@ EOT; $showTotalScoreAndUserChoicesInLastAttempt = true; $showTotalScore = true; $showQuestionScore = true; + $attemptResult = []; if (in_array( $objExercise->results_disabled, [ RESULT_DISABLE_SHOW_SCORE_ATTEMPT_SHOW_ANSWERS_LAST_ATTEMPT, + RESULT_DISABLE_SHOW_SCORE_ATTEMPT_SHOW_ANSWERS_LAST_ATTEMPT_NO_FEEDBACK, RESULT_DISABLE_DONT_SHOW_SCORE_ONLY_IF_USER_FINISHES_ATTEMPTS_SHOW_ALWAYS_FEEDBACK, ]) ) { @@ -4281,6 +4373,9 @@ EOT; $numberAttempts++; } $showTotalScore = false; + if ($objExercise->results_disabled == RESULT_DISABLE_SHOW_SCORE_ATTEMPT_SHOW_ANSWERS_LAST_ATTEMPT) { + $showTotalScore = true; + } $showTotalScoreAndUserChoicesInLastAttempt = false; if ($numberAttempts >= $objExercise->attempts) { $showTotalScore = true; @@ -4288,6 +4383,15 @@ EOT; $show_only_score = false; $showTotalScoreAndUserChoicesInLastAttempt = true; } + if ($objExercise->results_disabled == RESULT_DISABLE_SHOW_SCORE_ATTEMPT_SHOW_ANSWERS_LAST_ATTEMPT_NO_FEEDBACK) { + $showTotalScore = true; + $show_results = true; + $show_only_score = false; + $showTotalScoreAndUserChoicesInLastAttempt = false; + if ($numberAttempts >= $objExercise->attempts) { + $showTotalScoreAndUserChoicesInLastAttempt = true; + } + } } if (RESULT_DISABLE_DONT_SHOW_SCORE_ONLY_IF_USER_FINISHES_ATTEMPTS_SHOW_ALWAYS_FEEDBACK == @@ -4305,6 +4409,16 @@ EOT; } } + if ($allowExportPdf && $isExport) { + $showTotalScore = false; + $showQuestionScore = false; + $objExercise->feedback_type = 2; + $objExercise->hideComment = true; + $objExercise->hideNoAnswer = true; + $objExercise->results_disabled = 0; + $objExercise->hideExpectedAnswer = true; + $show_results = true; + } if ('embeddable' !== $origin && !empty($exercise_stat_info['exe_user_id']) && !empty($studentInfo) @@ -4313,7 +4427,9 @@ EOT; echo $objExercise->showExerciseResultHeader( $studentInfo, $exercise_stat_info, - $save_user_result + $save_user_result, + $allowSignature, + $allowExportPdf ); } @@ -4327,7 +4443,6 @@ EOT; } $question_list_answers = []; - $media_list = []; $category_list = []; $loadChoiceFromSession = false; $fromDatabase = true; @@ -4335,7 +4450,7 @@ EOT; $exerciseResultCoordinates = null; $delineationResults = null; - if (in_array( + if (true === $save_user_result && in_array( $objExercise->getFeedbackType(), [EXERCISE_FEEDBACK_TYPE_DIRECT, EXERCISE_FEEDBACK_TYPE_POPUP] )) { @@ -4394,6 +4509,7 @@ EOT; $my_total_score = $result['score']; $my_total_weight = $result['weight']; + $scorePassed = self::scorePassed($my_total_score, $my_total_weight); // Category report $category_was_added_for_this_test = false; @@ -4404,8 +4520,34 @@ EOT; if (!isset($category_list[$objQuestionTmp->category]['total'])) { $category_list[$objQuestionTmp->category]['total'] = 0; } + if (!isset($category_list[$objQuestionTmp->category]['total_questions'])) { + $category_list[$objQuestionTmp->category]['total_questions'] = 0; + } + if (!isset($category_list[$objQuestionTmp->category]['passed'])) { + $category_list[$objQuestionTmp->category]['passed'] = 0; + } + if (!isset($category_list[$objQuestionTmp->category]['wrong'])) { + $category_list[$objQuestionTmp->category]['wrong'] = 0; + } + if (!isset($category_list[$objQuestionTmp->category]['no_answer'])) { + $category_list[$objQuestionTmp->category]['no_answer'] = 0; + } $category_list[$objQuestionTmp->category]['score'] += $my_total_score; $category_list[$objQuestionTmp->category]['total'] += $my_total_weight; + if ($scorePassed) { + // Only count passed if score is not empty + if (!empty($my_total_score)) { + $category_list[$objQuestionTmp->category]['passed']++; + } + } else { + if ($result['user_answered']) { + $category_list[$objQuestionTmp->category]['wrong']++; + } else { + $category_list[$objQuestionTmp->category]['no_answer']++; + } + } + + $category_list[$objQuestionTmp->category]['total_questions']++; $category_was_added_for_this_test = true; } @@ -4456,25 +4598,21 @@ EOT; } } + $calculatedScore = [ + 'result' => self::show_score( + $my_total_score, + $my_total_weight, + false + ), + 'pass' => $scorePassed, + 'score' => $my_total_score, + 'weight' => $my_total_weight, + 'comments' => $comnt, + 'user_answered' => $result['user_answered'], + ]; $score = []; if ($show_results) { - $scorePassed = $my_total_score >= $my_total_weight; - if (function_exists('bccomp')) { - $compareResult = bccomp($my_total_score, $my_total_weight, 3); - $scorePassed = 1 === $compareResult || 0 === $compareResult; - } - $score = [ - 'result' => self::show_score( - $my_total_score, - $my_total_weight, - false - ), - 'pass' => $scorePassed, - 'score' => $my_total_score, - 'weight' => $my_total_weight, - 'comments' => $comnt, - 'user_answered' => $result['user_answered'], - ]; + $score = $calculatedScore; } if (in_array($objQuestionTmp->type, [FREE_ANSWER, ORAL_EXPRESSION, ANNOTATION])) { @@ -4492,7 +4630,7 @@ EOT; $question_content = ''; if ($show_results) { $question_content = ''; - if (false == $showQuestionScore) { + if (false === $showQuestionScore) { $score = []; } @@ -4508,6 +4646,8 @@ EOT; if ($show_results) { $question_content .= ''; } + $calculatedScore['question_content'] = $question_content; + $attemptResult[] = $calculatedScore; if ($objExercise->showExpectedChoice()) { $exercise_content .= Display::div( Display::panel($question_content), @@ -4581,13 +4721,15 @@ EOT; echo $chartMultiAnswer; } - if (!empty($category_list) && ($show_results || $show_only_score)) { + if (!empty($category_list) && + ($show_results || $show_only_score || RESULT_DISABLE_RADAR == $objExercise->results_disabled) + ) { // Adding total $category_list['total'] = [ 'score' => $total_score, 'total' => $total_weight, ]; - echo TestCategory::get_stats_table_by_attempt($objExercise->id, $category_list); + echo TestCategory::get_stats_table_by_attempt($objExercise, $category_list); } if ($show_all_but_expected_answer) { @@ -4669,7 +4811,7 @@ EOT; )) { echo Display::page_header(get_lang('Ranking'), null, 'h4'); echo self::displayResultsInRanking( - $objExercise->iId, + $objExercise, api_get_user_id(), $courseId, $sessionId @@ -4679,23 +4821,59 @@ EOT; if (!empty($remainingMessage)) { echo Display::return_message($remainingMessage, 'normal', false); } + $failedAnswersCount = 0; + $wrongQuestionHtml = ''; + $all = ''; + foreach ($attemptResult as $item) { + if (false === $item['pass']) { + $failedAnswersCount++; + $wrongQuestionHtml .= $item['question_content'].''; + } + $all .= $item['question_content'].''; + } + + $passed = self::isPassPercentageAttemptPassed( + $objExercise, + $total_score, + $total_weight + ); + + $percentage = 0; + if (!empty($total_weight)) { + $percentage = ($total_score / $total_weight) * 100; + } + + return [ + 'category_list' => $category_list, + 'attempts_result_list' => $attemptResult, // array of results + 'exercise_passed' => $passed, // boolean + 'total_answers_count' => count($attemptResult), // int + 'failed_answers_count' => $failedAnswersCount, // int + 'failed_answers_html' => $wrongQuestionHtml, + 'all_answers_html' => $all, + 'total_score' => $total_score, + 'total_weight' => $total_weight, + 'total_percentage' => $percentage, + 'count_pending_questions' => $countPendingQuestions, + ]; } /** * Display the ranking of results in a exercise. * - * @param int $exerciseId + * @param Exercise $exercise * @param int $currentUserId * @param int $courseId * @param int $sessionId * * @return string */ - public static function displayResultsInRanking($exerciseId, $currentUserId, $courseId, $sessionId = 0) + public static function displayResultsInRanking($exercise, $currentUserId, $courseId, $sessionId = 0) { + $exerciseId = $exercise->iId; $data = self::exerciseResultsInRanking($exerciseId, $courseId, $sessionId); - $table = new HTML_Table(['class' => 'table table-hover table-bordered']); + $table = new HTML_Table(['class' => 'table table-hover table-striped table-bordered']); $table->setHeaderContents(0, 0, get_lang('Position'), ['class' => 'text-right']); $table->setHeaderContents(0, 1, get_lang('Username')); $table->setHeaderContents(0, 2, get_lang('Score'), ['class' => 'text-right']); @@ -4813,12 +4991,11 @@ EOT; $ribbon = $displayChartDegree ? '' : ''; if ($checkPassPercentage) { - $isSuccess = self::isSuccessExerciseResult( - $score, $weight, $objExercise->selectPassPercentage() - ); + $passPercentage = $objExercise->selectPassPercentage(); + $isSuccess = self::isSuccessExerciseResult($score, $weight, $passPercentage); // Color the final test score if pass_percentage activated $ribbonTotalSuccessOrError = ''; - if (self::isPassPercentageEnabled($objExercise->selectPassPercentage())) { + if (self::isPassPercentageEnabled($passPercentage)) { if ($isSuccess) { $ribbonTotalSuccessOrError = ' ribbon-total-success'; } else { @@ -4850,6 +5027,12 @@ EOT; return $ribbon; } + public static function isPassPercentageAttemptPassed($objExercise, $score, $weight) + { + $passPercentage = $objExercise->selectPassPercentage(); + + return self::isSuccessExerciseResult($score, $weight, $passPercentage); + } /** * @param float $score * @param float $weight @@ -5261,16 +5444,28 @@ EOT; return Category::getDownloadCertificateBlock($certificate); } + /** + * @param int $exerciseId + */ + public static function getExerciseTitleById($exerciseId) + { + $em = Database::getManager(); + + return $em + ->createQuery('SELECT cq.title + FROM ChamiloCourseBundle:CQuiz cq + WHERE cq.iid = :iid' + ) + ->setParameter('iid', $exerciseId) + ->getSingleScalarResult(); + } + /** * @param int $exeId ID from track_e_exercises * @param int $userId User ID * @param int $exerciseId Exercise ID * @param int $courseId Optional. Coure ID. * - * @throws \Doctrine\ORM\ORMException - * @throws \Doctrine\ORM\OptimisticLockException - * @throws \Doctrine\ORM\TransactionRequiredException - * * @return TrackEExercises|null */ public static function recalculateResult($exeId, $userId, $exerciseId, $courseId = 0) @@ -5360,4 +5555,510 @@ EOT; return $trackedExercise; } + + public static function getTotalQuestionAnswered($courseId, $exerciseId, $questionId) + { + $courseId = (int) $courseId; + $exerciseId = (int) $exerciseId; + $questionId = (int) $questionId; + + $attemptTable = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ATTEMPT); + $trackTable = Database::get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES); + + $sql = "SELECT count(te.exe_id) total + FROM $attemptTable t + INNER JOIN $trackTable te + ON (te.c_id = t.c_id AND t.exe_id = te.exe_id) + WHERE + t.c_id = $courseId AND + exe_exo_id = $exerciseId AND + t.question_id = $questionId AND + status != 'incomplete' + "; + $queryTotal = Database::query($sql); + $totalRow = Database::fetch_array($queryTotal, 'ASSOC'); + $total = 0; + if ($totalRow) { + $total = (int) $totalRow['total']; + } + + return $total; + } + + public static function getWrongQuestionResults($courseId, $exerciseId, $sessionId = 0, $limit = 10) + { + $courseId = (int) $courseId; + $exerciseId = (int) $exerciseId; + $limit = (int) $limit; + + $questionTable = Database::get_course_table(TABLE_QUIZ_QUESTION); + $attemptTable = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ATTEMPT); + $trackTable = Database::get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES); + + $sessionCondition = ''; + if (!empty($sessionId)) { + $sessionCondition = api_get_session_condition($sessionId, true, false, 'te.session_id'); + } + + $sql = "SELECT q.question, question_id, count(q.iid) count + FROM $attemptTable t + INNER JOIN $questionTable q + ON (q.c_id = t.c_id AND q.id = t.question_id) + INNER JOIN $trackTable te + ON (te.c_id = q.c_id AND t.exe_id = te.exe_id) + WHERE + t.c_id = $courseId AND + t.marks != q.ponderation AND + exe_exo_id = $exerciseId AND + status != 'incomplete' + $sessionCondition + GROUP BY q.iid + ORDER BY count DESC + LIMIT $limit + "; + + $result = Database::query($sql); + + return Database::store_result($result, 'ASSOC'); + } + + public static function getExerciseResultsCount($type, $courseId, $exerciseId, $sessionId = 0) + { + $courseId = (int) $courseId; + $exerciseId = (int) $exerciseId; + + $trackTable = Database::get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES); + + $sessionCondition = ''; + if (!empty($sessionId)) { + $sessionCondition = api_get_session_condition($sessionId, true, false, 'te.session_id'); + } + + $selectCount = 'count(DISTINCT te.exe_id)'; + $scoreCondition = ''; + switch ($type) { + case 'correct_student': + $selectCount = 'count(DISTINCT te.exe_user_id)'; + $scoreCondition = ' AND exe_result = exe_weighting '; + break; + case 'wrong_student': + $selectCount = 'count(DISTINCT te.exe_user_id)'; + $scoreCondition = ' AND exe_result != exe_weighting '; + break; + case 'correct': + $scoreCondition = ' AND exe_result = exe_weighting '; + break; + case 'wrong': + $scoreCondition = ' AND exe_result != exe_weighting '; + break; + } + + $sql = "SELECT $selectCount count + FROM $trackTable te + WHERE + c_id = $courseId AND + exe_exo_id = $exerciseId AND + status != 'incomplete' + $scoreCondition + $sessionCondition + "; + $result = Database::query($sql); + $totalRow = Database::fetch_array($result, 'ASSOC'); + $total = 0; + if ($totalRow) { + $total = (int) $totalRow['count']; + } + + return $total; + } + + public static function parseContent($content, $stats, $exercise, $trackInfo, $currentUserId = 0) + { + $wrongAnswersCount = $stats['failed_answers_count']; + $attemptDate = substr($trackInfo['exe_date'], 0, 10); + + $content = str_replace( + [ + '((exercise_error_count))', + '((all_answers_html))', + '((exercise_title))', + '((exercise_attempt_date))', + ], + [ + $wrongAnswersCount, + $stats['all_answers_html'], + $exercise->get_formated_title(), + $attemptDate, + ], + $content + ); + + $currentUserId = empty($currentUserId) ? api_get_user_id() : (int) $currentUserId; + + $content = AnnouncementManager::parseContent( + $currentUserId, + $content, + api_get_course_id(), + api_get_session_id() + ); + + return $content; + } + + public static function sendNotification( + $currentUserId, + $objExercise, + $exercise_stat_info, + $courseInfo, + $attemptCountToSend, + $stats + ) { + $notifications = api_get_configuration_value('exercise_finished_notification_settings'); + if (empty($notifications)) { + return false; + } + + $studentId = $exercise_stat_info['exe_user_id']; + $exerciseExtraFieldValue = new ExtraFieldValue('exercise'); + $wrongAnswersCount = $stats['failed_answers_count']; + $exercisePassed = $stats['exercise_passed']; + $countPendingQuestions = $stats['count_pending_questions']; + + // If there are no pending questions (Open questions). + if (0 === $countPendingQuestions) { + /*$extraFieldData = $exerciseExtraFieldValue->get_values_by_handler_and_field_variable( + $objExercise->iId, + 'signature_mandatory' + ); + + if ($extraFieldData && isset($extraFieldData['value']) && 1 === (int) $extraFieldData['value']) { + if (ExerciseSignaturePlugin::exerciseHasSignatureActivated($objExercise)) { + $signature = ExerciseSignaturePlugin::getSignature($studentId, $exercise_stat_info); + if (false !== $signature) { + //return false; + } + } + }*/ + + // Notifications. + $extraFieldData = $exerciseExtraFieldValue->get_values_by_handler_and_field_variable( + $objExercise->iId, + 'notifications' + ); + $exerciseNotification = ''; + if ($extraFieldData && isset($extraFieldData['value'])) { + $exerciseNotification = $extraFieldData['value']; + } + + $subject = sprintf(get_lang('WrongAttemptXInCourseX'), $attemptCountToSend, $courseInfo['title']); + if ($exercisePassed) { + $subject = sprintf(get_lang('ExerciseValidationInCourseX'), $courseInfo['title']); + } + + if ($exercisePassed) { + $extraFieldData = $exerciseExtraFieldValue->get_values_by_handler_and_field_variable( + $objExercise->iId, + 'MailSuccess' + ); + } else { + $extraFieldData = $exerciseExtraFieldValue->get_values_by_handler_and_field_variable( + $objExercise->iId, + 'MailAttempt'.$attemptCountToSend + ); + } + + // Blocking exercise. + $blockPercentageExtra = $exerciseExtraFieldValue->get_values_by_handler_and_field_variable( + $objExercise->iId, + 'blocking_percentage' + ); + $blockPercentage = false; + if ($blockPercentageExtra && isset($blockPercentageExtra['value']) && $blockPercentageExtra['value']) { + $blockPercentage = $blockPercentageExtra['value']; + } + if ($blockPercentage) { + $passBlock = $stats['total_percentage'] > $blockPercentage; + if (false === $passBlock) { + $extraFieldData = $exerciseExtraFieldValue->get_values_by_handler_and_field_variable( + $objExercise->iId, + 'MailIsBlockByPercentage' + ); + } + } + + $extraFieldValueUser = new ExtraFieldValue('user'); + + if ($extraFieldData && isset($extraFieldData['value'])) { + $content = $extraFieldData['value']; + $content = self::parseContent($content, $stats, $objExercise, $exercise_stat_info, $studentId); + if (false === $exercisePassed) { + if (0 !== $wrongAnswersCount) { + $content .= $stats['failed_answers_html']; + } + } + + $sendMessage = true; + if (!empty($exerciseNotification)) { + foreach ($notifications as $name => $notificationList) { + if ($exerciseNotification !== $name) { + continue; + } + foreach ($notificationList as $notificationName => $attemptData) { + if ('student_check' === $notificationName) { + $sendMsgIfInList = isset($attemptData['send_notification_if_user_in_extra_field']) ? $attemptData['send_notification_if_user_in_extra_field'] : ''; + if (!empty($sendMsgIfInList)) { + foreach ($sendMsgIfInList as $skipVariable => $skipValues) { + $userExtraFieldValue = $extraFieldValueUser->get_values_by_handler_and_field_variable( + $studentId, + $skipVariable + ); + + if (empty($userExtraFieldValue)) { + $sendMessage = false; + break; + } else { + $sendMessage = false; + if (isset($userExtraFieldValue['value']) && + in_array($userExtraFieldValue['value'], $skipValues) + ) { + $sendMessage = true; + break; + } + } + } + } + break; + } + } + } + } + + // Send to student. + if ($sendMessage) { + MessageManager::send_message($currentUserId, $subject, $content); + } + } + + if (!empty($exerciseNotification)) { + foreach ($notifications as $name => $notificationList) { + if ($exerciseNotification !== $name) { + continue; + } + foreach ($notificationList as $attemptData) { + $skipNotification = false; + $skipNotificationList = isset($attemptData['send_notification_if_user_in_extra_field']) ? $attemptData['send_notification_if_user_in_extra_field'] : []; + if (!empty($skipNotificationList)) { + foreach ($skipNotificationList as $skipVariable => $skipValues) { + $userExtraFieldValue = $extraFieldValueUser->get_values_by_handler_and_field_variable( + $studentId, + $skipVariable + ); + + if (empty($userExtraFieldValue)) { + $skipNotification = true; + break; + } else { + if (isset($userExtraFieldValue['value'])) { + if (!in_array($userExtraFieldValue['value'], $skipValues)) { + $skipNotification = true; + break; + } + } else { + $skipNotification = true; + break; + } + } + } + } + + if ($skipNotification) { + continue; + } + + $email = isset($attemptData['email']) ? $attemptData['email'] : ''; + $emailList = explode(',', $email); + if (empty($emailList)) { + continue; + } + $attempts = isset($attemptData['attempts']) ? $attemptData['attempts'] : []; + foreach ($attempts as $attempt) { + $sendMessage = false; + if (isset($attempt['attempt']) && $attemptCountToSend !== (int) $attempt['attempt']) { + continue; + } + + if (!isset($attempt['status'])) { + continue; + } + + if ($blockPercentage && isset($attempt['is_block_by_percentage'])) { + if ($attempt['is_block_by_percentage']) { + if ($passBlock) { + continue; + } + } else { + if (false === $passBlock) { + continue; + } + } + } + + switch ($attempt['status']) { + case 'passed': + if ($exercisePassed) { + $sendMessage = true; + } + break; + case 'failed': + if (false === $exercisePassed) { + $sendMessage = true; + } + break; + case 'all': + $sendMessage = true; + break; + } + + if ($sendMessage) { + $attachments = []; + if (isset($attempt['add_pdf']) && $attempt['add_pdf']) { + // Get pdf content + $pdfExtraData = $exerciseExtraFieldValue->get_values_by_handler_and_field_variable( + $objExercise->iId, + $attempt['add_pdf'] + ); + + if ($pdfExtraData && isset($pdfExtraData['value'])) { + $pdfContent = self::parseContent( + $pdfExtraData['value'], + $stats, + $objExercise, + $exercise_stat_info, + $studentId + ); + + @$pdf = new PDF(); + $filename = get_lang('Exercise'); + $cssFile = api_get_path(SYS_CSS_PATH).'themes/chamilo/default.css'; + $pdfPath = @$pdf->content_to_pdf( + "$pdfContent", + file_get_contents($cssFile), + $filename, + api_get_course_id(), + 'F', + false, + null, + false, + true + ); + $attachments[] = ['filename' => $filename, 'path' => $pdfPath]; + } + } + + $content = isset($attempt['content_default']) ? $attempt['content_default'] : ''; + if (isset($attempt['content'])) { + $extraFieldData = $exerciseExtraFieldValue->get_values_by_handler_and_field_variable( + $objExercise->iId, + $attempt['content'] + ); + if ($extraFieldData && isset($extraFieldData['value']) && !empty($extraFieldData['value'])) { + $content = $extraFieldData['value']; + } + } + + if (!empty($content)) { + $content = self::parseContent( + $content, + $stats, + $objExercise, + $exercise_stat_info, + $studentId + ); + foreach ($emailList as $email) { + if (empty($email)) { + continue; + } + api_mail_html( + null, + $email, + $subject, + $content, + null, + null, + [], + $attachments + ); + } + } + + if (isset($attempt['post_actions'])) { + foreach ($attempt['post_actions'] as $action => $params) { + switch ($action) { + case 'subscribe_student_to_courses': + foreach ($params as $code) { + CourseManager::subscribeUser($currentUserId, $code); + break; + } + break; + } + } + } + } + } + } + } + } + } + } + + /** + * Delete an exercise attempt. + * + * Log the exe_id deleted with the exe_user_id related. + * + * @param int $exeId + */ + public static function deleteExerciseAttempt($exeId) + { + $exeId = (int) $exeId; + + $trackExerciseInfo = self::get_exercise_track_exercise_info($exeId); + + if (empty($trackExerciseInfo)) { + return; + } + + $tblTrackExercises = Database::get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES); + $tblTrackAttempt = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ATTEMPT); + + Database::query("DELETE FROM $tblTrackExercises WHERE exe_id = $exeId"); + Database::query("DELETE FROM $tblTrackAttempt WHERE exe_id = $exeId"); + + Event::addEvent( + LOG_EXERCISE_ATTEMPT_DELETE, + LOG_EXERCISE_ATTEMPT, + $exeId, + api_get_utc_datetime() + ); + Event::addEvent( + LOG_EXERCISE_ATTEMPT_DELETE, + LOG_EXERCISE_AND_USER_ID, + $exeId.'-'.$trackExerciseInfo['exe_user_id'], + api_get_utc_datetime() + ); + } + + public static function scorePassed($score, $total) + { + $compareResult = bccomp($score, $total, 3); + $scorePassed = 1 === $compareResult || 0 === $compareResult; + if (false === $scorePassed) { + $epsilon = 0.00001; + if (abs($score - $total) < $epsilon) { + $scorePassed = true; + } + } + + return $scorePassed; + } } diff --git a/public/main/inc/lib/exercise_show_functions.lib.php b/public/main/inc/lib/exercise_show_functions.lib.php index 38d49d853d..951cb4384e 100644 --- a/public/main/inc/lib/exercise_show_functions.lib.php +++ b/public/main/inc/lib/exercise_show_functions.lib.php @@ -1,16 +1,6 @@ '; + $content = ''; $content .= ''; $content .= ''; + $hotspotColors[$orderColor].'">'; $content .= ''; $content .= ''; $content .= "$answerId - $answer"; $content .= ''; + if (false === $exercise->hideComment) { $content .= ''; if (!$hide_expected_answer) { $status = Display::label(get_lang('Incorrect'), 'danger'); if ($studentChoice) { $status = Display::label(get_lang('Correct'), 'success'); - } else { - if (in_array($resultsDisabled, [ - RESULT_DISABLE_SHOW_ONLY_IN_CORRECT_ANSWER, - ]) - ) { - return ''; - } } $content .= $status; + } else { + $content .= ' '; } $content .= ''; if (EXERCISE_FEEDBACK_TYPE_EXAM != $feedback_type) { $content .= ''; if ($studentChoice) { $content .= ''.nl2br($answerComment).''; + } else { + $content .= ' '; } $content .= ''; } else { $content .= ' '; } + } $content .= ''; echo $content; @@ -319,6 +325,9 @@ class ExerciseShowFunctions $showTotalScoreAndUserChoices, $export = false ) { + if (true === $exercise->hideNoAnswer && empty($studentChoice)) { + return ''; + } if ($export) { $answer = strip_tags_blacklist($answer, ['title', 'head']); // Fix answers that contains this tags @@ -356,6 +365,11 @@ class ExerciseShowFunctions $hide_expected_answer = false; } break; + case RESULT_DISABLE_SHOW_SCORE_ATTEMPT_SHOW_ANSWERS_LAST_ATTEMPT_NO_FEEDBACK: + if (false === $showTotalScoreAndUserChoices && empty($studentChoiceInt)) { + return ''; + } + break; } $icon = in_array($answerType, [UNIQUE_ANSWER, UNIQUE_ANSWER_NO_OPTION]) ? 'radio' : 'checkbox'; @@ -418,6 +432,7 @@ class ExerciseShowFunctions $showComment = true; } + if (false === $exercise->hideComment) { if ($showComment) { echo ''; $color = 'black'; @@ -435,6 +450,7 @@ class ExerciseShowFunctions } else { echo ' '; } + } echo ''; } @@ -486,6 +502,11 @@ class ExerciseShowFunctions $hide_expected_answer = false; } break; + case RESULT_DISABLE_SHOW_SCORE_ATTEMPT_SHOW_ANSWERS_LAST_ATTEMPT_NO_FEEDBACK: + if (false === $showTotalScoreAndUserChoices && empty($studentChoice)) { + return ''; + } + break; } $content = ''; @@ -531,6 +552,7 @@ class ExerciseShowFunctions $content .= ''; } + if (false === $exercise->hideComment) { if (EXERCISE_FEEDBACK_TYPE_EXAM != $feedbackType) { $content .= ''; $color = 'black'; @@ -553,6 +575,7 @@ class ExerciseShowFunctions } $content .= ''; } + } $content .= ''; echo $content; @@ -645,6 +668,7 @@ class ExerciseShowFunctions ' '; + if (false === $exercise->hideComment) { if (EXERCISE_FEEDBACK_TYPE_EXAM != $feedbackType) { echo ''; if (isset($newOptions[$studentChoice])) { @@ -654,6 +678,7 @@ class ExerciseShowFunctions } else { echo ' '; } + } echo ''; } @@ -704,6 +729,11 @@ class ExerciseShowFunctions $hide_expected_answer = false; } break; + case RESULT_DISABLE_SHOW_SCORE_ATTEMPT_SHOW_ANSWERS_LAST_ATTEMPT_NO_FEEDBACK: + if (false === $showTotalScoreAndUserChoices && empty($studentChoice)) { + return ''; + } + break; } echo ''; @@ -750,13 +780,17 @@ class ExerciseShowFunctions echo ''; } + if (false === $exercise->hideComment) { if (EXERCISE_FEEDBACK_TYPE_EXAM != $feedbackType) { echo ''; //@todo replace this harcoded value - if ($studentChoice || in_array($resultsDisabled, [ + if ($studentChoice || in_array( + $resultsDisabled, + [ RESULT_DISABLE_SHOW_ONLY_IN_CORRECT_ANSWER, RESULT_DISABLE_SHOW_SCORE_AND_EXPECTED_ANSWERS_AND_RANKING, - ]) + ] + ) ) { $color = 'black'; if ($studentChoice == $answerCorrect) { @@ -770,6 +804,7 @@ class ExerciseShowFunctions echo ''; } else { echo ' '; + } } echo ''; } diff --git a/src/CoreBundle/Entity/TrackEAttempt.php b/src/CoreBundle/Entity/TrackEAttempt.php index e76c45d398..7bfad37c37 100644 --- a/src/CoreBundle/Entity/TrackEAttempt.php +++ b/src/CoreBundle/Entity/TrackEAttempt.php @@ -118,13 +118,14 @@ class TrackEAttempt /** * @var int * - * @ORM\Column(name="second_spent", type="integer") + * @ORM\Column(name="seconds_spent", type="integer") */ - protected $secondSpent; + protected $secondsSpent; public function __construct() { - $this->secondSpent = 0; + $this->teacherComment = ''; + $this->secondsSpent = 0; } /** @@ -352,4 +353,16 @@ class TrackEAttempt { return $this->id; } + + public function getSecondsSpent(): int + { + return $this->secondsSpent; + } + + public function setSecondsSpent(int $secondsSpent): TrackEAttempt + { + $this->secondsSpent = $secondsSpent; + + return $this; + } } diff --git a/src/CoreBundle/Entity/TrackEAttemptRecording.php b/src/CoreBundle/Entity/TrackEAttemptRecording.php index 88dc7891d6..bad68ae74d 100644 --- a/src/CoreBundle/Entity/TrackEAttemptRecording.php +++ b/src/CoreBundle/Entity/TrackEAttemptRecording.php @@ -269,4 +269,23 @@ class TrackEAttemptRecording { return $this->id; } + + /** + * @return int + */ + public function getAnswer() + { + return $this->answer; + } + + /** + * @param int $answer + */ + public function setAnswer($answer): self + { + $this->answer = $answer; + + return $this; + } + } diff --git a/src/CoreBundle/Migrations/Schema/V200/Version20180904175500.php b/src/CoreBundle/Migrations/Schema/V200/Version20180904175500.php index e11e3e975e..853350614e 100644 --- a/src/CoreBundle/Migrations/Schema/V200/Version20180904175500.php +++ b/src/CoreBundle/Migrations/Schema/V200/Version20180904175500.php @@ -97,8 +97,8 @@ class Version20180904175500 extends AbstractMigrationChamilo $this->addSql('CREATE INDEX idx_track_e_attempt_tms ON track_e_attempt (tms)'); } - if (false === $table->hasColumn('second_spent')) { - $this->addSql('ALTER TABLE track_e_attempt ADD second_spent INT NOT NULL, CHANGE user_id user_id INT DEFAULT NULL'); + if (false === $table->hasColumn('seconds_spent')) { + $this->addSql('ALTER TABLE track_e_attempt ADD seconds_spent INT NOT NULL, CHANGE user_id user_id INT DEFAULT NULL'); } if (false === $table->hasForeignKey('FK_A89CC3B691D79BD3')) {](exercise_report.php?id='.$exerciseId.'&'.api_get_cidreq().'
ICON_SIZE_MEDIUM
)
.'</a>';
+$actions .= Display::url(
+ Display::return_icon('pdf.png', get_lang('ExportToPDF'), [], ICON_SIZE_MEDIUM),
+ 'stats.php?exerciseId='.$exerciseId.'&export_pdf=1&'.api_get_cidreq()
+);
$actions = Display::div($actions, ['class' => 'actions']);
$content = $actions.$content;
$tpl->assign('content', $content);
diff --git a/public/main/exercise/tests_category.php b/public/main/exercise/tests_category.php
index 871aabbd76..926cc7be5b 100644
--- a/public/main/exercise/tests_category.php
+++ b/public/main/exercise/tests_category.php
@@ -24,6 +24,7 @@ $nameTools = '';
require_once __DIR__.'/../inc/global.inc.php';
+$this_section = SECTION_COURSES;
api_protect_course_script(true);
if (!api_is_allowed_to_edit()) {
diff --git a/public/main/exercise/unique_answer.class.php b/public/main/exercise/unique_answer.class.php
index 62bd13e2c7..df4e013fa6 100644
--- a/public/main/exercise/unique_answer.class.php
+++ b/public/main/exercise/unique_answer.class.php
@@ -452,7 +452,9 @@ class UniqueAnswer extends Question
if ($exercise->showExpectedChoice()) {
$header .= '<th>'.get_lang('Status').'</th>';
}
- $header .= '<th>'.get_lang('Comment').'</th>';
+ if (false === $exercise->hideComment) {
+ $header .= '<th>'.get_lang('Comment').'</th>';
+ }
$header .= '</tr>';
return $header;
diff --git a/public/main/exercise/unique_answer_no_option.class.php b/public/main/exercise/unique_answer_no_option.class.php
index c59267d939..774a5bd0b3 100644
--- a/public/main/exercise/unique_answer_no_option.class.php
+++ b/public/main/exercise/unique_answer_no_option.class.php
@@ -409,7 +409,9 @@ class UniqueAnswerNoOption extends Question
if ($exercise->showExpectedChoice()) {
$header .= '<th>'.get_lang('Status').'</th>';
}
- $header .= '<th>'.get_lang('Comment').'</th>';
+ if (false === $exercise->hideComment) {
+ $header .= '<th>'.get_lang('Comment').'</th>';
+ }
$header .= '</tr>';
return $header;
diff --git a/public/main/exercise/upload_exercise.php b/public/main/exercise/upload_exercise.php
index 6da0e89ee4..41b4328a48 100644
--- a/public/main/exercise/upload_exercise.php
+++ b/public/main/exercise/upload_exercise.php
@@ -7,16 +7,19 @@ use ChamiloSession as Session;
/**
* Upload quiz: This script shows the upload quiz feature.
*/
+$help_content = 'exercise_upload';
require_once __DIR__.'/../inc/global.inc.php';
api_protect_course_script(true);
$is_allowed_to_edit = api_is_allowed_to_edit(null, true);
+$debug = false;
$origin = api_get_origin();
if (!$is_allowed_to_edit) {
api_not_allowed(true);
}
+$this_section = SECTION_COURSES;
$htmlHeadXtra[] = ){kind=link}