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

Diff for /loncom/homework/lonhomework.pm between versions 1.239 and 1.252

version 1.239, 2006/04/11 21:08:29 version 1.252, 2006/06/20 05:10:00
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 157  sub proctor_checked_in { Line 161  sub proctor_checked_in {
     my ($slot_name,$slot,$type)=@_;      my ($slot_name,$slot,$type)=@_;
     my @possible_proctors=split(",",$slot->{'proctor'});      my @possible_proctors=split(",",$slot->{'proctor'});
           
       return 1 if (!@possible_proctors);
   
     my $key;      my $key;
     if ($type eq 'Task') {      if ($type eq 'Task') {
  my $version=$Apache::lonhomework::history{'resource.0.version'};   my $version=$Apache::lonhomework::history{'resource.0.version'};
Line 164  sub proctor_checked_in { Line 170  sub proctor_checked_in {
     } elsif ($type eq 'problem') {      } elsif ($type eq 'problem') {
  $key ='resource.0.checkedin';   $key ='resource.0.checkedin';
     }      }
           # backward compatability, used to be username@domain, 
       # now is username:domain
       my $who = $Apache::lonhomework::history{$key};
       if ($who !~ /:/) {
    $who =~ tr/@/:/;
       }     
     foreach my $possible (@possible_proctors) {       foreach my $possible (@possible_proctors) { 
  if ($Apache::lonhomework::history{$key} eq $possible   if ($who eq $possible
     && $Apache::lonhomework::history{$key.'.slot'} eq $slot_name) {      && $Apache::lonhomework::history{$key.'.slot'} eq $slot_name) {
     return 1;      return 1;
  }   }
Line 233  sub check_slot_access { Line 244  sub check_slot_access {
     # does it pass normal muster      # does it pass normal muster
     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.0.useslots");
     if ($useslots ne 'resource') {      if ($useslots ne 'resource' && $useslots ne 'map' 
    && $useslots ne 'map_map') {
  return ($status,$datemsg);   return ($status,$datemsg);
     }      }
   
Line 257  sub check_slot_access { Line 269  sub check_slot_access {
     }      }
   
     my @slots=      my @slots=
  (split(':',&Apache::lonnet::EXT("resource.$id.availablestudent")),   (split(':',&Apache::lonnet::EXT("resource.0.availablestudent")),
  split(':',&Apache::lonnet::EXT("resource.$id.available")));   split(':',&Apache::lonnet::EXT("resource.0.available")));
   
 #    if (!@slots) {  #    if (!@slots) {
 # return ($status,$datemsg);  # return ($status,$datemsg);
Line 266  sub check_slot_access { Line 278  sub check_slot_access {
     my $slotstatus='NOT_IN_A_SLOT';      my $slotstatus='NOT_IN_A_SLOT';
     my ($returned_slot,$slot_name);      my ($returned_slot,$slot_name);
     foreach my $slot (@slots) {      foreach my $slot (@slots) {
    $slot =~ s/(^\s*|\s*$)//g;
  &Apache::lonxml::debug("getting $slot");   &Apache::lonxml::debug("getting $slot");
  my %slot=&Apache::lonnet::get_slot($slot);   my %slot=&Apache::lonnet::get_slot($slot);
  &Apache::lonhomework::showhash(%slot);   &Apache::lonhomework::showhash(%slot);
Line 297  sub check_slot_access { Line 310  sub check_slot_access {
  $checkedin =   $checkedin =
     $Apache::lonhomework::history{"resource.$version.0.checkedin"};      $Apache::lonhomework::history{"resource.$version.0.checkedin"};
     } elsif ($type eq 'problem') {      } elsif ($type eq 'problem') {
  $got_grade = 1;   $got_grade  = 1;
  $checkedin = $Apache::lonhomework::history{"resource.0.checkedin"};   $checkedin  = $Apache::lonhomework::history{"resource.0.checkedin"};
    $is_correct =
       ($Apache::lonhomework::history{"resource.0.solved"} =~/^correct_/);
     }      }
           
     &Apache::lonxml::debug(" slot is $slotstatus checkedin ($checkedin) got_grade ($got_grade) is_correct ($is_correct)");      &Apache::lonxml::debug(" slot is $slotstatus checkedin ($checkedin) got_grade ($got_grade) is_correct ($is_correct)");
           
     # has a current checked in recrd, but hasn't got a grade, must be awaiting      # no slot is currently open, and has been checked in for this version
     # a grade      # but hasn't got a grade, therefore must be awaiting a grade
     if ($checkedin       if (!defined($slot_name)
    && $checkedin 
  && !$got_grade) {   && !$got_grade) {
  return ('WAITING_FOR_GRADE');   return ('WAITING_FOR_GRADE');
     }      }
   
       # no slot is currently open, and has been checked in for this version
       # previous slot is therefore CLOSED, so therefore the problem is
       if (!defined($slot_name)
    && $checkedin 
    && $type eq 'problem') {
    return ('CLOSED',$datemsg);
       }
   
     if ($slotstatus eq 'NOT_IN_A_SLOT'       if ($slotstatus eq 'NOT_IN_A_SLOT' 
  && $checkedin ) {   && $checkedin ) {
   
Line 377  sub check_access { Line 401  sub check_access {
   
  foreach my $temp ("opendate","duedate","answerdate") {   foreach my $temp ("opendate","duedate","answerdate") {
     $lastdate = $date;      $lastdate = $date;
     $date = &Apache::lonnet::EXT("resource.$id.$temp");      if ($temp eq 'duedate') {
    $date = &due_date($id);
       } else {
    $date = &Apache::lonnet::EXT("resource.$id.$temp");
       }
       
     my $thistype = &Apache::lonnet::EXT("resource.$id.$temp.type");      my $thistype = &Apache::lonnet::EXT("resource.$id.$temp.type");
     if ($thistype =~ /^(con_lost|no_such_host)/ ||      if ($thistype =~ /^(con_lost|no_such_host)/ ||
  $date     =~ /^(con_lost|no_such_host)/) {   $date     =~ /^(con_lost|no_such_host)/) {
Line 445  sub check_access { Line 474  sub check_access {
     &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';
  $datemsg=&seconds_to_human_length($interval);   my $due_date = &due_date($id);
     } else {   $datemsg=&seconds_to_human_length($due_date-time);
  my $newdate=localtime($first_access+$interval);  
  if (time > ($first_access+$interval)) {  
     $status='CLOSED';  
     $datemsg = &mt("was due on")." $newdate".&mt(", and answers will be available on")." $date";  
  } else {  
     $datemsg = &mt("is due at")." $newdate";  
  }  
     }      }
  }   }
     }      }
   
   #if (($status ne 'CLOSED') && ($Apache::lonhomework::type eq 'exam') &&    #if (($status ne 'CLOSED') && ($Apache::lonhomework::type eq 'exam') &&
   #    (!$Apache::lonhomework::history{"resource.0.outtoken"})) {    #    (!$Apache::lonhomework::history{"resource.0.outtoken"})) {
   #    return ('UNCHECKEDOUT','needs to be checked out');    #    return ('UNCHECKEDOUT','needs to be checked out');
Line 472  sub check_access { Line 495  sub check_access {
   
     return ($status,$datemsg);      return ($status,$datemsg);
 }  }
   # this should work exactly like the copy in lonnavmaps.pm
   sub due_date {
       my ($part_id,$symb,$udom,$uname)=@_;
       my $date;
       my $interval= &Apache::lonnet::EXT("resource.$part_id.interval",$symb,
          $udom,$uname);
       &Apache::lonxml::debug("looking for interval $part_id $symb $interval");
       my $due_date= &Apache::lonnet::EXT("resource.$part_id.duedate",$symb,
          $udom,$uname);
       &Apache::lonxml::debug("looking for due_date $part_id $symb $due_date");
       if (defined($interval)) {
    my $first_access=&Apache::lonnet::get_first_access('map',$symb);
    if (defined($first_access)) {
       $interval = $first_access+$interval;
       $date = ($interval < $due_date)? $interval : $due_date;
    } else {
       $date = $due_date;
    }
       } else {
    $date = $due_date;
       }
       return $date
   }
   
 sub seconds_to_human_length {  sub seconds_to_human_length {
     my ($length)=@_;      my ($length)=@_;
Line 544  sub setuppermissions { Line 590  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 560  sub setuppermissions { Line 608  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 623  sub handle_save_or_undo { Line 681  sub handle_save_or_undo {
 sub analyze_header {  sub analyze_header {
     my ($request) = @_;      my ($request) = @_;
     my $result =      my $result =
  &Apache::loncommon::start_page('Analyzing a problem',undef,   &Apache::loncommon::start_page('Analyzing a problem',undef);
        {'only_body' => ($env{'environment.remote'} ne 'off'),});  
     $result .=       $result .= 
  &Apache::lonxml::message_location().'   &Apache::lonxml::message_location().'
             <form name="lonhomework" method="POST" action="'.              <form name="lonhomework" method="POST" action="'.
Line 756  sub editxmlmode { Line 814  sub editxmlmode {
  if ($rows < 20) { $rows = 20; }   if ($rows < 20) { $rows = 20; }
  my $start_page =    my $start_page = 
     &Apache::loncommon::start_page("EditXML $file",      &Apache::loncommon::start_page("EditXML $file",
    &Apache::edit::js_change_detection(),     &Apache::edit::js_change_detection());
    {'only_body' =>  
  ($env{'environment.remote'} ne 'off')});  
   
  $result.=$start_page.   $result.=$start_page.
     &renderpage($request,$file,['no_output_web'],1).      &renderpage($request,$file,['no_output_web'],1).
Line 911  sub newproblem { Line 967  sub newproblem {
     $errormsg='<p><font color="red">'.&mt('You did not select a template.').'</font></p>'."\n";      $errormsg='<p><font color="red">'.&mt('You did not select a template.').'</font></p>'."\n";
  }   }
  my $instructions;   my $instructions;
  my $bodytag=&Apache::loncommon::bodytag(undef,undef,undef,   my $start_page = 
  ($env{'environment.remote'} ne 'off'));      &Apache::loncommon::start_page("Create New $extension");
  if ($templatelist) { $instructions=&mt(", select a template from the pull-down menu below.").'<br />'.&mt("Then");}   if ($templatelist) { $instructions=&mt(", select a template from the pull-down menu below.").'<br />'.&mt("Then");}
  my %lt=&Apache::lonlocal::texthash( 'create' => 'Creating a new',   my %lt=&Apache::lonlocal::texthash( 'create' => 'Creating a new',
   'resource' => 'resource',    'resource' => 'resource',
Line 923  sub newproblem { Line 979  sub newproblem {
   'Create' => 'Create',    'Create' => 'Create',
   'button' => 'button');    'button' => 'button');
  $request->print(<<ENDNEWPROBLEM);   $request->print(<<ENDNEWPROBLEM);
 $bodytag  $start_page
 <h1>$lt{'create'} $extension $lt{'resource'}</h1>  <h1>$lt{'create'} $extension $lt{'resource'}</h1>
 $errormsg  $errormsg
 $lt{'requested'} <tt>$shownurl</tt> $lt{'not exist'}.  $lt{'requested'} <tt>$shownurl</tt> $lt{'not exist'}.
Line 968  sub handler { Line 1024  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.239  
changed lines
  Added in v.1.252

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