Diff for /loncom/homework/bridgetask.pm between versions 1.3 and 1.4

version 1.3, 2005/03/17 21:56:04 version 1.4, 2005/03/28 19:26:10
Line 41  BEGIN { Line 41  BEGIN {
     &Apache::lonxml::register('Apache::bridgetask',('Task','IntroParagraph','Dimension','Instance','InstanceText','Criteria','ClosingParagraph'));      &Apache::lonxml::register('Apache::bridgetask',('Task','IntroParagraph','Dimension','Instance','InstanceText','Criteria','ClosingParagraph'));
 }  }
   
   sub proctor_check_auth {
       my ($slot)=@_;
       my $user=$ENV{'form.proctorname'};
       my $domain=$ENV{'form.proctordomain'};
       
       my @allowed=split(",",$slot->{'proctor'});
       foreach my $possible (@allowed) {
    my ($puser,$pdom)=(split('@',$possible));
    if ($puser eq $user && $pdom eq $domain) {
       my $authhost=&Apache::lonnet::authenticate($puser,$ENV{'form.proctorpassword'},$pdom);
       if ($authhost ne 'no_host') {
    $Apache::lonhomework::results{'resource.checkedin'}=
       $user.'@'.$domain;
    return 1;
       }
    }
       }
       return 0;
   }
   
 sub start_Task {  sub start_Task {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   
     #&initialize_storage();      &Apache::structuretags::initialize_storage();
       &Apache::lonhomework::showhash(%Apache::lonhomework::history);
     my $status;  
     my $accessmsg;  
   
       my ($status,$accessmsg,$slot);
       $Apache::lonhomework::parsing_a_task=1;
     #should get back a <html> or the neccesary stuff to start XML/MathML      #should get back a <html> or the neccesary stuff to start XML/MathML
     my ($result,$head_tag_start,$body_tag_start,$form_tag_start)=      my ($result,$head_tag_start,$body_tag_start,$form_tag_start)=
  &Apache::structuretags::page_start($target,$token,$tagstack,$parstack,$parser,$safeeval);   &Apache::structuretags::page_start($target,$token,$tagstack,$parstack,$parser,$safeeval);
   
     if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||      if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
  $target eq 'tex') {   $target eq 'tex') {
  ($status,$accessmsg) = &Apache::lonhomework::check_task_access('0');   ($status,$accessmsg,$slot) = 
       &Apache::lonhomework::check_task_access('0');
  push (@Apache::inputtags::status,$status);   push (@Apache::inputtags::status,$status);
  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.0.solved"}.'";';
Line 65  sub start_Task { Line 86  sub start_Task {
     ( $status eq 'BANNED') ||      ( $status eq 'BANNED') ||
     ( $status eq 'UNAVAILABLE') ||      ( $status eq 'UNAVAILABLE') ||
     ( $status eq 'NOT_IN_A_SLOT') ||      ( $status eq 'NOT_IN_A_SLOT') ||
       ( $status eq 'NEEDS_CHECKIN') ||
     ( $status eq 'INVALID_ACCESS')) {      ( $status eq 'INVALID_ACCESS')) {
     my $bodytext=&Apache::lonxml::get_all_text("/task",$parser);      my $bodytext=&Apache::lonxml::get_all_text("/task",$parser);
     if ( $target eq "web" ) {      if ( $target eq "web" ) {
  $result.= $head_tag_start.'</head>';   $result.= $head_tag_start.'</head>'.$body_tag_start;
  my $msg=$body_tag_start;   my $msg;
  if ($status eq 'UNAVAILABLE') {   if ($status eq 'UNAVAILABLE') {
     $msg.='<h1>'.&mt('Unable to determine if this resource is open due to network problems. Please try again later.').'</h1>';      $msg.='<h1>'.&mt('Unable to determine if this resource is open due to network problems. Please try again later.').'</h1>';
  } elsif ($status eq 'NOT_IN_A_SLOT') {   } elsif ($status eq 'NOT_IN_A_SLOT') {
     $msg.='<h1>'.&mt('You are not currently signed up to work at this time and/or place.').'</h1>';      $msg.='<h1>'.&mt('You are not currently signed up to work at this time and/or place.').'</h1>';
  } elsif ($status eq 'IN_A_SLOT') {   } elsif ($status eq 'NEEDS_CHECKIN') {
     $msg.='<h1>'.&mt('You need the Proctor to validate you.').'</h1>';      $msg.='<h1>'.&mt('You need the Proctor to validate you.').
    '</h1>'.&proctor_validation_screen($slot);
  } elsif ($status ne 'NOT_YET_VIEWED') {   } elsif ($status ne 'NOT_YET_VIEWED') {
     $msg.='<h1>'.&mt('Not open to be viewed').'</h1>';      $msg.='<h1>'.&mt('Not open to be viewed').'</h1>';
  }   }
Line 90  sub start_Task { Line 113  sub start_Task {
  } else {   } else {
     $result.=&mt('Problem is not open to be viewed. It')." $accessmsg \\vskip 0 mm ";      $result.=&mt('Problem is not open to be viewed. It')." $accessmsg \\vskip 0 mm ";
  }   }
       } elsif ($target eq 'grade') {
    if ($status eq 'NEEDS_CHECKIN') {
       if (&proctor_check_auth($slot)) {
    #FIXME immeadiatly add this to the grading queue
                           #      with slot->{'endtime'} for when grading can 
                           #      begin on this resource
        }
    }
     }      }
  } 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);
Line 126  sub end_Task { Line 157  sub end_Task {
     }      }
  }   }
  if ($target eq 'grade') {   if ($target eq 'grade') {
     #&Apache::lonhomework::showhash(%Apache::lonhomework::results);      &Apache::lonhomework::showhash(%Apache::lonhomework::results);
     #&finalize_storage();      &Apache::structuretags::finalize_storage();
  }   }
     } elsif ($target eq 'meta') {      } elsif ($target eq 'meta') {
  $result.='<parameter part="0" package="Task"></parameter>'."\n";   $result.='<parameter part="0" package="Task"></parameter>'."\n";
  #$result.=&Apache::response::meta_part_order();   #$result.=&Apache::response::meta_part_order();
  #$result.=&Apache::response::meta_response_order();   #$result.=&Apache::response::meta_response_order();
     }      }
       undef($Apache::lonhomework::parsing_a_task);
     return $result;      return $result;
 }  }
   
