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

Diff for /loncom/homework/bridgetask.pm between versions 1.152 and 1.156

version 1.152, 2006/05/16 21:21:31 version 1.156, 2006/05/25 19:55:10
Line 1198  sub add_to_queue { Line 1198  sub add_to_queue {
     return &Apache::lonnet::cput($queue,\%data,$cdom,$cnum);      return &Apache::lonnet::cput($queue,\%data,$cdom,$cnum);
 }  }
   
   sub get_limited_classlist {
       my ($sections) = @_;
   
       my $classlist = &Apache::loncoursedata::get_classlist();
   
       if (!grep('all',@{ $sections })) {
    foreach my $student (keys(%$classlist)) {
       my $section  = 
    $classlist->{$student}[&Apache::loncoursedata::CL_SECTION()];
       if (! grep($section,@{ $sections })) {
    delete($classlist->{$student});
       }
    }
       }
       return $classlist;
   }
   
   
 sub show_queue {  sub show_queue {
     my ($queue,$with_selects)=@_;      my ($queue,$with_selects)=@_;
     my $result;      my $result;
Line 1207  sub show_queue { Line 1225  sub show_queue {
   
     my @chosen_sections=      my @chosen_sections=
  &Apache::loncommon::get_env_multiple('form.chosensections');   &Apache::loncommon::get_env_multiple('form.chosensections');
     &Apache::grades::init_perm();  
     my ($classlist,$section,$fullname)=&Apache::grades::getclasslist(\@chosen_sections,);      my $classlist = &get_limited_classlist(\@chosen_sections);
     &Apache::grades::reset_perm();  
     if (!(grep(/^all$/,@chosen_sections))) {      if (!(grep(/^all$/,@chosen_sections))) {
  $result.='<p> Showing only sections <tt>'.join(', ',@chosen_sections).   $result.='<p> Showing only sections <tt>'.join(', ',@chosen_sections).
     '</tt>.</p> '."\n";      '</tt>.</p> '."\n";
     }      }
   
       my ($view,$view_section);
       my $scope = $env{'request.course.id'};
       if (!($view=&Apache::lonnet::allowed('vgr',$scope))) {
    $scope .= '/'.$env{'request.course.sec'};
    if ( $view = &Apache::lonnet::allowed('vgr',$scope)) {
       $view_section=$env{'request.course.sec'};
    } else {
       undef($view);
    }
       }
   
     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 1228  sub show_queue { Line 1257  sub show_queue {
     foreach my $key (sort(keys(%queue))) {      foreach my $key (sort(keys(%queue))) {
  my ($symb,$uname,$udom) = &decode_queue_key($key);   my ($symb,$uname,$udom) = &decode_queue_key($key);
  if (!defined($classlist->{$uname.':'.$udom})) { next; }   if (!defined($classlist->{$uname.':'.$udom})) { next; }
   
    my $section = $classlist->{$uname.':'.$udom}[&Apache::loncoursedata::CL_SECTION()];
   
    my $can_view=1;
    if (!$view
       || ($view_section && !$section)
       || ($view_section && $section && ($view_section ne $section))) {
       $can_view=0;
    }
   
  if ($key=~/locked$/ && !$with_selects) {   if ($key=~/locked$/ && !$with_selects) {
     $result.="<tr><td>$uname</td>";      $result.="<tr><td>$uname</td>";
     $result.='<td>'.$queue{$key}.'</td></tr>';      $result.='<td>'.$queue{$key}.'</td></tr>';
Line 1263  sub show_queue { Line 1302  sub show_queue {
     $seclist.='<input type="hidden" name="chosensections"       $seclist.='<input type="hidden" name="chosensections" 
                                value="'.$sec.'" />';                                 value="'.$sec.'" />';
  }   }
  if ($end_time ne '' && time > $end_time) {   if ($can_view && ($end_time ne '' && time > $end_time)) {
     $result.=(<<FORM);      $result.=(<<FORM);
 <td>$status</td>  <td>$status</td>
 <td>  <td>
Line 1278  sub show_queue { Line 1317  sub show_queue {
 </form>  </form>
 </td>  </td>
 FORM  FORM
                   } elsif (!$can_view && ($end_time ne '' && time > $end_time)) {
       $result.='<td>'.&mt("Not gradable").'</td><td>&nbsp;</td>'
                 } else {                  } else {
     $result.='<td>'.&mt("In Progress").'</td><td>&nbsp;</td>'      $result.='<td>'.&mt("In Progress").'</td><td>&nbsp;</td>'
  }   }
     }      }
     $result.= "<td>".$fullname->{$uname.':'.$udom}.      $result.= "<td>".$classlist->{$uname.':'.$udom}[&Apache::loncoursedata::CL_FULLNAME()].
  " <tt>($uname:$udom)</tt> </td>";   " <tt>($uname:$udom)</tt> </td>";
     $result.='<td>'.$slot_text.' End time: '.      $result.='<td>'.$slot_text.' End time: '.
  &Apache::lonlocal::locallocaltime($end_time).   &Apache::lonlocal::locallocaltime($end_time).
Line 1300  sub get_queue_counts { Line 1340  sub get_queue_counts {
     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 $classlist=&Apache::loncoursedata::get_classlist();
   
     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 1309  sub get_queue_counts { Line 1352  sub get_queue_counts {
     my ($entries,$ready_to_grade,$locks)=(0,0,0);      my ($entries,$ready_to_grade,$locks)=(0,0,0);
     my %slot_cache;      my %slot_cache;
     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$/) {   if ($key=~/locked$/) {
     $locks++;      $locks++;
  } elsif ($key=~/timestamp$/) {   } elsif ($key=~/timestamp$/) {
     #ignore      #ignore
  } elsif ($key!~/(timestamp|locked)$/) {   } elsif ($key!~/(timestamp|locked)$/) {
     my ($symb,$uname,$udom) = &decode_queue_key($key);  
     $entries++;      $entries++;
     if (my $slot=&slotted_access($queue{$key})) {      if (my $slot=&slotted_access($queue{$key})) {
  if (!exists($slot_cache{$slot})) {   if (!exists($slot_cache{$slot})) {
Line 1379  sub slotted_access { Line 1424  sub slotted_access {
 }  }
   
 sub pick_from_queue_data {  sub pick_from_queue_data {
     my ($queue,$check_section,$queuedata,$cdom,$cnum)=@_;      my ($queue,$check_section,$queuedata,$cdom,$cnum,$classlist)=@_;
     my @possible; # will hold queue entries that are valid to be selected      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 =~ /\0locked$/) { next; }
  if ($key =~ /\0timestamp$/) { next; }   if ($key =~ /\0timestamp$/) { next; }
   
  my ($symb,$uname,$udom)=&decode_queue_key($key);   my ($symb,$uname,$udom)=&decode_queue_key($key);
    if (!defined($classlist->{$uname.':'.$udom})) { next; }
   
  if ($check_section) {   if ($check_section) {
     my $section=&Apache::lonnet::getsection($uname,$udom);      my $section =
    $classlist->{$uname.':'.$udom}[&Apache::loncoursedata::CL_SECTION()];
     if ($section eq $check_section) {      if ($section eq $check_section) {
  &Apache::lonxml::debug("my sec");   &Apache::lonxml::debug("my sec");
  next;   next;
Line 1394  sub pick_from_queue_data { Line 1443  sub pick_from_queue_data {
  }   }
  my $end_time;   my $end_time;
  if (my $slot=&slotted_access($queuedata->{$key})) {   if (my $slot=&slotted_access($queuedata->{$key})) {
       &Apache::lonxml::debug("looking at slot $slot");
     my %slot_data=&Apache::lonnet::get_slot($slot);      my %slot_data=&Apache::lonnet::get_slot($slot);
     if ($slot_data{'endtime'} < time) {       if ($slot_data{'endtime'} < time) { 
  $end_time = $slot_data{'endtime'};   $end_time = $slot_data{'endtime'};
       } else {
    &Apache::lonxml::debug("not time ".$slot_data{'endtime'});
    next;
     }      }
  } else {   } else {
     my $due_date = &Apache::lonhomework::due_date('0',$symb);      my $due_date = &Apache::lonhomework::due_date('0',$symb);
     if ($due_date > time) {      if ($due_date < time) {
  $end_time = $due_date;   $end_time = $due_date;
       } else {
    &Apache::lonxml::debug("not time $due_date");
    next;
     }      }
  }   }
  if ($end_time ne '') {  
     &Apache::lonxml::debug("not time");  
     next;  
  }  
   
  if (exists($queuedata->{"$key\0locked"})) {   if (exists($queuedata->{"$key\0locked"})) {
     &Apache::lonxml::debug("someone already has um.");      &Apache::lonxml::debug("someone already has um.");
Line 1474  sub get_queue_symb_status { Line 1526  sub get_queue_symb_status {
  $cnum=$env{'course.'.$cid.'.num'};   $cnum=$env{'course.'.$cid.'.num'};
  $cdom=$env{'course.'.$cid.'.domain'};   $cdom=$env{'course.'.$cid.'.domain'};
     }      }
       my $classlist=&Apache::loncoursedata::get_classlist();
   
     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 1483  sub get_queue_symb_status { Line 1537  sub get_queue_symb_status {
  next if ($key=~/locked$/);   next if ($key=~/locked$/);
  next if ($key=~/timestamp$/);   next if ($key=~/timestamp$/);
  my ($symb,$uname,$udom) = &decode_queue_key($key);   my ($symb,$uname,$udom) = &decode_queue_key($key);
    next if (!defined($classlist->{$uname.':'.$udom}));
  push(@users,"$uname:$udom");   push(@users,"$uname:$udom");
     }      }
     return @users;      return @users;
Line 1498  sub get_from_queue { Line 1553  sub get_from_queue {
     &Apache::lonxml::debug("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;      my $attempts=0;
   
       my $classlist=&Apache::loncoursedata::get_classlist();
   
     while (1) {      while (1) {
  if ($attempts > 2) {   if ($attempts > 2) {
     # tried twice to get a queue entry, giving up      # tried twice to get a queue entry, giving up
Line 1508  sub get_from_queue { Line 1566  sub get_from_queue {
       $cdom,$cnum);        $cdom,$cnum);
  &Apache::lonxml::debug("$starttime");   &Apache::lonxml::debug("$starttime");
  my $regexp="^$symb\0queue\0";   my $regexp="^$symb\0queue\0";
  my $range= ($attempts < 1 ) ? '0-100' : '0-400';   #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 _not_ 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::lonxml::debug("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,$classlist);
     &Apache::lonxml::debug("sce $todo");      &Apache::lonxml::debug("sce $todo");
  }   }
  # no one _not_ in our section so look for any user that is   # no one _not_ in our section so look for any user that is
  # ready for grading   # ready for grading
  if (!$todo) {   if (!$todo) {
     &Apache::lonxml::debug("no sce");      &Apache::lonxml::debug("no sce");
     $todo=&pick_from_queue_data($queue,undef,\%queue,$cdom,$cnum);      $todo=&pick_from_queue_data($queue,undef,\%queue,$cdom,$cnum,
    $classlist);
     &Apache::lonxml::debug("no sce $todo");      &Apache::lonxml::debug("no sce $todo");
  }   }
  # no user to grade    # no user to grade 
Line 1567  sub select_user { Line 1626  sub select_user {
   
     my @chosen_sections=      my @chosen_sections=
  &Apache::loncommon::get_env_multiple('form.chosensections');   &Apache::loncommon::get_env_multiple('form.chosensections');
     &Apache::grades::init_perm();  
     my ($classlist,$section,$fullname)=&Apache::grades::getclasslist(\@chosen_sections,);      my $classlist = &get_limited_classlist(\@chosen_sections);
     &Apache::grades::reset_perm();  
           
     my $result;      my $result;
     if (!(grep(/^all$/,@chosen_sections))) {      if (!(grep(/^all$/,@chosen_sections))) {
Line 1578  sub select_user { Line 1636  sub select_user {
     }      }
     $result.='<table border="1">';      $result.='<table border="1">';
   
     foreach my $student (sort {lc($$fullname{$a}) cmp lc($$fullname{$b}) } keys %$fullname) {      foreach my $student (sort {lc($classlist->{$a}[&Apache::loncoursedata::CL_FULLNAME()]) cmp lc($classlist->{$b}[&Apache::loncoursedata::CL_FULLNAME()]) } (keys(%$classlist))) {
  my ($uname,$udom) = split(/:/,$student);   my ($uname,$udom) = split(/:/,$student);
   
  my $cnum=$env{'course.'.$cid.'.num'};   my $cnum=$env{'course.'.$cid.'.num'};
Line 1601  sub select_user { Line 1659  sub select_user {
  my $todo =    my $todo = 
     &Apache::lonnet::escape(&encode_queue_key($symb,$udom,$uname));      &Apache::lonnet::escape(&encode_queue_key($symb,$udom,$uname));
  if ($cannot_grade) {   if ($cannot_grade) {
     $result.='<tr><td>&nbsp;</td><td>'.$fullname->{$student}.      $result.='<tr><td>&nbsp;</td><td>'.$classlist->{$student}[&Apache::loncoursedata::CL_FULLNAME()].
  '</td><td>';   '</td><td>';
  } else {   } else {
     my $seclist;      my $seclist;
Line 1609  sub select_user { Line 1667  sub select_user {
  $seclist.='<input type="hidden" name="chosensections"    $seclist.='<input type="hidden" name="chosensections" 
                                value="'.$sec.'" />';                                 value="'.$sec.'" />';
     }      }
     my $studentdis = $student;  
     $studentdis =~ tr/:/@/;  
     $result.=<<RESULT;      $result.=<<RESULT;
 <tr>  <tr>
   <td>    <td>
Line 1622  sub select_user { Line 1678  sub select_user {
       <input type="submit" name="submit" value="Regrade" />        <input type="submit" name="submit" value="Regrade" />
       $seclist        $seclist
     </form>      </form>
   <td>$fullname->{$student} <tt>($studentdis)</tt></td>    <td>$classlist->{$student}[&Apache::loncoursedata::CL_FULLNAME()] <tt>($student)</tt></td>
   <td>    <td>
 RESULT  RESULT
         }          }
Line 1909  sub get_instance { Line 1965  sub get_instance {
     my $mandatory_failed=0;      my $mandatory_failed=0;
     my $ungraded=0;      my $ungraded=0;
     my $review=0;      my $review=0;
   
       @Apache::scripttag::parser_env = @_;
       $result.=&Apache::scripttag::xmlparse($dimension{'intro'});
     foreach my $id (@{$dimension{$instance.'.criterias'}},      foreach my $id (@{$dimension{$instance.'.criterias'}},
     @{$dimension{'criterias'}}) {      @{$dimension{'criterias'}}) {
  my $link=&link($id);   my $link=&link($id);
    @Apache::scripttag::parser_env = @_;
    $result.=&Apache::scripttag::xmlparse($dimension{$instance.'.text'});
  my $status=$Apache::lonhomework::results{"resource.$version.0.$dim.$id.status"}=$env{'form.HWVAL_'.$link};   my $status=$Apache::lonhomework::results{"resource.$version.0.$dim.$id.status"}=$env{'form.HWVAL_'.$link};
  $Apache::lonhomework::results{"resource.$version.0.$dim.$id.comment"}=$env{'form.HWVAL_comment_'.$link};   $Apache::lonhomework::results{"resource.$version.0.$dim.$id.comment"}=$env{'form.HWVAL_comment_'.$link};
  my $mandatory=($dimension{'criteria.'.$id.'.mandatory'} ne 'N');   my $mandatory=($dimension{'criteria.'.$id.'.mandatory'} ne 'N');
Line 1995  sub grading_history { Line 2056  sub grading_history {
 sub start_IntroParagraph {  sub start_IntroParagraph {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result;      my $result;
     if ($target eq 'web' || $target eq 'webgrade') {      if ($target eq 'grade' || $target eq 'web' || $target eq 'webgrade') {
  if ($tagstack->[-2] eq 'Dimension' || $tagstack->[-2] eq 'Question' ) {   if ($tagstack->[-2] eq 'Dimension' || $tagstack->[-2] eq 'Question' ) {
     $dimension{'intro'}=      $dimension{'intro'}=
  &Apache::lonxml::get_all_text('/introparagraph',   &Apache::lonxml::get_all_text('/introparagraph',
Line 2037  sub start_InstanceText { Line 2098  sub start_InstanceText {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $instance_id=$Apache::bridgetask::instance[-1];      my $instance_id=$Apache::bridgetask::instance[-1];
     my $text=&Apache::lonxml::get_all_text('/instancetext',$parser,$style);      my $text=&Apache::lonxml::get_all_text('/instancetext',$parser,$style);
     if ($target eq 'web' || $target eq 'webgrade') {      if ($target eq 'grade' || $target eq 'web' || $target eq 'webgrade') {
  $dimension{$instance_id.'.text'}=$text;   $dimension{$instance_id.'.text'}=$text;
     }      }
     return '';      return '';
Removed from v.1.152  
changed lines
  Added in v.1.156

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