Diff for /loncom/homework/bridgetask.pm between versions 1.112 and 1.114

version 1.112, 2006/02/20 22:57:41 version 1.114, 2006/02/21 22:41:29
Line 480  sub start_Task { Line 480  sub start_Task {
  } elsif ($env{'form.donescreen'}) {   } elsif ($env{'form.donescreen'}) {
     my $title=&Apache::lonnet::gettitle();      my $title=&Apache::lonnet::gettitle();
     my @files=split(',',$Apache::lonhomework::history{'resource.'.$version.'.0.bridgetask.portfiles'});      my @files=split(',',$Apache::lonhomework::history{'resource.'.$version.'.0.bridgetask.portfiles'});
     my $files='<ul><li>'.join('</li><li>',@files).'</li></ul>';      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;      $result.=<<DONESCREEN;
 <h2>$title</h2>  <h2>$title</h2>
 <p> Files submitted: $files </p>  <p> Files submitted: $files </p>
Line 1792  sub get_instance { Line 1805  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 1840  sub get_instance { Line 1854  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;

Removed from v.1.112  
changed lines
  Added in v.1.114


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>