Diff for /loncom/homework/grades.pm between versions 1.15 and 1.20

version 1.15, 2001/08/20 23:27:27 version 1.20, 2002/04/09 03:56: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  # 7/26 H.K. Ng
Line 18  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 '';
Line 33  sub listStudents { Line 64  sub listStudents {
   my ($request) = shift;    my ($request) = shift;
   my ($cdom,$cnum) = split(/_/,$ENV{'request.course.id'});    my ($cdom,$cnum) = split(/_/,$ENV{'request.course.id'});
   my $chome=$ENV{"course.$ENV{'request.course.id'}.home"};    my $chome=$ENV{"course.$ENV{'request.course.id'}.home"};
   $request->print ("Found $cdom:$cnum:$chome<br />");    $request->print ('<h1>Show Student Submissions on Assessment</h1>'.
    '<table border="1"><tr><th>Username</th><th>Domain</th><th>Name</th><th>&nbsp;</th></tr>'
    );
   my (%classlist) = &getclasslist($cdom,$cnum,$chome,'0');    my (%classlist) = &getclasslist($cdom,$cnum,$chome,'0');
   foreach my $student ( sort(@{ $classlist{'allids'} }) ) {    foreach my $student ( sort(@{ $classlist{'allids'} }) ) {
       my ($sname,$sdom) = split(/:/,$student);        my ($sname,$sdom) = split(/:/,$student);
Line 46  sub listStudents { Line 79  sub listStudents {
 #      my $sfullname = $Apache::lonnet::unescape($nameparts[0]);  #      my $sfullname = $Apache::lonnet::unescape($nameparts[0]);
   
       if ( $Apache::grades::viewgrades eq 'F' ) {        if ( $Apache::grades::viewgrades eq 'F' ) {
   $request->print('<form action="/adm/grades" method="post">'."\n");    $request->print(
   $request->print("$sname @nameparts\n");   "\n".'<tr><form action="/adm/grades" method="post">'.
   $request->print('<input type="hidden" name="url" value="'.$ENV{'form.url'}.'"></input>'."\n");   "<td>$sname</td><td>$sdom</td><td>@nameparts</td><td>");
   $request->print('<input type="hidden" name="command" value="'.$ENV{'form.command'}.'"></input>'."\n");    if ($ENV{'form.url'}) {
   $request->print('<input type="hidden" name="student" value="'.$sname.'"></input>'."\n");      $request->print(
   $request->print('<input type="hidden" name="domain" value="'.$sdom.'"></input>'."\n");      '<input type="hidden" name="url" value="'.$ENV{'form.url'}.'" />');
   $request->print('<input type="submit" name="submit" value="View"></input>'."<br />\n");    }
   $request->print('</form>');    if ($ENV{'form.symb'}) {
       $request->print(
       '<input type="hidden" name="symb" value="'.$ENV{'form.symb'}.'" />');
     }
     $request->print(
       '<input type="hidden" name="command" value="'.$ENV{'form.command'}.'" />');
     $request->print(
                '<input type="hidden" name="student" value="'.$sname.'" />');
     $request->print(
                '<input type="hidden" name="domain" value="'.$sdom.'" />');
     $request->print(
                            '<input type="submit" name="submit" value="View" />');
     $request->print('</td></form></tr>');
       }        }
   }    }
     $request->print('</table>');
 }  }
   
   
Line 211  sub submission { Line 256  sub submission {
 #  if ($ENV{'form.student'} eq '') { &listStudents($request); 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 <br />".$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:";
   
     my $answer=&Apache::loncommon::get_student_answers($symb,$uname,$udom,
     $ENV{'request.course.id'});
     $result.=$answer;
   return $result;    return $result;
 }  }
   
Line 245  sub viewgrades { Line 302  sub viewgrades {
   
   #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 border=0><tr><td bgcolor="#999999">'."\n".      '<table border=0><tr><td bgcolor="#999999">'."\n".
Line 326  sub handler { Line 383  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 '') {
      if ($ENV{'user.adv'}) {       if ($ENV{'user.adv'}) {
Line 361  sub handler { Line 423  sub handler {
   } 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(&listStudents($request)) if ($ENV{'form.student'} eq '');        &listStudents($request) if ($ENV{'form.student'} eq '');
       $request->print(&submission($request)) if ($ENV{'form.student'} ne '');        $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));

Removed from v.1.15  
changed lines
  Added in v.1.20


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