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

Diff for /loncom/homework/grades.pm between versions 1.32 and 1.34

version 1.32, 2002/06/26 21:25:31 version 1.34, 2002/07/01 21:20:29
Line 65  sub moreinfo { Line 65  sub moreinfo {
 sub verifyreceipt {  sub verifyreceipt {
     my $request=shift;      my $request=shift;
     my $courseid=$ENV{'request.course.id'};      my $courseid=$ENV{'request.course.id'};
     my $cdom=$ENV{"course.$courseid.domain"};  #    my $cdom=$ENV{"course.$courseid.domain"};
     my $cnum=$ENV{"course.$courseid.num"};  #    my $cnum=$ENV{"course.$courseid.num"};
     my $receipt=unpack("%32C*",$Apache::lonnet::perlvar{'lonHostID'}).'-'.      my $receipt=unpack("%32C*",$Apache::lonnet::perlvar{'lonHostID'}).'-'.
                 $ENV{'form.receipt'};                  $ENV{'form.receipt'};
     $receipt=~s/[^\-\d]//g;      $receipt=~s/[^\-\d]//g;
Line 77  sub verifyreceipt { Line 77  sub verifyreceipt {
     if ((&Apache::lonnet::allowed('mgr',$courseid)) && ($symb)) {      if ((&Apache::lonnet::allowed('mgr',$courseid)) && ($symb)) {
         $request->print('<h1>Verifying Submission Receipt '.$receipt.'</h1>');          $request->print('<h1>Verifying Submission Receipt '.$receipt.'</h1>');
         my $matches=0;          my $matches=0;
         my (%classlist) = &getclasslist($cdom,$cnum,'0');          my ($classlist) = &getclasslist('all','0');
         foreach my $student ( sort(@{ $classlist{'allids'} }) ) {          foreach my $student ( sort(@{ $$classlist{'all'} }) ) {
             my ($uname,$udom)=split(/\:/,$student);              my ($uname,$udom)=split(/\:/,$student);
             if ($receipt eq               if ($receipt eq 
              &Apache::lonnet::ireceipt($uname,$udom,$courseid,$symb)) {               &Apache::lonnet::ireceipt($uname,$udom,$courseid,$symb)) {
Line 87  sub verifyreceipt { Line 87  sub verifyreceipt {
    }     }
         }          }
         $request->printf('<p>'.$matches." match%s</p>",$matches <= 1 ? '' : 'es');          $request->printf('<p>'.$matches." match%s</p>",$matches <= 1 ? '' : 'es');
   # needs to print who is matched
     }      }
     return '';      return '';
 }  }
   
 sub receiptInput {  
   my ($request) = shift;  
   my $cdom=$ENV{"course.$ENV{'request.course.id'}.domain"};  
   my $cnum=$ENV{"course.$ENV{'request.course.id'}.num"};  
   my $hostver=unpack("%32C*",$Apache::lonnet::perlvar{'lonHostID'});  
   $request->print(<<ENDHEADER);  
 <h2><font color="#339933">Verify a Submission Receipt Issued by this Server</font></h2>  
 <form action="/adm/grades" method="post">  
 <tt>$hostver-<input type="text" name="receipt" size="4"></tt>  
 <input type="submit" name="submit" value="Verify">  
 <input type="hidden" name="command" value="verify">  
 ENDHEADER  
   if ($ENV{'form.url'}) {  
     $request->print(  
     '<input type="hidden" name="url" value="'.$ENV{'form.url'}.'" />');  
   }  
   if ($ENV{'form.symb'}) {  
     $request->print(  
     '<input type="hidden" name="symb" value="'.$ENV{'form.symb'}.'" />');  
   }  
 #  $request->print(<<ENDTABLEST);  
   $request->print('</form>');  
     return '';  
 }  
   
 sub student_gradeStatus {  sub student_gradeStatus {
   my ($url,$udom,$uname) = @_;    my ($url,$udom,$uname) = @_;
   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 124  sub student_gradeStatus { Line 100  sub student_gradeStatus {
     my ($temp,$part,$type)=split(/_/,$part);      my ($temp,$part,$type)=split(/_/,$part);
     if ($type eq 'solved') {      if ($type eq 'solved') {
       my ($status,$foo)=split(/_/,$record{"resource.$part.$type"},2);        my ($status,$foo)=split(/_/,$record{"resource.$part.$type"},2);
         $status = 'partial' if ($foo =~ /^partially/);
       $status = 'nothing' if ($status eq '');        $status = 'nothing' if ($status eq '');
       return $type,$status;        return $type,$status;
     }      }
Line 131  sub student_gradeStatus { Line 108  sub student_gradeStatus {
   return '';    return '';
 }  }
   
   sub get_fullname {
       my ($sname,$sdom) = @_;
       my %name=&Apache::lonnet::get('environment', ['lastname','generation',
     'firstname','middlename'],
     $sdom,$sname);
       my $fullname;
       my ($tmp) = keys(%name);
       if ($tmp !~ /^(con_lost|error|no_such_host)/i) {
    $fullname=$name{'lastname'}.$name{'generation'};
    if ($fullname =~ /[^\s]+/) { $fullname.=', '; }
    $fullname.=$name{'firstname'}.' '.$name{'middlename'};
       }
       return $fullname;
   }
   
 sub listStudents {  sub listStudents {
   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"};
     my $getsec    =$ENV{'form.section'};
     my $submitonly=$ENV{'form.submitonly'};
   
   $request->print(<<ENDTABLEST);    $request->print(<<ENDTABLEST);
 <h2><font color="#339933">Show Student Submissions on Assessment</font></h2>  <h2><font color="#339933">&nbsp;View Submissions for a Student or a Group of Students</font></h2>
   &nbsp;<font size=+1><b>Resource:</b> $ENV{'form.url'}<br /><br />
   <form action="/adm/grades" method="post">&nbsp;<b>View Options</b></font><br />
   &nbsp;<b>View Problem: </b><input type="radio" name="vProb" value="no" checked> no 
   <input type="radio" name="vProb" value="yes"> yes 
   &nbsp;&nbsp;&nbsp;<b>Submissions: </b><input type="radio" name="lastSub" value="last" checked> last 
   <input type="radio" name="lastSub" value="all"> all 
   <input type="hidden" name="section" value="$getsec">
   <input type="hidden" name="submitonly" value="$submitonly">
 <table border="0"><tr><td bgcolor="#777777">  <table border="0"><tr><td bgcolor="#777777">
 <table border="0">  <table border="0"><tr bgcolor="#e6ffff">
 <tr bgcolor="#e6ffff"><td colspan="7"><b>Resource: </b> $ENV{'form.url'}</td></tr>  <td><b>&nbsp;Select&nbsp;</b></td><td><b>&nbsp;Username&nbsp;</b></td>
 <tr bgcolor="#e6ffff"><td><b>Username</b></td><td><b>Name</b></td><td><b>Domain</b></td>  <td><b>&nbsp;Fullname&nbsp;</b></td><td><b>&nbsp;Domain&nbsp;</b></td>
 <td><b>View Problem</b></td><td><b>Submissions</b></td>  <td><b>&nbsp;Grade Status&nbsp;</b></td></tr>
 <td><b>Grade Status</b></td><td><b>Action</b></td></tr>  
 ENDTABLEST  ENDTABLEST
   my (%classlist) = &getclasslist($cdom,$cnum,'0');    if ($ENV{'form.url'}) {
   foreach my $student ( sort(@{ $classlist{'allids'} }) ) {        $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="processGroup" />'."\n");
   
     my ($classlist) = &getclasslist($getsec,'0');
     foreach my $student ( sort(@{ $$classlist{$getsec} }) ) {
       my ($sname,$sdom) = split(/:/,$student);        my ($sname,$sdom) = split(/:/,$student);
         my ($type,$status) = &student_gradeStatus($ENV{'form.url'},$cdom,$sname);
         next if ($status eq 'nothing' && $submitonly eq 'yes');
   
       my %name=&Apache::lonnet::get('environment', ['lastname','generation',        my $fullname = &get_fullname($sname,$sdom);
     'firstname','middlename'],  
     $sdom,$sname);  
       my $fullname;  
       my ($tmp) = keys(%name);  
       if ($tmp !~ /^(con_lost|error|no_such_host)/i) {  
  $fullname=$name{'lastname'}.$name{'generation'};  
  if ($fullname =~ /[^\s]+/) { $fullname.=', '; }  
  $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 align=\"middle\">$sdom</td>".    $request->print("\n".'<tr bgcolor="#ffffe6">'.
   '<form action="/adm/grades" method="post">');    '<td align="center"><input type=checkbox name="stuinfo" value="'.
   if ($ENV{'form.url'}) {    $student.':'.$fullname.'"></td>'."\n".
     $request->print(    '<td>&nbsp;'.$sname.'&nbsp;</td>'."\n".
     '<input type="hidden" name="url" value="'.$ENV{'form.url'}.'" />');    '<td>&nbsp;'.$fullname.'&nbsp;</td>'."\n".
   }    '<td align="middle">&nbsp;'.$sdom.'&nbsp;</td>'."\n");
   if ($ENV{'form.symb'}) {    $request->print('<td align="middle">&nbsp;'.$status.'&nbsp;</td>'."\n");
     $request->print(  
     '<input type="hidden" name="symb" value="'.$ENV{'form.symb'}.'" />');    $request->print('</tr>');
   }  
   $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="fullname" value="'.$fullname.'" />');  
   $request->print(  
   '<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>');  
   my ($type,$status) = &student_gradeStatus($ENV{'form.url'},$cdom,$sname);  
   $request->print(  
   '<td align="middle">'.$status.'&nbsp;</td>');  
   $request->print(  
                          '<td><input type="submit" name="submit" value="View/Grade" />');  
   $request->print('</td></tr></form>');  
 #  $request->print('</form></td></tr>');  
       }        }
   }    }
   $request->print('</table></td></tr></table>');    $request->print('</table></td></tr></table>');
     $request->print('<input type="submit" name="submit" value="View/Grade" /><form />');
 }  }
   
   sub processGroup {
     my ($request)  = shift;
     my $ctr        = 0;
     my @stuchecked = (ref($ENV{'form.stuinfo'}) ? @{$ENV{'form.stuinfo'}}
                              :  ($ENV{'form.stuinfo'}) );
     my $total      = scalar(@stuchecked)-1;
     foreach my $student (@stuchecked) {
         my ($sname,$sdom,$fullname) = split(/:/,$student);
         $ENV{'form.student'} = $sname;
         $ENV{'form.fullname'} = $fullname;
         &submission($request,$ctr,$total);
         $ctr++;
     }
   
     return 'The End';
   }
   
 #FIXME - needs to handle multiple matches  #FIXME - needs to handle multiple matches
 sub finduser {  sub finduser {
Line 205  sub finduser { Line 201  sub finduser {
   
   if ( $Apache::grades::viewgrades eq 'F' ) {    if ( $Apache::grades::viewgrades eq 'F' ) {
     #get classlist      #get classlist
     my ($cdom,$cnum) = split(/_/,$ENV{'request.course.id'});  #    my ($cdom,$cnum) = split(/_/,$ENV{'request.course.id'});
     #print "Found $cdom:$cnum<br />";      #print "Found $cdom:$cnum<br />";
     my (%classlist) = &getclasslist($cdom,$cnum,'0');      my ($classlist) = &getclasslist('all','0');
     foreach my $student ( sort(@{ $classlist{'allids'} }) ) {      foreach my $student ( sort(@{ $$classlist{'all'} }) ) {
       my ($posname,$posdomain) = split(/:/,$student);        my ($posname,$posdomain) = split(/:/,$student);
       if ($posname =~ $name) { $name=$posname; $domain=$posdomain; last; }        if ($posname =~ $name) { $name=$posname; $domain=$posdomain; last; }
     }      }
Line 219  sub finduser { Line 215  sub finduser {
 }  }
   
 sub getclasslist {  sub getclasslist {
   my ($coursedomain,$coursenum,$hideexpired) = @_;    my ($getsec,$hideexpired) = @_;
     my ($coursedomain,$coursenum) = split(/_/,$ENV{'request.course.id'});
   my %classlist=&Apache::lonnet::dump('classlist',$coursedomain,$coursenum);    my %classlist=&Apache::lonnet::dump('classlist',$coursedomain,$coursenum);
   my $now = time;    my $now = time;
     my (@holdsec,@sections);
   foreach my $student (keys(%classlist)) {    foreach my $student (keys(%classlist)) {
     my ($end,$start)=split(/:/,$classlist{$student});      my ($end,$start)=split(/:/,$classlist{$student});
     # still a student?      # still a student?
     if (($hideexpired) && ($end) && ($end < $now)) {      if (($hideexpired) && ($end) && ($end < $now)) {
       #print "Skipping:$name:$end:$now<br />\n";  
       next;        next;
     }      }
     #print "record=$record<br>";      my ($unam,$udom) = split(/:/,$student,2);
     push( @{ $classlist{'allids'} }, $student);      my $section = &Apache::lonnet::usection($udom,$unam,$ENV{'request.course.id'});
       push @holdsec,$section;
       push (@{ $classlist{$getsec} }, $student) if ($getsec eq 'all' or $getsec == $section);
     }
     my %seen = ();
     foreach my $item (@holdsec) {
         push (@sections, $item) unless $seen{$item}++;
   }    }
   return (%classlist);    return (\%classlist,\@sections);
 }  }
   
 sub getpartlist {  sub getpartlist {
Line 253  sub viewstudentgrade { Line 256  sub viewstudentgrade {
   my $cellclr = '"#ffffdd"';    my $cellclr = '"#ffffdd"';
   my ($username,$domain) = split(/:/,$student);    my ($username,$domain) = split(/:/,$student);
   
   my (@requests) = ('lastname','firstname','middlename','generation');    my $fullname = &get_fullname($username,$domain);
   my (%name) = &Apache::lonnet::get('environment',\@requests,$domain,$username);  
   my %record=&Apache::lonnet::restore($symb,$courseid,$domain,$username);    my %record=&Apache::lonnet::restore($symb,$courseid,$domain,$username);
   
   my $fullname=$name{'lastname'}.$name{'generation'};  
   if ($fullname =~ /[^\s]+/) { $fullname.=', '; }  
   $fullname.=$name{'firstname'}.' '.$name{'middlename'};  
   
   $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);
Line 272  sub viewstudentgrade { Line 270  sub viewstudentgrade {
       my ($status,$foo)=split(/_/,$score,2);        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";
       my $optsel = '<option>correct</option><option>incorrect</option><option>excused</option>'.        my $optsel = '<option>correct</option><option>incorrect</option><option>excused</option>'.
   '<option>ungraded</option><option>handgraded</option><option>nothing</option>'."\n";    '<option>ungraded</option><option>partial</option><option>nothing</option>'."\n";
       $status = 'nothing' if ($status eq '');        $status = 'nothing' if ($status eq '');
       $optsel =~ s/<option>$status/<option selected="on">$status/;        $optsel =~ s/<option>$status/<option selected="on">$status/;
       $result.=$optsel;        $result.=$optsel;
Line 287  sub viewstudentgrade { Line 285  sub viewstudentgrade {
 #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) = @_;
     print "set student grade parts=@parts<br>";
   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);
Line 308  sub setstudentgrade { Line 306  sub setstudentgrade {
       } elsif ($oldscore !~ m/^$newscore/) {        } elsif ($oldscore !~ m/^$newscore/) {
  $update=1;   $update=1;
  $result.="Updating $stuname to $newscore<br />\n";   $result.="Updating $stuname to $newscore<br />\n";
  if ($newscore eq 'correct') { $newscore = 'correct_by_override'; }   if ($newscore eq 'correct')   { $newscore = 'correct_by_override'; }
  if ($newscore eq 'incorrect') { $newscore = 'incorrect_by_override'; }   if ($newscore eq 'incorrect') { $newscore = 'incorrect_by_override'; }
  if ($newscore eq 'excused') { $newscore = 'excused'; }   if ($newscore eq 'excused')   { $newscore = 'excused'; }
  if ($newscore eq 'ungraded') { $newscore = 'ungraded_attempted'; }   if ($newscore eq 'ungraded')  { $newscore = 'ungraded_attempted'; }
    if ($newscore eq 'partial')   { $newscore = 'correct_partially_by_override'; }
       } else {        } else {
  #$result.="$stuname:$part:$type:unchanged  $oldscore to $newscore:<br />\n";   #$result.="$stuname:$part:$type:unchanged  $oldscore to $newscore:<br />\n";
       }        }
Line 331  sub setstudentgrade { Line 330  sub setstudentgrade {
     while (my ($k,$v) = each %newrecord) {      while (my ($k,$v) = each %newrecord) {
  print "k=$k:v=$v:<br>\n";   print "k=$k:v=$v:<br>\n";
     }      }
     &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;
 }  }
   
 # --------------------------- show submissions of a student, option to grade --------  
 #  #
   # --------------------------- show submissions of a student, option to grade --------
 sub submission {  sub submission {
   my ($request) = @_;    my ($request,$counter,$total) = @_;
   $request->print(<<JAVASCRIPT);  
     if ($counter == 0) {
         $request->print(<<JAVASCRIPT);
 <script type="text/javascript" language="javascript">  <script type="text/javascript" language="javascript">
     function updateRadio() {    function updateRadio(radioButton,formtextbox,formsel,wgt) {
  var pts = document.SCORE.GRADE_BOX.value;       var pts = formtextbox.value;
  var radioButton = document.SCORE.radval;       var resetbox =false;
  var checked  =true;       if (isNaN(pts) || pts < 0) {
  var unchecked=false;   alert("A number equal or greater than 0 is expected. Entered value = "+pts);
  var resetbox =false;   for (var i=0; i<radioButton.length; i++) {
  if (isNaN(pts) || pts < 0) {     if (radioButton[i].checked) {
     alert("A number equal or greater than 0 is expected. Entered value = "+pts);        formtextbox.value = i;
     for (var i=0; i<radioButton.length; i++) {        resetbox = true;
  if (radioButton[i].checked) {     }
     document.SCORE.GRADE_BOX.value = i;   }
     resetbox = true;   if (!resetbox) {
  }     formtextbox.value = "";
     }  
     if (!resetbox) {  
  document.SCORE.GRADE_BOX.value = "";  
     }  
     return;  
  }   }
    return;
       }
   
  for (var i=0; i<radioButton.length; i++) {      for (var i=0; i<radioButton.length; i++) {
     radioButton[i].checked=unchecked;   radioButton[i].checked=false;
     if (pts == i) {   if (pts == i) {
  radioButton[i].checked=checked;     radioButton[i].checked=true;
     }  
  }   }
     }      }
       updateSelect(formsel,pts,wgt);
     }
   
     function writeBox(formrad,formsel,pts,wgt) {
       formrad.value = pts;
       updateSelect(formsel,pts,wgt);
       return;
     }
   
     function updateSelect(formsel,pts,wgt) {
       if (pts == 0) {
         formsel[1].selected = true;
       }
       if (pts > 0 && pts < wgt) {
         formsel[4].selected = true;
       }
       if (pts == wgt) {
         formsel[0].selected = true;
       }
       return;
     }
   
 </script>  </script>
 JAVASCRIPT  JAVASCRIPT
   my $url=$ENV{'form.url'};  }
   $url=~s-^http://($ENV{'SERVER_NAME'}|$ENV{'HTTP_HOST'})--;    (my $url=$ENV{'form.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 ''; }
   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=($ENV{'form.symb'} ne '' ? $ENV{'form.symb'} : (&Apache::lonnet::symbread($url)));    my $symb=($ENV{'form.symb'} ne '' ? $ENV{'form.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 $last = ($ENV{'form.lastSub'} eq 'last' ? 'last' : '');
 #  #
 # header info  # header info
   my $result='<h2><font color="#339933">Submission Record</font></h2>';    if ($counter == 0) {
   $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>';        $request->print('<h2><font color="#339933">Submission Record</font></h2>');
   $result.='<tr><td colspan=3><b>Resource: </b>'.$url.'</td></tr></table>';    }
   
 #  #
 # option to display problem  # option to display problem, only once else it cause problems with the form later since the problem has a form.
   if ($ENV{'form.vProb'} eq 'yes') {    if ($ENV{'form.vProb'} eq 'yes' && $counter == 0) {
       my $rendered=&Apache::loncommon::get_student_view($symb,$uname,$udom,        my $rendered=&Apache::loncommon::get_student_view($symb,$uname,$udom,
    $ENV{'request.course.id'});     $ENV{'request.course.id'});
       my $companswer=&Apache::loncommon::get_student_answers($symb,$uname,$udom,        my $companswer=&Apache::loncommon::get_student_answers($symb,$uname,$udom,
  $ENV{'request.course.id'});   $ENV{'request.course.id'});
       $result.='<table border="0"><tr><td bgcolor="#777777">';        my $result.='<table border="0" width="100%"><tr><td bgcolor="#777777">';
       $result.='<table border="0"><tr><td bgcolor="#e6ffff">';        $result.='<table border="0" width="100%"><tr><td bgcolor="#e6ffff">';
       $result.='<b>Student\'s view of the problem</b></td></tr><tr><td bgcolor="#ffffff">'.$rendered.'<br />';        $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.='<b>Correct answer:</b><br />'.$companswer;
       $result.='</td></tr></table>';        $result.='</td></tr></table>';
       $result.='</td></tr></table><br />';        $result.='</td></tr></table><br />';
         $request->print($result);
     }
   #
   # beginning of form
     if ($counter == 0) {
         $request->print('<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="vProb" value="'.$ENV{'form.vProb'}.'" />'."\n".
         '<input type="hidden" name="lastSub" value="'.$last.'" />'."\n".
         '<input type="hidden" name="section" value="'.$ENV{'form.section'}.'">'."\n".
         '<input type="hidden" name="submitonly" value="'.$ENV{'form.submitonly'}.'">'."\n".
         '<input type="hidden" name="command" value="handgrade" />'."\n".
         '<input type="hidden" name="NCT"'.
         ' value="'.($ENV{'form.NTSTU'} ne '' ? $ENV{'form.NTSTU'} : '1').'" />'."\n");
   }    }
   my $last = '';  #
   $last = 'last' if ($ENV{'form.submission'} eq 'last');  # Student info
     $request->print(($counter == 0 ? '' : '<br /><hr><br />'));
     my $result.='<table border="0"><tr><td><b>Username: </b>'.$uname.
         '</td><td><b>Fullname: </b>'.
     ($ENV{'form.fullname'} ne '' ? $ENV{'form.fullname'} : &get_fullname($uname,$udom)).
         '</td><td><b>Domain: </b>'.$udom.'</td></tr>';
     $result.='<tr><td colspan=3><b>Resource: </b>'.$url.'</td></tr></table>';
     $request->print($result);
   #
   # print student answer
   my $answer=&Apache::loncommon::get_previous_attempt($symb,$uname,$udom,    my $answer=&Apache::loncommon::get_previous_attempt($symb,$uname,$udom,
       $ENV{'request.course.id'},$last);     $ENV{'request.course.id'},$last);
   $result.=$answer;    $request->print($answer);
     $answer =~ m/.*<\/tr><tr.*?<td>.*?<td>(.*?)<td>(.*?)<\/td>/;
   my $wgt   = &Apache::lonnet::EXT('resource.partid.weight',$symb,$udom,$uname);    print "Submitted=$1:<br>$2;";
   my %record= &Apache::lonnet::restore($symb,$ENV{'request.course.id'},$udom,$uname);  #
   my $score = $record{'resource.0.awarded'}*$wgt;    my $wgt    = &Apache::lonnet::EXT('resource.partid.weight',$symb,$udom,$uname);
     my $wgtmsg = ($wgt > 0 ? '(problem weight)' : '<font color="red">problem weight assigned by computer</font>');
   $result.= '<form action="/adm/grades" method="post" name="SCORE">'."\n".    $wgt       = ($wgt > 0 ? $wgt : '1');
     '<input type="hidden" name="symb" value="'.$symb.'" />'."\n".    my %record = &Apache::lonnet::restore($symb,$ENV{'request.course.id'},$udom,$uname);
       '<input type="hidden" name="url" value="'.$url.'" />'."\n".    my $score  = ($record{'resource.0.awarded'} eq '' ? '' : $record{'resource.0.awarded'}*$wgt);
  '<input type="hidden" name="command" value="handgrade" />'."\n";  
   
   #
   # display grading options
     $result='<input type="hidden" name="WGT'.$counter.'" value="'.$wgt.'" />'.
         '<input type="hidden" name="unamedom'.$counter.'" value="'.$uname.':'.$udom.'" />'."\n";
   $result.='<table border="0"><tr><td><b>Points</b></td><td>';    $result.='<table border="0"><tr><td><b>Points</b></td><td>';
   my $ctr = 0;    my $ctr = 0;
   
     $result.='<table border="0"><tr>';  # display radio buttons in a nice table with 10 across
   while ($ctr<=$wgt) {    while ($ctr<=$wgt) {
       $result.= '<input type="radio" name="radval" '.        $result.= '<td><input type="radio" name="RADVAL'.$counter.'" '.
 #  'onclick="javascript:writeBox(\'GRADE_'.$ENV{'form.student'}.'\',\''.$ctr.'\')" '.    'onclick="javascript:writeBox(this.form.GRADE_BOX'.$counter.
   'onclick="javascript:SCORE.GRADE_BOX.value='.$ctr.'" '.      ',this.form.GRADE_SEL'.$counter.','.$ctr.','.$wgt.')" '.
   ($score == $ctr? 'checked':'').' /> '.$ctr."\n";   ($score eq $ctr ? 'checked':'').' /> '.$ctr."</td>\n";
         $result.=(($ctr+1)%10 == 0 ? '</tr><tr>' : '');
       $ctr++;        $ctr++;
   }    }
     $result.='</tr></table>';
   
   $result.='</td><td>&nbsp;<b>or</b>&nbsp;</td>';    $result.='</td><td>&nbsp;<b>or</b>&nbsp;</td>';
   $result.='<td><input type="text" name="GRADE_BOX"'.    $result.='<td><input type="text" name="GRADE_BOX'.$counter.'"'.
       ($score ne ''? ' value = "'.$score.'"':'').' size="4" '.        ($score ne ''? ' value = "'.$score.'"':'').' size="4" '.
       'onChange="javascript:updateRadio()" /></td>'."\n";           'onChange="javascript:updateRadio(this.form.RADVAL'.$counter.
   $result.='<td>/'.$wgt.' (problem weight)</td></tr>';          ',this.form.GRADE_BOX'.$counter.
      ',this.form.GRADE_SEL'.$counter.',\''.$wgt.'\')" /></td>'."\n";
     $result.='<td>/'.$wgt.' '.$wgtmsg.' </td><td>';
   
   $result.='<input type="hidden" name="GRADE_'.$uname.':'.$udom.'" value="handgraded" />'."\n";    foreach my $part (&getpartlist($url)) {
   $result.='<tr><td colspan="5"><input type="submit" name="gradeOpt" value="Save & Next" />&nbsp;';      my ($temp,$part,$type)=split(/_/,$part);
   $result.='<input type="submit" name="gradeOpt" value="Next" />&nbsp';      if ($type eq 'solved') {
   $result.='<input type="submit" name="gradeOpt" value="Previous" />&nbsp';        my ($status,$foo)=split(/_/,$record{"resource.$part.$type"},2);
   $result.='</td><tr></table></form>';        $status = 'partial' if ($foo =~ /partially/);
   return $result;        $status = 'nothing' if ($status eq '');
         $result.='<select name="GRADE_SEL'.$counter.'">'."\n";
         my $optsel = '<option>correct</option><option>incorrect</option>'.
     '<option>excused</option><option>ungraded</option>'.
         '<option>partial</option><option>nothing</option>'."\n";
         $optsel =~ s/<option>$status/<option selected="on">$status/;
         $result.=$optsel;
         $result.="</select></td></tr>\n";
       }
     }
     $result.='</table>';
     $request->print($result);
   #
   # print end of form
     if ($counter == $total) {
         my $endform.='<table border="0"><tr><td><input type="submit" name="gradeOpt" value="Save & Next" />';
         my $ntstu ='<select name="NTSTU">'.
     '<option>1</option><option>2</option>'.
         '<option>3</option><option>5</option>'.
     '<option>7</option><option>10</option></select>'."\n";
         my $nsel = ($ENV{'form.NTSTU'} ne '' ? $ENV{'form.NTSTU'} : '1');
         $ntstu =~ s/<option>$nsel/<option selected="on">$nsel/;
         $endform.=$ntstu.'student(s) &nbsp;&nbsp;';
         $endform.='<input type="submit" name="gradeOpt" value="Next" />&nbsp';
         $endform.='<input type="submit" name="gradeOpt" value="Previous" />&nbsp';
         $endform.='(Next and Previous do not save the scores.)';
         $endform.='</td><tr></table></form>';
         $request->print($endform);
     }
     return '';
 }  }
   
 sub processHandGrade {  sub processHandGrade {
   my ($url,$symb,$courseid,$student,@parts) = @_;    my ($request) = shift;
     my $url    = $ENV{'form.url'};
     my $symb   = $ENV{'form.symb'};
     my $button = $ENV{'form.gradeOpt'};
     my $ngrade = $ENV{'form.NCT'};
     my $ntstu  = $ENV{'form.NTSTU'};
   #  my $vProb  = $ENV{'form.vProb'};
   #  my $lastSub= $ENV{'form.lastSub'};
   
   my ($stuname,$domain) = split(/:/,$student);    my (@parts) = sort(&getpartlist($url));
   my %record=&Apache::lonnet::restore($symb,$courseid,$domain,$stuname);  
     if ($button eq 'Save & Next') {
         my $ctr = 0;
         while ($ctr < $ENV{'form.NCT'}) {
   #  my $pts    = ($ENV{'form.GRADE_BOX'.$ctr} ne '' ? $ENV{'form.GRADE_BOX'.$ctr} : $ENV{'form.RADVAL'.$ctr});
   #  my $wgt    = $ENV{'form.WGT'.$ctr};
   #  my $sel    = $ENV{'form.GRADE_SEL'.$ctr};
   #  my $score  = $pts/$wgt if ($wgt != 0);
     my ($uname,$udom) = split(/:/,$ENV{'form.unamedom'.$ctr});
     &saveHandGrade($url,$symb,$uname,$udom,$ctr,@parts);
   #  &saveHandGrade($url,$symb,$uname,$udom,$score,@parts);
     $ctr++;
         }
     }
     my $firststu = $ENV{'form.unamedom0'};
     my $laststu  = $ENV{'form.unamedom'.($ngrade-1)};
   
     #get classlist
   #  my ($cdom,$cnum) = split(/_/,$ENV{'request.course.id'});
     my ($classlist) = &getclasslist('all','0');
   
     my (@nextlist,@prevlist);
     my ($nextflg,$prevflg,$ctr,$ctprev) = (0,0,0,0);
     foreach my $student ( sort(@{ $$classlist{'all'} }) ) {
         my ($uname,$udom) = split(/:/,$student);
         if ($nextflg == 1 && $button =~ /Next$/) {
     push @nextlist,$uname if ($ctr < $ntstu);
     $ctr++;
         }
         $nextflg = 1 if ($student eq $laststu);
         $prevflg = 1 if ($student eq $firststu);
         if ($prevflg == 0 && $button eq 'Previous') {
     push @prevlist,$uname;
     $ctprev++;
         }
     }
     if ($button eq 'Previous') {
         if ($ctprev <= $ntstu) {
     @nextlist = @prevlist;
         } else {
     my $idx = 0;
     my $start = $ctprev - $ntstu;
     while ($idx < $ntstu) {
         $nextlist[$idx] = $prevlist[$start+$idx];
         $idx++;
     }
         }
     }
     $ctr = 0;
     my $total = scalar(@nextlist)-1;
     foreach my $student (@nextlist) {
         $ENV{'form.student'} = $student;
         &submission($request,$ctr,$total);
         $ctr++;
     }
   
     return 'The End';
   }
   
   sub saveHandGrade {
     my ($url,$symb,$stuname,$domain,$newflg,@parts) = @_;
   #  my ($stuname,$domain) = split(/:/,$student);
     my %record=&Apache::lonnet::restore($symb,$ENV{'request.course.id'},$domain,$stuname);
   my %newrecord;    my %newrecord;
   
   foreach my $part (@parts) {    foreach my $part (@parts) {
     my ($temp,$part,$type)=split(/_/,$part);      my ($temp,$part,$type)=split(/_/,$part);
     my $oldscore=$record{"resource.$part.$type"};      my $oldscore=$record{"resource.$part.$type"};
     my $newscore=($ENV{'form.GRADE_BOX'} ne '' ? $ENV{"form.GRADE_BOX"} : $ENV{'form.radval'});      my $newscore;
       if ($type eq 'awarded' && $newflg >= 0) {
    my $pts    = ($ENV{'form.GRADE_BOX'.$newflg} ne '' ? $ENV{'form.GRADE_BOX'.$newflg} : $ENV{'form.RADVAL'.$newflg});
    my $wgt    = $ENV{'form.WGT'.$newflg};
   # my $sel    = $ENV{'form.GRADE_SEL'.$newflg};
    $newscore  = $pts/$wgt if ($wgt != 0);
       }
     if ($type eq 'solved') {      if ($type eq 'solved') {
         $newscore = $ENV{'form.GRADE_SEL'.$newflg} if ($newflg >= 0);
       my $update=0;        my $update=0;
       if ($newscore eq 'nothing' ) {        if ($newscore eq 'nothing' ) {
  if ($oldscore ne '') {   if ($oldscore ne '') {
Line 463  sub processHandGrade { Line 622  sub processHandGrade {
  if ($newscore eq 'incorrect') { $newscore = 'incorrect_by_override'; }   if ($newscore eq 'incorrect') { $newscore = 'incorrect_by_override'; }
  if ($newscore eq 'excused')   { $newscore = 'excused'; }   if ($newscore eq 'excused')   { $newscore = 'excused'; }
  if ($newscore eq 'ungraded')  { $newscore = 'ungraded_attempted'; }   if ($newscore eq 'ungraded')  { $newscore = 'ungraded_attempted'; }
  if ($newscore eq 'handgraded') { $newscore = 'handgraded_by_grader'; }   if ($newscore eq 'partial')   { $newscore = 'correct_partially_by_override'; }
       }        }
       if ($update) { $newrecord{"resource.$part.$type"}=$newscore; }        if ($update) { $newrecord{"resource.$part.$type"}=$newscore; }
     } else {      } else {
       if ($oldscore ne $newscore) {        if ($oldscore ne $newscore) {
  $newrecord{"resource.$part.$type"}=$newscore;   $newrecord{"resource.$part.$type"}=$newscore;
         }
     }      }
   }    }
   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'}";
     print "grader=$newrecord{'resource.regrader'}:<br>records<br>";        while (my ($k,$v) = each %newrecord) {
     while (my ($k,$v) = each %newrecord) {   print "k=$k:v=$v:<br>\n";
  print "k=$k:v=$v:<br>\n";        }
     }        print "symb=$symb,courseid=$ENV{'request.course.id'},dom=$domain,name=$stuname<br>";
     &Apache::lonnet::cstore(\%newrecord,$symb,$courseid,$domain,$stuname);  #     &Apache::lonnet::cstore(\%newrecord,$symb,$ENV{'request.course.id'},$domain,$stuname);
   }    }
   return '';    return '';
 }  }
   
 sub get_symb_and_url {  sub get_symb_and_url {
  my ($request) = @_;    my ($request) = @_;
   my $url=$ENV{'form.url'};    (my $url=$ENV{'form.url'}) =~ s-^http://($ENV{'SERVER_NAME'}|$ENV{'HTTP_HOST'})--;
   $url=~s-^http://($ENV{'SERVER_NAME'}|$ENV{'HTTP_HOST'})--;  
 #  my $symb=$ENV{'form.symb'};  
 #  if (!$symb) { $symb=&Apache::lonnet::symbread($url); }  
   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)));
   if ($symb eq '') { $request->print("Unable to handle ambiguous references:$url:."); return ''; }    if ($symb eq '') { $request->print("Unable to handle ambiguous references:$url:."); return ''; }
  return ($symb,$url);    return ($symb,$url);
 }  
   
 sub view_edit_entire_class_form {  
   my ($symb,$url)=@_;  
   my $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="viewgrades" />'."\n".  
   '<input type="submit" name="submit" value="View/Grade Entire Class" />'."\n".  
     '</form>'."\n";  
   return $result;  
 }  }
   
 sub show_grading_menu_form {  sub show_grading_menu_form {
Line 520  sub gradingmenu { Line 666  sub gradingmenu {
   my ($symb,$url)=&get_symb_and_url($request);    my ($symb,$url)=&get_symb_and_url($request);
   if (!$symb) {return '';}    if (!$symb) {return '';}
   
   my $result='<h2>&nbsp;<font color="#339933">Select a Grading Method</font></h2><br />';    my $result='<h2>&nbsp;<font color="#339933">Select a Grading Method</font></h2>';
   $result.='<table width=100% border=0><tr><td bgcolor=#777777>'."\n";    $result.='&nbsp;<font size=+1><b>Resource: </b>'.$url.'</font><br /><br />';
   $result.='<table width=100% border=0><tr><td bgcolor=#e6ffff>'."\n";  
   $result.='&nbsp;<b>Resource :</b> '.$url.'</td></tr>'."\n";    $result.=&view_edit_entire_class_form($symb,$url).'<br />';
     $result.=&upcsvScores_form($symb,$url).'<br />';
     $result.=&viewGradeaStu_form($symb,$url).'<br />';
     $result.=&verifyReceipt_form($symb,$url);
     return $result;
   }
   
   sub view_edit_entire_class_form {
     my ($symb,$url)=@_;
     my $result.='<table width=100% border=0><tr><td bgcolor=#777777>'."\n";
     $result.='<table width=100% border=0><tr bgcolor="#e6ffff"><td>'."\n";
     $result.='&nbsp;<b>View/Grade Entire Class</b></td></tr>'."\n";
   $result.='<tr bgcolor=#ffffe6><td>'."\n";    $result.='<tr bgcolor=#ffffe6><td>'."\n";
   $result.=&view_edit_entire_class_form($symb,$url);  
   $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="command" value="csvupload" />'."\n".  
   '<input type="submit" name="submit" value="Upload Scores" />'."\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="url" value="'.$url.'" />'."\n".
  '<input type="hidden" name="command" value="submission" />'."\n".    '<input type="hidden" name="command" value="viewgrades" />'."\n";
   '<input type="submit" name="submit" value="View/Grade A Student" />'."\n".    $result.='&nbsp;<b>Display students who has: </b>'.
     '</form>'."\n";        '<input type="radio" name="submitonly" value="yes" checked> submitted'.
     '<input type="radio" name="submitonly" value="all"> everybody <br /><br />';
     $result.='&nbsp;<input type="submit" name="submit" value="View/Grade" /></form>'."\n";
     $result.='</td></tr></table>'."\n";
     $result.='</td></tr></table>'."\n";
     return $result;
   }
   
   sub upcsvScores_form {
     my ($symb,$url) = @_;
     if (!$symb) {return '';}
     my $result.='<table width=100% border=0><tr><td bgcolor=#777777>'."\n";
     $result.='<table width=100% border=0><tr bgcolor="#e6ffff"><td>'."\n";
     $result.='&nbsp;<b>Specify a file containing the class scores for above resource</b></td></tr>'."\n";
     $result.='<tr bgcolor=#ffffe6><td>'."\n";
     my $upfile_select=&Apache::loncommon::upfile_select_html();
     $result.=<<ENDUPFORM;
   <form method="post" enctype="multipart/form-data" action="/adm/grades" name="gradesupload">
   <input type="hidden" name="symb" value="$symb" />
   <input type="hidden" name="url" value="$url" />
   <input type="hidden" name="command" value="csvuploadmap" />
   $upfile_select
   <br />&nbsp;<input type="submit" name="submit" value="Upload Grades" />
   </form>
   ENDUPFORM
     $result.='</td></tr></table>'."\n";
     $result.='</td></tr></table>'."\n";
     return $result;
   }
   
   sub viewGradeaStu_form {
     my ($symb,$url) = @_;
     my ($classlist,$sections) = &getclasslist('all','0');
     my $result.='<table width=100% border=0><tr><td bgcolor=#777777>'."\n";
     $result.='<table width=100% border=0><tr bgcolor="#e6ffff"><td>'."\n";
     $result.='&nbsp;<b>View/Grade an Individual Student\'s Submission</b></td></tr>'."\n";
     $result.='<tr bgcolor=#ffffe6><td>'."\n";
   $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="receiptInput" />'."\n".    '<input type="hidden" name="command" value="submission" />'."\n";
   '<input type="submit" name="submit" value="Verify Receipt" />'."\n".  
     '</form>'."\n";    $result.='&nbsp;<b>Select section:</b> <select name="section">'."\n";
     foreach my $section (sort (@$sections)) {
         $result.= '<option>'.$section.'</option>'."\n";
     }
     $result.= '<option selected="on">all</select>'."\n";
     $result.='&nbsp;&nbsp;<b>Display students who has: </b>'.
         '<input type="radio" name="submitonly" value="yes" checked> submitted'.
     '<input type="radio" name="submitonly" value="all"> everybody <br />';
     $result.='&nbsp;(Section -1 implies the students were not assigned a section.)<br />' if (grep /-1/,@$sections);
   
     $result.='<br />&nbsp;<input type="submit" name="submit" value="View/Grade" />'."\n".
         '</form>'."\n";
     $result.='</td></tr></table>'."\n";
     $result.='</td></tr></table>'."\n";
     return $result;
   }
   
   sub verifyReceipt_form {
     my ($symb,$url) = @_;
     my $cdom=$ENV{"course.$ENV{'request.course.id'}.domain"};
     my $cnum=$ENV{"course.$ENV{'request.course.id'}.num"};
     my $hostver=unpack("%32C*",$Apache::lonnet::perlvar{'lonHostID'});
   
     my $result.='<table width=100% border=0><tr><td bgcolor=#777777>'."\n";
     $result.='<table width=100% border=0><tr><td bgcolor=#e6ffff>'."\n";
     $result.='&nbsp;<b>Verify a Submission Receipt Issued by this Server</td></tr>'."\n";
     $result.='<tr bgcolor=#ffffe6><td>'."\n";
     $result.='<form action="/adm/grades" method="post">'."\n";
     $result.='&nbsp;<tt>'.$hostver.'-<input type="text" name="receipt" size="4"></tt><br />'."\n";
     $result.='&nbsp;<input type="submit" name="submit" value="Verify Receipt">'."\n";
     $result.='<input type="hidden" name="command" value="verify">'."\n";
     if ($ENV{'form.url'}) {
         $result.='<input type="hidden" name="url" value="'.$ENV{'form.url'}.'" />';
     }
     if ($ENV{'form.symb'}) {
         $result.='<input type="hidden" name="symb" value="'.$ENV{'form.symb'}.'" />';
     }
     $result.='</form>';
   $result.='</td></tr></table>'."\n";    $result.='</td></tr></table>'."\n";
   $result.='</td></tr></table>'."\n";    $result.='</td></tr></table>'."\n";
   return $result;    return $result;
Line 559  sub viewgrades { Line 782  sub viewgrades {
   #get classlist    #get classlist
   my ($cdom,$cnum) = split(/_/,$ENV{'request.course.id'});    my ($cdom,$cnum) = split(/_/,$ENV{'request.course.id'});
   #print "Found $cdom:$cnum<br />";    #print "Found $cdom:$cnum<br />";
   my (%classlist) = &getclasslist($cdom,$cnum,'0');    my ($classlist) = &getclasslist('all','0');
   my $headerclr = '"#ccffff"';    my $headerclr = '"#ccffff"';
   my $cellclr = '"#ffffcc"';    my $cellclr = '"#ffffcc"';
   
Line 580  sub viewgrades { Line 803  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{'all'} }) ) {
     my $display=&viewstudentgrade($url,$symb,$ENV{'request.course.id'},$student,@parts);      my $display=&viewstudentgrade($url,$symb,$ENV{'request.course.id'},$student,@parts);
 #      print "ID=$ENV{'request.course.id'}:STU=$student:DIS=$display:<br>\n";  #      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);
Line 604  sub editgrades { Line 826  sub editgrades {
   if ($symb eq '') { $request->print("Unable to handle ambiguous references:$symb:$ENV{'form.url'}"); return ''; }    if ($symb eq '') { $request->print("Unable to handle ambiguous references:$symb:$ENV{'form.url'}"); return ''; }
   my $url=$ENV{'form.url'};    my $url=$ENV{'form.url'};
   #get classlist    #get classlist
   my ($cdom,$cnum) = split(/_/,$ENV{'request.course.id'});  #  my ($cdom,$cnum) = split(/_/,$ENV{'request.course.id'});
   #print "Found $cdom:$cnum<br />";    #print "Found $cdom:$cnum<br />";
   my (%classlist) = &getclasslist($cdom,$cnum,'0');    my ($classlist) = &getclasslist('all','0');
   
   #get list of parts for this problem    #get list of parts for this problem
   my (@parts) = &getpartlist($url);    my (@parts) = &getpartlist($url);
Line 617  sub editgrades { Line 839  sub editgrades {
  '<input type="hidden" name="command" value="viewgrades" />'."\n".   '<input type="hidden" name="command" value="viewgrades" />'."\n".
   '<input type="submit" name="submit" value="See Grades" /> <br />'."\n";    '<input type="submit" name="submit" value="See Grades" /> <br />'."\n";
   
   foreach my $student ( sort(@{ $classlist{'allids'} }) ) {    foreach my $student ( sort(@{ $$classlist{'all   '} }) ) {
     $result.=&setstudentgrade($url,$symb,$ENV{'request.course.id'},$student,@parts);      $result.=&setstudentgrade($url,$symb,$ENV{'request.course.id'},$student,@parts);
   }    }
   
Line 625  sub editgrades { Line 847  sub editgrades {
   return $result;    return $result;
 }  }
   
 sub csvupload {  
   my ($request)= @_;  
   my $result;  
   my ($symb,$url)=&get_symb_and_url($request);  
   if (!$symb) {return '';}  
   my $upfile_select=&Apache::loncommon::upfile_select_html();  
   $result.=<<ENDUPFORM;  
 <form method="post" enctype="multipart/form-data" action="/adm/grades" name="gradesupload">  
 <input type="hidden" name="symb" value="$symb" />  
 <input type="hidden" name="url" value="$url" />  
 <input type="hidden" name="command" value="csvuploadmap" />  
 <hr />  
 <h3>Specify a file containing the class grades for resource $url</h3>  
 $upfile_select  
 <p><input type="submit" name="submit" value="Upload Grades" />  
 ENDUPFORM  
   return $result;  
 }  
   
 sub csvupload_javascript_reverse_associate {  sub csvupload_javascript_reverse_associate {
   return(<<ENDPICK);    return(<<ENDPICK);
   function verify(vf) {    function verify(vf) {
Line 836  sub csvuploadassign { Line 1039  sub csvuploadassign {
   }    }
   $request->print('<h3>Assigning Grades</h3>');    $request->print('<h3>Assigning Grades</h3>');
   my $courseid=$ENV{'request.course.id'};    my $courseid=$ENV{'request.course.id'};
   my $cdom=$ENV{"course.$courseid.domain"};  #  my $cdom=$ENV{"course.$courseid.domain"};
   my $cnum=$ENV{"course.$courseid.num"};  #  my $cnum=$ENV{"course.$courseid.num"};
   my (%classlist) = &getclasslist($cdom,$cnum,'1');    my ($classlist) = &getclasslist('all','1');
   my @skipped;    my @skipped;
   my $countdone=0;    my $countdone=0;
   foreach my $grade (@gradedata) {    foreach my $grade (@gradedata) {
     my %entries=&Apache::loncommon::record_sep($grade);      my %entries=&Apache::loncommon::record_sep($grade);
     my $username=$entries{$fields{'username'}};      my $username=$entries{$fields{'username'}};
     my $domain=$entries{$fields{'domain'}};      my $domain=$entries{$fields{'domain'}};
     if (!exists($classlist{"$username:$domain"})) {      if (!exists($$classlist{"$username:$domain"})) {
       push(@skipped,"$username:$domain");        push(@skipped,"$username:$domain");
       next;        next;
     }      }
Line 944  sub handler { Line 1147  sub handler {
     $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') {
       &listStudents($request) if ($ENV{'form.student'} eq '');        &listStudents($request) if ($ENV{'form.student'} eq '');
       $request->print(&submission($request)) if ($ENV{'form.student'} ne '');        &submission($request,0,0) if ($ENV{'form.student'} ne '');
       } elsif ($command eq 'processGroup') {
         &processGroup($request);
     } elsif ($command eq 'gradingmenu') {      } elsif ($command eq 'gradingmenu') {
       $request->print(&gradingmenu($request));        $request->print(&gradingmenu($request));
     } elsif ($command eq 'viewgrades') {      } elsif ($command eq 'viewgrades') {
       $request->print(&viewgrades($request));        $request->print(&viewgrades($request));
       } elsif ($command eq 'handgrade') {
         $request->print(&processHandGrade($request));
     } elsif ($command eq 'editgrades') {      } elsif ($command eq 'editgrades') {
       $request->print(&editgrades($request));        $request->print(&editgrades($request));
     } elsif ($command eq 'verify') {      } elsif ($command eq 'verify') {
Line 957  sub handler { Line 1164  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') {  #    } elsif ($command eq 'receiptInput') {
       &receiptInput($request);  #      &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.32  
changed lines
  Added in v.1.34

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