version 1.157, 2006/05/25 20:08:18
|
version 1.171, 2006/06/13 21:34:28
|
Line 38 use Apache::lonlocal;
|
Line 38 use Apache::lonlocal;
|
use Apache::lonxml; |
use Apache::lonxml; |
use Apache::slotrequest(); |
use Apache::slotrequest(); |
use Time::HiRes qw( gettimeofday tv_interval ); |
use Time::HiRes qw( gettimeofday tv_interval ); |
|
use lib '/home/httpd/lib/perl/'; |
|
use LONCAPA; |
|
|
|
|
BEGIN { |
BEGIN { |
&Apache::lonxml::register('Apache::bridgetask',('Task','IntroParagraph','Dimension','Question','Instance','InstanceText','Criteria','ClosingParagraph')); |
&Apache::lonxml::register('Apache::bridgetask',('Task','IntroParagraph','Dimension','Question','QuestionText','Setup','Instance','InstanceText','Criteria','ClosingParagraph')); |
} |
} |
|
|
|
my %dimension; |
sub initialize_bridgetask { |
sub initialize_bridgetask { |
# id of current Dimension, 0 means that no dimension is current |
# id of current Dimension, 0 means that no dimension is current |
# (inside <Task> only) |
# (inside <Task> only) |
$Apache::bridgetask::dimension=''; |
%Apache::bridgetask::dimension=(); |
# list of all Dimension ids seen |
# list of all Dimension ids seen |
@Apache::bridgetask::dimensionlist=(); |
%Apache::bridgetask::top_dimensionlist=(); |
# mandatory attribute of all Dimensions seen |
|
%Apache::bridgetask::dimensionmandatory=(); |
|
# list of all current Instance ids |
# list of all current Instance ids |
@Apache::bridgetask::instance=(); |
%Apache::bridgetask::instance=(); |
# list of all Instance ids seen in this problem |
# list of all Instance ids seen in this problem |
@Apache::bridgetask::instancelist=(); |
@Apache::bridgetask::instancelist=(); |
# key of queud user data that we are currently grading |
# key of queud user data that we are currently grading |
$Apache::bridgetask::queue_key=''; |
$Apache::bridgetask::queue_key=''; |
|
undef(%dimension); |
} |
} |
|
|
sub proctor_check_auth { |
sub proctor_check_auth { |
Line 263 STUFF
|
Line 266 STUFF
|
} |
} |
|
|
if ($env{'request.enc'}) { $symb=&Apache::lonenc::encrypted($symb); } |
if ($env{'request.enc'}) { $symb=&Apache::lonenc::encrypted($symb); } |
$symb=&Apache::lonnet::escape($symb); |
$symb=&escape($symb); |
$result.='<form method="post" action="/adm/slotrequest">'. |
$result.='<form method="post" action="/adm/slotrequest">'. |
'<input type="hidden" name="symb" value="'.$symb.'" />'. |
'<input type="hidden" name="symb" value="'.$symb.'" />'. |
'<input type="hidden" name="command" value="'.$action.'" />'. |
'<input type="hidden" name="command" value="'.$action.'" />'. |
Line 362 sub file_list {
|
Line 365 sub file_list {
|
my $file=$file_url.$partial_file; |
my $file=$file_url.$partial_file; |
$file=~s|/+|/|g; |
$file=~s|/+|/|g; |
&Apache::lonnet::allowuploaded('/adm/bridgetask',$file); |
&Apache::lonnet::allowuploaded('/adm/bridgetask',$file); |
$file_list.='<li><nobr><a href="'.$file.'?rawmode=1" target="lonGRDs"><img src="'. |
$file_list.='<li><span style="white-space: nowrap;"><a href="'.$file.'?rawmode=1" target="lonGRDs"><img src="'. |
&Apache::loncommon::icon($file).'" border="0"> '.$file. |
&Apache::loncommon::icon($file).'" alt="file icon" border="0" /> '.$file. |
'</a></nobr></li>'."\n"; |
'</a></span></li>'."\n"; |
} |
} |
$file_list.="</ul>\n"; |
$file_list.="</ul>\n"; |
return $file_list; |
return $file_list; |
} |
} |
|
|
|
sub grade_mode { |
|
if ($env{'form.regrade'} || $env{'form.regradeaspecificsubmission'}) { |
|
return 'regrade'; |
|
} |
|
return 'queue_grade'; |
|
} |
|
|
sub webgrade_standard_info { |
sub webgrade_standard_info { |
my ($version)=&get_version(); |
my ($version)=&get_version(); |
|
|
my $file_list = &file_list($Apache::lonhomework::history{"resource.$version.0.bridgetask.portfiles"}); |
my $file_list = &file_list($Apache::lonhomework::history{"resource.$version.0.bridgetask.portfiles"}); |
|
|
my %lt=&Apache::lonlocal::texthash('done' => 'Next Item', |
my %lt=('done' => 'Next Item', |
'stop' => 'Quit Grading', |
'stop' => 'Quit Grading', |
'fail' => 'Fail Rest', |
'fail' => 'Fail Rest', |
); |
'cancel' => 'Cancel', |
|
); |
|
%lt=&Apache::lonlocal::texthash(%lt); |
|
|
my $result=<<INFO; |
my $result=<<INFO; |
<div class="LC_GRADING_maincontrols"> |
<div class="LC_GRADING_maincontrols"> |
|
INFO |
|
|
|
if (&grade_mode() eq 'regrade') { |
|
$result.=<<INFO; |
|
<input type="submit" name="cancel" value="$lt{'cancel'}" /> |
|
INFO |
|
} |
|
|
|
$result.=<<INFO; |
<input type="submit" name="next" value="$lt{'done'}" /> |
<input type="submit" name="next" value="$lt{'done'}" /> |
<input type="submit" name="stop" value="$lt{'stop'}" /> |
<input type="submit" name="stop" value="$lt{'stop'}" /> |
<input type="button" name="fail" value="$lt{'fail'}" |
<input type="button" name="fail" value="$lt{'fail'}" |
Line 392 INFO
|
Line 413 INFO
|
return $result; |
return $result; |
} |
} |
|
|
|
sub done_screen { |
|
my ($version) = @_; |
|
my $title=&Apache::lonnet::gettitle(); |
|
my @files=split(',',$Apache::lonhomework::history{'resource.'.$version.'.0.bridgetask.portfiles'}); |
|
my (undef,undef,$domain,$user)= &Apache::lonxml::whichuser(); |
|
my $files = '<ul>'; |
|
my $msg; |
|
foreach my $file (@files) { |
|
my $url="/uploaded/$domain/$user/portfolio$file"; |
|
if (! &Apache::lonnet::stat_file($url)) { |
|
$file = &mt('<span class="LC_error"> Nonexistent file:</span> '. |
|
'<span class="LC_filename">[_1]</span>',$file); |
|
$msg .= "<p>Submitted non-existant file $file</p>\n"; |
|
} else { |
|
$file = '<span class="LC_filename">'.$file.'</span>'; |
|
$msg .= "<p>Submitted file $file</p>\n"; |
|
} |
|
$files .= '<li>'.$file.'</li>'; |
|
} |
|
$files.='</ul>'; |
|
my $subject = "Submission message for $title"; |
|
my ($message_status,$comment_status); |
|
my $setting = $env{'course.'.$env{'request.course.id'}.'.task_messages'}; |
|
$setting =~ s/^\s*(\S*)\s*$/$1/; |
|
$setting = lc($setting); |
|
if ($setting eq 'only_student' |
|
|| $setting eq 'student_and_user_notes_screen') { |
|
$message_status = |
|
&Apache::lonmsg::user_normal_msg($user,$domain,$subject,$msg); |
|
$message_status = '<p>'.&mt('Message sent to user: [_1]', |
|
$message_status).' </p>'; |
|
} |
|
if ($setting eq 'student_and_user_notes_screen') { |
|
$comment_status = |
|
&Apache::lonmsg::store_instructor_comment($subject.'<br />'. |
|
$msg,$user,$domain); |
|
$comment_status = '<p>'.&mt('Message sent to instructor: [_1]', |
|
$comment_status).' </p>'; |
|
} |
|
return <<DONESCREEN; |
|
<h2>$title</h2> |
|
<p> Files submitted: $files </p> |
|
<p> You are now done with this Bridge Task </p> |
|
<hr /> |
|
<p> <a href="/adm/logout">Logout</a> </p> |
|
<p> <a href="/adm/roles">Change to a different course</a> </p> |
|
$message_status |
|
$comment_status |
|
DONESCREEN |
|
|
|
} |
|
|
sub start_Task { |
sub start_Task { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
|
|
Line 452 sub start_Task {
|
Line 525 sub start_Task {
|
if ($target eq 'web' && $env{'request.state'} eq 'construct') { |
if ($target eq 'web' && $env{'request.state'} eq 'construct') { |
$form_tag_start.=&Apache::structuretags::problem_web_to_edit_header($env{'form.rndseed'}); |
$form_tag_start.=&Apache::structuretags::problem_web_to_edit_header($env{'form.rndseed'}); |
} |
} |
if ($target eq 'web' || ($target eq 'grade' && !$env{'form.webgrade'}) || $target eq 'answer' || |
if ($target eq 'web' |
$target eq 'tex') { |
|| ($target eq 'grade' && !$env{'form.webgrade'}) |
|
|| $target eq 'answer' |
|
|| $target eq 'tex') { |
my ($version,$previous)=&get_version(); |
my ($version,$previous)=&get_version(); |
($status,$accessmsg,my $slot_name,$slot) = |
($status,$accessmsg,my $slot_name,$slot) = |
&Apache::lonhomework::check_slot_access('0','Task'); |
&Apache::lonhomework::check_slot_access('0','Task'); |
Line 490 sub start_Task {
|
Line 565 sub start_Task {
|
} elsif ($status eq 'WAITING_FOR_GRADE') { |
} elsif ($status eq 'WAITING_FOR_GRADE') { |
$msg.='<h1>'.&mt('Your submission is in the grading queue.').'</h1>'; |
$msg.='<h1>'.&mt('Your submission is in the grading queue.').'</h1>'; |
} elsif ($env{'form.donescreen'}) { |
} elsif ($env{'form.donescreen'}) { |
my $title=&Apache::lonnet::gettitle(); |
$result .= &done_screen($version); |
my @files=split(',',$Apache::lonhomework::history{'resource.'.$version.'.0.bridgetask.portfiles'}); |
|
my (undef,undef,$domain,$user)= |
|
&Apache::lonxml::whichuser(); |
|
my $files = '<ul>'; |
|
foreach my $file (@files) { |
|
my $url="/uploaded/$domain/$user/portfolio$file"; |
|
if (! &Apache::lonnet::stat_file($url)) { |
|
$file = &mt('<font color="red"> Nonexistant file:</font> <tt>[_1]</tt>',$file); |
|
} else { |
|
$file = '<tt>'.$file.'</tt>'; |
|
} |
|
$files .= '<li>'.$file.'</li>'; |
|
} |
|
$files.='</ul>'; |
|
|
|
$result.=<<DONESCREEN; |
|
<h2>$title</h2> |
|
<p> Files submitted: $files </p> |
|
<p> You are now done with this Bridge Task </p> |
|
<hr /> |
|
<p> <a href="/adm/logout">Logout</a> </p> |
|
<p> <a href="/adm/roles">Change to a different course</a> </p> |
|
DONESCREEN |
|
} elsif ($status ne 'NOT_YET_VIEWED') { |
} elsif ($status ne 'NOT_YET_VIEWED') { |
$msg.='<h1>'.&mt('Not open to be viewed').'</h1>'; |
$msg.='<h1>'.&mt('Not open to be viewed').'</h1>'; |
} |
} |
Line 574 DONESCREEN
|
Line 626 DONESCREEN
|
&Apache::lonnet::gettitle($symb).' for '.$uname.' at '.$udom.'</td></tr></table>'; |
&Apache::lonnet::gettitle($symb).' for '.$uname.' at '.$udom.'</td></tr></table>'; |
$form_tag_start.= |
$form_tag_start.= |
'<input type="hidden" name="gradingkey" value="'. |
'<input type="hidden" name="gradingkey" value="'. |
&Apache::lonnet::escape($todo).'" />'; |
&escape($todo).'" />'; |
$Apache::bridgetask::queue_key=$todo; |
$Apache::bridgetask::queue_key=$todo; |
&Apache::structuretags::initialize_storage(); |
&Apache::structuretags::initialize_storage(); |
&Apache::lonhomework::showhash(%Apache::lonhomework::history); |
&Apache::lonhomework::showhash(%Apache::lonhomework::history); |
Line 589 DONESCREEN
|
Line 641 DONESCREEN
|
&mt('Return to resource').'</a></p>'; |
&mt('Return to resource').'</a></p>'; |
if ($status_code eq 'stop') { |
if ($status_code eq 'stop') { |
$result.='<b>'.&mt("Stopped grading.").'</b>'.$back; |
$result.='<b>'.&mt("Stopped grading.").'</b>'.$back; |
|
} elsif ($status_code eq 'cancel') { |
|
$result.='<b>'.&mt("Cancelled grading.").'</b>'.$back; |
|
} elsif ($status_code eq 'never_versioned') { |
|
$result.='<b>'. |
|
&mt("Requested user has never accessed the task."). |
|
'</b>'.$back; |
|
} elsif ($status_code =~ /still_open:(.*)/) { |
|
my $date = &Apache::lonlocal::locallocaltime($1); |
|
$result.='<b>'. |
|
&mt("Task is still open, will close at [_1].",$date). |
|
'</b>'.$back; |
} elsif ($status_code eq 'lock_failed') { |
} elsif ($status_code eq 'lock_failed') { |
$result.='<b>'.&mt("Failed to lock the requested record.") |
$result.='<b>'.&mt("Failed to lock the requested record.") |
.'</b>'.$back; |
.'</b>'.$back; |
Line 609 DONESCREEN
|
Line 672 DONESCREEN
|
} |
} |
} |
} |
$webgrade='no'; |
$webgrade='no'; |
|
} |
|
if (!$todo || $env{'form.cancel'}) { |
my $bodytext=&Apache::lonxml::get_all_text("/task",$parser,$style); |
my $bodytext=&Apache::lonxml::get_all_text("/task",$parser,$style); |
} |
} |
if ($target eq 'webgrade' && defined($env{'form.queue'})) { |
if ($target eq 'webgrade' && defined($env{'form.queue'})) { |
Line 651 DONESCREEN
|
Line 716 DONESCREEN
|
return $result; |
return $result; |
} |
} |
|
|
|
sub get_task_end_time { |
|
my ($queue_entry,$symb,$udom,$uname) = @_; |
|
|
|
my $end_time; |
|
if (my $slot = &slotted_access($queue_entry)) { |
|
my %slot_data=&Apache::lonnet::get_slot($slot); |
|
$end_time = $slot_data{'endtime'}; |
|
} else { |
|
$end_time = &Apache::lonhomework::due_date('0',$symb, |
|
$udom,$uname); |
|
} |
|
return $end_time; |
|
} |
|
|
sub get_key_todo { |
sub get_key_todo { |
my ($target)=@_; |
my ($target)=@_; |
my $todo; |
my $todo; |
Line 699 sub get_key_todo {
|
Line 778 sub get_key_todo {
|
if (!$queue) { |
if (!$queue) { |
$env{'form.queue'} = $queue = 'none'; |
$env{'form.queue'} = $queue = 'none'; |
#not queued so doing either a re or pre grade |
#not queued so doing either a re or pre grade |
|
my %status = &Apache::lonnet::restore($symb,$cid,$udom,$uname); |
|
if ($status{'resource.0.version'} < 1) { |
|
return (undef,'never_versioned'); |
|
} |
return ($gradingkey); |
return ($gradingkey); |
} |
} |
|
|
|
if ($queue) { |
|
my $queue_entry = &get_queue_data($queue,$udom,$uname); |
|
|
|
my $end_time = &get_task_end_time($queue_entry,$symb, |
|
$udom,$uname); |
|
if ($end_time > time) { |
|
return (undef,"still_open:$end_time"); |
|
} |
|
} |
|
|
my $who=&queue_key_locked($queue,$gradingkey); |
my $who=&queue_key_locked($queue,$gradingkey); |
if ($who eq $me) { |
if ($who eq $me) { |
#already have the lock |
#already have the lock |
$env{'form.gradingkey'}=&Apache::lonnet::escape($gradingkey); |
$env{'form.gradingkey'}=&escape($gradingkey); |
|
&Apache::lonxml::debug("already locked"); |
return ($gradingkey); |
return ($gradingkey); |
} |
} |
|
|
if (!defined($who)) { |
if (!defined($who)) { |
if (&lock_key($queue,$gradingkey)) { |
if (&lock_key($queue,$gradingkey)) { |
|
&Apache::lonxml::debug("newly locked"); |
return ($gradingkey); |
return ($gradingkey); |
} else { |
} else { |
return (undef,'lock_failed'); |
return (undef,'lock_failed'); |
Line 730 sub get_key_todo {
|
Line 825 sub get_key_todo {
|
$env{'form.queue'}=$queue='gradingqueue'; |
$env{'form.queue'}=$queue='gradingqueue'; |
} |
} |
|
|
my $gradingkey=&Apache::lonnet::unescape($env{'form.gradingkey'}); |
my $gradingkey=&unescape($env{'form.gradingkey'}); |
|
|
if ($env{'form.queue'} eq 'none') { |
if ($env{'form.queue'} eq 'none') { |
if (defined($env{'form.gradingkey'})) { |
if (defined($env{'form.gradingkey'})) { |
if ($target eq 'webgrade') { |
if ($target eq 'webgrade') { |
if ($env{'form.stop'}) { |
if ($env{'form.stop'}) { |
return (undef,'stop'); |
return (undef,'stop'); |
|
} elsif ($env{'form.cancel'}) { |
|
return (undef,'cancel'); |
} elsif ($env{'form.next'}) { |
} elsif ($env{'form.next'}) { |
return (undef,'select_user'); |
return (undef,'select_user'); |
} |
} |
Line 782 sub get_key_todo {
|
Line 879 sub get_key_todo {
|
|
|
if ($env{'form.queuemode'} ne 'selected') { |
if ($env{'form.queuemode'} ne 'selected') { |
# don't get something new from the queue if they hit the stop button |
# don't get something new from the queue if they hit the stop button |
if (!($env{'form.stop'} && $target eq 'webgrade') |
if (!(($env{'form.cancel'} || $env{'form.stop'}) |
|
&& $target eq 'webgrade') |
&& !$env{'form.gradingaction'}) { |
&& !$env{'form.gradingaction'}) { |
&Apache::lonxml::debug("Getting anew $queue"); |
&Apache::lonxml::debug("Getting anew $queue"); |
return (&get_from_queue($queue)); |
return (&get_from_queue($queue)); |
Line 873 DONEBUTTON
|
Line 971 DONEBUTTON
|
my $man_count=0; |
my $man_count=0; |
my $opt_count=0; |
my $opt_count=0; |
my $opt_passed=0; |
my $opt_passed=0; |
foreach my $dim_id (@Apache::bridgetask::dimensionlist) { |
foreach my $dim (keys(%Apache::bridgetask::top_dimensionlist)) { |
if ($Apache::bridgetask::dimensionmandatory{$dim_id} |
if ($Apache::bridgetask::top_dimensionlist{$dim}{'manadatory'} |
eq 'N') { |
eq 'N') { |
$opt_count++; |
$opt_count++; |
if ($Apache::lonhomework::history{"resource.$version.0.$dim_id.status"} eq 'pass') { |
if ($Apache::lonhomework::history{"resource.$version.0.$dim.status"} eq 'pass') { |
$opt_passed++; |
$opt_passed++; |
} |
} |
} else { |
} else { |
Line 934 DONEBUTTON
|
Line 1032 DONEBUTTON
|
} elsif ($Apache::lonhomework::results{'INTERNAL_store'}) { |
} elsif ($Apache::lonhomework::results{'INTERNAL_store'}) { |
&Apache::structuretags::finalize_storage(); |
&Apache::structuretags::finalize_storage(); |
} |
} |
if ($target eq 'grade' && $env{'form.webgrade'} eq 'yes') { |
if ($target eq 'grade' && $env{'form.webgrade'} eq 'yes' |
|
&& exists($env{'form.cancel'})) { |
|
&check_queue_unlock($env{'form.queue'}); |
|
&Apache::lonxml::debug(" cancelled grading .".$env{'form.queue'}); |
|
} elsif ($target eq 'grade' && $env{'form.webgrade'} eq 'yes' |
|
&& !exists($env{'form.cancel'})) { |
my $optional_required= |
my $optional_required= |
&Apache::lonxml::get_param('OptionalRequired',$parstack, |
&Apache::lonxml::get_param('OptionalRequired',$parstack, |
$safeeval); |
$safeeval); |
Line 943 DONEBUTTON
|
Line 1046 DONEBUTTON
|
my $ungraded=0; |
my $ungraded=0; |
my $review=0; |
my $review=0; |
&Apache::lonhomework::showhash(%Apache::lonhomework::results); |
&Apache::lonhomework::showhash(%Apache::lonhomework::results); |
foreach my $dim_id (@Apache::bridgetask::dimensionlist) { |
foreach my $dim (keys(%Apache::bridgetask::top_dimensionlist)) { |
my $status= |
my $status= |
$Apache::lonhomework::results{"resource.$version.0.$dim_id.status"}; |
$Apache::lonhomework::results{"resource.$version.0.$dim.status"}; |
my $mandatory= |
my $mandatory= |
($Apache::bridgetask::dimensionmandatory{$dim_id} ne 'N'); |
($Apache::bridgetask::top_dimensionlist{$dim}{'manadatory'} ne 'N'); |
if ($status eq 'pass') { |
if ($status eq 'pass') { |
if (!$mandatory) { $optional_passed++; } |
if (!$mandatory) { $optional_passed++; } |
} elsif ($status eq 'fail') { |
} elsif ($status eq 'fail') { |
Line 963 DONEBUTTON
|
Line 1066 DONEBUTTON
|
if ($optional_passed < $optional_required) { |
if ($optional_passed < $optional_required) { |
$mandatory_failed++; |
$mandatory_failed++; |
} |
} |
&Apache::lonxml::debug("all dim ".join(':',@Apache::bridgetask::dimensionlist)."results -> m_f $mandatory_failed o_p $optional_passed u $ungraded r $review"); |
&Apache::lonxml::debug("all dim ".join(':',keys(%Apache::bridgetask::top_dimensionlist))."results -> m_f $mandatory_failed o_p $optional_passed u $ungraded r $review"); |
$Apache::lonhomework::results{'resource.0.regrader'}= |
$Apache::lonhomework::results{'resource.0.regrader'}= |
$env{'user.name'}.':'.$env{'user.domain'}; |
$env{'user.name'}.':'.$env{'user.domain'}; |
if ($review) { |
if ($review) { |
Line 1088 sub check_queue_unlock {
|
Line 1191 sub check_queue_unlock {
|
my $me=$env{'user.name'}.':'.$env{'user.domain'}; |
my $me=$env{'user.name'}.':'.$env{'user.domain'}; |
my $who=&queue_key_locked($queue,$key,$cdom,$cnum); |
my $who=&queue_key_locked($queue,$key,$cdom,$cnum); |
if ($who eq $me) { |
if ($who eq $me) { |
|
&Apache::lonxml::debug("unlocking my own $who"); |
return &Apache::lonnet::del($queue,["$key\0locked"],$cdom,$cnum); |
return &Apache::lonnet::del($queue,["$key\0locked"],$cdom,$cnum); |
} elsif ($allow_not_me) { |
} elsif ($allow_not_me) { |
&Apache::lonxml::debug("unlocking $who by $me"); |
&Apache::lonxml::debug("unlocking $who by $me"); |
Line 1144 sub setup_env_for_other_user {
|
Line 1248 sub setup_env_for_other_user {
|
} |
} |
|
|
sub get_queue_data { |
sub get_queue_data { |
my ($queue)=@_; |
my ($queue,$udom,$uname)=@_; |
my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser(); |
my ($symb,$cid,$other_udom,$other_uname)=&Apache::lonxml::whichuser(); |
|
if (!$uname || !$udom) { |
|
$uname=$other_uname; |
|
$udom =$other_udom; |
|
} |
my $cnum=$env{'course.'.$cid.'.num'}; |
my $cnum=$env{'course.'.$cid.'.num'}; |
my $cdom=$env{'course.'.$cid.'.domain'}; |
my $cdom=$env{'course.'.$cid.'.domain'}; |
my $todo="$symb\0queue\0$uname:$udom"; |
my $todo="$symb\0queue\0$uname:$udom"; |
Line 1254 sub show_queue {
|
Line 1362 sub show_queue {
|
my %queue=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp); |
my %queue=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp); |
my ($tmp)=%queue; |
my ($tmp)=%queue; |
if ($tmp=~/^error: 2 /) { |
if ($tmp=~/^error: 2 /) { |
return "\n<h3>Current Queue - $queue</h3><table border='1'><tr><td>Empty</td></tr></table>"; |
return "\n<h3>Current Queue - $queue</h3>". |
|
&Apache::loncommon::start_data_table(). |
|
&Apache::loncommon::start_data_table_row(). |
|
'<td>'.&mt('Empty').'</td>'. |
|
&Apache::loncommon::end_data_table_row(). |
|
&Apache::loncommon::end_data_table(); |
} |
} |
my $title=&Apache::lonnet::gettitle($symb); |
my $title=&Apache::lonnet::gettitle($symb); |
$result.="\n<h3>Current Queue - $title $queue </h3><table border='1'><tr>"; |
$result.="\n<h3>Current Queue - $title $queue </h3>". |
|
&Apache::loncommon::start_data_table(). |
|
&Apache::loncommon::start_data_table_header_row(); |
if ($with_selects) { $result.="<th>Status</th><th></th>"; } |
if ($with_selects) { $result.="<th>Status</th><th></th>"; } |
$result.="<th>user</th><th>data</th></tr>"; |
$result.="<th>user</th><th>data</th>". |
|
&Apache::loncommon::end_data_table_header_row(); |
foreach my $key (sort(keys(%queue))) { |
foreach my $key (sort(keys(%queue))) { |
my ($symb,$uname,$udom) = &decode_queue_key($key); |
my ($symb,$uname,$udom) = &decode_queue_key($key); |
if (!defined($classlist->{$uname.':'.$udom})) { next; } |
if (!defined($classlist->{$uname.':'.$udom})) { next; } |
Line 1274 sub show_queue {
|
Line 1390 sub show_queue {
|
} |
} |
|
|
if ($key=~/locked$/ && !$with_selects) { |
if ($key=~/locked$/ && !$with_selects) { |
$result.="<tr><td>$uname</td>"; |
$result.= &Apache::loncommon::start_data_table_row(). |
|
"<td>$uname</td>"; |
$result.='<td>'.$queue{$key}.'</td></tr>'; |
$result.='<td>'.$queue{$key}.'</td></tr>'; |
} elsif ($key=~/timestamp$/ && !$with_selects) { |
} elsif ($key=~/timestamp$/ && !$with_selects) { |
$result.="<tr><td></td>"; |
$result.=&Apache::loncommon::start_data_table_row()."<td></td>"; |
$result.='<td>'. |
$result.='<td>'. |
&Apache::lonlocal::locallocaltime($queue{$key})."</td></tr>"; |
&Apache::lonlocal::locallocaltime($queue{$key})."</td></tr>"; |
} elsif ($key!~/(timestamp|locked)$/) { |
} elsif ($key!~/(timestamp|locked)$/) { |
$result.="<tr>"; |
$result.= &Apache::loncommon::start_data_table_row(); |
my ($end_time,$slot_text); |
my ($end_time,$slot_text); |
if (my $slot=&slotted_access($queue{$key})) { |
if (my $slot=&slotted_access($queue{$key})) { |
my %slot_data=&Apache::lonnet::get_slot($slot); |
my %slot_data=&Apache::lonnet::get_slot($slot); |
Line 1292 sub show_queue {
|
Line 1409 sub show_queue {
|
$slot_text = ''; |
$slot_text = ''; |
} |
} |
if ($with_selects) { |
if ($with_selects) { |
my $ekey=&Apache::lonnet::escape($key); |
my $ekey=&escape($key); |
my ($action,$description,$status)=('select',&mt('Select')); |
my ($action,$description,$status)=('select',&mt('Select')); |
if (exists($queue{"$key\0locked"})) { |
if (exists($queue{"$key\0locked"})) { |
my $me=$env{'user.name'}.':'.$env{'user.domain'}; |
my $me=$env{'user.name'}.':'.$env{'user.domain'}; |
Line 1333 FORM
|
Line 1450 FORM
|
" <tt>($uname:$udom)</tt> </td>"; |
" <tt>($uname:$udom)</tt> </td>"; |
$result.='<td>'.$slot_text.' End time: '. |
$result.='<td>'.$slot_text.' End time: '. |
&Apache::lonlocal::locallocaltime($end_time). |
&Apache::lonlocal::locallocaltime($end_time). |
"</td></tr>"; |
"</td>".&Apache::loncommon::end_data_table_row(); |
} |
} |
} |
} |
$result.="</table><hr />\n"; |
$result.= &Apache::loncommon::end_data_table()."<hr />\n"; |
return $result; |
return $result; |
} |
} |
|
|
Line 1491 sub pick_from_queue_data {
|
Line 1608 sub pick_from_queue_data {
|
|
|
sub find_mid_grade { |
sub find_mid_grade { |
my ($queue,$symb,$cdom,$cnum)=@_; |
my ($queue,$symb,$cdom,$cnum)=@_; |
my $todo=&Apache::lonnet::unescape($env{'form.gradingkey'}); |
my $todo=&unescape($env{'form.gradingkey'}); |
my $me=$env{'user.name'}.':'.$env{'user.domain'}; |
my $me=$env{'user.name'}.':'.$env{'user.domain'}; |
if ($todo) { |
if ($todo) { |
my $who=&queue_key_locked($queue,$todo,$cdom,$cnum); |
my $who=&queue_key_locked($queue,$todo,$cdom,$cnum); |
Line 1640 sub select_user {
|
Line 1757 sub select_user {
|
$result.='<p> Showing only sections <tt>'.join(', ',@chosen_sections). |
$result.='<p> Showing only sections <tt>'.join(', ',@chosen_sections). |
'</tt>.</p> '."\n"; |
'</tt>.</p> '."\n"; |
} |
} |
$result.='<table border="1">'; |
$result.=&Apache::loncommon::start_data_table(); |
|
|
foreach my $student (sort {lc($classlist->{$a}[&Apache::loncoursedata::CL_FULLNAME()]) cmp lc($classlist->{$b}[&Apache::loncoursedata::CL_FULLNAME()]) } (keys(%$classlist))) { |
foreach my $student (sort {lc($classlist->{$a}[&Apache::loncoursedata::CL_FULLNAME()]) cmp lc($classlist->{$b}[&Apache::loncoursedata::CL_FULLNAME()]) } (keys(%$classlist))) { |
my ($uname,$udom) = split(/:/,$student); |
my ($uname,$udom) = split(/:/,$student); |
Line 1663 sub select_user {
|
Line 1780 sub select_user {
|
} |
} |
} |
} |
my $todo = |
my $todo = |
&Apache::lonnet::escape(&encode_queue_key($symb,$udom,$uname)); |
&escape(&encode_queue_key($symb,$udom,$uname)); |
if ($cannot_grade) { |
if ($cannot_grade) { |
$result.='<tr><td> </td><td>'.$classlist->{$student}[&Apache::loncoursedata::CL_FULLNAME()]. |
$result.=&Apache::loncommon::start_data_table_row(). |
|
'<td> </td><td>'.$classlist->{$student}[&Apache::loncoursedata::CL_FULLNAME()]. |
'</td><td>'; |
'</td><td>'; |
} else { |
} else { |
my $seclist; |
my $seclist; |
Line 1673 sub select_user {
|
Line 1791 sub select_user {
|
$seclist.='<input type="hidden" name="chosensections" |
$seclist.='<input type="hidden" name="chosensections" |
value="'.$sec.'" />'; |
value="'.$sec.'" />'; |
} |
} |
|
$result.=&Apache::loncommon::start_data_table_row(); |
$result.=<<RESULT; |
$result.=<<RESULT; |
<tr> |
|
<td> |
<td> |
<form style="display: inline" method="post"> |
<form style="display: inline" method="post"> |
<input type="hidden" name="gradingkey" value="$todo" /> |
<input type="hidden" name="gradingkey" value="$todo" /> |
Line 1723 RESULT
|
Line 1841 RESULT
|
} else { |
} else { |
$result.=" "; |
$result.=" "; |
} |
} |
$result.= '</td></tr>'; |
$result.= '</td>'.&Apache::loncommon::end_data_table_row(); |
} |
} |
$result.='</table>'; |
$result.=&Apache::loncommon::end_data_table(); |
return $result; |
return $result; |
} |
} |
|
|
Line 1770 sub end_ClosingParagraph {
|
Line 1888 sub end_ClosingParagraph {
|
return $result; |
return $result; |
} |
} |
|
|
|
sub get_dim_id { |
|
return $Apache::bridgetask::dimension[-1]; |
|
} |
|
|
sub get_id { |
sub get_id { |
my ($parstack,$safeeval)=@_; |
my ($parstack,$safeeval)=@_; |
my $id=&Apache::lonxml::get_param('id',$parstack,$safeeval); |
my $id=&Apache::lonxml::get_param('id',$parstack,$safeeval); |
Line 1777 sub get_id {
|
Line 1899 sub get_id {
|
return $id; |
return $id; |
} |
} |
|
|
my %dimension; |
sub start_Setup { |
|
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
|
#undef(%dimension); |
|
my $dim = &get_id($parstack,$safeeval); |
|
push(@Apache::bridgetask::dimension,$dim); |
|
&Apache::lonxml::startredirection(); |
|
return &internal_location($dim); |
|
} |
sub start_Question { return &start_Dimension(@_); } |
sub start_Question { return &start_Dimension(@_); } |
sub start_Dimension { |
sub start_Dimension { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
undef(%dimension); |
my $dim = &get_id($parstack,$safeeval); |
my $dim_id=&get_id($parstack,$safeeval); |
my $previous_dim; |
$Apache::bridgetask::dimension=$dim_id; |
if (@Apache::bridgetask::dimension) { |
push(@Apache::bridgetask::dimensionlist,$dim_id); |
$previous_dim = $Apache::bridgetask::dimension[-1]; |
undef(@Apache::bridgetask::instance); |
push(@{$Apache::bridgetask::dimension{$previous_dim}{'contains'}}, |
$Apache::bridgetask::dimensionmandatory{$dim_id}= |
$dim); |
&Apache::lonxml::get_param('Mandatory',$parstack,$safeeval); |
$dimension{$previous_dim}{'criteria.'.$dim}=''; |
|
$dimension{$previous_dim}{'criteria.'.$dim.'.type'}='dimension'; |
|
$dimension{$previous_dim}{'criteria.'.$dim.'.mandatory'}= |
|
&Apache::lonxml::get_param('Mandatory',$parstack,$safeeval); |
|
push(@{$dimension{$previous_dim}{'criterias'}},$dim); |
|
$dimension{$dim}{'nested'}=$previous_dim; |
|
} else { |
|
$Apache::bridgetask::top_dimensionlist{$dim}{'manadatory'}= |
|
&Apache::lonxml::get_param('Mandatory',$parstack,$safeeval); |
|
} |
|
push(@Apache::bridgetask::dimension,$dim); |
&Apache::lonxml::startredirection(); |
&Apache::lonxml::startredirection(); |
return &internal_location($dim_id); |
return &internal_location($dim); |
|
} |
|
|
|
sub start_QuestionText { |
|
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
|
my $dim = &get_dim_id(); |
|
my $text=&Apache::lonxml::get_all_text('/questiontext',$parser,$style); |
|
if ($target eq 'grade' || $target eq 'web' || $target eq 'webgrade') { |
|
$dimension{$dim}{'questiontext'}=$text; |
|
} |
|
return ''; |
|
} |
|
|
|
sub end_QuestionText { |
|
return ''; |
} |
} |
|
|
sub get_instance { |
sub get_instance { |
Line 1799 sub get_instance {
|
Line 1952 sub get_instance {
|
$rand_alg eq '64bit2' || $rand_alg eq '64bit3' || |
$rand_alg eq '64bit2' || $rand_alg eq '64bit3' || |
$rand_alg eq '64bit4' ) { |
$rand_alg eq '64bit4' ) { |
&Apache::response::pushrandomnumber(); |
&Apache::response::pushrandomnumber(); |
my @order=&Math::Random::random_permutation(@{$dimension{'instances'}}); |
my @order=&Math::Random::random_permutation(@{$dimension{$dim}{'instances'}}); |
my $num=@order; |
my $num=@order; |
my $version=&get_version(); |
my $version=&get_version(); |
my $which=($version-1)%$num; |
my $which=($version-1)%$num; |
Line 1811 sub get_instance {
|
Line 1964 sub get_instance {
|
if (defined($instance)) { return $instance; } |
if (defined($instance)) { return $instance; } |
|
|
&Apache::response::pushrandomnumber(); |
&Apache::response::pushrandomnumber(); |
my @instances = @{$dimension{'instances'}}; |
my @instances = @{$dimension{$dim}{'instances'}}; |
# remove disabled instances |
# remove disabled instances |
for (my $i=0; $i < $#instances; $i++) { |
for (my $i=0; $i < $#instances; $i++) { |
if ($dimension{$instances[$i].'.disabled'}) { |
if ($dimension{$dim}{$instances[$i].'.disabled'}) { |
splice(@instances,$i,1); |
splice(@instances,$i,1); |
$i--; |
$i--; |
} |
} |
Line 1831 sub get_instance {
|
Line 1984 sub get_instance {
|
} |
} |
} |
} |
|
|
|
sub get_criteria { |
|
my ($what,$version,$dim,$id) = @_; |
|
my $type = $dimension{$dim}{'criteria.'.$id.'.type'}; |
|
my $prefix = ($type eq 'criteria') ? "$dim.$id" |
|
: "$id"; |
|
my $entry = "resource.$version.0.$prefix.$what"; |
|
if (exists($Apache::lonhomework::results{$entry})) { |
|
return $Apache::lonhomework::results{$entry}; |
|
} |
|
return $Apache::lonhomework::history{$entry}; |
|
} |
|
|
{ |
{ |
my $last_link; |
my $last_link; |
sub link { |
sub link { |
Line 1847 sub get_instance {
|
Line 2012 sub get_instance {
|
my $version=&get_version(); |
my $version=&get_version(); |
if ($target eq 'web') { |
if ($target eq 'web') { |
@Apache::scripttag::parser_env = @_; |
@Apache::scripttag::parser_env = @_; |
$result.=&Apache::scripttag::xmlparse($dimension{'intro'}); |
$result.=&Apache::scripttag::xmlparse($dimension{$dim}{'intro'}); |
my @instances = $instance; |
my @instances = $instance; |
if (&Apache::response::showallfoils()) { |
if (&Apache::response::showallfoils()) { |
@instances = @{$dimension{'instances'}}; |
@instances = @{$dimension{$dim}{'instances'}}; |
} |
} |
|
my $shown_question_text; |
foreach my $instance (@instances) { |
foreach my $instance (@instances) { |
@Apache::scripttag::parser_env = @_; |
@Apache::scripttag::parser_env = @_; |
$result.=&Apache::scripttag::xmlparse($dimension{$instance.'.text'}); |
$result.=&Apache::scripttag::xmlparse($dimension{$dim}{$instance.'.text'}); |
if ($Apache::lonhomework::history{"resource.$version.0.status"} eq 'pass' || |
@Apache::scripttag::parser_env = @_; |
$Apache::lonhomework::history{"resource.$version.0.status"} eq 'fail') { |
$result.=&Apache::scripttag::xmlparse($dimension{$dim}{'questiontext'}); |
|
|
|
my $task_status = |
|
$Apache::lonhomework::history{"resource.$version.0.status"}; |
|
if ($task_status eq 'pass' || $task_status eq 'fail') { |
|
|
my $dim_status=$Apache::lonhomework::history{"resource.$version.0.$dim.status"}; |
my $dim_status=$Apache::lonhomework::history{"resource.$version.0.$dim.status"}; |
my $mandatory='Mandatory'; |
my $mandatory='Mandatory'; |
Line 1874 sub get_instance {
|
Line 2044 sub get_instance {
|
my $man_passed=0; |
my $man_passed=0; |
my $opt_count=0; |
my $opt_count=0; |
my $opt_passed=0; |
my $opt_passed=0; |
foreach my $id ( @{$dimension{$instance.'.criterias'}}, |
foreach my $id ( @{$dimension{$dim}{$instance.'.criterias'}}, |
@{$dimension{'criterias'}} ) { |
@{$dimension{$dim}{'criterias'}} ) { |
if ($dimension{'criteria.'.$id.'.mandatory'} |
my $status = &get_criteria('status',$version,$dim,$id); |
|
if ($dimension{$dim}{'criteria.'.$id.'.mandatory'} |
eq 'N') { |
eq 'N') { |
$opt_count++; |
$opt_count++; |
if ($Apache::lonhomework::history{"resource.$version.0.$dim.$id.status"} eq 'pass') { |
if ($status eq 'pass') { $opt_passed++; } |
$opt_passed++; |
|
} |
|
} else { |
} else { |
$man_count++; |
$man_count++; |
if ($Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.status"} eq 'pass') { |
if ($status eq 'pass') { $man_passed++; } |
$man_passed++; |
|
} |
|
} |
} |
} |
} |
if ($man_passed eq $man_count) { $man_passed='all'; } |
if ($man_passed eq $man_count) { $man_passed='all'; } |
|
|
my $opt_req=$dimension{$instance.'.optionalrequired'}; |
my $opt_req=$dimension{$dim}{$instance.'.optionalrequired'}; |
if ($opt_req !~ /\S/) { |
if ($opt_req !~ /\S/) { |
$opt_req= |
$opt_req= |
&Apache::lonxml::get_param('OptionalRequired', |
&Apache::lonxml::get_param('OptionalRequired', |
Line 1903 sub get_instance {
|
Line 2070 sub get_instance {
|
my $internal_location=&internal_location($dim); |
my $internal_location=&internal_location($dim); |
$result=~s/\Q$internal_location\E/$dim_info/; |
$result=~s/\Q$internal_location\E/$dim_info/; |
|
|
foreach my $id (@{$dimension{$instance.'.criterias'}}, |
foreach my $id (@{$dimension{$dim}{$instance.'.criterias'}}, |
@{$dimension{'criterias'}}) { |
@{$dimension{$dim}{'criterias'}}) { |
my $status=$Apache::lonhomework::history{"resource.$version.0.$dim.$id.status"}; |
my $type = $dimension{$dim}{'criteria.'.$id.'.type'}; |
my $comment=$Apache::lonhomework::history{"resource.$version.0.$dim.$id.comment"}; |
if ($type eq 'dimension') { |
my $mandatory=($dimension{'criteria.'.$id.'.mandatory'} ne 'N'); |
$result.=$dimension{$id}{'result'}; |
|
next; |
|
} |
|
my $status= &get_criteria('status', $version,$dim,$id); |
|
my $comment=&get_criteria('comment',$version,$dim,$id); |
|
my $mandatory=($dimension{$dim}{'criteria.'.$id.'.mandatory'} ne 'N'); |
if ($mandatory) { |
if ($mandatory) { |
$mandatory='Mandatory'; |
$mandatory='Mandatory'; |
} else { |
} else { |
Line 1924 sub get_instance {
|
Line 2096 sub get_instance {
|
'<div class="LC_'.$status.' LC_criteria"><h4>' |
'<div class="LC_'.$status.' LC_criteria"><h4>' |
.$mandatory.' Criteria</h4><p>'; |
.$mandatory.' Criteria</h4><p>'; |
@Apache::scripttag::parser_env = @_; |
@Apache::scripttag::parser_env = @_; |
$result.=&Apache::scripttag::xmlparse($dimension{'criteria.'.$id}); |
$result.=&Apache::scripttag::xmlparse($dimension{$dim}{'criteria.'.$id}); |
$result.='</p><p class="LC_grade">'.$status_display.'</p>'; |
$result.='</p><p class="LC_grade">'.$status_display.'</p>'; |
if ($Apache::lonhomework::history{"resource.$version.0.$dim.$id.comment"}) { |
if ($comment) { |
$result.='<p class="LC_comment">'.&mt('Comment: [_1]',$Apache::lonhomework::history{"resource.$version.0.$dim.$id.comment"}).'</p>'; |
$result.='<p class="LC_comment">'. |
|
&mt('Comment: [_1]',$comment).'</p>'; |
} |
} |
$result.='</div>'; |
$result.='</div>'; |
} |
} |
} |
} |
} |
} |
|
if (exists($dimension{$dim}{'nested'})) { |
|
$dimension{$dim}{'result'}=$result; |
|
undef($result); |
|
} |
} elsif ($target eq 'webgrade') { |
} elsif ($target eq 'webgrade') { |
# in case of any side effects that we need |
# in case of any side effects that we need |
@Apache::scripttag::parser_env = @_; |
@Apache::scripttag::parser_env = @_; |
&Apache::scripttag::xmlparse($dimension{'intro'}); |
&Apache::scripttag::xmlparse($dimension{$dim}{'intro'}); |
@Apache::scripttag::parser_env = @_; |
@Apache::scripttag::parser_env = @_; |
&Apache::scripttag::xmlparse($dimension{$instance.'.text'}); |
&Apache::scripttag::xmlparse($dimension{$dim}{$instance.'.text'}); |
foreach my $id (@{$dimension{$instance.'.criterias'}}, |
@Apache::scripttag::parser_env = @_; |
@{$dimension{'criterias'}} ) { |
&Apache::scripttag::xmlparse($dimension{$dim}{'questiontext'}); |
|
foreach my $id (@{$dimension{$dim}{$instance.'.criterias'}}, |
|
@{$dimension{$dim}{'criterias'}} ) { |
|
my $type = $dimension{$dim}{'criteria.'.$id.'.type'}; |
|
if ($type eq 'dimension') { |
|
# dimensional 'criteria' don't get assigned grades |
|
$result.=$dimension{$id}{'result'}; |
|
next; |
|
} |
|
|
my $link=&link($id); |
my $link=&link($id); |
my $status=$Apache::lonhomework::history{"resource.$version.0.$dim.$id.status"}; |
my $status= &get_criteria('status',$version,$dim,$id); |
$result.='<div class="LC_GRADING_criteria" id="'.$link.'">'."\n". |
$result.='<div class="LC_GRADING_criteria" id="'.$link.'">'."\n". |
'<div class="LC_GRADING_criteriatext" id="next_'.$last_link.'">'."\n"; |
'<div class="LC_GRADING_criteriatext" id="next_'.$last_link.'">'."\n"; |
@Apache::scripttag::parser_env = @_; |
@Apache::scripttag::parser_env = @_; |
$result.=&Apache::scripttag::xmlparse($dimension{'criteria.'.$id}); |
$result.=&Apache::scripttag::xmlparse($dimension{$dim}{'criteria.'.$id}); |
$result.='</div>'."\n". |
$result.='</div>'."\n". |
#$dimension{'criteria.'.$id}. |
#$dimension{$dim}{'criteria.'.$id}. |
'<div class="LC_GRADING_grade">'."\n". |
'<div class="LC_GRADING_grade">'."\n". |
'<label class="LC_GRADING_ungraded"><input type="radio" name="HWVAL_'.$link.'" value="ungraded" '.($status eq 'ungraded' || !$status ? 'checked="checked"':'').' />'.&mt('Ungraded').'</label>'."\n". |
'<label class="LC_GRADING_ungraded"><input type="radio" name="HWVAL_'.$link.'" value="ungraded" '.($status eq 'ungraded' || !$status ? 'checked="checked"':'').' />'.&mt('Ungraded').'</label>'."\n". |
'<label class="LC_GRADING_fail"><input type="radio" name="HWVAL_'.$link.'" value="fail" '.($status eq 'fail' ? 'checked="checked"':'').' />'.&mt('Fail').'</label>'."\n". |
'<label class="LC_GRADING_fail"><input type="radio" name="HWVAL_'.$link.'" value="fail" '.($status eq 'fail' ? 'checked="checked"':'').' />'.&mt('Fail').'</label>'."\n". |
Line 1956 sub get_instance {
|
Line 2142 sub get_instance {
|
'<label class="LC_GRADING_review"><input type="radio" name="HWVAL_'.$link.'" value="review" '.($status eq 'review' ? 'checked="checked"':'').' />'.&mt('Review').'</label>'."\n". |
'<label class="LC_GRADING_review"><input type="radio" name="HWVAL_'.$link.'" value="review" '.($status eq 'review' ? 'checked="checked"':'').' />'.&mt('Review').'</label>'."\n". |
'</div>'."\n". |
'</div>'."\n". |
'<label class="LC_GRADING_comment">'.&mt('Additional Comment for Student')."\n". |
'<label class="LC_GRADING_comment">'.&mt('Additional Comment for Student')."\n". |
'<textarea class="LC_GRADING_comment_area" name="HWVAL_comment_'.$link.'">'.&HTML::Entities::encode($Apache::lonhomework::history{"resource.$version.0.$dim.$id.comment"}).'</textarea>'."\n". |
'<textarea class="LC_GRADING_comment_area" name="HWVAL_comment_'.$link.'">'.&HTML::Entities::encode(&get_criteria('comment',$version,$dim,$id),'<>"&').'</textarea>'."\n". |
'</label>'."\n". |
'</label>'."\n". |
'<ul class="LC_GRADING_navbuttons">'."\n". |
'<ul class="LC_GRADING_navbuttons">'."\n". |
'<li><a href="#'.$last_link.'">Prev</a></li>'."\n". |
'<li><a href="#'.$last_link.'">Prev</a></li>'."\n". |
Line 1966 sub get_instance {
|
Line 2152 sub get_instance {
|
$result.=&grading_history($version,$dim,$id); |
$result.=&grading_history($version,$dim,$id); |
$last_link=$link; |
$last_link=$link; |
} |
} |
|
if (exists($dimension{$dim}{'nested'})) { |
|
$dimension{$dim}{'result'}=$result; |
|
undef($result); |
|
} |
} elsif ($target eq 'grade' && $env{'form.webgrade'}) { |
} elsif ($target eq 'grade' && $env{'form.webgrade'}) { |
my $optional_passed=0; |
my $optional_passed=0; |
my $mandatory_failed=0; |
my $mandatory_failed=0; |
Line 1973 sub get_instance {
|
Line 2163 sub get_instance {
|
my $review=0; |
my $review=0; |
|
|
@Apache::scripttag::parser_env = @_; |
@Apache::scripttag::parser_env = @_; |
$result.=&Apache::scripttag::xmlparse($dimension{'intro'}); |
$result.=&Apache::scripttag::xmlparse($dimension{$dim}{'intro'}); |
foreach my $id (@{$dimension{$instance.'.criterias'}}, |
@Apache::scripttag::parser_env = @_; |
@{$dimension{'criterias'}}) { |
$result.=&Apache::scripttag::xmlparse($dimension{$dim}{$instance.'.text'}); |
|
@Apache::scripttag::parser_env = @_; |
|
&Apache::scripttag::xmlparse($dimension{$dim}{'questiontext'}); |
|
|
|
foreach my $id (@{$dimension{$dim}{$instance.'.criterias'}}, |
|
@{$dimension{$dim}{'criterias'}}) { |
my $link=&link($id); |
my $link=&link($id); |
@Apache::scripttag::parser_env = @_; |
|
$result.=&Apache::scripttag::xmlparse($dimension{$instance.'.text'}); |
my $type = $dimension{$dim}{'criteria.'.$id.'.type'}; |
my $status=$Apache::lonhomework::results{"resource.$version.0.$dim.$id.status"}=$env{'form.HWVAL_'.$link}; |
if ($type eq 'criteria') { |
$Apache::lonhomework::results{"resource.$version.0.$dim.$id.comment"}=$env{'form.HWVAL_comment_'.$link}; |
# dimensional 'criteria' don't get assigned grades |
my $mandatory=($dimension{'criteria.'.$id.'.mandatory'} ne 'N'); |
$Apache::lonhomework::results{"resource.$version.0.$dim.$id.status"}=$env{'form.HWVAL_'.$link}; |
|
$Apache::lonhomework::results{"resource.$version.0.$dim.$id.comment"}=$env{'form.HWVAL_comment_'.$link}; |
|
} |
|
my $status= &get_criteria('status',$version,$dim,$id); |
|
|
|
my $mandatory=($dimension{$dim}{'criteria.'.$id.'.mandatory'} ne 'N'); |
if ($status eq 'pass') { |
if ($status eq 'pass') { |
if (!$mandatory) { $optional_passed++; } |
if (!$mandatory) { $optional_passed++; } |
} elsif ($status eq 'fail') { |
} elsif ($status eq 'fail') { |
Line 1995 sub get_instance {
|
Line 2195 sub get_instance {
|
} |
} |
} |
} |
# FIXME optional required can apply to only <instance> right now... |
# FIXME optional required can apply to only <instance> right now... |
my $opt_req=$dimension{$instance.'.optionalrequired'}; |
my $opt_req=$dimension{$dim}{$instance.'.optionalrequired'}; |
if ($opt_req !~ /\S/) { |
if ($opt_req !~ /\S/) { |
$opt_req= |
$opt_req= |
&Apache::lonxml::get_param('OptionalRequired', |
&Apache::lonxml::get_param('OptionalRequired', |
Line 2005 sub get_instance {
|
Line 2205 sub get_instance {
|
if ($optional_passed < $opt_req) { |
if ($optional_passed < $opt_req) { |
$mandatory_failed++; |
$mandatory_failed++; |
} |
} |
&Apache::lonxml::debug("all instance ".join(':',@{$dimension{$instance.'.criterias'}})." results -> m_f $mandatory_failed o_p $optional_passed u $ungraded r $review"); |
&Apache::lonxml::debug("all instance ".join(':',@{$dimension{$dim}{$instance.'.criterias'}})." results -> m_f $mandatory_failed o_p $optional_passed u $ungraded r $review"); |
if ($review) { |
if ($review) { |
$Apache::lonhomework::results{"resource.$version.0.$dim.status"}= |
$Apache::lonhomework::results{"resource.$version.0.$dim.status"}= |
'review'; |
'review'; |
Line 2023 sub get_instance {
|
Line 2223 sub get_instance {
|
# any other targets no output |
# any other targets no output |
undef($result); |
undef($result); |
} |
} |
|
pop(@Apache::bridgetask::dimension); |
|
return $result; |
|
} |
|
|
|
sub end_Setup { |
|
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
|
my $result=&Apache::lonxml::endredirection(); |
|
my $dim=&get_id($parstack,$safeeval); |
|
my $instance=&get_instance($dim); |
|
my $version=&get_version(); |
|
if ($target eq 'web') { |
|
@Apache::scripttag::parser_env = @_; |
|
$result.=&Apache::scripttag::xmlparse($dimension{$dim}{'intro'}); |
|
my @instances = $instance; |
|
if (&Apache::response::showallfoils()) { |
|
@instances = @{$dimension{$dim}{'instances'}}; |
|
} |
|
foreach my $instance (@instances) { |
|
@Apache::scripttag::parser_env = @_; |
|
$result.=&Apache::scripttag::xmlparse($dimension{$dim}{$instance.'.text'}); |
|
@Apache::scripttag::parser_env = @_; |
|
$result.=&Apache::scripttag::xmlparse($dimension{$dim}{'questiontext'}); |
|
} |
|
} elsif ($target eq 'webgrade' |
|
|| $target eq 'grade' && $env{'form.webgrade'}) { |
|
# in case of any side effects that we need |
|
@Apache::scripttag::parser_env = @_; |
|
&Apache::scripttag::xmlparse($dimension{$dim}{'intro'}); |
|
@Apache::scripttag::parser_env = @_; |
|
&Apache::scripttag::xmlparse($dimension{$dim}{$instance.'.text'}); |
|
@Apache::scripttag::parser_env = @_; |
|
&Apache::scripttag::xmlparse($dimension{$dim}{'questiontext'}); |
|
} else { |
|
# any other targets no output |
|
undef($result); |
|
} |
|
pop(@Apache::bridgetask::dimension); |
return $result; |
return $result; |
} |
} |
} |
} |
Line 2062 sub grading_history {
|
Line 2299 sub grading_history {
|
sub start_IntroParagraph { |
sub start_IntroParagraph { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my $result; |
my $result; |
|
my $dim = &get_dim_id(); |
if ($target eq 'grade' || $target eq 'web' || $target eq 'webgrade') { |
if ($target eq 'grade' || $target eq 'web' || $target eq 'webgrade') { |
if ($tagstack->[-2] eq 'Dimension' || $tagstack->[-2] eq 'Question' ) { |
if ($tagstack->[-2] eq 'Dimension' || $tagstack->[-2] eq 'Question' ) { |
$dimension{'intro'}= |
$dimension{$dim}{'intro'}= |
&Apache::lonxml::get_all_text('/introparagraph', |
&Apache::lonxml::get_all_text('/introparagraph', |
$parser,$style); |
$parser,$style); |
} elsif ($tagstack->[-2] eq 'Task' && $target eq 'webgrade') { |
} elsif ($tagstack->[-2] eq 'Task' && $target eq 'webgrade') { |
Line 2084 sub end_IntroParagraph {
|
Line 2322 sub end_IntroParagraph {
|
|
|
sub start_Instance { |
sub start_Instance { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my $id=&get_id($parstack,$safeeval); |
my $dim = &get_dim_id(); |
push(@{$dimension{'instances'}},$id); |
my $id = &get_id($parstack,$safeeval); |
push(@Apache::bridgetask::instance,$id); |
push(@{$dimension{$dim}{'instances'}},$id); |
|
push(@{$Apache::bridgetask::instance{$dim}},$id); |
push(@Apache::bridgetask::instancelist,$id); |
push(@Apache::bridgetask::instancelist,$id); |
$dimension{$id.'.optionalrequired'}= |
$dimension{$dim}{$id.'.optionalrequired'}= |
&Apache::lonxml::get_param('OptionalRequired',$parstack,$safeeval); |
&Apache::lonxml::get_param('OptionalRequired',$parstack,$safeeval); |
my $disabled = &Apache::lonxml::get_param('Disabled',$parstack,$safeeval); |
my $disabled = &Apache::lonxml::get_param('Disabled',$parstack,$safeeval); |
if (lc($disabled) eq 'yes') { |
if (lc($disabled) eq 'yes') { |
$dimension{$id.'.disabled'}='1'; |
$dimension{$dim}{$id.'.disabled'}='1'; |
} |
} |
return ''; |
return ''; |
} |
} |
Line 2102 sub end_Instance {
|
Line 2341 sub end_Instance {
|
|
|
sub start_InstanceText { |
sub start_InstanceText { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my $instance_id=$Apache::bridgetask::instance[-1]; |
my $dim = &get_dim_id(); |
|
my $instance_id=$Apache::bridgetask::instance{$dim}[-1]; |
my $text=&Apache::lonxml::get_all_text('/instancetext',$parser,$style); |
my $text=&Apache::lonxml::get_all_text('/instancetext',$parser,$style); |
if ($target eq 'grade' || $target eq 'web' || $target eq 'webgrade') { |
if ($target eq 'grade' || $target eq 'web' || $target eq 'webgrade') { |
$dimension{$instance_id.'.text'}=$text; |
$dimension{$dim}{$instance_id.'.text'}=$text; |
} |
} |
return ''; |
return ''; |
} |
} |
Line 2118 sub start_Criteria {
|
Line 2358 sub start_Criteria {
|
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my $criteria=&Apache::lonxml::get_all_text('/criteria',$parser,$style); |
my $criteria=&Apache::lonxml::get_all_text('/criteria',$parser,$style); |
if ($target eq 'web' || $target eq 'webgrade' || $target eq 'grade') { |
if ($target eq 'web' || $target eq 'webgrade' || $target eq 'grade') { |
|
my $dim = &get_dim_id(); |
my $id=&get_id($parstack,$safeeval); |
my $id=&get_id($parstack,$safeeval); |
|
&Apache::lonxml::debug("Criteria $id with $dim"); |
if (&Apache::londefdef::is_inside_of($tagstack,'Instance')) { |
if (&Apache::londefdef::is_inside_of($tagstack,'Instance')) { |
my $instance_id=$Apache::bridgetask::instance[-1]; |
my $instance_id=$Apache::bridgetask::instance{$dim}[-1]; |
$dimension{"criteria.$instance_id.$id"}=$criteria; |
$dimension{$dim}{"criteria.$instance_id.$id"}=$criteria; |
$dimension{"criteria.$instance_id.$id.mandatory"}= |
$dimension{$dim}{"criteria.$instance_id.$id.type"}='criteria'; |
|
$dimension{$dim}{"criteria.$instance_id.$id.mandatory"}= |
&Apache::lonxml::get_param('Mandatory',$parstack,$safeeval); |
&Apache::lonxml::get_param('Mandatory',$parstack,$safeeval); |
push(@{$dimension{$instance_id.'.criterias'}},"$instance_id.$id"); |
push(@{$dimension{$dim}{$instance_id.'.criterias'}},"$instance_id.$id"); |
} else { |
} else { |
$dimension{'criteria.'.$id}=$criteria; |
$dimension{$dim}{'criteria.'.$id}=$criteria; |
$dimension{'criteria.'.$id.'.mandatory'}= |
$dimension{$dim}{'criteria.'.$id.'.type'}='criteria'; |
|
$dimension{$dim}{'criteria.'.$id.'.mandatory'}= |
&Apache::lonxml::get_param('Mandatory',$parstack,$safeeval); |
&Apache::lonxml::get_param('Mandatory',$parstack,$safeeval); |
push(@{$dimension{'criterias'}},$id); |
push(@{$dimension{$dim}{'criterias'}},$id); |
} |
} |
} |
} |
return ''; |
return ''; |