From e26d469543fd548c3926c6fd1b4f860223cac494 Mon Sep 17 00:00:00 2001
From: Paul <22284856+ProgramComputer@users.noreply.github.com>
Date: Sun, 7 Jan 2024 06:07:51 -0600
Subject: [PATCH 1/4] Utterance checkbox not saved (#185)

Adds a new local storage element "utterance-allowed".
---
 do_test_test.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/do_test_test.php b/do_test_test.php
index be2661da..b907075c 100644
--- a/do_test_test.php
+++ b/do_test_test.php
@@ -485,6 +485,15 @@ function do_test_prepare_ajax_test_area($selector, $selection, $count, $testtype
 
     ?>
     <script type="text/javascript">
+                window.onload = (event) => {
+            var utterancecheckbox = document.getElementById('utterance-allowed')
+
+            var utterancechecked = JSON.parse(localStorage.getItem('utterance-allowed'));
+            utterancecheckbox.checked = utterancechecked;
+            utterancecheckbox.addEventListener('change', function () {
+                localStorage.setItem('utterance-allowed', utterancecheckbox.checked);
+            });
+        };
         /**
          * Get a new word test.
          */

From f477aad8f5c3c2fc7dff2dfba317b091e20f3044 Mon Sep 17 00:00:00 2001
From: HugoFara <hugo.farajallah@protonmail.com>
Date: Sun, 7 Jan 2024 13:17:50 +0100
Subject: [PATCH 2/4] Updating JS from #185.

---
 do_test_test.php  | 36 +++++++++++++++++++-----------------
 docs/CHANGELOG.md |  1 +
 docs/info.html    |  1 +
 3 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/do_test_test.php b/do_test_test.php
index b907075c..c743c952 100644
--- a/do_test_test.php
+++ b/do_test_test.php
@@ -485,15 +485,16 @@ function do_test_prepare_ajax_test_area($selector, $selection, $count, $testtype
 
     ?>
     <script type="text/javascript">
-                window.onload = (event) => {
-            var utterancecheckbox = document.getElementById('utterance-allowed')
+        function saveUtteranceSetting () {
+            const utterancechecked = JSON.parse(localStorage.getItem('review-utterance-allowed'));
+            const utterancecheckbox = document.getElementById('utterance-allowed');
 
-            var utterancechecked = JSON.parse(localStorage.getItem('utterance-allowed'));
             utterancecheckbox.checked = utterancechecked;
             utterancecheckbox.addEventListener('change', function () {
-                localStorage.setItem('utterance-allowed', utterancecheckbox.checked);
+                localStorage.setItem('review-utterance-allowed', utterancecheckbox.checked);
             });
-        };
+        }
+
         /**
          * Get a new word test.
          */
@@ -516,6 +517,7 @@ function get_new_word()
         }
 
         $(get_new_word);
+        $(saveUtteranceSetting);
     </script>
 
     <p id="term-test" dir="<?php echo($lang['rtlScript'] ? 'rtl' : 'ltr'); ?>" 
@@ -846,21 +848,21 @@ function do_test_footer($notyettested, $wrong, $correct)
         title="Correct" alt="Correct" height="10" width="<?php echo $l_correct; ?>" />
     </span>
     <span style="margin-left: 15px; margin-right: 15px;">
-        <span title="Total number of tests" id="total_tests"><?php 
-        echo $totaltests; 
-        ?></span> 
+        <span title="Total number of tests" id="total_tests">
+            <?php echo $totaltests; ?>
+        </span> 
         =
-        <span class="todosty" title="Not yet tested" id="not-tested"><?php 
-        echo $notyettested; 
-        ?></span>
+        <span class="todosty" title="Not yet tested" id="not-tested">
+            <?php echo $notyettested; ?>
+        </span>
         +
-        <span class="donewrongsty" title="Wrong" id="wrong-tests"><?php 
-        echo $wrong; 
-        ?></span>
+        <span class="donewrongsty" title="Wrong" id="wrong-tests">
+            <?php echo $wrong; ?>
+        </span>
         +
-        <span class="doneoksty" title="Correct" id="correct-tests"><?php 
-        echo $correct; 
-        ?></span>
+        <span class="doneoksty" title="Correct" id="correct-tests">
+            <?php echo $correct; ?>
+        </span>
     </span>
 </footer>
     <?php
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index fe063772..8a1684fc 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -37,6 +37,7 @@ settings ([#119](https://github.com/HugoFara/lwt/issues/119)).
 [#169](https://github.com/HugoFara/lwt/pull/169), closing discussion 
 [#141](https://github.com/HugoFara/lwt/discussions/141). 
 Many thanks to [@ProgramComputer](https://github.com/ProgramComputer)!
+* On word review, the "Read words aloud" setting is now saved, PR [#185](https://github.com/HugoFara/lwt/pull/185).
 
 ### Changed
 
diff --git a/docs/info.html b/docs/info.html
index addffc46..ab7d84a3 100644
--- a/docs/info.html
+++ b/docs/info.html
@@ -2269,6 +2269,7 @@ <h4>Added</h4>
 <a href="https://github.com/HugoFara/lwt/pull/169">#169</a>, closing discussion
 <a href="https://github.com/HugoFara/lwt/discussions/141">#141</a>.
 Many thanks to <a href="https://github.com/ProgramComputer">@ProgramComputer</a>!</li>
+<li>On word review, the "Read words aloud" setting is now saved, PR <a href="https://github.com/HugoFara/lwt/pull/185">#185</a>.</li>
 </ul>
 <h4>Changed</h4>
 <ul>

From 7454d82b931cfd4332b9dfab5f511975054a987c Mon Sep 17 00:00:00 2001
From: HugoFara <hugo.farajallah@protonmail.com>
Date: Sun, 7 Jan 2024 13:26:27 +0100
Subject: [PATCH 3/4] Moves utterance setting JS to do_test_header.php.

---
 do_test_header.php | 19 +++++++++++++++++++
 do_test_test.php   | 11 -----------
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/do_test_header.php b/do_test_header.php
index 91ea8fb2..5a2c1943 100644
--- a/do_test_header.php
+++ b/do_test_header.php
@@ -186,6 +186,23 @@ function do_test_header_js()
 {
     ?>
 <script type="text/javascript">
+    
+    function setUtteranceSetting () {
+        const utterancechecked = JSON.parse(
+            localStorage.getItem('review-utterance-allowed')
+        );
+        const utterancecheckbox = document.getElementById('utterance-allowed');
+
+        utterancecheckbox.checked = utterancechecked;
+        utterancecheckbox.addEventListener('change', function () {
+            localStorage.setItem(
+                'review-utterance-allowed', 
+                utterancecheckbox.checked
+            );
+        });
+    }
+
+
     /**
      * Reset frames location
      */
@@ -209,6 +226,8 @@ function startTestTable(property) {
         resetFrames();
         window.location.href = 'do_test.php?type=table&' + property;
     }
+
+    $(setUtteranceSetting)
     </script>
     <?php
 }
diff --git a/do_test_test.php b/do_test_test.php
index c743c952..55d11a14 100644
--- a/do_test_test.php
+++ b/do_test_test.php
@@ -485,16 +485,6 @@ function do_test_prepare_ajax_test_area($selector, $selection, $count, $testtype
 
     ?>
     <script type="text/javascript">
-        function saveUtteranceSetting () {
-            const utterancechecked = JSON.parse(localStorage.getItem('review-utterance-allowed'));
-            const utterancecheckbox = document.getElementById('utterance-allowed');
-
-            utterancecheckbox.checked = utterancechecked;
-            utterancecheckbox.addEventListener('change', function () {
-                localStorage.setItem('review-utterance-allowed', utterancecheckbox.checked);
-            });
-        }
-
         /**
          * Get a new word test.
          */
@@ -517,7 +507,6 @@ function get_new_word()
         }
 
         $(get_new_word);
-        $(saveUtteranceSetting);
     </script>
 
     <p id="term-test" dir="<?php echo($lang['rtlScript'] ? 'rtl' : 'ltr'); ?>" 

From fde758d8d5b7cb63e0c96d533f4f59fe5cc6dfd8 Mon Sep 17 00:00:00 2001
From: HugoFara <hugo.farajallah@protonmail.com>
Date: Sun, 7 Jan 2024 13:33:22 +0100
Subject: [PATCH 4/4] Adds the option to click "Read words aloud" to toggle the
 checkbox.

---
 do_test_header.php | 63 +++++++++++++++++++++++-----------------------
 docs/CHANGELOG.md  |  4 ++-
 docs/info.html     |  7 +++++-
 3 files changed, 41 insertions(+), 33 deletions(-)

diff --git a/do_test_header.php b/do_test_header.php
index 5a2c1943..93deb645 100644
--- a/do_test_header.php
+++ b/do_test_header.php
@@ -52,10 +52,10 @@ function get_sql_test_data(&$title, &$p)
         echo error_message_with_hide($message, true);
         return '';
     }
-    $title .= ' in ' . get_first_value(
-        'SELECT LgName AS value 
-        FROM ' . $tbpref . 'languages, ' . $testsql . ' AND LgID = WoLgID 
-        LIMIT 1'
+    $title .= ' IN ' . get_first_value(
+        "SELECT LgName AS value
+        FROM {$tbpref}languages, {$testsql} AND LgID = WoLgID
+        LIMIT 1"
     );
     return $testsql;
 }
@@ -102,7 +102,7 @@ function get_text_test_data(&$title, &$p): string
     );
     saveSetting('currenttext', $_REQUEST['text']);
     $testsql =
-    ' ' . $tbpref . 'words, ' . $tbpref . 'textitems2 
+    ' ' . $tbpref . 'words, ' . $tbpref . 'textitems2
     WHERE Ti2LgID = WoLgID AND Ti2WoID = WoID AND Ti2TxID = ' . $textid . ' ';
     return $testsql;
 }
@@ -117,13 +117,13 @@ function get_text_test_data(&$title, &$p): string
 function get_test_counts($testsql)
 {
     $totalcountdue = get_first_value(
-        "SELECT count(distinct WoID) AS value 
-        FROM " . $testsql . " AND WoStatus BETWEEN 1 AND 5 
+        "SELECT count(distinct WoID) AS value
+        FROM " . $testsql . " AND WoStatus BETWEEN 1 AND 5
         AND WoTranslation != '' AND WoTranslation != '*' AND WoTodayScore < 0"
     );
     $totalcount = get_first_value(
-        "SELECT count(distinct WoID) AS value 
-        FROM " . $testsql . " AND WoStatus BETWEEN 1 AND 5 AND WoTranslation != '' 
+        "SELECT count(distinct WoID) AS value
+        FROM " . $testsql . " AND WoStatus BETWEEN 1 AND 5 AND WoTranslation != ''
         AND WoTranslation != '*'"
     );
     return array($totalcountdue, $totalcount);
@@ -186,7 +186,7 @@ function do_test_header_js()
 {
     ?>
 <script type="text/javascript">
-    
+
     function setUtteranceSetting () {
         const utterancechecked = JSON.parse(
             localStorage.getItem('review-utterance-allowed')
@@ -196,7 +196,7 @@ function setUtteranceSetting () {
         utterancecheckbox.checked = utterancechecked;
         utterancecheckbox.addEventListener('change', function () {
             localStorage.setItem(
-                'review-utterance-allowed', 
+                'review-utterance-allowed',
                 utterancecheckbox.checked
             );
         });
@@ -208,19 +208,19 @@ function setUtteranceSetting () {
      */
     function resetFrames() {
         parent.frames['ro'].location.href = 'empty.html';
-        parent.frames['ru'].location.href = 'empty.html'; 
+        parent.frames['ru'].location.href = 'empty.html';
     }
 
-    /** 
-     * Prepare frames for testing words 
+    /**
+     * Prepare frames for testing words
      */
     function startWordTest(type, property) {
         resetFrames();
         window.location.href = 'do_test.php?type=' + type + '&' + property;
     }
 
-    /** 
-     * Prepare frames for test table. 
+    /**
+     * Prepare frames for test table.
      */
     function startTestTable(property) {
         resetFrames();
@@ -248,33 +248,34 @@ function do_test_header_content($title, $p, $totalcountdue, $totalcount, $langua
     ?>
 <h1>TEST ▶ <?php echo tohtml($title) ?></h1>
 <div style="margin: 5px;">
-    Word<?php echo intval($totalcount) > 1 ? 's' : ''; ?> due today: 
-    <?php echo htmlspecialchars($totalcount); ?>, 
+    Word<?php echo intval($totalcount) > 1 ? 's' : ''; ?> due today:
+    <?php echo htmlspecialchars($totalcount); ?>,
     <span class="todosty" id="not-tested-header"><?php
     echo htmlspecialchars($totalcountdue);
     ?></span> remaining.
 </div>
 <div class="flex-spaced">
     <div>
-        <input type="button" value="..[<?php echo $language; ?>].." 
+        <input type="button" value="..[<?php echo $language; ?>].."
         onclick="startWordTest(1, '<?php echo $p; ?>')" />
-        <input type="button" value="..[L1].." 
+        <input type="button" value="..[L1].."
         onclick="startWordTest(2, '<?php echo $p; ?>')" />
-        <input type="button" value="..[••].." 
-        onclick="startWordTest(3, '<?php echo $p; ?>')" /> 
+        <input type="button" value="..[••].."
+        onclick="startWordTest(3, '<?php echo $p; ?>')" />
     </div>
-    <div> 
-        <input type="button" value="[<?php echo $language; ?>]" 
+    <div>
+        <input type="button" value="[<?php echo $language; ?>]"
         onclick="startWordTest(4, '<?php echo $p; ?>')" />
-        <input type="button" value="[L1]" 
-        onclick="startWordTest(5, '<?php echo $p; ?>')" /> 
+        <input type="button" value="[L1]"
+        onclick="startWordTest(5, '<?php echo $p; ?>')" />
     </div>
-    <div> 
-        <input type="button" value="Table" 
-        onclick="startTestTable('<?php echo $p; ?>')" /> 
+    <div>
+        <input type="button" value="Table"
+        onclick="startTestTable('<?php echo $p; ?>')" />
     </div>
-    <div> 
-        <input type="checkbox" id="utterance-allowed">Read words aloud</input>
+    <div>
+        <input type="checkbox" id="utterance-allowed" />
+        <label for="utterance-allowed">Read words aloud</label>
     </div>
 </div>
     <?php
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 8a1684fc..13daadd9 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -37,7 +37,9 @@ settings ([#119](https://github.com/HugoFara/lwt/issues/119)).
 [#169](https://github.com/HugoFara/lwt/pull/169), closing discussion 
 [#141](https://github.com/HugoFara/lwt/discussions/141). 
 Many thanks to [@ProgramComputer](https://github.com/ProgramComputer)!
-* On word review, the "Read words aloud" setting is now saved, PR [#185](https://github.com/HugoFara/lwt/pull/185).
+* On word review: 
+  * The "Read words aloud" setting is now saved, PR [#185](https://github.com/HugoFara/lwt/pull/185).
+  * UX change: You can click on "Read words aloud" text to check the checkbox.
 
 ### Changed
 
diff --git a/docs/info.html b/docs/info.html
index ab7d84a3..3c7909cb 100644
--- a/docs/info.html
+++ b/docs/info.html
@@ -2269,7 +2269,12 @@ <h4>Added</h4>
 <a href="https://github.com/HugoFara/lwt/pull/169">#169</a>, closing discussion
 <a href="https://github.com/HugoFara/lwt/discussions/141">#141</a>.
 Many thanks to <a href="https://github.com/ProgramComputer">@ProgramComputer</a>!</li>
-<li>On word review, the "Read words aloud" setting is now saved, PR <a href="https://github.com/HugoFara/lwt/pull/185">#185</a>.</li>
+<li>On word review:
+<ul>
+<li>The "Read words aloud" setting is now saved, PR <a href="https://github.com/HugoFara/lwt/pull/185">#185</a>.</li>
+<li>UX change: You can click on "Read words aloud" text to check the checkbox.</li>
+</ul>
+</li>
 </ul>
 <h4>Changed</h4>
 <ul>