Diff for /loncom/homework/bridgetask.pm between versions 1.32 and 1.150

version 1.32, 2005/05/27 17:08:03 version 1.150, 2006/05/12 06:55:46
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 59  sub initialize_bridgetask { Line 60  sub initialize_bridgetask {
 }  }
   
 sub proctor_check_auth {  sub proctor_check_auth {
     my ($slot_name,$slot)=@_;      my ($slot_name,$slot,$type)=@_;
     my $user=$env{'form.proctorname'};      my $user=$env{'form.proctorname'};
     my $domain=$env{'form.proctordomain'};      my $domain=$env{'form.proctordomain'};
           
     my @allowed=split(",",$slot->{'proctor'});      my @allowed=split(",",$slot->{'proctor'});
     foreach my $possible (@allowed) {      foreach my $possible (@allowed) {
  my ($puser,$pdom)=(split('@',$possible));   my ($puser,$pdom)=(split(':',$possible));
  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 $authenticated=0;
     if ($authhost ne 'no_host') {      if ( $slot->{'secret'} =~ /\S/ &&
  my $version=   $env{'form.proctorpassword'} eq $slot->{'secret'} ) {
     $Apache::lonhomework::results{'resource.version'}=   $authenticated=1;
     ++$Apache::lonhomework::history{'resource.version'};      } else {
  $Apache::lonhomework::results{"resource.$version.checkedin"}=  
     $user.'@'.$domain;   my $authhost=&Apache::lonnet::authenticate($puser,$env{'form.proctorpassword'},$pdom);
  $Apache::lonhomework::results{"resource.$version.checkedin.slot"}=   if ($authhost ne 'no_host') {
     $slot_name;      $authenticated=1;
  foreach my $key (keys(%Apache::lonhomework::history)) {  
     if ($key=~/^resource\.0\./) {  
  $Apache::lonhomework::results{$key}='';  
     }  
  }   }
       }
       if ($authenticated) {
    &create_new_version($type,$user,$domain,$slot_name);
  return 1;   return 1;
     }      }
  }   }
Line 88  sub proctor_check_auth { Line 88  sub proctor_check_auth {
     return 0;      return 0;
 }  }
   
   sub create_new_version {
       my ($type,$user,$domain,$slot_name) = @_;
       if ($type eq 'Task') {
    # increment version
    my $version=
       $Apache::lonhomework::history{'resource.0.version'};
    $version++;
   
    #clean out all current results
    foreach my $key (keys(%Apache::lonhomework::history)) {
       if ($key=~/^resource\.0\./) {
    $Apache::lonhomework::results{$key}='';
       }
    }
   
    #setup new version and who did it
    $Apache::lonhomework::results{'resource.0.version'}=$version;
    if (defined($user) && defined($domain)) {
       $Apache::lonhomework::results{"resource.$version.0.checkedin"}=
    $user.':'.$domain;
    }
    if (defined($slot_name)) {
       $Apache::lonhomework::results{"resource.$version.0.checkedin.slot"}=
    $slot_name;
    }
       } elsif ($type eq 'problem') {
    &Apache::lonxml::debug("authed $slot_name");
    if (defined($user) && defined($domain)) {
       $Apache::lonhomework::results{"resource.0.checkedin"}=
    $user.':'.$domain;
    }
    if (defined($slot_name)) {
       $Apache::lonhomework::results{"resource.0.checkedin.slot"}=
    $slot_name;
    }
       }
   }
   
 sub get_version {  sub get_version {
     my ($version,$previous);      my ($version,$previous);
     if ($env{'form.previousversion'} &&       if ($env{'form.previousversion'} && 
  defined($Apache::lonhomework::history{'resource.'.$env{'form.previousversion'}.'.status'})) {   $env{'form.previousversion'} ne 'current' &&
    defined($Apache::lonhomework::history{'resource.'.$env{'form.previousversion'}.'.0.status'})) {
  $version=$env{'form.previousversion'};   $version=$env{'form.previousversion'};
  $previous=1;   $previous=1;
     } else {      } else {
  $version=$Apache::lonhomework::history{'resource.version'};   if (defined($Apache::lonhomework::results{'resource.0.version'})) {
       $version=$Apache::lonhomework::results{'resource.0.version'};
    } elsif (defined($Apache::lonhomework::history{'resource.0.version'})) {
       $version=$Apache::lonhomework::history{'resource.0.version'};
    }
  $previous=0;   $previous=0;
     }      }
     if (wantarray) {      if (wantarray) {
Line 107  sub get_version { Line 150  sub get_version {
 sub add_previous_version_button {  sub add_previous_version_button {
     my ($status)=@_;      my ($status)=@_;
     my $result;      my $result;
     if ($Apache::lonhomework::history{'resource.version'} eq '') {      if ($Apache::lonhomework::history{'resource.0.version'} eq '') {
  return '';   return '';
     }      }
     if ($Apache::lonhomework::history{'resource.version'} < 2 &&      if ($Apache::lonhomework::history{'resource.0.version'} < 2 &&
  $status ne 'NEEDS_CHECKIN') {   $status ne 'NEEDS_CHECKIN') {
  return '';   return '';
     }      }
Line 121  sub add_previous_version_button { Line 164  sub add_previous_version_button {
     "</h3>\n";      "</h3>\n";
     }      }
     my @to_show;      my @to_show;
     foreach my $test_version (1..$Apache::lonhomework::history{'resource.version'}) {      foreach my $test_version (1..$Apache::lonhomework::history{'resource.0.version'}) {
  if (defined($Apache::lonhomework::history{'resource.'.$test_version.'.status'})) {   if (defined($Apache::lonhomework::history{'resource.'.$test_version.'.0.status'})) {
     push(@to_show,$test_version);      push(@to_show,$test_version);
  }   }
     }      }
     my $list='<option>'.      my $list='<option>'.
  join("</option>\n<option>",@to_show).   join("</option>\n<option>",@to_show).
      "</option>\n";       "</option>\n";
     $result.='<form name="getprevious" method="POST" action="';      $list.='<option value="current">'.&mt('Current').'</option>';
       $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); }
     $result.=$uri.'">'.      $result.=$uri.'">'.
Line 141  sub add_previous_version_button { Line 185  sub add_previous_version_button {
 }  }
   
 sub add_grading_button {  sub add_grading_button {
       my (undef,$cid)=&Apache::lonxml::whichuser();
       my $cnum=$env{'course.'.$cid.'.num'};
       my $cdom=$env{'course.'.$cid.'.domain'};
       my %sections = &Apache::loncommon::get_sections($cdom,$cnum);
   
       my $size=5;
       if (scalar(keys(%sections)) < 3) {
    $size=scalar(keys(%sections))+2;
       }
       my $sec_select = '<select multiple="multiple" name="chosensections" size="'.$size.'">'."\n";
       $sec_select .= "<option value='all' selected='selected'>all</option>\n";
       foreach my $sec (sort {lc($a) cmp lc($b)} (keys(%sections))) {
    $sec_select .= "<option value=\"$sec\">$sec</option>\n";
       }
       $sec_select .= "<option value='none'>none</option></select>\n";
       
     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');
  #check if review queue has items   $result.='<table><tr>';
  $result.=' <input type="submit" name="reviewasubmission" value="'.   $result.='<td rowspan="4">Specify a section: </td><td rowspan="4">'.$sec_select.'</td>';
     &mt("Select an entry from the review queue").'" />';   $result.='<td>'.' <input type="submit" name="reviewagrading" value="'.
       &mt("Select an entry from the grading queue:").'" /> ';
   
    $result.= &mt("[_1] entries, [_2] ready, [_3] being graded",$entries,$ready,$locks).' </td></tr>'."\n";
   
    ($entries,$ready,$locks)=&get_queue_counts('reviewqueue');
    $result.='<tr><td>'.
       ' <input type="submit" name="reviewasubmission" value="'.
       &mt("Select an entry from the review queue:").'" /> ';
    $result.=&mt("[_1] entries, [_2] ready, [_3] being graded",
        $entries,$ready,$locks).'</td></tr>'."\n";
    $result.='<tr><td> <input type="submit" name="regradeasubmission" value="'.
       &mt("List of user's grade status").'" /> </td></tr></table>'."\n";
    $result.='<p> <input type="submit" name="regradeaspecificsubmission" value="'.
       &mt("Regrade specific user:").'" />'."\n";
    $result.='<input type="text" size="12" name="gradinguser" />';
    $result.=&Apache::loncommon::select_dom_form($env{'user.domain'},
        'gradingdomain');
    $result.=' '.
       &Apache::loncommon::selectstudent_link('gradesubmission',
      'gradinguser',
      'gradingdomain');
    $result.=&Apache::loncommon::studentbrowser_javascript();
    $result.= '</p>';
     }      }
     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;
     $result.=' <input type="submit" name="requestattempt" value="'.      my $symb=&Apache::lonnet::symbread();
  &mt("Request another attempt").'" />';      # not a slot access based resource
       my $useslots = &Apache::lonnet::EXT("resource.0.useslots",$symb);
       if ($useslots =~ /^\s*no\s*$/i) {
    return '';
       }
   
       my ($slot_name,$slot)=&Apache::slotrequest::check_for_reservation($symb);
       my $action='get_reservation';
       if ($slot_name) {
    $text="Change reservation.";
    $action='change_reservation';
    my $description=&Apache::slotrequest::get_description($slot_name,
         $slot);
    $result.=(<<STUFF);
   <p> Will be next available: $description </p>
   STUFF
       }
       
       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 172  sub preserve_grade_info { Line 282  sub preserve_grade_info {
     return $result;      return $result;
 }  }
   
   sub style {
       my ($target) = @_;
       if ($target eq 'web'
    || $target eq 'webgrade') {
    return (<<STYLE);
   <link rel="stylesheet" type="text/css" href="/res/adm/includes/task.css" />
   STYLE
       }
       return;
   }
   
   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') ||
          ( &get_version() eq ''))) {
    return 0;
       }
       if ($env{'form.donescreen'}) { return 0; }
       return 1;
   }
   
   sub internal_location {
       my ($id)=@_;
       return '<!-- LONCAPA_INTERNAL_ADD_TASK_STATUS'.$id.' -->';
   }
   
   sub submission_time_stamp {
       my ($symb,$courseid,$udom,$uname)=&Apache::lonxml::whichuser();
       my $submissiontime;
       my $version=$Apache::lonhomework::history{'resource.0.version'};
       for (my $v=$Apache::lonhomework::history{'version'};$v>0;$v--) {
    if (defined($Apache::lonhomework::history{$v.':resource.'.$version.'.0.bridgetask.portfiles'})) {
       $submissiontime=$Apache::lonhomework::history{$v.':timestamp'};
    }
       }
       my $result;
       if ($submissiontime) {
    my $slot_name=$Apache::lonhomework::history{'resource.'.$version.'.0.checkedin.slot'};
    my %slot=&Apache::lonnet::get_slot($slot_name);
    my $diff = $slot{'endtime'} - $submissiontime;
    my ($color,$when)=('#FF6666','after');
    if ($diff > 0) { ($color,$when)=('#336600','before'); }
    my $info;
    if ($diff%60) { $info=($diff%60).' seconds'; }
    $diff=int($diff/60);
    if ($diff%60) { $info=($diff%60).' minutes '.$info; }
    $diff=int($diff/60);
    if ($diff) {    $info=$diff.' hours '.$info; }
    $result='<p><font color="'.$color.'">'.
       &mt('Student submitted [_1] [_2] the deadline. 
                    (Submission was at [_3], end of period was [_4].)',
    $info,$when,scalar(localtime($submissiontime)),
    scalar(localtime($slot{'endtime'}))).
    '</font></p>';
       }
       return $result;
   }
   
   sub file_list {
       my ($files,$uname,$udom) = @_;
       if (!defined($uname) || !defined($udom)) {
    (undef,undef,$udom,$uname) = &Apache::lonxml::whichuser();
       }
       my $file_url = '/uploaded/'.$udom.'/'.$uname.'/portfolio/';
   
       my $file_list="<ul class=\"LC_GRADING_handininfo\">\n";
       foreach my $partial_file (split(',',$files)) {
    my $file=$file_url.$partial_file;
    $file=~s|/+|/|g;
    &Apache::lonnet::allowuploaded('/adm/bridgetask',$file);
    $file_list.='<li><nobr><a href="'.$file.'?rawmode=1" target="lonGRDs"><img src="'.
       &Apache::loncommon::icon($file).'" border="0"> '.$file.
       '</a></nobr></li>'."\n";
       }
       $file_list.="</ul>\n";
       return $file_list;
   }
   
   sub webgrade_standard_info {
       my ($version)=&get_version();
   
       my $file_list = &file_list($Apache::lonhomework::history{"resource.$version.0.bridgetask.portfiles"});
   
       my %lt=&Apache::lonlocal::texthash('done' => 'Next Item',
          'stop' => 'Quit Grading',
          'fail' => 'Fail Rest',
          );
          
       my $result=<<INFO;
     <div class="LC_GRADING_maincontrols">
       <input type="submit" name="next" value="$lt{'done'}" />
       <input type="submit" name="stop" value="$lt{'stop'}" />
       <input type="button" name="fail" value="$lt{'fail'}" 
              onclick="javascript:onFailRest()" />
     </div>
     $file_list
   INFO
       return $result;
   }
   
 sub start_Task {  sub start_Task {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   
     my ($status,$accessmsg,$slot);      my ($status,$accessmsg,$slot);
     if ($target ne 'webgrade') {      if ($target ne 'webgrade') {
    &Apache::structuretags::init_problem_globals('Task');
  &Apache::structuretags::initialize_storage();   &Apache::structuretags::initialize_storage();
  &Apache::lonhomework::showhash(%Apache::lonhomework::history);   &Apache::lonhomework::showhash(%Apache::lonhomework::history);
    if ($env{'request.state'} eq 'construct') {
       &Apache::structuretags::setup_rndseed($safeeval);
    }
     }       } 
   
     $Apache::lonhomework::parsing_a_task=1;      $Apache::lonhomework::parsing_a_task=1;
     #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 $name;
  &Apache::structuretags::page_start($target,$token,$tagstack,$parstack,$parser,$safeeval);      if ($target eq 'web' || $target eq 'webgrade') {
        $name = &Apache::structuretags::get_resource_name($parstack,$safeeval);
     if ($target eq 'web') {      }
  if ($Apache::lonhomework::modifygrades) {  
     $body_tag_start.='<form name="gradesubmission" method="POST" action="';      my ($result,$form_tag_start);
       if ($target eq 'web' || $target eq 'webgrade' || $target eq 'tex'
    || $target eq 'edit') {
    ($result,$form_tag_start) =
       &Apache::structuretags::page_start($target,$token,$tagstack,
          $parstack,$parser,$safeeval,
          $name,&style($target));
    $result .= '<div class="LC_task">'."\n";
       }
   
       if ($target eq 'web' && $env{'request.state'} ne 'construct') {
    if ($Apache::lonhomework::queuegrade
       || $Apache::lonhomework::modifygrades) {
       $result.='<form name="gradesubmission" 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); }
     $body_tag_start.=$uri.'">'.&add_grading_button()."</form>";      $result.=$uri.'">'.&add_grading_button()."</form>";
       my $symb=&Apache::lonnet::symbread();
       if (&Apache::lonnet::allowed('mgq',$env{'request.course.id'})) {
    $result.='<form method="post" name="slotrequest" 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>';
    my $target_id = 
       &Apache::lonstathelpers::make_target_id({symb => $symb,
        part => '0'});
    $result.='<form method="post" name="gradingstatus" action="/adm/statistics">'.
       '<input type="hidden" name="problemchoice" value="'.$target_id.'" />'.
       '<input type="hidden" name="reportSelected" value="grading_analysis" />'.
       '<input type="submit" name="grading" value="'.
       &mt('Show Grading Status').'" />'.
       '</form>';
       }
  }   }
     }      }
       if ($target eq 'web' && $env{'request.state'} eq 'construct') {
    $form_tag_start.=&Apache::structuretags::problem_web_to_edit_header($env{'form.rndseed'});
       }
     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' ||
  $target eq 'tex') {   $target eq 'tex') {
  my ($version,$previous)=&get_version();   my ($version,$previous)=&get_version();
  ($status,$accessmsg,my $slot_name,$slot) =    ($status,$accessmsg,my $slot_name,$slot) = 
     &Apache::lonhomework::check_task_access('0');      &Apache::lonhomework::check_slot_access('0','Task');
    if ($status eq 'CAN_ANSWER' && $version eq '' && $slot_name eq '') {
       &create_new_version('Task');
       ($version,$previous)=&get_version();
    }
   
  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.$version.solved"}.'";';   $expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.$version.0.solved"}.'";';
  &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);   $result.=&add_previous_version_button($status);
  if (!$previous && (   if (!&show_task($status,$previous)) {
    ( $status eq 'CLOSED' ) ||      my $bodytext=&Apache::lonxml::get_all_text("/task",$parser,$style);
    ( $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);  
     if ( $target eq "web" ) {      if ( $target eq "web" ) {
  $result.= $head_tag_start.'</head>'.$body_tag_start;   if ($env{'request.state'} eq 'construct') {
       $result.=$form_tag_start;
    }
  my $msg;   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>';
       $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);
  } elsif ($status eq 'WAITING_FOR_GRADE') {   } elsif ($status eq 'WAITING_FOR_GRADE') {
     $msg.='<h1>'.&mt('Your submission is in the grading queue.').'</h1>';      $msg.='<h1>'.&mt('Your submission is in the grading queue.').'</h1>';
    } elsif ($env{'form.donescreen'}) {
       my $title=&Apache::lonnet::gettitle();
       my @files=split(',',$Apache::lonhomework::history{'resource.'.$version.'.0.bridgetask.portfiles'});
       my (undef,undef,$domain,$user)=
    &Apache::lonxml::whichuser();
       my $files = '<ul>';
       foreach my $file (@files) {
    my $url="/uploaded/$domain/$user/portfolio$file";
    if (! &Apache::lonnet::stat_file($url)) {
       $file = &mt('<font color="red"> Nonexistant file:</font> <tt>[_1]</tt>',$file);
    } else {
       $file = '<tt>'.$file.'</tt>';
    }
    $files .= '<li>'.$file.'</li>';
       }
       $files.='</ul>';
   
       $result.=<<DONESCREEN;
   <h2>$title</h2>
   <p> Files submitted: $files </p>
   <p> You are now done with this Bridge Task </p>
   <hr />
   <p> <a href="/adm/logout">Logout</a> </p>
   <p> <a href="/adm/roles">Change to a different course</a> </p>
   DONESCREEN
  } 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 243  sub start_Task { Line 524  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)) {      if(&proctor_check_auth($slot_name,$slot,'Task')
  #FIXME immeadiatly add this to the grading queue         && defined($Apache::inputtags::slot_name)) {
                         #      with slot->{'endtime'} for when grading can    my $result=
                         #      begin on this resource      &add_to_queue('gradingqueue',
  # FIXME I think the above is done by default,    {'type' => 'task',
                         #        need to check that     'time' => time,
                         #        failure doesn't do this.     'slot' => 
      }         $Apache::inputtags::slot_name});
    &Apache::lonxml::debug("add_to_queue said $result");
       }
  }   }
     }      }
  } elsif ($target eq 'web') {   } elsif ($target eq 'web') {
     my $name= &Apache::structuretags::get_resource_name($parstack,$safeeval);  
     $result.="$head_tag_start<title>$name</title></head>  
               $body_tag_start \n $form_tag_start".  
       '<input type="hidden" name="submitted" value="yes" />';  
     $result.=&preserve_grade_info();      $result.=&preserve_grade_info();
     my ($version,$previous)=&get_version();      $result.=&internal_location();
     if ($Apache::lonhomework::history{"resource.$version.status"} eq 'fail') {      $result.=$form_tag_start.
  $result.='<h1><font color="red">'.&mt('Did not pass').'</font></h1>';   '<input type="hidden" name="submitted" value="yes" />';
  if (!$previous) {      &Apache::lonxml::startredirection();
     $result.=&add_request_another_attempt_button();  
  }  
     }  
     if ($Apache::lonhomework::history{"resource.$version.status"} eq 'pass') {  
  $result.='<h1><font color="green">'.&mt('Passed').'</font></h1>';  
     }  
  }   }
     } 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') {
     #FIXME FORM conflcit with the 'show queue',1       $result.= "\n".'<div class="LC_GRADING_task">'."\n".
     $result.=$head_tag_start.$body_tag_start;   '<script type="text/javascript" 
     $result.='<br />Review'.&show_queue('reviewqueue');                           src="/res/adm/includes/task_grading.js"></script>';
     $result.='<br />Before'.&show_queue('gradingqueue');      #$result.='<br />Review'.&show_queue('reviewqueue');
  }      #$result.='<br />Grade'.&show_queue('gradingqueue');
  if (defined($env{'form.reviewasubmission'})) {   }
     $result.=&show_queue('reviewqueue',1);   # FIXME Blast! still need to reorg this, need to reshow the
     my $bodytext=&Apache::lonxml::get_all_text("/task",$parser);          #       queue being reviewed once done with the grade pass...
           #       Hrrm, vaildation pass should perhaps say 'not_locked'
           #       perhaps do a search if there is a key that is mine and if
           #       there isn't reshow the queue....
    my ($todo,$status_code,$msg)=&get_key_todo($target);
   
    if ($todo) {
       &setup_env_for_other_user($todo,$safeeval);
       my ($symb,$uname,$udom)=&decode_queue_key($todo);
       $result.="\n".'<table><tr><td>Found '.
    &Apache::lonnet::gettitle($symb).' for '.$uname.' at '.$udom.'</td></tr></table>';
       $form_tag_start.=
    '<input type="hidden" name="gradingkey" value="'.
    &Apache::lonnet::escape($todo).'" />';
       $Apache::bridgetask::queue_key=$todo;
       &Apache::structuretags::initialize_storage();
       &Apache::lonhomework::showhash(%Apache::lonhomework::history);
       if ($target eq 'webgrade' && $status_code eq 'selected') {
    $form_tag_start.=
       '<input type="hidden" name="queuemode" value="selected" />';
       }
  } else {   } else {
     my ($todo,$status_code)=&get_key_todo($target);      if ($target eq 'webgrade') {
     if ($todo) {   $result.="\n";
  &setup_env_for_other_user($todo,$safeeval);   my $back='<p><a href="/adm/flip?postdata=return:">'.
  my ($symb,$uname,$udom)=&decode_queue_key($todo);      &mt('Return to resource').'</a></p>';
  $result.="\n".'<table><tr><td>Found '.   if      ($status_code eq 'stop') {
     &Apache::lonnet::gettitle($symb).' for '.$uname.' at '.$udom.'</td></tr></table>';      $result.='<b>'.&mt("Stopped grading.").'</b>'.$back;
  $result.='<input type="hidden" name="gradingkey" value="'.   } elsif ($status_code eq 'lock_failed') {
     &Apache::lonnet::escape($todo).'" />';      $result.='<b>'.&mt("Failed to lock the requested record.")
  $Apache::bridgetask::queue_key=$todo;   .'</b>'.$back;
  &Apache::structuretags::initialize_storage();   } elsif ($status_code eq 'unlock') {
  &Apache::lonhomework::showhash(%Apache::lonhomework::history);      $result.='<b>'.&mt("Unlocked the requested record.")
  if ($target eq 'webgrade') {   .'</b>'.$back;
     $result.='<br />After'.&show_queue('gradingqueue');      $result.=&show_queue($env{'form.queue'},1);
     $result.="\n".'<table width="100%" style="width:100%" border="1">';   } elsif ($status_code eq 'show_list') {
  }      $result.=&show_queue($env{'form.queue'},1);
     } else {   } elsif ($status_code eq 'select_user') {
  if ($target eq 'webgrade') {      $result.=&select_user();
     $result.="\n".'<table><tr><td><b>';   } elsif ($status_code eq 'unable') {
     if      ($status_code eq 'stop') {      $result.='<b>'.&mt("Unable to aqcuire a user to grade.").'</b>'.$back;
  $result.=&mt("Stopped grading.");   } elsif ($status_code eq 'not_allowed') {
     } elsif ($status_code eq 'lock_failed') {      $result.='<b>'.&mt('Not allowed to grade the requested user.').' '.$msg.'</b>'.$back;
  $result.=&mt("Failed to lock the request record.");   } else {
     } elsif ($status_code eq 'unlock') {      $result.='<b>'.&mt("No user to be graded.").'</b>'.$back;
  $result.=&mt("Unlocked the requested user.");  
     } else {  
  $result.=&mt("No user to be graded.");  
     }  
     $result.='</b></td></tr></table>';  
  }   }
  $webgrade='no';  
  my $bodytext=&Apache::lonxml::get_all_text("/task",$parser);  
     }      }
       $webgrade='no';
       my $bodytext=&Apache::lonxml::get_all_text("/task",$parser,$style);
  }   }
  if ($target eq 'webgrade' && defined($env{'form.queue'})) {   if ($target eq 'webgrade' && defined($env{'form.queue'})) {
       if ($webgrade eq 'yes') {
    $result.=&submission_time_stamp();
       }
     $result.=$form_tag_start;      $result.=$form_tag_start;
     $result.='<input type="hidden" name="webgrade" value="'.      $result.='<input type="hidden" name="webgrade" value="'.
  $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'}.'" />';
       }
       if ($env{'form.chosensections'}) {
    my @chosen_sections=
       &Apache::loncommon::get_env_multiple('form.chosensections');
    foreach my $sec (@chosen_sections) {
       $result.='<input type="hidden" name="chosensections" 
                                  value="'.$sec.'" />';
    }
       }
       if ($webgrade eq 'yes') { $result.=&webgrade_standard_info(); }
    }
    if ($target eq 'webgrade') {
       $result.="\n".'<div id="LC_GRADING_criterialist">';
  }   }
       } elsif ($target eq 'edit') {
    $result.=$form_tag_start.
       &Apache::structuretags::problem_edit_header();
    $Apache::lonxml::warnings_error_header=
       &mt("Editor Errors - these errors might not effect the running of the problem, but they will likely cause problems with further use of the Edit mode. Please use the EditXML mode to fix these errors.")."<br />";
    my $temp=&Apache::edit::insertlist($target,$token);
    $result.=$temp;
     } 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
  $result = '';   $result = '';
