Diff for /loncom/homework/lonhomework.pm between versions 1.243 and 1.246

version 1.243, 2006/05/09 19:03:02 version 1.246, 2006/05/12 03:46:54
Line 86  sub get_target { Line 86  sub get_target {
  } elsif ( defined($env{'form.grade_target'}  )    } elsif ( defined($env{'form.grade_target'}  ) 
   && ($Apache::lonhomework::viewgrades eq 'F' )) {    && ($Apache::lonhomework::viewgrades eq 'F' )) {
     return ($env{'form.grade_target'});      return ($env{'form.grade_target'});
    } elsif ( $env{'form.grade_target'} eq 'webgrade'
     && ($Apache::lonhomework::queuegrade eq 'F' )) {
       return ($env{'form.grade_target'});
  }   }
  if ($env{'form.webgrade'} &&   if ($env{'form.webgrade'} &&
     $Apache::lonhomework::modifygrades eq 'F') {      ($Apache::lonhomework::modifygrades eq 'F'
        || $Apache::lonhomework::queuegrade eq 'F' )) {
     return ('grade','webgrade');      return ('grade','webgrade');
  }   }
  if ( defined($env{'form.submitted'}) &&   if ( defined($env{'form.submitted'}) &&
Line 234  sub check_slot_access { Line 238  sub check_slot_access {
     my ($status,$datemsg)=&check_access($id);      my ($status,$datemsg)=&check_access($id);
           
     my $useslots = &Apache::lonnet::EXT("resource.$id.useslots");      my $useslots = &Apache::lonnet::EXT("resource.$id.useslots");
     if ($useslots ne 'resource' && $useslots ne 'sequence') {      if ($useslots ne 'resource' && $useslots ne 'map') {
  return ($status,$datemsg);   return ($status,$datemsg);
     }      }
   
Line 475  sub check_access { Line 479  sub check_access {
     return ($status,$datemsg);      return ($status,$datemsg);
 }  }
   
   sub due_date {
       my ($part_id,$symb)=@_;
       my $date;
       my $interval= &Apache::lonnet::EXT("resource.$part_id.interval",$symb);
       if ($interval) {
    my $first_access=&Apache::lonnet::get_first_access('map',$symb);
    if ($first_access) { $date = $first_access+$interval; }
       }
       if (!defined($date)) {
    $date = &Apache::lonnet::EXT("resource.$part_id.duedate",$symb);
       }
       return $date
   }
   
 sub seconds_to_human_length {  sub seconds_to_human_length {
     my ($length)=@_;      my ($length)=@_;
   
Line 546  sub setuppermissions { Line 564  sub setuppermissions {
  $viewgrades = &Apache::lonnet::allowed('vgr',$env{'request.course.id'}.   $viewgrades = &Apache::lonnet::allowed('vgr',$env{'request.course.id'}.
                                                '/'.$env{'request.course.sec'});                                                 '/'.$env{'request.course.sec'});
     }      }
     $Apache::lonhomework::viewgrades = $viewgrades; # File global variable...dirt.      $Apache::lonhomework::viewgrades = $viewgrades;
   
     if ($Apache::lonhomework::browse eq 'F' &&       if ($Apache::lonhomework::browse eq 'F' && 
  $env{'form.devalidatecourseresdata'} eq 'on') {   $env{'form.devalidatecourseresdata'} eq 'on') {
  my (undef,$courseid) = &Apache::lonxml::whichuser();   my (undef,$courseid) = &Apache::lonxml::whichuser();
  &Apache::lonnet::devalidatecourseresdata($env{"course.$courseid.num"},   &Apache::lonnet::devalidatecourseresdata($env{"course.$courseid.num"},
       $env{"course.$courseid.domain"});        $env{"course.$courseid.domain"});
     }      }
   
     my $modifygrades = &Apache::lonnet::allowed('mgr',$env{'request.course.id'});      my $modifygrades = &Apache::lonnet::allowed('mgr',$env{'request.course.id'});
     if (! $modifygrades &&       if (! $modifygrades && 
  exists($env{'request.course.sec'}) &&    exists($env{'request.course.sec'}) && 
Line 562  sub setuppermissions { Line 582  sub setuppermissions {
      '/'.$env{'request.course.sec'});       '/'.$env{'request.course.sec'});
     }      }
     $Apache::lonhomework::modifygrades = $modifygrades;      $Apache::lonhomework::modifygrades = $modifygrades;
   
       my $queuegrade = &Apache::lonnet::allowed('mqg',$env{'request.course.id'});
       if (! $queuegrade && 
    exists($env{'request.course.sec'}) && 
    $env{'request.course.sec'} !~ /^\s*$/) {
    $queuegrade = 
       &Apache::lonnet::allowed('qgr',$env{'request.course.id'}.
        '/'.$env{'request.course.sec'});
       }
       $Apache::lonhomework::queuegrade = $queuegrade;
     return '';      return '';
 }  }
   
Line 968  sub handler { Line 998  sub handler {
  }   }
     }      }
     if (&setupheader($request)) { return OK; }      if (&setupheader($request)) { return OK; }
     &Apache::lonxml::debug("Permissions:$Apache::lonhomework::browse:$Apache::lonhomework::viewgrades:");      &Apache::lonxml::debug("Permissions:$Apache::lonhomework::browse:$Apache::lonhomework::viewgrades:$Apache::lonhomework::modifygrades:$Apache::lonhomework::queuegrade");
     &Apache::lonxml::debug("Problem Mode ".$env{'form.problemmode'});      &Apache::lonxml::debug("Problem Mode ".$env{'form.problemmode'});
     my ($symb) = &Apache::lonxml::whichuser();      my ($symb) = &Apache::lonxml::whichuser();
     &Apache::lonxml::debug('symb is '.$symb);      &Apache::lonxml::debug('symb is '.$symb);

Removed from v.1.243  
changed lines
  Added in v.1.246


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