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

Diff for /loncom/homework/grades.pm between versions 1.9 and 1.17

version 1.9, 2001/07/26 15:50:25 version 1.17, 2001/11/29 23:16:29
Line 1 Line 1
   # The LearningOnline Network with CAPA
 # The LON-CAPA Grading handler  # The LON-CAPA Grading handler
   #
   # $Id$
   #
   # Copyright Michigan State University Board of Trustees
   #
   # This file is part of the LearningOnline Network with CAPA (LON-CAPA).
   #
   # LON-CAPA is free software; you can redistribute it and/or modify
   # it under the terms of the GNU General Public License as published by
   # the Free Software Foundation; either version 2 of the License, or
   # (at your option) any later version.
   #
   # LON-CAPA is distributed in the hope that it will be useful,
   # but WITHOUT ANY WARRANTY; without even the implied warranty of
   # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   # GNU General Public License for more details.
   #
   # You should have received a copy of the GNU General Public License
   # along with LON-CAPA; if not, write to the Free Software
   # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
   #
   # /home/httpd/html/adm/gpl.txt
   #
   # http://www.lon-capa.org/
   #
 # 2/9,2/13 Guy Albertelli  # 2/9,2/13 Guy Albertelli
 # 6/8 Gerd Kortemeyer  # 6/8 Gerd Kortemeyer
   # 7/26 H.K. Ng
   # 8/20 Gerd Kortemeyer
   
 package Apache::grades;  package Apache::grades;
 use strict;  use strict;