Line 333  sub start_Task { Line 648  sub start_Task {
 sub get_key_todo {  sub get_key_todo {
     my ($target)=@_;      my ($target)=@_;
     my $todo;      my $todo;
   
       if (defined($env{'form.reviewasubmission'})) {
    &Apache::lonxml::debug("review a submission....");
    $env{'form.queue'}='reviewqueue';
    return (undef,'show_list');
       }
   
       if (defined($env{'form.reviewagrading'})) {
    &Apache::lonxml::debug("review a grading....");
    $env{'form.queue'}='gradingqueue';
    return (undef,'show_list');
       }
   
       if (defined($env{'form.regradeasubmission'})) {
    &Apache::lonxml::debug("regrade a grading....");
    $env{'form.queue'}='none';
    return (undef,'select_user');
       }
   
   
       my $me=$env{'user.name'}.':'.$env{'user.domain'};
   
       #need to try both queues..
       if (defined($env{'form.regradeaspecificsubmission'}) &&
    defined($env{'form.gradinguser'})               &&
    defined($env{'form.gradingdomain'})               ) {
    my ($symb,$cid)=&Apache::lonxml::whichuser();
    my $cnum  = $env{'course.'.$cid.'.num'};
    my $cdom  = $env{'course.'.$cid.'.domain'};
    my $uname = $env{'form.gradinguser'};
    my $udom  = $env{'form.gradingdomain'};
   
    my $gradingkey=&encode_queue_key($symb,$udom,$uname);
   
    my $queue;
   
    if      (&in_queue('gradingqueue',$symb,$cdom,$cnum,$udom,$uname)) {
       $env{'form.queue'} = $queue = 'gradingqueue';
    } elsif (&in_queue('reviewqueue' ,$symb,$cdom,$cnum,$udom,$uname)) {
       $env{'form.queue'} = $queue = 'reviewqueue';
    }
   
    if (!$queue) {
       $env{'form.queue'} = $queue = 'none';
       #not queued so doing either a re or pre grade
       return ($gradingkey);
    }
   
    my $who=&queue_key_locked($queue,$gradingkey);
    if ($who eq $me) {
       #already have the lock
       $env{'form.gradingkey'}=&Apache::lonnet::escape($gradingkey);
       return ($gradingkey);
    }
   
    if (!defined($who)) {
       if (&lock_key($queue,$gradingkey)) {
    return ($gradingkey);
       } else {
    return (undef,'lock_failed');
       }
    }
   
    #otherwise (defined($who) && $who ne $me) some else has it...
    return (undef,'not_allowed',
    &mt('Another user ([_1]) currently has the record for [_2] locked.',
       $who,$env{'form.gradinguser'}.':'.$env{'form.gradingdomain'}));
       }
   
   
     my $queue=$env{'form.queue'};      my $queue=$env{'form.queue'};
   
     if (!defined($queue)) {      if (!defined($queue)) {
  $env{'form.queue'}=$queue='gradingqueue';   $env{'form.queue'}=$queue='gradingqueue';
     }      }
   
     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,'select_user');
    }
       }
       return ($gradingkey,'selected');
    } else {
       return (undef,'select_user');
    }
       }
     if (defined($env{'form.queue'}) && defined($env{'form.gradingkey'})      if (defined($env{'form.queue'}) && defined($env{'form.gradingkey'})
  && !defined($env{'form.action'})) {   && !defined($env{'form.gradingaction'}) 
  #FIXME probably need to do some cheking here for more validity   && $env{'form.queuemode'} eq 'selected') {
  &Apache::lonnet::logthis("Found a key was given to me");  
  return ($gradingkey);   my $who=&queue_key_locked($queue,$gradingkey);
     }   if ($who eq $me) {
     if ($env{'form.action'} eq 'resume') {      &Apache::lonxml::debug("Found a key was given to me");
  &Apache::lonnet::logthis("Resuming a key");      return ($gradingkey,'selected');
  return ($gradingkey);   } else {
     } elsif ($env{'form.action'} eq 'unlock') {      return (undef,'show_list');
  &Apache::lonnet::logthis("Unlocking a key ".   }
  &check_queue_unlock($queue,$gradingkey,1));  
  return (undef,'unlock');      }
     } elsif ($env{'form.action'} eq 'select') {  
  if (&lock_key($queue,$gradingkey)) {      if ($target eq 'webgrade' && $env{'form.queuemode'} eq 'selected') {
    if ($env{'form.gradingaction'} eq 'resume') {
       delete($env{'form.gradingaction'});
       &Apache::lonxml::debug("Resuming a key");
     return ($gradingkey);      return ($gradingkey);
    } elsif ($env{'form.gradingaction'} eq 'unlock') {
       &Apache::lonxml::debug("Unlocking a key ".
        &check_queue_unlock($queue,$gradingkey,1));
       return (undef,'unlock');
    } elsif ($env{'form.gradingaction'} eq 'select') {
       &Apache::lonxml::debug("Locking a key");
       if (&lock_key($queue,$gradingkey)) {
    &Apache::lonxml::debug("Success $queue");
    return ($gradingkey);
       }
       &Apache::lonxml::debug("Failed $queue");
       return (undef,'lock_failed');
  }   }
  return (undef,'lock_failed');  
     }      }
     # don't get something new from the queue if they hit the stop button  
     if (!($env{'form.stop'} && $target eq 'webgrade')) {      if ($env{'form.queuemode'} ne 'selected') {
  return (&get_from_queue($queue));   # don't get something new from the queue if they hit the stop button
     } else {      if (!($env{'form.stop'} && $target eq 'webgrade') 
  return (undef,'stop');      && !$env{'form.gradingaction'}) {
       &Apache::lonxml::debug("Getting anew $queue");
       return (&get_from_queue($queue));
    } else {
       return (undef,'stop');
    }
       }
       return (undef,undef)
   }
   
   sub minimize_storage {
       foreach my $key (keys(%Apache::lonhomework::results)) {
    if ($key =~ /regrader$/) { next; }
    if ($Apache::lonhomework::results{$key} eq
       $Apache::lonhomework::history{$key}) {
       delete($Apache::lonhomework::results{$key});
    }
     }      }
 }  }
   
