version 1.257, 2010/12/31 02:40:14
|
version 1.258, 2012/01/03 00:28:17
|
Line 199 sub get_version {
|
Line 199 sub get_version {
|
|
|
sub add_previous_version_button { |
sub add_previous_version_button { |
my ($status)=@_; |
my ($status)=@_; |
|
my (undef,undef,$udom,$uname)=&Apache::lonnet::whichuser(); |
|
if (($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) { |
|
return; |
|
} |
my $result; |
my $result; |
if ($Apache::lonhomework::history{'resource.0.version'} eq '') { |
if ($Apache::lonhomework::history{'resource.0.version'} eq '') { |
return ''; |
return ''; |
Line 235 sub add_previous_version_button {
|
Line 239 sub add_previous_version_button {
|
} |
} |
|
|
sub add_grading_button { |
sub add_grading_button { |
my (undef,$cid)=&Apache::lonnet::whichuser(); |
my (undef,$cid,$udom,$uname)=&Apache::lonnet::whichuser(); |
|
if (($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) { |
|
return; |
|
} |
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 %sections = &Apache::loncommon::get_sections($cdom,$cnum); |
my %sections = &Apache::loncommon::get_sections($cdom,$cnum); |
Line 250 sub add_grading_button {
|
Line 257 sub add_grading_button {
|
$sec_select .= "\t<option value=\"$sec\">$sec</option>\n"; |
$sec_select .= "\t<option value=\"$sec\">$sec</option>\n"; |
} |
} |
$sec_select .= "\t<option value='none'>none</option>\n</select>\n"; |
$sec_select .= "\t<option value='none'>none</option>\n</select>\n"; |
|
|
my $result="\n\t".'<input type="submit" name="gradeasubmission" value="'. |
my $uri=$env{'request.uri'}; |
&mt("Get a submission to grade").'" />'; |
if ($env{'request.enc'}) { $uri=&Apache::lonenc::encrypted($uri); } |
$result.="\n\t".'<input type="hidden" name="grade_target" value="webgrade" />'; |
my $result = |
|
'<form name="gradesubmission" method="post" action="'.$uri.'">'. |
|
"\n\t".'<input type="submit" name="gradeasubmission" value="'. |
|
&mt("Get a submission to grade").'" />'. |
|
"\n\t".'<input type="hidden" name="grade_target" value="webgrade" />'; |
my $see_all = &Apache::lonnet::allowed('mgq',$env{'request.course.id'}); |
my $see_all = &Apache::lonnet::allowed('mgq',$env{'request.course.id'}); |
my $see_sec = &Apache::lonnet::allowed('mgq',$env{'request.course.id'}. |
my $see_sec = &Apache::lonnet::allowed('mgq',$env{'request.course.id'}. |
'/'.$env{'request.course.sec'}); |
'/'.$env{'request.course.sec'}); |
Line 299 sub add_grading_button {
|
Line 310 sub add_grading_button {
|
$result.=&Apache::loncommon::studentbrowser_javascript(); |
$result.=&Apache::loncommon::studentbrowser_javascript(); |
$result.= '</p>'."\n"; |
$result.= '</p>'."\n"; |
} |
} |
|
$result .= '</form>'."\n"; |
|
return $result; |
|
} |
|
|
|
sub add_slotlist_button { |
|
my (undef,$cid,$udom,$uname)=&Apache::lonnet::whichuser(); |
|
if (($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) { |
|
return; |
|
} |
|
my $symb=&Apache::lonnet::symbread(); |
|
my $result; |
|
if (&Apache::lonnet::allowed('mgq',$env{'request.course.id'}) || |
|
&Apache::lonnet::allowed('mgq',$env{'request.course.id'}.'/'.$env{'request.course.sec'})) { |
|
$result = '<form method="post" name="slotrequest" action="/adm/slotrequest">'. |
|
'<input type="hidden" name="symb" value="'.$symb.'" />'. |
|
'<input type="hidden" name="command" value="showslots" />'. |
|
'<input type="submit" name="requestattempt" value="'. |
|
&mt('Show Slot list').'" />'. |
|
'</form>'; |
|
my $target_id = |
|
&Apache::lonstathelpers::make_target_id({symb => $symb, |
|
part => '0'}); |
|
if (!§ion_restricted()) { |
|
$result.='<form method="post" name="gradingstatus" action="/adm/statistics">'. |
|
'<input type="hidden" name="problemchoice" value="'.$target_id.'" />'. |
|
'<input type="hidden" name="reportSelected" value="grading_analysis" />'. |
|
'<input type="submit" name="grading" value="'. |
|
&mt('Show Grading Status').'" />'. |
|
'</form>'; |
|
} |
|
} |
return $result; |
return $result; |
} |
} |
|
|
sub add_request_another_attempt_button { |
sub add_request_another_attempt_button { |
my ($text)=@_; |
my ($text)=@_; |
|
my (undef,$cid,$udom,$uname)=&Apache::lonnet::whichuser(); |
|
if (($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) { |
|
return; |
|
} |
if (!$text) { $text=&mt('Request another attempt'); } |
if (!$text) { $text=&mt('Request another attempt'); } |
my $result; |
my $result; |
my $symb=&Apache::lonnet::symbread(); |
my $symb=&Apache::lonnet::symbread(); |
Line 642 sub start_Task {
|
Line 688 sub start_Task {
|
if ($target eq 'web' && $env{'request.state'} ne 'construct') { |
if ($target eq 'web' && $env{'request.state'} ne 'construct') { |
if ($Apache::lonhomework::queuegrade |
if ($Apache::lonhomework::queuegrade |
|| $Apache::lonhomework::modifygrades) { |
|| $Apache::lonhomework::modifygrades) { |
$result.='<form name="gradesubmission" method="post" action="'; |
$result .= &add_grading_button(); |
my $uri=$env{'request.uri'}; |
|
if ($env{'request.enc'}) { $uri=&Apache::lonenc::encrypted($uri); } |
|
$result.=$uri.'">'.&add_grading_button()."</form>\n"; |
|
my $symb=&Apache::lonnet::symbread(); |
my $symb=&Apache::lonnet::symbread(); |
if (&Apache::lonnet::allowed('mgq',$env{'request.course.id'}) |
if (&Apache::lonnet::allowed('mgq',$env{'request.course.id'}) |
|| &Apache::lonnet::allowed('mgq',$env{'request.course.id'}.'/'.$env{'request.course.sec'})) { |
|| &Apache::lonnet::allowed('mgq',$env{'request.course.id'}.'/'.$env{'request.course.sec'})) { |
$result.='<form method="post" name="slotrequest" action="/adm/slotrequest">'. |
$result .= &add_slotlist_button(); |
'<input type="hidden" name="symb" value="'.$symb.'" />'. |
|
'<input type="hidden" name="command" value="showslots" />'. |
|
'<input type="submit" name="requestattempt" value="'. |
|
&mt('Show Slot list').'" />'. |
|
'</form>'; |
|
my $target_id = |
|
&Apache::lonstathelpers::make_target_id({symb => $symb, |
|
part => '0'}); |
|
if (!§ion_restricted()) { |
|
$result.='<form method="post" name="gradingstatus" action="/adm/statistics">'. |
|
'<input type="hidden" name="problemchoice" value="'.$target_id.'" />'. |
|
'<input type="hidden" name="reportSelected" value="grading_analysis" />'. |
|
'<input type="submit" name="grading" value="'. |
|
&mt('Show Grading Status').'" />'. |
|
'</form>'; |
|
} |
|
} |
} |
} |
} |
} |
} |
Line 693 sub start_Task {
|
Line 720 sub start_Task {
|
($version,$previous)=&get_version(); |
($version,$previous)=&get_version(); |
} |
} |
|
|
my $status_id = |
my $status_id = 'LC_task_take'; |
($previous || $status eq 'SHOW_ANSWER') ? 'LC_task_feedback' |
if ($previous && $target eq 'answer') { |
: 'LC_task_take'; |
$status_id = 'LC_task_answer'; |
|
} elsif ($previous || $status eq 'SHOW_ANSWER') { |
|
$status_id = 'LC_task_feedback'; |
|
} |
$result .= '<div class="LC_task" id="'.$status_id.'">'."\n"; |
$result .= '<div class="LC_task" id="'.$status_id.'">'."\n"; |
|
|
push(@Apache::inputtags::status,$status); |
push(@Apache::inputtags::status,$status); |
Line 1214 DONEBUTTON
|
Line 1244 DONEBUTTON
|
} |
} |
$result.="\n</div>\n". |
$result.="\n</div>\n". |
&Apache::loncommon::end_page({'discussion' => 1}); |
&Apache::loncommon::end_page({'discussion' => 1}); |
} |
} elsif ($target eq 'answer') { |
|
$result.="\n</div>\n"; |
|
} |
} |
} |
|
|
my $useslots = &Apache::lonnet::EXT("resource.0.useslots"); |
my $useslots = &Apache::lonnet::EXT("resource.0.useslots"); |
Line 1225 DONEBUTTON
|
Line 1257 DONEBUTTON
|
} elsif (defined($Apache::lonhomework::history{"resource.$version.0.checkedin.slot"})) { |
} elsif (defined($Apache::lonhomework::history{"resource.$version.0.checkedin.slot"})) { |
$queue_data{'slot'} = $Apache::lonhomework::history{"resource.$version.0.checkedin.slot"}; |
$queue_data{'slot'} = $Apache::lonhomework::history{"resource.$version.0.checkedin.slot"}; |
} |
} |
|
|
|
|
if ($target eq 'grade' && !$env{'form.webgrade'} && !$previous |
if ($target eq 'grade' && !$env{'form.webgrade'} && !$previous |
&& $status eq 'CAN_ANSWER') { |
&& $status eq 'CAN_ANSWER') { |