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

Diff for /loncom/homework/bridgetask.pm between versions 1.90 and 1.93

version 1.90, 2005/12/21 18:08:28 version 1.93, 2005/12/21 19:10:33
Line 80  sub proctor_check_auth { Line 80  sub proctor_check_auth {
  }   }
     }      }
     if ($authenticated && $type eq 'Task') {      if ($authenticated && $type eq 'Task') {
    # increment version
  my $version=   my $version=
     $Apache::lonhomework::history{'resource.0.version'};      $Apache::lonhomework::history{'resource.0.version'};
  $version++;   $version++;
  $Apache::lonhomework::results{'resource.0.version'}=$version;  
  $Apache::lonhomework::results{"resource.$version.0.checkedin"}=   #clean out all current results
     $user.'@'.$domain;  
  $Apache::lonhomework::results{"resource.$version.0.checkedin.slot"}=  
     $slot_name;  
  foreach my $key (keys(%Apache::lonhomework::history)) {   foreach my $key (keys(%Apache::lonhomework::history)) {
     if ($key=~/^resource\.0\./) {      if ($key=~/^resource\.0\./) {
  $Apache::lonhomework::results{$key}='';   $Apache::lonhomework::results{$key}='';
     }      }
  }   }
   
    #setup new version and who did it
    $Apache::lonhomework::results{'resource.0.version'}=$version;
    $Apache::lonhomework::results{"resource.$version.0.checkedin"}=
       $user.'@'.$domain;
    $Apache::lonhomework::results{"resource.$version.0.checkedin.slot"}=
       $slot_name;
   
  return 1;   return 1;
     } elsif ($authenticated && $type eq 'problem') {      } elsif ($authenticated && $type eq 'problem') {
  &Apache::lonxml::debug("authed $slot_name");   &Apache::lonxml::debug("authed $slot_name");
Line 758  DONEBUTTON Line 764  DONEBUTTON
     my $opt_req=&Apache::lonxml::get_param('OptionalRequired',      my $opt_req=&Apache::lonxml::get_param('OptionalRequired',
  $parstack,$safeeval);   $parstack,$safeeval);
     if ($opt_req !~ /\S/) { $opt_req='0'; }      if ($opt_req !~ /\S/) { $opt_req='0'; }
     $status.="\n<p>".&mt('You needed to pass all of the [_1]  mandatory components and [_2] of the [_3] optional components on the bridge task.',$man_count,$opt_req,$opt_count)."</p></div>\n";      $status.="\n<p>".&mt('You needed to pass all of the [_1]  mandatory components and [_2] of the [_3] optional components, of which you were required to pass [_4] on the bridge task.',$man_count,$opt_passed,$opt_count,$opt_req)."</p></div>\n";
   
     my $internal_location=&internal_location();      my $internal_location=&internal_location();
     $result=~s/\Q$internal_location\E/$status/;      $result=~s/\Q$internal_location\E/$status/;
Line 1709  sub get_instance { Line 1715  sub get_instance {
  $Apache::lonhomework::results{"resource.$version.0.$dim.status"}=   $Apache::lonhomework::results{"resource.$version.0.$dim.status"}=
     'fail';      'fail';
     } else {      } else {
  $Apache::lonhomework::results{"resource.$version.$dim.status"}=   $Apache::lonhomework::results{"resource.$version.0.$dim.status"}=
     'pass';      'pass';
     }      }
  } else {   } else {
Removed from v.1.90  
changed lines
  Added in v.1.93

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