version 1.111, 2006/02/20 21:43:16
|
version 1.113, 2006/02/21 18:36:30
|
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>\n"; |
my $file_list="<ul class=\"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="handininfo"> |
|
<div class="maincontrols"> |
<div class="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> |
$file_list |
$file_list |
</div> |
|
INFO |
INFO |
return $result; |
return $result; |
} |
} |
Line 1772 sub get_instance {
|
Line 1770 sub get_instance {
|
foreach my $id (@{$dimension{$instance.'.criterias'}}) { |
foreach my $id (@{$dimension{$instance.'.criterias'}}) { |
my $link='criteria_'.$instance.'_'.$id; |
my $link='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 id="'.$link.'">'."\n". |
$result.='<div class="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="criteriatext">'."\n"; |
Line 1786 sub get_instance {
|
Line 1784 sub get_instance {
|
'<label class="pass"><input type="radio" name="HWVAL_'.$link.'" value="pass" '.($status eq 'pass' ? 'checked="checked"':'').' />'.&mt('Pass').'</label>'."\n". |
'<label class="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="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').'</label>'."\n". |
'<label class="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="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="navbuttons">'."\n". |
Line 1794 sub get_instance {
|
Line 1792 sub get_instance {
|
'<li><a href="#next_'.$link.'">Next</a></li>'."\n". |
'<li><a href="#next_'.$link.'">Next</a></li>'."\n". |
'</ul>'."\n". |
'</ul>'."\n". |
'</div>'."\n"; |
'</div>'."\n"; |
|
$result.=&grading_history($version,$dim,$instance,$id); |
$last_link=$link; |
$last_link=$link; |
} |
} |
} elsif ($target eq 'grade' && $env{'form.webgrade'}) { |
} elsif ($target eq 'grade' && $env{'form.webgrade'}) { |
Line 1842 sub get_instance {
|
Line 1841 sub get_instance {
|
} |
} |
} |
} |
|
|
|
sub grading_history { |
|
my ($version,$dim,$instance,$criteria) = @_; |
|
if (!&Apache::lonnet::allowed('mgq',$env{'request.course.id'})) { |
|
return ''; |
|
} |
|
my ($result,$grader); |
|
my $scope="resource.$version.0.$dim.$instance.$criteria"; |
|
foreach my $t (1..$Apache::lonhomework::history{'version'}) { |
|
if (exists($Apache::lonhomework::history{$t.':resource.0.regrader'})) { |
|
my ($gname,$gdom) = |
|
split('@',$Apache::lonhomework::history{$t.':resource.0.regrader'}); |
|
my $fullname = &Apache::loncommon::plainname($gname,$gdom); |
|
$grader = &Apache::loncommon::aboutmewrapper($fullname, |
|
$gname,$gdom); |
|
} |
|
my $entry; |
|
if (exists($Apache::lonhomework::history{"$t:$scope.status"})) { |
|
$entry.="<tt>".$Apache::lonhomework::history{"$t:$scope.status"}.'</tt>'; |
|
} |
|
if (exists($Apache::lonhomework::history{"$t:$scope.comment"})) { |
|
$entry.=' comment: "'.$Apache::lonhomework::history{"$t:$scope.comment"}.'"'; |
|
} |
|
if ($entry) { |
|
$result.= "<li>$grader : $entry </li>"; |
|
} |
|
} |
|
if ($result) { |
|
return '<ul class="pastgrading">'.$result.'</ul>'; |
|
} |
|
return ''; |
|
} |
|
|
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; |