Index: openacs-4/packages/xowf/lib/inclass-exam.wf =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowf/lib/Attic/inclass-exam.wf,v diff -u -r1.1.2.31 -r1.1.2.32 --- openacs-4/packages/xowf/lib/inclass-exam.wf 29 Apr 2020 19:42:09 -0000 1.1.2.31 +++ openacs-4/packages/xowf/lib/inclass-exam.wf 3 May 2020 14:15:58 -0000 1.1.2.32 @@ -442,22 +442,23 @@ # Print the answers in a somewhat printer friendly way. # :proc www-print-answers {} { - set HTML "" - set heading "" - set as_student [${:package_id} query_parameter as_student:boolean 0] + set as_student [:query_parameter as_student:boolean 0] + set filter_id [:query_parameter id:integer ""] + set creation_user [:query_parameter creation_user:integer ""] + set revision_id [:query_parameter rid:integer ""] + set combined_form_info [::xowf::test_item::question_manager combined_question_form [self]] set autograde [dict get $combined_form_info autograde] set totalPoints [::xowf::test_item::question_manager total_minutes $combined_form_info] set percentage_to_grade {50.0 60.0 70.0 80.0} ;# WI - set grade_count {} - + set grading_scheme ::xowf::test_item::grading::wi1 + set grade_dict {} + set grade_csv "" + set ctx [::xowf::Context require [self]] set wf [xowf::test_item::answer_manager get_answer_wf [self]] + if {$wf ne ""} { - set package_id [$wf package_id] - set filter_id [$package_id query_parameter id:integer ""] - set creation_user [$package_id query_parameter creation_user:integer ""] - set revision_id [$package_id query_parameter rid:integer ""] set items [xowf::test_item::answer_manager get_wf_instances \ {*}[expr {$creation_user ne "" ? "-creation_user $creation_user" : ""}] \ @@ -467,7 +468,36 @@ ? [dict get ${:instance_attributes} signature] : 0 }] set examTitle ${:title} + set do_stream [expr {[llength [$items children]] > 100}] + ::xo::cc set_parameter template_file view-plain-master + ::xo::cc set_parameter MenuBar 0 + template::head::add_link -rel stylesheet -href /resources/xowf/test-item.css + + if {$as_student} { + set userName [acs_user::get_element -user_id [ad_conn user_id] -element username] + set fullName [::xo::get_user_name [ad_conn user_id]] + set heading "$userName - $fullName" + set HTML "
[xowf::test_item::answer_manager grading_table $grade_count]
+ append HTML[xowf::test_item::answer_manager grading_table -csv $grade_csv $grade_dict]
} - set return_url [$package_id query_parameter local_return_url:localurl [:pretty_link]] + set return_url [:query_parameter local_return_url:localurl [:pretty_link]] append HTML "