Diff for /loncom/homework/lonhomework.pm between versions 1.361 and 1.362

version 1.361, 2016/05/13 22:48:09 version 1.362, 2016/05/30 02:45:32
Line 561  sub check_access { Line 561  sub check_access {
     if ($status eq 'CAN_ANSWER' || $status eq 'CANNOT_ANSWER') {      if ($status eq 'CAN_ANSWER' || $status eq 'CANNOT_ANSWER') {
  my @interval=&Apache::lonnet::EXT("resource.$id.interval",$symb);   my @interval=&Apache::lonnet::EXT("resource.$id.interval",$symb);
  &Apache::lonxml::debug("looking for interval @interval");   &Apache::lonxml::debug("looking for interval @interval");
  if ($interval[0]) {   if ($interval[0]=~ /^\d+/) {
     my $first_access=&Apache::lonnet::get_first_access($interval[1],$symb);      my $first_access=&Apache::lonnet::get_first_access($interval[1],$symb);
     &Apache::lonxml::debug("looking for accesstime $first_access");      &Apache::lonxml::debug("looking for accesstime $first_access");
     if (!$first_access) {      if (!$first_access) {
  $status='NOT_YET_VIEWED';   $status='NOT_YET_VIEWED';
  my $due_date = &due_date($id,$symb);   my $due_date = &due_date($id,$symb);
  my $seconds_left = $due_date - time;   my $seconds_left = $due_date - time;
  if ($seconds_left > $interval[0] || $due_date eq '') {   my ($timelimit) = ($interval[0] =~ /^(\d+)/);
     $seconds_left = $interval[0];   if ($seconds_left > $timelimit || $due_date eq '') {
       $seconds_left = $timelimit;
  }   }
  $datemsg=&seconds_to_human_length($seconds_left);   $datemsg=&seconds_to_human_length($seconds_left);
     }      }
Line 604  sub due_date { Line 605  sub due_date {
  my $first_access=&Apache::lonnet::get_first_access($interval[1],$symb);   my $first_access=&Apache::lonnet::get_first_access($interval[1],$symb);
  &Apache::lonxml::debug("looking for first_access $first_access ($interval[1])");   &Apache::lonxml::debug("looking for first_access $first_access ($interval[1])");
  if (defined($first_access)) {   if (defined($first_access)) {
     my $interval = $first_access+$interval[0];      my ($timelimit) = ($interval[0] =~ /^(\d+)/);
       my $interval = $first_access+$timelimit;
     $date = (!$due_date || $interval < $due_date) ? $interval      $date = (!$due_date || $interval < $due_date) ? $interval
                                                           : $due_date;                                                            : $due_date;
  } else {   } else {

Removed from v.1.361  
changed lines
  Added in v.1.362


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