[LON-CAPA-cvs] cvs: loncom /homework grades.pm
ng
lon-capa-cvs@mail.lon-capa.org
Mon, 01 Jul 2002 21:20:29 -0000
This is a MIME encoded message
--ng1025558429
Content-Type: text/plain
ng Mon Jul 1 17:20:29 2002 EDT
Modified files:
/loncom/homework grades.pm
Log:
Reorganized front menu for grades.pm.
Allow viewing by section or all and those who has submitted or everybody.
--ng1025558429
Content-Type: text/plain
Content-Disposition: attachment; filename="ng-20020701172029.txt"
Index: loncom/homework/grades.pm
diff -u loncom/homework/grades.pm:1.33 loncom/homework/grades.pm:1.34
--- loncom/homework/grades.pm:1.33 Thu Jun 27 17:34:18 2002
+++ loncom/homework/grades.pm Mon Jul 1 17:20:29 2002
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# The LON-CAPA Grading handler
#
-# $Id: grades.pm,v 1.33 2002/06/27 21:34:18 ng Exp $
+# $Id: grades.pm,v 1.34 2002/07/01 21:20:29 ng Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -65,8 +65,8 @@
sub verifyreceipt {
my $request=shift;
my $courseid=$ENV{'request.course.id'};
- my $cdom=$ENV{"course.$courseid.domain"};
- my $cnum=$ENV{"course.$courseid.num"};
+# my $cdom=$ENV{"course.$courseid.domain"};
+# my $cnum=$ENV{"course.$courseid.num"};
my $receipt=unpack("%32C*",$Apache::lonnet::perlvar{'lonHostID'}).'-'.
$ENV{'form.receipt'};
$receipt=~s/[^\-\d]//g;
@@ -77,8 +77,8 @@
if ((&Apache::lonnet::allowed('mgr',$courseid)) && ($symb)) {
$request->print('<h1>Verifying Submission Receipt '.$receipt.'</h1>');
my $matches=0;
- my (%classlist) = &getclasslist($cdom,$cnum,'0');
- foreach my $student ( sort(@{ $classlist{'allids'} }) ) {
+ my ($classlist) = &getclasslist('all','0');
+ foreach my $student ( sort(@{ $$classlist{'all'} }) ) {
my ($uname,$udom)=split(/\:/,$student);
if ($receipt eq
&Apache::lonnet::ireceipt($uname,$udom,$courseid,$symb)) {
@@ -92,31 +92,6 @@
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 {
my ($url,$udom,$uname) = @_;
my $symb=($ENV{'form.symb'} ne '' ? $ENV{'form.symb'} : (&Apache::lonnet::symbread($url)));
@@ -125,6 +100,7 @@
my ($temp,$part,$type)=split(/_/,$part);
if ($type eq 'solved') {
my ($status,$foo)=split(/_/,$record{"resource.$part.$type"},2);
+ $status = 'partial' if ($foo =~ /^partially/);
$status = 'nothing' if ($status eq '');
return $type,$status;
}
@@ -132,72 +108,91 @@
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 {
my ($request) = shift;
- my $cdom=$ENV{"course.$ENV{'request.course.id'}.domain"};
- my $cnum=$ENV{"course.$ENV{'request.course.id'}.num"};
+ my $cdom =$ENV{"course.$ENV{'request.course.id'}.domain"};
+ my $cnum =$ENV{"course.$ENV{'request.course.id'}.num"};
+ my $getsec =$ENV{'form.section'};
+ my $submitonly=$ENV{'form.submitonly'};
$request->print(<<ENDTABLEST);
-<h2><font color="#339933">Show Student Submissions on Assessment</font></h2>
-
+<h2><font color="#339933"> View Submissions for a Student or a Group of Students</font></h2>
+ <font size=+1><b>Resource:</b> $ENV{'form.url'}<br /><br />
+<form action="/adm/grades" method="post"> <b>View Options</b></font><br />
+ <b>View Problem: </b><input type="radio" name="vProb" value="no" checked> no
+<input type="radio" name="vProb" value="yes"> yes
+ <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 bgcolor="#e6ffff"><td colspan="7"><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>Grade Status</b></td><td><b>Action</b></td></tr>
+<table border="0"><tr bgcolor="#e6ffff">
+<td><b> Select </b></td><td><b> Username </b></td>
+<td><b> Fullname </b></td><td><b> Domain </b></td>
+<td><b> Grade Status </b></td></tr>
ENDTABLEST
- my (%classlist) = &getclasslist($cdom,$cnum,'0');
- foreach my $student ( sort(@{ $classlist{'allids'} }) ) {
+ if ($ENV{'form.url'}) {
+ $request->print('<input type="hidden" name="url" value="'.$ENV{'form.url'}.'" />'."\n");
+ }
+ if ($ENV{'form.symb'}) {
+ $request->print('<input type="hidden" name="symb" value="'.$ENV{'form.symb'}.'" />'."\n");
+ }
+ $request->print('<input type="hidden" name="command" value="processGroup" />'."\n");
+
+ my ($classlist) = &getclasslist($getsec,'0');
+ foreach my $student ( sort(@{ $$classlist{$getsec} }) ) {
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',
- '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'};
- }
+ my $fullname = &get_fullname($sname,$sdom);
if ( $Apache::grades::viewgrades eq 'F' ) {
- $request->print("\n".'<tr bgcolor=#ffffe6>'."<td>$sname</td><td>$fullname</td><td align=\"middle\">$sdom</td>".
- '<form action="/adm/grades" method="post">');
- 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(
- '<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="lastSub" value="last" checked> last '.
- '<input type="radio" name="lastSub" value="all"> all </td>');
- my ($type,$status) = &student_gradeStatus($ENV{'form.url'},$cdom,$sname);
- $request->print(
- '<td align="middle">'.$status.' </td>');
- $request->print(
- '<td><input type="submit" name="submit" value="View/Grade" />');
- $request->print('</td></tr></form>');
-# $request->print('</form></td></tr>');
+ $request->print("\n".'<tr bgcolor="#ffffe6">'.
+ '<td align="center"><input type=checkbox name="stuinfo" value="'.
+ $student.':'.$fullname.'"></td>'."\n".
+ '<td> '.$sname.' </td>'."\n".
+ '<td> '.$fullname.' </td>'."\n".
+ '<td align="middle"> '.$sdom.' </td>'."\n");
+ $request->print('<td align="middle"> '.$status.' </td>'."\n");
+
+ $request->print('</tr>');
}
}
$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
sub finduser {
@@ -206,10 +201,10 @@
if ( $Apache::grades::viewgrades eq 'F' ) {
#get classlist
- my ($cdom,$cnum) = split(/_/,$ENV{'request.course.id'});
+# my ($cdom,$cnum) = split(/_/,$ENV{'request.course.id'});
#print "Found $cdom:$cnum<br />";
- my (%classlist) = &getclasslist($cdom,$cnum,'0');
- foreach my $student ( sort(@{ $classlist{'allids'} }) ) {
+ my ($classlist) = &getclasslist('all','0');
+ foreach my $student ( sort(@{ $$classlist{'all'} }) ) {
my ($posname,$posdomain) = split(/:/,$student);
if ($posname =~ $name) { $name=$posname; $domain=$posdomain; last; }
}
@@ -220,20 +215,27 @@
}
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 $now = time;
+ my (@holdsec,@sections);
foreach my $student (keys(%classlist)) {
my ($end,$start)=split(/:/,$classlist{$student});
# still a student?
if (($hideexpired) && ($end) && ($end < $now)) {
- #print "Skipping:$name:$end:$now<br />\n";
next;
}
- #print "record=$record<br>";
- push( @{ $classlist{'allids'} }, $student);
+ my ($unam,$udom) = split(/:/,$student,2);
+ 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 {
@@ -254,14 +256,9 @@
my $cellclr = '"#ffffdd"';
my ($username,$domain) = split(/:/,$student);
- my (@requests) = ('lastname','firstname','middlename','generation');
- my (%name) = &Apache::lonnet::get('environment',\@requests,$domain,$username);
+ my $fullname = &get_fullname($username,$domain);
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";
foreach my $part (@parts) {
my ($temp,$part,$type)=split(/_/,$part);
@@ -288,7 +285,7 @@
#interface based on that, also do that to above function.
sub setstudentgrade {
my ($url,$symb,$courseid,$student,@parts) = @_;
-
+ print "set student grade parts=@parts<br>";
my $result ='';
my ($stuname,$domain) = split(/:/,$student);
my %record=&Apache::lonnet::restore($symb,$courseid,$domain,$stuname);
@@ -309,10 +306,11 @@
} elsif ($oldscore !~ m/^$newscore/) {
$update=1;
$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 'excused') { $newscore = 'excused'; }
- if ($newscore eq 'ungraded') { $newscore = 'ungraded_attempted'; }
+ if ($newscore eq 'excused') { $newscore = 'excused'; }
+ if ($newscore eq 'ungraded') { $newscore = 'ungraded_attempted'; }
+ if ($newscore eq 'partial') { $newscore = 'correct_partially_by_override'; }
} else {
#$result.="$stuname:$part:$type:unchanged $oldscore to $newscore:<br />\n";
}
@@ -332,7 +330,7 @@
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";
}
@@ -342,9 +340,10 @@
#
# --------------------------- show submissions of a student, option to grade --------
sub submission {
- my ($request) = @_;
+ my ($request,$counter,$total) = @_;
- $request->print(<<JAVASCRIPT);
+ if ($counter == 0) {
+ $request->print(<<JAVASCRIPT);
<script type="text/javascript" language="javascript">
function updateRadio(radioButton,formtextbox,formsel,wgt) {
var pts = formtextbox.value;
@@ -393,125 +392,158 @@
</script>
JAVASCRIPT
+}
(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 ''; }
- print "formstu=$ENV{'form.student'}:<br>";
my ($uname,$udom) = &finduser($ENV{'form.student'});
if ($uname eq '') { &moreinfo($request,"Unable to find student"); return ''; }
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 ''; }
+ my $last = ($ENV{'form.lastSub'} eq 'last' ? 'last' : '');
#
# header info
- my $result='<h2><font color="#339933">Submission Record</font></h2>';
- $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>';
- $result.='<tr><td colspan=3><b>Resource: </b>'.$url.'</td></tr></table>';
+ if ($counter == 0) {
+ $request->print('<h2><font color="#339933">Submission Record</font></h2>');
+ }
+
#
-# option to display problem
- if ($ENV{'form.vProb'} eq 'yes') {
+# 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' && $counter == 0) {
my $rendered=&Apache::loncommon::get_student_view($symb,$uname,$udom,
$ENV{'request.course.id'});
my $companswer=&Apache::loncommon::get_student_answers($symb,$uname,$udom,
$ENV{'request.course.id'});
- $result.='<table border="0" width="100%"><tr><td bgcolor="#777777">';
+ my $result.='<table border="0" width="100%"><tr><td bgcolor="#777777">';
$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>Correct answer:</b><br />'.$companswer;
$result.='</td></tr></table>';
$result.='</td></tr></table><br />';
+ $request->print($result);
}
- my $last = ($ENV{'form.lastSub'} eq 'last' ? 'last' : '');
+#
+# 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");
+ }
+#
+# 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,
- $ENV{'request.course.id'},$last);
- $result.=$answer;
-
- my $wgt = &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'}*$wgt;
-
- $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="vProb" value="'.$ENV{'form.vProb'}.'" />'."\n".
- '<input type="hidden" name="lastSub" value="'.$last.'" />'."\n".
- '<input type="hidden" name="command" value="handgrade" />'."\n".
- '<input type="hidden" name="NCT"'.
- ' value="'.($ENV{'form.NTSTU'} ne '' ? $ENV{'form.NTSTU'} : '1').'" />'."\n";
+ $ENV{'request.course.id'},$last);
+ $request->print($answer);
+ $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 $wgtmsg = ($wgt > 0 ? '(problem weight)' : '<font color="red">problem weight assigned by computer</font>');
+ $wgt = ($wgt > 0 ? $wgt : '1');
+ my %record = &Apache::lonnet::restore($symb,$ENV{'request.course.id'},$udom,$uname);
+ my $score = ($record{'resource.0.awarded'} eq '' ? '' : $record{'resource.0.awarded'}*$wgt);
- my $counter = 0;
- $result.='<input type="hidden" name="WGT'.$counter.'" value="'.$wgt.'" />'.
+#
+# 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>';
my $ctr = 0;
+
+ $result.='<table border="0"><tr>'; # display radio buttons in a nice table with 10 across
while ($ctr<=$wgt) {
- $result.= '<input type="radio" name="RADVAL'.$counter.'" '.
+ $result.= '<td><input type="radio" name="RADVAL'.$counter.'" '.
'onclick="javascript:writeBox(this.form.GRADE_BOX'.$counter.
- ',this.form.GRADE_SEL'.$counter.',\''.$ctr.'\',\''.$wgt.'\')" '.
- ($score == $ctr? 'checked':'').' /> '.$ctr."\n";
+ ',this.form.GRADE_SEL'.$counter.','.$ctr.','.$wgt.')" '.
+ ($score eq $ctr ? 'checked':'').' /> '.$ctr."</td>\n";
+ $result.=(($ctr+1)%10 == 0 ? '</tr><tr>' : '');
$ctr++;
}
+ $result.='</tr></table>';
+
$result.='</td><td> <b>or</b> </td>';
$result.='<td><input type="text" name="GRADE_BOX'.$counter.'"'.
($score ne ''? ' value = "'.$score.'"':'').' size="4" '.
'onChange="javascript:updateRadio(this.form.RADVAL'.$counter.
',this.form.GRADE_BOX'.$counter.
',this.form.GRADE_SEL'.$counter.',\''.$wgt.'\')" /></td>'."\n";
- $result.='<td>/'.($wgt > 0 ? $wgt.' (problem weight)' : '<font color="red">invalid problem weight</font>' ).
- ' </td><td>';
+ $result.='<td>/'.$wgt.' '.$wgtmsg.' </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);
+ $status = 'partial' if ($foo =~ /partially/);
+ $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";
- $status = 'nothing' if ($status eq '');
$optsel =~ s/<option>$status/<option selected="on">$status/;
$result.=$optsel;
$result.="</select></td></tr>\n";
}
}
-
- $result.='<tr><td colspan="6"><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/;
- $result.=$ntstu.'student(s) '."\n <br />";
- $result.='<input type="submit" name="gradeOpt" value="Next" /> ';
- $result.='<input type="submit" name="gradeOpt" value="Previous" /> ';
- $result.='(Next and Previous do not save the scores.)';
- $result.='</td><tr></table></form>';
- return $result;
+ $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) ';
+ $endform.='<input type="submit" name="gradeOpt" value="Next" /> ';
+ $endform.='<input type="submit" name="gradeOpt" value="Previous" /> ';
+ $endform.='(Next and Previous do not save the scores.)';
+ $endform.='</td><tr></table></form>';
+ $request->print($endform);
+ }
+ return '';
}
sub processHandGrade {
- my ($request) = @_;
- my $result='';
-
+ 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 $vProb = $ENV{'form.vProb'};
+# my $lastSub= $ENV{'form.lastSub'};
my (@parts) = sort(&getpartlist($url));
+
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 $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,$score,@parts);
+ &saveHandGrade($url,$symb,$uname,$udom,$ctr,@parts);
+# &saveHandGrade($url,$symb,$uname,$udom,$score,@parts);
$ctr++;
}
}
@@ -519,40 +551,49 @@
my $laststu = $ENV{'form.unamedom'.($ngrade-1)};
#get classlist
- my ($cdom,$cnum) = split(/_/,$ENV{'request.course.id'});
- my (%classlist) = &getclasslist($cdom,$cnum,'0');
+# my ($cdom,$cnum) = split(/_/,$ENV{'request.course.id'});
+ my ($classlist) = &getclasslist('all','0');
my (@nextlist,@prevlist);
- my ($nextflg,$prevflg,$ctr) = (0,0,0);
- foreach my $student ( sort(@{ $classlist{'allids'} }) ) {
+ 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 < $ENV{'form.NTSTU'});
+ 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;
- $request->print(&submission($request));
- }
- $request->print ("<h2><font color=\"#339933\">Grading</font></h2>");
-
- #get info for each student
- 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);
+ &submission($request,$ctr,$total);
+ $ctr++;
}
return 'The End';
-# return $result;
}
sub saveHandGrade {
- my ($url,$symb,$stuname,$domain,$newscore,@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 %newrecord;
@@ -560,7 +601,15 @@
foreach my $part (@parts) {
my ($temp,$part,$type)=split(/_/,$part);
my $oldscore=$record{"resource.$part.$type"};
+ 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') {
+ $newscore = $ENV{'form.GRADE_SEL'.$newflg} if ($newflg >= 0);
my $update=0;
if ($newscore eq 'nothing' ) {
if ($oldscore ne '') {
@@ -573,7 +622,7 @@
if ($newscore eq 'incorrect') { $newscore = 'incorrect_by_override'; }
if ($newscore eq 'excused') { $newscore = 'excused'; }
if ($newscore eq 'ungraded') { $newscore = 'ungraded_attempted'; }
- if ($newscore eq 'partial') { $newscore = 'partial_correct'; }
+ if ($newscore eq 'partial') { $newscore = 'correct_partially_by_override'; }
}
if ($update) { $newrecord{"resource.$part.$type"}=$newscore; }
} else {
@@ -581,38 +630,24 @@
$newrecord{"resource.$part.$type"}=$newscore;
}
}
- if ( scalar(keys(%newrecord)) > 0 ) {
+ }
+ if ( scalar(keys(%newrecord)) > 0 ) {
$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);
- }
- return '';
+ while (my ($k,$v) = each %newrecord) {
+ 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,$ENV{'request.course.id'},$domain,$stuname);
}
+ return '';
}
sub get_symb_and_url {
- my ($request) = @_;
- my $url=$ENV{'form.url'};
- $url=~s-^http://($ENV{'SERVER_NAME'}|$ENV{'HTTP_HOST'})--;
-# my $symb=$ENV{'form.symb'};
-# if (!$symb) { $symb=&Apache::lonnet::symbread($url); }
+ my ($request) = @_;
+ (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)));
if ($symb eq '') { $request->print("Unable to handle ambiguous references:$url:."); return ''; }
- 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;
+ return ($symb,$url);
}
sub show_grading_menu_form {
@@ -631,30 +666,107 @@
my ($symb,$url)=&get_symb_and_url($request);
if (!$symb) {return '';}
- my $result='<h2> <font color="#339933">Select a Grading Method</font></h2><br />';
- $result.='<table width=100% border=0><tr><td bgcolor=#777777>'."\n";
- $result.='<table width=100% border=0><tr><td bgcolor=#e6ffff>'."\n";
- $result.=' <b>Resource :</b> '.$url.'</td></tr>'."\n";
+ my $result='<h2> <font color="#339933">Select a Grading Method</font></h2>';
+ $result.=' <font size=+1><b>Resource: </b>'.$url.'</font><br /><br />';
+
+ $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.=' <b>View/Grade Entire Class</b></td></tr>'."\n";
$result.='<tr bgcolor=#ffffe6><td>'."\n";
- $result.=&view_edit_entire_class_form($symb,$url);
- $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="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="symb" value="'.$symb.'" />'."\n".
'<input type="hidden" name="url" value="'.$url.'" />'."\n".
- '<input type="hidden" name="command" value="submission" />'."\n".
- '<input type="submit" name="submit" value="View/Grade A Student" />'."\n".
- '</form>'."\n";
+ '<input type="hidden" name="command" value="viewgrades" />'."\n";
+ $result.=' <b>Display students who has: </b>'.
+ '<input type="radio" name="submitonly" value="yes" checked> submitted'.
+ '<input type="radio" name="submitonly" value="all"> everybody <br /><br />';
+ $result.=' <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.=' <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 /> <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.=' <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".
'<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";
+ '<input type="hidden" name="command" value="submission" />'."\n";
+
+ $result.=' <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.=' <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.=' (Section -1 implies the students were not assigned a section.)<br />' if (grep /-1/,@$sections);
+
+ $result.='<br /> <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.=' <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.=' <tt>'.$hostver.'-<input type="text" name="receipt" size="4"></tt><br />'."\n";
+ $result.=' <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";
return $result;
@@ -670,7 +782,7 @@
#get classlist
my ($cdom,$cnum) = split(/_/,$ENV{'request.course.id'});
#print "Found $cdom:$cnum<br />";
- my (%classlist) = &getclasslist($cdom,$cnum,'0');
+ my ($classlist) = &getclasslist('all','0');
my $headerclr = '"#ccffff"';
my $cellclr = '"#ffffcc"';
@@ -691,12 +803,11 @@
foreach my $part (@parts) {
my $display=&Apache::lonnet::metadata($url,$part.'.display');
if (!$display) { $display = &Apache::lonnet::metadata($url,$part.'.name'); }
- print "Manual grading:$url:$part:$display:<br>";
$result.='<td><b>'.$display.'</b></td>'."\n";
}
$result.='</tr>';
#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);
# print "ID=$ENV{'request.course.id'}:STU=$student:DIS=$display:<br>\n";
$result.=&viewstudentgrade($url,$symb,$ENV{'request.course.id'},$student,@parts);
@@ -715,9 +826,9 @@
if ($symb eq '') { $request->print("Unable to handle ambiguous references:$symb:$ENV{'form.url'}"); return ''; }
my $url=$ENV{'form.url'};
#get classlist
- my ($cdom,$cnum) = split(/_/,$ENV{'request.course.id'});
+# my ($cdom,$cnum) = split(/_/,$ENV{'request.course.id'});
#print "Found $cdom:$cnum<br />";
- my (%classlist) = &getclasslist($cdom,$cnum,'0');
+ my ($classlist) = &getclasslist('all','0');
#get list of parts for this problem
my (@parts) = &getpartlist($url);
@@ -728,7 +839,7 @@
'<input type="hidden" name="command" value="viewgrades" />'."\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);
}
@@ -736,25 +847,6 @@
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 {
return(<<ENDPICK);
function verify(vf) {
@@ -947,16 +1039,16 @@
}
$request->print('<h3>Assigning Grades</h3>');
my $courseid=$ENV{'request.course.id'};
- my $cdom=$ENV{"course.$courseid.domain"};
- my $cnum=$ENV{"course.$courseid.num"};
- my (%classlist) = &getclasslist($cdom,$cnum,'1');
+# my $cdom=$ENV{"course.$courseid.domain"};
+# my $cnum=$ENV{"course.$courseid.num"};
+ my ($classlist) = &getclasslist('all','1');
my @skipped;
my $countdone=0;
foreach my $grade (@gradedata) {
my %entries=&Apache::loncommon::record_sep($grade);
my $username=$entries{$fields{'username'}};
my $domain=$entries{$fields{'domain'}};
- if (!exists($classlist{"$username:$domain"})) {
+ if (!exists($$classlist{"$username:$domain"})) {
push(@skipped,"$username:$domain");
next;
}
@@ -1055,7 +1147,9 @@
$Apache::grades::viewgrades=&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'});
if ($command eq 'submission') {
&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') {
$request->print(&gradingmenu($request));
} elsif ($command eq 'viewgrades') {
@@ -1070,8 +1164,8 @@
$request->print(&csvupload($request));
} elsif ($command eq 'csvuploadmap') {
$request->print(&csvuploadmap($request));
- } elsif ($command eq 'receiptInput') {
- &receiptInput($request);
+# } elsif ($command eq 'receiptInput') {
+# &receiptInput($request);
} elsif ($command eq 'csvuploadassign') {
if ($ENV{'form.associate'} ne 'Reverse Association') {
$request->print(&csvuploadassign($request));
--ng1025558429--