From 91f513636393dce87e88ae113a9f449da05d4b40 Mon Sep 17 00:00:00 2001
From: Simey Lameze <simey@moodle.com>
Date: Wed, 6 Oct 2021 12:37:12 +0800
Subject: [PATCH] MDL-72667 lesson: improve colour contrast of correct text

---
 mod/lesson/pagetypes/multichoice.php | 16 ++++++++--------
 mod/lesson/pagetypes/truefalse.php   | 16 ++++++++--------
 mod/lesson/report.php                |  4 ++--
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/mod/lesson/pagetypes/multichoice.php b/mod/lesson/pagetypes/multichoice.php
index 1ca091211f0..0415d705aef 100644
--- a/mod/lesson/pagetypes/multichoice.php
+++ b/mod/lesson/pagetypes/multichoice.php
@@ -343,6 +343,8 @@ class lesson_page_type_multichoice extends lesson_page {
         $formattextdefoptions->context = $answerpage->context;
 
         foreach ($answers as $answer) {
+            $answertext = format_text($answer->answer,$answer->answerformat,$formattextdefoptions);
+            $correctresponsetext = html_writer::div(get_string('correctresponse', 'lesson'), 'badge badge-success');
             if ($this->properties->qoption) {
                 if ($useranswer == null) {
                     $userresponse = array();
@@ -376,12 +378,11 @@ class lesson_page_type_multichoice extends lesson_page {
                     // unchecked
                     $checkboxelement = "<input type=\"checkbox\" readonly=\"readonly\" name=\"answer[$i]\" value=\"0\" disabled=\"disabled\" />";
                 }
+                $answercontent = html_writer::label($checkboxelement . ' ' . $answertext, null);
                 if (($answer->score > 0 && $this->lesson->custom) || ($this->lesson->jumpto_is_correct($this->properties->id, $answer->jumpto) && !$this->lesson->custom)) {
-                    $answertext = $checkboxelement . format_text($answer->answer, $answer->answerformat, $formattextdefoptions);
-                    $data = "<div class='highlight'><label>$answertext</label></div>";
+                    $data = html_writer::div($answercontent, 'text-success') . $correctresponsetext;
                 } else {
-                    $answertext = $checkboxelement . format_text($answer->answer, $answer->answerformat, $formattextdefoptions);
-                    $data = "<label>$answertext</label>";
+                    $data = $answercontent;
                 }
             } else {
                 if ($useranswer != null and $answer->id == $useranswer->answerid) {
@@ -407,12 +408,11 @@ class lesson_page_type_multichoice extends lesson_page {
                     // unchecked
                     $checkboxelement = "<input type=\"checkbox\" readonly=\"readonly\" name=\"answer[$i]\" value=\"0\" disabled=\"disabled\" />";
                 }
+                $answercontent = html_writer::label($checkboxelement . ' ' . $answertext, null);
                 if (($answer->score > 0 && $this->lesson->custom) || ($this->lesson->jumpto_is_correct($this->properties->id, $answer->jumpto) && !$this->lesson->custom)) {
-                    $answertext = $checkboxelement . format_text($answer->answer, FORMAT_MOODLE, $formattextdefoptions);
-                    $data = "<div class='highlight'><label>$answertext</label></div>";
+                    $data = html_writer::div($answercontent, 'text-success') . $correctresponsetext;
                 } else {
-                    $answertext = $checkboxelement . format_text($answer->answer, $answer->answerformat, $formattextdefoptions);
-                    $data = "<label>$answertext</label>";
+                    $data = $answercontent;
                 }
             }
             if (isset($pagestats[$this->properties->id][$answer->id])) {
diff --git a/mod/lesson/pagetypes/truefalse.php b/mod/lesson/pagetypes/truefalse.php
index 5ada146b9e5..d4ec210c117 100644
--- a/mod/lesson/pagetypes/truefalse.php
+++ b/mod/lesson/pagetypes/truefalse.php
@@ -259,6 +259,8 @@ class lesson_page_type_truefalse extends lesson_page {
 
         foreach ($answers as $answer) {
             $answer = parent::rewrite_answers_urls($answer);
+            $answertext = format_text($answer->answer, $answer->answerformat, $formattextdefoptions);
+            $correctresponsetext = html_writer::div(get_string('correctresponse', 'lesson'), 'badge badge-success');
             if ($this->properties->qoption) {
                 if ($useranswer == null) {
                     $userresponse = array();
@@ -292,12 +294,11 @@ class lesson_page_type_truefalse extends lesson_page {
                     // unchecked
                     $checkboxelement = "<input type=\"checkbox\" readonly=\"readonly\" name=\"answer[$i]\" value=\"0\" disabled=\"disabled\" />";
                 }
+                $answercontent = html_writer::label($checkboxelement . ' ' . $answertext, null);
                 if (($answer->score > 0 && $this->lesson->custom) || ($this->lesson->jumpto_is_correct($this->properties->id, $answer->jumpto) && !$this->lesson->custom)) {
-                    $answertext = $checkboxelement . format_text($answer->answer, $answer->answerformat, $formattextdefoptions);
-                    $data = "<div class='highlight'><label>$answertext</label></div>";
+                    $data = html_writer::div($answercontent, 'text-success') . $correctresponsetext;
                 } else {
-                    $answertext = $checkboxelement . format_text($answer->answer, $answer->answerformat, $formattextdefoptions);
-                    $data = "<label>$answertext</label>";
+                    $data = $answercontent;
                 }
             } else {
                 if ($useranswer != null and $answer->id == $useranswer->answerid) {
@@ -323,12 +324,11 @@ class lesson_page_type_truefalse extends lesson_page {
                     // unchecked
                     $checkboxelement = "<input type=\"checkbox\" readonly=\"readonly\" name=\"answer[$i]\" value=\"0\" disabled=\"disabled\" />";
                 }
+                $answercontent = html_writer::label($checkboxelement . ' ' . $answertext, null);
                 if (($answer->score > 0 && $this->lesson->custom) || ($this->lesson->jumpto_is_correct($this->properties->id, $answer->jumpto) && !$this->lesson->custom)) {
-                    $answertext = $checkboxelement . format_text($answer->answer, $answer->answerformat, $formattextdefoptions);
-                    $data = "<div class='highlight'><label>$answertext</label></div>";
+                    $data = html_writer::div($answercontent, 'text-success') . $correctresponsetext;
                 } else {
-                    $answertext = $checkboxelement . format_text($answer->answer, $answer->answerformat, $formattextdefoptions);
-                    $data = "<label>$answertext</label>";
+                    $data = $answercontent;
                 }
             }
             if (isset($pagestats[$this->properties->id][$answer->id])) {
diff --git a/mod/lesson/report.php b/mod/lesson/report.php
index 2149668a2d0..28d942202a0 100644
--- a/mod/lesson/report.php
+++ b/mod/lesson/report.php
@@ -291,7 +291,7 @@ if ($action === 'delete') {
 
         $table->head = array();
         $table->align = array('right', 'left');
-        $table->attributes['class'] = 'generaltable';
+        $table->attributes['class'] = 'table table-striped';
 
         if (empty($userstats->gradeinfo)) {
             $table->align = array("center");
@@ -317,7 +317,7 @@ if ($action === 'delete') {
     foreach ($answerpages as $page) {
         $table->align = array('left', 'left');
         $table->size = array('70%', null);
-        $table->attributes['class'] = 'generaltable';
+        $table->attributes['class'] = 'table table-striped';
         unset($table->data);
         if ($page->grayout) { // set the color of text
             $fontstart = html_writer::start_tag('span', array('class' => 'dimmed_text'));