version 1.31, 2002/06/25 21:07:56
|
version 1.32, 2002/06/26 21:25:31
|
Line 116 ENDHEADER
|
Line 116 ENDHEADER
|
return ''; |
return ''; |
} |
} |
|
|
|
sub student_gradeStatus { |
|
my ($url,$udom,$uname) = @_; |
|
my $symb=($ENV{'form.symb'} ne '' ? $ENV{'form.symb'} : (&Apache::lonnet::symbread($url))); |
|
my %record= &Apache::lonnet::restore($symb,$ENV{'request.course.id'},$udom,$uname); |
|
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 = 'nothing' if ($status eq ''); |
|
return $type,$status; |
|
} |
|
} |
|
return ''; |
|
} |
|
|
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"}; |
Line 124 sub listStudents {
|
Line 139 sub listStudents {
|
$request->print(<<ENDTABLEST); |
$request->print(<<ENDTABLEST); |
<h2><font color="#339933">Show Student Submissions on Assessment</font></h2> |
<h2><font color="#339933">Show Student Submissions on Assessment</font></h2> |
|
|
<table border="0"><tr><td bgcolor="#000000"> |
<table border="0"><tr><td bgcolor="#777777"> |
<table border="0"> |
<table border="0"> |
<tr bgcolor="#e6ffff"><td colspan="6"><b>Resource: </b> $ENV{'form.url'}</td></tr> |
<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> |
<tr bgcolor="#e6ffff"><td><b>Username</b></td><td><b>Name</b></td><td><b>Domain</b></td> |
<td><b>View Problem</b></td><td><b>Submissions</b></td><td><b>Action</b></td></tr> |
<td><b>View Problem</b></td><td><b>Submissions</b></td> |
|
<td><b>Grade Status</b></td><td><b>Action</b></td></tr> |
ENDTABLEST |
ENDTABLEST |
my (%classlist) = &getclasslist($cdom,$cnum,'0'); |
my (%classlist) = &getclasslist($cdom,$cnum,'0'); |
foreach my $student ( sort(@{ $classlist{'allids'} }) ) { |
foreach my $student ( sort(@{ $classlist{'allids'} }) ) { |
Line 145 ENDTABLEST
|
Line 161 ENDTABLEST
|
$fullname.=$name{'firstname'}.' '.$name{'middlename'}; |
$fullname.=$name{'firstname'}.' '.$name{'middlename'}; |
} |
} |
if ( $Apache::grades::viewgrades eq 'F' ) { |
if ( $Apache::grades::viewgrades eq 'F' ) { |
$request->print("\n".'<tr bgcolor=#ffffe6>'."<td>$sname</td><td>$fullname</td><td>$sdom</td>". |
$request->print("\n".'<tr bgcolor=#ffffe6>'."<td>$sname</td><td>$fullname</td><td align=\"middle\">$sdom</td>". |
'<form action="/adm/grades" method="post">'); |
'<form action="/adm/grades" method="post">'); |
if ($ENV{'form.url'}) { |
if ($ENV{'form.url'}) { |
$request->print( |
$request->print( |
Line 169 ENDTABLEST
|
Line 185 ENDTABLEST
|
$request->print('<td>'. |
$request->print('<td>'. |
'<input type="radio" name="submission" value="last" checked> last '. |
'<input type="radio" name="submission" value="last" checked> last '. |
'<input type="radio" name="submission" value="all"> all </td>'); |
'<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.' </td>'); |
$request->print( |
$request->print( |
'<td><input type="submit" name="submit" value="View/Grade" />'); |
'<td><input type="submit" name="submit" value="View/Grade" />'); |
$request->print('</td></tr></form>'); |
$request->print('</td></tr></form>'); |
Line 237 sub viewstudentgrade {
|
Line 256 sub viewstudentgrade {
|
my (@requests) = ('lastname','firstname','middlename','generation'); |
my (@requests) = ('lastname','firstname','middlename','generation'); |
my (%name) = &Apache::lonnet::get('environment',\@requests,$domain,$username); |
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'}; |
my $fullname=$name{'lastname'}.$name{'generation'}; |
if ($fullname =~ /[^\s]+/) { $fullname.=', '; } |
if ($fullname =~ /[^\s]+/) { $fullname.=', '; } |
$fullname.=$name{'firstname'}.' '.$name{'middlename'}; |
$fullname.=$name{'firstname'}.' '.$name{'middlename'}; |
Line 277 sub setstudentgrade {
|
Line 297 sub setstudentgrade {
|
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.$student.$part.$type"}; |
my $newscore=$ENV{"form.GRADE.$student.$part.$type"}; |
|
print "old=$oldscore:new=$newscore:<br>"; |
if ($type eq 'solved') { |
if ($type eq 'solved') { |
my $update=0; |
my $update=0; |
if ($newscore eq 'nothing' ) { |
if ($newscore eq 'nothing' ) { |
Line 305 sub setstudentgrade {
|
Line 326 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 313 sub setstudentgrade {
|
Line 338 sub setstudentgrade {
|
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) = @_; |
$request->print(<<JAVASCRIPT); |
$request->print(<<JAVASCRIPT); |
<script type="text/javascript"> |
<script type="text/javascript" language="javascript"> |
function changeRadio(title,url) { |
function updateRadio() { |
|
var pts = document.SCORE.GRADE_BOX.value; |
|
var radioButton = document.SCORE.radval; |
|
var checked =true; |
|
var unchecked=false; |
|
var resetbox =false; |
|
if (isNaN(pts) || pts < 0) { |
|
alert("A number equal or greater than 0 is expected. Entered value = "+pts); |
|
for (var i=0; i<radioButton.length; i++) { |
|
if (radioButton[i].checked) { |
|
document.SCORE.GRADE_BOX.value = i; |
|
resetbox = true; |
|
} |
|
} |
|
if (!resetbox) { |
|
document.SCORE.GRADE_BOX.value = ""; |
|
} |
|
return; |
|
} |
|
|
|
for (var i=0; i<radioButton.length; i++) { |
|
radioButton[i].checked=unchecked; |
|
if (pts == i) { |
|
radioButton[i].checked=checked; |
|
} |
|
} |
} |
} |
|
|
</script> |
</script> |
JAVASCRIPT |
JAVASCRIPT |
my $url=$ENV{'form.url'}; |
my $url=$ENV{'form.url'}; |
Line 328 JAVASCRIPT
|
Line 379 JAVASCRIPT
|
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; |
|
if ($ENV{'form.symb'}) { |
my $symb=($ENV{'form.symb'} ne '' ? $ENV{'form.symb'} : (&Apache::lonnet::symbread($url))); |
$symb=$ENV{'form.symb'}; |
|
} else { |
|
$symb=&Apache::lonnet::symbread($url); |
|
} |
|
if ($symb eq '') { $request->print("Unable to handle ambiguous references:$url:."); return ''; } |
if ($symb eq '') { $request->print("Unable to handle ambiguous references:$url:."); return ''; } |
# |
# |
# header info |
# header info |
Line 347 JAVASCRIPT
|
Line 394 JAVASCRIPT
|
$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="#000000">'; |
$result.='<table border="0"><tr><td bgcolor="#777777">'; |
$result.='<table border="0"><tr><td bgcolor="#e6ffff">'; |
$result.='<table border="0"><tr><td bgcolor="#e6ffff">'; |
$result.='<b>Student\'s view of the problem</b></td></tr><tr><td bgcolor="#ffffff">'.$rendered.'<br />'; |
$result.='<b>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; |
Line 360 JAVASCRIPT
|
Line 407 JAVASCRIPT
|
$ENV{'request.course.id'},$last); |
$ENV{'request.course.id'},$last); |
$result.=$answer; |
$result.=$answer; |
|
|
my $maxpt = &Apache::lonnet::EXT('resource.partid.weight',$symb,$udom,$uname); |
my $wgt = &Apache::lonnet::EXT('resource.partid.weight',$symb,$udom,$uname); |
my %record= &Apache::lonnet::restore($symb,$ENV{'request.course.id'},$udom,$uname); |
my %record= &Apache::lonnet::restore($symb,$ENV{'request.course.id'},$udom,$uname); |
my $score = $record{'resource.0.awarded'}*$maxpt; |
my $score = $record{'resource.0.awarded'}*$wgt; |
|
|
$result.= '<form action="/adm/grades" method="post" name="SCORE">'."\n". |
$result.= '<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="command" value="editgrades" />'."\n". |
'<input type="hidden" name="command" value="handgrade" />'."\n"; |
'<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; |
while ($ctr<=$maxpt) { |
while ($ctr<=$wgt) { |
$result.= '<input type="radio" name="radval" '. |
$result.= '<input type="radio" name="radval" '. |
'onclick="javascript:SCORE.GRADE_'.$ENV{'form.student'}.'.value='.$ctr.'" value="'.$ctr.'" '. |
# 'onclick="javascript:writeBox(\'GRADE_'.$ENV{'form.student'}.'\',\''.$ctr.'\')" '. |
|
'onclick="javascript:SCORE.GRADE_BOX.value='.$ctr.'" '. |
($score == $ctr? 'checked':'').' /> '.$ctr."\n"; |
($score == $ctr? 'checked':'').' /> '.$ctr."\n"; |
$ctr++; |
$ctr++; |
} |
} |
$result.='</td><td> <b>or</b> </td>'; |
$result.='</td><td> <b>or</b> </td>'; |
$result.='<td><input type="text" name="GRADE_'.$ENV{'form.student'}.'"'. |
$result.='<td><input type="text" name="GRADE_BOX"'. |
($score ne ''? ' value = "'.$score.'"':'').' size="4" /></td>'."\n"; |
($score ne ''? ' value = "'.$score.'"':'').' size="4" '. |
$result.='<td>/'.$maxpt.' (max pts)</td><td>'; |
'onChange="javascript:updateRadio()" /></td>'."\n"; |
|
$result.='<td>/'.$wgt.' (problem weight)</td></tr>'; |
|
|
foreach my $part (&getpartlist($url)) { |
$result.='<input type="hidden" name="GRADE_'.$uname.':'.$udom.'" value="handgraded" />'."\n"; |
my ($temp,$part,$type)=split(/_/,$part); |
$result.='<tr><td colspan="5"><input type="submit" name="gradeOpt" value="Save & Next" /> '; |
if ($type eq 'solved') { |
|
my ($status,$foo)=split(/_/,$record{"resource.$part.$type"},2); |
|
$result.="<select name=\"GRADE.$uname:$udom.$part.$type\">\n"; |
|
my $optsel = '<option>correct</option><option>incorrect</option>'. |
|
'<option>excused</option><option>ungraded</option>'. |
|
'<option>handgraded</option><option>nothing</option>'."\n"; |
|
$status = 'nothing' if ($status eq ''); |
|
$optsel =~ s/<option>$status/<option selected="on">$status/; |
|
$result.=$optsel; |
|
$result.="</select></td></tr>\n"; |
|
} |
|
} |
|
$result.='<tr><td colspan="5">The buttons do not work yet.<input type="submit" name="gradeOpt" value="Save N Next" /> '; |
|
$result.='<input type="submit" name="gradeOpt" value="Next" /> '; |
$result.='<input type="submit" name="gradeOpt" value="Next" /> '; |
$result.='<input type="submit" name="gradeOpt" value="Previous" /> '; |
$result.='<input type="submit" name="gradeOpt" value="Previous" /> '; |
$result.='</td><tr></table></form>'; |
$result.='</td><tr></table></form>'; |
return $result; |
return $result; |
} |
} |
|
|
|
sub processHandGrade { |
|
my ($url,$symb,$courseid,$student,@parts) = @_; |
|
|
|
my ($stuname,$domain) = split(/:/,$student); |
|
my %record=&Apache::lonnet::restore($symb,$courseid,$domain,$stuname); |
|
my %newrecord; |
|
|
|
foreach my $part (@parts) { |
|
my ($temp,$part,$type)=split(/_/,$part); |
|
my $oldscore=$record{"resource.$part.$type"}; |
|
my $newscore=($ENV{'form.GRADE_BOX'} ne '' ? $ENV{"form.GRADE_BOX"} : $ENV{'form.radval'}); |
|
if ($type eq 'solved') { |
|
my $update=0; |
|
if ($newscore eq 'nothing' ) { |
|
if ($oldscore ne '') { |
|
$update=1; |
|
$newscore = ''; |
|
} |
|
} elsif ($oldscore !~ m/^$newscore/) { |
|
$update=1; |
|
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 'handgraded') { $newscore = 'handgraded_by_grader'; } |
|
} |
|
if ($update) { $newrecord{"resource.$part.$type"}=$newscore; } |
|
} else { |
|
if ($oldscore ne $newscore) { |
|
$newrecord{"resource.$part.$type"}=$newscore; |
|
} |
|
} |
|
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 ''; |
|
} |
|
|
sub get_symb_and_url { |
sub get_symb_and_url { |
my ($request) = @_; |
my ($request) = @_; |
my $url=$ENV{'form.url'}; |
my $url=$ENV{'form.url'}; |
$url=~s-^http://($ENV{'SERVER_NAME'}|$ENV{'HTTP_HOST'})--; |
$url=~s-^http://($ENV{'SERVER_NAME'}|$ENV{'HTTP_HOST'})--; |
my $symb=$ENV{'form.symb'}; |
# my $symb=$ENV{'form.symb'}; |
if (!$symb) { $symb=&Apache::lonnet::symbread($url); } |
# if (!$symb) { $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); |
} |
} |
Line 440 sub gradingmenu {
|
Line 521 sub gradingmenu {
|
if (!$symb) {return '';} |
if (!$symb) {return '';} |
|
|
my $result='<h2> <font color="#339933">Select a Grading Method</font></h2><br />'; |
my $result='<h2> <font color="#339933">Select a Grading Method</font></h2><br />'; |
$result.='<table width=100% border=0><tr><td bgcolor=#000000>'."\n"; |
$result.='<table width=100% border=0><tr><td bgcolor=#777777>'."\n"; |
$result.='<table width=100% border=0><tr><td bgcolor=#e6ffff>'."\n"; |
$result.='<table width=100% border=0><tr><td bgcolor=#e6ffff>'."\n"; |
$result.=' <b>Resource :</b> '.$url.'</td></tr>'."\n"; |
$result.=' <b>Resource :</b> '.$url.'</td></tr>'."\n"; |
$result.='<tr bgcolor=#ffffe6><td>'."\n"; |
$result.='<tr bgcolor=#ffffe6><td>'."\n"; |
Line 493 sub viewgrades {
|
Line 574 sub viewgrades {
|
'<input type="hidden" name="url" value="'.$url.'" />'."\n". |
'<input type="hidden" name="url" value="'.$url.'" />'."\n". |
'<input type="hidden" name="command" value="editgrades" />'."\n". |
'<input type="hidden" name="command" value="editgrades" />'."\n". |
'<input type="submit" name="submit" value="Submit Changes" />'."\n". |
'<input type="submit" name="submit" value="Submit Changes" />'."\n". |
'<table border=0><tr><td bgcolor="#000000">'."\n". |
'<table border=0><tr><td bgcolor="#777777">'."\n". |
'<table border=0>'."\n". |
'<table border=0>'."\n". |
'<tr bgcolor='.$headerclr.'><td><b>Username</b></td><td><b>Name</b></td><td><b>Domain</b></td>'."\n"; |
'<tr bgcolor='.$headerclr.'><td><b>Username</b></td><td><b>Name</b></td><td><b>Domain</b></td>'."\n"; |
foreach my $part (@parts) { |
foreach my $part (@parts) { |