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

Diff for /loncom/homework/bridgetask.pm between versions 1.22 and 1.23

version 1.22, 2005/05/10 20:29:26 version 1.23, 2005/05/10 20:58:38
Line 69  sub proctor_check_auth { Line 69  sub proctor_check_auth {
  if ($puser eq $user && $pdom eq $domain) {   if ($puser eq $user && $pdom eq $domain) {
     my $authhost=&Apache::lonnet::authenticate($puser,$env{'form.proctorpassword'},$pdom);      my $authhost=&Apache::lonnet::authenticate($puser,$env{'form.proctorpassword'},$pdom);
     if ($authhost ne 'no_host') {      if ($authhost ne 'no_host') {
  $Apache::lonhomework::results{'resource.checkedin'}=   my $version=
       $Apache::lonhomework::results{'resource.version'}=
       $Apache::lonhomework::history{'resource.version'}++;
    $Apache::lonhomework::results{"resource.$version.checkedin"}=
     $user.'@'.$domain;      $user.'@'.$domain;
  $Apache::lonhomework::results{'resource.checkedin.slot'}=   $Apache::lonhomework::results{"resource.$version.checkedin.slot"}=
     $slot_name;      $slot_name;
  return 1;   return 1;
     }      }
Line 130  sub start_Task { Line 133  sub start_Task {
  push(@Apache::inputtags::status,$status);   push(@Apache::inputtags::status,$status);
  $Apache::inputtags::slot_name=$slot_name;   $Apache::inputtags::slot_name=$slot_name;
  my $expression='$external::datestatus="'.$status.'";';   my $expression='$external::datestatus="'.$status.'";';
  $expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.0.solved"}.'";';   $expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.$version.solved"}.'";';
  &Apache::run::run($expression,$safeeval);   &Apache::run::run($expression,$safeeval);
  &Apache::lonxml::debug("Got $status");   &Apache::lonxml::debug("Got $status");
  if (( $status eq 'CLOSED' ) ||   if (( $status eq 'CLOSED' ) ||
Line 236  sub end_Task { Line 239  sub end_Task {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $result='';      my $result='';
     my $status=$Apache::inputtags::status['-1'];      my $status=$Apache::inputtags::status['-1'];
       my $version=$Apache::lonhomework::history{'resource.version'};
     if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ||      if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ||
  $target eq 'tex') {   $target eq 'tex') {
  if (   if (
Line 245  sub end_Task { Line 249  sub end_Task {
     if ($target eq 'web') {      if ($target eq 'web') {
  if ($status eq 'CAN_ANSWER') {   if ($status eq 'CAN_ANSWER') {
     $result.="\n".'<table border="1">'.      $result.="\n".'<table border="1">'.
  &Apache::inputtags::file_selector('0',"bridgetask","*",   &Apache::inputtags::file_selector($version,
     "bridgetask","*",
   'portfolioonly').    'portfolioonly').
   "</table>";    "</table>";
     $result.=&Apache::inputtags::gradestatus('0');      $result.=&Apache::inputtags::gradestatus('0');
Line 260  sub end_Task { Line 265  sub end_Task {
     &Apache::essayresponse::file_submission('0','bridgetask',      &Apache::essayresponse::file_submission('0','bridgetask',
     'portfiles',\$award);      'portfiles',\$award);
     if ($award eq 'SUBMITTED' &&      if ($award eq 'SUBMITTED' &&
  $Apache::lonhomework::results{"resource.0.bridgetask.portfiles"}) {   $Apache::lonhomework::results{"resource.$version.bridgetask.portfiles"}) {
  $Apache::lonhomework::results{"resource.0.tries"}=   $Apache::lonhomework::results{"resource.$version.tries"}=
     1+$Apache::lonhomework::history{"resource.0.tries"};      1+$Apache::lonhomework::history{"resource.$version.tries"};
     }      }
     $Apache::lonhomework::results{"resource.0.award"}=$award;      $Apache::lonhomework::results{"resource.$version.award"}=$award;
     &Apache::lonhomework::showhash(%Apache::lonhomework::results);      &Apache::lonhomework::showhash(%Apache::lonhomework::results);
     &Apache::structuretags::finalize_storage();      &Apache::structuretags::finalize_storage();
     if ($award eq 'SUBMITTED') {      if ($award eq 'SUBMITTED') {
Line 309  sub end_Task { Line 314  sub end_Task {
  &check_queue_unlock();   &check_queue_unlock();
     } elsif ($mandatory_failed) {      } elsif ($mandatory_failed) {
  $Apache::lonhomework::results{'resource.status'}='fail';   $Apache::lonhomework::results{'resource.status'}='fail';
  $Apache::lonhomework::results{"resource.0.award"}='EXACT_ANS';   $Apache::lonhomework::results{"resource.$version.award"}='EXACT_ANS';
  &remove_from_queue();   &remove_from_queue();
     } else {      } else {
  $Apache::lonhomework::results{'resource.status'}='pass';   $Apache::lonhomework::results{'resource.status'}='pass';
  $Apache::lonhomework::results{"resource.0.award"}='INCORRECT';   $Apache::lonhomework::results{"resource.$version.award"}='INCORRECT';
  &remove_from_queue();   &remove_from_queue();
     }      }
     &Apache::structuretags::finalize_storage();      &Apache::structuretags::finalize_storage();
Line 645  sub get_instance { Line 650  sub get_instance {
  $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.0.bridgetask.portfiles"})) {   foreach my $partial_file (split(',',$Apache::lonhomework::history{"resource.$version.bridgetask.portfiles"})) {
     my $file=$file_url.$partial_file;      my $file=$file_url.$partial_file;
     &Apache::lonnet::allowuploaded('/adm/bridgetask',$file);      &Apache::lonnet::allowuploaded('/adm/bridgetask',$file);
     $result.='<a href="'.$file.'" target="lonGRDs"><img src="'.      $result.='<a href="'.$file.'" target="lonGRDs"><img src="'.
Removed from v.1.22  
changed lines
  Added in v.1.23

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