version 1.235, 2007/08/02 00:42:35
|
version 1.237, 2007/08/09 00:59:16
|
Line 244 sub add_grading_button {
|
Line 244 sub add_grading_button {
|
my $result="\n\t".'<input type="submit" name="gradeasubmission" value="'. |
my $result="\n\t".'<input type="submit" name="gradeasubmission" value="'. |
&mt("Get a submission to grade").'" />'; |
&mt("Get a submission to grade").'" />'; |
$result.="\n\t".'<input type="hidden" name="grade_target" value="webgrade" />'; |
$result.="\n\t".'<input type="hidden" name="grade_target" value="webgrade" />'; |
if (&Apache::lonnet::allowed('mgq',$env{'request.course.id'}) |
my $see_all = &Apache::lonnet::allowed('mgq',$env{'request.course.id'}); |
|| &Apache::lonnet::allowed('mgq',$env{'request.course.id'}.'/'.$env{'request.course.sec'}) |
my $see_sec = &Apache::lonnet::allowed('mgq',$env{'request.course.id'}. |
) { |
'/'.$env{'request.course.sec'}); |
|
|
|
if ($see_all || $see_sec) { |
my ($entries,$ready,$locks)=&get_queue_counts('gradingqueue'); |
my ($entries,$ready,$locks)=&get_queue_counts('gradingqueue'); |
$result.="\n\t".'<table>'."\n\t\t".'<tr>'; |
$result.="\n\t".'<table>'."\n\t\t".'<tr>'; |
$result.="\n\t\t\t".'<td rowspan="4">Specify a section: </td>'. |
if ($see_all || (!§ion_restricted())) { |
"\n\t\t\t".'<td rowspan="4">'.$sec_select."\n\t\t\t".'</td>'; |
$result.="\n\t\t\t".'<td rowspan="4">Specify a section: </td>'. |
|
"\n\t\t\t".'<td rowspan="4">'.$sec_select."\n\t\t\t".'</td>'; |
|
} else { |
|
$result.="\n\t\t\t".'<td rowspan="4">Grading section: </td>'. |
|
"\n\t\t\t".'<td rowspan="4">'.$env{'request.course.sec'}."\n\t\t\t".'</td>'; |
|
} |
$result.="\n\t\t\t".'<td>'.'<input type="submit" name="reviewagrading" value="'. |
$result.="\n\t\t\t".'<td>'.'<input type="submit" name="reviewagrading" value="'. |
&mt("Select an entry from the grading queue:").'" /> '; |
&mt("Select an entry from the grading queue:").'" /> '; |
|
|
Line 623 sub start_Task {
|
Line 630 sub start_Task {
|
my $target_id = |
my $target_id = |
&Apache::lonstathelpers::make_target_id({symb => $symb, |
&Apache::lonstathelpers::make_target_id({symb => $symb, |
part => '0'}); |
part => '0'}); |
$result.='<form method="post" name="gradingstatus" action="/adm/statistics">'. |
if (§ion_restricted()) { |
'<input type="hidden" name="problemchoice" value="'.$target_id.'" />'. |
$result.='<form method="post" name="gradingstatus" action="/adm/statistics">'. |
'<input type="hidden" name="reportSelected" value="grading_analysis" />'. |
'<input type="hidden" name="problemchoice" value="'.$target_id.'" />'. |
'<input type="submit" name="grading" value="'. |
'<input type="hidden" name="reportSelected" value="grading_analysis" />'. |
&mt('Show Grading Status').'" />'. |
'<input type="submit" name="grading" value="'. |
'</form>'; |
&mt('Show Grading Status').'" />'. |
|
'</form>'; |
|
} |
} |
} |
} |
} |
} |
} |
Line 807 sub start_Task {
|
Line 816 sub start_Task {
|
$result.='<input type="hidden" name="regrade" value="'. |
$result.='<input type="hidden" name="regrade" value="'. |
$env{'form.regrade'}.'" />'; |
$env{'form.regrade'}.'" />'; |
} |
} |
if ($env{'form.chosensections'}) { |
if ($env{'form.chosensections'} || §ion_restricted()) { |
my @chosen_sections= |
my @chosen_sections = &get_allowed_sections(); |
&Apache::loncommon::get_env_multiple('form.chosensections'); |
|
foreach my $sec (@chosen_sections) { |
foreach my $sec (@chosen_sections) { |
$result.='<input type="hidden" name="chosensections" |
$result.='<input type="hidden" name="chosensections" |
value="'.$sec.'" />'; |
value="'.$sec.'" />'; |
Line 905 sub get_key_todo {
|
Line 913 sub get_key_todo {
|
my $cdom = $env{'course.'.$cid.'.domain'}; |
my $cdom = $env{'course.'.$cid.'.domain'}; |
my $uname = &LONCAPA::clean_username($env{'form.gradinguser'}); |
my $uname = &LONCAPA::clean_username($env{'form.gradinguser'}); |
my $udom = &LONCAPA::clean_domain($env{'form.gradingdomain'}); |
my $udom = &LONCAPA::clean_domain($env{'form.gradingdomain'}); |
|
|
|
if (§ion_restricted()) { |
|
my $classlist=&get_limited_classlist(); |
|
if (!&allow_grade_user($classlist->{$uname.':'.$udom})) { |
|
return (undef,'not_allowed', |
|
&mt('Requested student ([_1]) is in a section you aren\'t allowed to grade.',$uname.':'.$udom)); |
|
} |
|
} |
my $gradingkey=&encode_queue_key($symb,$udom,$uname); |
my $gradingkey=&encode_queue_key($symb,$udom,$uname); |
|
|
my $queue; |
my $queue; |
Line 1521 sub get_limited_classlist {
|
Line 1536 sub get_limited_classlist {
|
} |
} |
} |
} |
|
|
if (ref($sections) && !grep('all',@{ $sections })) { |
if (ref($sections) && !grep {$_ eq '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()]; |
if (! grep($section,@{ $sections })) { |
if (! grep {$_ eq $section} (@{ $sections })) { |
delete($classlist->{$student}); |
delete($classlist->{$student}); |
} |
} |
} |
} |
Line 1541 sub show_queue {
|
Line 1556 sub show_queue {
|
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 @chosen_sections= |
my @chosen_sections = &get_allowed_sections(); |
&Apache::loncommon::get_env_multiple('form.chosensections'); |
|
|
|
my $classlist = &get_limited_classlist(\@chosen_sections); |
my $classlist = &get_limited_classlist(\@chosen_sections); |
|
|
Line 1571 sub show_queue {
|
Line 1585 sub show_queue {
|
my ($tmp)=%queue; |
my ($tmp)=%queue; |
if ($tmp=~/^error: 2 /) { |
if ($tmp=~/^error: 2 /) { |
$result.= |
$result.= |
|
|
&Apache::loncommon::start_data_table(). |
&Apache::loncommon::start_data_table(). |
&Apache::loncommon::start_data_table_row(). |
&Apache::loncommon::start_data_table_row(). |
'<td>'.&mt('Empty').'</td>'. |
'<td>'.&mt('Empty').'</td>'. |
Line 1589 sub show_queue {
|
Line 1602 sub show_queue {
|
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); |
next if (!defined($classlist->{$uname.':'.$udom})); |
next if (!defined($classlist->{$uname.':'.$udom})); |
next if (§ion_restricted($classlist->{$uname.':'.$udom})); |
next if (!&allow_grade_user($classlist->{$uname.':'.$udom})); |
|
|
my $section = $classlist->{$uname.':'.$udom}[&Apache::loncoursedata::CL_SECTION()]; |
my $section = $classlist->{$uname.':'.$udom}[&Apache::loncoursedata::CL_SECTION()]; |
|
|
Line 1675 FORM
|
Line 1688 FORM
|
return $result; |
return $result; |
} |
} |
|
|
|
sub get_allowed_sections { |
|
my @chosen_sections; |
|
if (§ion_restricted()) { |
|
@chosen_sections = ($env{'request.course.sec'}); |
|
} else { |
|
@chosen_sections = |
|
&Apache::loncommon::get_env_multiple('form.chosensections'); |
|
} |
|
|
|
return @chosen_sections; |
|
} |
|
|
sub section_restricted { |
sub section_restricted { |
my ($classlist_entry) = @_; |
|
my $cid =(&Apache::lonnet::whichuser())[1]; |
my $cid =(&Apache::lonnet::whichuser())[1]; |
if (lc($env{'course.'.$cid.'.task_grading'}) eq 'section' |
return (lc($env{'course.'.$cid.'.task_grading'}) eq 'section' |
&& $env{'request.course.sec'} |
&& $env{'request.course.sec'} ne '' ); |
|
} |
|
|
|
sub allow_grade_user { |
|
my ($classlist_entry) = @_; |
|
|
|
if (§ion_restricted() |
&& $env{'request.course.sec'} ne |
&& $env{'request.course.sec'} ne |
$classlist_entry->[&Apache::loncoursedata::CL_SECTION()]) { |
$classlist_entry->[&Apache::loncoursedata::CL_SECTION()]) { |
return 1; |
return 0; |
} |
} |
return 0; |
return 1; |
} |
} |
|
|
sub get_queue_counts { |
sub get_queue_counts { |
Line 1708 sub get_queue_counts {
|
Line 1738 sub get_queue_counts {
|
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); |
next if (!defined($classlist->{$uname.':'.$udom})); |
next if (!defined($classlist->{$uname.':'.$udom})); |
next if (§ion_restricted($classlist->{$uname.':'.$udom})); |
next if (!&allow_grade_user($classlist->{$uname.':'.$udom})); |
|
|
if ($key=~/locked$/) { |
if ($key=~/locked$/) { |
$locks++; |
$locks++; |
Line 1787 sub pick_from_queue_data {
|
Line 1817 sub pick_from_queue_data {
|
|
|
my ($symb,$uname,$udom)=&decode_queue_key($key); |
my ($symb,$uname,$udom)=&decode_queue_key($key); |
next if (!defined($classlist->{$uname.':'.$udom})); |
next if (!defined($classlist->{$uname.':'.$udom})); |
next if (§ion_restricted($classlist->{$uname.':'.$udom})); |
next if (!&allow_grade_user($classlist->{$uname.':'.$udom})); |
|
|
if ($check_section) { |
if ($check_section) { |
my $section = |
my $section = |
Line 1912 sub get_queue_symb_status {
|
Line 1942 sub get_queue_symb_status {
|
next if ($key=~/timestamp$/); |
next if ($key=~/timestamp$/); |
my ($symb,$uname,$udom) = &decode_queue_key($key); |
my ($symb,$uname,$udom) = &decode_queue_key($key); |
next if (!defined($classlist->{$uname.':'.$udom})); |
next if (!defined($classlist->{$uname.':'.$udom})); |
next if (§ion_restricted($classlist->{$uname.':'.$udom})); |
next if (!&allow_grade_user($classlist->{$uname.':'.$udom})); |
push(@users,"$uname:$udom"); |
push(@users,"$uname:$udom"); |
} |
} |
return @users; |
return @users; |
Line 1999 sub get_from_queue {
|
Line 2029 sub get_from_queue {
|
sub select_user { |
sub select_user { |
my ($symb,$cid)=&Apache::lonnet::whichuser(); |
my ($symb,$cid)=&Apache::lonnet::whichuser(); |
|
|
my @chosen_sections= |
my @chosen_sections = &get_allowed_sections(); |
&Apache::loncommon::get_env_multiple('form.chosensections'); |
|
|
|
my $classlist = &get_limited_classlist(\@chosen_sections); |
my $classlist = &get_limited_classlist(\@chosen_sections); |
|
|
my $result; |
my $result; |
Line 2054 sub select_user {
|
Line 2082 sub select_user {
|
<input type="submit" name="submit" value="Regrade" /> |
<input type="submit" name="submit" value="Regrade" /> |
$seclist |
$seclist |
</form> |
</form> |
<td>$classlist->{$student}[&Apache::loncoursedata::CL_FULLNAME()] <tt>($student)</tt></td> |
<td>$classlist->{$student}[&Apache::loncoursedata::CL_FULLNAME()] <tt>($student)</tt> Sec: $classlist->{$student}[&Apache::loncoursedata::CL_SECTION()]</td> |
<td> |
<td> |
RESULT |
RESULT |
} |
} |
Line 2161 sub get_dim_id {
|
Line 2189 sub get_dim_id {
|
|
|
sub get_id { |
sub get_id { |
my ($parstack,$safeeval)=@_; |
my ($parstack,$safeeval)=@_; |
my $id=&Apache::lonxml::get_param('id',$parstack,$safeeval); |
return &Apache::lonxml::get_id($parstack,$safeeval); |
if (!$id) { $id=$Apache::lonxml::curdepth; } |
|
return $id; |
|
} |
} |
|
|
sub start_Setup { |
sub start_Setup { |