version 1.118, 2006/03/06 19:46:59
|
version 1.136, 2006/03/31 20:30:30
|
Line 176 sub add_grading_button {
|
Line 176 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 name="chosensections" size="'.$size.'">'."\n"; |
my $sec_select = '<select multiple="multiple" name="chosensections" size="'.$size.'">'."\n"; |
$sec_select .= "<option value='all' selected='selected'>all</option>\n"; |
$sec_select .= "<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 name=\"$sec\">$sec</option>\n"; |
$sec_select .= "<option value=\"$sec\">$sec</option>\n"; |
} |
} |
$sec_select .= "<option value='none'>none</option></select>\n"; |
$sec_select .= "<option value='none'>none</option></select>\n"; |
|
|
Line 213 sub add_grading_button {
|
Line 213 sub add_grading_button {
|
'gradinguser', |
'gradinguser', |
'gradingdomain'); |
'gradingdomain'); |
$result.=&Apache::loncommon::studentbrowser_javascript(); |
$result.=&Apache::loncommon::studentbrowser_javascript(); |
|
$result.= '</p>'; |
} |
} |
return $result; |
return $result; |
} |
} |
Line 258 sub preserve_grade_info {
|
Line 259 sub preserve_grade_info {
|
} |
} |
|
|
sub style { |
sub style { |
return (<<STYLE); |
my ($target) = @_; |
<style type="text/css"> |
if ($target eq 'web' |
.LC_fail, .LC_pass, .LC_neutral { |
|| $target eq 'webgrade') { |
position: relative; |
return (<<STYLE); |
margin : 5px; |
<link rel="stylesheet" type="text/css" href="/res/adm/includes/task.css" /> |
margin-bottom :10px; |
|
padding : 4px; |
|
padding-left : 75px; |
|
border : thin solid; |
|
font-weight : bolder; |
|
font-size: smaller; |
|
font-family: Arial; |
|
background-color : rgb(255,240,225); |
|
} |
|
|
|
.LC_fail h4, .LC_pass h4 { |
|
position:absolute; |
|
left: -4px; |
|
top: -8px; |
|
padding:2px; |
|
margin:0; |
|
background-color : rgb(255,240,225); |
|
border : thin solid; |
|
} |
|
|
|
.LC_fail { |
|
color: red; |
|
} |
|
|
|
.LC_pass { |
|
color : green; |
|
} |
|
|
|
.LC_neutral { |
|
color : blue; |
|
} |
|
|
|
.LC_question { |
|
border : thin solid black; |
|
padding : 4px; |
|
margin-bottom : 1em; |
|
} |
|
|
|
.LC_grade { |
|
font-size: x-large; |
|
font-family: Arial; |
|
position:absolute; |
|
left: 5px; |
|
top: -5px; |
|
width: 70px; |
|
} |
|
|
|
div#feedback h1 { |
|
color : inherit; |
|
} |
|
</style> |
|
STYLE |
STYLE |
|
} |
|
return; |
} |
} |
|
|
sub show_task { |
sub show_task { |
Line 371 sub submission_time_stamp {
|
Line 322 sub submission_time_stamp {
|
return $result; |
return $result; |
} |
} |
|
|
sub webgrade_standard_info { |
sub file_list { |
my ($version)=&get_version(); |
my ($files,$uname,$udom) = @_; |
my (undef,undef,$udom,$uname) = &Apache::lonxml::whichuser(); |
if (!defined($uname) || !defined($udom)) { |
|
(undef,undef,$udom,$uname) = &Apache::lonxml::whichuser(); |
|
} |
my $file_url = '/uploaded/'.$udom.'/'.$uname.'/portfolio/'; |
my $file_url = '/uploaded/'.$udom.'/'.$uname.'/portfolio/'; |
my $file_list="<ul class=\"LC_GRADE_handininfo\">\n"; |
|
foreach my $partial_file (split(',',$Apache::lonhomework::history{"resource.$version.0.bridgetask.portfiles"})) { |
my $file_list="<ul class=\"LC_GRADING_handininfo\">\n"; |
|
foreach my $partial_file (split(',',$files)) { |
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); |
Line 385 sub webgrade_standard_info {
|
Line 339 sub webgrade_standard_info {
|
'</a></nobr></li>'."\n"; |
'</a></nobr></li>'."\n"; |
} |
} |
$file_list.="</ul>\n"; |
$file_list.="</ul>\n"; |
|
return $file_list; |
|
} |
|
|
|
sub webgrade_standard_info { |
|
my ($version)=&get_version(); |
|
|
|
my $file_list = &file_list($Apache::lonhomework::history{"resource.$version.0.bridgetask.portfiles"}); |
|
|
my %lt=&Apache::lonlocal::texthash('done' => 'Next Item', |
my %lt=&Apache::lonlocal::texthash('done' => 'Next Item', |
'stop' => 'Quit Grading', |
'stop' => 'Quit Grading', |
); |
); |
|
|
my $result=<<INFO; |
my $result=<<INFO; |
<div class="LC_GRADE_maincontrols"> |
<div class="LC_GRADING_maincontrols"> |
<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'}" /> |
</div> |
</div> |
Line 418 sub start_Task {
|
Line 379 sub start_Task {
|
my ($result,$head_tag_start,$body_tag_start,$form_tag_start)= |
my ($result,$head_tag_start,$body_tag_start,$form_tag_start)= |
&Apache::structuretags::page_start($target,$token,$tagstack,$parstack,$parser,$safeeval); |
&Apache::structuretags::page_start($target,$token,$tagstack,$parstack,$parser,$safeeval); |
|
|
$body_tag_start = '<div class="LC_task">'."\n"; |
$head_tag_start .= &style($target); |
|
$body_tag_start .= '<div class="LC_task">'."\n"; |
|
|
|
if ($target eq 'web' || $target eq 'webgrade') { |
|
$head_tag_start.='<title>'. |
|
&Apache::structuretags::get_resource_name($parstack,$safeeval). |
|
'</title>'; |
|
} |
|
|
if ($target eq 'web' && $env{'request.state'} ne 'construct') { |
if ($target eq 'web' && $env{'request.state'} ne 'construct') { |
if ($Apache::lonhomework::modifygrades) { |
if ($Apache::lonhomework::modifygrades) { |
$body_tag_start.='<form name="gradesubmission" method="post" action="'; |
$body_tag_start.='<form name="gradesubmission" method="post" action="'; |
Line 528 DONESCREEN
|
Line 497 DONESCREEN
|
} |
} |
} |
} |
} elsif ($target eq 'web') { |
} elsif ($target eq 'web') { |
my $name= &Apache::structuretags::get_resource_name($parstack,$safeeval); |
$result.="$head_tag_start</head> |
$result.="$head_tag_start<title>$name</title></head> |
$body_tag_start \n"; |
$body_tag_start \n".&style(); |
|
|
|
$result.=&preserve_grade_info(); |
$result.=&preserve_grade_info(); |
$result.=&internal_location(); |
$result.=&internal_location(); |
Line 542 DONESCREEN
|
Line 510 DONESCREEN
|
$target eq 'webgrade') { |
$target eq 'webgrade') { |
my $webgrade='yes'; |
my $webgrade='yes'; |
if ($target eq 'webgrade') { |
if ($target eq 'webgrade') { |
$result.=$head_tag_start.'</head>'.$body_tag_start; |
$result.=$head_tag_start. |
|
'</head>'.$body_tag_start. |
|
"\n".'<div class="LC_GRADING_task">'."\n". |
|
'<script type="text/javascript" |
|
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'); |
} |
} |
Line 621 DONESCREEN
|
Line 593 DONESCREEN
|
if ($webgrade eq 'yes') { $result.=&webgrade_standard_info(); } |
if ($webgrade eq 'yes') { $result.=&webgrade_standard_info(); } |
} |
} |
if ($target eq 'webgrade') { |
if ($target eq 'webgrade') { |
$result.="\n".'<div id="LC_GRADE_criterialist">'; |
$result.="\n".'<div id="LC_GRADING_criterialist">'; |
} |
} |
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
$result.=$head_tag_start."</head>".$body_tag_start.$form_tag_start. |
$result.=$head_tag_start."</head>".$body_tag_start.$form_tag_start. |
Line 1002 DONEBUTTON
|
Line 974 DONEBUTTON
|
&Apache::structuretags::finalize_storage(); |
&Apache::structuretags::finalize_storage(); |
} |
} |
} elsif ($target eq 'webgrade') { |
} elsif ($target eq 'webgrade') { |
$result.="</div>\n<hr />"; |
$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 1011 DONEBUTTON
|
Line 983 DONEBUTTON
|
# &mt('Throw Away & Stop Grading').'" /> '; |
# &mt('Throw Away & Stop Grading').'" /> '; |
#$result.='<input type="submit" name="save" value="'. |
#$result.='<input type="submit" name="save" value="'. |
# &mt('Save Partial Grade and Continue Grading').'" /> '; |
# &mt('Save Partial Grade and Continue Grading').'" /> '; |
$result.='</form>'."\n</div>\n". |
$result.='</form>'."\n</div>\n</div>\n". |
&Apache::loncommon::endbodytag().'</html>'; |
&Apache::loncommon::endbodytag().'</html>'; |
} elsif ($target eq 'meta') { |
} elsif ($target eq 'meta') { |
$result.=&Apache::response::meta_package_write('Task'); |
$result.=&Apache::response::meta_package_write('Task'); |
Line 1691 sub get_instance {
|
Line 1663 sub get_instance {
|
|
|
{ |
{ |
my $last_link; |
my $last_link; |
|
sub link { |
|
my ($instance,$id) = @_; |
|
return 'LC_GRADING_criteria_'.$instance.'_'.$id; |
|
} |
sub end_Dimension { |
sub end_Dimension { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my $result=&Apache::lonxml::endredirection(); |
my $result=&Apache::lonxml::endredirection(); |
Line 1785 sub get_instance {
|
Line 1761 sub get_instance {
|
@Apache::scripttag::parser_env = @_; |
@Apache::scripttag::parser_env = @_; |
&Apache::scripttag::xmlparse($dimension{$instance.'.text'}); |
&Apache::scripttag::xmlparse($dimension{$instance.'.text'}); |
foreach my $id (@{$dimension{$instance.'.criterias'}}) { |
foreach my $id (@{$dimension{$instance.'.criterias'}}) { |
my $link='LC_GRADE_criteria_'.$instance.'_'.$id; |
my $link=&link($instance,$id); |
my $status=$Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.status"}; |
my $status=$Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.status"}; |
$result.='<div class="LC_GRADE_criteria" id="'.$link.'">'."\n". |
$result.='<div class="LC_GRADING_criteria" id="'.$link.'">'."\n". |
'<a name="'.$link.'" />'."\n". |
'<div class="LC_GRADING_criteriatext" id="next_'.$last_link.'">'."\n"; |
'<a name="next_'.$last_link.'" />'."\n". |
|
'<div class="LC_GRADE_criteriatext">'."\n"; |
|
@Apache::scripttag::parser_env = @_; |
@Apache::scripttag::parser_env = @_; |
$result.=&Apache::scripttag::xmlparse($dimension{$instance.'.criteria.'.$id}); |
$result.=&Apache::scripttag::xmlparse($dimension{$instance.'.criteria.'.$id}); |
$result.='</div>'."\n". |
$result.='</div>'."\n". |
#$dimension{$instance.'.criteria.'.$id}. |
#$dimension{$instance.'.criteria.'.$id}. |
'<div class="LC_GRADE_grade">'."\n". |
'<div class="LC_GRADING_grade">'."\n". |
'<label class="LC_GRADE_ungraded"><input type="radio" name="HWVAL_'.$link.'" value="ungraded" '.($status eq 'ungraded' || !$status ? 'checked="checked"':'').' />'.&mt('Ungraded').'</label>'."\n". |
'<label class="LC_GRADING_ungraded"><input type="radio" name="HWVAL_'.$link.'" value="ungraded" '.($status eq 'ungraded' || !$status ? 'checked="checked"':'').' />'.&mt('Ungraded').'</label>'."\n". |
'<label class="LC_GRADE_fail"><input type="radio" name="HWVAL_'.$link.'" value="fail" '.($status eq 'fail' ? 'checked="checked"':'').' />'.&mt('Fail').'</label>'."\n". |
'<label class="LC_GRADING_fail"><input type="radio" name="HWVAL_'.$link.'" value="fail" '.($status eq 'fail' ? 'checked="checked"':'').' />'.&mt('Fail').'</label>'."\n". |
'<label class="LC_GRADE_pass"><input type="radio" name="HWVAL_'.$link.'" value="pass" '.($status eq 'pass' ? 'checked="checked"':'').' />'.&mt('Pass').'</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_GRADE_review"><input type="radio" name="HWVAL_'.$link.'" value="review" '.($status eq 'review' ? 'checked="checked"':'').' />'.&mt('Review').'</label>'."\n". |
'<label class="LC_GRADING_review"><input type="radio" name="HWVAL_'.$link.'" value="review" '.($status eq 'review' ? 'checked="checked"':'').' />'.&mt('Review').'</label>'."\n". |
'</div>'."\n". |
'</div>'."\n". |
'<label class="LC_GRADE_comment">'.&mt('Additional Comment for Student')."\n". |
'<label class="LC_GRADING_comment">'.&mt('Additional Comment for Student')."\n". |
'<textarea class="LC_GRADE_comment_area" name="HWVAL_comment_'.$link.'">'.&HTML::Entities::encode($Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.comment"}).'</textarea>'."\n". |
'<textarea class="LC_GRADING_comment_area" name="HWVAL_comment_'.$link.'">'.&HTML::Entities::encode($Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.comment"}).'</textarea>'."\n". |
'</label>'."\n". |
'</label>'."\n". |
'<ul class="LC_GRADE_navbuttons">'."\n". |
'<ul class="LC_GRADING_navbuttons">'."\n". |
'<li><a href="#'.$last_link.'">Prev</a></li>'."\n". |
'<li><a href="#'.$last_link.'">Prev</a></li>'."\n". |
'<li><a href="#next_'.$link.'">Next</a></li>'."\n". |
'<li><a href="#next_'.$link.'">Next</a></li>'."\n". |
'</ul>'."\n". |
'</ul>'."\n". |
Line 1818 sub get_instance {
|
Line 1792 sub get_instance {
|
my $ungraded=0; |
my $ungraded=0; |
my $review=0; |
my $review=0; |
foreach my $id (@{$dimension{$instance.'.criterias'}}) { |
foreach my $id (@{$dimension{$instance.'.criterias'}}) { |
my $status=$Apache::lonhomework::results{"resource.$version.0.$dim.$instance.$id.status"}=$env{'form.HWVAL_criteria_'.$instance.'_'.$id}; |
my $link=&link($instance,$id); |
$Apache::lonhomework::results{"resource.$version.0.$dim.$instance.$id.comment"}=$env{'form.HWVAL_comment_criteria_'.$instance.'_'.$id}; |
my $status=$Apache::lonhomework::results{"resource.$version.0.$dim.$instance.$id.status"}=$env{'form.HWVAL_'.$link}; |
|
$Apache::lonhomework::results{"resource.$version.0.$dim.$instance.$id.comment"}=$env{'form.HWVAL_comment_'.$link}; |
my $mandatory=($dimension{$instance.'.criteria.'.$id.'.mandatory'} ne 'N'); |
my $mandatory=($dimension{$instance.'.criteria.'.$id.'.mandatory'} ne 'N'); |
if ($status eq 'pass') { |
if ($status eq 'pass') { |
if (!$mandatory) { $optional_passed++; } |
if (!$mandatory) { $optional_passed++; } |
Line 1885 sub grading_history {
|
Line 1860 sub grading_history {
|
} |
} |
} |
} |
if ($result) { |
if ($result) { |
return '<ul class="LC_GRADE_pastgrading">'.$result.'</ul>'; |
return '<ul class="LC_GRADING_pastgrading">'.$result.'</ul>'; |
} |
} |
return ''; |
return ''; |
} |
} |
Line 1897 sub start_IntroParagraph {
|
Line 1872 sub start_IntroParagraph {
|
if ($tagstack->[-2] eq 'Dimension') { |
if ($tagstack->[-2] eq 'Dimension') { |
$dimension{'intro'}=&Apache::lonxml::get_all_text('/introparagraph',$parser,$style); |
$dimension{'intro'}=&Apache::lonxml::get_all_text('/introparagraph',$parser,$style); |
|
|
} elsif ($target eq 'webgrade') { |
} elsif ($tagstack->[-2] eq 'Task' && $target eq 'webgrade') { |
&Apache::lonxml::get_all_text('/introparagraph',$parser,$style); |
&Apache::lonxml::startredirection(); |
} |
} |
|
|
} |
} |
Line 1906 sub start_IntroParagraph {
|
Line 1881 sub start_IntroParagraph {
|
} |
} |
|
|
sub end_IntroParagraph { |
sub end_IntroParagraph { |
|
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
|
if ($tagstack->[-2] eq 'Task' && $target eq 'webgrade') { |
|
my $result = &Apache::lonxml::endredirection(); |
|
} |
} |
} |
|
|
sub start_Instance { |
sub start_Instance { |