Added: nc for typed answers

This commit is contained in:
Luc Mcgrady 2025-11-03 23:07:03 +00:00
parent 4e8bf13813
commit 7cb7d208c6
No known key found for this signature in database
GPG key ID: 4F3D7A0B17CC3D9C
3 changed files with 12 additions and 5 deletions

View file

@ -307,6 +307,7 @@ message NextCardDataResponse {
string body_class = 6;
bool autoplay = 7;
optional string typed_answer = 12;
optional string typed_answer_args = 13;
repeated card_rendering.AVTag question_av_tags = 8;
repeated card_rendering.AVTag answer_av_tags = 9;

View file

@ -431,7 +431,10 @@ impl crate::services::SchedulerService for Collection {
let mut out = None;
*text = ANSWER_REGEX
.replace(text, |cap: &regex::Captures<'_>| {
out = Some(cap[2].to_string());
out = Some((
cap.get(1).map(|g| g.as_str().to_string()),
cap[2].to_string(),
));
ANSWER_HTML
})
.to_string();
@ -441,12 +444,14 @@ impl crate::services::SchedulerService for Collection {
}
});
let typed_answer = typed_answer_parent_node.map(|field| {
let typed_answer = typed_answer_parent_node.as_ref().map(|field| {
let note = self.get_note(next_card.card.note_id.into()).unwrap();
let notetype = self.get_notetype(note.notetype_id.into()).unwrap().unwrap();
note.fields[notetype.get_field_ord(&field).unwrap()].clone()
note.fields[notetype.get_field_ord(&field.1).unwrap()].clone()
});
dbg!(&typed_answer_parent_node);
Ok(NextCardDataResponse {
next_card: Some(NextCardData {
queue: Some(queue.into()),
@ -458,6 +463,7 @@ impl crate::services::SchedulerService for Collection {
answer_buttons,
autoplay: !config.inner.disable_autoplay,
typed_answer,
typed_answer_args: typed_answer_parent_node.and_then(|v| v.0),
// Filled by python
front: "".to_string(),

View file

@ -137,13 +137,13 @@ export class ReviewerState {
}
async showTypedAnswer(html: string) {
if (!this._cardData?.typedAnswer) {
if (!this._cardData?.typedAnswer || !this._cardData.typedAnswerArgs) {
return html;
}
const compareAnswerResp = await compareAnswer({
expected: this._cardData?.typedAnswer,
provided: this.currentTypedAnswer,
combining: false,
combining: !this._cardData.typedAnswerArgs.includes("nc"),
});
const display = compareAnswerResp.val;