Line 372  sub end_Task { Line 804  sub end_Task {
     my ($version,$previous)=&get_version();      my ($version,$previous)=&get_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 ($target eq 'web' || $target eq 'answer' || $target eq 'tex') {
     (($target eq 'web') && ($env{'request.state'} ne 'construct')) ||  
     ($target eq 'answer') || ($target eq 'tex')  
    ) {  
     if ($target eq 'web') {      if ($target eq 'web') {
  if ($status eq 'CAN_ANSWER' && !$previous) {   if (&show_task($status,$previous)) {
       $result.=&Apache::lonxml::endredirection();
    }
    if ($status eq 'CAN_ANSWER' && !$previous && 
       !$env{'form.donescreen'}) {
     $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>";
    }
    if (!$previous && $status ne 'SHOW_ANSWER' &&
       &show_task($status,$previous)) {
     $result.=&Apache::inputtags::gradestatus('0');      $result.=&Apache::inputtags::gradestatus('0');
       $result.='</form>';
       my $action = &Apache::lonenc::check_encrypt($env{'request.uri'});
       $result.=<<DONEBUTTON;
   <form name="done" method="post" action="$action">
      <input type="hidden" name="donescreen" value="1" />
      <input type="submit" value="Done" />
   </form>
   DONEBUTTON
                   }
    if (&show_task($status,$previous) &&
       $Apache::lonhomework::history{"resource.$version.0.status"} =~ /^(pass|fail)$/) {
       my $bt_status=$Apache::lonhomework::history{"resource.$version.0.status"};
       my $title=&Apache::lonnet::gettitle();
   
       my $start_time;
   
       my $slot_name=
    $Apache::lonhomework::history{"resource.$version.0.checkedin.slot"};
       if ($slot_name) {
    my %slot=&Apache::lonnet::get_slot($slot_name);
   
    $start_time=$slot{'starttime'}
       } else {
    $start_time= 
       &Apache::lonnet::EXT('resource.0.opendate');
       }
       $start_time=&Apache::lonlocal::locallocaltime($start_time);
   
       my $status = "\n<div class='LC_$bt_status LC_criteria'>\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.0.$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, of which you passed [_4].',$man_count,$opt_req,$opt_count,$opt_passed)."</p></div>\n";
   
       my $internal_location=&internal_location();
       $result=~s/\Q$internal_location\E/$status/;
  }   }
     }    $result.="\n</div>\n".
     if ($target eq 'web' || $target eq 'webgrade') {      &Apache::loncommon::end_page({'discussion' => 1});
  $result.=&Apache::lonxml::xmlend().'</html>';  
     }      }
  }   }
  if ($target eq 'grade' && !$env{'form.webgrade'} && !$previous) {   if ($target eq 'grade' && !$env{'form.webgrade'} && !$previous) {
Line 403  sub end_Task { Line 903  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"}='';
       } else {
    delete($Apache::lonhomework::results{"resource.$version.0.bridgetask.portfiles"});
    $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') {
  &add_to_queue('gradingqueue',$Apache::inputtags::slot_name);   my $useslots = &Apache::lonnet::EXT("resource.0.useslots");
    if ($useslots =~ /^\s*no\s*$/i) {
       &add_to_queue('gradingqueue',
     {'type' => 'task',
      'time' => time});
    } elsif (defined($Apache::inputtags::slot_name)) {
       &add_to_queue('gradingqueue',
     {'type' => 'task',
      'time' => time,
      'slot' => $Apache::inputtags::slot_name});
    }
     }      }
    } elsif ($Apache::lonhomework::results{'INTERNAL_store'}) {
       &Apache::structuretags::finalize_storage();
  }   }
  if ($target eq 'grade' && $env{'form.webgrade'} eq 'yes') {   if ($target eq 'grade' && $env{'form.webgrade'} eq 'yes') {
     my $optional_required=      my $optional_required=
Line 421  sub end_Task { Line 938  sub end_Task {
     &Apache::lonhomework::showhash(%Apache::lonhomework::results);      &Apache::lonhomework::showhash(%Apache::lonhomework::results);
     foreach my $dim_id (@Apache::bridgetask::dimensionlist) {      foreach my $dim_id (@Apache::bridgetask::dimensionlist) {
  my $status=   my $status=
     $Apache::lonhomework::results{"resource.$version.$dim_id.status"};      $Apache::lonhomework::results{"resource.$version.0.$dim_id.status"};
  my $mandatory=   my $mandatory=
     ($Apache::bridgetask::dimensionmandatory{$dim_id} ne 'N');      ($Apache::bridgetask::dimensionmandatory{$dim_id} ne 'N');
  if ($status eq 'pass') {   if ($status eq 'pass') {
Line 432  sub end_Task { Line 949  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++;
     }      }
     &Apache::lonxml::debug("all dim ".join(':',@Apache::bridgetask::dimensionlist)."results -> m_f $mandatory_failed o_p $optional_passed u $ungraded r $review");      &Apache::lonxml::debug("all dim ".join(':',@Apache::bridgetask::dimensionlist)."results -> m_f $mandatory_failed o_p $optional_passed u $ungraded r $review");
     $Apache::lonhomework::results{'resource.grader'}=      $Apache::lonhomework::results{'resource.0.regrader'}=
  $env{'user.name'}.'@'.$env{'user.domain'};   $env{'user.name'}.':'.$env{'user.domain'};
     if ($review) {      if ($review) {
  $Apache::lonhomework::results{"resource.$version.status"}='review';   $Apache::lonhomework::results{"resource.$version.0.status"}='review';
  # FIXME won't work well when already in review queues   if ($env{'form.queue'} eq 'reviewqueue') {
  &move_between_queues('gradingqueue','reviewqueue');      &check_queue_unlock($env{'form.queue'});
       &Apache::lonxml::debug(" still needs review not changing status.");
    } else {
       &move_between_queues($env{'form.queue'},'reviewqueue');
    }
     } elsif ($ungraded) {      } elsif ($ungraded) {
  $Apache::lonhomework::results{"resource.$version.status"}='ungraded';   $Apache::lonhomework::results{"resource.$version.0.status"}='ungraded';
  # FIXME if in review queue need to move back to grading queue   if ($env{'form.queue'} eq 'reviewqueue' ||
  &check_queue_unlock($env{'form.queue'});      $env{'form.queue'} eq 'none' ) {
       &Apache::lonxml::debug("moving back.");
       &move_between_queues($env{'form.queue'},'gradingqueue');
    } else {
       &check_queue_unlock($env{'form.queue'});
    }
     } elsif ($mandatory_failed) {      } elsif ($mandatory_failed) {
  $Apache::lonhomework::results{"resource.$version.status"}='fail';   $Apache::lonhomework::results{"resource.$version.0.status"}='fail';
  $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.0.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.0.status"}=
  $Apache::lonhomework::results{"resource.$version.status"};   $Apache::lonhomework::results{"resource.$version.0.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"};
     }      }
       &minimize_storage();
     &Apache::structuretags::finalize_storage();      &Apache::structuretags::finalize_storage();
  }   }
     } elsif ($target eq 'webgrade') {      } elsif ($target eq 'webgrade') {
  $result.="</table>\n<hr />";   $result.="</div>";
  #$result.='<input type="submit" name="next" value="'.   #$result.='<input type="submit" name="next" value="'.
  #    &mt('Save &amp; Next').'" /> ';   #    &mt('Save &amp; Next').'" /> ';
  #$result.='<input type="submit" name="end" value="'.   #$result.='<input type="submit" name="end" value="'.
Line 483  sub end_Task { Line 1035  sub end_Task {
  #    &mt('Throw Away &amp; Stop Grading').'" /> ';   #    &mt('Throw Away &amp; Stop Grading').'" /> ';
  #$result.='<input type="submit" name="save" value="'.   #$result.='<input type="submit" name="save" value="'.
  #    &mt('Save Partial Grade and Continue Grading').'" /> ';   #    &mt('Save Partial Grade and Continue Grading').'" /> ';
  $result.='</form>'.&Apache::loncommon::endbodytag().'</html>';   $result.='</form>'."\n</div>\n</div>\n".
       &Apache::loncommon::end_page();
     } elsif ($target eq 'meta') {      } elsif ($target eq 'meta') {
  $result.='<parameter part="0" package="Task"></parameter>'."\n";   $result.=&Apache::response::meta_package_write('Task');
  #$result.=&Apache::response::meta_part_order();          $result.=&Apache::response::meta_stores_write('solved','string',
  #$result.=&Apache::response::meta_response_order();        'Problem Status');
    $result.=&Apache::response::meta_stores_write('tries','int_zeropos',
         'Number of Attempts');
    $result.=&Apache::response::meta_stores_write('awarded','float',
         'Partial Credit Factor');
    $result.=&Apache::response::meta_stores_write('status','string',
         'Bridge Task Status');
     }      }
     undef($Apache::lonhomework::parsing_a_task);      undef($Apache::lonhomework::parsing_a_task);
     return $result;      return $result;
Line 495  sub end_Task { Line 1054  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') {
     my $result=&add_to_queue($dest_queue,$cur_data->[0]);   $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);
     if ($result ne 'ok') {      if ($result ne 'ok') {
  return $result;   return $result;
     }      }
Line 507  sub move_between_queues { Line 1071  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";
     }      }
     my $cnum=$env{'course.'.$cid.'.num'};      my $cnum=$env{'course.'.$cid.'.num'};
     my $cdom=$env{'course.'.$cid.'.domain'};      my $cdom=$env{'course.'.$cid.'.domain'};
     my $me=$env{'user.name'}.'@'.$env{'user.domain'};      my $me=$env{'user.name'}.':'.$env{'user.domain'};
     my $who=&queue_key_locked($queue,$key,$cdom,$cnum);      my $who=&queue_key_locked($queue,$key,$cdom,$cnum);
     if  ($who eq $me) {      if  ($who eq $me) {
  return &Apache::lonnet::del($queue,["$key\0locked"],$cdom,$cnum);   return &Apache::lonnet::del($queue,["$key\0locked"],$cdom,$cnum);
     } elsif ($allow_not_me) {      } elsif ($allow_not_me) {
  &Apache::lonnet::logthis("unlocking $who by $me");   &Apache::lonxml::debug("unlocking $who by $me");
  return &Apache::lonnet::del($queue,["$key\0locked"],$cdom,$cnum);   return &Apache::lonnet::del($queue,["$key\0locked"],$cdom,$cnum);
     }      }
     return 'not_owner';      return 'not_owner';
 }  }
   
   sub in_queue {
       my ($queue,$symb,$cdom,$cnum,$udom,$uname)=@_;
       if ($queue eq 'none') { return 0; }
       if (!defined($symb) || !defined($cdom) || !defined($cnum)
    || !defined($udom) || !defined($uname)) {
    ($symb,my $cid,$udom,$uname)=&Apache::lonxml::whichuser();
    $cnum=$env{'course.'.$cid.'.num'};
    $cdom=$env{'course.'.$cid.'.domain'};
       }
   
       my $key=&encode_queue_key($symb,$udom,$uname);
       my %results = &Apache::lonnet::get($queue,[$key],$cdom,$cnum);
   
       if (defined($results{$key})) {
    return 1;
       }
       return 0;
   }
   
 sub remove_from_queue {  sub remove_from_queue {
     my ($queue)=@_;      my ($queue,$symb,$cdom,$cnum,$udom,$uname)=@_;
     my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser();      if ($queue eq 'none') { return 'ok'; }
     my $cnum=$env{'course.'.$cid.'.num'};      if (!defined($symb) || !defined($cdom) || !defined($cnum)
     my $cdom=$env{'course.'.$cid.'.domain'};   || !defined($udom) || !defined($uname)) {
     my $key="$symb\0queue\0$uname\@$udom";   ($symb,my $cid,$udom,$uname)=&Apache::lonxml::whichuser();
    $cnum=$env{'course.'.$cid.'.num'};
    $cdom=$env{'course.'.$cid.'.domain'};
       }
       if (!&in_queue($queue,$symb,$cdom,$cnum,$udom,$uname)) {
    return 'ok';
       }
       my $key=&encode_queue_key($symb,$udom,$uname);
     my @keys=($key,"$key\0locked");      my @keys=($key,"$key\0locked");
     return &Apache::lonnet::del($queue,\@keys,$cdom,$cnum);      return &Apache::lonnet::del($queue,\@keys,$cdom,$cnum);
 }  }
