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

Diff for /loncom/homework/bridgetask.pm between versions 1.14 and 1.19

version 1.14, 2005/05/03 00:05:41 version 1.19, 2005/05/09 21:55:01
Line 52  sub initialize_bridgetask { Line 52  sub initialize_bridgetask {
     @Apache::bridgetask::instance=();      @Apache::bridgetask::instance=();
     # list of all Instance ids seen in this problem      # list of all Instance ids seen in this problem
     @Apache::bridgetask::instancelist=();      @Apache::bridgetask::instancelist=();
       # key of queud user data that we are currently grading
       $Apache::bridgetask::queue_key='';
 }  }
   
 sub proctor_check_auth {  sub proctor_check_auth {
Line 93  sub add_grading_button { Line 95  sub add_grading_button {
 sub start_Task {  sub start_Task {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   
     &Apache::structuretags::initialize_storage();  
     &Apache::lonhomework::showhash(%Apache::lonhomework::history);  
     my ($status,$accessmsg,$slot);      my ($status,$accessmsg,$slot);
       if ($target ne 'webgrade') {
    &Apache::structuretags::initialize_storage();
    &Apache::lonhomework::showhash(%Apache::lonhomework::history);
       } 
   
     $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      #should get back a <html> or the neccesary stuff to start XML/MathML
     my ($result,$head_tag_start,$body_tag_start,$form_tag_start)=      my ($result,$head_tag_start,$body_tag_start,$form_tag_start)=
  &Apache::structuretags::page_start($target,$token,$tagstack,$parstack,$parser,$safeeval);   &Apache::structuretags::page_start($target,$token,$tagstack,$parstack,$parser,$safeeval);
       
     if ($target eq 'web') {      if ($target eq 'web') {
  $body_tag_start.=&add_previous_version_button();   $body_tag_start.=&add_previous_version_button();
  if ($Apache::lonhomework::modifygrades) {   if ($Apache::lonhomework::modifygrades) {
Line 174  sub start_Task { Line 179  sub start_Task {
     }      }
  }   }
     } elsif ($target eq 'webgrade') {      } elsif ($target eq 'webgrade') {
  $result.=$head_tag_start.$body_tag_start.$form_tag_start.   $result.=$head_tag_start.$body_tag_start.$form_tag_start;
     'Yahoo!';   $result.=
       '<input type="hidden" name="grade_target" value="webgrade" />';
  $result.=&show_queue();   $result.=&show_queue();
  $result.=&get_from_queue();   my $todo=&get_from_queue();
    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>';
       $result.='<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);
       $result.="\n".'<table width="100%" style="width:100%" border="1">';
    } else {
       $result.="\n".
    '<table><tr><td>No user to be graded.</td></tr></table>';
       my $bodytext=&Apache::lonxml::get_all_text("/task",$parser);
    }
   
     } 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 191  sub end_Task { Line 213  sub end_Task {
     my $result='';      my $result='';
     my $status=$Apache::inputtags::status['-1'];      my $status=$Apache::inputtags::status['-1'];
     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 'webgrade') {   $target eq 'tex') {
  if (   if (
     (($target eq 'web') && ($env{'request.state'} ne 'construct')) ||      (($target eq 'web') && ($env{'request.state'} ne 'construct')) ||
     ($target eq 'answer') || ($target eq 'tex')      ($target eq 'answer') || ($target eq 'tex')
    ) {     ) {
     if ($target eq 'web') {      if ($target eq 'web') {
  if ($status eq 'CAN_ANSWER') {   if ($status eq 'CAN_ANSWER') {
     $result.='<table border="1">'.      $result.="\n".'<table border="1">'.
  &Apache::inputtags::file_selector('0',"bridgetask","*",   &Apache::inputtags::file_selector('0',"bridgetask","*",
   'portfolioonly').    'portfolioonly').
   "</table>";    "</table>";
Line 224  sub end_Task { Line 246  sub end_Task {
  &add_to_queue();   &add_to_queue();
     }      }
  }   }
       } elsif ($target eq 'webgrade') {
    $result.="</table>\n<hr />";
    $result.='<input type="submit" name="next" value="'.
       &mt('Save & Next').'" /> ';
    $result.='<input type="submit" name="end" value="'.
       &mt('Save & Stop Grading').'" /> ';
    $result.='<input type="submit" name="end" value="'.
       &mt('Throw Away & Stop Grading').'" /> ';
    $result.='</form>'.&Apache::loncommon::endbodytag().'</html>';
     } elsif ($target eq 'meta') {      } elsif ($target eq 'meta') {
  $result.='<parameter part="0" package="Task"></parameter>'."\n";   $result.='<parameter part="0" package="Task"></parameter>'."\n";
  #$result.=&Apache::response::meta_part_order();   #$result.=&Apache::response::meta_part_order();
Line 233  sub end_Task { Line 264  sub end_Task {
     return $result;      return $result;
 }  }
   
   sub setup_env_for_other_user {
       my ($queue_key,$safeeval)=@_;
       my ($symb,$uname,$udom)=&decode_queue_key($queue_key);
       $env{'form.grade_symb'}=$symb;
       $env{'form.grade_domain'}=$udom;
       $env{'form.grade_username'}=$uname;
       $env{'form.grade_courseid'}=$env{'request.course.id'};
       &Apache::lonxml::initialize_rndseed($safeeval);
   }
   
 sub add_to_queue {  sub add_to_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 %data;      my %data;
     #$data{"$symb\0timestamp"}=time;  
     $data{"$symb\0queue\0$uname\@$udom"}=[$Apache::inputtags::slot_name];      $data{"$symb\0queue\0$uname\@$udom"}=[$Apache::inputtags::slot_name];
     &Apache::lonnet::put('gradingqueue',\%data,$cdom,$cnum);      &Apache::lonnet::put('gradingqueue',\%data,$cdom,$cnum);
 }  }
Line 248  sub show_queue { Line 288  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 $regexp="^$symb\0queue";      my $regexp="^$symb\0";
     my %queue=&Apache::lonnet::dump('gradingqueue',$cdom,$cnum,$regexp);      my %queue=&Apache::lonnet::dump('gradingqueue',$cdom,$cnum,$regexp);
     $result.="<table><tr><th>resource</th><th>user</th><th>Time available for grading</th></tr>";      $result.="\n<h3>Current Queue</h3><table><tr><th>resource</th><th>user</th><th>type</th><th>data</th></tr>";
     foreach my $key (sort(keys(%queue))) {      foreach my $key (sort(keys(%queue))) {
  my ($symb,undef,$user) = split("\0",$key);   if ($key=~/locked$/) {
  my ($uname,$udom) = split('@',$user);      my ($symb,$uname,$udom) = &decode_queue_key($key);
  my $title=&Apache::lonnet::gettitle($symb);      my $title=&Apache::lonnet::gettitle($symb);
  $result.="<tr><td>$title</td><td>$uname</td><td>";      $result.="<tr><td>$title</td><td>$uname</td><td>";
  my $slot=$queue{$key}->[0];      $result.='<td>lock</td><td>'.$queue{$key}.'</td></tr>';
  my %slot_data=&Apache::lonnet::get_slot($slot);   } elsif ($key=~/timestamp$/) {
  $result.="End time: ".&Apache::lonlocal::locallocaltime($slot_data{'endtime'})."</td></tr>";      my ($symb,undef) = split("\0",$key);
       my $title=&Apache::lonnet::gettitle($symb);
       $result.="<tr><td>$title</td><td></td><td>";
       $result.='<td>last queue modification time</td><td>'.
    &Apache::lonlocal::locallocaltime($queue{$key})."</td></tr>";
    } else {
       my ($symb,$uname,$udom) = &decode_queue_key($key);
       my $title=&Apache::lonnet::gettitle($symb);
       $result.="<tr><td>$title</td><td>$uname</td><td>";
       my $slot=$queue{$key}->[0];
       my %slot_data=&Apache::lonnet::get_slot($slot);
       $result.='<td>queue entry</td><td>End time: '.&Apache::lonlocal::locallocaltime($slot_data{'endtime'})."</td></tr>";
    }
     }      }
     $result.="</table>";      $result.="</table><hr />\n";
     return $result;      return $result;
 }  }
   
Line 272  sub decode_queue_key { Line 324  sub decode_queue_key {
 }  }
   
 sub queue_key_locked {  sub queue_key_locked {
     my ($key)=@_;      my ($key,$cdom,$cnum)=@_;
     my ($key_locked,$value)=      my ($key_locked,$value)=
  &Apache::lonnet::get('gradingqueue',["$key\0locked"],$cdom,$cnum);   &Apache::lonnet::get('gradingqueue',["$key\0locked"],$cdom,$cnum);
     if ($key_locked eq "$key\0locked") {      if ($key_locked eq "$key\0locked") {
Line 282  sub queue_key_locked { Line 334  sub queue_key_locked {
 }  }
   
 sub pick_from_queue_data {  sub pick_from_queue_data {
     my ($check_section,$queue)=@_;      my ($check_section,$queue,$cdom,$cnum)=@_;
     foreach my $key (sort(keys(%$queue))) {      foreach my $key (keys(%$queue)) {
  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 ne $check_section) { next; }      if ($section eq $check_section) {
    &Apache::lonnet::logthis("my sec");
    next;
       }
  }   }
  my $slot=$queue->{$key}[0];   my $slot=$queue->{$key}[0];
  my %slot_data=&Apache::lonnet::get_slot($slot);   my %slot_data=&Apache::lonnet::get_slot($slot);
  if ($slot_data{'endtime'} > time) { next; }   if ($slot_data{'endtime'} > time) { 
  if (&queue_key_locked($key)) { next; }      &Apache::lonnet::logthis("not time");
       next;
    }
    if (&queue_key_locked($key,$cdom,$cnum)) {
       &Apache::lonnet::logthis("someone already has um.");
       next;
    }
  return $key;   return $key;
     }      }
     return undef;      return undef;
 }  }
   
   sub find_mid_grade {
       my ($symb,$cdom,$cnum)=@_;
       my $todo=&Apache::lonnet::unescape($env{'form.gradingkey'});
       my $me=$env{'user.name'}.'@'.$env{'user.domain'};
       if ($todo) {
    my $who=&queue_key_locked($todo,$cdom,$cnum);
    if ($who eq $me) { return $todo; }
       }
       my $regexp="^$symb\0.*\0locked\$";
       my %locks=&Apache::lonnet::dump('gradingqueue',$cdom,$cnum,$regexp);
       foreach my $key (keys(%locks)) {
    my $who=$locks{$key};
    if ($who eq $me) {
       $todo=$key;
       $todo=~s/\0locked$//;
       return $todo;
    }
       }
       return undef;
   }
   
 sub get_from_queue {  sub get_from_queue {
     my $result;      my $result;
     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;      my $todo;
       # FIXME need to find if I am 'mid grading'
       $todo=&find_mid_grade($symb,$cdom,$cnum);
       &Apache::lonnet::logthis("found ".join(':',&decode_queue_key($todo)));
       if ($todo) { return $todo; }
     while (1) {      while (1) {
  my $starttime=time;   my $starttime=time;
  &Apache::lonnet::put('gradingqueue',{"$symb\0timestamp"=>$starttime},   &Apache::lonnet::put('gradingqueue',{"$symb\0timestamp"=>$starttime},
      $cdom,$cnum);       $cdom,$cnum);
    &Apache::lonnet::logthis("$starttime");
  my $regexp="^$symb\0queue\0";   my $regexp="^$symb\0queue\0";
  my %queue=&Apache::lonnet::dump('gradingqueue',$cdom,$cnum,$regexp);   my %queue=&Apache::lonnet::dump('gradingqueue',$cdom,$cnum,$regexp);
  #make a pass looking for a user in my section   #make a pass looking for a user in my section
  if ($env{'request.course.sec'}) {   if ($env{'request.course.sec'}) {
     $todo=&pick_from_queue_data($env{'request.course.sec'},\%queue);      &Apache::lonnet::logthis("sce");
       $todo=&pick_from_queue_data($env{'request.course.sec'},\%queue,
    $cdom,$cnum);
       &Apache::lonnet::logthis("sce $todo");
  }   }
  # no one in our section so look for any user that is ready for grading   # no one in our section so look for any user that is ready for grading
  if (!$todo) {   if (!$todo) {
     $todo=&pick_from_queue_data($env{'request.course.sec'},\%queue);      &Apache::lonnet::logthis("no sce");
       $todo=&pick_from_queue_data($env{'request.course.sec'},\%queue,
    $cdom,$cnum);
       &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");
  # otherwise found someone so lets try to lock them   # otherwise found someone so lets try to lock them
  my $success=&Apache::lonnet::newput('gradingqueue',   my $success=&Apache::lonnet::newput('gradingqueue',
     {"$todo\0locked"=>      {"$todo\0locked"=>
  $env{'user.name'}.'@'.$env{'user.domain'}},   $env{'user.name'}.'@'.$env{'user.domain'}},
    $cdom,$cnum);     $cdom,$cnum);
  # someone else already picked them   # someone else already picked them
    &Apache::lonnet::logthis("success $todo");
  if ($success ne 'ok') { next; }   if ($success ne 'ok') { next; }
  my (undef,$endtime)=   my (undef,$endtime)=
     &Apache::lonnet::get('gradingqueue',["$symb\0timestamp"],      &Apache::lonnet::get('gradingqueue',["$symb\0timestamp"],
  $cdom,$cnum);   $cdom,$cnum);
    &Apache::lonnet::logthis("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 338  sub get_from_queue { Line 434  sub get_from_queue {
     my ($key,$value)=      my ($key,$value)=
  &Apache::lonnet::get('gradingqueue',["$todo"],   &Apache::lonnet::get('gradingqueue',["$todo"],
      $cdom,$cnum);       $cdom,$cnum);
       &Apache::lonnet::logthis("check  $key .. $value");
     if ($key eq $todo && ref($value)) {      if ($key eq $todo && ref($value)) {
     } else {      } else {
  &Apache::lonnet::del('gradingqueue',["$todo\0locked"],   &Apache::lonnet::del('gradingqueue',["$todo\0locked"],
      $cdom,$cnum);       $cdom,$cnum);
    &Apache::lonnet::logthis("del");
  next;   next;
     }      }
  }   }
    &Apache::lonnet::logthis("last $todo");
  last;   last;
     }      }
     return $todo;      return $todo;
Line 370  sub end_ClosingParagraph { Line 469  sub end_ClosingParagraph {
     return $result;      return $result;
 }  }
   
   sub get_id {
       my ($parstack,$safeeval)=@_;
       my $id=&Apache::lonxml::get_param('id',$parstack,$safeeval);
       if (!$id) { $id=$Apache::lonxml::curdepth; }
       return $id;
   }
   
 my %dimension;  my %dimension;
 sub start_Dimension {  sub start_Dimension {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     undef(%dimension);      undef(%dimension);
     my $dim_id=$Apache::lonxml::curdepth;      my $dim_id=&get_id($parstack,$safeeval);
     $Apache::bridgetask::dimension=$dim_id;      $Apache::bridgetask::dimension=$dim_id;
     push(@Apache::bridgetask::dimensionlist,$dim_id);      push(@Apache::bridgetask::dimensionlist,$dim_id);
     undef(@Apache::bridgetask::instance);      undef(@Apache::bridgetask::instance);
Line 390  sub get_instance { Line 496  sub get_instance {
     return $order[0];      return $order[0];
 }  }
   
 sub end_Dimension {  {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my $last_link;
     my $result;      sub end_Dimension {
     if ($target eq 'web') {   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
  my $instance=&get_instance();   my $result;
  $result=$dimension{'intro'}.$dimension{$instance.'.text'};  
     } elsif ($target eq 'webgrade') {  
  my $instance=&get_instance();   my $instance=&get_instance();
  $result.='<table>';   if ($target eq 'web') {
  foreach my $id (@{$dimension{$instance.'.criterias'}}) {      $result=$dimension{'intro'}.$dimension{$instance.'.text'};
     $result.='<tr><td>'.   } elsif ($target eq 'webgrade') {
  $dimension{$instance.'.criteria.'.$id}.'</td></tr>';      foreach my $id (@{$dimension{$instance.'.criterias'}}) {
    my $link='criteria_'.$instance.'_'.$id;
    $result.='<tr><td width="100%" valign="top">'.
       '<a name="'.$link.'" />'.
       '<a name="next_'.$last_link.'" />'.
       '<br /><textarea enabled="false" style="width:100%" rows="8" width="25" wrap="hard">'.$dimension{$instance.'.criteria.'.$id}.'</textarea>'.
       #$dimension{$instance.'.criteria.'.$id}.
       '</td>'.
       '<td><nobr>Additional Comment for Student</nobr> <br />'.
       '<textarea style="width:100%" rows="8" width="25" wrap="hard" name="HWVAL_comment_'.$link.'"></textarea>'.
       '</td>'.
       '<td>'.
       '<nobr><label><input type="radio" name="HWVAL_'.$link.'" value="ungraded" />Ungraded</label></nobr><br />'.
       '<label><input type="radio" name="HWVAL_'.$link.'" value="pass" />Pass</label><br />'.
       '<label><input type="radio" name="HWVAL_'.$link.'" value="fail" />Fail</label><br />'.
       '<label><input type="radio" name="HWVAL_'.$link.'" value="review" />Review</label><br />'.
       '</td>'.
       '<td>'.
       '<a href="#'.$last_link.'">Prev</a><br />'.
       '<a href="#next_'.$link.'">Next</a><br />'.
       '</td></tr>';
    $last_link=$link;
       }
    } elsif ($target eq 'grade') {
       my $optional_passed=0;
       foreach my $id (@{$dimension{$instance.'.criterias'}}) {
    if ($env{'form.HWVAL_criteria_'.$instance.'_'.$id} eq 'pass') {
    } elsif ($env{'form.HWVAL_criteria_'.$instance.'_'.$id} eq 'fail') {
    } elsif ($env{'form.HWVAL_criteria_'.$instance.'_'.$id} eq 'ungraded') {
    } elsif ($env{'form.HWVAL_criteria_'.$instance.'_'.$id} eq 'review') {
    }
       }
  }   }
  $result.='</table>';   return $result;
     }      }
     return $result;  
 }  }
   
 sub start_IntroParagraph {  sub start_IntroParagraph {
Line 432  sub end_IntroParagraph { Line 566  sub end_IntroParagraph {
   
 sub start_Instance {  sub start_Instance {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     push(@{$dimension{'instances'}},$Apache::lonxml::curdepth);      my $id=&get_id($parstack,$safeeval);
     push(@Apache::bridgetask::instance,$Apache::lonxml::curdepth);      push(@{$dimension{'instances'}},$id);
     push(@Apache::bridgetask::instancelist,$Apache::lonxml::curdepth);      push(@Apache::bridgetask::instance,$id);
       push(@Apache::bridgetask::instancelist,$id);
       $dimension{$instance_id.'.optionalrequired'}=
    &Apache::lonxml::get_param('OptionalRequired',$parstack,$safeeval);
     return '';      return '';
 }  }
   
Line 473  sub end_Criteria { Line 610  sub end_Criteria {
     my $instance_id=$Apache::bridgetask::instance[-1];      my $instance_id=$Apache::bridgetask::instance[-1];
     if ($target eq 'web' || $target eq 'webgrade') {      if ($target eq 'web' || $target eq 'webgrade') {
  my $criteria=&Apache::lonxml::endredirection();   my $criteria=&Apache::lonxml::endredirection();
  my $id=$Apache::lonxml::curdepth;   my $id=&get_id($parstack,$safeeval);
  $dimension{$instance_id.'.criteria.'.$id}=$criteria;   $dimension{$instance_id.'.criteria.'.$id}=$criteria;
    $dimension{$instance_id.'.criteria.'.$id.'.mandatory'}=
       &Apache::lonxml::get_param('Mandatory',$parstack,$safeeval);
  push(@{$dimension{$instance_id.'.criterias'}},$id);   push(@{$dimension{$instance_id.'.criterias'}},$id);
     }      }
     return '';      return '';
Removed from v.1.14  
changed lines
  Added in v.1.19

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