[ns_quotehtml $title]
" set menu "" - set text [::xowf::test_item::question_manager exam_info_block \ + set text [${:QM} exam_info_block \ -combined_form_info $combined_form_info \ $obj] set detail_link [$obj pretty_link -query m=exam-summary] @@ -314,7 +315,7 @@ if {$state eq "published"} { set src [$obj pretty_link -query m=qrcode] set qrCode [subst {+ #xowf.Achieved_points#: $grading_info
}] } else { set achievedPointsInfo "" @@ -2552,6 +2724,8 @@ # general, this could be as well made available per question or # per-student. # + # @return HTML + # set wf [:get_answer_wf $examWf] if {$wf eq ""} { return "" @@ -2571,9 +2745,10 @@ {-revision_id} } { # - # Render for the submission i the proctor images. + # Render proctor images the provided submission. # - + # @return HTML + # set user_id [$submission creation_user] set img_url [$examWf pretty_link -query m=proctor-image&user_id=$user_id] @@ -2744,6 +2919,7 @@ $submission set __form_objs $form_objs set question_form [$submission render_content] } + return $question_form } @@ -2813,6 +2989,181 @@ #---------------------------------------------------------------------- # Class: Answer_manager + # Method: dom ensemble for tdom manipluations + #---------------------------------------------------------------------- + :method "dom node replace" {domNode xquery script} { + set node [$domNode selectNodes $xquery] + if {$node ne ""} { + foreach child [$node childNodes] { + $child delete + } + :uplevel [list $node appendFromScript $script] + } + } + :method "dom node delete" {domNode xquery} { + set nodes [$domNode selectNodes $xquery] + foreach node $nodes { + $node delete + } + } + :method "dom class add" {domNode xquery class} { + set nodes [$domNode selectNodes $xquery] + foreach node $nodes { + set oldClass [$node getAttribute class] + if {$class ni $oldClass} { + $node setAttribute class "$oldClass $class" + } + } + } + :method "dom class remove" {domNode xquery class} { + set nodes [$domNode selectNodes $xquery] + foreach node $nodes { + set oldClass [$node getAttribute class] + set pos [lsearch $oldClass $class] + if {$pos != -1} { + $node setAttribute class [lreplace $oldClass $pos $pos] + } + } + } + + #---------------------------------------------------------------------- + # Class: Answer_manager + # Method: postprocess_question_html + #---------------------------------------------------------------------- + :method postprocess_question_html { + {-question_form:required} + {-achieved_points:required} + {-manual_grading:required} + {-submission:object,required} + {-runtime_panel_view:required} + {-exam_state:required} + } { + # + # Post-process the HTML of a question by adding information of + # the student as data attributes, such as achieved and + # achievable points, setting CSS classes, mangling names of + # composite questions to match with the data in achieved_points, + # + # @return HTML block + + #ns_log notice "QF=$question_form" + dom parse -simple -html $question_form doc + $doc documentElement root + if {$root eq ""} { + error "form '$form' is not valid" + } + + set per_question_points "" + foreach pd [:dict_value $achieved_points details] { + set qn [dict get $pd attributeName] + dict set per_question_points $qn achieved [dict get $pd achieved] + dict set per_question_points $qn achievable [dict get $pd achievable] + } + + # + # For every composite question: + # + # - update the question_name of the subquestion by prefixing it + # with the name of the composite, since this is what we have + # in the details of achieved_points. + # - hide the grading box of the composite + # - unhide the grading box of the composite children + # + set composite_grading_boxes \ + [$root selectNodes \ + {//div[@data-item_type='Composite']/div[contains(@class,'grading-box')]}] + foreach composite_grading_box $composite_grading_boxes { + set composite_qn [$composite_grading_box getAttribute "data-question_name"] + set parentNode [$composite_grading_box parentNode] + :dom class add $composite_grading_box {.} hidden + foreach grading_box [$parentNode selectNodes {div//div[contains(@class,'grading-box')]}] { + set qn [$grading_box getAttribute data-question_name] + regsub {^answer_} $qn ${composite_qn}_ new_qn + #ns_log notice "CHILD of Composite: rename QN from $qn to $new_qn" + $grading_box setAttribute data-question_name $new_qn + $grading_box setAttribute id ${composite_qn}_[$grading_box getAttribute id] + :dom class remove $grading_box {.} hidden + } + } + + set submission_state [$submission state] + set noManualGrading [expr {$submission_state ne "done" || $exam_state eq "published"}] + + set grading_boxes [${root} selectNodes {//div[contains(@class,'grading-box')]}] + foreach grading_box $grading_boxes { + set qn [$grading_box getAttribute "data-question_name"] + set item_node [$grading_box parentNode] + set item_type [expr {[$item_node hasAttribute "data-item_type"] + ? [$item_node getAttribute "data-item_type"] + : ""}] + ns_log notice "... QN '$qn' item_type '$item_type'" \ + "submission state $submission_state" \ + "exam state $exam_state" + if {$noManualGrading} { + :dom class add $grading_box {a[contains(@class,'manual-grade')]} hidden + } + + # + # Get manual gradings, if these were already provided. + # + if {[dict exists $manual_grading $qn]} { + set achieved [dict get $manual_grading $qn achieved] + set comment [dict get $manual_grading $qn comment] + } else { + set achieved "" + set comment "" + } + + if {[dict exists $per_question_points $qn achieved]} { + # + # Manual grading has higher priority than automated grading. + # + if {$achieved eq ""} { + set achieved [dict get $per_question_points $qn achieved] + } + set achievable [dict get $per_question_points $qn achievable] + $grading_box setAttribute data-autograde 1 + } else { + set achievable "" + } + #ns_log notice "... QN '$qn' item_type $item_type achieved '$achieved' achievable '$achievable'" + + if {$achieved eq ""} { + :dom node replace $grading_box {span[@class='points']} { + ::html::span -class "glyphicon glyphicon-alert text-warn" -aria-hidden "true" {} + } + } else { + :dom node replace $grading_box {span[@class='points']} {::html::t $achieved} + } + # + # When "comment" is empty, do not show the label. + # + :dom node replace $grading_box {span[@class='comment']} {::html::t $comment} + if {$comment eq ""} { + :dom class add $grading_box {span[@class='feedback-label']} hidden + } else { + :dom class remove $grading_box {span[@class='feedback-label']} hidden + } + + $grading_box setAttribute data-user_id [$submission creation_user] + $grading_box setAttribute data-user_name [$submission set online-exam-userName] + $grading_box setAttribute data-full_name [$submission set online-exam-fullName] + $grading_box setAttribute data-achieved $achieved + $grading_box setAttribute data-achievable $achievable + $grading_box setAttribute data-comment $comment + + # + # In student review mode ('Einsicht'), remove edit controls. + # + if {$runtime_panel_view eq "student"} { + :dom node delete $grading_box {a} + } + } + return [$root asHTML] + } + + #---------------------------------------------------------------------- + # Class: Answer_manager # Method: render_submission=exam_protocol #---------------------------------------------------------------------- :method render_submission=exam_protocol { @@ -2832,9 +3183,10 @@ {-with_signature:boolean false} {-with_exam_heading:boolean true} } { - set userName [$submission set online-exam-userName] set fullName [$submission set online-exam-fullName] + set user_id [$submission set creation_user] + set manual_gradings [$examWf property manual_gradings] #if {[$submission state] ne "done"} { # ns_log notice "online-exam: submission of $userName is not finished (state [$submission state])" @@ -2856,14 +3208,17 @@ } } + set answerAttributes [xowf::test_item::renaming_form_loader \ + answer_attributes [$submission instance_attributes]] + + # + # "render_full_submission_form" calls "summary_form" to obtain the + # user's answers to all questions. + # set question_form [:render_full_submission_form \ -wf $wf \ -submission $submission \ -form_objs $form_objs] - # - # Now, the question_form contains the rendered answer of the - # student. - # if {$recutil ne ""} { :export_answer \ @@ -2877,18 +3232,24 @@ :export_file_submission -submission $submission -zipFile $zipFile } - set achieved_points {} - if {$with_signature || $autograde} { - set answerAttributes [xowf::test_item::renaming_form_loader \ - answer_attributes [$submission instance_attributes]] - if {$autograde} { - set achieved_points [:achieved_points \ - -submission $submission \ - -answer_attributes $answerAttributes] - dict set achieved_points totalPoints $totalPoints - } - } + # + # Achieved_points are computed for autograded and manually + # graded exams. + # + set achieved_points [:achieved_points \ + -manual_grading [:dict_value $manual_gradings $user_id] \ + -submission $submission \ + -answer_attributes $answerAttributes] + dict set achieved_points totalPoints $totalPoints + set question_form [:postprocess_question_html \ + -question_form $question_form \ + -achieved_points $achieved_points \ + -manual_grading [:dict_value $manual_gradings $user_id] \ + -submission $submission \ + -exam_state [$examWf state] \ + -runtime_panel_view $runtime_panel_view] + if {$with_signature} { set sha256 [ns_md string -digest sha256 $answerAttributes] set signatureString "
online-exam-actual_signature: $sha256
\n"
@@ -2941,23 +3302,63 @@
set runtime_panel ""
}
+ #
+ # Don't add details to exam-review for student.
+ #
+ if {$runtime_panel_view eq "student"} {
+ set grading_scheme ""
+ set achieved_points ""
+ }
set heading "$userName · $fullName · $pretty_date"
- append HTML [subst {
+ append HTML [subst [ns_trim {
-
+
- }]
+ }]]
return $HTML
}
#----------------------------------------------------------------------
# Class: Answer_manager
+ # Method: grading_scheme
+ #----------------------------------------------------------------------
+ :method grading_scheme {
+ {-grading:alnum,0..n ""}
+ {-total_points}
+ } {
+ #
+ # The management of the grading scheme has to be extended. For the
+ # time being, we have a single grading scheme with the option to
+ # round to full points or not. When an exam has less than 40
+ # points, we do not round per default, since this rounding could
+ # provide more than 1 percent of the result. This should be made
+ # configurable (also in www-print-answer-table, which is not used
+ # right now).
+ #
+ # @return fully qualified grading scheme object
+ #
+ if {$grading eq ""} {
+ set grading [expr {$total_points < 40 ? "wi1_noround" : "wi1p"}]
+ }
+
+ set grading_scheme ::xowf::test_item::grading::$grading
+ if {[info commands $grading_scheme] eq ""} {
+ set grading_scheme ::xowf::test_item::grading::wi1
+ }
+ #ns_log notice "USE grading_scheme $grading_scheme"
+ return $grading_scheme
+ }
+
+ #----------------------------------------------------------------------
+ # Class: Answer_manager
# Method: render_answers
#----------------------------------------------------------------------
:public method render_answers {
@@ -2976,6 +3377,8 @@
# Return the answers in HTML format in a somewhat printer
# friendly way, e.g. as the exam protocol.
#
+ # @return dict containing "do_stream" and "HTML"
+ #
set combined_form_info [::xowf::test_item::question_manager combined_question_form $examWf]
set autograde [dict get $combined_form_info autograde]
set totalPoints [::xowf::test_item::question_manager total_points \
@@ -2996,24 +3399,8 @@
"valid [dict get $combined_form_info question_objs]"
set form_objs ""
}
- #
- # The management of the grading scheme has to be extended. For the
- # time being, we have a single grading scheme with the option to
- # round to full points or not. When an exam has less than 40
- # points, we do not round per default, since this rounding could
- # provide more than 1 percent of the result. This should be made
- # configurable (also in www-print-answer-table, which is not used
- # right now).
- #
- if {$grading eq ""} {
- set grading [expr {$totalPoints < 40 ? "wi1_noround" : "wi1p"}]
- }
- set grading_scheme ::xowf::test_item::grading::$grading
- if {[info commands $grading_scheme] eq ""} {
- set grading_scheme ::xowf::test_item::grading::wi1
- }
- #ns_log notice "USE grading_scheme $grading_scheme"
+ set grading_scheme [:grading_scheme -grading $grading -total_points $totalPoints]
set :grade_dict {}
set :grade_csv ""
@@ -3062,6 +3449,7 @@
set runtime_panel_view "default"
}
}
+ append HTML [:grading_dialog_setup $examWf]
if {$do_stream} {
# ns_log notice STREAM-[info level]-$::template::parse_level
@@ -3210,6 +3598,7 @@
if {$with_grading_table && $autograde
&& !$as_student && $filter_id eq "" && $creation_user eq "" && $revision_id eq ""
} {
+ set statistics {}
set ia [$examWf instance_attributes]
foreach var {__stats_success __stats_count} key {success count} {
if {[$examWf exists $var]} {
@@ -3249,8 +3638,17 @@
#ns_log notice "### '$att' value '$value'"
$answerObj combine_data_and_form_field_default 1 $f $value
$f set_feedback 1
- $f add_statistics -options {word_statistics word_cloud}
+
#
+ # TODO: world-cloud statistics make mostly sense for the
+ # inclass quizzes, but there these require still an
+ # interface via "reporting_obj" instead of "add_statistics"
+ # (although, for the purposes of the inclass-quiz,
+ # randomization is not an issue.
+ #
+ #$f add_statistics -options {word_statistics word_cloud}
+
+ #
# Leave the form-field in statistics mode in a state with
# correct anwers.
#
@@ -4301,12 +4699,6 @@
- $minutes - $points - $lang - $fc_dict - [$pool_question_obj revision_id]
ns_log notice "get_pool_questions fetch via key: '$key'"
- #return [:get_pool_replacement_candidates \
- -minutes $minutes \
- -points $points \
- -fc_dict $fc_dict \
- -lang $lang \
- $pool_question_obj]
return [ns_cache_eval -expires 1m -- ns:memoize $key {
:get_pool_replacement_candidates \
-minutes $minutes \
@@ -4390,8 +4782,13 @@
-exam_obj:object
} {
#
- # Applies replace_pool_question to all the relevant form objects
+ # Replaces all pool questions for the exam by random items. In
+ # case there were replacement items, set/update the property
+ # "question" for the individual answer_obj.
#
+ # @param answer_obj the workflow instance of the answer workflow
+ # @param exam_obj the exam objject to which the answer_object belongs to
+ #
if {[$answer_obj property question] ne ""} {
ns_log notice "answer_obj $answer_obj has already a 'question' property" \
[lsort [dict keys [$answer_obj instance_attributes]]]
@@ -4610,7 +5007,6 @@
ns_log warning "load_question_objs: only $loaded out of $out_of from '$names' could be loaded"
}
}
- #ns_log notice "XXX [$obj name] load_question_objs questionNames = <$names>"
return $questionForms
}
@@ -4921,6 +5317,161 @@
#----------------------------------------------------------------------
# Class: Question_manager
+ # Method: question_randomization_ok
+ #----------------------------------------------------------------------
+ :method question_randomization_ok {form_obj} {
+ set randomizationOk 1
+ set qd [:dict_value [$form_obj instance_attributes] question]
+ if {$qd ne ""} {
+ #
+ # No question should have shuffle "always".
+ #
+ if {[:dict_value $qd question.shuffle] eq "always"} {
+ #ns_log notice "FOUND shuffle $qd"
+ set randomizationOk 0
+ }
+ }
+ return $randomizationOk
+ }
+
+ #----------------------------------------------------------------------
+ # Class: Question_manager
+ # Method: question_is_autograded
+ #----------------------------------------------------------------------
+ :method question_is_autograded {form_obj} {
+ #
+ # Return boolean information whether this question is autograded.
+ #
+
+ set formAttributes [$form_obj instance_attributes]
+ if {[dict exists $formAttributes question]} {
+ #
+ # Check autograding and randomization for exam.
+ #
+ set qd [dict get [$form_obj instance_attributes] question]
+
+ #
+ # For autoGrade, we assume currently to have either a grading,
+ # or a question, where every alternative is exactly provided.
+ #
+ if {[dict exists $qd question.grading]} {
+ #
+ # autograde ok on the item type level
+ #
+ set autoGrade 1
+
+ } elseif {[:dict_value $formAttributes auto_correct 0]} {
+ #
+ # auto_correct is in principle enabled, check details on
+ # the concrete question item.
+ #
+ set autoGrade 1
+
+ if {[:dict_value $formAttributes item_type] eq "ShortText"} {
+ #
+ # Check, if the correct_when specification of a short text
+ # question is suited for autocorrection. On the longer
+ # range, this function should be moved to a different
+ # place.
+ #
+
+ set dict [lindex [fc_to_dict [dict get $formAttributes form_constraints]] 1]
+ foreach a [dict get $dict answer] {
+ set op ""
+ regexp {^(\S+)\s} $a . op
+ if {$op ni {eq lt le gt ge btwn AND}} {
+ ns_log notice "question_info [$form_obj name]: not suited for autoGrade: '$a'"
+ set autoGrade 0
+ break
+ }
+ if {$op eq "AND"} {
+ foreach c [lrange $a 1 end] {
+ set op ""
+ regexp {^(\S+)\s} $c . op
+ if {$op ni {eq lt le gt ge btwn}} {
+ ns_log notice "question_info [$form_obj name]: not suited for autoGrade: AND clause '$c'"
+ set autoGrade 0
+ break
+ }
+ }
+ }
+ }
+ }
+ } elseif [dict exists $qd question.interaction question.interaction.answer] {
+ set autoGrade 1
+
+ set answer [dict get $qd question.interaction question.interaction.answer]
+ foreach k [dict keys $answer] {
+ if {![dict exists $answer $k $k.correct]} {
+ set autoGrade 0
+ }
+ }
+ } else {
+ set autoGrade 0
+ }
+ #ns_log notice "question_info [$form_obj name] [$form_obj title] autoGrade $autoGrade"
+ }
+ return $autoGrade
+ }
+
+ #----------------------------------------------------------------------
+ # Class: Question_manager
+ # Method: exam_form
+ #----------------------------------------------------------------------
+ :public method aggregated_form {
+ {-titleless_form:switch false}
+ {-with_grading_box ""}
+ question_infos
+ } {
+ #
+ # Compute an aggregated form based on the chunks available in
+ # question_infos.
+ #
+ # @return HTML form content
+ #
+ set full_form ""
+ set count 0
+ foreach \
+ question_form [dict get $question_infos question_forms] \
+ title_info [dict get $question_infos title_infos] \
+ question_obj [dict get $question_infos question_objs] {
+ set item_type [$question_obj property item_type]
+ append full_form \
+ "
[expr {$with_exam_heading ? "
$signatureString
$question_form
$heading
" : ""}] $runtime_panel"
+
+ if {!$titleless_form} {
+ append full_form \
+ "
+ }
+
+ regsub -all {<[/]?form>} $full_form "" full_form
+ return $full_form
+ }
+
+ #----------------------------------------------------------------------
+ # Class: Question_manager
# Method: question_info
#----------------------------------------------------------------------
:public method question_info {
@@ -4942,20 +5493,20 @@
# "randomization_for_exam" "autograde" and "question_objs". This
# information is obtained from the provided "form_objs".
#
- set full_form {}
- set full_fc {}
+ # @return dict containing "title_infos", "form_constraints",
+ # "disabled_form_constraints", "randomization_for_exam",
+ # "autograde", "question_forms", "question_objs"
set full_disabled_fc {}
set title_infos {}
+ set question_forms {}
+
if {[llength $positions] == 0} {
set position -1
set positions [lmap form_obj $form_objs {incr position}]
}
set randomizationOk 1
set autoGrade 1
foreach form_obj $form_objs number $numbers position $positions {
- #if {[info exists fixed_position]} {
- # set position $fixed_position
- #}
set form_obj [::xowf::test_item::renaming_form_loader rename_attributes $form_obj]
set form_title [$form_obj title]
set minutes [:question_property $form_obj minutes]
@@ -4993,19 +5544,14 @@
}
append title " " [join $title_components " - "]
- if {!$titleless_form} {
- append full_form \
- "[dict get $title_info full_title]
\n" + } + if {$with_grading_box ne ""} { + set question_name [xowf::test_item::renaming_form_loader \ + form_name_based_attribute_stem \ + [$question_obj name]] + set visible [expr {$with_grading_box eq "hidden" ? "hidden" : ""}] + if {$with_grading_box eq "hidden"} { + set question_name answer_$question_name + } + append full_form [subst [ns_trim -delimiter | { + |
+ | #xowf.Points#:
+ | #xowf.feedback#:
+ |
+ |
+ |
+ |
+ }]]
+ }
+ append full_form $question_form \n