feat: cooked up something fierce
Pipeline / check (pull_request) Successful in 3m9s
Pipeline / docs (pull_request) Skipped
Pipeline / nightly (pull_request) Skipped
Pipeline / release (pull_request) Skipped

This commit is contained in:
alexm committed 2026-09-26 18:22:25 -04:00
1 parent eabc98ad31
commit 5ac1e317c0
26 files changed
+1485 -44

No files matched your search

+10 -5
View File
@@ -289,7 +289,7 @@ fn worksheet_question(
out.push_str("\n\n");
if item.has_options() {
let ordered = ordered_options(item, form, &placement.item);
let ordered = ordered_options(item, placement, form);
for (position, source) in ordered.iter().enumerate() {
out.push_str(&format!(
"{}. {}\n",
@@ -320,7 +320,7 @@ fn solution_question(
out.push_str("\n\n");
if item.has_options() {
let ordered = ordered_options(item, form, &placement.item);
let ordered = ordered_options(item, placement, form);
for (position, source) in ordered.iter().enumerate() {
let mark = if source.correct { " ✓" } else { "" };
let note = source
@@ -458,10 +458,11 @@ fn meta_line(placement: &Placement, item: &Item) -> String {
/// Salted with the item's global id, the same value the Typst and QTI exports use,
/// so a worksheet built for form B lists options in the order that form's paper and
/// its Canvas quiz do.
fn ordered_options<'a>(item: &'a Item, form: &Form, uid: &str) -> Vec<&'a Choice> {
select::option_order(form, uid, item.options.len())
fn ordered_options<'a>(item: &'a Item, placement: &Placement, form: &Form) -> Vec<&'a Choice> {
let shown = item.administered(&placement.key, &placement.distractors);
select::option_order(form, &placement.item, shown.len())
.into_iter()
.map(|i| &item.options[i])
.map(|i| shown[i])
.collect()
}
@@ -579,6 +580,8 @@ items:
item: "l11::q-enthalpy-001".into(),
version: None,
stem_digest: None,
distractors: Vec::new(),
variant: None,
fingerprint: None,
points: Some(1.0),
bonus: false,
@@ -595,6 +598,8 @@ items:
item: "l11::q-enthalpy-op-001".into(),
version: None,
stem_digest: None,
distractors: Vec::new(),
variant: None,
fingerprint: None,
points: Some(2.0),
bonus: false,
+17 -3
View File
@@ -476,10 +476,12 @@ pub fn build(catalog: &Catalog, record: &AssessmentFile, opts: &QtiOptions) -> R
if !placement.bonus {
total_points += points;
}
let shown = item.administered(&placement.key, &placement.distractors);
items.push(build_item(
&record.assessment.id,
&placement.item,
item,
&shown,
points,
opts,
));
@@ -564,14 +566,21 @@ pub fn build(catalog: &Catalog, record: &AssessmentFile, opts: &QtiOptions) -> R
/// # Returns
///
/// The element.
fn build_item(assessment_id: &str, uid: &str, item: &Item, points: f64, opts: &QtiOptions) -> Node {
fn build_item(
assessment_id: &str,
uid: &str,
item: &Item,
shown: &[&crate::item::Choice],
points: f64,
opts: &QtiOptions,
) -> Node {
// An open-response item is an essay in Canvas: no choices, graded by hand.
if !item.format.has_options() {
return build_essay_item(assessment_id, uid, item, points, opts);
}
let order = select::option_order(&opts.form, uid, item.options.len());
let ordered: Vec<&crate::item::Choice> = order.iter().map(|i| &item.options[*i]).collect();
let order = select::option_order(&opts.form, uid, shown.len());
let ordered: Vec<&crate::item::Choice> = order.iter().map(|i| shown[*i]).collect();
// Option identifiers are numeric, mirroring Canvas's own exports, and are
// derived from the item id so they survive regeneration.
@@ -1259,6 +1268,7 @@ mod tests {
defense: None,
feedback_student: None,
selection_rate_expected: None,
retired: None,
}
}
@@ -1390,6 +1400,8 @@ items:
item: "b::q-mcq".into(),
version: None,
stem_digest: None,
distractors: Vec::new(),
variant: None,
fingerprint: None,
points: Some(1.0),
bonus: false,
@@ -1406,6 +1418,8 @@ items:
item: "b::q-open".into(),
version: None,
stem_digest: None,
distractors: Vec::new(),
variant: None,
fingerprint: None,
points: Some(2.0),
bonus: false,
+10 -4
View File
@@ -226,12 +226,13 @@ fn question_block(
if item.has_options() {
b.push_str(":::: {.q-choices}\n");
let order = select::option_order(form, &placement.item, item.options.len());
let shown = item.administered(&placement.key, &placement.distractors);
let order = select::option_order(form, &placement.item, shown.len());
for (position, &source) in order.iter().enumerate() {
b.push_str(&format!(
"{}. {}\n",
position + 1,
markup::to_markdown(&item.options[source].text)
markup::to_markdown(&shown[source].text)
));
}
b.push_str("::::\n\n");
@@ -295,11 +296,12 @@ fn fragment(
/// A single-best-answer or multiple-response fragment: the key, the model answer,
/// the explanation, then per-distractor feedback.
fn choice_fragment(course: &CourseFile, placement: &Placement, item: &Item, form: &Form) -> String {
let order = select::option_order(form, &placement.item, item.options.len());
let shown = item.administered(&placement.key, &placement.distractors);
let order = select::option_order(form, &placement.item, shown.len());
let printed: Vec<(usize, &Choice)> = order
.iter()
.enumerate()
.map(|(position, &source)| (position, &item.options[source]))
.map(|(position, &source)| (position, shown[source]))
.collect();
let mut out = String::new();
@@ -844,6 +846,8 @@ items:
item: "b::q-mcq".into(),
version: None,
stem_digest: None,
distractors: Vec::new(),
variant: None,
fingerprint: None,
points: Some(1.0),
bonus: false,
@@ -860,6 +864,8 @@ items:
item: "b::q-open".into(),
version: None,
stem_digest: None,
distractors: Vec::new(),
variant: None,
fingerprint: None,
points: Some(2.0),
bonus: false,
+4
View File
@@ -432,6 +432,8 @@ mod tests {
item: "b::q-1".into(),
version: None,
stem_digest: None,
distractors: Vec::new(),
variant: None,
fingerprint: None,
points: None,
bonus: false,
@@ -448,6 +450,8 @@ mod tests {
item: "b::q-2".into(),
version: None,
stem_digest: None,
distractors: Vec::new(),
variant: None,
fingerprint: None,
points: None,
bonus: false,
+3 -2
View File
@@ -411,11 +411,12 @@ pub fn build(
_ => (None, None),
};
let order = select::option_order(form, &placement.item, item.options.len());
let shown = item.administered(&placement.key, &placement.distractors);
let order = select::option_order(form, &placement.item, shown.len());
let options: Vec<Opt> = order
.iter()
.enumerate()
.map(|(position, source_index)| option(&item.options[*source_index], position, config))
.map(|(position, source_index)| option(shown[*source_index], position, config))
.collect();
let key = if config.reveal.shows_key() {