Line 550  sub get_queue_data { Line 1141  sub get_queue_data {
     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'};
     my $todo="$symb\0queue\0$uname\@$udom";      my $todo="$symb\0queue\0$uname:$udom";
     my ($key,$value)=&Apache::lonnet::get($queue,[$todo],$cdom,$cnum);      my ($key,$value)=&Apache::lonnet::get($queue,[$todo],$cdom,$cnum);
     if ($key eq $todo && ref($value)) {      if ($key eq $todo && ref($value)) {
  return $value;   return $value;
Line 558  sub get_queue_data { Line 1149  sub get_queue_data {
     return undef;      return undef;
 }  }
   
   
   sub check_queue_for_key {
       my ($cdom,$cnum,$queue,$todo)=@_;
   
       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';
    }
    if (my $slot=&slotted_access($results{$todo})) {
       my %slot_data=&Apache::lonnet::get_slot($slot);
       if ($slot_data{'endtime'} > time) { 
    return 'in_progress';
       }
    } else {
       my ($symb) = &decode_queue_key($todo);
       my $due_date = &Apache::lonhomework::due_date('0',$symb);
       if ($due_date > time) {
    return 'in_progress';
       }
    }
    return 'enqueued';
       }
       return undef;
   }
   
 sub add_to_queue {  sub add_to_queue {
     my ($queue,$slot_name)=@_;      my ($queue,$user_data)=@_;
       if ($queue eq 'none') { return 'ok'; }
     my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser();      my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser();
       if (!$cid || $env{'request.state'} eq 'construct') {
    return 'no_queue';
       }
     my $cnum=$env{'course.'.$cid.'.num'};      my $cnum=$env{'course.'.$cid.'.num'};
     my $cdom=$env{'course.'.$cid.'.domain'};      my $cdom=$env{'course.'.$cid.'.domain'};
     my %data;      my %data;
     $data{"$symb\0queue\0$uname\@$udom"}=[$slot_name];      $data{"$symb\0queue\0$uname:$udom"}=$user_data;
     return &Apache::lonnet::put($queue,\%data,$cdom,$cnum);      return &Apache::lonnet::cput($queue,\%data,$cdom,$cnum);
 }  }
   
 sub show_queue {  sub show_queue {
Line 574  sub show_queue { Line 1197  sub show_queue {
     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'};
   
       my @chosen_sections=
    &Apache::loncommon::get_env_multiple('form.chosensections');
       &Apache::grades::init_perm();
       my ($classlist,$section,$fullname)=&Apache::grades::getclasslist(\@chosen_sections,);
       &Apache::grades::reset_perm();
       if (!(grep(/^all$/,@chosen_sections))) {
    $result.='<p> Showing only sections <tt>'.join(', ',@chosen_sections).
       '</tt>.</p> '."\n";
       }
   
     my $regexp="^$symb\0";      my $regexp="^$symb\0";
     my %queue=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp);      my %queue=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp);
     my ($tmp)=%queue;      my ($tmp)=%queue;
     if ($tmp=~/^error: 2 /) {      if ($tmp=~/^error: 2 /) {
  return "\n<h3>Current Queue</h3><table border='1'><tr><td>Empty</td></tr></table>";   return "\n<h3>Current Queue - $queue</h3><table border='1'><tr><td>Empty</td></tr></table>";
     }      }
     $result.="\n<h3>Current Queue</h3><table border='1'><tr>";      my $title=&Apache::lonnet::gettitle($symb);
     if ($with_selects) { $result.="<th></th>"; }      $result.="\n<h3>Current Queue - $title $queue </h3><table border='1'><tr>";
     $result.="<th>resource</th><th>user</th><th>type</th><th>data</th></tr>";      if ($with_selects) { $result.="<th>Status</th><th></th>"; }
       $result.="<th>user</th><th>data</th></tr>";
     foreach my $key (sort(keys(%queue))) {      foreach my $key (sort(keys(%queue))) {
    my ($symb,$uname,$udom) = &decode_queue_key($key);
    if (!defined($classlist->{$uname.':'.$udom})) { next; }
  if ($key=~/locked$/ && !$with_selects) {   if ($key=~/locked$/ && !$with_selects) {
     my ($symb,$uname,$udom) = &decode_queue_key($key);      $result.="<tr><td>$uname</td>";
     my $title=&Apache::lonnet::gettitle($symb);      $result.='<td>'.$queue{$key}.'</td></tr>';
     $result.="<tr><td>$title</td><td>$uname</td>";  
     $result.='<td>lock</td><td>'.$queue{$key}.'</td></tr>';  
  } elsif ($key=~/timestamp$/ && !$with_selects) {   } elsif ($key=~/timestamp$/ && !$with_selects) {
     my ($symb,undef) = split("\0",$key);      $result.="<tr><td></td>";
     my $title=&Apache::lonnet::gettitle($symb);      $result.='<td>'.
     $result.="<tr><td>$title</td><td></td>";  
     $result.='<td>last queue modification time</td><td>'.  
  &Apache::lonlocal::locallocaltime($queue{$key})."</td></tr>";   &Apache::lonlocal::locallocaltime($queue{$key})."</td></tr>";
  } elsif ($key!~/(timestamp|locked)$/) {   } elsif ($key!~/(timestamp|locked)$/) {
     my ($symb,$uname,$udom) = &decode_queue_key($key);  
     my $title=&Apache::lonnet::gettitle($symb);  
     $result.="<tr>";      $result.="<tr>";
       my ($end_time,$slot_text);
       if (my $slot=&slotted_access($queue{$key})) {
    my %slot_data=&Apache::lonnet::get_slot($slot);
    $end_time = $slot_data{'endtime'};
    $slot_text = &mt('Slot: [_1]',$slot);
       } else {
    $end_time = &Apache::lonhomework::due_date('0',$symb);
    $slot_text = '';
       }
     if ($with_selects) {      if ($with_selects) {
  my $ekey=&Apache::lonnet::escape($key);   my $ekey=&Apache::lonnet::escape($key);
  my ($action,$description)=('select',&mt('Select'));   my ($action,$description,$status)=('select',&mt('Select'));
  if (exists($queue{"$key\0locked"})) {   if (exists($queue{"$key\0locked"})) {
     my $me=$env{'user.name'}.'@'.$env{'user.domain'};      my $me=$env{'user.name'}.':'.$env{'user.domain'};
       $status=&mt('Locked by <tt>[_1]</tt>',$queue{"$key\0locked"});
     if ($me eq $queue{"$key\0locked"}) {      if ($me eq $queue{"$key\0locked"}) {
  ($action,$description)=('resume',&mt('Resume'));   ($action,$description)=('resume',&mt('Resume'));
     } else {      } else {
  ($action,$description)=('unlock',&mt('Unlock'));   ($action,$description)=('unlock',&mt('Unlock'));
     }      }
  }   }
  $result.=(<<FORM);   my $seclist;
    foreach my $sec (@chosen_sections) {
       $seclist.='<input type="hidden" name="chosensections" 
                                  value="'.$sec.'" />';
    }
    if ($end_time ne '' && time > $end_time) {
       $result.=(<<FORM);
   <td>$status</td>
 <td>  <td>
 <form method="POST">  <form style="display: inline" method="post">
  <input type="hidden" name="gradingkey" value="$ekey" />   <input type="hidden" name="gradingkey" value="$ekey" />
  <input type="hidden" name="queue" value="$queue" />   <input type="hidden" name="queue" value="$queue" />
  <input type="hidden" name="gradingaction" value="$action" />   <input type="hidden" name="gradingaction" value="$action" />
  <input type="hidden" name="webgrade" value="no" />   <input type="hidden" name="webgrade" value="no" />
    <input type="hidden" name="queuemode" value="selected" />
  <input type="submit" name="submit" value="$description" />   <input type="submit" name="submit" value="$description" />
    $seclist
 </form>  </form>
 </td>  </td>
 FORM  FORM
   
                   } else {
       $result.='<td>'.&mt("In Progress").'</td><td>&nbsp;</td>'
    }
     }      }
     $result.="<td>$title</td><td>$uname</td>";      $result.= "<td>".$fullname->{$uname.':'.$udom}.
     my $slot=$queue{$key}->[0];   " <tt>($uname:$udom)</tt> </td>";
     my %slot_data=&Apache::lonnet::get_slot($slot);      $result.='<td>'.$slot_text.' End time: '.
     $result.='<td>queue entry</td><td>Slot: '.$slot.' End time: '.   &Apache::lonlocal::locallocaltime($end_time).
  &Apache::lonlocal::locallocaltime($slot_data{'endtime'}).  
  "</td></tr>";   "</td></tr>";
  }   }
     }      }
Line 634  FORM Line 1287  FORM
     return $result;      return $result;
 }  }
   
   sub get_queue_counts {
       my ($queue)=@_;
       my $result;
       my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser();
       my $cnum=$env{'course.'.$cid.'.num'};
       my $cdom=$env{'course.'.$cid.'.domain'};
       my $regexp="^$symb\0";
       my %queue=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp);
       my ($tmp)=%queue;
       if ($tmp=~/^error: 2 /) {
    return (0,0,0);
       }
       my ($entries,$ready_to_grade,$locks)=(0,0,0);
       my %slot_cache;
       foreach my $key (sort(keys(%queue))) {
    if ($key=~/locked$/) {
       $locks++;
    } elsif ($key=~/timestamp$/) {
       #ignore
    } elsif ($key!~/(timestamp|locked)$/) {
       my ($symb,$uname,$udom) = &decode_queue_key($key);
       $entries++;
       if (my $slot=&slotted_access($queue{$key})) {
    if (!exists($slot_cache{$slot})) {
       my %slot_data=&Apache::lonnet::get_slot($slot);
       $slot_cache{$slot} = \%slot_data;
    }
    if (time > $slot_cache{$slot}{'endtime'}) {
       $ready_to_grade++;
    }
       } else {
    my $due_date = &Apache::lonhomework::due_date('0',$symb);
    if ($due_date ne '' && time > $due_date) {
       $ready_to_grade++;
    }
       }
    }
       }
       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);
     my ($uname,$udom) = split('@',$user);      my ($uname,$udom) = split(':',$user);
     return ($symb,$uname,$udom);      return ($symb,$uname,$udom);
 }  }
   
 sub queue_key_locked {  sub queue_key_locked {
     my ($queue,$key,$cdom,$cnum)=@_;      my ($queue,$key,$cdom,$cnum)=@_;
       if (!defined($cdom) || !defined($cnum)) {
    my (undef,$cid)=&Apache::lonxml::whichuser();
    $cnum=$env{'course.'.$cid.'.num'};
    $cdom=$env{'course.'.$cid.'.domain'};
       }
     my ($key_locked,$value)=      my ($key_locked,$value)=
  &Apache::lonnet::get($queue,["$key\0locked"],$cdom,$cnum);   &Apache::lonnet::get($queue,["$key\0locked"],$cdom,$cnum);
     if ($key_locked eq "$key\0locked") {      if ($key_locked eq "$key\0locked") {
Line 651  sub queue_key_locked { Line 1355  sub queue_key_locked {
     return undef;      return undef;
 }  }
   
   sub slotted_access {
       my ($queue_entry) = @_;
       if (ref($queue_entry) eq 'ARRAY') {
    if (defined($queue_entry->[0])) {
       return $queue_entry->[0];
    }
    return undef;
       } elsif (ref($queue_entry) eq 'HASH') {
    if (defined($queue_entry->{'slot'})) {
       return $queue_entry->{'slot'};
    }
    return undef;
       }
       return undef;
   }
   
 sub pick_from_queue_data {  sub pick_from_queue_data {
     my ($queue,$check_section,$queuedata,$cdom,$cnum)=@_;      my ($queue,$check_section,$queuedata,$cdom,$cnum)=@_;
       my @possible; # will hold queue entries that are valid to be selected
     foreach my $key (keys(%$queuedata)) {      foreach my $key (keys(%$queuedata)) {
    if ($key =~ /\0locked$/) { next; }
    if ($key =~ /\0timestamp$/) { next; }
  my ($symb,$uname,$udom)=&decode_queue_key($key);   my ($symb,$uname,$udom)=&decode_queue_key($key);
  if ($check_section) {   if ($check_section) {
     my $section=&Apache::lonnet::getsection($uname,$udom);      my $section=&Apache::lonnet::getsection($uname,$udom);
     if ($section eq $check_section) {      if ($section eq $check_section) {
  &Apache::lonnet::logthis("my sec");   &Apache::lonxml::debug("my sec");
  next;   next;
     }      }
  }   }
  my $slot=$queuedata->{$key}[0];   my $end_time;
  my %slot_data=&Apache::lonnet::get_slot($slot);   if (my $slot=&slotted_access($queuedata->{$key})) {
  if ($slot_data{'endtime'} > time) {       my %slot_data=&Apache::lonnet::get_slot($slot);
     &Apache::lonnet::logthis("not time");      if ($slot_data{'endtime'} < time) { 
    $end_time = $slot_data{'endtime'};
       }
    } else {
       my $due_date = &Apache::lonhomework::due_date('0',$symb);
       if ($due_date > time) {
    $end_time = $due_date;
       }
    }
    if ($end_time ne '') {
       &Apache::lonxml::debug("not time");
     next;      next;
  }   }
  if (&queue_key_locked($queue,$key,$cdom,$cnum)) {  
     &Apache::lonnet::logthis("someone already has um.");   if (exists($queuedata->{"$key\0locked"})) {
       &Apache::lonxml::debug("someone already has um.");
     next;      next;
  }   }
  return $key;   push(@possible,[$key,$end_time]);
       }
       if (@possible) {
           # sort entries in order by slot end time
    @possible = sort { $a->[1] <=> $b->[1] } @possible;
    # pick one of the entries in the top 10% in small queues and one
    # of the first ten entries in large queues
    #my $ten_percent = int($#possible * 0.1);
    #if ($ten_percent < 1 ) { $ten_percent = 1;  }
    #if ($ten_percent > 10) { $ten_percent = 10; }
    #my $max=($#possible < $ten_percent) ? $#possible : $ten_percent;
   
    #return $possible[int(rand($max))][0];
    return $possible[0][0];
     }      }
     return undef;      return undef;
 }  }
Line 680  sub pick_from_queue_data { Line 1427  sub pick_from_queue_data {
 sub find_mid_grade {  sub find_mid_grade {
     my ($queue,$symb,$cdom,$cnum)=@_;      my ($queue,$symb,$cdom,$cnum)=@_;
     my $todo=&Apache::lonnet::unescape($env{'form.gradingkey'});      my $todo=&Apache::lonnet::unescape($env{'form.gradingkey'});
     my $me=$env{'user.name'}.'@'.$env{'user.domain'};      my $me=$env{'user.name'}.':'.$env{'user.domain'};
     if ($todo) {      if ($todo) {
  my $who=&queue_key_locked($queue,$todo,$cdom,$cnum);   my $who=&queue_key_locked($queue,$todo,$cdom,$cnum);
  if ($who eq $me) { return $todo; }   if ($who eq $me) { return $todo; }
Line 700  sub find_mid_grade { Line 1447  sub find_mid_grade {
   
 sub lock_key {  sub lock_key {
     my ($queue,$todo)=@_;      my ($queue,$todo)=@_;
     my $me=$env{'user.name'}.'@'.$env{'user.domain'};      my $me=$env{'user.name'}.':'.$env{'user.domain'};
     my (undef,$cid)=&Apache::lonxml::whichuser();      my (undef,$cid)=&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'};
     my $success=&Apache::lonnet::newput($queue,{"$todo\0locked"=> $me},      my $success=&Apache::lonnet::newput($queue,{"$todo\0locked"=> $me},
  $cdom,$cnum);   $cdom,$cnum);
     &Apache::lonnet::logthis("success $success $todo");      &Apache::lonxml::debug("success $success $todo");
     if ($success eq 'ok') {      if ($success eq 'ok') {
  return 1;   return 1;
     }      }
     return 0;      return 0;
 }  }
   
   sub get_queue_symb_status {
       my ($queue,$symb,$cdom,$cnum) = @_;
       if (!defined($cdom) || !defined($cnum)) {
    my (undef,$cid)=&Apache::lonxml::whichuser();
    $cnum=$env{'course.'.$cid.'.num'};
    $cdom=$env{'course.'.$cid.'.domain'};
       }
       my $regexp="^$symb\0";
       my %queue=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp);
       my ($tmp)=%queue;
       if ($tmp=~/^error: 2 /) { return; }
       my @users;
       foreach my $key (sort(keys(%queue))) {
    next if ($key=~/locked$/);
    next if ($key=~/timestamp$/);
    my ($symb,$uname,$udom) = &decode_queue_key($key);
    push(@users,"$uname:$udom");
       }
       return @users;
   }
   
 sub get_from_queue {  sub get_from_queue {
     my ($queue)=@_;      my ($queue)=@_;
     my $result;      my $result;
Line 720  sub get_from_queue { Line 1488  sub get_from_queue {
     my $cnum=$env{'course.'.$cid.'.num'};      my $cnum=$env{'course.'.$cid.'.num'};
     my $cdom=$env{'course.'.$cid.'.domain'};      my $cdom=$env{'course.'.$cid.'.domain'};
     my $todo=&find_mid_grade($queue,$symb,$cdom,$cnum);      my $todo=&find_mid_grade($queue,$symb,$cdom,$cnum);
     &Apache::lonnet::logthis("found ".join(':',&decode_queue_key($todo)));      &Apache::lonxml::debug("found ".join(':',&decode_queue_key($todo)));
     if ($todo) { return $todo; }      if ($todo) { return $todo; }
       my $attempts=0;
     while (1) {      while (1) {
    if ($attempts > 2) {
       # tried twice to get a queue entry, giving up
       return (undef,'unable');
    }
  my $starttime=time;   my $starttime=time;
  &Apache::lonnet::put($queue,{"$symb\0timestamp"=>$starttime},   &Apache::lonnet::cput($queue,{"$symb\0timestamp"=>$starttime},
      $cdom,$cnum);        $cdom,$cnum);
  &Apache::lonnet::logthis("$starttime");   &Apache::lonxml::debug("$starttime");
  my $regexp="^$symb\0queue\0";   my $regexp="^$symb\0queue\0";
    my $range= ($attempts < 1 ) ? '0-100' : '0-400';
   
  my %queue=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp);   my %queue=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp);
  #make a pass looking for a user in my section   #make a pass looking for a user _not_ in my section
  if ($env{'request.course.sec'}) {   if ($env{'request.course.sec'}) {
     &Apache::lonnet::logthis("sce");      &Apache::lonxml::debug("sce");
     $todo=&pick_from_queue_data($queue,$env{'request.course.sec'},      $todo=&pick_from_queue_data($queue,$env{'request.course.sec'},
  \%queue,$cdom,$cnum);   \%queue,$cdom,$cnum);
     &Apache::lonnet::logthis("sce $todo");      &Apache::lonxml::debug("sce $todo");
  }   }
  # no one in our section so look for any user that is ready for grading   # no one _not_ in our section so look for any user that is
    # ready for grading
  if (!$todo) {   if (!$todo) {
     &Apache::lonnet::logthis("no sce");      &Apache::lonxml::debug("no sce");
     $todo=&pick_from_queue_data($queue,$env{'request.course.sec'},      $todo=&pick_from_queue_data($queue,undef,\%queue,$cdom,$cnum);
  \%queue,$cdom,$cnum);      &Apache::lonxml::debug("no sce $todo");
     &Apache::lonnet::logthis("no sce $todo");  
  }   }
  # no user to grade    # no user to grade 
  if (!$todo) { last; }   if (!$todo) { last; }
  &Apache::lonnet::logthis("got $todo");   &Apache::lonxml::debug("got $todo");
  # otherwise found someone so lets try to lock them   # otherwise found someone so lets try to lock them
  # unless someone else already picked them   # unless someone else already picked them
  if (!&lock_key($queue,$todo)) { next; }   if (!&lock_key($queue,$todo)) {
       $attempts++;
       next;
    }
  my (undef,$endtime)=   my (undef,$endtime)=
     &Apache::lonnet::get($queue,["$symb\0timestamp"],      &Apache::lonnet::get($queue,["$symb\0timestamp"],
  $cdom,$cnum);   $cdom,$cnum);
  &Apache::lonnet::logthis("emd  $endtime");   &Apache::lonxml::debug("emd  $endtime");
  # someone else already modified the queue,    # someone else already modified the queue, 
  # perhaps our picked user wass already fully graded between   # perhaps our picked user wass already fully graded between
  # when we picked him and when we locked his record? so lets   # when we picked him and when we locked his record? so lets
Line 761  sub get_from_queue { Line 1539  sub get_from_queue {
     my ($key,$value)=      my ($key,$value)=
  &Apache::lonnet::get($queue,["$todo"],   &Apache::lonnet::get($queue,["$todo"],
      $cdom,$cnum);       $cdom,$cnum);
     &Apache::lonnet::logthis("check  $key .. $value");      &Apache::lonxml::debug("check  $key .. $value");
     if ($key eq $todo && ref($value)) {      if ($key eq $todo && ref($value)) {
     } else {      } else {
  &Apache::lonnet::del($queue,["$todo\0locked"],   &Apache::lonnet::del($queue,["$todo\0locked"],
      $cdom,$cnum);       $cdom,$cnum);
  &Apache::lonnet::logthis("del");   &Apache::lonxml::debug("del");
    $attempts++;
  next;   next;
     }      }
  }   }
  &Apache::lonnet::logthis("last $todo");   &Apache::lonxml::debug("last $todo");
  last;   last;
     }      }
     return $todo;      return $todo;
 }  }
   
   sub select_user {
       my ($symb,$cid)=&Apache::lonxml::whichuser();
   
       my @chosen_sections=
    &Apache::loncommon::get_env_multiple('form.chosensections');
       &Apache::grades::init_perm();
       my ($classlist,$section,$fullname)=&Apache::grades::getclasslist(\@chosen_sections,);
       &Apache::grades::reset_perm();
       
       my $result;
       if (!(grep(/^all$/,@chosen_sections))) {
    $result.='<p> Showing only sections <tt>'.join(', ',@chosen_sections).
       '</tt>.</p> '."\n";
       }
       $result.='<table border="1">';
   
       foreach my $student (sort {lc($$fullname{$a}) cmp lc($$fullname{$b}) } keys %$fullname) {
    my ($uname,$udom) = split(/:/,$student);
   
    my $cnum=$env{'course.'.$cid.'.num'};
    my $cdom=$env{'course.'.$cid.'.domain'};
    my %status = &get_student_status($symb,$cdom,$cnum,$udom,$uname,
    'Task');
    my $queue = 'none';
    my $cannot_grade;
    if ($status{'reviewqueue'} =~ /^(in_progress|enqueue)$/) {
       $queue = 'reviewqueue';
       if ($status{'reviewqueue'} eq 'in_progress') {
    $cannot_grade=1;
       }
    } elsif ($status{'gradingqueue'} =~ /^(in_progress|enqueue)$/) {
       $queue = 'gradingqueue';
       if ($status{'gradingqueue'} eq 'in_progress') {
    $cannot_grade=1;
       }
    }
    my $todo = 
       &Apache::lonnet::escape(&encode_queue_key($symb,$udom,$uname));
    if ($cannot_grade) {
       $result.='<tr><td>&nbsp;</td><td>'.$fullname->{$student}.
    '</td><td>';
    } else {
       my $seclist;
       foreach my $sec (@chosen_sections) {
    $seclist.='<input type="hidden" name="chosensections" 
                                  value="'.$sec.'" />';
       }
       my $studentdis = $student;
       $studentdis =~ tr/:/@/;
       $result.=<<RESULT;
   <tr>
     <td>
       <form style="display: inline" 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" />
         $seclist
       </form>
     <td>$fullname->{$student} <tt>($studentdis)</tt></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'};
    }
    if ($status{'grader'}) {
       $result .= ' '.&mt('(Graded by [_1])',$status{'grader'}).' ';
    }
    $result.= '</td><td>';
    if ($status{'reviewqueue'} eq 'enqueued') {
       $result .= &mt('Awaiting Review');
    } elsif ($status{'reviewqueue'} eq 'locked') {
       $result .= &mt('Under Review');
    } elsif ($status{'reviewqueue'} eq 'in_progress') {
       $result .= &mt('Still being worked on.');
    } elsif ($status{'gradingqueue'} eq 'enqueued') {
       $result .= &mt('Awaiting Grading');
    } elsif ($status{'gradingqueue'} eq 'locked') {
       $result .= &mt('Being Graded');
    } elsif ($status{'gradingqueue'} eq 'in_progress') {
       $result .= &mt('Still being worked on.');
    } else {
       $result.="&nbsp;";
    }
    $result.= '</td></tr>';
       }
       $result.='</table>';
       return $result;
   }
   
   sub get_student_status {
       my ($symb,$cdom,$cnum,$udom,$uname,$type)=@_;
   
       my %status;
   
       if ($type eq 'Task') {
    my %record = &Apache::lonnet::restore($symb,$env{'request.course.id'},
     $udom,$uname);
    $status{'status'}=$record{'resource.0.status'};
    $status{'version'}=$record{'resource.0.version'};
    $status{'grader'}=$record{'resource.0.regrader'};
       }
       $status{'reviewqueue'}=
    &check_queue_for_key($cdom,$cnum,'reviewqueue',
        &encode_queue_key($symb,$udom,$uname));
       $status{'gradingqueue'}=
    &check_queue_for_key($cdom,$cnum,'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 813  sub start_Dimension { Line 1718  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 {
     &Apache::response::pushrandomnumber();      my ($dim)=@_;
     my @order=&Math::Random::random_permutation(@{$dimension{'instances'}});      my $rand_alg=&Apache::lonnet::get_rand_alg();
     my $num=@order;      if (!$rand_alg || $rand_alg eq '32bit' || $rand_alg eq '64bit' ||
     my $version=&get_version();   $rand_alg eq '64bit2' || $rand_alg eq '64bit3' ||
     my $which=($version-1)%$num;   $rand_alg eq '64bit4' ) {
     return $order[$which];   &Apache::response::pushrandomnumber();
    my @order=&Math::Random::random_permutation(@{$dimension{'instances'}});
    my $num=@order;
    my $version=&get_version();
    my $which=($version-1)%$num;
    return $order[$which];
       } else {
    my ($version,$previous) = &get_version();
    my $instance = 
       $Apache::lonhomework::history{"resource.$version.0.$dim.instance"};
    if (defined($instance)) { return $instance; }
   
    &Apache::response::pushrandomnumber();
    my @instances = @{$dimension{'instances'}};
    # remove disabled instances
    for (my $i=0; $i < $#instances; $i++) {
       if ($dimension{$instances[$i].'.disabled'}) {
    splice(@instances,$i,1);
    $i--;
       }
    }
    @instances = &Math::Random::random_permutation(@instances);
    $instance  = $instances[($version-1)%scalar(@instances)];
    if ($version =~ /^\d$/) {
       $Apache::lonhomework::results{"resource.$version.0.$dim.instance"} = 
    $instance;
       $Apache::lonhomework::results{'INTERNAL_store'} = 1; 
    }
    &Apache::response::poprandomnumber();
    return $instance;
       }
 }  }
   
 {  {
     my $last_link;      my $last_link;
       sub link {
    my ($instance,$id) = @_;
    return 'LC_GRADING_criteria_'.$instance.'_'.$id;
       }
     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($dim);
  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 = @_;
     if ($Apache::lonhomework::history{"resource.$version.status"} eq 'pass' ||      $result.=&Apache::scripttag::xmlparse($dimension{'intro'});
  $Apache::lonhomework::history{"resource.$version.status"} eq 'fail') {      my @instances = $instance;
  foreach my $id (@{$dimension{$instance.'.criterias'}}) {      if (&Apache::response::showallfoils()) {
     my $status=$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.status"};   @instances = @{$dimension{'instances'}};
     my $comment=$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"};      }
     $result.='<table border="1"><tr><td>';      foreach my $instance (@instances) {
     if ($status eq 'fail') {   @Apache::scripttag::parser_env = @_;
  $result.='<font color="red">'.&mt('Did not pass').'</font>';   $result.=&Apache::scripttag::xmlparse($dimension{$instance.'.text'});
     } elsif ($status eq 'pass') {   if ($Apache::lonhomework::history{"resource.$version.0.status"} eq 'pass' ||
  $result.='<font color="green">'.&mt('Passed').'</font>';      $Apache::lonhomework::history{"resource.$version.0.status"} eq 'fail') {
     } else {  
  &Apache::lonxml::error("Student viewing a graded bridgetask was show a status of $status");      my $dim_status=$Apache::lonhomework::history{"resource.$version.0.$dim.status"};
       my $mandatory='Mandatory';
       if ($Apache::bridgetask::dimensionmandatory{$dim} eq 'N') {
    $mandatory='Optional';
       }
       my $dim_info="<div class='LC_$dim_status LC_question_grade'>\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 $man_passed=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.0.$dim.$instance.$id.status"} eq 'pass') {
    $opt_passed++;
       }
    } else {
       $man_count++;
       if ($Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.status"} eq 'pass') {
    $man_passed++;
       }
    }
     }      }
     $result.='</td></tr><tr><td>';      if ($man_passed eq $man_count) { $man_passed='all'; }
     if ($Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"}) {      my $opt_req=$dimension{$instance.'.optionalrequired'};
  $result.=&mt('Comment from grader: ').$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"}.'</td></tr><tr><td>';      if ($opt_req !~ /\S/) { $opt_req='0'; }
       $dim_info.="\n<p>".&mt('You passed [_1] of the [_2] mandatory components and [_3] of the [_4] optional components, of which you were required to pass [_5].',$man_passed,$man_count,$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'}}) {
    my $status=$Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.status"};
    my $comment=$Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.comment"};
    my $mandatory=($dimension{$instance.'.criteria.'.$id.'.mandatory'} ne 'N');
    if ($mandatory) {
       $mandatory='Mandatory';
    } else {
       $mandatory='Optional';
    }
    if ($status eq 'fail') {
    } elsif ($status eq 'pass') {
    } else {
       &Apache::lonxml::error("Student viewing a graded bridgetask was shown a status of $status");
    }
    my $status_display=$status;
    $status_display=~s/^([a-z])/uc($1)/e;
    @Apache::scripttag::parser_env = @_;
    $result.=
       '<div class="LC_'.$status.' LC_criteria"><h4>'
       .$mandatory.' Criteria</h4><p>';
    @Apache::scripttag::parser_env = @_;
    $result.=&Apache::scripttag::xmlparse($dimension{$instance.'.criteria.'.$id});
    $result.='</p><p class="LC_grade">'.$status_display.'</p>';
    if ($Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.comment"}) {
       $result.='<p class="LC_comment">'.&mt('Comment: [_1]',$Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.comment"}).'</p>';
    }
    $result.='</div>';
     }      }
     $result.=$dimension{$instance.'.criteria.'.$id}.  
  '</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=&link($instance,$id);
  my $status=$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.status"};   my $status=$Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.status"};
  $result.='<tr><td width="100%" valign="top">'.   $result.='<div class="LC_GRADING_criteria" id="'.$link.'">'."\n".
     '<a name="'.$link.'" />'.      '<div class="LC_GRADING_criteriatext" id="next_'.$last_link.'">'."\n";
     '<a name="next_'.$last_link.'" />'.   @Apache::scripttag::parser_env = @_;
     '<br /><textarea enabled="false" style="width:100%" rows="8" width="25" wrap="hard">'.$dimension{$instance.'.criteria.'.$id}.'</textarea>'.   $result.=&Apache::scripttag::xmlparse($dimension{$instance.'.criteria.'.$id});
    $result.='</div>'."\n".
     #$dimension{$instance.'.criteria.'.$id}.      #$dimension{$instance.'.criteria.'.$id}.
     '</td>'.      '<div class="LC_GRADING_grade">'."\n".
     '<td><nobr>Additional Comment for Student</nobr> <br />'.      '<label class="LC_GRADING_ungraded"><input type="radio" name="HWVAL_'.$link.'" value="ungraded" '.($status eq 'ungraded' || !$status ? 'checked="checked"':'').' />'.&mt('Ungraded').'</label>'."\n".
     '<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>'.      '<label class="LC_GRADING_fail"><input type="radio" name="HWVAL_'.$link.'" value="fail" '.($status eq 'fail' ? 'checked="checked"':'').' />'.&mt('Fail').'</label>'."\n".
     '</td>'.      '<label class="LC_GRADING_pass"><input type="radio" name="HWVAL_'.$link.'" value="pass" '.($status eq 'pass' ? 'checked="checked"':'').' />'.&mt('Pass').'</label>'."\n".
     '<td>'.      '<label class="LC_GRADING_review"><input type="radio" name="HWVAL_'.$link.'" value="review" '.($status eq 'review' ? 'checked="checked"':'').' />'.&mt('Review').'</label>'."\n".
     '<nobr><label><input type="radio" name="HWVAL_'.$link.'" value="ungraded" '.($status eq 'ungraded' || !$status ? 'checked="checked"':'').'/>'.&mt('Ungraded').'</label></nobr><br />'.      '</div>'."\n".
     '<label><input type="radio" name="HWVAL_'.$link.'" value="pass" '.($status eq 'pass' ? 'checked="checked"':'').' />'.&mt('Pass').'</label><br />'.      '<label class="LC_GRADING_comment">'.&mt('Additional Comment for Student')."\n".
     '<label><input type="radio" name="HWVAL_'.$link.'" value="fail" '.($status eq 'fail' ? 'checked="checked"':'').' />'.&mt('Fail').'</label><br />'.      '<textarea class="LC_GRADING_comment_area" name="HWVAL_comment_'.$link.'">'.&HTML::Entities::encode($Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.comment"}).'</textarea>'."\n".
     '<label><input type="radio" name="HWVAL_'.$link.'" value="review" '.($status eq 'review' ? 'checked="checked"':'').' />'.&mt('Review').'</label><br />'.      '</label>'."\n".
     '</td>'.      '<ul class="LC_GRADING_navbuttons">'."\n".
     '<td>'.      '<li><a href="#'.$last_link.'">Prev</a></li>'."\n".
     '<a href="#'.$last_link.'">Prev</a><br />'.      '<li><a href="#next_'.$link.'">Next</a></li>'."\n".
     '<a href="#next_'.$link.'">Next</a><br /><br /><br />'.      '</ul>'."\n".
     '<input type="submit" name="next" value="'.                      '</div>'."\n";
     &mt('Done').'" /> '.   $result.=&grading_history($version,$dim,$instance,$id);
     '<input type="submit" name="stop" value="'.  
     &mt('Stop').'" /> '.  
     '</td></tr>';  
  $result.='<tr><td colspan="4">';  
  my (undef,undef,$udom,$uname) = &Apache::lonxml::whichuser();  
  my $file_url = '/uploaded/'.$udom.'/'.$uname.'/portfolio';  
  foreach my $partial_file (split(',',$Apache::lonhomework::history{"resource.$version.bridgetask.portfiles"})) {  
     my $file=$file_url.$partial_file;  
     &Apache::lonnet::allowuploaded('/adm/bridgetask',$file);  
     $result.='<a href="'.$file.'" target="lonGRDs"><img src="'.  
  &Apache::loncommon::icon($file).'" border=0"> '.$file.  
  '</a>';  
  }  
  $result.='</td></tr>';  
  $last_link=$link;   $last_link=$link;
     }      }
  } elsif ($target eq 'grade' && $env{'form.webgrade'}) {   } elsif ($target eq 'grade' && $env{'form.webgrade'}) {
Line 902  sub get_instance { Line 1892  sub get_instance {
     my $ungraded=0;      my $ungraded=0;
     my $review=0;      my $review=0;
     foreach my $id (@{$dimension{$instance.'.criterias'}}) {      foreach my $id (@{$dimension{$instance.'.criterias'}}) {
  my $status=$Apache::lonhomework::results{"resource.$version.$dim.$instance.$id.status"}=$env{'form.HWVAL_criteria_'.$instance.'_'.$id};   my $link=&link($instance,$id);
  $Apache::lonhomework::results{"resource.$version.$dim.$instance.$id.comment"}=$env{'form.HWVAL_comment_criteria_'.$instance.'_'.$id};   my $status=$Apache::lonhomework::results{"resource.$version.0.$dim.$instance.$id.status"}=$env{'form.HWVAL_'.$link};
    $Apache::lonhomework::results{"resource.$version.0.$dim.$instance.$id.comment"}=$env{'form.HWVAL_comment_'.$link};
  my $mandatory=($dimension{$instance.'.criteria.'.$id.'.mandatory'} ne 'N');   my $mandatory=($dimension{$instance.'.criteria.'.$id.'.mandatory'} ne 'N');
  if ($status eq 'pass') {   if ($status eq 'pass') {
     if (!$mandatory) { $optional_passed++; }      if (!$mandatory) { $optional_passed++; }
Line 914  sub get_instance { Line 1905  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 922  sub get_instance { Line 1913  sub get_instance {
     }      }
     &Apache::lonxml::debug("all instance ".join(':',@{$dimension{$instance.'.criterias'}})." results -> m_f $mandatory_failed o_p $optional_passed u $ungraded r $review");      &Apache::lonxml::debug("all instance ".join(':',@{$dimension{$instance.'.criterias'}})." results -> m_f $mandatory_failed o_p $optional_passed u $ungraded r $review");
     if ($review) {      if ($review) {
  $Apache::lonhomework::results{"resource.$version.$dim.status"}=   $Apache::lonhomework::results{"resource.$version.0.$dim.status"}=
     'review';      'review';
     } elsif ($ungraded) {      } elsif ($ungraded) {
  $Apache::lonhomework::results{"resource.$version.$dim.status"}=   $Apache::lonhomework::results{"resource.$version.0.$dim.status"}=
     'ungraded';      'ungraded';
     } elsif ($mandatory_failed) {      } elsif ($mandatory_failed) {
  $Apache::lonhomework::results{"resource.$version.$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 {
       # any other targets no output
       undef($result);
  }   }
  return $result;   return $result;
     }      }
 }  }
   
   sub grading_history {
       my ($version,$dim,$instance,$criteria) = @_;
       if (!&Apache::lonnet::allowed('mgq',$env{'request.course.id'})) {
    return '';
       }
       my ($result,$grader);
       my $scope="resource.$version.0.$dim.$instance.$criteria";
       foreach my $t (1..$Apache::lonhomework::history{'version'}) {
    if (exists($Apache::lonhomework::history{$t.':resource.0.regrader'})) {
       my ($gname,$gdom) = 
    split(':',$Apache::lonhomework::history{$t.':resource.0.regrader'});
       my $fullname = &Apache::loncommon::plainname($gname,$gdom);
       $grader = &Apache::loncommon::aboutmewrapper($fullname,
    $gname,$gdom);
    }
    my $entry;
    if (exists($Apache::lonhomework::history{"$t:$scope.status"})) {
       $entry.="<tt>".$Apache::lonhomework::history{"$t:$scope.status"}.'</tt>';
    }
    if (exists($Apache::lonhomework::history{"$t:$scope.comment"})) {
       $entry.=' comment: "'.$Apache::lonhomework::history{"$t:$scope.comment"}.'"';
    }
    if ($entry) {
       $result.= "<li>$grader : $entry </li>";
    }
       }
       if ($result) {
    return '<ul class="LC_GRADING_pastgrading">'.$result.'</ul>';
       }
       return '';
   }
   
 sub start_IntroParagraph {  sub start_IntroParagraph {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     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') {
       $dimension{'intro'}=&Apache::lonxml::get_all_text('/introparagraph',$parser,$style);
   
    } elsif ($tagstack->[-2] eq 'Task' && $target eq 'webgrade') {
     &Apache::lonxml::startredirection();      &Apache::lonxml::startredirection();
  }   }
   
     }      }
     return $result;      return $result;
 }  }
   
 sub end_IntroParagraph {  sub end_IntroParagraph {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result;      if ($tagstack->[-2] eq 'Task' && $target eq 'webgrade') {
     if ($target eq 'web' || $target eq 'webgrade') {   my $result = &Apache::lonxml::endredirection();
  if ($tagstack->[-2] eq 'Dimension' || $target eq 'webgrade') {  
     $dimension{'intro'}=&Apache::lonxml::endredirection();  
  }  
     }      }
     return $result;  
 }  }
   
 sub start_Instance {  sub start_Instance {
Line 969  sub start_Instance { Line 1995  sub start_Instance {
     push(@Apache::bridgetask::instancelist,$id);      push(@Apache::bridgetask::instancelist,$id);
     $dimension{$id.'.optionalrequired'}=      $dimension{$id.'.optionalrequired'}=
  &Apache::lonxml::get_param('OptionalRequired',$parstack,$safeeval);   &Apache::lonxml::get_param('OptionalRequired',$parstack,$safeeval);
       my $disabled = &Apache::lonxml::get_param('Disabled',$parstack,$safeeval);
       if (lc($disabled) eq 'yes') {
    $dimension{$id.'.disabled'}='1';
       }
     return '';      return '';
 }  }
   
 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,$style)=@_;
       my $instance_id=$Apache::bridgetask::instance[-1];
       my $text=&Apache::lonxml::get_all_text('/instancetext',$parser,$style);
     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,$style)=@_;
     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,$style);
     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 1016  sub end_Criteria { Line 2033  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>
     $msg      $msg
 <form name="checkout" method="POST" action="$env{'request.uri'}">  <form name="checkout" method="post" action="$env{'request.uri'}">
 <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.32  
changed lines
  Added in v.1.150


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