From 4a9f1dd66a04541eedb550987d99401fe04c6b70 Mon Sep 17 00:00:00 2001
From: Geoffrey Wu <geoffreywu1000@gmail.com>
Date: Sun, 13 Oct 2024 20:04:21 -0400
Subject: [PATCH] fix singleplayer stats recording

---
 client/singleplayer/tossups/index.jsx    | 2 +-
 client/singleplayer/tossups/index.min.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/singleplayer/tossups/index.jsx b/client/singleplayer/tossups/index.jsx
index aa965308..1a293faf 100644
--- a/client/singleplayer/tossups/index.jsx
+++ b/client/singleplayer/tossups/index.jsx
@@ -143,7 +143,7 @@ async function next ({ packetLength, oldTossup, tossup: nextTossup, type }) {
   document.getElementById('question-number-info').textContent = nextTossup.number;
   document.getElementById('set-name-info').textContent = nextTossup.set.name;
 
-  if (type === 'next' && await account.getUsername() && document.getElementById('answer').innerHTML) {
+  if (type === 'next' && await account.getUsername()) {
     const pointValue = room.previous.isCorrect ? (room.previous.inPower ? room.previous.powerValue : 10) : (room.previous.endOfQuestion ? 0 : room.previous.negValue);
     questionStats.recordTossup(room.previous.tossup, room.previous.isCorrect, pointValue, room.previous.celerity, false);
   }
diff --git a/client/singleplayer/tossups/index.min.js b/client/singleplayer/tossups/index.min.js
index 4f8f001f..59b3b745 100644
--- a/client/singleplayer/tossups/index.min.js
+++ b/client/singleplayer/tossups/index.min.js
@@ -1,5 +1,5 @@
 import account from"../../scripts/accounts.js";import api from"../../scripts/api/index.js";import questionStats from"../../scripts/auth/question-stats.js";import audio from"../../audio/index.js";// import Player from '../../../quizbowl/Player.js';
-import Player from"../../../quizbowl/Player.js";import ClientTossupRoom from"../ClientTossupRoom.js";import CategoryManager from"../../../quizbowl/category-manager.js";import{arrayToRange,createTossupCard,rangeToArray}from"../../scripts/utilities/index.js";import{getDropdownValues}from"../../scripts/utilities/dropdown-checklist.js";import CategoryModal from"../../scripts/components/CategoryModal.min.js";import DifficultyDropdown from"../../scripts/components/DifficultyDropdown.min.js";let maxPacketNumber=24;const categoryManager=new CategoryManager,queryVersion="2024-10-11",settingsVersion="2024-10-11",USER_ID="user",room=new ClientTossupRoom;room.players[USER_ID]=new Player(USER_ID);const socket={send:onmessage,sendToServer:a=>room.message(USER_ID,a)};room.sockets[USER_ID]=socket;function onmessage(a){const b=JSON.parse(a);switch(b.type){case"buzz":return buzz(b);case"clear-stats":return clearStats(b);case"end-of-set":return endOfSet(b);case"give-answer":return giveAnswer(b);case"next":return next(b);case"no-questions-found":return noQuestionsFound(b);case"pause":return pause(b);case"reveal-answer":return revealAnswer(b);case"set-categories":return setCategories(b);case"set-difficulties":return setDifficulties(b);case"set-reading-speed":return setReadingSpeed(b);case"set-packet-numbers":return setPacketNumbers(b);case"set-set-name":return setSetName(b);case"set-year-range":return setYearRange(b);case"skip":return next(b);case"start":return next(b);case"timer-update":return updateTimerDisplay(b.timeRemaining);case"toggle-correct":return toggleCorrect(b);case"toggle-powermark-only":return togglePowermarkOnly(b);case"toggle-rebuzz":return toggleRebuzz(b);case"toggle-select-by-set-name":return toggleSelectBySetName(b);case"toggle-show-history":return toggleShowHistory(b);case"toggle-standard-only":return toggleStandardOnly(b);case"toggle-timer":return toggleTimer(b);case"toggle-type-to-answer":return toggleTypeToAnswer(b);case"update-question":return updateQuestion(b)}}function buzz({timer:a,userId:b,username:c}){audio.soundEffects&&audio.buzz.play();const d=document.getElementById("type-to-answer").checked;d&&(document.getElementById("answer-input-group").classList.remove("d-none"),document.getElementById("answer-input").focus(),document.getElementById("buzz").disabled=!0)}function clearStats({userId:a}){updateStatDisplay(room.players[a])}function endOfSet(){window.alert("No more questions left"),document.getElementById("buzz").disabled=!0,document.getElementById("pause").disabled=!0,document.getElementById("next").disabled=!0}async function giveAnswer({directive:a,directedPrompt:b,perQuestionCelerity:c,score:d,tossup:e,userId:f}){return"prompt"===a?(document.getElementById("answer-input-group").classList.remove("d-none"),document.getElementById("answer-input").focus(),void(document.getElementById("answer-input").placeholder=b?`Prompt: "${b}"`:"Prompt")):void(document.getElementById("answer-input").value="",document.getElementById("answer-input").blur(),document.getElementById("answer-input").placeholder="Enter answer",document.getElementById("answer-input-group").classList.add("d-none"),document.getElementById("next").disabled=!1,document.getElementById("pause").disabled=!1,room.settings.rebuzz&&(document.getElementById("buzz").disabled=!1,document.getElementById("buzz").textContent="Buzz"),updateStatDisplay(room.players[USER_ID]),audio.soundEffects&&f===USER_ID&&("accept"===a&&10<d?audio.power.play():"accept"===a&&10===d?audio.correct.play():"reject"===a&&audio.incorrect.play()))}async function next({packetLength:a,oldTossup:b,tossup:c,type:d}){if("start"===d&&(document.getElementById("next").disabled=!1,document.getElementById("next").textContent="Skip",document.getElementById("settings").classList.add("d-none")),("next"===d||"skip"===d)&&createTossupCard(b),document.getElementById("answer").textContent="",document.getElementById("question").textContent="",document.getElementById("toggle-correct").textContent="I was wrong",document.getElementById("toggle-correct").classList.add("d-none"),document.getElementById("buzz").textContent="Buzz",document.getElementById("buzz").disabled=!1,document.getElementById("next").textContent="Skip",document.getElementById("packet-number-info").textContent=c.packet.number,document.getElementById("packet-length-info").textContent=room.query.selectBySetName?a:"-",document.getElementById("pause").textContent="Pause",document.getElementById("pause").disabled=!1,document.getElementById("question-number-info").textContent=c.number,document.getElementById("set-name-info").textContent=c.set.name,"next"===d&&(await account.getUsername())&&document.getElementById("answer").innerHTML){const a=room.previous.isCorrect?room.previous.inPower?room.previous.powerValue:10:room.previous.endOfQuestion?0:room.previous.negValue;questionStats.recordTossup(room.previous.tossup,room.previous.isCorrect,a,room.previous.celerity,!1)}}function noQuestionsFound(){window.alert("No questions found")}function pause({paused:a}){document.getElementById("buzz").disabled=a,document.getElementById("pause").textContent=a?"Resume":"Pause"}function revealAnswer({answer:a,question:b}){document.getElementById("question").innerHTML=b,document.getElementById("answer").innerHTML="ANSWER: "+a,document.getElementById("pause").disabled=!0,document.getElementById("buzz").disabled=!0,document.getElementById("buzz").textContent="Buzz",document.getElementById("next").disabled=!1,document.getElementById("next").textContent="Next",document.getElementById("start").disabled=!1,document.getElementById("toggle-correct").classList.remove("d-none"),document.getElementById("toggle-correct").textContent=room.previous.isCorrect?"I was wrong":"I was right"}function setCategories({alternateSubcategories:a,categories:b,subcategories:c}){categoryManager.import(b,c,a),categoryManager.loadCategoryModal(),window.localStorage.setItem("singleplayer-tossup-query",JSON.stringify({...room.query,version:queryVersion}))}function setDifficulties({difficulties:a}){window.localStorage.setItem("singleplayer-tossup-query",JSON.stringify({...room.query,version:queryVersion}))}function setPacketNumbers({packetNumbers:a}){document.getElementById("packet-number").value=arrayToRange(a),window.localStorage.setItem("singleplayer-tossup-query",JSON.stringify({...room.query,version:queryVersion}))}function setReadingSpeed({readingSpeed:a}){document.getElementById("reading-speed").value=a,document.getElementById("reading-speed-display").textContent=a,window.localStorage.setItem("singleplayer-tossup-settings",JSON.stringify({...room.settings,version:settingsVersion}))}async function setSetName({setName:a}){document.getElementById("set-name").value=a;// make border red if set name is not in set list
+import Player from"../../../quizbowl/Player.js";import ClientTossupRoom from"../ClientTossupRoom.js";import CategoryManager from"../../../quizbowl/category-manager.js";import{arrayToRange,createTossupCard,rangeToArray}from"../../scripts/utilities/index.js";import{getDropdownValues}from"../../scripts/utilities/dropdown-checklist.js";import CategoryModal from"../../scripts/components/CategoryModal.min.js";import DifficultyDropdown from"../../scripts/components/DifficultyDropdown.min.js";let maxPacketNumber=24;const categoryManager=new CategoryManager,queryVersion="2024-10-11",settingsVersion="2024-10-11",USER_ID="user",room=new ClientTossupRoom;room.players[USER_ID]=new Player(USER_ID);const socket={send:onmessage,sendToServer:a=>room.message(USER_ID,a)};room.sockets[USER_ID]=socket;function onmessage(a){const b=JSON.parse(a);switch(b.type){case"buzz":return buzz(b);case"clear-stats":return clearStats(b);case"end-of-set":return endOfSet(b);case"give-answer":return giveAnswer(b);case"next":return next(b);case"no-questions-found":return noQuestionsFound(b);case"pause":return pause(b);case"reveal-answer":return revealAnswer(b);case"set-categories":return setCategories(b);case"set-difficulties":return setDifficulties(b);case"set-reading-speed":return setReadingSpeed(b);case"set-packet-numbers":return setPacketNumbers(b);case"set-set-name":return setSetName(b);case"set-year-range":return setYearRange(b);case"skip":return next(b);case"start":return next(b);case"timer-update":return updateTimerDisplay(b.timeRemaining);case"toggle-correct":return toggleCorrect(b);case"toggle-powermark-only":return togglePowermarkOnly(b);case"toggle-rebuzz":return toggleRebuzz(b);case"toggle-select-by-set-name":return toggleSelectBySetName(b);case"toggle-show-history":return toggleShowHistory(b);case"toggle-standard-only":return toggleStandardOnly(b);case"toggle-timer":return toggleTimer(b);case"toggle-type-to-answer":return toggleTypeToAnswer(b);case"update-question":return updateQuestion(b)}}function buzz({timer:a,userId:b,username:c}){audio.soundEffects&&audio.buzz.play();const d=document.getElementById("type-to-answer").checked;d&&(document.getElementById("answer-input-group").classList.remove("d-none"),document.getElementById("answer-input").focus(),document.getElementById("buzz").disabled=!0)}function clearStats({userId:a}){updateStatDisplay(room.players[a])}function endOfSet(){window.alert("No more questions left"),document.getElementById("buzz").disabled=!0,document.getElementById("pause").disabled=!0,document.getElementById("next").disabled=!0}async function giveAnswer({directive:a,directedPrompt:b,perQuestionCelerity:c,score:d,tossup:e,userId:f}){return"prompt"===a?(document.getElementById("answer-input-group").classList.remove("d-none"),document.getElementById("answer-input").focus(),void(document.getElementById("answer-input").placeholder=b?`Prompt: "${b}"`:"Prompt")):void(document.getElementById("answer-input").value="",document.getElementById("answer-input").blur(),document.getElementById("answer-input").placeholder="Enter answer",document.getElementById("answer-input-group").classList.add("d-none"),document.getElementById("next").disabled=!1,document.getElementById("pause").disabled=!1,room.settings.rebuzz&&(document.getElementById("buzz").disabled=!1,document.getElementById("buzz").textContent="Buzz"),updateStatDisplay(room.players[USER_ID]),audio.soundEffects&&f===USER_ID&&("accept"===a&&10<d?audio.power.play():"accept"===a&&10===d?audio.correct.play():"reject"===a&&audio.incorrect.play()))}async function next({packetLength:a,oldTossup:b,tossup:c,type:d}){if("start"===d&&(document.getElementById("next").disabled=!1,document.getElementById("next").textContent="Skip",document.getElementById("settings").classList.add("d-none")),("next"===d||"skip"===d)&&createTossupCard(b),document.getElementById("answer").textContent="",document.getElementById("question").textContent="",document.getElementById("toggle-correct").textContent="I was wrong",document.getElementById("toggle-correct").classList.add("d-none"),document.getElementById("buzz").textContent="Buzz",document.getElementById("buzz").disabled=!1,document.getElementById("next").textContent="Skip",document.getElementById("packet-number-info").textContent=c.packet.number,document.getElementById("packet-length-info").textContent=room.query.selectBySetName?a:"-",document.getElementById("pause").textContent="Pause",document.getElementById("pause").disabled=!1,document.getElementById("question-number-info").textContent=c.number,document.getElementById("set-name-info").textContent=c.set.name,"next"===d&&(await account.getUsername())){const a=room.previous.isCorrect?room.previous.inPower?room.previous.powerValue:10:room.previous.endOfQuestion?0:room.previous.negValue;questionStats.recordTossup(room.previous.tossup,room.previous.isCorrect,a,room.previous.celerity,!1)}}function noQuestionsFound(){window.alert("No questions found")}function pause({paused:a}){document.getElementById("buzz").disabled=a,document.getElementById("pause").textContent=a?"Resume":"Pause"}function revealAnswer({answer:a,question:b}){document.getElementById("question").innerHTML=b,document.getElementById("answer").innerHTML="ANSWER: "+a,document.getElementById("pause").disabled=!0,document.getElementById("buzz").disabled=!0,document.getElementById("buzz").textContent="Buzz",document.getElementById("next").disabled=!1,document.getElementById("next").textContent="Next",document.getElementById("start").disabled=!1,document.getElementById("toggle-correct").classList.remove("d-none"),document.getElementById("toggle-correct").textContent=room.previous.isCorrect?"I was wrong":"I was right"}function setCategories({alternateSubcategories:a,categories:b,subcategories:c}){categoryManager.import(b,c,a),categoryManager.loadCategoryModal(),window.localStorage.setItem("singleplayer-tossup-query",JSON.stringify({...room.query,version:queryVersion}))}function setDifficulties({difficulties:a}){window.localStorage.setItem("singleplayer-tossup-query",JSON.stringify({...room.query,version:queryVersion}))}function setPacketNumbers({packetNumbers:a}){document.getElementById("packet-number").value=arrayToRange(a),window.localStorage.setItem("singleplayer-tossup-query",JSON.stringify({...room.query,version:queryVersion}))}function setReadingSpeed({readingSpeed:a}){document.getElementById("reading-speed").value=a,document.getElementById("reading-speed-display").textContent=a,window.localStorage.setItem("singleplayer-tossup-settings",JSON.stringify({...room.settings,version:settingsVersion}))}async function setSetName({setName:a}){document.getElementById("set-name").value=a;// make border red if set name is not in set list
 const b=!a||api.getSetList().includes(a);document.getElementById("set-name").classList.toggle("is-invalid",!b),maxPacketNumber=b?await api.getNumPackets(a):0,document.getElementById("packet-number").placeholder="Packet Numbers"+(maxPacketNumber?` (1-${maxPacketNumber})`:""),window.localStorage.setItem("singleplayer-tossup-query",JSON.stringify({...room.query,version:queryVersion}))}function setYearRange({minYear:a,maxYear:b}){$("#slider").slider("values",[a,b]),document.getElementById("year-range-a").textContent=a,document.getElementById("year-range-b").textContent=b,window.localStorage.setItem("singleplayer-tossup-query",JSON.stringify({...room.query,version:queryVersion}))}function toggleCorrect({correct:a,userId:b}){updateStatDisplay(room.players[USER_ID]),document.getElementById("toggle-correct").textContent=a?"I was wrong":"I was right"}function togglePowermarkOnly({powermarkOnly:a}){document.getElementById("toggle-powermark-only").checked=a,window.localStorage.setItem("singleplayer-tossup-query",JSON.stringify({...room.query,version:queryVersion}))}function toggleRebuzz({rebuzz:a}){document.getElementById("toggle-rebuzz").checked=a,window.localStorage.setItem("singleplayer-tossup-settings",JSON.stringify({...room.settings,version:settingsVersion}))}function toggleSelectBySetName({selectBySetName:a}){document.getElementById("difficulty-settings").classList.toggle("d-none",a),document.getElementById("toggle-powermark-only").disabled=a,document.getElementById("toggle-select-by-set-name").checked=a,document.getElementById("toggle-standard-only").disabled=a,document.getElementById("set-settings").classList.toggle("d-none",!a),window.localStorage.setItem("singleplayer-tossup-query",JSON.stringify({...room.query,version:queryVersion}))}function toggleShowHistory({showHistory:a}){document.getElementById("room-history").classList.toggle("d-none",!a),document.getElementById("toggle-show-history").checked=a,window.localStorage.setItem("singleplayer-tossup-settings",JSON.stringify({...room.settings,version:settingsVersion}))}function toggleStandardOnly({standardOnly:a}){document.getElementById("toggle-standard-only").checked=a}function toggleTimer({timer:a}){document.getElementById("timer").classList.toggle("d-none",!a),document.getElementById("toggle-timer").checked=a,window.localStorage.setItem("singleplayer-tossup-settings",JSON.stringify({...room.settings,version:settingsVersion}))}function toggleTypeToAnswer({typeToAnswer:a}){document.getElementById("type-to-answer").checked=a,window.localStorage.setItem("singleplayer-tossup-settings",JSON.stringify({...room.settings,version:settingsVersion}))}function updateQuestion({word:a}){"(*)"===a||(document.getElementById("question").innerHTML+=a+" ")}/**
  * Updates the displayed stat line.
  */function updateStatDisplay({powers:a,tens:b,negs:c,tuh:d,points:e,celerity:f}){const g=f.correct.average.toFixed(3),h=1===d?"":"s";// disable clear stats button if no stats