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

Diff for /loncom/homework/bridgetask.pm between versions 1.35 and 1.37

version 1.35, 2005/05/31 16:31:01 version 1.37, 2005/06/04 08:17:06
Line 36  use Apache::File(); Line 36  use Apache::File();
 use Apache::lonmenu;  use Apache::lonmenu;
 use Apache::lonlocal;  use Apache::lonlocal;
 use Apache::lonxml;  use Apache::lonxml;
   use Apache::slotrequest();
 use Time::HiRes qw( gettimeofday tv_interval );  use Time::HiRes qw( gettimeofday tv_interval );
   
 BEGIN {  BEGIN {
Line 91  sub proctor_check_auth { Line 92  sub proctor_check_auth {
 sub get_version {  sub get_version {
     my ($version,$previous);      my ($version,$previous);
     if ($env{'form.previousversion'} &&       if ($env{'form.previousversion'} && 
    $env{'form.previousversion'} ne 'current' &&
  defined($Apache::lonhomework::history{'resource.'.$env{'form.previousversion'}.'.status'})) {   defined($Apache::lonhomework::history{'resource.'.$env{'form.previousversion'}.'.status'})) {
  $version=$env{'form.previousversion'};   $version=$env{'form.previousversion'};
  $previous=1;   $previous=1;
Line 129  sub add_previous_version_button { Line 131  sub add_previous_version_button {
     my $list='<option>'.      my $list='<option>'.
  join("</option>\n<option>",@to_show).   join("</option>\n<option>",@to_show).
      "</option>\n";       "</option>\n";
       $list.='<option value="current">'.&mt('Current').'</option>';
     $result.='<form name="getprevious" method="POST" action="';      $result.='<form name="getprevious" method="POST" action="';
     my $uri=$env{'request.uri'};      my $uri=$env{'request.uri'};
     if ($env{'request.enc'}) { $uri=&Apache::lonenc::encrypted($uri); }      if ($env{'request.enc'}) { $uri=&Apache::lonenc::encrypted($uri); }
Line 163  sub add_grading_button { Line 166  sub add_grading_button {
   
 sub add_request_another_attempt_button {  sub add_request_another_attempt_button {
     my $result;      my $result;
     $result.=' <input type="submit" name="requestattempt" value="'.      my $symb=&Apache::lonnet::symbread();
  &mt("Request another attempt").'" />';      my ($slot_name,$slot)=&Apache::slotrequest::check_for_reservation($symb);
       if ($slot_name) {
    my $description=&Apache::slotrequest::get_description($slot_name,
         $slot);
    $result.=(<<STUFF);
   <p> Will be next available: $description </p>
   STUFF
   
       } else {
    if ($env{'request.enc'}) { $symb=&Apache::lonenc::encrypted($symb); }
    $symb=&Apache::lonnet::escape($symb);
    $result.='<form method="POST" action="/adm/slotrequest">'.
       '<input type="hidden" name="symb" value="'.$symb.'" />'.
       '<input type="submit" name="requestattempt" value="'.
       &mt("Request another attempt").'" />'.
       '</form>';
       }
     return $result;      return $result;
 }  }
   
Line 264  sub start_Task { Line 283  sub start_Task {
  } elsif ($target eq 'web') {   } elsif ($target eq 'web') {
     my $name= &Apache::structuretags::get_resource_name($parstack,$safeeval);      my $name= &Apache::structuretags::get_resource_name($parstack,$safeeval);
     $result.="$head_tag_start<title>$name</title></head>      $result.="$head_tag_start<title>$name</title></head>
               $body_tag_start \n $form_tag_start".                $body_tag_start \n";
       '<input type="hidden" name="submitted" value="yes" />';      
     $result.=&preserve_grade_info();  
     my ($version,$previous)=&get_version();      my ($version,$previous)=&get_version();
     if ($Apache::lonhomework::history{"resource.$version.status"} eq 'fail') {      if ($Apache::lonhomework::history{"resource.$version.status"} eq 'fail') {
  $result.='<h1><font color="red">'.&mt('Did not pass').'</font></h1>';   $result.='<h1><font color="red">'.&mt('Did not pass').'</font></h1>';
Line 277  sub start_Task { Line 295  sub start_Task {
     if ($Apache::lonhomework::history{"resource.$version.status"} eq 'pass') {      if ($Apache::lonhomework::history{"resource.$version.status"} eq 'pass') {
  $result.='<h1><font color="green">'.&mt('Passed').'</font></h1>';   $result.='<h1><font color="green">'.&mt('Passed').'</font></h1>';
     }      }
       $result.=$form_tag_start.
    '<input type="hidden" name="submitted" value="yes" />';
       $result.=&preserve_grade_info();
   
  }   }
     } elsif ( ($target eq 'grade' && $env{'form.webgrade'}) ||      } elsif ( ($target eq 'grade' && $env{'form.webgrade'}) ||
       $target eq 'webgrade') {        $target eq 'webgrade') {
Removed from v.1.35  
changed lines
  Added in v.1.37

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