Line 259  sub end_Criteria { Line 291  sub end_Criteria {
     return '';      return '';
 }  }
   
   sub proctor_validation_screen {
       my ($slot) = @_;
       my (undef,undef,$domain,$user) = &Apache::lonxml::whichuser();
       my $ret=&Apache::lonnet::reply("studentphoto:$domain:$user:gif",&Apache::lonnet::homeserver($user,$domain));
       my $url="/uploaded/$domain/$user/internal/studentphoto.gif";
       my $tokenurl=&Apache::lonnet::tokenwrapper($url);
       my $dom=(&Apache::lonxml::whichuser())[2];
       my $user=$ENV{'form.proctorname'};
       if ($ENV{'form.proctordomain'}) { $dom=$ENV{'form.proctordomain'}; }
       my $msg;
       if ($ENV{'form.proctorpassword'}) {
    $msg='<p><font color="red">'.&mt("Failed to authenticate the proctor.")
       .'</font></p>';
       }
       my $result= (<<ENDCHECKOUT);
   <h2>Proctor Validation</h2>
       <p>Your room's proctor needs to validate your access to this resource.</p>
       $msg
   <form name="checkout" method="POST" action="$ENV{'request.uri'}">
   <input type="hidden" name="validate" value="yes" />
   <input type="hidden" name="submitted" value="yes" />
   <table>
     <tr><td>Proctor's Username:</td><td><input type="string" name="proctorname" value="$user" /></td></tr>
     <tr><td>Password:</td><td><input type="password" name="proctorpassword" value="" /></td></tr>
     <tr><td>Proctor's Domain:</td><td><input type="string" name="proctordomain" value="$dom" /></td></tr>
   </table>
   <input type="submit" name="checkoutbutton" value="Validate"  /><br />
   Student who should be logged in is:<br />
   <img src="$tokenurl" /><br />
   </form>
   ENDCHECKOUT
       return $result;
   }
   
 1;  1;
 __END__  __END__

Removed from v.1.3  
changed lines
  Added in v.1.4


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