version 1.115, 2006/03/02 21:20:30
|
version 1.116, 2006/03/02 22:06:27
|
Line 260 sub preserve_grade_info {
|
Line 260 sub preserve_grade_info {
|
sub style { |
sub style { |
return (<<STYLE); |
return (<<STYLE); |
<style type="text/css"> |
<style type="text/css"> |
.fail, .pass, .neutral { |
.LC_fail, .LC_pass, .LC_neutral { |
position: relative; |
position: relative; |
margin : 5px; |
margin : 5px; |
margin-bottom :10px; |
margin-bottom :10px; |
Line 273 sub style {
|
Line 273 sub style {
|
background-color : rgb(255,240,225); |
background-color : rgb(255,240,225); |
} |
} |
|
|
.fail h4, .pass h4 { |
.LC_fail h4, .LC_pass h4 { |
position:absolute; |
position:absolute; |
left: -4px; |
left: -4px; |
top: -8px; |
top: -8px; |
Line 283 sub style {
|
Line 283 sub style {
|
border : thin solid; |
border : thin solid; |
} |
} |
|
|
.fail { |
.LC_fail { |
color: red; |
color: red; |
} |
} |
|
|
.pass { |
.LC_pass { |
color : green; |
color : green; |
} |
} |
|
|
.neutral { |
.LC_neutral { |
color : blue; |
color : blue; |
} |
} |
|
|
.question { |
.LC_question { |
border : thin solid black; |
border : thin solid black; |
padding : 4px; |
padding : 4px; |
margin-bottom : 1em; |
margin-bottom : 1em; |
} |
} |
|
|
.grade { |
.LC_grade { |
font-size: x-large; |
font-size: x-large; |
font-family: Arial; |
font-family: Arial; |
position:absolute; |
position:absolute; |
Line 375 sub webgrade_standard_info {
|
Line 375 sub webgrade_standard_info {
|
my ($version)=&get_version(); |
my ($version)=&get_version(); |
my (undef,undef,$udom,$uname) = &Apache::lonxml::whichuser(); |
my (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=\"handininfo\">\n"; |
my $file_list="<ul class=\"LC_GRADE_handininfo\">\n"; |
foreach my $partial_file (split(',',$Apache::lonhomework::history{"resource.$version.0.bridgetask.portfiles"})) { |
foreach my $partial_file (split(',',$Apache::lonhomework::history{"resource.$version.0.bridgetask.portfiles"})) { |
my $file=$file_url.$partial_file; |
my $file=$file_url.$partial_file; |
$file=~s|/+|/|g; |
$file=~s|/+|/|g; |
Line 391 sub webgrade_standard_info {
|
Line 391 sub webgrade_standard_info {
|
); |
); |
|
|
my $result=<<INFO; |
my $result=<<INFO; |
<div class="maincontrols"> |
<div class="LC_GRADE_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 620 DONESCREEN
|
Line 620 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="criterialist">'; |
$result.="\n".'<div id="LC_GRADE_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 815 sub end_Task {
|
Line 815 sub end_Task {
|
&show_task($status,$previous)) { |
&show_task($status,$previous)) { |
$result.=&Apache::inputtags::gradestatus('0'); |
$result.=&Apache::inputtags::gradestatus('0'); |
$result.='</form>'; |
$result.='</form>'; |
my $action = &Apache::lonenc::check_encrypted($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"> |
<input type="hidden" name="donescreen" value="1" /> |
<input type="hidden" name="donescreen" value="1" /> |
Line 834 DONEBUTTON
|
Line 834 DONEBUTTON
|
my $start_time= |
my $start_time= |
&Apache::lonlocal::locallocaltime($slot{'starttime'}); |
&Apache::lonlocal::locallocaltime($slot{'starttime'}); |
|
|
my $status = "\n<div class='$bt_status'>\n"; |
my $status = "\n<div class='LC_$bt_status LC_criteria'>\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 '. |
Line 1713 sub get_instance {
|
Line 1713 sub get_instance {
|
if ($Apache::bridgetask::dimensionmandatory{$dim} eq 'N') { |
if ($Apache::bridgetask::dimensionmandatory{$dim} eq 'N') { |
$mandatory='Optional'; |
$mandatory='Optional'; |
} |
} |
my $dim_info="<div class='$dim_status'>\n"; |
my $dim_info="<div class='LC_$dim_status LC_question_grade'>\n"; |
if ($dim_status eq 'pass') { |
if ($dim_status eq 'pass') { |
$dim_info.='<h3>Question : you passed this '.$mandatory.' question</h3>'; |
$dim_info.='<h3>Question : you passed this '.$mandatory.' question</h3>'; |
} |
} |
Line 1763 sub get_instance {
|
Line 1763 sub get_instance {
|
my $status_display=$status; |
my $status_display=$status; |
$status_display=~s/^([a-z])/uc($1)/e; |
$status_display=~s/^([a-z])/uc($1)/e; |
@Apache::scripttag::parser_env = @_; |
@Apache::scripttag::parser_env = @_; |
$result.='<div class="'.$status.'"><h4>'.$mandatory. |
$result.= |
' Criteria</h4><p>'; |
'<div class="LC_'.$status.' LC_criteria"><h4>' |
|
.$mandatory.' Criteria</h4><p>'; |
@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.='</p><p class="grade">'.$status_display.'</p>'; |
$result.='</p><p class="LC_grade">'.$status_display.'</p>'; |
if ($Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.comment"}) { |
if ($Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.comment"}) { |
$result.='<p class="comment">'.&mt('Comment: [_1]',$Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.comment"}).'</p>'; |
$result.='<p class="LC_comment">'.&mt('Comment: [_1]',$Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.comment"}).'</p>'; |
} |
} |
$result.='</div>'; |
$result.='</div>'; |
} |
} |
Line 1782 sub get_instance {
|
Line 1783 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='criteria_'.$instance.'_'.$id; |
my $link='LC_GRADE_criteria_'.$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="criteria" id="'.$link.'">'."\n". |
$result.='<div class="LC_GRADE_criteria" id="'.$link.'">'."\n". |
'<a name="'.$link.'" />'."\n". |
'<a name="'.$link.'" />'."\n". |
'<a name="next_'.$last_link.'" />'."\n". |
'<a name="next_'.$last_link.'" />'."\n". |
'<div class="criteriatext">'."\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="grade">'."\n". |
'<div class="LC_GRADE_grade">'."\n". |
'<label class="ungraded"><input type="radio" name="HWVAL_'.$link.'" value="ungraded" '.($status eq 'ungraded' || !$status ? 'checked="checked"':'').' />'.&mt('Ungraded').'</label>'."\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="fail"><input type="radio" name="HWVAL_'.$link.'" value="fail" '.($status eq 'fail' ? 'checked="checked"':'').' />'.&mt('Fail').'</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="pass"><input type="radio" name="HWVAL_'.$link.'" value="pass" '.($status eq 'pass' ? 'checked="checked"':'').' />'.&mt('Pass').'</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="review"><input type="radio" name="HWVAL_'.$link.'" value="review" '.($status eq 'review' ? 'checked="checked"':'').' />'.&mt('Review').'</label>'."\n". |
'<label class="LC_GRADE_review"><input type="radio" name="HWVAL_'.$link.'" value="review" '.($status eq 'review' ? 'checked="checked"':'').' />'.&mt('Review').'</label>'."\n". |
'</div>'."\n". |
'</div>'."\n". |
'<label class="comment">'.&mt('Additional Comment for Student')."\n". |
'<label class="LC_GRADE_comment">'.&mt('Additional Comment for Student')."\n". |
'<textarea class="comment_area" name="HWVAL_comment_'.$link.'">'.&HTML::Entities::encode($Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.comment"}).'</textarea>'."\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". |
'</label>'."\n". |
'</label>'."\n". |
'<ul class="navbuttons">'."\n". |
'<ul class="LC_GRADE_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 1882 sub grading_history {
|
Line 1883 sub grading_history {
|
} |
} |
} |
} |
if ($result) { |
if ($result) { |
return '<ul class="pastgrading">'.$result.'</ul>'; |
return '<ul class="LC_pastgrading">'.$result.'</ul>'; |
} |
} |
return ''; |
return ''; |
} |
} |