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

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

version 1.34, 2002/07/01 21:20:29 version 1.35, 2002/07/03 21:05:33
Line 30 Line 30
 # 7/26 H.K. Ng  # 7/26 H.K. Ng
 # 8/20 Gerd Kortemeyer  # 8/20 Gerd Kortemeyer
 # Year 2002  # Year 2002
 # June 2002 H.K. Ng  # June, July 2002 H.K. Ng
 #  #
   
 package Apache::grades;  package Apache::grades;
Line 53  sub moreinfo { Line 53  sub moreinfo {
     if ($ENV{'form.symb'}) {      if ($ENV{'form.symb'}) {
       $request->print('<input type="hidden" name="symb" value="'.$ENV{'form.symb'}.'" />'."\n");        $request->print('<input type="hidden" name="symb" value="'.$ENV{'form.symb'}.'" />'."\n");
     }      }
   #    $request->print('<input type="hidden" name="command" value="submission" />'."\n");
     $request->print('<input type="hidden" name="command" value="'.$ENV{'form.command'}.'" />'."\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("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("Domain:".'<input type="text" name="domain" value="'.$ENV{'user.domain'}.'" />'."<br />\n");
Line 140  sub listStudents { Line 141  sub listStudents {
 <input type="radio" name="lastSub" value="all"> all   <input type="radio" name="lastSub" value="all"> all 
 <input type="hidden" name="section" value="$getsec">  <input type="hidden" name="section" value="$getsec">
 <input type="hidden" name="submitonly" value="$submitonly">  <input type="hidden" name="submitonly" value="$submitonly">
   <input type="hidden" name="response" value="$ENV{'form.response'}">
   <input type="hidden" name="handgrade" value="$ENV{'form.handgrade'}">
 <table border="0"><tr><td bgcolor="#777777">  <table border="0"><tr><td bgcolor="#777777">
 <table border="0"><tr bgcolor="#e6ffff">  <table border="0"><tr bgcolor="#e6ffff">
 <td><b>&nbsp;Select&nbsp;</b></td><td><b>&nbsp;Username&nbsp;</b></td>  <td><b>&nbsp;Select&nbsp;</b></td><td><b>&nbsp;Username&nbsp;</b></td>
Line 181  sub processGroup { Line 184  sub processGroup {
   my ($request)  = shift;    my ($request)  = shift;
   my $ctr        = 0;    my $ctr        = 0;
   my @stuchecked = (ref($ENV{'form.stuinfo'}) ? @{$ENV{'form.stuinfo'}}    my @stuchecked = (ref($ENV{'form.stuinfo'}) ? @{$ENV{'form.stuinfo'}}
                            :  ($ENV{'form.stuinfo'}) );                             : ($ENV{'form.stuinfo'}));
   my $total      = scalar(@stuchecked)-1;    my $total      = scalar(@stuchecked)-1;
   foreach my $student (@stuchecked) {    if ($stuchecked[0] eq '') {
       my ($sname,$sdom,$fullname) = split(/:/,$student);        &userError($request,'No student was selected for viewing/grading.');
         return;
     }
     foreach (@stuchecked) {
         my ($sname,$sdom,$fullname) = split(/:/);
       $ENV{'form.student'} = $sname;        $ENV{'form.student'} = $sname;
       $ENV{'form.fullname'} = $fullname;        $ENV{'form.fullname'} = $fullname;
       &submission($request,$ctr,$total);        &submission($request,$ctr,$total);
       $ctr++;        $ctr++;
   }    }
   
   return 'The End';    return 'The End';
 }  }
   
   sub userError {
       my ($request, $reason, $step) = @_;
       $request->print('<h3><font color="red">LON-CAPA User Error</font></h3><br />'."\n");
       $request->print('<b>Reason: </b>'.$reason.'<br /><br />'."\n");
       $request->print('<b>Step: </b>'.($step ne '' ? $step : 'Use your browser back button to correct')
       .'<br /><br />'."\n");
       return '';
   }
   
 #FIXME - needs to handle multiple matches  #FIXME - needs to handle multiple matches
 sub finduser {  sub finduser {
   my ($name) = @_;    my ($name) = @_;
   my $domain = '';    my $domain = '';
   
   if ( $Apache::grades::viewgrades eq 'F' ) {    if ( $Apache::grades::viewgrades eq 'F' ) {
     #get classlist  
 #    my ($cdom,$cnum) = split(/_/,$ENV{'request.course.id'});  
     #print "Found $cdom:$cnum<br />";  
     my ($classlist) = &getclasslist('all','0');      my ($classlist) = &getclasslist('all','0');
     foreach my $student ( sort(@{ $$classlist{'all'} }) ) {      foreach ( sort(@{ $$classlist{'all'} }) ) {
       my ($posname,$posdomain) = split(/:/,$student);        my ($posname,$posdomain) = split(/:/);
       if ($posname =~ $name) { $name=$posname; $domain=$posdomain; last; }        if ($posname =~ $name) { $name=$posname; $domain=$posdomain; last; }
     }      }
     return ($name,$domain);      return ($name,$domain);
Line 228  sub getclasslist { Line 239  sub getclasslist {
     }      }
     my ($unam,$udom) = split(/:/,$student,2);      my ($unam,$udom) = split(/:/,$student,2);
     my $section = &Apache::lonnet::usection($udom,$unam,$ENV{'request.course.id'});      my $section = &Apache::lonnet::usection($udom,$unam,$ENV{'request.course.id'});
       $section = ($section ne '-1' ? $section : 'no');
     push @holdsec,$section;      push @holdsec,$section;
     push (@{ $classlist{$getsec} }, $student) if ($getsec eq 'all' or $getsec == $section);      push (@{ $classlist{$getsec} }, $student) if ($getsec eq 'all' || $getsec eq $section);
   }    }
   my %seen = ();    my %seen = ();
   foreach my $item (@holdsec) {    foreach my $item (@holdsec) {
Line 326  sub setstudentgrade { Line 338  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'}";
     print "grader=$newrecord{'resource.regrader'}:<br>records<br>";  
     while (my ($k,$v) = each %newrecord) {  
  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";
Line 390  sub submission { Line 398  sub submission {
     return;      return;
   }    }
   
     function keywords(keyform) {
       var keywds = keyform.value;
       var nret = prompt("Keywords list, separate by a space or comma. Add/delete to list if desired.",keywds);
       if (nret==null) return;
       keyform.value = nret;
       return;
     }
   
     function addmsg(msgform) {
       var msg  = msgform.value;
       var nret = prompt("Enter the message you wish to send to the student.",msg);
       if (nret==null) return;
       msgform.value = nret;
       return;
     }
   
     function savedmsg(msgform) {
       var Nmsg  = msgform.value;
       var nret = prompt("Number of saved messages = ",Nmsg);
       if (nret==null) return;
       msgform.value = nret;
       return;
     }
   
 </script>  </script>
 JAVASCRIPT  JAVASCRIPT
 }  }
   (my $url=$ENV{'form.url'})=~s-^http://($ENV{'SERVER_NAME'}|$ENV{'HTTP_HOST'})--;    (my $url=$ENV{'form.url'})=~s-^http://($ENV{'SERVER_NAME'}|$ENV{'HTTP_HOST'})--;
   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 ''; }
Line 425  JAVASCRIPT Line 457  JAVASCRIPT
 #  #
 # beginning of form  # beginning of form
   if ($counter == 0) {    if ($counter == 0) {
         my %keyhash = &Apache::lonnet::get
                   ('nohist_handgrade',[$symb.'_keywords'],
                    $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
    $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
   
       $request->print('<form action="/adm/grades" method="post" name="SCORE">'."\n".        $request->print('<form action="/adm/grades" method="post" name="SCORE">'."\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="vProb" value="'.$ENV{'form.vProb'}.'" />'."\n".        '<input type="hidden" name="vProb"      value="'.$ENV{'form.vProb'}.'" />'."\n".
       '<input type="hidden" name="lastSub" value="'.$last.'" />'."\n".        '<input type="hidden" name="lastSub"    value="'.$last.'" />'."\n".
       '<input type="hidden" name="section" value="'.$ENV{'form.section'}.'">'."\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="submitonly" value="'.$ENV{'form.submitonly'}.'">'."\n".
       '<input type="hidden" name="command" value="handgrade" />'."\n".        '<input type="hidden" name="response"   value="'.$ENV{'form.response'}.'">'."\n".
         '<input type="hidden" name="handgrade"  value="'.$ENV{'form.handgrade'}.'">'."\n".
         '<input type="hidden" name="command"    value="handgrade" />'."\n".
         '<input type="hidden" name="keywords"   value="'.$keyhash{$symb.'_keywords'}.'" />'."\n".
         '<input type="hidden" name="addmsg"     value="" />'."\n".
         '<input type="hidden" name="savemsgN"   value="3" />'."\n".
         '<input type="hidden" name="savemsg0"   value="Good Job!" />'."\n".
         '<input type="hidden" name="savemsg1"   value="Needs a better explanation." />'."\n".
         '<input type="hidden" name="savemsg2"   value="Read the book before submitting such garbagge!" />'."\n".
       '<input type="hidden" name="NCT"'.        '<input type="hidden" name="NCT"'.
       ' value="'.($ENV{'form.NTSTU'} ne '' ? $ENV{'form.NTSTU'} : '1').'" />'."\n");        ' value="'.($ENV{'form.NTSTU'} ne '' ? $ENV{'form.NTSTU'} : '1').'" />'."\n");
   
         if ($ENV{'form.handgrade'} eq 'yes') {
     $request->print(<<KEYWORDS);
   &nbsp;<b>Grading Options</b> 
   <a href="javascript:keywords(document.SCORE.keywords)"; TARGET=_self>Keywords list</a>&nbsp; &nbsp;
   <a href="javascript:addmsg(document.SCORE.addmsg)"; TARGET=_self>Add a message</a>&nbsp; &nbsp;
   <a href="javascript:savedmsg(document.SCORE.savemsgN)"; TARGET=_self>Saved messages</a><br /><br />
   KEYWORDS
         }
   }    }
   
 #  #
 # Student info  # Student info
   $request->print(($counter == 0 ? '' : '<br /><hr><br />'));    $request->print(($counter == 0 ? '' : '<br /><hr><br />'));
Line 443  JAVASCRIPT Line 498  JAVASCRIPT
       '</td><td><b>Fullname: </b>'.        '</td><td><b>Fullname: </b>'.
   ($ENV{'form.fullname'} ne '' ? $ENV{'form.fullname'} : &get_fullname($uname,$udom)).    ($ENV{'form.fullname'} ne '' ? $ENV{'form.fullname'} : &get_fullname($uname,$udom)).
       '</td><td><b>Domain: </b>'.$udom.'</td></tr>';        '</td><td><b>Domain: </b>'.$udom.'</td></tr>';
   $result.='<tr><td colspan=3><b>Resource: </b>'.$url.'</td></tr></table>';    if ($ENV{'form.handgrade'} eq 'yes') {
         my $subonly = &get_last_submission($symb,$uname,$udom,$ENV{'request.course.id'});
         my ($classlist) = &getclasslist('all','0');
         my @collaborators;
         foreach ( sort(@{ $$classlist{'all'} }) ) {
     my ($sname,$sdom) = split(/:/);
     push @collaborators,$sname if (grep /\b$sname(\b|\.)/i,$subonly);
         }
         push @collaborators,'leede','carlandmm','freyniks'; # as a test to display collaborators.
         if (scalar(@collaborators) != 0) {
     $result.='<tr><td colspan=3><b>Collaborators: </b>';
     foreach (@collaborators) {
         $result.=$_.' ('.&get_fullname($_,$udom).') &nbsp; &nbsp;';
     }
     $result.='</td></tr>'."\n";
     $result.='<input type="hidden" name="collaborator'.$counter.
         '" value="'.(join ':',@collaborators).'" />'."\n";
         }
     }
     $result.='<tr><td colspan=3><b>Resource: </b>'.$url.'</td></tr></table>'."\n";
   $request->print($result);    $request->print($result);
 #  #
 # print student answer  # print student answer
   my $answer=&Apache::loncommon::get_previous_attempt($symb,$uname,$udom,    $request->print(&Apache::loncommon::get_previous_attempt($symb,$uname,$udom,
    $ENV{'request.course.id'},$last);     $ENV{'request.course.id'},$last,
   $request->print($answer);     '.submission','Apache::grades::keywords_highlight'));
   $answer =~ m/.*<\/tr><tr.*?<td>.*?<td>(.*?)<td>(.*?)<\/td>/;  #
   print "Submitted=$1:<br>$2;";  
 #  #
   my $wgt    = &Apache::lonnet::EXT('resource.partid.weight',$symb,$udom,$uname);    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>');    my $wgtmsg = ($wgt > 0 ? '(problem weight)' : '<font color="red">problem weight assigned by computer</font>');
Line 522  JAVASCRIPT Line 595  JAVASCRIPT
   return '';    return '';
 }  }
   
   sub get_last_submission {
     my ($symb,$username,$domain,$course)=@_;
     if ($symb) {
        my (%returnhash)=&Apache::lonnet::restore($symb,$course,$domain,$username);
        if ($returnhash{'version'}) {
    my %lasthash=();
    my $version;
    for ($version=1;$version<=$returnhash{'version'};$version++) {
     foreach (sort(split(/\:/,$returnhash{$version.':keys'}))) {
         $lasthash{$_}=$returnhash{$version.':'.$_};
     }
           }
    foreach ((keys %lasthash)) {
       if ($_ =~ /\.submission$/) {return $lasthash{$_}}
    }
    return '';
       }
     }
   }
   
   sub keywords_highlight {
     my $string  = shift;
     (my $url=$ENV{'form.url'})=~s-^http://($ENV{'SERVER_NAME'}|$ENV{'HTTP_HOST'})--;
     my $symb=($ENV{'form.symb'} ne '' ? $ENV{'form.symb'} : (&Apache::lonnet::symbread($url)));
     my %keyhash = &Apache::lonnet::get
         ('nohist_handgrade',[$symb.'_keywords'],
          $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
          $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
     my @keylist = split(/[,\s+]/,$keyhash{$symb.'_keywords'});
     foreach my $word (@keylist) {
         next if ($word eq '');
         $string =~ s/\b$word(\b|\.)/\<font color\=red\>$word\<\/font\>/gi;
     }
     return $string;
   }
   
 sub processHandGrade {  sub processHandGrade {
   my ($request) = shift;    my ($request) = shift;
   my $url    = $ENV{'form.url'};    my $url    = $ENV{'form.url'};
Line 529  sub processHandGrade { Line 638  sub processHandGrade {
   my $button = $ENV{'form.gradeOpt'};    my $button = $ENV{'form.gradeOpt'};
   my $ngrade = $ENV{'form.NCT'};    my $ngrade = $ENV{'form.NCT'};
   my $ntstu  = $ENV{'form.NTSTU'};    my $ntstu  = $ENV{'form.NTSTU'};
 #  my $vProb  = $ENV{'form.vProb'};    my $keywords= $ENV{'form.keywords'};
 #  my $lastSub= $ENV{'form.lastSub'};    my $addmsg  = $ENV{'form.addmsg'};
     print "addmsg=$addmsg<br>";
     if ($keywords ne '') {
         my $crsname = $ENV{'course.'.$ENV{'request.course.id'}.'.num'};
         my $crsdom  = $ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
         my $putresult = &Apache::lonnet::put
                   ('nohist_handgrade',{$symb.'_keywords' => $keywords},
                    $crsdom,$crsname);
     }
   my (@parts) = sort(&getpartlist($url));    my (@parts) = sort(&getpartlist($url));
   
   if ($button eq 'Save & Next') {    if ($button eq 'Save & Next') {
       my $ctr = 0;        my $ctr = 0;
       while ($ctr < $ENV{'form.NCT'}) {        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});    my ($uname,$udom) = split(/:/,$ENV{'form.unamedom'.$ctr});
   &saveHandGrade($url,$symb,$uname,$udom,$ctr,@parts);    &saveHandGrade($url,$symb,$uname,$udom,$ctr,@parts);
 #  &saveHandGrade($url,$symb,$uname,$udom,$score,@parts);    if ($ENV{'form.collaborator'.$ctr}) {
         my (@collaborators) = split(/:/,$ENV{'form.collaborator'.$ctr});
         foreach (@collaborators) {
     &saveHandGrade($url,$symb,$_,$udom,$ctr,@parts);
         }
     }
   $ctr++;    $ctr++;
       }        }
   }    }
   my $firststu = $ENV{'form.unamedom0'};    my $firststu = $ENV{'form.unamedom0'};
   my $laststu  = $ENV{'form.unamedom'.($ngrade-1)};    my $laststu  = $ENV{'form.unamedom'.($ngrade-1)};
   
   #get classlist    my ($classlist) = &getclasslist($ENV{'form.section'},'0');
 #  my ($cdom,$cnum) = split(/_/,$ENV{'request.course.id'});  
   my ($classlist) = &getclasslist('all','0');  
   
   my (@nextlist,@prevlist);    my (@nextlist,@prevlist);
   my ($nextflg,$prevflg,$ctr,$ctprev) = (0,0,0,0);    my ($nextflg,$prevflg,$ctr,$ctprev) = (0,0,0,0);
   foreach my $student ( sort(@{ $$classlist{'all'} }) ) {    foreach my $student ( sort(@{ $$classlist{$ENV{'form.section'}} }) ) {
       my ($uname,$udom) = split(/:/,$student);        my ($uname,$udom) = split(/:/,$student);
       if ($nextflg == 1 && $button =~ /Next$/) {        if ($nextflg == 1 && $button =~ /Next$/) {
   push @nextlist,$uname if ($ctr < $ntstu);    push @nextlist,$uname if ($ctr < $ntstu);
Line 594  sub processHandGrade { Line 709  sub processHandGrade {
   
 sub saveHandGrade {  sub saveHandGrade {
   my ($url,$symb,$stuname,$domain,$newflg,@parts) = @_;    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 %record=&Apache::lonnet::restore($symb,$ENV{'request.course.id'},$domain,$stuname);
   my %newrecord;    my %newrecord;
   
Line 603  sub saveHandGrade { Line 717  sub saveHandGrade {
     my $oldscore=$record{"resource.$part.$type"};      my $oldscore=$record{"resource.$part.$type"};
     my $newscore;      my $newscore;
     if ($type eq 'awarded' && $newflg >= 0) {      if ($type eq 'awarded' && $newflg >= 0) {
  my $pts    = ($ENV{'form.GRADE_BOX'.$newflg} ne '' ? $ENV{'form.GRADE_BOX'.$newflg} : $ENV{'form.RADVAL'.$newflg});   my $pts    = ($ENV{'form.GRADE_BOX'.$newflg} ne '' ? 
         $ENV{'form.GRADE_BOX'.$newflg} : $ENV{'form.RADVAL'.$newflg});
  my $wgt    = $ENV{'form.WGT'.$newflg};   my $wgt    = $ENV{'form.WGT'.$newflg};
 # my $sel    = $ENV{'form.GRADE_SEL'.$newflg};  # my $sel    = $ENV{'form.GRADE_SEL'.$newflg};
  $newscore  = $pts/$wgt if ($wgt != 0);   $newscore  = $pts/$wgt if ($wgt != 0);
Line 633  sub saveHandGrade { Line 748  sub saveHandGrade {
   }    }
   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'}";
       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>";  #      print "symb=$symb,courseid=$ENV{'request.course.id'},dom=$domain,name=$stuname<br>";
 #     &Apache::lonnet::cstore(\%newrecord,$symb,$ENV{'request.course.id'},$domain,$stuname);  #     &Apache::lonnet::cstore(\%newrecord,$symb,$ENV{'request.course.id'},$domain,$stuname);
   }    }
   return '';    return '';
Line 665  sub gradingmenu { Line 780  sub gradingmenu {
   my ($request) = @_;    my ($request) = @_;
   my ($symb,$url)=&get_symb_and_url($request);    my ($symb,$url)=&get_symb_and_url($request);
   if (!$symb) {return '';}    if (!$symb) {return '';}
     my $allkeys = &Apache::lonnet::metadata($url,'keys');
     my $handgrade = ($allkeys =~ /parameter_.*?_handgrade/ ? 'yes' : 'no');
     my ($responsetype,$foo) = split(/_/,&Apache::lonnet::metadata($url,'packages'));
   
   my $result='<h2>&nbsp;<font color="#339933">Select a Grading Method</font></h2>';    my $result='<h2>&nbsp;<font color="#339933">Select a Grading Method</font></h2>';
   $result.='&nbsp;<font size=+1><b>Resource: </b>'.$url.'</font><br /><br />';    $result.='<table border="0">';
     $result.='<tr><td><font size=+1><b>Resource: </b></font></td>'.
         '<td><font size=+1>'.$url.'</font></td></tr>';
     $result.='<tr><td><font size=+1><b>Type: </b></font></td>'.
         '<td><font size=+1>'.$responsetype.'&nbsp;&nbsp;<b>Handgrade: </b>'.$handgrade.'</font></td></tr>';
     $result.='</table>';
   
   $result.=&view_edit_entire_class_form($symb,$url).'<br />';    $result.=&view_edit_entire_class_form($symb,$url).'<br />';
   $result.=&upcsvScores_form($symb,$url).'<br />';    $result.=&upcsvScores_form($symb,$url).'<br />';
   $result.=&viewGradeaStu_form($symb,$url).'<br />';    $result.=&viewGradeaStu_form($symb,$url,$responsetype,$handgrade).'<br />';
   $result.=&verifyReceipt_form($symb,$url);    $result.=&verifyReceipt_form($symb,$url);
   return $result;    return $result;
 }  }
Line 718  ENDUPFORM Line 841  ENDUPFORM
 }  }
   
 sub viewGradeaStu_form {  sub viewGradeaStu_form {
   my ($symb,$url) = @_;    my ($symb,$url,$response,$handgrade) = @_;
   my ($classlist,$sections) = &getclasslist('all','0');    my ($classlist,$sections) = &getclasslist('all','0');
   my $result.='<table width=100% border=0><tr><td bgcolor=#777777>'."\n";    my $result.='<table width=100% border=0><tr><td bgcolor=#777777>'."\n";
   $result.='<table width=100% border=0><tr bgcolor="#e6ffff"><td>'."\n";    $result.='<table width=100% border=0><tr bgcolor="#e6ffff"><td>'."\n";
Line 727  sub viewGradeaStu_form { Line 850  sub viewGradeaStu_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="submission" />'."\n";         '<input type="hidden" name="response" value="'.$response.'" />'."\n".
           '<input type="hidden" name="handgrade" value="'.$handgrade.'" />'."\n".
    '<input type="hidden" name="command" value="submission" />'."\n";
   
   $result.='&nbsp;<b>Select section:</b> <select name="section">'."\n";    $result.='&nbsp;<b>Select section:</b> <select name="section">'."\n";
   foreach my $section (sort (@$sections)) {    foreach my $section (sort (@$sections)) {
Line 737  sub viewGradeaStu_form { Line 862  sub viewGradeaStu_form {
   $result.='&nbsp;&nbsp;<b>Display students who has: </b>'.    $result.='&nbsp;&nbsp;<b>Display students who has: </b>'.
       '<input type="radio" name="submitonly" value="yes" checked> submitted'.        '<input type="radio" name="submitonly" value="yes" checked> submitted'.
   '<input type="radio" name="submitonly" value="all"> everybody <br />';    '<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.='&nbsp;(Section "no" implies the students were not assigned a section.)<br />' 
         if (grep /no/,@$sections);
   
   $result.='<br />&nbsp;<input type="submit" name="submit" value="View/Grade" />'."\n".    $result.='<br />&nbsp;<input type="submit" name="submit" value="View/Grade" />'."\n".
       '</form>'."\n";        '</form>'."\n";
Line 839  sub editgrades { Line 965  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{'all   '} }) ) {    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);
   }    }
   
Removed from v.1.34  
changed lines
  Added in v.1.35

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