diff --git a/qt/aqt/reviewer.py b/qt/aqt/reviewer.py index fd13584f4..b3232a9cf 100644 --- a/qt/aqt/reviewer.py +++ b/qt/aqt/reviewer.py @@ -10,7 +10,7 @@ from collections.abc import Callable, Generator, Sequence from dataclasses import dataclass from enum import Enum, auto from functools import partial -from typing import Any, Literal, Match, Union, cast +from typing import Any, Literal, Match, cast import aqt import aqt.browser diff --git a/ts/routes/reviewer-bottom/+page.svelte b/ts/routes/reviewer-bottom/+page.svelte index 2b801cf3a..566b287e6 100644 --- a/ts/routes/reviewer-bottom/+page.svelte +++ b/ts/routes/reviewer-bottom/+page.svelte @@ -3,13 +3,15 @@ import { writable } from "svelte/store"; import { bridgeCommand } from "@tslib/bridgecommand"; import ReviewerBottom from "./ReviewerBottom.svelte"; + import type {AnswerButtonInfo} from "./types" import "./index.scss" - let answerButtons = writable([]) - let remaining = writable<[number, number, number]>([0, 0, 0]) - let remainingIndex = writable(-1) + const answerButtons = writable([]) + const remaining = writable<[number, number, number]>([0, 0, 0]) + const remainingIndex = writable(-1) onMount(() => { + /* let timerStopped = false; let maxTime = 0; @@ -31,33 +33,34 @@ } else { timeNode.textContent = timeString; } - } + }*/ let intervalId: number | undefined; - function _showQuestion(txt: string, maxTime_: number): void { + function _showQuestion(_txt: string, _maxTime_: number): void { _showAnswer([]); globalThis.time = 0; - maxTime = maxTime_; + // maxTime = maxTime_; // updateTime(); if (intervalId !== undefined) { clearInterval(intervalId); } + /* intervalId = setInterval(function() { if (!timerStopped) { globalThis.time += 1; //updateTime(); } - }, 1000); + }, 1000);*/ } - function _showAnswer(info: AnswerButtonInfo[], stopTimer = false): void { + function _showAnswer(info: AnswerButtonInfo[], _stopTimer = false): void { console.log(info) answerButtons.set(info); - timerStopped = stopTimer; + // timerStopped = stopTimer; } function _updateRemaining(counts: [number, number, number], idx: number) { @@ -69,6 +72,7 @@ globalThis._showAnswer = _showAnswer; globalThis._updateRemaining = _updateRemaining; + /* function selectedAnswerButton(): string | undefined { const node = document.activeElement as HTMLElement; if (!node) { @@ -76,7 +80,7 @@ } return node.dataset.ease; } - + */ bridgeCommand("bottomReady"); }); diff --git a/ts/routes/reviewer-bottom/AnswerButton.svelte b/ts/routes/reviewer-bottom/AnswerButton.svelte index 2a04b7a20..645a4f4fe 100644 --- a/ts/routes/reviewer-bottom/AnswerButton.svelte +++ b/ts/routes/reviewer-bottom/AnswerButton.svelte @@ -1,5 +1,6 @@ diff --git a/ts/routes/reviewer-bottom/ReviewerBottom.svelte b/ts/routes/reviewer-bottom/ReviewerBottom.svelte index 31e3f82fd..0e2bded32 100644 --- a/ts/routes/reviewer-bottom/ReviewerBottom.svelte +++ b/ts/routes/reviewer-bottom/ReviewerBottom.svelte @@ -4,6 +4,7 @@ import { bridgeCommand } from "@tslib/bridgecommand"; import * as tr from "@generated/ftl"; import RemainingNumber from "./RemainingNumber.svelte"; + import type { AnswerButtonInfo } from "./types"; export let answerButtons: Writable export let remaining: Writable diff --git a/ts/routes/reviewer-bottom/types.ts b/ts/routes/reviewer-bottom/types.ts index 5a4ec8116..48fe4567d 100644 --- a/ts/routes/reviewer-bottom/types.ts +++ b/ts/routes/reviewer-bottom/types.ts @@ -1,4 +1,4 @@ -interface AnswerButtonInfo { +export interface AnswerButtonInfo { "extra": string, "key": string, "i": number,