[BACK]Return to bridgetask.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / homework

Diff for /loncom/homework/bridgetask.pm between versions 1.51 and 1.52

version 1.51, 2005/09/20 07:14:23 version 1.52, 2005/09/21 21:54:20
Line 370  sub start_Task { Line 370  sub start_Task {
  $webgrade.'" />';   $webgrade.'" />';
     $result.='<input type="hidden" name="queue" value="'.      $result.='<input type="hidden" name="queue" value="'.
  $env{'form.queue'}.'" />';   $env{'form.queue'}.'" />';
       if ($env{'form.regrade'}) {
    $result.='<input type="hidden" name="regrade" value="'.
       $env{'form.regrade'}.'" />';
       }
  }   }
     } else {      } else {
  # page_start returned a starting result, delete it if we don't need it   # page_start returned a starting result, delete it if we don't need it
Line 577  sub end_Task { Line 581  sub end_Task {
  &remove_from_queue($env{'form.queue'});    &remove_from_queue($env{'form.queue'}); 
   
  my ($symb,$courseid,$udom,$uname)=&Apache::lonxml::whichuser();   my ($symb,$courseid,$udom,$uname)=&Apache::lonxml::whichuser();
  $Apache::lonhomework::results{"resource.$version.0.bridgetask.portfiles"}=  
     $Apache::lonhomework::history{"resource.$version.0.bridgetask.portfiles"};   if ($env{'form.regrade'} ne 'yes') {
  &Apache::grades::version_portfiles(      $Apache::lonhomework::results{"resource.$version.0.bridgetask.portfiles"}=
  \%Apache::lonhomework::results,   $Apache::lonhomework::history{"resource.$version.0.bridgetask.portfiles"};
  ["$version.0.bridgetask"],$courseid,      &Apache::grades::version_portfiles(
  $symb,$udom,$uname,         \%Apache::lonhomework::results,
  ["$version.0.bridgetask"]);         ["$version.0.bridgetask"],$courseid,
          $symb,$udom,$uname,
          ["$version.0.bridgetask"]);
    }
     } else {      } else {
  $Apache::lonhomework::results{"resource.$version.status"}='pass';   $Apache::lonhomework::results{"resource.$version.status"}='pass';
  $Apache::lonhomework::results{"resource.$version.0.solved"}='correct_by_override';   $Apache::lonhomework::results{"resource.$version.0.solved"}='correct_by_override';
Line 592  sub end_Task { Line 599  sub end_Task {
  &remove_from_queue($env{'form.queue'});   &remove_from_queue($env{'form.queue'});
   
  my ($symb,$courseid,$udom,$uname)=&Apache::lonxml::whichuser();   my ($symb,$courseid,$udom,$uname)=&Apache::lonxml::whichuser();
  $Apache::lonhomework::results{"resource.$version.0.bridgetask.portfiles"}=   if ($env{'form.regrade'} ne 'yes') {
     $Apache::lonhomework::history{"resource.$version.0.bridgetask.portfiles"};      $Apache::lonhomework::results{"resource.$version.0.bridgetask.portfiles"}=
  &Apache::grades::version_portfiles(   $Apache::lonhomework::history{"resource.$version.0.bridgetask.portfiles"};
  \%Apache::lonhomework::results,      &Apache::grades::version_portfiles(
  ["$version.0.bridgetask"],$courseid,         \%Apache::lonhomework::results,
  $symb,$udom,$uname,         ["$version.0.bridgetask"],$courseid,
  ["$version.0.bridgetask"]);         $symb,$udom,$uname,
          ["$version.0.bridgetask"]);
    }
     }      }
     $Apache::lonhomework::results{"resource.status"}=      $Apache::lonhomework::results{"resource.status"}=
  $Apache::lonhomework::results{"resource.$version.status"};   $Apache::lonhomework::results{"resource.$version.status"};
Line 1013  sub select_user { Line 1022  sub select_user {
       <input type="hidden" name="gradingkey" value="$todo" />        <input type="hidden" name="gradingkey" value="$todo" />
       <input type="hidden" name="queue" value="$queue" />        <input type="hidden" name="queue" value="$queue" />
       <input type="hidden" name="webgrade" value="no" />        <input type="hidden" name="webgrade" value="no" />
         <input type="hidden" name="regrade" value="yes" />
      <input type="submit" name="submit" value="Regrade" />       <input type="submit" name="submit" value="Regrade" />
     </form>      </form>
   <td>$fullname->{$student}</td>    <td>$fullname->{$student}</td>
Line 1188  sub get_instance { Line 1198  sub get_instance {
     '</td></tr>';      '</td></tr>';
  $result.='<tr><td colspan="4">';   $result.='<tr><td colspan="4">';
  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/';
  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;
     &Apache::lonnet::allowuploaded('/adm/bridgetask',$file);      &Apache::lonnet::allowuploaded('/adm/bridgetask',$file);
     $result.='<nobr><a href="'.$file.'" target="lonGRDs"><img src="'.      $result.='<nobr><a href="'.$file.'" target="lonGRDs"><img src="'.
  &Apache::loncommon::icon($file).'" border=0"> '.$file.   &Apache::loncommon::icon($file).'" border=0"> '.$file.
Removed from v.1.51  
changed lines
  Added in v.1.52

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