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

Diff for /loncom/homework/grades.pm between versions 1.29 and 1.31

version 1.29, 2002/06/20 22:04:21 version 1.31, 2002/06/25 21:07:56
Line 29 Line 29
 # 6/8 Gerd Kortemeyer  # 6/8 Gerd Kortemeyer
 # 7/26 H.K. Ng  # 7/26 H.K. Ng
 # 8/20 Gerd Kortemeyer  # 8/20 Gerd Kortemeyer
   # Year 2002
   # June 2002 H.K. Ng
   #
   
 package Apache::grades;  package Apache::grades;
 use strict;  use strict;
Line 83  sub verifyreceipt { Line 86  sub verifyreceipt {
                $matches++;                 $matches++;
    }     }
         }          }
         $request->print('<p>'.$matches.' match(es)</p>');          $request->printf('<p>'.$matches." match%s</p>",$matches <= 1 ? '' : 'es');
     }      }
     return '';      return '';
 }  }
   
 sub listStudents {  sub receiptInput {
   my ($request) = shift;    my ($request) = shift;
   my $cdom=$ENV{"course.$ENV{'request.course.id'}.domain"};    my $cdom=$ENV{"course.$ENV{'request.course.id'}.domain"};
   my $cnum=$ENV{"course.$ENV{'request.course.id'}.num"};    my $cnum=$ENV{"course.$ENV{'request.course.id'}.num"};
Line 108  ENDHEADER Line 111  ENDHEADER
     $request->print(      $request->print(
     '<input type="hidden" name="symb" value="'.$ENV{'form.symb'}.'" />');      '<input type="hidden" name="symb" value="'.$ENV{'form.symb'}.'" />');
   }    }
   #  $request->print(<<ENDTABLEST);
     $request->print('</form>');
       return '';
   }
   
   sub listStudents {
     my ($request) = shift;
     my $cdom=$ENV{"course.$ENV{'request.course.id'}.domain"};
     my $cnum=$ENV{"course.$ENV{'request.course.id'}.num"};
   
   $request->print(<<ENDTABLEST);    $request->print(<<ENDTABLEST);
 </form>  
 <h2><font color="#339933">Show Student Submissions on Assessment</font></h2>  <h2><font color="#339933">Show Student Submissions on Assessment</font></h2>
   
 <table border="0"><tr><td bgcolor="#000000">  <table border="0"><tr><td bgcolor="#000000">
 <table border="0">  <table border="0">
 <tr bgcolor="#e6ffff"><td><b>Username</b></td><td><b>Name</b></td><td><b>Domain</b></td><td>&nbsp;</td></tr>  <tr bgcolor="#e6ffff"><td colspan="6"><b>Resource: </b> $ENV{'form.url'}</td></tr>
   <tr bgcolor="#e6ffff"><td><b>Username</b></td><td><b>Name</b></td><td><b>Domain</b></td>
   <td><b>View Problem</b></td><td><b>Submissions</b></td><td><b>Action</b></td></tr>
 ENDTABLEST  ENDTABLEST
   my (%classlist) = &getclasslist($cdom,$cnum,'0');    my (%classlist) = &getclasslist($cdom,$cnum,'0');
   foreach my $student ( sort(@{ $classlist{'allids'} }) ) {    foreach my $student ( sort(@{ $classlist{'allids'} }) ) {
Line 131  ENDTABLEST Line 145  ENDTABLEST
  $fullname.=$name{'firstname'}.' '.$name{'middlename'};   $fullname.=$name{'firstname'}.' '.$name{'middlename'};
       }        }
       if ( $Apache::grades::viewgrades eq 'F' ) {        if ( $Apache::grades::viewgrades eq 'F' ) {
   $request->print("\n".'<tr bgcolor=#ffffe6>'."<td>$sname</td><td>$fullname</td><td>$sdom</td><td>".    $request->print("\n".'<tr bgcolor=#ffffe6>'."<td>$sname</td><td>$fullname</td><td>$sdom</td>".
   '<form action="/adm/grades" method="post">');    '<form action="/adm/grades" method="post">');
   if ($ENV{'form.url'}) {    if ($ENV{'form.url'}) {
     $request->print(      $request->print(
     '<input type="hidden" name="url" value="'.$ENV{'form.url'}.'" />');      '<input type="hidden" name="url" value="'.$ENV{'form.url'}.'" />');
   }    }
   if ($ENV{'form.symb'}) {    if ($ENV{'form.symb'}) {
     $request->print(      $request->print(
     '<input type="hidden" name="symb" value="'.$ENV{'form.symb'}.'" />');      '<input type="hidden" name="symb" value="'.$ENV{'form.symb'}.'" />');
   }    }
   $request->print(    $request->print(
     '<input type="hidden" name="command" value="'.$ENV{'form.command'}.'" />');    '<input type="hidden" name="command" value="'.$ENV{'form.command'}.'" />');
   $request->print(    $request->print(
              '<input type="hidden" name="student" value="'.$sname.'" />');    '<input type="hidden" name="student" value="'.$sname.'" />');
   $request->print(    $request->print(
              '<input type="hidden" name="fullname" value="'.$fullname.'" />');    '<input type="hidden" name="fullname" value="'.$fullname.'" />');
   $request->print(    $request->print(
              '<input type="hidden" name="domain" value="'.$sdom.'" />');    '<input type="hidden" name="domain" value="'.$sdom.'" />');
     $request->print('<td>'.
     '<input type="radio" name="vProb" value="no" checked> no '.
     '<input type="radio" name="vProb" value="yes"> yes </td>');
     $request->print('<td>'.
     '<input type="radio" name="submission" value="last" checked> last '.
     '<input type="radio" name="submission" value="all"> all </td>');
   $request->print(    $request->print(
                          '<input type="submit" name="submit" value="View" />');                           '<td><input type="submit" name="submit" value="View/Grade" />');
   $request->print('</td></tr></form>');    $request->print('</td></tr></form>');
 #  $request->print('</form></td></tr>');  #  $request->print('</form></td></tr>');
       }        }
Line 201  sub getpartlist { Line 221  sub getpartlist {
   my @parts =();    my @parts =();
   my (@metakeys) = split(/,/,&Apache::lonnet::metadata($url,'keys'));    my (@metakeys) = split(/,/,&Apache::lonnet::metadata($url,'keys'));
   foreach my $key (@metakeys) {    foreach my $key (@metakeys) {
     if ( $key =~ m/stores_([0-9]+)_.*/ ) {      if ( $key =~ m/stores_([0-9]+)_.*/) {
       push(@parts,$key);        push(@parts,$key);
     }      }
   }    }
Line 224  sub viewstudentgrade { Line 244  sub viewstudentgrade {
   $result.="<tr bgcolor=$cellclr><td>$username</td><td>$fullname</td><td align=\"middle\">$domain</td>\n";    $result.="<tr bgcolor=$cellclr><td>$username</td><td>$fullname</td><td 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";      my $score=$record{"resource.$part.$type"};
     if ($type eq 'awarded') {      if ($type eq 'awarded' || $type eq 'tries') {
       my $score=$record{"resource.$part.$type"};        $result.='<td align="middle"><input type="text" name="GRADE.'.$student.'.'.$part.'.'.$type.
       $result.="<td align=\"middle\"><input type=\"text\" name=\"GRADE.$student.$part.$type\" value=\"$score\" size=\"4\" /></td>\n";    '" value="'.$score.'" size="4" /></td>'."\n";
     } elsif ($type eq 'tries') {  
       my $score=$record{"resource.$part.$type"};  
       $result.="<td 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 ($status,$foo)=split(/_/,$score,2);
       $result.="<td align=\"middle\"><select name=\"GRADE.$student.$part.$type\">\n";        $result.="<td align=\"middle\"><select name=\"GRADE.$student.$part.$type\">\n";
       if ($score =~ /^correct/) {        my $optsel = '<option>correct</option><option>incorrect</option><option>excused</option>'.
  $result.="<option selected=\"on\">correct</option>\n<option>incorrect</option>\n<option>excused</option>\n<option>ungraded</option>\n<option>nothing</option>\n";    '<option>ungraded</option><option>handgraded</option><option>nothing</option>'."\n";
       } elsif ($score =~ /^incorrect/) {        $status = 'nothing' if ($status eq '');
  $result.="<option>correct</option>\n<option selected=\"on\">incorrect</option>\n<option>excused</option>\n<option>ungraded</option>\n<option>nothing</option>\n";        $optsel =~ s/<option>$status/<option selected="on">$status/;
       } elsif ($score eq '') {        $result.=$optsel;
  $result.="<option>correct</option>\n<option>incorrect</option>\n<option>excused</option>\n<option>ungraded</option>\n<option selected=\"on\">nothing</option>\n";  
       } elsif ($score =~ /^excused/) {  
  $result.="<option>correct</option>\n<option>incorrect</option>\n<option selected=\"on\">excused</option>\n<option>ungraded</option>\n<option>nothing</option>\n";  
       } elsif ($score =~ /^ungraded/) {  
  $result.="<option>correct</option>\n<option>incorrect</option>\n<option>excused</option>\n<option selected=\"on\">ungraded</option>\n<option>nothing</option>\n";  
       }  
       $result.="</select></td>\n";        $result.="</select></td>\n";
     }      }
   }    }
   $result.='<td></td></tr>';    $result.='<td></td></tr>';
   return $result;    return $result;
 }  }
 #FIXME need to look at the meatdata <stores> spec on what type of data to accept and provide an  
   #FIXME need to look at the metadata <stores> spec on what type of data to accept and provide an
 #interface based on that, also do that to above function.  #interface based on that, also do that to above function.
 sub setstudentgrade {  sub setstudentgrade {
   my ($url,$symb,$courseid,$student,@parts) = @_;    my ($url,$symb,$courseid,$student,@parts) = @_;
   
   my $result ='';    my $result ='';
   
   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);
   
   my %newrecord;    my %newrecord;
   
   foreach my $part (@parts) {    foreach my $part (@parts) {
Line 304  sub setstudentgrade { Line 313  sub setstudentgrade {
   return $result;    return $result;
 }  }
   
   # -- show submissions of a student, option to grade
   #
 sub submission {  sub submission {
   my ($request) = @_;    my ($request) = @_;
     $request->print(<<JAVASCRIPT);
   <script type="text/javascript">
       function changeRadio(title,url) {
       }
   </script>
   JAVASCRIPT
   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;    my $symb;
Line 319  sub submission { Line 335  sub submission {
     $symb=&Apache::lonnet::symbread($url);      $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,  #
       $ENV{'request.course.id'});  # header info
   my $result='<h2><font color="#339933">Submission Record</font></h2>';    my $result='<h2><font color="#339933">Submission Record</font></h2>';
   $result.='<b>Username : </b>'.$uname.'<br><b>Fullname : </b>'.$ENV{'form.fullname'}.'<br><b>Domain : </b>'.$udom.'<br><b>Resource : </b>'.$url.' <br />'.$answer;    $result.='<table border="0"><tr><td><b>Username: </b>'.$uname.'</td><td><b>Fullname: </b>'.$ENV{'form.fullname'}.'</td><td><b>Domain: </b>'.$udom.'</td></tr>';
   my $rendered=&Apache::loncommon::get_student_view($symb,$uname,$udom,    $result.='<tr><td colspan=3><b>Resource: </b>'.$url.'</td></tr></table>';
   #
   # option to display problem
     if ($ENV{'form.vProb'} eq 'yes') {
         my $rendered=&Apache::loncommon::get_student_view($symb,$uname,$udom,
    $ENV{'request.course.id'});     $ENV{'request.course.id'});
   $result.="Student's view of the problem:<br /> $rendered <br /> Correct answer:<br />";        my $companswer=&Apache::loncommon::get_student_answers($symb,$uname,$udom,
    $ENV{'request.course.id'});
   $answer=&Apache::loncommon::get_student_answers($symb,$uname,$udom,        $result.='<table border="0"><tr><td bgcolor="#000000">';
   $ENV{'request.course.id'});        $result.='<table border="0"><tr><td bgcolor="#e6ffff">';
         $result.='<b>Student\'s view of the problem</b></td></tr><tr><td bgcolor="#ffffff">'.$rendered.'<br />';
         $result.='<b>Correct answer:</b><br />'.$companswer;
         $result.='</td></tr></table>';
         $result.='</td></tr></table><br />';
     }
     my $last = '';
     $last = 'last' if ($ENV{'form.submission'} eq 'last');
     my $answer=&Apache::loncommon::get_previous_attempt($symb,$uname,$udom,
         $ENV{'request.course.id'},$last);
   $result.=$answer;    $result.=$answer;
   
     my $maxpt = &Apache::lonnet::EXT('resource.partid.weight',$symb,$udom,$uname);
     my %record= &Apache::lonnet::restore($symb,$ENV{'request.course.id'},$udom,$uname);
     my $score = $record{'resource.0.awarded'}*$maxpt;
   
     $result.= '<form action="/adm/grades" method="post" name="SCORE">'."\n".
       '<input type="hidden" name="symb" value="'.$symb.'" />'."\n".
         '<input type="hidden" name="url" value="'.$url.'" />'."\n".
    '<input type="hidden" name="command" value="editgrades" />'."\n".
            '<table border="0"><tr><td><b>Points</b></td><td>';
     my $ctr = 0;
     while ($ctr<=$maxpt) {
         $result.= '<input type="radio" name="radval" '.
     'onclick="javascript:SCORE.GRADE_'.$ENV{'form.student'}.'.value='.$ctr.'" value="'.$ctr.'" '.
     ($score == $ctr? 'checked':'').' /> '.$ctr."\n";
         $ctr++;
     }
     $result.='</td><td>&nbsp;<b>or</b>&nbsp;</td>';
     $result.='<td><input type="text" name="GRADE_'.$ENV{'form.student'}.'"'.
         ($score ne ''? ' value = "'.$score.'"':'').' size="4" /></td>'."\n";  
     $result.='<td>/'.$maxpt.' (max pts)</td><td>';
   
     foreach my $part (&getpartlist($url)) {
       my ($temp,$part,$type)=split(/_/,$part);
       if ($type eq 'solved') {
         my ($status,$foo)=split(/_/,$record{"resource.$part.$type"},2);
         $result.="<select name=\"GRADE.$uname:$udom.$part.$type\">\n";
         my $optsel = '<option>correct</option><option>incorrect</option>'.
     '<option>excused</option><option>ungraded</option>'.
         '<option>handgraded</option><option>nothing</option>'."\n";
         $status = 'nothing' if ($status eq '');
         $optsel =~ s/<option>$status/<option selected="on">$status/;
         $result.=$optsel;
         $result.="</select></td></tr>\n";
       }
     }
     $result.='<tr><td colspan="5">The buttons do not work yet.<input type="submit" name="gradeOpt" value="Save N Next" />&nbsp;';
     $result.='<input type="submit" name="gradeOpt" value="Next" />&nbsp';
     $result.='<input type="submit" name="gradeOpt" value="Previous" />&nbsp';
     $result.='</td><tr></table></form>';
   return $result;    return $result;
 }  }
   
Line 349  sub view_edit_entire_class_form { Line 418  sub view_edit_entire_class_form {
     '<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="viewgrades" />'."\n".   '<input type="hidden" name="command" value="viewgrades" />'."\n".
   '<input type="submit" name="submit" value="View/Edit Entire Class" />'."\n".    '<input type="submit" name="submit" value="View/Grade Entire Class" />'."\n".
     '</form>'."\n";      '</form>'."\n";
   return $result;    return $result;
 }  }
Line 386  sub gradingmenu { Line 455  sub gradingmenu {
      '<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="submission" />'."\n".   '<input type="hidden" name="command" value="submission" />'."\n".
   '<input type="submit" name="submit" value="View/Edit Student" />'."\n".    '<input type="submit" name="submit" value="View/Grade A Student" />'."\n".
       '</form>'."\n";
     $result.='<form action="/adm/grades" method="post">'."\n".
        '<input type="hidden" name="symb" value="'.$symb.'" />'."\n".
         '<input type="hidden" name="url" value="'.$url.'" />'."\n".
    '<input type="hidden" name="command" value="receiptInput" />'."\n".
     '<input type="submit" name="submit" value="Verify Receipt" />'."\n".
     '</form>'."\n";      '</form>'."\n";
   $result.='</td></tr></table>'."\n";    $result.='</td></tr></table>'."\n";
   $result.='</td></tr></table>'."\n";    $result.='</td></tr></table>'."\n";
Line 424  sub viewgrades { Line 499  sub viewgrades {
   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'); }
         print "Manual grading:$url:$part:$display:<br>";
      $result.='<td><b>'.$display.'</b></td>'."\n";       $result.='<td><b>'.$display.'</b></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'} }) ) {
       my $display=&viewstudentgrade($url,$symb,$ENV{'request.course.id'},$student,@parts);
   #      print "ID=$ENV{'request.course.id'}:STU=$student:DIS=$display:<br>\n";
     $result.=&viewstudentgrade($url,$symb,$ENV{'request.course.id'},$student,@parts);      $result.=&viewstudentgrade($url,$symb,$ENV{'request.course.id'},$student,@parts);
   }    }
   $result.='</table></td></tr></table><input type="submit" name="submit" value="Submit Changes" /></form>';    $result.='</table></td></tr></table>';
     $result.='<input type="submit" name="submit" value="Submit Changes" /></form>';
   $result.=&show_grading_menu_form($symb,$url);    $result.=&show_grading_menu_form($symb,$url);
   return $result;    return $result;
 }  }
Line 797  sub handler { Line 876  sub handler {
       $request->print(&csvupload($request));        $request->print(&csvupload($request));
     } elsif ($command eq 'csvuploadmap') {      } elsif ($command eq 'csvuploadmap') {
       $request->print(&csvuploadmap($request));        $request->print(&csvuploadmap($request));
       } elsif ($command eq 'receiptInput') {
         &receiptInput($request);
     } elsif ($command eq 'csvuploadassign') {      } elsif ($command eq 'csvuploadassign') {
       if ($ENV{'form.associate'} ne 'Reverse Association') {        if ($ENV{'form.associate'} ne 'Reverse Association') {
  $request->print(&csvuploadassign($request));   $request->print(&csvuploadassign($request));
Removed from v.1.29  
changed lines
  Added in v.1.31

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