Line 16  sub moreinfo { Line 44  sub moreinfo {
   $request->print("Unable to process request: $reason");    $request->print("Unable to process request: $reason");
   if ( $Apache::grades::viewgrades eq 'F' ) {    if ( $Apache::grades::viewgrades eq 'F' ) {
     $request->print('<form action="/adm/grades" method="post">'."\n");      $request->print('<form action="/adm/grades" method="post">'."\n");
     $request->print('<input type="hidden" name="url" value="'.$ENV{'form.url'}.'"></input>'."\n");      if ($ENV{'form.url'}) {
     $request->print('<input type="hidden" name="command" value="'.$ENV{'form.command'}.'"></input>'."\n");        $request->print('<input type="hidden" name="url" value="'.$ENV{'form.url'}.'" />'."\n");
     $request->print("Student:".'<input type="text" name="student" value="'.$ENV{'form.student'}.'"></input>'."<br />\n");      }
     $request->print("Domain:".'<input type="text" name="domain" value="'.$ENV{'user.domain'}.'"></input>'."<br />\n");      if ($ENV{'form.symb'}) {
     $request->print('<input type="submit" name="submit" value="ReSubmit"></input>'."<br />\n");        $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>');      $request->print('</form>');
   }    }
   return '';    return '';
 }  }
   
   
   sub listStudents {
     my ($request) = shift;
     my ($cdom,$cnum) = split(/_/,$ENV{'request.course.id'});
     my $chome=$ENV{"course.$ENV{'request.course.id'}.home"};
     $request->print ("Found $cdom:$cnum:$chome<br />");
     my (%classlist) = &getclasslist($cdom,$cnum,$chome,'0');
     foreach my $student ( sort(@{ $classlist{'allids'} }) ) {
         my ($sname,$sdom) = split(/:/,$student);
   
         my $reply=&Apache::lonnet::reply('get:'.$sdom.':'.$sname.
        ':environment:lastname&generation&firstname&middlename',
         &Apache::lonnet::homeserver($sname,$sdom));
         #print "reply=$reply<br>";
         my (@nameparts) = split /&/,$reply;
   #      my $sfullname = $Apache::lonnet::unescape($nameparts[0]);
   
         if ( $Apache::grades::viewgrades eq 'F' ) {
     $request->print('<form action="/adm/grades" method="post">'."\n");
     $request->print("$sname @nameparts\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('<input type="hidden" name="student" value="'.$sname.'" />'."\n");
     $request->print('<input type="hidden" name="domain" value="'.$sdom.'" />'."\n");
     $request->print('<input type="submit" name="submit" value="View" />'."<br />\n");
     $request->print('</form>');
         }
     }
   
   }
   
   
 #FIXME - needs to handle multiple matches  #FIXME - needs to handle multiple matches
 sub finduser {  sub finduser {
   my ($name) = @_;    my ($name) = @_;
Line 58  sub getclasslist { Line 127  sub getclasslist {
     my ($end,$start)=split(/:/,$value);      my ($end,$start)=split(/:/,$value);
     # still a student?      # still a student?
     if (($hideexpired) && ($end) && ($end < $now)) {      if (($hideexpired) && ($end) && ($end < $now)) {
       print "Skipping:$name:$end:$now<br />\n";        #print "Skipping:$name:$end:$now<br />\n";
       next;        next;
     }      }
       #print "record=$record<br>";
     push( @{ $classlist{'allids'} }, $name);       push( @{ $classlist{'allids'} }, $name); 
   }    }
   return (%classlist);    return (%classlist);
Line 81  sub getpartlist { Line 151  sub getpartlist {
 sub viewstudentgrade {  sub viewstudentgrade {
   my ($url,$symb,$courseid,$student,@parts) = @_;    my ($url,$symb,$courseid,$student,@parts) = @_;
   my $result ='';    my $result ='';
     my $cellclr = '"#ffffdd"';
   my ($stuname,$domain) = split(/:/,$student);    my ($stuname,$domain) = split(/:/,$student);
   
   my %record=&Apache::lonnet::restore($symb,$courseid,$domain,$stuname);    my %record=&Apache::lonnet::restore($symb,$courseid,$domain,$stuname);
   
   $result.="<tr><td>$stuname</td><td>$domain</td>\n";    $result.="<tr><td bgcolor=$cellclr>$stuname</td><td bgcolor=$cellclr align=\"middle\">$domain</td>\n";
   foreach my $part (@parts) {    foreach my $part (@parts) {
     my ($temp,$part,$type)=split(/_/,$part);      my ($temp,$part,$type)=split(/_/,$part);
     #print "resource.$part.$type = ".$record{"resource.$part.$type"}." <br />\n";      #print "resource.$part.$type = ".$record{"resource.$part.$type"}." <br />\n";
     if ($type eq 'awarded') {      if ($type eq 'awarded') {
       my $score=$record{"resource.$part.$type"};        my $score=$record{"resource.$part.$type"};
       $result.="<td><input type=\"text\" name=\"GRADE.$student.$part.$type\" value=\"$score\" size=\"4\" /></td>\n";        $result.="<td bgcolor=$cellclr align=\"middle\"><input type=\"text\" name=\"GRADE.$student.$part.$type\" value=\"$score\" size=\"4\" /></td>\n";
     } elsif ($type eq 'tries') {      } elsif ($type eq 'tries') {
       my $score=$record{"resource.$part.$type"};        my $score=$record{"resource.$part.$type"};
       $result.="<td><input type=\"text\" name=\"GRADE.$student.$part.$type\" value=\"$score\" size=\"4\" /></td>\n"        $result.="<td bgcolor=$cellclr align=\"middle\"><input type=\"text\" name=\"GRADE.$student.$part.$type\" value=\"$score\" size=\"4\" /></td>\n"
     } elsif ($type eq 'solved') {      } elsif ($type eq 'solved') {
       my $score=$record{"resource.$part.$type"};        my $score=$record{"resource.$part.$type"};
       $result.="<td><select name=\"GRADE.$student.$part.$type\">\n";        $result.="<td bgcolor=$cellclr align=\"middle\"><select name=\"GRADE.$student.$part.$type\">\n";
       if ($score =~ /^correct/) {        if ($score =~ /^correct/) {
  $result.="<option selected=\"on\">correct</option>\n<option>incorrect</option>\n<option>excused</option>\n<option>ungraded</option>\n<option>nothing</option>\n";   $result.="<option selected=\"on\">correct</option>\n<option>incorrect</option>\n<option>excused</option>\n<option>ungraded</option>\n<option>nothing</option>\n";
       } elsif ($score =~ /^incorrect/) {        } elsif ($score =~ /^incorrect/) {
Line 163  sub setstudentgrade { Line 233  sub setstudentgrade {
   if ( scalar(keys(%newrecord)) > 0 ) {    if ( scalar(keys(%newrecord)) > 0 ) {
     $newrecord{"resource.regrader"}="$ENV{'user.name'}:$ENV{'user.domain'}";      $newrecord{"resource.regrader"}="$ENV{'user.name'}:$ENV{'user.domain'}";
     &Apache::lonnet::cstore(\%newrecord,$symb,$courseid,$domain,$stuname);      &Apache::lonnet::cstore(\%newrecord,$symb,$courseid,$domain,$stuname);
   
     $result.="Stored away ".scalar(keys(%newrecord))." elements.<br />\n";      $result.="Stored away ".scalar(keys(%newrecord))." elements.<br />\n";
   }    }
   return $result;    return $result;
Line 173  sub submission { Line 244  sub submission {
   my $url=$ENV{'form.url'};    my $url=$ENV{'form.url'};
   $url=~s-^http://($ENV{'SERVER_NAME'}|$ENV{'HTTP_HOST'})--;    $url=~s-^http://($ENV{'SERVER_NAME'}|$ENV{'HTTP_HOST'})--;
   if ($ENV{'form.student'} eq '') { &moreinfo($request,"Need student login id"); return ''; }    if ($ENV{'form.student'} eq '') { &moreinfo($request,"Need student login id"); return ''; }
   #  if ($ENV{'form.student'} eq '') { &listStudents($request); return ''; }
   my ($uname,$udom) = &finduser($ENV{'form.student'});    my ($uname,$udom) = &finduser($ENV{'form.student'});
   if ($uname eq '') { &moreinfo($request,"Unable to find student"); return ''; }    if ($uname eq '') { &moreinfo($request,"Unable to find student"); return ''; }
   my $symb=&Apache::lonnet::symbread($url);    my $symb;
     if ($ENV{'form.symb'}) {
       $symb=$ENV{'form.symb'};
     } else {
       $symb=&Apache::lonnet::symbread($url);
     }
   if ($symb eq '') { $request->print("Unable to handle ambiguous references:$url:."); return ''; }    if ($symb eq '') { $request->print("Unable to handle ambiguous references:$url:."); return ''; }
   my $answer=&Apache::loncommon::get_previous_attempt($symb,$uname,$udom,    my $answer=&Apache::loncommon::get_previous_attempt($symb,$uname,$udom,
       $ENV{'request.course.id'});        $ENV{'request.course.id'});
   my $result="<h2> Submission Record </h2>  $uname:$udom for $url".$answer;    my $result="<h2> Submission Record </h2>  $uname:$udom for $url <br />".$answer;
     my $rendered=&Apache::loncommon::get_student_view($symb,$uname,$udom,
      $ENV{'request.course.id'});
     $result.="Student's view of the problem:<br /> $rendered <br /> Correct answer:";
   return $result;    return $result;
 }  }
   
Line 199  sub viewgrades { Line 279  sub viewgrades {
   my $chome=$ENV{"course.$ENV{'request.course.id'}.home"};    my $chome=$ENV{"course.$ENV{'request.course.id'}.home"};
   #print "Found $cdom:$cnum:$chome<br />";    #print "Found $cdom:$cnum:$chome<br />";
   my (%classlist) = &getclasslist($cdom,$cnum,$chome,'0');    my (%classlist) = &getclasslist($cdom,$cnum,$chome,'0');
     my $headerclr = '"#ccffff"';
     my $cellclr = '"#ffffcc"';
   
   #get list of parts for this problem    #get list of parts for this problem
   my (@parts) = &getpartlist($url);    my (@parts) = &getpartlist($url);
   
     $request->print ("<h2><font color=\"#339966\">Manual Grading</font></h2>");
   
   #start the form    #start the form
   $result = '<form action="/adm/grades" method="post">'."\n".    $result = '<form action="/adm/grades" method="post">'."\n".
     '<input type="hidden" name="symb" value="'.$symb.'"/>'."\n".      '<input type="hidden" name="symb" value="'.$symb.'" />'."\n".
       '<input type="hidden" name="url" value="'.$url.'"/>'."\n".        '<input type="hidden" name="url" value="'.$url.'" />'."\n".
  '<input type="hidden" name="command" value="editgrades" />'."\n".   '<input type="hidden" name="command" value="editgrades" />'."\n".
   '<input type="submit" name="submit" value="Submit Changes" />'."\n".    '<input type="submit" name="submit" value="Submit Changes" />'."\n".
     '<table>'."\n".      '<table border=0><tr><td bgcolor="#999999">'."\n".
       '<tr><td>UserId</td><td>Domain</td>'."\n";       '<table border=0>'."\n".
         '<tr><td bgcolor='.$headerclr.'>UserId</td><td bgcolor='.$headerclr.'>Domain</td>'."\n";
   foreach my $part (@parts) {    foreach my $part (@parts) {
      my $display=&Apache::lonnet::metadata($url,$part.'.display');       my $display=&Apache::lonnet::metadata($url,$part.'.display');
      if  (!$display) { $display = &Apache::lonnet::metadata($url,$part.'.name'); }       if  (!$display) { $display = &Apache::lonnet::metadata($url,$part.'.name'); }
      $result.="<td>$display</td>\n";       $result.='<td bgcolor='.$headerclr.'>'.$display.'</td>'."\n";
    }     }
   $result.="</tr>";    $result.="</tr>";
   #get info for each student    #get info for each student
   foreach my $student ( sort(@{ $classlist{'allids'} }) ) {    foreach my $student ( sort(@{ $classlist{'allids'} }) ) {
     $result.=&viewstudentgrade($url,$symb,$ENV{'request.course.id'},$student,@parts);      $result.=&viewstudentgrade($url,$symb,$ENV{'request.course.id'},$student,@parts);
   }    }
   $result.='</table><input type="submit" name="submit" value="Submit Changes" /></form>';    $result.='</table></td></tr></table><input type="submit" name="submit" value="Submit Changes" /></form>';
   
   return $result;    return $result;
 }  }
Line 286  sub handler { Line 370  sub handler {
   }    }
   $request->send_http_header;    $request->send_http_header;
   return OK if $request->header_only;    return OK if $request->header_only;
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'});
   my $url=$ENV{'form.url'};    my $url=$ENV{'form.url'};
   my $symb=$ENV{'form.symb'};    my $symb=$ENV{'form.symb'};
   my $command=$ENV{'form.command'};    my $command=$ENV{'form.command'};
       if (!$url) {
       my ($temp1,$temp2);
       ($temp1,$temp2,$ENV{'form.url'})=split(/___/,$symb);
       $url = $ENV{'form.url'};
     }
   &send_header($request);    &send_header($request);
   if ($url eq '' && $symb eq '') {    if ($url eq '' && $symb eq '') {
     $request->print("Non-Contextual Access Unsupported:$command:$url:");       if ($ENV{'user.adv'}) {
            if (($ENV{'form.codeone'}) && ($ENV{'form.codetwo'}) &&
                ($ENV{'form.codethree'})) {
                my $token=$ENV{'form.codeone'}.'*'.$ENV{'form.codetwo'}.'*'.
           $ENV{'form.codethree'};
                my ($tsymb,$tuname,$tudom,$tcrsid)=
    &Apache::lonnet::checkin($token);
                if ($tsymb) {
                   my ($map,$id,$url)=split(/\_\_\_/,$tsymb);
                   if (&Apache::lonnet::allowed('mgr',$tcrsid)) {
                      $request->print(
                        &Apache::lonnet::ssi('/res/'.$url,
                           ('grade_username' => $tuname,
                            'grade_domain' => $tudom,
                            'grade_courseid' => $tcrsid,
                            'grade_symb' => $tsymb)));
                   } else {
                      $request->print('<h1>Not authorized: '.$token.'</h1>');
                   }           
       } else {
                   $request->print('<h1>Not a valid DocID: '.$token.'</h1>');
               }
    } else {
                $request->print(&Apache::lonxml::tokeninputfield());
            }
        }
   } else {    } else {
     $Apache::grades::viewgrades=&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'});      $Apache::grades::viewgrades=&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'});
     if ($command eq 'submission') {      if ($command eq 'submission') {
       $request->print(&submission($request));        $request->print(&listStudents($request)) if ($ENV{'form.student'} eq '');
         $request->print(&submission($request)) if ($ENV{'form.student'} ne '');
     } elsif ($command eq 'viewgrades') {      } elsif ($command eq 'viewgrades') {
       $request->print(&viewgrades($request));        $request->print(&viewgrades($request));
     } elsif ($command eq 'editgrades') {      } elsif ($command eq 'editgrades') {
Removed from v.1.9  
changed lines
  Added in v.1.17

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