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

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

version 1.37, 2005/06/04 08:17:06 version 1.55, 2005/09/29 19:18:37
Line 147  sub add_grading_button { Line 147  sub add_grading_button {
     my $result=' <input type="submit" name="gradeasubmission" value="'.      my $result=' <input type="submit" name="gradeasubmission" value="'.
  &mt("Get a submission to grade").'" />';   &mt("Get a submission to grade").'" />';
     $result.='<input type="hidden" name="grade_target" value="webgrade" />';      $result.='<input type="hidden" name="grade_target" value="webgrade" />';
     if ( 1) {      if (&Apache::lonnet::allowed('mgq',$env{'request.course.id'})) {
  #need a permissions for limitng this to 'powerful users'  
   
  my ($entries,$ready,$locks)=&get_queue_counts('gradingqueue');   my ($entries,$ready,$locks)=&get_queue_counts('gradingqueue');
  $result.='<p>'.&mt("Grading Queue has [_1] entries. [_2] of them are ready to be graded and [_3] of them are currently being graded",$entries,$ready,$locks);   $result.='<p>'.&mt("Grading Queue has [_1] entries. [_2] of them are ready to be graded and [_3] of them are currently being graded",$entries,$ready,$locks);
   
Line 160  sub add_grading_button { Line 158  sub add_grading_button {
  $result.='<p>'.&mt("Review Queue has [_1] entries. [_2] of them are ready to be graded and [_3] of them are currently being graded",$entries,$ready,$locks);   $result.='<p>'.&mt("Review Queue has [_1] entries. [_2] of them are ready to be graded and [_3] of them are currently being graded",$entries,$ready,$locks);
  $result.=' <input type="submit" name="reviewasubmission" value="'.   $result.=' <input type="submit" name="reviewasubmission" value="'.
     &mt("Select an entry from the review queue").'" /> </p>'."\n";      &mt("Select an entry from the review queue").'" /> </p>'."\n";
    $result.=' <input type="submit" name="regradeasubmission" value="'.
       &mt("Select a user to regrade.").'" /> </p>'."\n";
     }      }
     return $result;      return $result;
 }  }
   
 sub add_request_another_attempt_button {  sub add_request_another_attempt_button {
       my ($text)=@_;
       if (!$text) { $text="Request another attempt"; }
     my $result;      my $result;
     my $symb=&Apache::lonnet::symbread();      my $symb=&Apache::lonnet::symbread();
     my ($slot_name,$slot)=&Apache::slotrequest::check_for_reservation($symb);      my ($slot_name,$slot)=&Apache::slotrequest::check_for_reservation($symb);
       my $action='get_reservation';
     if ($slot_name) {      if ($slot_name) {
    $text="Change reservation.";
    $action='change_reservation';
  my $description=&Apache::slotrequest::get_description($slot_name,   my $description=&Apache::slotrequest::get_description($slot_name,
       $slot);        $slot);
  $result.=(<<STUFF);   $result.=(<<STUFF);
 <p> Will be next available: $description </p>  <p> Will be next available: $description </p>
 STUFF  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>';  
     }      }
       
       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="hidden" name="command" value="'.$action.'" />'.
    '<input type="submit" name="requestattempt" value="'.
    &mt($text).'" />'.
    '</form>';
     return $result;      return $result;
 }  }
   
Line 199  sub preserve_grade_info { Line 204  sub preserve_grade_info {
     return $result;      return $result;
 }  }
   
   sub style {
       return (<<STYLE);
   <style type="text/css">
   .fail, .pass, .neutral {
       position: relative;
       margin : 5px;
       margin-bottom :10px;
       padding : 4px;
       padding-left : 75px;
    border : thin solid;
       font-weight : bolder;
       font-size: smaller;
       font-family: Arial;
       background-color : rgb(255,240,225);
   }
   
   .fail h4, .pass h4 {
    position:absolute;
    left: -4px;
    top: -8px;
    padding:2px;
    margin:0;
    background-color : rgb(255,240,225);
    border : thin solid;
   }
   
   .fail {
    color: red;
   }
   
   .pass {
       color : green;
   }
   
   .neutral {
    color : blue;
   }
   
   .question {
    border : thin solid black;
    padding : 4px;
    margin-bottom : 1em;
   }
   
   .grade {
    font-size: x-large;
    font-family: Arial;
    position:absolute;
    left: 5px;
    top: -5px;
    width: 70px;
   }
   
   div#feedback h1 {
       color : inherit;
   }
   </style>
   STYLE
   
   }
   
   sub show_task {
       my ($status,$previous)=@_;
       if (!$previous && (
          ( $status eq 'CLOSED' ) ||
          ( $status eq 'BANNED') ||
          ( $status eq 'UNAVAILABLE') ||
          ( $status eq 'NOT_IN_A_SLOT') ||
          ( $status eq 'NEEDS_CHECKIN') ||
          ( $status eq 'WAITING_FOR_GRADE') ||
          ( $status eq 'INVALID_ACCESS') )) {
    return 0;
       }
       return 1;
   }
   
   sub internal_location {
       my ($id)=@_;
       return '<!-- LONCAPA_INTERNAL_ADD_TASK_STATUS'.$id.' -->';
   }
   
 sub start_Task {  sub start_Task {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   
Line 219  sub start_Task { Line 305  sub start_Task {
     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); }
     $body_tag_start.=$uri.'">'.&add_grading_button()."</form>";      $body_tag_start.=$uri.'">'.&add_grading_button()."</form>";
       my $symb=&Apache::lonnet::symbread();
       if (&Apache::lonnet::allowed('mgq',$env{'request.course.id'})) {
    $body_tag_start.='<form method="POST" action="/adm/slotrequest">'.
       '<input type="hidden" name="symb" value="'.$symb.'" />'.
       '<input type="hidden" name="command" value="showslots" />'.
       '<input type="submit" name="requestattempt" value="'.
       &mt('Show Slot list').'" />'.
       '</form>';
       }
  }   }
     }      }
     if ($target eq 'web' || ($target eq 'grade' && !$env{'form.webgrade'}) || $target eq 'answer' ||      if ($target eq 'web' || ($target eq 'grade' && !$env{'form.webgrade'}) || $target eq 'answer' ||
Line 233  sub start_Task { Line 328  sub start_Task {
  &Apache::run::run($expression,$safeeval);   &Apache::run::run($expression,$safeeval);
  &Apache::lonxml::debug("Got $status");   &Apache::lonxml::debug("Got $status");
  $body_tag_start.=&add_previous_version_button($status);   $body_tag_start.=&add_previous_version_button($status);
  if (!$previous && (   if (!&show_task($status,$previous)) {
    ( $status eq 'CLOSED' ) ||  
    ( $status eq 'BANNED') ||  
    ( $status eq 'UNAVAILABLE') ||  
    ( $status eq 'NOT_IN_A_SLOT') ||  
    ( $status eq 'NEEDS_CHECKIN') ||  
    ( $status eq 'WAITING_FOR_GRADE') ||  
    ( $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>'.$body_tag_start;   $result.= $head_tag_start.'</head>'.$body_tag_start;
Line 249  sub start_Task { Line 337  sub start_Task {
     $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>';
       $msg.=&add_request_another_attempt_button("Sign up for time to work.");
  } elsif ($status eq 'NEEDS_CHECKIN') {   } elsif ($status eq 'NEEDS_CHECKIN') {
     $msg.='<h1>'.&mt('You need the Proctor to validate you.').      $msg.='<h1>'.&mt('You need the Proctor to validate you.').
  '</h1>'.&proctor_validation_screen($slot);   '</h1>'.&proctor_validation_screen($slot);
Line 270  sub start_Task { Line 359  sub start_Task {
  }   }
     } elsif ($target eq 'grade' && !$env{'form.webgrade'}) {      } elsif ($target eq 'grade' && !$env{'form.webgrade'}) {
  if ($status eq 'NEEDS_CHECKIN') {   if ($status eq 'NEEDS_CHECKIN') {
     if (&proctor_check_auth($slot_name,$slot)) {      &proctor_check_auth($slot_name,$slot);
  #FIXME immeadiatly add this to the grading queue  
                         #      with slot->{'endtime'} for when grading can   
                         #      begin on this resource  
  # FIXME I think the above is done by default,  
                         #        need to check that  
                         #        failure doesn't do this.  
      }  
  }   }
     }      }
  } 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";                $body_tag_start \n".&style();
           
     my ($version,$previous)=&get_version();  
     if ($Apache::lonhomework::history{"resource.$version.status"} eq 'fail') {  
  $result.='<h1><font color="red">'.&mt('Did not pass').'</font></h1>';  
  if (!$previous) {  
     $result.=&add_request_another_attempt_button();  
  }  
     }  
     if ($Apache::lonhomework::history{"resource.$version.status"} eq 'pass') {  
  $result.='<h1><font color="green">'.&mt('Passed').'</font></h1>';  
     }  
     $result.=$form_tag_start.      $result.=$form_tag_start.
  '<input type="hidden" name="submitted" value="yes" />';   '<input type="hidden" name="submitted" value="yes" />';
     $result.=&preserve_grade_info();      $result.=&preserve_grade_info();
       $result.=&internal_location();
       &Apache::lonxml::startredirection();
  }   }
     } elsif ( ($target eq 'grade' && $env{'form.webgrade'}) ||      } elsif ( ($target eq 'grade' && $env{'form.webgrade'}) ||
       $target eq 'webgrade') {        $target eq 'webgrade') {
  my $webgrade='yes';   my $webgrade='yes';
  if ($target eq 'webgrade') {   if ($target eq 'webgrade') {
     $result.=$head_tag_start.$body_tag_start;      $result.=$head_tag_start.$body_tag_start;
     $result.='<br />Review'.&show_queue('reviewqueue');      #$result.='<br />Review'.&show_queue('reviewqueue');
     $result.='<br />Grade'.&show_queue('gradingqueue');      #$result.='<br />Grade'.&show_queue('gradingqueue');
  }   }
  # FIXME Blast! still need to reorg this, need to reshow the   # FIXME Blast! still need to reorg this, need to reshow the
         #       queue being reviewed once done with the grade pass...          #       queue being reviewed once done with the grade pass...
Line 315  sub start_Task { Line 388  sub start_Task {
         #       there isn't reshow the queue....          #       there isn't reshow the queue....
  my ($todo,$status_code)=&get_key_todo($target);   my ($todo,$status_code)=&get_key_todo($target);
   
  &Apache::lonnet::logthis("got todo -$todo- stat -$status_code-");  
  if ($todo) {   if ($todo) {
     &setup_env_for_other_user($todo,$safeeval);      &setup_env_for_other_user($todo,$safeeval);
     my ($symb,$uname,$udom)=&decode_queue_key($todo);      my ($symb,$uname,$udom)=&decode_queue_key($todo);
Line 328  sub start_Task { Line 400  sub start_Task {
     &Apache::structuretags::initialize_storage();      &Apache::structuretags::initialize_storage();
     &Apache::lonhomework::showhash(%Apache::lonhomework::history);      &Apache::lonhomework::showhash(%Apache::lonhomework::history);
     if ($target eq 'webgrade') {      if ($target eq 'webgrade') {
  $result.='<br />After -'.&show_queue($env{'form.queue'});   #$result.='<br />After -'.&show_queue($env{'form.queue'});
  $result.="\n".'<table width="100%" style="width:100%" border="1">';   $result.="\n".'<table width="100%" style="width:100%" border="1">';
  if ($status_code eq 'selected') {   if ($status_code eq 'selected') {
     $form_tag_start.=      $form_tag_start.=
Line 347  sub start_Task { Line 419  sub start_Task {
     $result.=&show_queue($env{'form.queue'},1);      $result.=&show_queue($env{'form.queue'},1);
  } elsif ($status_code eq 'show_list') {   } elsif ($status_code eq 'show_list') {
     $result.=&show_queue($env{'form.queue'},1);      $result.=&show_queue($env{'form.queue'},1);
    } elsif ($status_code eq 'select_user') {
       $result.=&select_user();
  } else {   } else {
     $result.='<b>'.&mt("No user to be graded.").'</b>';      $result.='<b>'.&mt("No user to be graded.").'</b>';
  }   }
Line 360  sub start_Task { Line 434  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 373  sub get_key_todo { Line 451  sub get_key_todo {
     my $todo;      my $todo;
   
     if (defined($env{'form.reviewasubmission'})) {      if (defined($env{'form.reviewasubmission'})) {
  &Apache::lonnet::logthis("review a submission....");   &Apache::lonxml::debug("review a submission....");
  $env{'form.queue'}='reviewqueue';   $env{'form.queue'}='reviewqueue';
  return (undef,'show_list');   return (undef,'show_list');
     }      }
Line 384  sub get_key_todo { Line 462  sub get_key_todo {
  return (undef,'show_list');   return (undef,'show_list');
     }      }
   
       if (defined($env{'form.regradeasubmission'})) {
    &Apache::lonxml::debug("regrade a grading....");
    $env{'form.queue'}='none';
    return (undef,'select_user');
       }
   
     my $queue=$env{'form.queue'};      my $queue=$env{'form.queue'};
   
     if (!defined($queue)) {      if (!defined($queue)) {
Line 392  sub get_key_todo { Line 476  sub get_key_todo {
   
     my $gradingkey=&Apache::lonnet::unescape($env{'form.gradingkey'});      my $gradingkey=&Apache::lonnet::unescape($env{'form.gradingkey'});
   
       if ($env{'form.queue'} eq 'none') {
    if (defined($env{'form.gradingkey'})) {
       if ($target eq 'webgrade') {
    if ($env{'form.stop'}) {
       return (undef,'stop');
    } elsif ($env{'form.next'}) {
       return (undef,'show_list');
    }
       }
       return ($gradingkey,'selected');
    } else {
       return (undef,'show_list');
    }
       }
     if (defined($env{'form.queue'}) && defined($env{'form.gradingkey'})      if (defined($env{'form.queue'}) && defined($env{'form.gradingkey'})
  && !defined($env{'form.gradingaction'})    && !defined($env{'form.gradingaction'}) 
  && $env{'form.queuemode'} eq 'selected') {   && $env{'form.queuemode'} eq 'selected') {
Line 452  sub end_Task { Line 550  sub end_Task {
     ($target eq 'answer') || ($target eq 'tex')      ($target eq 'answer') || ($target eq 'tex')
    ) {     ) {
     if ($target eq 'web') {      if ($target eq 'web') {
    if (&show_task($status,$previous)) {
       $result.=&Apache::lonxml::endredirection();
    }
  if ($status eq 'CAN_ANSWER' && !$previous) {   if ($status eq 'CAN_ANSWER' && !$previous) {
     $result.="\n".'<table border="1">'.      $result.="\n".'<table border="1">'.
  &Apache::inputtags::file_selector("$version.0",   &Apache::inputtags::file_selector("$version.0",
   "bridgetask","*",    "bridgetask","*",
   'portfolioonly').    'portfolioonly',
     '
   <h2>'.&mt('Submit Portfolio Files for Grading').'</h2>
   <p>'.&mt('Indicate the files from your portfolio to be evaluated in grading this task.').'</p>').
   "</table>";    "</table>";
     $result.=&Apache::inputtags::gradestatus('0');      $result.=&Apache::inputtags::gradestatus('0');
  }   }
    if (&show_task($status,$previous)) {
       my $bt_status=$Apache::lonhomework::history{"resource.$version.status"};
       my $title=&Apache::lonnet::gettitle();
       my %slot=&Apache::lonnet::get_slot($Apache::inputtags::slot_name);
       my $start_time=
    &Apache::lonlocal::locallocaltime($slot{'starttime'});
   
       my $status;
       $status.="\n<div class='$bt_status'>\n";
       
       if ($bt_status eq 'pass')  {
    $status.='<h2>You passed the '.$title.' given on '.
       $start_time.'.</h2>';
       }
       if ($bt_status eq 'fail')  {
    $status.='<h2>You did not pass the '.$title.' given on '.
       $start_time.'.</h2>';
    if (!$previous) {
       $status.=&add_request_another_attempt_button();
    }
       }
       my $man_count=0;
       my $opt_count=0;
       my $opt_passed=0;
       foreach my $dim_id (@Apache::bridgetask::dimensionlist) {
    if ($Apache::bridgetask::dimensionmandatory{$dim_id}
       eq 'N') {
       $opt_count++;
       if ($Apache::lonhomework::history{"resource.$version.$dim_id.status"} eq 'pass') {
    $opt_passed++;
       }
    } else {
       $man_count++;
    }
       }
       my $opt_req=&Apache::lonxml::get_param('OptionalRequired',
    $parstack,$safeeval);
       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";
   
       my $internal_location=&internal_location();
       $result=~s/\Q$internal_location\E/$status/;
    }
     }       } 
     if ($target eq 'web' || $target eq 'webgrade') {      if ($target eq 'web' || $target eq 'webgrade') {
  $result.=&Apache::lonxml::xmlend().'</html>';   $result.=&Apache::lonxml::xmlend().'</html>';
Line 478  sub end_Task { Line 625  sub end_Task {
  $Apache::lonhomework::results{"resource.0.award"}=   $Apache::lonhomework::results{"resource.0.award"}=
     $Apache::lonhomework::results{"resource.$version.0.award"}=      $Apache::lonhomework::results{"resource.$version.0.award"}=
     $award;      $award;
    $Apache::lonhomework::results{"resource.0.submission"}=
       $Apache::lonhomework::results{"resource.$version.0.submission"}='';
     }      }
     &Apache::lonhomework::showhash(%Apache::lonhomework::results);      &Apache::lonhomework::showhash(%Apache::lonhomework::results);
     &Apache::structuretags::finalize_storage();      &Apache::structuretags::finalize_storage();
Line 507  sub end_Task { Line 656  sub end_Task {
     $ungraded++;      $ungraded++;
  } elsif ($status eq 'review') {   } elsif ($status eq 'review') {
     $review++;      $review++;
  }   } else {
       $ungraded++;
    }
     }      }
     if ($optional_passed < $optional_required) {      if ($optional_passed < $optional_required) {
  $mandatory_failed++;   $mandatory_failed++;
Line 521  sub end_Task { Line 672  sub end_Task {
     &check_queue_unlock($env{'form.queue'});      &check_queue_unlock($env{'form.queue'});
     &Apache::lonxml::debug(" still needs review not changing status.");      &Apache::lonxml::debug(" still needs review not changing status.");
  } else {   } else {
     &move_between_queues('gradingqueue','reviewqueue');      &move_between_queues($env{'form.queue'},'reviewqueue');
  }   }
     } elsif ($ungraded) {      } elsif ($ungraded) {
  $Apache::lonhomework::results{"resource.$version.status"}='ungraded';   $Apache::lonhomework::results{"resource.$version.status"}='ungraded';
  # FIXME if in review queue need to move back to grading queue   if ($env{'form.queue'} eq 'reviewqueue' ||
  if ($env{'form.queue'} eq 'reviewqueue') {      $env{'form.queue'} eq 'none' ) {
     &Apache::lonxml::debug("moving back.");      &Apache::lonxml::debug("moving back.");
     &move_between_queues('reviewqueue','gradingqueue');      &move_between_queues($env{'form.queue'},'gradingqueue');
  } else {   } else {
     &check_queue_unlock($env{'form.queue'});      &check_queue_unlock($env{'form.queue'});
  }   }
Line 537  sub end_Task { Line 688  sub end_Task {
  $Apache::lonhomework::results{"resource.$version.0.solved"}='incorrect_by_override';   $Apache::lonhomework::results{"resource.$version.0.solved"}='incorrect_by_override';
  $Apache::lonhomework::results{"resource.$version.0.award"}='INCORRECT';   $Apache::lonhomework::results{"resource.$version.0.award"}='INCORRECT';
  $Apache::lonhomework::results{"resource.$version.0.awarded"}='0';   $Apache::lonhomework::results{"resource.$version.0.awarded"}='0';
  &remove_from_queue($env{'form.queue'});   &remove_from_queue($env{'form.queue'}); 
   
    my ($symb,$courseid,$udom,$uname)=&Apache::lonxml::whichuser();
   
    if ($env{'form.regrade'} ne 'yes') {
       $Apache::lonhomework::results{"resource.$version.0.bridgetask.portfiles"}=
    $Apache::lonhomework::history{"resource.$version.0.bridgetask.portfiles"};
       &Apache::grades::version_portfiles(
          \%Apache::lonhomework::results,
          ["$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';
  $Apache::lonhomework::results{"resource.$version.0.award"}='EXACT_ANS';   $Apache::lonhomework::results{"resource.$version.0.award"}='EXACT_ANS';
  $Apache::lonhomework::results{"resource.$version.0.awarded"}='1';   $Apache::lonhomework::results{"resource.$version.0.awarded"}='1';
  &remove_from_queue($env{'form.queue'});   &remove_from_queue($env{'form.queue'});
   
    my ($symb,$courseid,$udom,$uname)=&Apache::lonxml::whichuser();
    if ($env{'form.regrade'} ne 'yes') {
       $Apache::lonhomework::results{"resource.$version.0.bridgetask.portfiles"}=
    $Apache::lonhomework::history{"resource.$version.0.bridgetask.portfiles"};
       &Apache::grades::version_portfiles(
          \%Apache::lonhomework::results,
          ["$version.0.bridgetask"],$courseid,
          $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"};
     if (defined($Apache::lonhomework::results{"resource.$version.0.awarded"})) {      if (defined($Apache::lonhomework::results{"resource.$version.0.awarded"})) {
  $Apache::lonhomework::results{"resource.0.award"}=   $Apache::lonhomework::results{"resource.0.award"}=
     $Apache::lonhomework::results{"resource.$version.award"};      $Apache::lonhomework::results{"resource.$version.0.award"};
  $Apache::lonhomework::results{"resource.0.awarded"}=   $Apache::lonhomework::results{"resource.0.awarded"}=
     $Apache::lonhomework::results{"resource.$version.awarded"};      $Apache::lonhomework::results{"resource.$version.0.awarded"};
  $Apache::lonhomework::results{"resource.0.solved"}=   $Apache::lonhomework::results{"resource.0.solved"}=
     $Apache::lonhomework::results{"resource.$version.solved"};      $Apache::lonhomework::results{"resource.$version.0.solved"};
     }      }
     &Apache::structuretags::finalize_storage();      &Apache::structuretags::finalize_storage();
  }   }
Line 579  sub end_Task { Line 753  sub end_Task {
   
 sub move_between_queues {  sub move_between_queues {
     my ($src_queue,$dest_queue)=@_;      my ($src_queue,$dest_queue)=@_;
     my $cur_data=&get_queue_data($src_queue);      my $cur_data;
     if (!$cur_data) { return 'not_exist'; }      if ($src_queue ne 'none') {
    $cur_data=&get_queue_data($src_queue);
    if (!$cur_data) { return 'not_exist'; }
       } else {
    $cur_data = ['none'];
       }
     my $result=&add_to_queue($dest_queue,$cur_data->[0]);      my $result=&add_to_queue($dest_queue,$cur_data->[0]);
     if ($result ne 'ok') {      if ($result ne 'ok') {
  return $result;   return $result;
Line 591  sub move_between_queues { Line 770  sub move_between_queues {
   
 sub check_queue_unlock {  sub check_queue_unlock {
     my ($queue,$key,$allow_not_me)=@_;      my ($queue,$key,$allow_not_me)=@_;
       if ($queue eq 'none') { return 'ok'; }
     my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser();      my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser();
     if (!defined($key)) {      if (!defined($key)) {
  $key="$symb\0queue\0$uname\@$udom";   $key="$symb\0queue\0$uname\@$udom";
Line 610  sub check_queue_unlock { Line 790  sub check_queue_unlock {
   
 sub remove_from_queue {  sub remove_from_queue {
     my ($queue)=@_;      my ($queue)=@_;
       if ($queue eq 'none') { return 'ok'; }
     my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser();      my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser();
     my $cnum=$env{'course.'.$cid.'.num'};      my $cnum=$env{'course.'.$cid.'.num'};
     my $cdom=$env{'course.'.$cid.'.domain'};      my $cdom=$env{'course.'.$cid.'.domain'};
Line 642  sub get_queue_data { Line 823  sub get_queue_data {
     return undef;      return undef;
 }  }
   
   sub check_queue_for_key {
       my ($cid,$queue,$todo)=@_;
       my $cnum=$env{'course.'.$cid.'.num'};
       my $cdom=$env{'course.'.$cid.'.domain'};
       my %results=
    &Apache::lonnet::get($queue,[$todo,"$todo\0locked"],$cdom,$cnum);
       
       if (exists($results{$todo}) && ref($results{$todo})) {
    if (defined($results{"$todo\0locked"})) {
       return 'locked';
    }
    return 'enqueued';
       }
       return undef;
   }
   
 sub add_to_queue {  sub add_to_queue {
     my ($queue,$slot_name)=@_;      my ($queue,$slot_name)=@_;
       if ($queue eq 'none') { return 'ok'; }
     my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser();      my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser();
     my $cnum=$env{'course.'.$cid.'.num'};      my $cnum=$env{'course.'.$cid.'.num'};
     my $cdom=$env{'course.'.$cid.'.domain'};      my $cdom=$env{'course.'.$cid.'.domain'};
Line 755  sub get_queue_counts { Line 953  sub get_queue_counts {
     return ($entries,$ready_to_grade,$locks);      return ($entries,$ready_to_grade,$locks);
 }  }
   
   sub encode_queue_key {
       my ($symb,$udom,$uname)=@_;
       return "$symb\0queue\0$uname\@$udom";
   }
   
 sub decode_queue_key {  sub decode_queue_key {
     my ($key)=@_;      my ($key)=@_;
     my ($symb,undef,$user) = split("\0",$key);      my ($symb,undef,$user) = split("\0",$key);
Line 903  sub get_from_queue { Line 1106  sub get_from_queue {
     return $todo;      return $todo;
 }  }
   
   sub select_user {
       my ($symb,$cid)=&Apache::lonxml::whichuser();
       my $result.='<table border="1">';
   
       &Apache::grades::init_perm();
       my ($classlist,$section,$fullname)=&Apache::grades::getclasslist('all',);
       &Apache::grades::reset_perm();
   
       foreach my $student (sort {lc($$fullname{$a}) cmp lc($$fullname{$b}) } keys %$fullname) {
    my ($uname,$udom) = split(/:/,$student);
    my %status = &get_student_status($symb,$cid,$udom,$uname);
    my $queue = 'none';
    if ($status{'reviewqueue'} eq 'enqueued') {
       $queue = 'reviewqueue';
    } elsif ($status{'gradingqueue'} eq 'enqueued') {
       $queue = 'gradingqueue';
    }
    my $todo = 
       &Apache::lonnet::escape(&encode_queue_key($symb,$udom,$uname));
    $result.=<<RESULT;
   <tr>
     <td>
       <form method="POST">
         <input type="hidden" name="gradingkey" value="$todo" />
         <input type="hidden" name="queue" value="$queue" />
         <input type="hidden" name="webgrade" value="no" />
         <input type="hidden" name="regrade" value="yes" />
        <input type="submit" name="submit" value="Regrade" />
       </form>
     <td>$fullname->{$student}</td>
     <td>
   RESULT
   
           if ($status{'status'} eq 'pass') {
       $result .= '<font color="green">'.&mt('Passed').'</font>';
    } elsif ($status{'status'} eq 'fail') {
       $result .= '<font color="red">'.&mt('Failed').'</font>';
    } elsif ($status{'status'} eq 'review') {
       $result .= '<font color="blue">'.&mt('Under Review').'</font>';
    } elsif ($status{'status'} eq 'ungraded') {
       $result .= &mt('Ungraded');
    } elsif ($status{'status'} ne '') {
       $result .= '<font color="orange">'.&mt('Unknown Status').'</font>';
    } else {
       $result.="&nbsp;";
    }
    if ($status{'version'}) {
       $result .= ' '.&mt('Version').' '.$status{'version'};
    }
    $result.= '</td><td>';
    if ($status{'reviewqueue'} eq 'enqueued') {
       $result .= &mt('Awaiting Review');
    } elsif ($status{'reviewqueue'} eq 'locked') {
       $result .= &mt('Under Review');
    } elsif ($status{'gradingqueue'} eq 'enqueued') {
       $result .= &mt('Awaiting Grading');
    } elsif ($status{'gradingqueue'} eq 'locked') {
       $result .= &mt('Being Graded');
    } else {
       $result.="&nbsp;";
    }
    $result.= '</td></tr>';
       }
       $result.='</table>';
       return $result;
   }
   
   sub get_student_status {
       my ($symb,$cid,$udom,$uname)=@_;
       my %record = &Apache::lonnet::restore($symb,$env{'request.course.id'},
     $udom,$uname);
       my %status;
       $status{'status'}=$record{'resource.status'};
       $status{'version'}=$record{'resource.version'};
       $status{'grader'}=$record{'resource.grader'};
       $status{'reviewqueue'}=&check_queue_for_key($cid,'reviewqueue',
          &encode_queue_key($symb,$udom,$uname));
       $status{'gradingqueue'}=&check_queue_for_key($cid,'gradingqueue',
          &encode_queue_key($symb,$udom,$uname));
       return %status;
   }
   
 sub start_ClosingParagraph {  sub start_ClosingParagraph {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $result;      my $result;
Line 940  sub start_Dimension { Line 1225  sub start_Dimension {
     undef(@Apache::bridgetask::instance);      undef(@Apache::bridgetask::instance);
     $Apache::bridgetask::dimensionmandatory{$dim_id}=      $Apache::bridgetask::dimensionmandatory{$dim_id}=
  &Apache::lonxml::get_param('Mandatory',$parstack,$safeeval);   &Apache::lonxml::get_param('Mandatory',$parstack,$safeeval);
     return '';      &Apache::lonxml::startredirection();
       return &internal_location($dim_id);
 }  }
   
 sub get_instance {  sub get_instance {
Line 956  sub get_instance { Line 1242  sub get_instance {
     my $last_link;      my $last_link;
     sub end_Dimension {      sub end_Dimension {
  my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
  my $result;   my $result=&Apache::lonxml::endredirection();
  my $dim=&get_id($parstack,$safeeval);   my $dim=&get_id($parstack,$safeeval);
  my $instance=&get_instance();   my $instance=&get_instance();
  my $version=&get_version();   my $version=&get_version();
  if ($target eq 'web') {   if ($target eq 'web') {
     $result=$dimension{'intro'}.$dimension{$instance.'.text'};      @Apache::scripttag::parser_env = @_;
       $result.=&Apache::scripttag::xmlparse($dimension{'intro'});
       @Apache::scripttag::parser_env = @_;
       $result.=&Apache::scripttag::xmlparse($dimension{$instance.'.text'});
     if ($Apache::lonhomework::history{"resource.$version.status"} eq 'pass' ||      if ($Apache::lonhomework::history{"resource.$version.status"} eq 'pass' ||
  $Apache::lonhomework::history{"resource.$version.status"} eq 'fail') {   $Apache::lonhomework::history{"resource.$version.status"} eq 'fail') {
   
    my $dim_status=$Apache::lonhomework::history{"resource.$version.$dim.status"};
    my $mandatory='Mandatory';
    if ($Apache::bridgetask::dimensionmandatory{$dim} eq 'N') {
       $mandatory='Optional';
    }
    my $dim_info="<div class='$dim_status'>\n";
    if ($dim_status eq 'pass') {
       $dim_info.='<h3>Question : you passed this '.$mandatory.' question</h3>';
    }
    if ($dim_status eq 'fail') {
       $dim_info.='<h3>Question : you did not pass this '.$mandatory.' question</h3>';
    }
    my $man_count=0;
    my $opt_count=0;
    my $opt_passed=0;
    foreach my $id (@{$dimension{$instance.'.criterias'}}) {
       if ($dimension{$instance.'.criteria.'.$id.'.mandatory'} 
    eq 'N') {
    $opt_count++;
    if ($Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.status"} eq 'pass') {
       $opt_passed++;
    }
       } else {
    $man_count++;
       }
    }
    my $opt_req=&Apache::lonxml::get_param('OptionalRequired',
          $parstack,$safeeval);
    if ($opt_req !~ /\S/) { $opt_req='0'; }
    $dim_info.="\n<p>".&mt('You passed all of the mandatory components and [_1] of the [_2] optional components, of which you were required to pass [_3].',$opt_passed,$opt_count,$opt_req)."</p>\n</div>";
   
    my $internal_location=&internal_location($dim);
    $result=~s/\Q$internal_location\E/$dim_info/;
   
  foreach my $id (@{$dimension{$instance.'.criterias'}}) {   foreach my $id (@{$dimension{$instance.'.criterias'}}) {
     my $status=$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.status"};      my $status=$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.status"};
     my $comment=$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"};      my $comment=$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"};
     $result.='<table border="1"><tr><td>';      my $mandatory=($dimension{$instance.'.criteria.'.$id.'.mandatory'} ne 'N');
       if ($mandatory) {
    $mandatory='Mandatory';
       } else {
    $mandatory='Optional';
       }
     if ($status eq 'fail') {      if ($status eq 'fail') {
  $result.='<font color="red">'.&mt('Did not pass').'</font>';  
     } elsif ($status eq 'pass') {      } elsif ($status eq 'pass') {
  $result.='<font color="green">'.&mt('Passed').'</font>';  
     } else {      } else {
  &Apache::lonxml::error("Student viewing a graded bridgetask was show a status of $status");   &Apache::lonxml::error("Student viewing a graded bridgetask was shown a status of $status");
     }      }
     $result.='</td></tr><tr><td>';      my $status_display=$status;
       $status_display=~s/^([a-z])/uc($1)/e;
       @Apache::scripttag::parser_env = @_;
       $result.='<div class="'.$status.'"><h4>'.$mandatory.
    ' Criteria</h4><p>';
       @Apache::scripttag::parser_env = @_;
       $result.=&Apache::scripttag::xmlparse($dimension{$instance.'.criteria.'.$id});
       $result.='</p><p class="grade">'.$status_display.'</p>';
     if ($Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"}) {      if ($Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"}) {
  $result.=&mt('Comment from grader: ').$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"}.'</td></tr><tr><td>';   $result.='<p class="comment">'.$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"}.'</p>';
     }      }
     $result.=$dimension{$instance.'.criteria.'.$id}.      $result.='</div>';
  '</td></tr></table>';  
  }   }
     }      }
  } elsif ($target eq 'webgrade') {   } elsif ($target eq 'webgrade') {
       # in case of any side effects that we need
       @Apache::scripttag::parser_env = @_;
       &Apache::scripttag::xmlparse($dimension{'intro'});
       @Apache::scripttag::parser_env = @_;
       &Apache::scripttag::xmlparse($dimension{$instance.'.text'});
     foreach my $id (@{$dimension{$instance.'.criterias'}}) {      foreach my $id (@{$dimension{$instance.'.criterias'}}) {
  my $link='criteria_'.$instance.'_'.$id;   my $link='criteria_'.$instance.'_'.$id;
  my $status=$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.status"};   my $status=$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.status"};
  $result.='<tr><td width="100%" valign="top">'.   $result.='<tr><td width="100%" valign="top">'.
     '<a name="'.$link.'" />'.      '<a name="'.$link.'" />'.
     '<a name="next_'.$last_link.'" />'.      '<a name="next_'.$last_link.'" />'.
     '<br /><textarea enabled="false" style="width:100%" rows="8" width="25" wrap="hard">'.$dimension{$instance.'.criteria.'.$id}.'</textarea>'.      '<br /><textarea enabled="false" style="width:100%" rows="8" width="25" wrap="hard">';
    @Apache::scripttag::parser_env = @_;
    $result.=&Apache::scripttag::xmlparse($dimension{$instance.'.criteria.'.$id});
    $result.='</textarea>'.
     #$dimension{$instance.'.criteria.'.$id}.      #$dimension{$instance.'.criteria.'.$id}.
     '</td>'.      '</td>'.
     '<td><nobr>Additional Comment for Student</nobr> <br />'.      '<td><nobr>Additional Comment for Student</nobr> <br />'.
     '<textarea style="width:100%" rows="8" width="25" wrap="hard" name="HWVAL_comment_'.$link.'">'.&HTML::Entities::encode($Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"}).'</textarea>'.      '<textarea style="width:100%" rows="8" width="25" wrap="hard" name="HWVAL_comment_'.$link.'">'.&HTML::Entities::encode($Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"}).'</textarea>'.
     '</td>'.      '</td>'.
     '<td>'.      '<td>'.
     '<nobr><label><input type="radio" name="HWVAL_'.$link.'" value="ungraded" '.($status eq 'ungraded' || !$status ? 'checked="checked"':'').'/>'.&mt('Ungraded').'</label></nobr><br />'.      '<nobr><label><input type="radio" name="HWVAL_'.$link.'" value="ungraded" '.($status eq 'ungraded' || !$status ? 'checked="checked"':'').' />'.&mt('Ungraded').'</label></nobr><br />'.
     '<label><input type="radio" name="HWVAL_'.$link.'" value="pass" '.($status eq 'pass' ? 'checked="checked"':'').' />'.&mt('Pass').'</label><br />'.      '<label><input type="radio" name="HWVAL_'.$link.'" value="pass" '.($status eq 'pass' ? 'checked="checked"':'').' />'.&mt('Pass').'</label><br />'.
     '<label><input type="radio" name="HWVAL_'.$link.'" value="fail" '.($status eq 'fail' ? 'checked="checked"':'').' />'.&mt('Fail').'</label><br />'.      '<label><input type="radio" name="HWVAL_'.$link.'" value="fail" '.($status eq 'fail' ? 'checked="checked"':'').' />'.&mt('Fail').'</label><br />'.
     '<label><input type="radio" name="HWVAL_'.$link.'" value="review" '.($status eq 'review' ? 'checked="checked"':'').' />'.&mt('Review').'</label><br />'.      '<label><input type="radio" name="HWVAL_'.$link.'" value="review" '.($status eq 'review' ? 'checked="checked"':'').' />'.&mt('Review').'</label><br />'.
Line 1012  sub get_instance { Line 1353  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.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.='<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.
  '</a>';   '</a></nobr> ';
  }   }
  $result.='</td></tr>';   $result.='</td></tr>';
  $last_link=$link;   $last_link=$link;
Line 1041  sub get_instance { Line 1383  sub get_instance {
  } elsif ($status eq 'ungraded') {   } elsif ($status eq 'ungraded') {
     $ungraded++;      $ungraded++;
  } else {   } else {
     &Apache::lonxml::error("got weird status --$status--");      $ungraded++;
  }   }
     }      }
     if ($optional_passed < $dimension{$instance.'.optionalrequired'}) {      if ($optional_passed < $dimension{$instance.'.optionalrequired'}) {
Line 1070  sub start_IntroParagraph { Line 1412  sub start_IntroParagraph {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $result;      my $result;
     if ($target eq 'web' || $target eq 'webgrade') {      if ($target eq 'web' || $target eq 'webgrade') {
  if ($tagstack->[-2] eq 'Dimension' || $target eq 'webgrade') {   if ($tagstack->[-2] eq 'Dimension') {
     &Apache::lonxml::startredirection();      $dimension{'intro'}=&Apache::lonxml::get_all_text('/introparagraph',$parser);
   
    } elsif ($target eq 'webgrade') {
       &Apache::lonxml::get_all_text('/introparagraph',$parser);
  }   }
   
     }      }
     return $result;      return $result;
 }  }
   
 sub end_IntroParagraph {  sub end_IntroParagraph {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;  
     my $result;  
     if ($target eq 'web' || $target eq 'webgrade') {  
  if ($tagstack->[-2] eq 'Dimension' || $target eq 'webgrade') {  
     $dimension{'intro'}=&Apache::lonxml::endredirection();  
  }  
     }  
     return $result;  
 }  }
   
 sub start_Instance {  sub start_Instance {
Line 1100  sub start_Instance { Line 1438  sub start_Instance {
 }  }
   
 sub end_Instance {  sub end_Instance {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;  
     return '';  
 }  }
   
 sub start_InstanceText {  sub start_InstanceText {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
       my $instance_id=$Apache::bridgetask::instance[-1];
       my $text=&Apache::lonxml::get_all_text('/instancetext',$parser);
     if ($target eq 'web' || $target eq 'webgrade') {      if ($target eq 'web' || $target eq 'webgrade') {
  &Apache::lonxml::startredirection();   $dimension{$instance_id.'.text'}=$text;
     }      }
     return '';      return '';
 }  }
   
 sub end_InstanceText {  sub end_InstanceText {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;  
     my $instance_id=$Apache::bridgetask::instance[-1];  
     if ($target eq 'web' || $target eq 'webgrade') {  
  $dimension{$instance_id.'.text'}=&Apache::lonxml::endredirection();  
     }  
     return '';      return '';
 }  }
   
 sub start_Criteria {  sub start_Criteria {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     if ($target eq 'web' || $target eq 'webgrade' || $target eq 'grade') {  
  &Apache::lonxml::startredirection();  
     }  
     return '';  
 }  
   
 sub end_Criteria {  
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;  
     my $instance_id=$Apache::bridgetask::instance[-1];      my $instance_id=$Apache::bridgetask::instance[-1];
       my $criteria=&Apache::lonxml::get_all_text('/criteria',$parser);
     if ($target eq 'web' || $target eq 'webgrade' || $target eq 'grade') {      if ($target eq 'web' || $target eq 'webgrade' || $target eq 'grade') {
  my $criteria=&Apache::lonxml::endredirection();  
  my $id=&get_id($parstack,$safeeval);   my $id=&get_id($parstack,$safeeval);
  $dimension{$instance_id.'.criteria.'.$id}=$criteria;   $dimension{$instance_id.'.criteria.'.$id}=$criteria;
  $dimension{$instance_id.'.criteria.'.$id.'.mandatory'}=   $dimension{$instance_id.'.criteria.'.$id.'.mandatory'}=
Line 1143  sub end_Criteria { Line 1468  sub end_Criteria {
     return '';      return '';
 }  }
   
   sub end_Criteria {
   }
   
 sub proctor_validation_screen {  sub proctor_validation_screen {
     my ($slot) = @_;      my ($slot) = @_;
     my (undef,undef,$domain,$user) = &Apache::lonxml::whichuser();      my (undef,undef,$domain,$user) = &Apache::lonxml::whichuser();
     my $url=&Apache::lonnet::studentphoto($domain,$user,'jpg');      my $url=&Apache::lonnet::studentphoto($domain,$user,'jpg');
     $user=$env{'form.proctorname'};      my $name=&Apache::loncommon::plainname($user,$domain);
     if ($env{'form.proctordomain'}) { $domain=$env{'form.proctordomain'}; }      
     my $msg;      my $msg;
     if ($env{'form.proctorpassword'}) {      if ($env{'form.proctorpassword'}) {
  $msg='<p><font color="red">'.&mt("Failed to authenticate the proctor.")   $msg='<p><font color="red">'.&mt("Failed to authenticate the proctor.")
     .'</font></p>';      .'</font></p>';
     }      }
       if (!$env{'form.proctordomain'}) { $env{'form.proctordomain'}=$domain; }
     my $result= (<<ENDCHECKOUT);      my $result= (<<ENDCHECKOUT);
 <h2>Proctor Validation</h2>  <h2>Proctor Validation</h2>
     <p>Your room's proctor needs to validate your access to this resource.</p>      <p>Your room's proctor needs to validate your access to this resource.</p>
Line 1162  sub proctor_validation_screen { Line 1491  sub proctor_validation_screen {
 <input type="hidden" name="validate" value="yes" />  <input type="hidden" name="validate" value="yes" />
 <input type="hidden" name="submitted" value="yes" />  <input type="hidden" name="submitted" value="yes" />
 <table>  <table>
   <tr><td>Proctor's Username:</td><td><input type="string" name="proctorname" value="$user" /></td></tr>    <tr><td>Proctor's Username:</td><td><input type="string" name="proctorname" value="$env{'form.proctorname'}" /></td></tr>
   <tr><td>Password:</td><td><input type="password" name="proctorpassword" value="" /></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="$domain" /></td></tr>    <tr><td>Proctor's Domain:</td><td><input type="string" name="proctordomain" value="$env{'form.proctordomain'}" /></td></tr>
 </table>  </table>
 <input type="submit" name="checkoutbutton" value="Validate"  /><br />  <input type="submit" name="checkoutbutton" value="Validate"  /><br />
 Student who should be logged in is:<br />  <table border="1">
 <img src="$url" /><br />    <tr><td>
       <table>
         <tr><td colspan="2">Student who should be logged in is:</td></tr>
         <tr><td>Name:</td><td>$name</td></tr>
         <tr><td>Student ID:</td><td>$env{'environment.id'}</td></tr>
         <tr><td>Usename</td><td>$user\@$domain</td></tr>
         <tr><td colspan="2"><img src="$url" /></td></tr>
       </table>
     </tr></td>
   </table>
 </form>  </form>
 ENDCHECKOUT  ENDCHECKOUT
     return $result;      return $result;
Removed from v.1.37  
changed lines
  Added in v.1.55

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