Exercise: Use MailSuccess extra field BT#17786

chamilo · Oct 16, 2020 · 8d4c0da · 8d4c0da
1 parent 930314e
commit 8d4c0da
Show file tree

Hide file tree

Showing 2 changed files with 82 additions and 52 deletions.
diff --git a/main/exercise/exercise_result.php b/main/exercise/exercise_result.php
@@ -225,67 +225,84 @@
 
 $emailSettings = api_get_configuration_value('exercise_finished_email_settings');
 if (!empty($emailSettings)) {
+    $exerciseExtraFieldValue = new ExtraFieldValue('exercise');
     $attemptCountToSend = $attempt_count++;
     $subject = sprintf(get_lang('WrongAttemptXInCourseX'), $attemptCountToSend, $courseInfo['title']);
     $wrongAnswersCount = $stats['failed_answers_count'];
     if (0 === $wrongAnswersCount) {
         $subject = sprintf(get_lang('ExerciseValidationInCourseX'), $courseInfo['title']);
     }
 
-    $totalScore = ExerciseLib::show_score($total_score, $max_score, false, true);
-    $exerciseExtraFieldValue = new ExtraFieldValue('exercise');
-    $data = $exerciseExtraFieldValue->get_values_by_handler_and_field_variable($objExercise->iId, 'MailAttemptX');
-    $content = '';
-    $userInfo = api_get_user_info();
-    if ($data && isset($data['value'])) {
-        $content = sprintf($data['value'], $attemptCountToSend);
-        $content = str_replace('((exercise_error_count))', $wrongAnswersCount, $content);
-        $content = AnnouncementManager::parseContent(
-            api_get_user_id(),
-            $content,
-            api_get_course_id(),
-            api_get_session_id()
-        );
-
-        if (0 !== $wrongAnswersCount) {
-            $content .= $stats['failed_answers_html'];
-        } else {
-            $content .= 'Exercise ok!';
+    $exercisePassed = $stats['exercise_passed'];
+
+    if ($exercisePassed) {
+        $data = $exerciseExtraFieldValue->get_values_by_handler_and_field_variable($objExercise->iId, 'MailSuccess');
+
+        if ($data && isset($data['value'])) {
+            //$content = sprintf($data['value'], $attemptCountToSend);
+            $content = $data['value'];
+            $content = str_replace('((exercise_error_count))', $wrongAnswersCount, $content);
+            $content = AnnouncementManager::parseContent(
+                api_get_user_id(),
+                $content,
+                api_get_course_id(),
+                api_get_session_id()
+            );
+            MessageManager::send_message(api_get_user_id(), $subject, $content);
         }
-    }
-
-    if (isset($emailSettings['send_by_status']) && !empty($emailSettings['send_by_status'])) {
-        foreach ($emailSettings['send_by_status'] as $item) {
-            $type = $item['type'];
-            switch ($item['type']) {
-                case 'only_score':
-                    //$content = get_lang('YourScore')." $totalScore ";
-                    break;
-                case 'complete':
-                    //$content = $pageContent;
-                    break;
+    } else {
+        $totalScore = ExerciseLib::show_score($total_score, $max_score, false, true);
+        $data = $exerciseExtraFieldValue->get_values_by_handler_and_field_variable($objExercise->iId, 'MailAttemptX');
+        $content = '';
+        $userInfo = api_get_user_info();
+        if ($data && isset($data['value'])) {
+            $content = sprintf($data['value'], $attemptCountToSend);
+            $content = str_replace('((exercise_error_count))', $wrongAnswersCount, $content);
+            $content = AnnouncementManager::parseContent(
+                api_get_user_id(),
+                $content,
+                api_get_course_id(),
+                api_get_session_id()
+            );
+
+            if (0 !== $wrongAnswersCount) {
+                $content .= $stats['failed_answers_html'];
             }
+        }
 
-            switch ($item['status']) {
-                case STUDENT:
-                    MessageManager::send_message(api_get_user_id(), $subject, $content);
-                    break;
+        if (isset($emailSettings['send_by_status']) && !empty($emailSettings['send_by_status'])) {
+            foreach ($emailSettings['send_by_status'] as $item) {
+                $type = $item['type'];
+                switch ($item['type']) {
+                    case 'only_score':
+                        //$content = get_lang('YourScore')." $totalScore ";
+                        break;
+                    case 'complete':
+                        //$content = $pageContent;
+                        break;
+                }
+
+                switch ($item['status']) {
+                    case STUDENT:
+                        MessageManager::send_message(api_get_user_id(), $subject, $content);
+                        break;
+                }
             }
         }
-    }
 
-    if (isset($emailSettings['send_by_email']) && !empty($emailSettings['send_by_email'])) {
-        foreach ($emailSettings['send_by_email'] as $item) {
-            $type = $item['type'];
-            /*switch ($item['type']) {
-                case 'only_score':
-                    $content = get_lang('YourScore')." $totalScore ";
-                    break;
-                case 'complete':
-                    $content = $pageContent;
-                    break;
-            }*/
-            api_mail_html('', $item['email'], $subject, $content);
+        if (isset($emailSettings['send_by_email']) && !empty($emailSettings['send_by_email'])) {
+            foreach ($emailSettings['send_by_email'] as $item) {
+                $type = $item['type'];
+                /*switch ($item['type']) {
+                    case 'only_score':
+                        $content = get_lang('YourScore')." $totalScore ";
+                        break;
+                    case 'complete':
+                        $content = $pageContent;
+                        break;
+                }*/
+                api_mail_html('', $item['email'], $subject, $content);
+            }
         }
     }
 }

diff --git a/main/inc/lib/exercise.lib.php b/main/inc/lib/exercise.lib.php
@@ -4964,8 +4964,15 @@ public static function displayQuestionListByAttempt(
             }
         }
 
+        $passed = self::isPassPercentageAttemptPassed(
+            $objExercise,
+            $total_score,
+            $total_weight
+        );
+
         return [
             'attempts_result' => $attemptResult,
+            'exercise_passed' => $passed,
             'total_answers_count' => count($attemptResult),
             'failed_answers_count' => $failedAnswersCount,
             'failed_answers_html' => $wrongQuestionHtml,
@@ -5104,12 +5111,11 @@ public static function getQuestionDiagnosisRibbon($objExercise, $score, $weight,
         $ribbon = $displayChartDegree ? '<div class="ribbon">' : '';
 
         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 {
@@ -5141,6 +5147,13 @@ public static function getQuestionDiagnosisRibbon($objExercise, $score, $weight,
         return $ribbon;
     }
 
+    public static function isPassPercentageAttemptPassed($objExercise, $score, $weight)
+    {
+        $passPercentage = $objExercise->selectPassPercentage();
+
+        return self::isSuccessExerciseResult($score, $weight, $passPercentage);
+    }
+
     /**
      * @param float $score
      * @param float $weight