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

Diff for /loncom/homework/bridgetask.pm between versions 1.58 and 1.59

version 1.58, 2005/10/01 02:06:06 version 1.59, 2005/10/01 03:27:44
Line 144  sub add_previous_version_button { Line 144  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;
       my $numsections=&Apache::loncommon::get_sections($cdom,$cnum,\%sections);
       my $size=5;
       if (scalar(keys(%sections)) < 3) {
    $size=scalar(keys(%sections))+2;
       }
       my $sec_select = '<select 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 name=\"$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 (&Apache::lonnet::allowed('mgq',$env{'request.course.id'})) {      if (&Apache::lonnet::allowed('mgq',$env{'request.course.id'})) {
  my ($entries,$ready,$locks)=&get_queue_counts('gradingqueue');   my ($entries,$ready,$locks)=&get_queue_counts('gradingqueue');
    $result.='<p>Specify a section: '.$sec_select.'</p>';
  $result.='<p>'.&mt("Grading Queue has [_1] entries. [_2] of them are ready to be graded and [_3] of them are currently being graded",$entries,$ready,$locks);   $result.='<p>'.&mt("Grading Queue has [_1] entries. [_2] of them are ready to be graded and [_3] of them are currently being graded",$entries,$ready,$locks);
   
  $result.=' <input type="submit" name="reviewagrading" value="'.   $result.=' <input type="submit" name="reviewagrading" value="'.
Line 482  sub get_key_todo { Line 499  sub get_key_todo {
  if ($env{'form.stop'}) {   if ($env{'form.stop'}) {
     return (undef,'stop');      return (undef,'stop');
  } elsif ($env{'form.next'}) {   } elsif ($env{'form.next'}) {
     return (undef,'show_list');      return (undef,'select_user');
  }   }
     }      }
     return ($gradingkey,'selected');      return ($gradingkey,'selected');
  } else {   } else {
     return (undef,'show_list');      return (undef,'select_user');
  }   }
     }      }
     if (defined($env{'form.queue'}) && defined($env{'form.gradingkey'})      if (defined($env{'form.queue'}) && defined($env{'form.gradingkey'})
Line 862  sub show_queue { Line 879  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();
   
     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;
Line 872  sub show_queue { Line 896  sub show_queue {
     if ($with_selects) { $result.="<th></th>"; }      if ($with_selects) { $result.="<th></th>"; }
     $result.="<th>resource</th><th>user</th><th>type</th><th>data</th></tr>";      $result.="<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,$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);  
     my $title=&Apache::lonnet::gettitle($symb);      my $title=&Apache::lonnet::gettitle($symb);
     $result.="<tr><td>$title</td><td>$uname</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>';
Line 884  sub show_queue { Line 909  sub show_queue {
     $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>";
  } elsif ($key!~/(timestamp|locked)$/) {   } elsif ($key!~/(timestamp|locked)$/) {
     my ($symb,$uname,$udom) = &decode_queue_key($key);  
     my $title=&Apache::lonnet::gettitle($symb);      my $title=&Apache::lonnet::gettitle($symb);
     $result.="<tr>";      $result.="<tr>";
     my $slot=$queue{$key}->[0];      my $slot=$queue{$key}->[0];
Line 1116  sub select_user { Line 1140  sub select_user {
     my ($symb,$cid)=&Apache::lonxml::whichuser();      my ($symb,$cid)=&Apache::lonxml::whichuser();
     my $result.='<table border="1">';      my $result.='<table border="1">';
   
       my @chosen_sections=
    &Apache::loncommon::get_env_multiple('form.chosensections');
     &Apache::grades::init_perm();      &Apache::grades::init_perm();
     my ($classlist,$section,$fullname)=&Apache::grades::getclasslist('all',);      my ($classlist,$section,$fullname)=&Apache::grades::getclasslist(\@chosen_sections,);
     &Apache::grades::reset_perm();      &Apache::grades::reset_perm();
   
     foreach my $student (sort {lc($$fullname{$a}) cmp lc($$fullname{$b}) } keys %$fullname) {      foreach my $student (sort {lc($$fullname{$a}) cmp lc($$fullname{$b}) } keys %$fullname) {
  my ($uname,$udom) = split(/:/,$student);   my ($uname,$udom) = split(/:/,$student);
   
  my %status = &get_student_status($symb,$cid,$udom,$uname);   my %status = &get_student_status($symb,$cid,$udom,$uname);
  my $queue = 'none';   my $queue = 'none';
  my $cannot_grade;   my $cannot_grade;
Removed from v.1.58  
changed lines
  Added in v.1.59

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