version 1.158, 2006/05/30 12:45:36
|
version 1.222, 2007/01/23 05:02:16
|
Line 43 use LONCAPA;
|
Line 43 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','GraderNote','ClosingParagraph')); |
} |
} |
|
|
|
my %dimension; |
|
my $top = 'top'; |
|
|
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 |
|
@Apache::bridgetask::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 83 sub proctor_check_auth {
|
Line 83 sub proctor_check_auth {
|
} |
} |
} |
} |
if ($authenticated) { |
if ($authenticated) { |
&create_new_version($type,$user,$domain,$slot_name); |
&check_in($type,$user,$domain,$slot_name); |
return 1; |
return 1; |
} |
} |
} |
} |
Line 91 sub proctor_check_auth {
|
Line 91 sub proctor_check_auth {
|
return 0; |
return 0; |
} |
} |
|
|
|
sub check_in { |
|
my ($type,$user,$domain,$slot_name) = @_; |
|
my $useslots = &Apache::lonnet::EXT("resource.0.useslots"); |
|
if ( $useslots eq 'map_map') { |
|
&check_in_sequence($user,$domain,$slot_name); |
|
} else { |
|
&create_new_version($type,$user,$domain,$slot_name); |
|
&Apache::structuretags::finalize_storage(); |
|
} |
|
return 1; |
|
} |
|
|
|
sub check_in_sequence { |
|
my ($user,$domain,$slot_name) = @_; |
|
my $navmap = Apache::lonnavmaps::navmap->new(); |
|
my ($symb) = &Apache::lonnet::whichuser(); |
|
my ($map) = &Apache::lonnet::decode_symb($symb); |
|
my @resources = |
|
$navmap->retrieveResources($map, sub { $_[0]->is_problem() },0,0); |
|
my %old_history = %Apache::lonhomework::history; |
|
my %old_results = %Apache::lonhomework::results; |
|
|
|
foreach my $res (@resources) { |
|
&Apache::lonxml::debug("doing ".$res->src); |
|
&Apache::structuretags::initialize_storage($res->symb); |
|
my $type = ($res->is_task()) ? 'Task' : 'problem'; |
|
&create_new_version($type,$user,$domain,$slot_name); |
|
&Apache::structuretags::finalize_storage($res->symb); |
|
} |
|
|
|
%Apache::lonhomework::history = %old_history; |
|
%Apache::lonhomework::results = %old_results; |
|
} |
|
|
sub create_new_version { |
sub create_new_version { |
my ($type,$user,$domain,$slot_name) = @_; |
my ($type,$user,$domain,$slot_name) = @_; |
|
|
|
my $id = '0'; |
if ($type eq 'Task') { |
if ($type eq 'Task') { |
# increment version |
# increment version |
my $version= |
my $version= |
Line 107 sub create_new_version {
|
Line 143 sub create_new_version {
|
} |
} |
|
|
#setup new version and who did it |
#setup new version and who did it |
$Apache::lonhomework::results{'resource.0.version'}=$version; |
$Apache::lonhomework::results{'resource.0.version'}=$version; |
if (defined($user) && defined($domain)) { |
$id = "$version.0"; |
$Apache::lonhomework::results{"resource.$version.0.checkedin"}= |
if (!defined($user) || !defined($domain)) { |
$user.':'.$domain; |
$user = $env{'user.name'}; |
} else { |
$domain = $env{'user.domain'}; |
$Apache::lonhomework::results{"resource.$version.0.checkedin"}= |
|
$env{'user.name'}.':'.$env{'user.domain'}; |
|
} |
|
if (defined($slot_name)) { |
|
$Apache::lonhomework::results{"resource.$version.0.checkedin.slot"}= |
|
$slot_name; |
|
} |
} |
|
|
} elsif ($type eq 'problem') { |
} elsif ($type eq 'problem') { |
&Apache::lonxml::debug("authed $slot_name"); |
&Apache::lonxml::debug("authed $slot_name"); |
if (defined($user) && defined($domain)) { |
} |
$Apache::lonhomework::results{"resource.0.checkedin"}= |
if (!defined($user) || !defined($domain)) { |
$user.':'.$domain; |
$user = $env{'user.name'}; |
} |
$domain = $env{'user.domain'}; |
if (defined($slot_name)) { |
} |
$Apache::lonhomework::results{"resource.0.checkedin.slot"}= |
|
$slot_name; |
$Apache::lonhomework::results{"resource.$id.checkedin"}= |
} |
$user.':'.$domain; |
|
|
|
if (defined($slot_name)) { |
|
$Apache::lonhomework::results{"resource.$id.checkedin.slot"}= |
|
$slot_name; |
} |
} |
} |
} |
|
|
Line 191 sub add_previous_version_button {
|
Line 226 sub add_previous_version_button {
|
} |
} |
|
|
sub add_grading_button { |
sub add_grading_button { |
my (undef,$cid)=&Apache::lonxml::whichuser(); |
my (undef,$cid)=&Apache::lonnet::whichuser(); |
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 200 sub add_grading_button {
|
Line 235 sub add_grading_button {
|
if (scalar(keys(%sections)) < 3) { |
if (scalar(keys(%sections)) < 3) { |
$size=scalar(keys(%sections))+2; |
$size=scalar(keys(%sections))+2; |
} |
} |
my $sec_select = '<select multiple="multiple" name="chosensections" size="'.$size.'">'."\n"; |
my $sec_select = "\n".'<select multiple="multiple" name="chosensections" size="'.$size.'">'."\n"; |
$sec_select .= "<option value='all' selected='selected'>all</option>\n"; |
$sec_select .= "\t<option value='all' selected='selected'>all</option>\n"; |
foreach my $sec (sort {lc($a) cmp lc($b)} (keys(%sections))) { |
foreach my $sec (sort {lc($a) cmp lc($b)} (keys(%sections))) { |
$sec_select .= "<option value=\"$sec\">$sec</option>\n"; |
$sec_select .= "\t<option value=\"$sec\">$sec</option>\n"; |
} |
} |
$sec_select .= "<option value='none'>none</option></select>\n"; |
$sec_select .= "\t<option value='none'>none</option>\n</select>\n"; |
|
|
my $result=' <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.='<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'})) { |
if (&Apache::lonnet::allowed('mgq',$env{'request.course.id'})) { |
my ($entries,$ready,$locks)=&get_queue_counts('gradingqueue'); |
my ($entries,$ready,$locks)=&get_queue_counts('gradingqueue'); |
$result.='<table><tr>'; |
$result.="\n\t".'<table>'."\n\t\t".'<tr>'; |
$result.='<td rowspan="4">Specify a section: </td><td rowspan="4">'.$sec_select.'</td>'; |
$result.="\n\t\t\t".'<td rowspan="4">Specify a section: </td>'. |
$result.='<td>'.' <input type="submit" name="reviewagrading" value="'. |
"\n\t\t\t".'<td rowspan="4">'.$sec_select."\n\t\t\t".'</td>'; |
|
$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:").'" /> '; |
|
|
$result.= &mt("[_1] entries, [_2] ready, [_3] being graded",$entries,$ready,$locks).' </td></tr>'."\n"; |
$result.= "\n\t\t\t\t".&mt("[_1] entries, [_2] ready, [_3] being graded",$entries,$ready,$locks).'</td>'."\n\t\t".'</tr>'."\n"; |
|
|
($entries,$ready,$locks)=&get_queue_counts('reviewqueue'); |
($entries,$ready,$locks)=&get_queue_counts('reviewqueue'); |
$result.='<tr><td>'. |
$result.="\n\t\t".'<tr>'. |
' <input type="submit" name="reviewasubmission" value="'. |
"\n\t\t\t".'<td>'. |
|
"\n\t\t\t\t".'<input type="submit" name="reviewasubmission" value="'. |
&mt("Select an entry from the review queue:").'" /> '; |
&mt("Select an entry from the review queue:").'" /> '; |
$result.=&mt("[_1] entries, [_2] ready, [_3] being graded", |
$result.=&mt("[_1] entries, [_2] ready, [_3] being graded", |
$entries,$ready,$locks).'</td></tr>'."\n"; |
$entries,$ready,$locks).'</td>'."\n\t\t".'</tr>'."\n"; |
$result.='<tr><td> <input type="submit" name="regradeasubmission" value="'. |
$result.="\n\t\t".'<tr>'. |
&mt("List of user's grade status").'" /> </td></tr></table>'."\n"; |
"\n\t\t\t".'<td>'. |
$result.='<p> <input type="submit" name="regradeaspecificsubmission" value="'. |
"\n\t\t\t\t".'<input type="submit" name="regradeasubmission" value="'. |
&mt("Regrade specific user:").'" />'."\n"; |
&mt("List of user's grade status").'" /> </td>' |
$result.='<input type="text" size="12" name="gradinguser" />'; |
."\n\t\t".'</tr>' |
|
."\n\t".'</table>'."\n"; |
|
$result.="\n\t".'<p>'. |
|
"\n\t\t".'<input type="submit" name="regradeaspecificsubmission" value="'. |
|
&mt("Regrade specific user:").'" />'; |
|
$result.= "\n\t\t".'<input type="text" size="12" name="gradinguser" />'; |
$result.=&Apache::loncommon::select_dom_form($env{'user.domain'}, |
$result.=&Apache::loncommon::select_dom_form($env{'user.domain'}, |
'gradingdomain'); |
'gradingdomain'); |
$result.=' '. |
$result.=' '. |
Line 237 sub add_grading_button {
|
Line 279 sub add_grading_button {
|
'gradinguser', |
'gradinguser', |
'gradingdomain'); |
'gradingdomain'); |
$result.=&Apache::loncommon::studentbrowser_javascript(); |
$result.=&Apache::loncommon::studentbrowser_javascript(); |
$result.= '</p>'; |
$result.= '</p>'."\n"; |
} |
} |
return $result; |
return $result; |
} |
} |
Line 261 sub add_request_another_attempt_button {
|
Line 303 sub add_request_another_attempt_button {
|
my $description=&Apache::slotrequest::get_description($slot_name, |
my $description=&Apache::slotrequest::get_description($slot_name, |
$slot); |
$slot); |
$result.=(<<STUFF); |
$result.=(<<STUFF); |
<p> Will be next available: $description </p> |
<p> Will be next available: $description </p> |
STUFF |
STUFF |
} |
} |
|
|
if ($env{'request.enc'}) { $symb=&Apache::lonenc::encrypted($symb); } |
if ($env{'request.enc'}) { $symb=&Apache::lonenc::encrypted($symb); } |
$symb=&escape($symb); |
$symb=&escape($symb); |
$result.='<form method="post" action="/adm/slotrequest">'. |
$result.= |
'<input type="hidden" name="symb" value="'.$symb.'" />'. |
"\n\t".'<form method="post" action="/adm/slotrequest">'."\n\t\t". |
'<input type="hidden" name="command" value="'.$action.'" />'. |
'<input type="hidden" name="symb" value="'.$symb.'" />'."\n\t\t". |
|
'<input type="hidden" name="command" value="'.$action.'" />'."\n\t\t". |
'<input type="submit" name="requestattempt" value="'. |
'<input type="submit" name="requestattempt" value="'. |
&mt($text).'" />'. |
&mt($text).'" />'."\n\t". |
'</form>'; |
'</form>'."\n"; |
return $result; |
return $result; |
} |
} |
|
|
Line 292 sub style {
|
Line 335 sub style {
|
my ($target) = @_; |
my ($target) = @_; |
if ($target eq 'web' |
if ($target eq 'web' |
|| $target eq 'webgrade') { |
|| $target eq 'webgrade') { |
return (<<STYLE); |
my $style = (<<STYLE); |
<link rel="stylesheet" type="text/css" href="/res/adm/includes/task.css" /> |
<link rel="stylesheet" type="text/css" href="/res/adm/includes/task.css" /> |
STYLE |
STYLE |
|
if ($env{'browser.type'} eq 'explorer' |
|
&& $env{'browser.os'} eq 'win' ) { |
|
if ($env{'browser.version'} < 7) { |
|
$style .= (<<STYLE); |
|
<link rel="stylesheet" type="text/css" href="/res/adm/includes/task_ie.css" /> |
|
STYLE |
|
} else { |
|
$style .= (<<STYLE); |
|
<link rel="stylesheet" type="text/css" href="/res/adm/includes/task_ie7.css" /> |
|
STYLE |
|
} |
|
} |
|
return $style; |
} |
} |
return; |
return; |
} |
} |
Line 316 sub show_task {
|
Line 372 sub show_task {
|
return 1; |
return 1; |
} |
} |
|
|
|
my @delay; |
|
sub nest { |
|
if (@delay) { |
|
return $delay[-1]; |
|
} else { |
|
return; |
|
} |
|
} |
|
|
|
sub start_delay { |
|
push(@delay,1); |
|
} |
|
sub end_delay { |
|
pop(@delay); |
|
} |
|
|
|
sub nested_parse { |
|
my ($str,$env,$args) = @_; |
|
my @old_env = @Apache::scripttag::parser_env; |
|
@Apache::scripttag::parser_env = @$env; |
|
if (exists($args->{'set_dim_id'})) { |
|
&enable_dimension_parsing($args->{'set_dim_id'}); |
|
} |
|
push(@delay,(($args->{'delayed_dim_results'})? 1 : 0)); |
|
my $result = &Apache::scripttag::xmlparse($$str); |
|
pop(@delay); |
|
if (exists($args->{'set_dim_id'})) { |
|
&disable_dimension_parsing(); |
|
} |
|
@Apache::scripttag::parser_env = @old_env; |
|
if ($args->{'delayed_dim_results'}) { |
|
my $dim = &get_dim_id(); |
|
&Apache::lonxml::debug(" tossing out $result "); |
|
&Apache::lonxml::debug(" usining out $dim 's ". $dimension{$dim}{'result'}); |
|
return $dimension{$dim}{'result'}; |
|
} |
|
return $result; |
|
} |
|
|
sub internal_location { |
sub internal_location { |
my ($id)=@_; |
my ($id)=@_; |
return '<!-- LONCAPA_INTERNAL_ADD_TASK_STATUS'.$id.' -->'; |
return '<!-- LONCAPA_INTERNAL_ADD_TASK_STATUS'.$id.' -->'; |
} |
} |
|
|
sub submission_time_stamp { |
sub submission_time_stamp { |
my ($symb,$courseid,$udom,$uname)=&Apache::lonxml::whichuser(); |
my ($symb,$courseid,$udom,$uname)=&Apache::lonnet::whichuser(); |
my $submissiontime; |
my $submissiontime; |
my $version=$Apache::lonhomework::history{'resource.0.version'}; |
my $version=$Apache::lonhomework::history{'resource.0.version'}; |
for (my $v=$Apache::lonhomework::history{'version'};$v>0;$v--) { |
for (my $v=$Apache::lonhomework::history{'version'};$v>0;$v--) { |
if (defined($Apache::lonhomework::history{$v.':resource.'.$version.'.0.bridgetask.portfiles'})) { |
if (defined($Apache::lonhomework::history{$v.':resource.'.$version.'.0.bridgetask.portfiles'}) |
|
&& defined($Apache::lonhomework::history{$v.':resource.'.$version.'.0.tries'})) { |
$submissiontime=$Apache::lonhomework::history{$v.':timestamp'}; |
$submissiontime=$Apache::lonhomework::history{$v.':timestamp'}; |
|
last; |
} |
} |
} |
} |
my $result; |
my $result; |
Line 338 sub submission_time_stamp {
|
Line 435 sub submission_time_stamp {
|
my ($color,$when)=('#FF6666','after'); |
my ($color,$when)=('#FF6666','after'); |
if ($diff > 0) { ($color,$when)=('#336600','before'); } |
if ($diff > 0) { ($color,$when)=('#336600','before'); } |
my $info; |
my $info; |
|
$diff = abs($diff); |
if ($diff%60) { $info=($diff%60).' seconds'; } |
if ($diff%60) { $info=($diff%60).' seconds'; } |
$diff=int($diff/60); |
$diff=int($diff/60); |
if ($diff%60) { $info=($diff%60).' minutes '.$info; } |
if ($diff%60) { $info=($diff%60).' minutes '.$info; } |
$diff=int($diff/60); |
$diff=int($diff/60); |
if ($diff) { $info=$diff.' hours '.$info; } |
if ($diff) { $info=$diff.' hours '.$info; } |
$result='<p><font color="'.$color.'">'. |
$result='<p><font color="'.$color.'">'. |
&mt('Student submitted [_1] [_2] the deadline. |
&mt('Student submitted [_1] [_2] the deadline. '. |
(Submission was at [_3], end of period was [_4].)', |
'(Submission was at [_3], end of period was [_4].)', |
$info,$when,scalar(localtime($submissiontime)), |
$info,$when, |
scalar(localtime($slot{'endtime'}))). |
&Apache::lonlocal::locallocaltime($submissiontime), |
|
&Apache::lonlocal::locallocaltime($slot{'endtime'})). |
'</font></p>'; |
'</font></p>'; |
} |
} |
return $result; |
return $result; |
Line 356 sub submission_time_stamp {
|
Line 455 sub submission_time_stamp {
|
sub file_list { |
sub file_list { |
my ($files,$uname,$udom) = @_; |
my ($files,$uname,$udom) = @_; |
if (!defined($uname) || !defined($udom)) { |
if (!defined($uname) || !defined($udom)) { |
(undef,undef,$udom,$uname) = &Apache::lonxml::whichuser(); |
(undef,undef,$udom,$uname) = &Apache::lonnet::whichuser(); |
} |
} |
my $file_url = '/uploaded/'.$udom.'/'.$uname.'/portfolio/'; |
my $file_url = '/uploaded/'.$udom.'/'.$uname.'/portfolio/'; |
|
|
Line 365 sub file_list {
|
Line 464 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 395 INFO
|
Line 512 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::lonnet::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)=@_; |
|
|
my ($status,$accessmsg,$slot); |
my ($status,$accessmsg,$slot); |
|
&Apache::structuretags::init_problem_globals('Task'); |
if ($target ne 'webgrade') { |
if ($target ne 'webgrade') { |
&Apache::structuretags::init_problem_globals('Task'); |
|
&Apache::structuretags::initialize_storage(); |
&Apache::structuretags::initialize_storage(); |
&Apache::lonhomework::showhash(%Apache::lonhomework::history); |
&Apache::lonhomework::showhash(%Apache::lonhomework::history); |
if ($env{'request.state'} eq 'construct') { |
if ($env{'request.state'} eq 'construct') { |
Line 422 sub start_Task {
|
Line 591 sub start_Task {
|
&Apache::structuretags::page_start($target,$token,$tagstack, |
&Apache::structuretags::page_start($target,$token,$tagstack, |
$parstack,$parser,$safeeval, |
$parstack,$parser,$safeeval, |
$name,&style($target)); |
$name,&style($target)); |
$result .= '<div class="LC_task">'."\n"; |
|
} |
} |
|
|
if ($target eq 'web' && $env{'request.state'} ne 'construct') { |
if ($target eq 'web' && $env{'request.state'} ne 'construct') { |
Line 431 sub start_Task {
|
Line 599 sub start_Task {
|
$result.='<form name="gradesubmission" method="post" action="'; |
$result.='<form name="gradesubmission" method="post" action="'; |
my $uri=$env{'request.uri'}; |
my $uri=$env{'request.uri'}; |
if ($env{'request.enc'}) { $uri=&Apache::lonenc::encrypted($uri); } |
if ($env{'request.enc'}) { $uri=&Apache::lonenc::encrypted($uri); } |
$result.=$uri.'">'.&add_grading_button()."</form>"; |
$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'})) { |
$result.='<form method="post" name="slotrequest" action="/adm/slotrequest">'. |
$result.='<form method="post" name="slotrequest" action="/adm/slotrequest">'. |
Line 455 sub start_Task {
|
Line 623 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'); |
if ($status eq 'CAN_ANSWER' && $version eq '') { |
if ($status eq 'CAN_ANSWER' && $version eq '') { |
&create_new_version('Task',undef,undef,$slot_name); |
# CAN_ANSWER mode, and no current version, unproctored access |
|
# thus self-checkedin |
|
&check_in('Task',undef,undef,$slot_name); |
&add_to_queue('gradingqueue',{'type' => 'Task', |
&add_to_queue('gradingqueue',{'type' => 'Task', |
'time' => time, |
'time' => time, |
'slot' => $slot_name}); |
'slot' => $slot_name}); |
($version,$previous)=&get_version(); |
($version,$previous)=&get_version(); |
} |
} |
|
|
|
my $status_id = |
|
($previous || $status eq 'SHOW_ANSWER') ? 'LC_task_feedback' |
|
: 'LC_task_take'; |
|
$result .= '<div class="LC_task" id="'.$status_id.'">'."\n"; |
|
|
push(@Apache::inputtags::status,$status); |
push(@Apache::inputtags::status,$status); |
$Apache::inputtags::slot_name=$slot_name; |
$Apache::inputtags::slot_name=$slot_name; |
Line 493 sub start_Task {
|
Line 670 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 548 DONESCREEN
|
Line 702 DONESCREEN
|
} elsif ($target eq 'web') { |
} elsif ($target eq 'web') { |
|
|
$result.=&preserve_grade_info(); |
$result.=&preserve_grade_info(); |
$result.=&internal_location(); |
$result.=&internal_location(); |
$result.=$form_tag_start. |
$result.=$form_tag_start."\t". |
'<input type="hidden" name="submitted" value="yes" />'; |
'<input type="hidden" name="submitted" value="yes" />'; |
&Apache::lonxml::startredirection(); |
&Apache::lonxml::startredirection(); |
} |
} |
Line 557 DONESCREEN
|
Line 711 DONESCREEN
|
$target eq 'webgrade') { |
$target eq 'webgrade') { |
my $webgrade='yes'; |
my $webgrade='yes'; |
if ($target eq 'webgrade') { |
if ($target eq 'webgrade') { |
|
$result .= '<div class="LC_task">'."\n"; |
$result.= "\n".'<div class="LC_GRADING_task">'."\n". |
$result.= "\n".'<div class="LC_GRADING_task">'."\n". |
'<script type="text/javascript" |
'<script type="text/javascript" |
src="/res/adm/includes/task_grading.js"></script>'; |
src="/res/adm/includes/task_grading.js"></script>'; |
#$result.='<br />Review'.&show_queue('reviewqueue'); |
#$result.='<br />Review'.&show_queue('reviewqueue'); |
#$result.='<br />Grade'.&show_queue('gradingqueue'); |
#$result.='<br />Grade'.&show_queue('gradingqueue'); |
} |
} |
# FIXME Blast! still need to reorg this, need to reshow the |
|
# queue being reviewed once done with the grade pass... |
|
# Hrrm, vaildation pass should perhaps say 'not_locked' |
|
# perhaps do a search if there is a key that is mine and if |
|
# there isn't reshow the queue.... |
|
my ($todo,$status_code,$msg)=&get_key_todo($target); |
my ($todo,$status_code,$msg)=&get_key_todo($target); |
|
|
if ($todo) { |
if ($todo) { |
Line 592 DONESCREEN
|
Line 743 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 612 DONESCREEN
|
Line 774 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 639 DONESCREEN
|
Line 803 DONESCREEN
|
} |
} |
if ($target eq 'webgrade') { |
if ($target eq 'webgrade') { |
$result.="\n".'<div id="LC_GRADING_criterialist">'; |
$result.="\n".'<div id="LC_GRADING_criterialist">'; |
|
&Apache::lonxml::startredirection(); |
|
&start_delay(); |
|
$dimension{$top}{'result'}=$result; |
|
undef($result); |
} |
} |
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
$result.=$form_tag_start. |
$result.=$form_tag_start. |
Line 654 DONESCREEN
|
Line 822 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 683 sub get_key_todo {
|
Line 865 sub get_key_todo {
|
if (defined($env{'form.regradeaspecificsubmission'}) && |
if (defined($env{'form.regradeaspecificsubmission'}) && |
defined($env{'form.gradinguser'}) && |
defined($env{'form.gradinguser'}) && |
defined($env{'form.gradingdomain'}) ) { |
defined($env{'form.gradingdomain'}) ) { |
my ($symb,$cid)=&Apache::lonxml::whichuser(); |
my ($symb,$cid)=&Apache::lonnet::whichuser(); |
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 $uname = $env{'form.gradinguser'}; |
my $uname = $env{'form.gradinguser'}; |
Line 702 sub get_key_todo {
|
Line 884 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'}=&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 740 sub get_key_todo {
|
Line 938 sub get_key_todo {
|
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 785 sub get_key_todo {
|
Line 985 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 832 sub end_Task {
|
Line 1033 sub end_Task {
|
if (!$previous && $status ne 'SHOW_ANSWER' && |
if (!$previous && $status ne 'SHOW_ANSWER' && |
&show_task($status,$previous)) { |
&show_task($status,$previous)) { |
$result.=&Apache::inputtags::gradestatus('0'); |
$result.=&Apache::inputtags::gradestatus('0'); |
$result.='</form>'; |
} |
|
|
|
$result.='</form>'; |
|
|
|
if (!$previous && $status ne 'SHOW_ANSWER' && |
|
&show_task($status,$previous)) { |
my $action = &Apache::lonenc::check_encrypt($env{'request.uri'}); |
my $action = &Apache::lonenc::check_encrypt($env{'request.uri'}); |
$result.=<<DONEBUTTON; |
$result.=<<DONEBUTTON; |
<form name="done" method="post" action="$action"> |
<form name="done" method="post" action="$action"> |
Line 860 DONEBUTTON
|
Line 1066 DONEBUTTON
|
} |
} |
$start_time=&Apache::lonlocal::locallocaltime($start_time); |
$start_time=&Apache::lonlocal::locallocaltime($start_time); |
|
|
my $status = "\n<div class='LC_$bt_status LC_criteria'>\n"; |
my $status = |
|
"\n<div class='LC_$bt_status LC_criteria LC_task_overall_status'>\n\t"; |
|
|
|
my $dim = $top; |
|
my %counts = &get_counts($dim,undef,$parstack, |
|
$safeeval); |
|
my $question_status ="\n\t<p>". |
|
&question_status_message(\%counts,-1). |
|
"</p>\n"; |
|
|
if ($bt_status eq 'pass') { |
if ($bt_status eq 'pass') { |
$status.='<h2>You passed the '.$title.' given on '. |
$status.='<h2>You passed the '.$title.' given on '. |
$start_time.'</h2>'; |
$start_time.'</h2>'; |
|
$status.=$question_status; |
} |
} |
if ($bt_status eq 'fail') { |
if ($bt_status eq 'fail') { |
$status.='<h2>You did not pass the '.$title.' given on '. |
$status.='<h2>You did not pass the '.$title.' given on '. |
$start_time.'</h2>'; |
$start_time.'</h2>'; |
|
$status.=$question_status; |
if (!$previous) { |
if (!$previous) { |
$status.=&add_request_another_attempt_button(); |
$status.=&add_request_another_attempt_button(); |
} |
} |
} |
} |
my $man_count=0; |
|
my $opt_count=0; |
$status.="\n".'</div>'."\n"; |
my $opt_passed=0; |
|
foreach my $dim_id (@Apache::bridgetask::dimensionlist) { |
foreach my $id (@{$dimension{$dim}{'criterias'}}) { |
if ($Apache::bridgetask::dimensionmandatory{$dim_id} |
my $type = $dimension{$dim}{'criteria.'.$id.'.type'}; |
eq 'N') { |
if ($type eq 'dimension') { |
$opt_count++; |
$result.=$dimension{$id}{'result'}; |
if ($Apache::lonhomework::history{"resource.$version.0.$dim_id.status"} eq 'pass') { |
next; |
$opt_passed++; |
|
} |
|
} else { |
|
$man_count++; |
|
} |
} |
|
my $criteria = |
|
&nested_parse(\$dimension{$dim}{'criteria.'.$id}, |
|
[@_]); |
|
$status .= &layout_web_Criteria($dim,$id,$criteria); |
} |
} |
|
|
my $opt_req=&Apache::lonxml::get_param('OptionalRequired', |
|
$parstack,$safeeval); |
|
if ($opt_req !~ /\S/) { $opt_req='0'; } |
|
$status.="\n<p>".&mt('You needed to pass all of the [_1] mandatory components and [_2] of the [_3] optional components, of which you passed [_4].',$man_count,$opt_req,$opt_count,$opt_passed)."</p></div>\n"; |
|
|
|
my $internal_location=&internal_location(); |
my $internal_location=&internal_location(); |
$result=~s/\Q$internal_location\E/$status/; |
$result=~s/\Q$internal_location\E/$status/; |
Line 900 DONEBUTTON
|
Line 1111 DONEBUTTON
|
&Apache::loncommon::end_page({'discussion' => 1}); |
&Apache::loncommon::end_page({'discussion' => 1}); |
} |
} |
} |
} |
if ($target eq 'grade' && !$env{'form.webgrade'} && !$previous) { |
|
|
my $useslots = &Apache::lonnet::EXT("resource.0.useslots"); |
|
my %queue_data = ('type' => 'Task', |
|
'time' => time,); |
|
if (defined($Apache::inputtags::slot_name)) { |
|
$queue_data{'slot'} = $Apache::inputtags::slot_name; |
|
} elsif (defined($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 |
|
&& $status eq 'CAN_ANSWER') { |
my $award='SUBMITTED'; |
my $award='SUBMITTED'; |
&Apache::essayresponse::file_submission("$version.0",'bridgetask', |
&Apache::essayresponse::file_submission("$version.0",'bridgetask', |
'portfiles',\$award); |
'portfiles',\$award); |
Line 922 DONEBUTTON
|
Line 1145 DONEBUTTON
|
&Apache::lonhomework::showhash(%Apache::lonhomework::results); |
&Apache::lonhomework::showhash(%Apache::lonhomework::results); |
&Apache::structuretags::finalize_storage(); |
&Apache::structuretags::finalize_storage(); |
if ($award eq 'SUBMITTED') { |
if ($award eq 'SUBMITTED') { |
my $useslots = &Apache::lonnet::EXT("resource.0.useslots"); |
&add_to_queue('gradingqueue',\%queue_data); |
if ($useslots =~ /^\s*no\s*$/i) { |
|
&add_to_queue('gradingqueue', |
|
{'type' => 'Task', |
|
'time' => time}); |
|
} elsif (defined($Apache::inputtags::slot_name)) { |
|
&add_to_queue('gradingqueue', |
|
{'type' => 'Task', |
|
'time' => time, |
|
'slot' => $Apache::inputtags::slot_name}); |
|
} |
|
} |
} |
} elsif ($Apache::lonhomework::results{'INTERNAL_store'}) { |
|
&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 946 DONEBUTTON
|
Line 1162 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) { |
my $dim = $top; |
|
foreach my $id (@{$dimension{$dim}{'criterias'}}) { |
|
my $link=&link($id); |
|
|
|
my $type = $dimension{$dim}{'criteria.'.$id.'.type'}; |
|
|
|
if ($type eq 'criteria') { |
|
# dimensional 'criteria' don't get assigned grades |
|
$Apache::lonhomework::results{"resource.$version.0.$id.status"}=$env{'form.HWVAL_'.$link}; |
|
$Apache::lonhomework::results{"resource.$version.0.$id.comment"}=$env{'form.HWVAL_comment_'.$link}; |
|
} |
my $status= |
my $status= |
$Apache::lonhomework::results{"resource.$version.0.$dim_id.status"}; |
$Apache::lonhomework::results{"resource.$version.0.$id.status"}; |
my $mandatory= |
my $mandatory=($dimension{$dim}{'criteria.'.$id.'.mandatory'} ne 'N'); |
($Apache::bridgetask::dimensionmandatory{$dim_id} 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') { |
if ($mandatory) { $mandatory_failed++; } |
if ($mandatory) { $mandatory_failed++; } |
} elsif ($status eq 'ungraded') { |
|
$ungraded++; |
|
} elsif ($status eq 'review') { |
} elsif ($status eq 'review') { |
$review++; |
$review++; |
|
} elsif ($status eq 'ungraded') { |
|
$ungraded++; |
} else { |
} else { |
$ungraded++; |
$ungraded++; |
} |
} |
Line 966 DONEBUTTON
|
Line 1192 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(" task 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) { |
$Apache::lonhomework::results{"resource.$version.0.status"}='review'; |
$Apache::lonhomework::results{"resource.$version.0.status"}='review'; |
if ($env{'form.queue'} eq 'reviewqueue') { |
|
&check_queue_unlock($env{'form.queue'}); |
|
&Apache::lonxml::debug(" still needs review not changing status."); |
|
} else { |
|
&move_between_queues($env{'form.queue'},'reviewqueue'); |
|
} |
|
} elsif ($ungraded) { |
} elsif ($ungraded) { |
$Apache::lonhomework::results{"resource.$version.0.status"}='ungraded'; |
$Apache::lonhomework::results{"resource.$version.0.status"}='ungraded'; |
if ($env{'form.queue'} eq 'reviewqueue' || |
|
$env{'form.queue'} eq 'none' ) { |
|
&Apache::lonxml::debug("moving back."); |
|
&move_between_queues($env{'form.queue'},'gradingqueue'); |
|
} else { |
|
&check_queue_unlock($env{'form.queue'}); |
|
} |
|
} elsif ($mandatory_failed) { |
} elsif ($mandatory_failed) { |
$Apache::lonhomework::results{"resource.$version.0.status"}='fail'; |
$Apache::lonhomework::results{"resource.$version.0.status"}='fail'; |
$Apache::lonhomework::results{"resource.$version.0.solved"}='incorrect_by_override'; |
$Apache::lonhomework::results{"resource.$version.0.solved"}='incorrect_by_override'; |
$Apache::lonhomework::results{"resource.$version.0.award"}='INCORRECT'; |
$Apache::lonhomework::results{"resource.$version.0.award"}='INCORRECT'; |
$Apache::lonhomework::results{"resource.$version.0.awarded"}='0'; |
$Apache::lonhomework::results{"resource.$version.0.awarded"}='0'; |
&remove_from_queue($env{'form.queue'}); |
my ($symb,$courseid,$udom,$uname)=&Apache::lonnet::whichuser(); |
|
|
my ($symb,$courseid,$udom,$uname)=&Apache::lonxml::whichuser(); |
|
|
|
if ($env{'form.regrade'} ne 'yes') { |
if ($env{'form.regrade'} ne 'yes') { |
$Apache::lonhomework::results{"resource.$version.0.bridgetask.portfiles"}= |
$Apache::lonhomework::results{"resource.$version.0.bridgetask.portfiles"}= |
Line 1009 DONEBUTTON
|
Line 1220 DONEBUTTON
|
$Apache::lonhomework::results{"resource.$version.0.solved"}='correct_by_override'; |
$Apache::lonhomework::results{"resource.$version.0.solved"}='correct_by_override'; |
$Apache::lonhomework::results{"resource.$version.0.award"}='EXACT_ANS'; |
$Apache::lonhomework::results{"resource.$version.0.award"}='EXACT_ANS'; |
$Apache::lonhomework::results{"resource.$version.0.awarded"}='1'; |
$Apache::lonhomework::results{"resource.$version.0.awarded"}='1'; |
&remove_from_queue($env{'form.queue'}); |
my ($symb,$courseid,$udom,$uname)=&Apache::lonnet::whichuser(); |
|
|
my ($symb,$courseid,$udom,$uname)=&Apache::lonxml::whichuser(); |
|
if ($env{'form.regrade'} ne 'yes') { |
if ($env{'form.regrade'} ne 'yes') { |
$Apache::lonhomework::results{"resource.$version.0.bridgetask.portfiles"}= |
$Apache::lonhomework::results{"resource.$version.0.bridgetask.portfiles"}= |
$Apache::lonhomework::history{"resource.$version.0.bridgetask.portfiles"}; |
$Apache::lonhomework::history{"resource.$version.0.bridgetask.portfiles"}; |
Line 1034 DONEBUTTON
|
Line 1243 DONEBUTTON
|
} |
} |
&minimize_storage(); |
&minimize_storage(); |
&Apache::structuretags::finalize_storage(); |
&Apache::structuretags::finalize_storage(); |
|
|
|
# data stored, now handle queue |
|
if ($review) { |
|
if ($env{'form.queue'} eq 'reviewqueue') { |
|
&check_queue_unlock($env{'form.queue'}); |
|
&Apache::lonxml::debug(" still needs review not changing status."); |
|
} else { |
|
if ($env{'form.queue'} ne 'none') { |
|
&move_between_queues($env{'form.queue'},'reviewqueue'); |
|
} else { |
|
&add_to_queue('reviewqueue',\%queue_data); |
|
} |
|
} |
|
} elsif ($ungraded) { |
|
if ($env{'form.queue'} eq 'reviewqueue') { |
|
&Apache::lonxml::debug("moving back."); |
|
&move_between_queues($env{'form.queue'}, |
|
'gradingqueue'); |
|
} elsif ($env{'form.queue'} eq 'none' ) { |
|
&add_to_queue('gradingqueue',\%queue_data); |
|
} else { |
|
&check_queue_unlock($env{'form.queue'}); |
|
} |
|
} elsif ($mandatory_failed) { |
|
&remove_from_queue($env{'form.queue'}); |
|
} else { |
|
&remove_from_queue($env{'form.queue'}); |
|
} |
|
} |
|
if (exists($Apache::lonhomework::results{'INTERNAL_store'})) { |
|
# instance generation occured and hasn't yet been stored |
|
&Apache::structuretags::finalize_storage(); |
} |
} |
} elsif ($target eq 'webgrade') { |
} elsif ($target eq 'webgrade') { |
$result.="</div>"; |
if (&nest()) { |
|
&Apache::lonxml::endredirection(); |
|
&end_delay(); |
|
$result.=$dimension{$top}{'result'}; |
|
} else { |
|
$result.=&Apache::lonxml::endredirection(); |
|
} |
|
my $dim = $top; |
|
foreach my $id (@{$dimension{$dim}{'criterias'}} ) { |
|
my $type = $dimension{$dim}{'criteria.'.$id.'.type'}; |
|
if ($type eq 'dimension') { |
|
# dimensional 'criteria' don't get assigned grades |
|
next; |
|
} else { |
|
my $criteria =&nested_parse(\$dimension{$dim}{'criteria.'.$id}, |
|
[@_]); |
|
$criteria = &layout_webgrade_Criteria($dim,$id,$criteria); |
|
my $internal_location=&internal_location($id); |
|
if ($result =~ m/\Q$internal_location\E/) { |
|
$result=~s/\Q$internal_location\E/$criteria/; |
|
} else { |
|
$result.=$criteria; |
|
} |
|
|
|
} |
|
} |
|
$result.="</div>"; |
#$result.='<input type="submit" name="next" value="'. |
#$result.='<input type="submit" name="next" value="'. |
# &mt('Save & Next').'" /> '; |
# &mt('Save & Next').'" /> '; |
#$result.='<input type="submit" name="end" value="'. |
#$result.='<input type="submit" name="end" value="'. |
Line 1057 DONEBUTTON
|
Line 1324 DONEBUTTON
|
'Partial Credit Factor'); |
'Partial Credit Factor'); |
$result.=&Apache::response::meta_stores_write('status','string', |
$result.=&Apache::response::meta_stores_write('status','string', |
'Bridge Task Status'); |
'Bridge Task Status'); |
|
} elsif ($target eq 'edit') { |
|
&Apache::structuretags::reset_problem_globals('Task'); |
|
undef($Apache::lonhomework::parsing_a_task); |
|
return ('','no'); |
} |
} |
|
&Apache::structuretags::reset_problem_globals('Task'); |
undef($Apache::lonhomework::parsing_a_task); |
undef($Apache::lonhomework::parsing_a_task); |
return $result; |
return $result; |
} |
} |
Line 1082 sub move_between_queues {
|
Line 1354 sub move_between_queues {
|
sub check_queue_unlock { |
sub check_queue_unlock { |
my ($queue,$key,$allow_not_me)=@_; |
my ($queue,$key,$allow_not_me)=@_; |
if ($queue eq 'none') { return 'ok'; } |
if ($queue eq 'none') { return 'ok'; } |
my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser(); |
my ($symb,$cid,$udom,$uname)=&Apache::lonnet::whichuser(); |
if (!defined($key)) { |
if (!defined($key)) { |
$key="$symb\0queue\0$uname:$udom"; |
$key="$symb\0queue\0$uname:$udom"; |
} |
} |
Line 1091 sub check_queue_unlock {
|
Line 1363 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 1104 sub in_queue {
|
Line 1377 sub in_queue {
|
if ($queue eq 'none') { return 0; } |
if ($queue eq 'none') { return 0; } |
if (!defined($symb) || !defined($cdom) || !defined($cnum) |
if (!defined($symb) || !defined($cdom) || !defined($cnum) |
|| !defined($udom) || !defined($uname)) { |
|| !defined($udom) || !defined($uname)) { |
($symb,my $cid,$udom,$uname)=&Apache::lonxml::whichuser(); |
($symb,my $cid,$udom,$uname)=&Apache::lonnet::whichuser(); |
$cnum=$env{'course.'.$cid.'.num'}; |
$cnum=$env{'course.'.$cid.'.num'}; |
$cdom=$env{'course.'.$cid.'.domain'}; |
$cdom=$env{'course.'.$cid.'.domain'}; |
} |
} |
Line 1123 sub remove_from_queue {
|
Line 1396 sub remove_from_queue {
|
if ($queue eq 'none') { return 'ok'; } |
if ($queue eq 'none') { return 'ok'; } |
if (!defined($symb) || !defined($cdom) || !defined($cnum) |
if (!defined($symb) || !defined($cdom) || !defined($cnum) |
|| !defined($udom) || !defined($uname)) { |
|| !defined($udom) || !defined($uname)) { |
($symb,my $cid,$udom,$uname)=&Apache::lonxml::whichuser(); |
($symb,my $cid,$udom,$uname)=&Apache::lonnet::whichuser(); |
$cnum=$env{'course.'.$cid.'.num'}; |
$cnum=$env{'course.'.$cid.'.num'}; |
$cdom=$env{'course.'.$cid.'.domain'}; |
$cdom=$env{'course.'.$cid.'.domain'}; |
} |
} |
Line 1147 sub setup_env_for_other_user {
|
Line 1420 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::lonnet::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 1190 sub check_queue_for_key {
|
Line 1467 sub check_queue_for_key {
|
sub add_to_queue { |
sub add_to_queue { |
my ($queue,$user_data)=@_; |
my ($queue,$user_data)=@_; |
if ($queue eq 'none') { return 'ok'; } |
if ($queue eq 'none') { return 'ok'; } |
my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser(); |
my ($symb,$cid,$udom,$uname)=&Apache::lonnet::whichuser(); |
if (!$cid || $env{'request.state'} eq 'construct') { |
if (!$cid || $env{'request.state'} eq 'construct') { |
return 'no_queue'; |
return 'no_queue'; |
} |
} |
Line 1228 sub get_limited_classlist {
|
Line 1505 sub get_limited_classlist {
|
sub show_queue { |
sub show_queue { |
my ($queue,$with_selects)=@_; |
my ($queue,$with_selects)=@_; |
my $result; |
my $result; |
my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser(); |
my ($symb,$cid,$udom,$uname)=&Apache::lonnet::whichuser(); |
my $cnum=$env{'course.'.$cid.'.num'}; |
my $cnum=$env{'course.'.$cid.'.num'}; |
my $cdom=$env{'course.'.$cid.'.domain'}; |
my $cdom=$env{'course.'.$cid.'.domain'}; |
|
|
Line 1257 sub show_queue {
|
Line 1534 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 1277 sub show_queue {
|
Line 1562 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 1298 sub show_queue {
|
Line 1584 sub show_queue {
|
my $ekey=&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 ($locker,$time) = |
|
&get_lock_info($queue{"$key\0locked"}); |
|
if ($time) { |
|
$time = |
|
&Apache::lonnavmaps::timeToHumanString($time, |
|
'start'); |
|
} |
my $me=$env{'user.name'}.':'.$env{'user.domain'}; |
my $me=$env{'user.name'}.':'.$env{'user.domain'}; |
$status=&mt('Locked by <tt>[_1]</tt>',$queue{"$key\0locked"}); |
$status=&mt('Locked by <tt>[_1]</tt> [_2]',$locker,$time); |
if ($me eq $queue{"$key\0locked"}) { |
if ($me eq $locker) { |
($action,$description)=('resume',&mt('Resume')); |
($action,$description)=('resume',&mt('Resume')); |
} else { |
} else { |
($action,$description)=('unlock',&mt('Unlock')); |
($action,$description)=('unlock',&mt('Unlock')); |
Line 1336 FORM
|
Line 1629 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; |
} |
} |
|
|
sub get_queue_counts { |
sub get_queue_counts { |
my ($queue)=@_; |
my ($queue)=@_; |
my $result; |
my $result; |
my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser(); |
my ($symb,$cid,$udom,$uname)=&Apache::lonnet::whichuser(); |
my $cnum=$env{'course.'.$cid.'.num'}; |
my $cnum=$env{'course.'.$cid.'.num'}; |
my $cdom=$env{'course.'.$cid.'.domain'}; |
my $cdom=$env{'course.'.$cid.'.domain'}; |
|
|
Line 1363 sub get_queue_counts {
|
Line 1656 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); |
if (!defined($classlist->{$uname.':'.$udom})) { next; } |
if (!defined($classlist->{$uname.':'.$udom})) { next; } |
|
|
if ($key=~/locked$/) { |
if ($key=~/locked$/) { |
$locks++; |
$locks++; |
} elsif ($key=~/timestamp$/) { |
} elsif ($key=~/timestamp$/) { |
Line 1404 sub decode_queue_key {
|
Line 1696 sub decode_queue_key {
|
sub queue_key_locked { |
sub queue_key_locked { |
my ($queue,$key,$cdom,$cnum)=@_; |
my ($queue,$key,$cdom,$cnum)=@_; |
if (!defined($cdom) || !defined($cnum)) { |
if (!defined($cdom) || !defined($cnum)) { |
my (undef,$cid)=&Apache::lonxml::whichuser(); |
my (undef,$cid)=&Apache::lonnet::whichuser(); |
$cnum=$env{'course.'.$cid.'.num'}; |
$cnum=$env{'course.'.$cid.'.num'}; |
$cdom=$env{'course.'.$cid.'.domain'}; |
$cdom=$env{'course.'.$cid.'.domain'}; |
} |
} |
my ($key_locked,$value)= |
my ($key_locked,$value)= |
&Apache::lonnet::get($queue,["$key\0locked"],$cdom,$cnum); |
&Apache::lonnet::get($queue,["$key\0locked"],$cdom,$cnum); |
if ($key_locked eq "$key\0locked") { |
if ($key_locked eq "$key\0locked") { |
return $value; |
return &get_lock_info($value); |
} |
} |
return undef; |
return undef; |
} |
} |
Line 1492 sub pick_from_queue_data {
|
Line 1784 sub pick_from_queue_data {
|
return undef; |
return undef; |
} |
} |
|
|
|
sub get_lock_info { |
|
my ($lock_info) = @_; |
|
if (wantarray) { |
|
if (ref($lock_info) eq 'ARRAY') { |
|
return @{$lock_info}; |
|
} else { |
|
return ($lock_info); |
|
} |
|
} else { |
|
if (ref($lock_info) eq 'ARRAY') { |
|
return $lock_info->[0]; |
|
} else { |
|
return $lock_info; |
|
} |
|
} |
|
return; |
|
} |
|
|
sub find_mid_grade { |
sub find_mid_grade { |
my ($queue,$symb,$cdom,$cnum)=@_; |
my ($queue,$symb,$cdom,$cnum)=@_; |
my $todo=&unescape($env{'form.gradingkey'}); |
my $todo=&unescape($env{'form.gradingkey'}); |
Line 1503 sub find_mid_grade {
|
Line 1813 sub find_mid_grade {
|
my $regexp="^$symb\0.*\0locked\$"; |
my $regexp="^$symb\0.*\0locked\$"; |
my %locks=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp); |
my %locks=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp); |
foreach my $key (keys(%locks)) { |
foreach my $key (keys(%locks)) { |
my $who=$locks{$key}; |
my $who= &get_lock_info($locks{$key}); |
if ($who eq $me) { |
if ($who eq $me) { |
$todo=$key; |
$todo=$key; |
$todo=~s/\0locked$//; |
$todo=~s/\0locked$//; |
Line 1516 sub find_mid_grade {
|
Line 1826 sub find_mid_grade {
|
sub lock_key { |
sub lock_key { |
my ($queue,$todo)=@_; |
my ($queue,$todo)=@_; |
my $me=$env{'user.name'}.':'.$env{'user.domain'}; |
my $me=$env{'user.name'}.':'.$env{'user.domain'}; |
my (undef,$cid)=&Apache::lonxml::whichuser(); |
my (undef,$cid)=&Apache::lonnet::whichuser(); |
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 $success=&Apache::lonnet::newput($queue,{"$todo\0locked"=> $me}, |
my $success=&Apache::lonnet::newput($queue,{"$todo\0locked"=> [$me,time]}, |
$cdom,$cnum); |
$cdom,$cnum); |
&Apache::lonxml::debug("success $success $todo"); |
&Apache::lonxml::debug("success $success $todo"); |
if ($success eq 'ok') { |
if ($success eq 'ok') { |
Line 1531 sub lock_key {
|
Line 1841 sub lock_key {
|
sub get_queue_symb_status { |
sub get_queue_symb_status { |
my ($queue,$symb,$cdom,$cnum) = @_; |
my ($queue,$symb,$cdom,$cnum) = @_; |
if (!defined($cdom) || !defined($cnum)) { |
if (!defined($cdom) || !defined($cnum)) { |
my (undef,$cid)=&Apache::lonxml::whichuser(); |
my (undef,$cid)=&Apache::lonnet::whichuser(); |
$cnum=$env{'course.'.$cid.'.num'}; |
$cnum=$env{'course.'.$cid.'.num'}; |
$cdom=$env{'course.'.$cid.'.domain'}; |
$cdom=$env{'course.'.$cid.'.domain'}; |
} |
} |
Line 1555 sub get_queue_symb_status {
|
Line 1865 sub get_queue_symb_status {
|
sub get_from_queue { |
sub get_from_queue { |
my ($queue)=@_; |
my ($queue)=@_; |
my $result; |
my $result; |
my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser(); |
my ($symb,$cid,$udom,$uname)=&Apache::lonnet::whichuser(); |
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=&find_mid_grade($queue,$symb,$cdom,$cnum); |
my $todo=&find_mid_grade($queue,$symb,$cdom,$cnum); |
Line 1631 sub get_from_queue {
|
Line 1941 sub get_from_queue {
|
} |
} |
|
|
sub select_user { |
sub select_user { |
my ($symb,$cid)=&Apache::lonxml::whichuser(); |
my ($symb,$cid)=&Apache::lonnet::whichuser(); |
|
|
my @chosen_sections= |
my @chosen_sections= |
&Apache::loncommon::get_env_multiple('form.chosensections'); |
&Apache::loncommon::get_env_multiple('form.chosensections'); |
Line 1643 sub select_user {
|
Line 1953 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 1668 sub select_user {
|
Line 1978 sub select_user {
|
my $todo = |
my $todo = |
&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 1676 sub select_user {
|
Line 1987 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 1726 RESULT
|
Line 2037 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 1773 sub end_ClosingParagraph {
|
Line 2084 sub end_ClosingParagraph {
|
return $result; |
return $result; |
} |
} |
|
|
|
sub get_dim_id { |
|
if (@Apache::bridgetask::dimension) { |
|
return $Apache::bridgetask::dimension[-1]; |
|
} else { |
|
return $top; |
|
} |
|
} |
|
|
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 1780 sub get_id {
|
Line 2099 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); |
|
} |
|
|
|
{ |
|
my @allowed; |
|
sub enable_dimension_parsing { |
|
my ($id) = @_; |
|
push(@allowed,$id); |
|
} |
|
sub disable_dimension_parsing { |
|
pop(@allowed); |
|
} |
|
sub skip_dimension_parsing { |
|
my ($check) = @_; |
|
if (!@allowed) { return 0;} |
|
# if unspecified allow any id |
|
if ($allowed[-1] eq undef) { return 0;} |
|
|
|
return ($check ne $allowed[-1]); |
|
} |
|
} |
|
|
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,$style)=@_; |
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); |
if(&skip_dimension_parsing($dim)) { |
|
$dimension{$previous_dim}{'criteria.'.$dim} = |
|
$token->[4] |
|
.&Apache::lonxml::get_all_text('/'.$tagstack->[-1],$parser, |
|
$style) |
|
.'</'.$tagstack->[-1].'>'; |
|
} |
|
$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; |
|
$dimension{$dim}{'depth'} = 1 + $dimension{$previous_dim}{'depth'}; |
|
|
|
&Apache::lonxml::debug("adding $dim as criteria to $previous_dim"); |
|
} else { |
|
$dimension{$top}{'depth'}=0; |
|
$dimension{$top}{'criteria.'.$dim.'.type'}='dimension'; |
|
$dimension{$top}{'criteria.'.$dim.'.mandatory'}= |
|
&Apache::lonxml::get_param('Mandatory',$parstack,$safeeval); |
|
push(@{$dimension{$top}{'criterias'}},$dim); |
|
$dimension{$dim}{'nested'}=$top; |
|
} |
|
push(@Apache::bridgetask::dimension,$dim); |
&Apache::lonxml::startredirection(); |
&Apache::lonxml::startredirection(); |
return &internal_location($dim_id); |
if (!&skip_dimension_parsing($dim)) { |
|
&enable_dimension_parsing($dim); |
|
} |
|
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 1802 sub get_instance {
|
Line 2188 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 1814 sub get_instance {
|
Line 2200 sub get_instance {
|
if (defined($instance)) { return $instance; } |
if (defined($instance)) { return $instance; } |
|
|
&Apache::response::pushrandomnumber(); |
&Apache::response::pushrandomnumber(); |
my @instances = @{$dimension{'instances'}}; |
if (ref($dimension{$dim}{'instances'}) eq 'ARRAY') { |
# remove disabled instances |
my @instances = @{$dimension{$dim}{'instances'}}; |
for (my $i=0; $i < $#instances; $i++) { |
# remove disabled instances |
if ($dimension{$instances[$i].'.disabled'}) { |
for (my $i=0; $i < $#instances; $i++) { |
splice(@instances,$i,1); |
if ($dimension{$dim}{$instances[$i].'.disabled'}) { |
$i--; |
splice(@instances,$i,1); |
|
$i--; |
|
} |
|
} |
|
@instances = &Math::Random::random_permutation(@instances); |
|
$instance = $instances[($version-1)%scalar(@instances)]; |
|
if ($version =~ /^\d$/) { |
|
$Apache::lonhomework::results{"resource.$version.0.$dim.instance"} = |
|
$instance; |
|
$Apache::lonhomework::results{'INTERNAL_store'} = 1; |
} |
} |
} |
|
@instances = &Math::Random::random_permutation(@instances); |
|
$instance = $instances[($version-1)%scalar(@instances)]; |
|
if ($version =~ /^\d$/) { |
|
$Apache::lonhomework::results{"resource.$version.0.$dim.instance"} = |
|
$instance; |
|
$Apache::lonhomework::results{'INTERNAL_store'} = 1; |
|
} |
} |
&Apache::response::poprandomnumber(); |
&Apache::response::poprandomnumber(); |
return $instance; |
return $instance; |
} |
} |
} |
} |
|
|
{ |
sub get_criteria { |
my $last_link; |
my ($what,$version,$dim,$id) = @_; |
sub link { |
my $type = $dimension{$dim}{'criteria.'.$id.'.type'}; |
my ($id) = @_; |
my $prefix = ($type eq 'criteria' && $dim ne $top) ? "$dim.$id" |
$id =~ s/\./_/g; |
: "$id"; |
return 'LC_GRADING_criteria_'.$id; |
my $entry = "resource.$version.0.$prefix.$what"; |
|
if (exists($Apache::lonhomework::results{$entry})) { |
|
return $Apache::lonhomework::results{$entry}; |
|
} |
|
return $Apache::lonhomework::history{$entry}; |
|
} |
|
|
|
sub link { |
|
my ($id) = @_; |
|
$id =~ s/\./_/g; |
|
return 'LC_GRADING_criteria_'.$id; |
|
} |
|
sub end_Question { return &end_Dimension(@_); } |
|
sub end_Dimension { |
|
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
|
my $result=&Apache::lonxml::endredirection(); |
|
my $dim=&get_id($parstack,$safeeval); |
|
if (&skip_dimension_parsing($dim)) { |
|
pop(@Apache::bridgetask::dimension); |
|
return; |
} |
} |
sub end_Question { return &end_Dimension(@_); } |
my $instance=&get_instance($dim); |
sub end_Dimension { |
my $version=&get_version(); |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
if ($target eq 'web') { |
my $result=&Apache::lonxml::endredirection(); |
$result .= &nested_parse(\$dimension{$dim}{'intro'},[@_]); |
my $dim=&get_id($parstack,$safeeval); |
my @instances = $instance; |
my $instance=&get_instance($dim); |
if (&Apache::response::showallfoils()) { |
my $version=&get_version(); |
@instances = @{$dimension{$dim}{'instances'}}; |
if ($target eq 'web') { |
} |
@Apache::scripttag::parser_env = @_; |
my $shown_question_text; |
$result.=&Apache::scripttag::xmlparse($dimension{'intro'}); |
foreach my $instance (@instances) { |
my @instances = $instance; |
$result .= &nested_parse(\$dimension{$dim}{$instance.'.text'}, |
if (&Apache::response::showallfoils()) { |
[@_]); |
@instances = @{$dimension{'instances'}}; |
$result .= &nested_parse(\$dimension{$dim}{'questiontext'}, |
} |
[@_],{'set_dim_id' => undef}); |
foreach my $instance (@instances) { |
my $task_status = |
@Apache::scripttag::parser_env = @_; |
$Apache::lonhomework::history{"resource.$version.0.status"}; |
$result.=&Apache::scripttag::xmlparse($dimension{$instance.'.text'}); |
if ($task_status ne 'pass' && $task_status ne 'fail') { |
if ($Apache::lonhomework::history{"resource.$version.0.status"} eq 'pass' || |
|
$Apache::lonhomework::history{"resource.$version.0.status"} eq 'fail') { |
foreach my $id (@{$dimension{$dim}{$instance.'.criterias'}}, |
|
@{$dimension{$dim}{'criterias'}}) { |
my $dim_status=$Apache::lonhomework::history{"resource.$version.0.$dim.status"}; |
my $type = $dimension{$dim}{'criteria.'.$id.'.type'}; |
my $mandatory='Mandatory'; |
&Apache::lonxml::debug("$id is $type"); |
if ($Apache::bridgetask::dimensionmandatory{$dim} eq 'N') { |
if ($type eq 'dimension') { |
$mandatory='Optional'; |
$result.= |
} |
&nested_parse(\$dimension{$dim}{'criteria.'.$id}, |
my $dim_info="<div class='LC_$dim_status LC_question_grade'>\n"; |
[@_],{'set_dim_id' => $id}); |
if ($dim_status eq 'pass') { |
|
$dim_info.='<h3>Question : you passed this '.$mandatory.' question</h3>'; |
|
} |
|
if ($dim_status eq 'fail') { |
|
$dim_info.='<h3>Question : you did not pass this '.$mandatory.' question</h3>'; |
|
} |
|
my $man_count=0; |
|
my $man_passed=0; |
|
my $opt_count=0; |
|
my $opt_passed=0; |
|
foreach my $id ( @{$dimension{$instance.'.criterias'}}, |
|
@{$dimension{'criterias'}} ) { |
|
if ($dimension{'criteria.'.$id.'.mandatory'} |
|
eq 'N') { |
|
$opt_count++; |
|
if ($Apache::lonhomework::history{"resource.$version.0.$dim.$id.status"} eq 'pass') { |
|
$opt_passed++; |
|
} |
|
} else { |
|
$man_count++; |
|
if ($Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.status"} eq 'pass') { |
|
$man_passed++; |
|
} |
|
} |
|
} |
|
if ($man_passed eq $man_count) { $man_passed='all'; } |
|
|
|
my $opt_req=$dimension{$instance.'.optionalrequired'}; |
|
if ($opt_req !~ /\S/) { |
|
$opt_req= |
|
&Apache::lonxml::get_param('OptionalRequired', |
|
$parstack,$safeeval); |
|
if ($opt_req !~ /\S/) { $opt_req = 0; } |
|
} |
} |
$dim_info.="\n<p>".&mt('You passed [_1] of the [_2] mandatory components and [_3] of the [_4] optional components, of which you were required to pass [_5].',$man_passed,$man_count,$opt_passed,$opt_count,$opt_req)."</p>\n</div>"; |
} |
|
} else { |
my $internal_location=&internal_location($dim); |
my $dim_status=$Apache::lonhomework::history{"resource.$version.0.$dim.status"}; |
$result=~s/\Q$internal_location\E/$dim_info/; |
my $mandatory='Mandatory'; |
|
if (&Apache::lonxml::get_param('Mandatory',$parstack,$safeeval) eq 'N') { |
foreach my $id (@{$dimension{$instance.'.criterias'}}, |
$mandatory='Optional'; |
@{$dimension{'criterias'}}) { |
} |
my $status=$Apache::lonhomework::history{"resource.$version.0.$dim.$id.status"}; |
my $dim_info= |
my $comment=$Apache::lonhomework::history{"resource.$version.0.$dim.$id.comment"}; |
"\n<div class='LC_$dim_status LC_question_grade'>\n\t"; |
my $mandatory=($dimension{'criteria.'.$id.'.mandatory'} ne 'N'); |
my $ucquestion = |
if ($mandatory) { |
my $question = |
$mandatory='Mandatory'; |
('sub' x $dimension{$dim}{'depth'}).'question'; |
} else { |
$ucquestion =~ s/^(.)/uc($1)/e; |
$mandatory='Optional'; |
if ($dim_status eq 'pass') { |
} |
$dim_info.='<h3>'.$ucquestion.' : you passed this '.$mandatory.' '.$question.'</h3>'; |
if ($status eq 'fail') { |
} |
} elsif ($status eq 'pass') { |
if ($dim_status eq 'fail') { |
|
$dim_info.='<h3>'.$ucquestion.' : you did not pass this '.$mandatory.' '.$question.'</h3>'; |
|
} |
|
my %counts = &get_counts($dim,$instance,$parstack, |
|
$safeeval); |
|
|
|
$dim_info.="\n\t<p>" |
|
.&question_status_message(\%counts, |
|
$dimension{$dim}{'depth'}) |
|
."</p>\n</div>\n"; |
|
|
|
foreach my $id (@{$dimension{$dim}{$instance.'.criterias'}}, |
|
@{$dimension{$dim}{'criterias'}}) { |
|
my $type = $dimension{$dim}{'criteria.'.$id.'.type'}; |
|
if ($type eq 'dimension') { |
|
if (defined($dimension{$id}{'result'})) { |
|
$result.=$dimension{$id}{'result'}; |
|
next; |
} else { |
} else { |
&Apache::lonxml::error("Student viewing a graded bridgetask was shown a status of $status"); |
$dim_info .= |
|
&nested_parse(\$dimension{$dim}{'criteria.'.$id}, |
|
[@_],{'set_dim_id' => $id}); |
} |
} |
my $status_display=$status; |
} else { |
$status_display=~s/^([a-z])/uc($1)/e; |
my $criteria = |
$result.= |
&nested_parse(\$dimension{$dim}{'criteria.'.$id}, |
'<div class="LC_'.$status.' LC_criteria"><h4>' |
[@_]); |
.$mandatory.' Criteria</h4><p>'; |
$dim_info .= &layout_web_Criteria($dim,$id,$criteria); |
@Apache::scripttag::parser_env = @_; |
|
$result.=&Apache::scripttag::xmlparse($dimension{'criteria.'.$id}); |
|
$result.='</p><p class="LC_grade">'.$status_display.'</p>'; |
|
if ($Apache::lonhomework::history{"resource.$version.0.$dim.$id.comment"}) { |
|
$result.='<p class="LC_comment">'.&mt('Comment: [_1]',$Apache::lonhomework::history{"resource.$version.0.$dim.$id.comment"}).'</p>'; |
|
} |
|
$result.='</div>'; |
|
} |
} |
} |
} |
} |
# puts the results at the end of the dimension |
} elsif ($target eq 'webgrade') { |
$result .= $dim_info; |
# in case of any side effects that we need |
|
@Apache::scripttag::parser_env = @_; |
|
&Apache::scripttag::xmlparse($dimension{'intro'}); |
|
@Apache::scripttag::parser_env = @_; |
|
&Apache::scripttag::xmlparse($dimension{$instance.'.text'}); |
|
foreach my $id (@{$dimension{$instance.'.criterias'}}, |
|
@{$dimension{'criterias'}} ) { |
|
my $link=&link($id); |
|
my $status=$Apache::lonhomework::history{"resource.$version.0.$dim.$id.status"}; |
|
$result.='<div class="LC_GRADING_criteria" id="'.$link.'">'."\n". |
|
'<div class="LC_GRADING_criteriatext" id="next_'.$last_link.'">'."\n"; |
|
@Apache::scripttag::parser_env = @_; |
|
$result.=&Apache::scripttag::xmlparse($dimension{'criteria.'.$id}); |
|
$result.='</div>'."\n". |
|
#$dimension{'criteria.'.$id}. |
|
'<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_fail"><input type="radio" name="HWVAL_'.$link.'" value="fail" '.($status eq 'fail' ? 'checked="checked"':'').' />'.&mt('Fail').'</label>'."\n". |
|
'<label class="LC_GRADING_pass"><input type="radio" name="HWVAL_'.$link.'" value="pass" '.($status eq 'pass' ? 'checked="checked"':'').' />'.&mt('Pass').'</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". |
|
'<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". |
|
'</label>'."\n". |
|
'<ul class="LC_GRADING_navbuttons">'."\n". |
|
'<li><a href="#'.$last_link.'">Prev</a></li>'."\n". |
|
'<li><a href="#next_'.$link.'">Next</a></li>'."\n". |
|
'</ul>'."\n". |
|
'</div>'."\n"; |
|
$result.=&grading_history($version,$dim,$id); |
|
$last_link=$link; |
|
} |
|
} elsif ($target eq 'grade' && $env{'form.webgrade'}) { |
|
my $optional_passed=0; |
|
my $mandatory_failed=0; |
|
my $ungraded=0; |
|
my $review=0; |
|
|
|
@Apache::scripttag::parser_env = @_; |
# puts the results at the beginning of the dimension |
$result.=&Apache::scripttag::xmlparse($dimension{'intro'}); |
# my $internal_location=&internal_location($dim); |
foreach my $id (@{$dimension{$instance.'.criterias'}}, |
# $result=~s/\Q$internal_location\E/$dim_info/; |
@{$dimension{'criterias'}}) { |
} |
my $link=&link($id); |
} |
@Apache::scripttag::parser_env = @_; |
if ($result !~ /^\s*$/s) { |
$result.=&Apache::scripttag::xmlparse($dimension{$instance.'.text'}); |
# FIXME? this maybe unneccssary in the future, (CSE101 BT |
my $status=$Apache::lonhomework::results{"resource.$version.0.$dim.$id.status"}=$env{'form.HWVAL_'.$link}; |
# from Fall 2006 geenrate a div that attempts to hide some |
$Apache::lonhomework::results{"resource.$version.0.$dim.$id.comment"}=$env{'form.HWVAL_comment_'.$link}; |
# of the output in an odd way, this is a workaround so |
my $mandatory=($dimension{'criteria.'.$id.'.mandatory'} ne 'N'); |
# those old ones will continue to work. # It puts the |
if ($status eq 'pass') { |
# LC_question div to come after any starting closie div |
if (!$mandatory) { $optional_passed++; } |
# that the dimension produces |
} elsif ($status eq 'fail') { |
if ($result =~ m{^\s*</div>}) { |
if ($mandatory) { $mandatory_failed++; } |
$result =~ s{^(\s*</div>)} |
} elsif ($status eq 'review') { |
{$1\n<div id="$dim" class="LC_question">}; |
$review++; |
} else { |
} elsif ($status eq 'ungraded') { |
$result = "\n".'<div id="'.$dim.'" class="LC_question">'. |
$ungraded++; |
"\n".$result; |
|
} |
|
$result .= "\n</div>\n"; |
|
} |
|
} elsif ($target eq 'webgrade') { |
|
# in case of any side effects that we need |
|
&nested_parse(\$dimension{$dim}{'intro'},[@_]); |
|
&nested_parse(\$dimension{$dim}{$instance.'.text'},[@_]); |
|
$result.= |
|
&nested_parse(\$dimension{$dim}{'questiontext'},[@_], |
|
{'set_dim_id' => undef, |
|
'delayed_dim_results' => 1}); |
|
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.= |
|
&nested_parse(\$dimension{$dim}{'criteria.'.$id}, |
|
[@_],{'set_dim_id' => $id}); |
|
next; |
|
} else { |
|
my $criteria =&nested_parse(\$dimension{$dim}{'criteria.'.$id}, |
|
[@_]); |
|
$criteria = &layout_webgrade_Criteria($dim,$id,$criteria); |
|
my $internal_location=&internal_location($id); |
|
if ($result =~ m/\Q$internal_location\E/) { |
|
$result =~ s/\Q$internal_location\E/$criteria/; |
} else { |
} else { |
$ungraded++; |
$result.=$criteria ; |
} |
} |
} |
} |
# FIXME optional required can apply to only <instance> right now... |
} |
my $opt_req=$dimension{$instance.'.optionalrequired'}; |
if (&nest()) { |
if ($opt_req !~ /\S/) { |
&Apache::lonxml::debug(" for $dim stashing results into ".$dimension{$dim}{'nested'}); |
$opt_req= |
$dimension{$dimension{$dim}{'nested'}}{'result'}.=$result; |
&Apache::lonxml::get_param('OptionalRequired', |
undef($result); |
$parstack,$safeeval); |
} |
if ($opt_req !~ /\S/) { $opt_req = 0; } |
} elsif ($target eq 'grade' && $env{'form.webgrade'}) { |
} |
my $optional_passed=0; |
if ($optional_passed < $opt_req) { |
my $mandatory_failed=0; |
$mandatory_failed++; |
my $ungraded=0; |
} |
my $review=0; |
&Apache::lonxml::debug("all instance ".join(':',@{$dimension{$instance.'.criterias'}})." results -> m_f $mandatory_failed o_p $optional_passed u $ungraded r $review"); |
|
if ($review) { |
$result .= &nested_parse(\$dimension{$dim}{'intro'},[@_]); |
$Apache::lonhomework::results{"resource.$version.0.$dim.status"}= |
$result .= &nested_parse(\$dimension{$dim}{$instance.'.text'}, |
'review'; |
[@_]); |
} elsif ($ungraded) { |
$result .= &nested_parse(\$dimension{$dim}{'questiontext'}, |
$Apache::lonhomework::results{"resource.$version.0.$dim.status"}= |
[@_],{'set_dim_id' => undef}); |
'ungraded'; |
|
} elsif ($mandatory_failed) { |
foreach my $id (@{$dimension{$dim}{$instance.'.criterias'}}, |
$Apache::lonhomework::results{"resource.$version.0.$dim.status"}= |
@{$dimension{$dim}{'criterias'}}) { |
'fail'; |
my $link=&link($id); |
|
|
|
my $type = $dimension{$dim}{'criteria.'.$id.'.type'}; |
|
if ($type eq 'criteria') { |
|
# dimensional 'criteria' don't get assigned grades |
|
$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}; |
|
} else { |
|
$result .= |
|
&nested_parse(\$dimension{$dim}{'criteria.'.$id}, |
|
[@_],{'set_dim_id' => $id}); |
|
} |
|
my $status= &get_criteria('status',$version,$dim,$id); |
|
|
|
my $mandatory=($dimension{$dim}{'criteria.'.$id.'.mandatory'} ne 'N'); |
|
if ($status eq 'pass') { |
|
if (!$mandatory) { $optional_passed++; } |
|
} elsif ($status eq 'fail') { |
|
if ($mandatory) { $mandatory_failed++; } |
|
} elsif ($status eq 'review') { |
|
$review++; |
|
} elsif ($status eq 'ungraded') { |
|
$ungraded++; |
} else { |
} else { |
$Apache::lonhomework::results{"resource.$version.0.$dim.status"}= |
$ungraded++; |
'pass'; |
|
} |
} |
|
} |
|
|
|
my $opt_req=$dimension{$dim}{$instance.'.optionalrequired'}; |
|
if ($opt_req !~ /\S/) { |
|
$opt_req= |
|
&Apache::lonxml::get_param('OptionalRequired', |
|
$parstack,$safeeval); |
|
if ($opt_req !~ /\S/) { $opt_req = 0; } |
|
} |
|
if ($optional_passed < $opt_req) { |
|
$mandatory_failed++; |
|
} |
|
&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) { |
|
$Apache::lonhomework::results{"resource.$version.0.$dim.status"}= |
|
'review'; |
|
} elsif ($ungraded) { |
|
$Apache::lonhomework::results{"resource.$version.0.$dim.status"}= |
|
'ungraded'; |
|
} elsif ($mandatory_failed) { |
|
$Apache::lonhomework::results{"resource.$version.0.$dim.status"}= |
|
'fail'; |
} else { |
} else { |
# any other targets no output |
$Apache::lonhomework::results{"resource.$version.0.$dim.status"}= |
undef($result); |
'pass'; |
} |
} |
return $result; |
} else { |
|
# any other targets no output |
|
undef($result); |
|
} |
|
&disable_dimension_parsing(); |
|
pop(@Apache::bridgetask::dimension); |
|
return $result; |
|
} |
|
|
|
sub question_status_message { |
|
my ($counts,$depth) = @_; |
|
my %req = ('man' => 'mandatory', |
|
'opt' => 'optional',); |
|
my %type = ('cri' => 'criteria', |
|
'dim' => ('sub'x($depth+1)).'questions',); |
|
my @sections; |
|
foreach my $req ('man','opt') { |
|
foreach my $type ('cri','dim') { |
|
if ($counts->{$req.'_'.$type}) { |
|
push(@sections, |
|
$counts->{$req.'_'.$type.'_passed'}.' of the '. |
|
$counts->{$req.'_'.$type}.' '. |
|
$req{$req}.' '.$type{$type}); |
|
} |
|
} |
|
} |
|
|
|
my $status = 'You passed '; |
|
if (@sections == -1) { |
|
} elsif (@sections == 1) { |
|
$status .= $sections[0]; |
|
} elsif (@sections == 2) { |
|
$status .= $sections[0].' and '.$sections[1]; |
|
} else { |
|
my $last = pop(@sections); |
|
$status .= join(', ',@sections).', and '.$last; |
} |
} |
|
$status .= '.'; |
|
if ($counts->{'opt'}) { |
|
$status .= ' You were required to pass '.$counts->{'opt_req'}. |
|
' optional '; |
|
if ($counts->{'opt_dim'} + $counts->{'man_dim'} < 1) { |
|
$status .= |
|
($counts->{'opt_req'} == 1?'criterion':'criteria'); |
|
} else { |
|
$status .= |
|
'component'.($counts->{'opt_req'} == 1?'':'s'); |
|
} |
|
$status .= '.'; |
|
} |
|
return $status; |
|
} |
|
|
|
sub get_counts { |
|
my ($dim,$instance,$parstack,$safeeval) = @_; |
|
my %counts; |
|
my @possible = ('man_cri','man_dim', |
|
'opt_cri','opt_dim', |
|
'man_cri_passed', 'man_dim_passed', |
|
'opt_cri_passed', 'opt_dim_passed', |
|
'man_passed', |
|
'opt_passed', |
|
'opt_req'); |
|
foreach my $which (@possible) { $counts{$which} = 0; } |
|
|
|
my $version = &get_version(); |
|
|
|
foreach my $id ( @{$dimension{$dim}{$instance.'.criterias'}}, |
|
@{$dimension{$dim}{'criterias'}} ) { |
|
my $status = &get_criteria('status',$version,$dim,$id); |
|
my $which; |
|
if ($dimension{$dim}{'criteria.'.$id.'.mandatory'} |
|
eq 'N') { |
|
$which = 'opt'; |
|
} else { |
|
$which = 'man'; |
|
} |
|
$counts{$which}++; |
|
if ($status eq 'pass') { $counts{$which.'_passed'}++; } |
|
if ($dimension{$dim}{'criteria.'.$id.'.type'} |
|
eq 'dimension') { |
|
$which .= '_dim'; |
|
} else { |
|
$which .= '_cri'; |
|
} |
|
$counts{$which}++; |
|
if ($status eq 'pass') { $counts{$which.'_passed'}++; } |
|
|
|
|
|
} |
|
if ($counts{'man_dim_passed'} eq $counts{'man_dim'}) { |
|
$counts{'man_dim_passed'}='all'; |
|
} |
|
if ($counts{'man_cri_passed'} eq $counts{'man_cri'}) { |
|
$counts{'man_cri_passed'}='all'; |
|
} |
|
|
|
$counts{'opt_req'}=$dimension{$dim}{$instance.'.optionalrequired'}; |
|
if ($counts{'opt_req'} !~ /\S/) { |
|
$counts{'opt_req'}= &Apache::lonxml::get_param('OptionalRequired', |
|
$parstack,$safeeval); |
|
if ($counts{'opt_req'} !~ /\S/) { $counts{'opt_req'} = 0; } |
|
} |
|
return %counts; |
|
} |
|
|
|
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; |
} |
} |
|
|
sub grading_history { |
sub grading_history { |
Line 2036 sub grading_history {
|
Line 2593 sub grading_history {
|
return ''; |
return ''; |
} |
} |
my ($result,$grader); |
my ($result,$grader); |
my $scope="resource.$version.0.$dim.$id"; |
my $scope="resource.$version.0."; |
|
$scope .= ($dim ne $top) ? "$dim.$id" |
|
: "$id"; |
foreach my $t (1..$Apache::lonhomework::history{'version'}) { |
foreach my $t (1..$Apache::lonhomework::history{'version'}) { |
if (exists($Apache::lonhomework::history{$t.':resource.0.regrader'})) { |
if (exists($Apache::lonhomework::history{$t.':resource.0.regrader'})) { |
my ($gname,$gdom) = |
my ($gname,$gdom) = |
Line 2053 sub grading_history {
|
Line 2612 sub grading_history {
|
$entry.=' comment: "'.$Apache::lonhomework::history{"$t:$scope.comment"}.'"'; |
$entry.=' comment: "'.$Apache::lonhomework::history{"$t:$scope.comment"}.'"'; |
} |
} |
if ($entry) { |
if ($entry) { |
$result.= "<li>$grader : $entry </li>"; |
$result.= "\n\t\t<li>\n\t\t\t$grader :\n\t\t\t $entry \n\t\t</li>"; |
} |
} |
} |
} |
if ($result) { |
if ($result) { |
return '<ul class="LC_GRADING_pastgrading">'.$result.'</ul>'; |
return "\n\t".'<ul class="LC_GRADING_pastgrading">'.$result. |
|
"\n\t".'</ul>'."\n"; |
} |
} |
return ''; |
return ''; |
} |
} |
Line 2065 sub grading_history {
|
Line 2625 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 2087 sub end_IntroParagraph {
|
Line 2648 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 2105 sub end_Instance {
|
Line 2667 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 2120 sub end_InstanceText {
|
Line 2683 sub end_InstanceText {
|
sub start_Criteria { |
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); |
|
my $result = ''; |
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); |
|
if ($target eq 'web' || $target eq 'webgrade') { |
|
if ($target eq 'webgrade') { |
|
&Apache::lonxml::debug(" for $dim $id stashing results into $dim "); |
|
$dimension{$dim}{'result'} .= &internal_location($id); |
|
} else { |
|
&Apache::lonxml::debug(" not stashing $dim $id"); |
|
#$result .= &internal_location($id); |
|
} |
|
} |
|
&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 $result; |
|
} |
|
|
|
sub layout_web_Criteria { |
|
my ($dim,$id,$criteria) = @_; |
|
|
|
my $version = &get_version(); |
|
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) { |
|
$mandatory='Mandatory'; |
|
} else { |
|
$mandatory='Optional'; |
|
} |
|
my $status_display=$status; |
|
$status_display=~s/^([a-z])/uc($1)/e; |
|
my $criteria_info.= |
|
'<div class="LC_'.$status.' LC_criteria">'."\n\t".'<h4>' |
|
.$mandatory.' Criteria</h4>'."\n\t".'<p class="LC_criteria_text">' |
|
."\n"; |
|
$criteria =~ s/^\s*//s; |
|
$criteria =~ s/\s*$//s; |
|
$criteria_info.= $criteria; |
|
$criteria_info.="\n\t".'</p>'. |
|
"\n\t".'<p class="LC_grade">'.$status_display.'</p>'; |
|
if ($comment =~ /\w/) { |
|
$criteria_info.= |
|
"\n\t". |
|
'<p class="LC_comment">'.&mt('Comment: [_1]',$comment).'</p>'; |
|
} |
|
$criteria_info.="\n".'</div>'."\n"; |
|
|
|
return $criteria_info; |
|
} |
|
|
|
sub layout_webgrade_Criteria { |
|
my ($dim,$id,$criteria) = @_; |
|
my $link=&link($id); |
|
my $version = &get_version(); |
|
my $status = &get_criteria('status',$version,$dim,$id); |
|
my %lt = ( 'ungraded' => 'Ungraded', |
|
'fail' => 'Fail', |
|
'pass' => 'Pass', |
|
'review' => 'Review', |
|
'comment' => 'Additional Comment for Student', |
|
); |
|
%lt = &Apache::lonlocal::texthash(%lt); |
|
my $comment = &get_criteria('comment',$version,$dim,$id); |
|
$comment = &HTML::Entities::encode($comment,'<>"&'); |
|
my %checked; |
|
foreach my $which ('ungraded','fail','pass','review') { |
|
if ($status eq $which) { $checked{$which} = 'checked="checked"'; } |
|
} |
|
if (!%checked) { $checked{'ungraded'} = 'checked="checked"'; } |
|
my $buttons; |
|
foreach my $which ('ungraded','fail','pass','review') { |
|
$buttons .= <<END_BUTTON; |
|
<label class="LC_GRADING_$which"> |
|
<input type="radio" name="HWVAL_$link" value="$which" $checked{$which} /> |
|
$lt{$which} |
|
</label> |
|
END_BUTTON |
|
} |
|
$criteria =~ s/^\s*//s; |
|
$criteria =~ s/\s*$//s; |
|
my $result = <<END_CRITERIA; |
|
<div class="LC_GRADING_criteria"> |
|
<div class="LC_GRADING_criteriatext"> |
|
$criteria |
|
</div> |
|
<div class="LC_GRADING_grade"> |
|
$buttons |
|
</div> |
|
<label class="LC_GRADING_comment"> |
|
$lt{'comment'} |
|
<textarea class="LC_GRADING_comment_area" name="HWVAL_comment_$link">$comment</textarea> |
|
</label> |
|
</div> |
|
END_CRITERIA |
|
$result .= &grading_history($version,$dim,$id); |
|
return $result; |
} |
} |
|
|
sub end_Criteria { |
sub end_Criteria { |
} |
} |
|
|
|
sub start_GraderNote { |
|
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
|
|
|
if ($target eq 'webgrade') { |
|
return '<div class="LC_GRADING_gradernote"><b>'. |
|
&mt('Note to graders:').'</b>'; |
|
} |
|
my $note=&Apache::lonxml::get_all_text('/gradernote',$parser,$style); |
|
return; |
|
} |
|
|
|
sub end_GraderNote { |
|
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
|
|
|
if ($target eq 'webgrade') { |
|
return '</div>'; |
|
} |
|
return; |
|
} |
|
|
|
|
|
|
sub proctor_validation_screen { |
sub proctor_validation_screen { |
my ($slot) = @_; |
my ($slot) = @_; |
my (undef,undef,$domain,$user) = &Apache::lonxml::whichuser(); |
my (undef,undef,$domain,$user) = &Apache::lonnet::whichuser(); |
my $url=&Apache::lonnet::studentphoto($domain,$user,'jpg'); |
my $url=&Apache::lonnet::studentphoto($domain,$user,'jpg'); |
my $name=&Apache::loncommon::plainname($user,$domain); |
my $name=&Apache::loncommon::plainname($user,$domain); |
|
|