version 1.156, 2006/05/25 19:55:10
|
version 1.160, 2006/06/01 19:22:29
|
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','Instance','InstanceText','Criteria','ClosingParagraph')); |
} |
} |
|
|
sub initialize_bridgetask { |
sub initialize_bridgetask { |
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 574 DONESCREEN
|
Line 577 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 705 sub get_key_todo {
|
Line 708 sub get_key_todo {
|
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); |
return ($gradingkey); |
return ($gradingkey); |
} |
} |
|
|
Line 730 sub get_key_todo {
|
Line 733 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'})) { |
Line 1202 sub get_limited_classlist {
|
Line 1205 sub get_limited_classlist {
|
my ($sections) = @_; |
my ($sections) = @_; |
|
|
my $classlist = &Apache::loncoursedata::get_classlist(); |
my $classlist = &Apache::loncoursedata::get_classlist(); |
|
foreach my $student (keys(%$classlist)) { |
|
if ( $classlist->{$student}[&Apache::loncoursedata::CL_STATUS()] |
|
ne 'Active') { |
|
delete($classlist->{$student}); |
|
} |
|
} |
|
|
if (!grep('all',@{ $sections })) { |
if (ref($sections) && !grep('all',@{ $sections })) { |
foreach my $student (keys(%$classlist)) { |
foreach my $student (keys(%$classlist)) { |
my $section = |
my $section = |
$classlist->{$student}[&Apache::loncoursedata::CL_SECTION()]; |
$classlist->{$student}[&Apache::loncoursedata::CL_SECTION()]; |
Line 1248 sub show_queue {
|
Line 1257 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 1268 sub show_queue {
|
Line 1285 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 1286 sub show_queue {
|
Line 1304 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 1327 FORM
|
Line 1345 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 1341 sub get_queue_counts {
|
Line 1359 sub get_queue_counts {
|
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 $classlist=&Apache::loncoursedata::get_classlist(); |
my $classlist=&get_limited_classlist(); |
|
|
my $regexp="^$symb\0"; |
my $regexp="^$symb\0"; |
my %queue=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp); |
my %queue=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp); |
Line 1485 sub pick_from_queue_data {
|
Line 1503 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 1526 sub get_queue_symb_status {
|
Line 1544 sub get_queue_symb_status {
|
$cnum=$env{'course.'.$cid.'.num'}; |
$cnum=$env{'course.'.$cid.'.num'}; |
$cdom=$env{'course.'.$cid.'.domain'}; |
$cdom=$env{'course.'.$cid.'.domain'}; |
} |
} |
my $classlist=&Apache::loncoursedata::get_classlist(); |
my $classlist=&get_limited_classlist(); |
|
|
my $regexp="^$symb\0"; |
my $regexp="^$symb\0"; |
my %queue=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp); |
my %queue=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp); |
Line 1554 sub get_from_queue {
|
Line 1572 sub get_from_queue {
|
if ($todo) { return $todo; } |
if ($todo) { return $todo; } |
my $attempts=0; |
my $attempts=0; |
|
|
my $classlist=&Apache::loncoursedata::get_classlist(); |
my $classlist=&get_limited_classlist(); |
|
|
while (1) { |
while (1) { |
if ($attempts > 2) { |
if ($attempts > 2) { |
Line 1634 sub select_user {
|
Line 1652 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 1657 sub select_user {
|
Line 1675 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 1667 sub select_user {
|
Line 1686 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 1717 RESULT
|
Line 1736 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 1786 sub start_Dimension {
|
Line 1805 sub start_Dimension {
|
return &internal_location($dim_id); |
return &internal_location($dim_id); |
} |
} |
|
|
|
sub start_QuestionText { |
|
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
|
my $dim_id=$Apache::bridgetask::dimension; |
|
my $text=&Apache::lonxml::get_all_text('/questiontext',$parser,$style); |
|
if ($target eq 'grade' || $target eq 'web' || $target eq 'webgrade') { |
|
$dimension{'questiontext'}=$text; |
|
} |
|
return ''; |
|
} |
|
|
|
sub end_QuestionText { |
|
return ''; |
|
} |
|
|
sub get_instance { |
sub get_instance { |
my ($dim)=@_; |
my ($dim)=@_; |
my $rand_alg=&Apache::lonnet::get_rand_alg(); |
my $rand_alg=&Apache::lonnet::get_rand_alg(); |
Line 1846 sub get_instance {
|
Line 1879 sub get_instance {
|
if (&Apache::response::showallfoils()) { |
if (&Apache::response::showallfoils()) { |
@instances = @{$dimension{'instances'}}; |
@instances = @{$dimension{'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{$instance.'.text'}); |
|
@Apache::scripttag::parser_env = @_; |
|
$result.=&Apache::scripttag::xmlparse($dimension{'questiontext'}); |
if ($Apache::lonhomework::history{"resource.$version.0.status"} eq 'pass' || |
if ($Apache::lonhomework::history{"resource.$version.0.status"} eq 'pass' || |
$Apache::lonhomework::history{"resource.$version.0.status"} eq 'fail') { |
$Apache::lonhomework::history{"resource.$version.0.status"} eq 'fail') { |
|
|
Line 1933 sub get_instance {
|
Line 1969 sub get_instance {
|
&Apache::scripttag::xmlparse($dimension{'intro'}); |
&Apache::scripttag::xmlparse($dimension{'intro'}); |
@Apache::scripttag::parser_env = @_; |
@Apache::scripttag::parser_env = @_; |
&Apache::scripttag::xmlparse($dimension{$instance.'.text'}); |
&Apache::scripttag::xmlparse($dimension{$instance.'.text'}); |
|
@Apache::scripttag::parser_env = @_; |
|
&Apache::scripttag::xmlparse($dimension{'questiontext'}); |
foreach my $id (@{$dimension{$instance.'.criterias'}}, |
foreach my $id (@{$dimension{$instance.'.criterias'}}, |
@{$dimension{'criterias'}} ) { |
@{$dimension{'criterias'}} ) { |
my $link=&link($id); |
my $link=&link($id); |
Line 1968 sub get_instance {
|
Line 2006 sub get_instance {
|
|
|
@Apache::scripttag::parser_env = @_; |
@Apache::scripttag::parser_env = @_; |
$result.=&Apache::scripttag::xmlparse($dimension{'intro'}); |
$result.=&Apache::scripttag::xmlparse($dimension{'intro'}); |
|
@Apache::scripttag::parser_env = @_; |
|
$result.=&Apache::scripttag::xmlparse($dimension{$instance.'.text'}); |
|
@Apache::scripttag::parser_env = @_; |
|
&Apache::scripttag::xmlparse($dimension{'questiontext'}); |
|
|
foreach my $id (@{$dimension{$instance.'.criterias'}}, |
foreach my $id (@{$dimension{$instance.'.criterias'}}, |
@{$dimension{'criterias'}}) { |
@{$dimension{'criterias'}}) { |
my $link=&link($id); |
my $link=&link($id); |
@Apache::scripttag::parser_env = @_; |
|
$result.=&Apache::scripttag::xmlparse($dimension{$instance.'.text'}); |
|
my $status=$Apache::lonhomework::results{"resource.$version.0.$dim.$id.status"}=$env{'form.HWVAL_'.$link}; |
my $status=$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}; |
$Apache::lonhomework::results{"resource.$version.0.$dim.$id.comment"}=$env{'form.HWVAL_comment_'.$link}; |
my $mandatory=($dimension{'criteria.'.$id.'.mandatory'} ne 'N'); |
my $mandatory=($dimension{'criteria.'.$id.'.mandatory'} ne 'N'); |