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

Diff for /loncom/homework/bridgetask.pm between versions 1.26 and 1.27

version 1.26, 2005/05/19 21:28:06 version 1.27, 2005/05/20 18:07:29
Line 71  sub proctor_check_auth { Line 71  sub proctor_check_auth {
     if ($authhost ne 'no_host') {      if ($authhost ne 'no_host') {
  my $version=   my $version=
     $Apache::lonhomework::results{'resource.version'}=      $Apache::lonhomework::results{'resource.version'}=
     $Apache::lonhomework::history{'resource.version'}++;      ++$Apache::lonhomework::history{'resource.version'};
  $Apache::lonhomework::results{"resource.$version.checkedin"}=   $Apache::lonhomework::results{"resource.$version.checkedin"}=
     $user.'@'.$domain;      $user.'@'.$domain;
  $Apache::lonhomework::results{"resource.$version.checkedin.slot"}=   $Apache::lonhomework::results{"resource.$version.checkedin.slot"}=
Line 271  sub end_Task { Line 271  sub end_Task {
     if ($target eq 'web') {      if ($target eq 'web') {
  if ($status eq 'CAN_ANSWER') {   if ($status eq 'CAN_ANSWER') {
     $result.="\n".'<table border="1">'.      $result.="\n".'<table border="1">'.
  &Apache::inputtags::file_selector($version,   &Apache::inputtags::file_selector('0',"bridgetask","*",
   "bridgetask","*",  
   'portfolioonly').    'portfolioonly').
   "</table>";    "</table>";
     $result.=&Apache::inputtags::gradestatus('0');      $result.=&Apache::inputtags::gradestatus('0');
Line 388  sub check_queue_unlock { Line 387  sub check_queue_unlock {
 }  }
   
 sub remove_from_queue {  sub remove_from_queue {
     &Apache::lonxml::debug("Want to remove. Done?");      my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser();
       my $cnum=$env{'course.'.$cid.'.num'};
       my $cdom=$env{'course.'.$cid.'.domain'};
       my $key="$symb\0queue\0$uname\@$udom";
       my @keys=($key,"$key\0locked");
       &Apache::lonnet::del('gradingqueue',\@keys,$cdom,$cnum);
 }  }
   
 sub setup_env_for_other_user {  sub setup_env_for_other_user {
Line 417  sub show_queue { Line 421  sub show_queue {
     my $cdom=$env{'course.'.$cid.'.domain'};      my $cdom=$env{'course.'.$cid.'.domain'};
     my $regexp="^$symb\0";      my $regexp="^$symb\0";
     my %queue=&Apache::lonnet::dump('gradingqueue',$cdom,$cnum,$regexp);      my %queue=&Apache::lonnet::dump('gradingqueue',$cdom,$cnum,$regexp);
     $result.="\n<h3>Current Queue</h3><table><tr><th>resource</th>".      $result.="\n<h3>Current Queue</h3><table border='1'><tr><th>resource</th>".
  "<th>user</th><th>type</th><th>data</th></tr>";   "<th>user</th><th>type</th><th>data</th></tr>";
     foreach my $key (sort(keys(%queue))) {      foreach my $key (sort(keys(%queue))) {
  if ($key=~/locked$/) {   if ($key=~/locked$/) {
     my ($symb,$uname,$udom) = &decode_queue_key($key);      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>";
     $result.='<td>lock</td><td>'.$queue{$key}.'</td></tr>';      $result.='<td>lock</td><td>'.$queue{$key}.'</td></tr>';
  } elsif ($key=~/timestamp$/) {   } elsif ($key=~/timestamp$/) {
     my ($symb,undef) = split("\0",$key);      my ($symb,undef) = split("\0",$key);
     my $title=&Apache::lonnet::gettitle($symb);      my $title=&Apache::lonnet::gettitle($symb);
     $result.="<tr><td>$title</td><td></td><td>";      $result.="<tr><td>$title</td><td></td>";
     $result.='<td>last queue modification time</td><td>'.      $result.='<td>last queue modification time</td><td>'.
  &Apache::lonlocal::locallocaltime($queue{$key})."</td></tr>";   &Apache::lonlocal::locallocaltime($queue{$key})."</td></tr>";
  } else {   } else {
     my ($symb,$uname,$udom) = &decode_queue_key($key);      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>";
     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);
     $result.='<td>queue entry</td><td>End time: '.      $result.='<td>queue entry</td><td>Slot: '.$slot.' End time: '.
  &Apache::lonlocal::locallocaltime($slot_data{'endtime'}).   &Apache::lonlocal::locallocaltime($slot_data{'endtime'}).
  "</td></tr>";   "</td></tr>";
  }   }
Removed from v.1.26  
changed lines
  Added in v.1.27

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