Diff for /loncom/homework/grades.pm between versions 1.101 and 1.102

version 1.101, 2003/06/18 18:59:20 version 1.102, 2003/06/20 17:25:48
Line 147  sub getclasslist { Line 147  sub getclasslist {
     return ($classlist,\@sections,\%fullnames);      return ($classlist,\@sections,\%fullnames);
 }  }
   
 #find user domain  
 sub finduser {  
     my ($name) = @_;  
     my $domain = '';  
     if ( $Apache::grades::viewgrades eq 'F' ) {  
  my %classlist=&Apache::lonnet::dump('classlist',  
     $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},  
     $ENV{'course.'.$ENV{'request.course.id'}.'.num'});  
  my (@fields) = grep /^$name:/, keys %classlist;  
  ($name, $domain) = split(/:/,$fields[0]);  
  return ($name,$domain);  
     } else {  
  return ($ENV{'user.name'},$ENV{'user.domain'});  
     }  
 }  
   
 #--- Prompts a user to enter a username.  
 sub moreinfo {  
     my ($request,$reason) = @_;  
     $request->print("Unable to process request: $reason");  
     if ( $Apache::grades::viewgrades eq 'F' ) {  
  $request->print('<form action="/adm/grades" method="post">'."\n");  
  if ($ENV{'form.url'}) {  
     $request->print('<input type="hidden" name="url" value="'.$ENV{'form.url'}.'" />'."\n");  
  }  
  if ($ENV{'form.symb'}) {  
     $request->print('<input type="hidden" name="symb" value="'.$ENV{'form.symb'}.'" />'."\n");  
  }  
  $request->print('<input type="hidden" name="command" value="'.$ENV{'form.command'}.'" />'."\n");  
  $request->print("Student:".'<input type="text" name="student" value="'.$ENV{'form.student'}.'" />'."<br />\n");  
  $request->print("Domain:".'<input type="text" name="domain" value="'.$ENV{'user.domain'}.'" />'."<br />\n");  
  $request->print('<input type="submit" name="submit" value="ReSubmit" />'."<br />\n");  
  $request->print('</form>');  
     }  
     return '';  
 }  
   
 #--- Retrieve the grade status of a student for all the parts  #--- Retrieve the grade status of a student for all the parts
 sub student_gradeStatus {  sub student_gradeStatus {
     my ($url,$symb,$udom,$uname,$partlist) = @_;      my ($url,$symb,$udom,$uname,$partlist) = @_;
Line 1050  sub submission { Line 1013  sub submission {
   
     (my $url=$ENV{'form.url'})=~s-^http://($ENV{'SERVER_NAME'}|$ENV{'HTTP_HOST'})--;      (my $url=$ENV{'form.url'})=~s-^http://($ENV{'SERVER_NAME'}|$ENV{'HTTP_HOST'})--;
     my ($uname,$udom)     = ($ENV{'form.student'},$ENV{'form.userdom'});      my ($uname,$udom)     = ($ENV{'form.student'},$ENV{'form.userdom'});
     ($uname,$udom)        = &finduser($uname) if $udom eq '';  
     $ENV{'form.fullname'} = &get_fullname ($uname,$udom) if $ENV{'form.fullname'} eq '';      $ENV{'form.fullname'} = &get_fullname ($uname,$udom) if $ENV{'form.fullname'} eq '';
   
     my $symb=($ENV{'form.symb'} ne '' ? $ENV{'form.symb'} : (&Apache::lonnet::symbread($url)));      my $symb=($ENV{'form.symb'} ne '' ? $ENV{'form.symb'} : (&Apache::lonnet::symbread($url)));
Line 3396  GRADINGMENUJS Line 3359  GRADINGMENUJS
   
 sub handler {  sub handler {
     my $request=$_[0];      my $request=$_[0];
       
       undef(%Apache::grades::perm);
     if ($ENV{'browser.mathml'}) {      if ($ENV{'browser.mathml'}) {
  $request->content_type('text/xml');   $request->content_type('text/xml');
     } else {      } else {
Line 3441  sub handler { Line 3405  sub handler {
     }      }
  }   }
     } else {      } else {
  $Apache::grades::viewgrades=&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'});   if (!($Apache::grades::perm{'vgr'}=&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'}))) {
       if ($Apache::grades::perm{'vgr'}=&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'}.'/'.$ENV{'request.course.sec'})) {
    $Apache::grades::perm{'vgr_section'}=$ENV{'request.course.sec'};
       } else {
    delete($Apache::grades::perm{'vgr'});
       }
    }
    if (!($Apache::grades::perm{'mgr'}=&Apache::lonnet::allowed('mgr',$ENV{'request.course.id'}))) {
       if ($Apache::grades::perm{'mgr'}=&Apache::lonnet::allowed('mgr',$ENV{'request.course.id'}.'/'.$ENV{'request.course.sec'})) {
    $Apache::grades::perm{'mgr_section'}=$ENV{'request.course.sec'};
       } else {
    delete($Apache::grades::perm{'mgr'});
       }
    }
   
  if ($command eq 'submission') {   if ($command eq 'submission') {
     ($ENV{'form.student'} eq '' ? &listStudents($request) : &submission($request,0,0));      ($ENV{'form.student'} eq '' ? &listStudents($request) : &submission($request,0,0));
  } elsif ($command eq 'pickStudentPage') {   } elsif ($command eq 'pickStudentPage') {

Removed from v.1.101  
changed lines
  Added in v.1.102


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