--- loncom/homework/grades.pm 2003/07/14 16:11:19 1.115
+++ loncom/homework/grades.pm 2004/12/03 22:44:36 1.233
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# The LON-CAPA Grading handler
#
-# $Id: grades.pm,v 1.115 2003/07/14 16:11:19 ng Exp $
+# $Id: grades.pm,v 1.233 2004/12/03 22:44:36 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -25,15 +25,6 @@
#
# http://www.lon-capa.org/
#
-# 2/9,2/13 Guy Albertelli
-# 6/8 Gerd Kortemeyer
-# 7/26 H.K. Ng
-# 8/20 Gerd Kortemeyer
-# Year 2002
-# June-August H.K. Ng
-# Year 2003
-# February, March H.K. Ng
-#
package Apache::grades;
use strict;
@@ -47,6 +38,7 @@ use Apache::lonhomework;
use Apache::loncoursedata;
use Apache::lonmsg qw(:user_normal_msg);
use Apache::Constants qw(:common);
+use Apache::lonlocal;
use String::Similarity;
my %oldessays=();
@@ -54,98 +46,325 @@ my %perm=();
# ----- These first few routines are general use routines.----
#
-# --- Retrieve the parts that matches stores_\d+ from the metadata file.---
+# --- Retrieve the parts from the metadata file.---
sub getpartlist {
- my ($url) = @_;
- my @parts =();
- my (@metakeys) = split(/,/,&Apache::lonnet::metadata($url,'keys'));
- foreach my $key (@metakeys) {
- if ( $key =~ m/stores_(\w+)_.*/) {
- push(@parts,$key);
+ my ($url,$symb) = @_;
+ my $partorder = &Apache::lonnet::metadata($url, 'partorder');
+ my @parts;
+ if ($partorder) {
+ for my $part (split (/,/,$partorder)) {
+ if (!&Apache::loncommon::check_if_partid_hidden($part,$symb)) {
+ push(@parts, $part);
+ }
+ }
+ } else {
+ my $metadata = &Apache::lonnet::metadata($url, 'packages');
+ foreach (split(/\,/,$metadata)) {
+ if ($_ =~ /^part_(.*)$/) {
+ if (!&Apache::loncommon::check_if_partid_hidden($1,$symb)) {
+ push(@parts, $1);
+ }
+ }
+ }
+ }
+ my @stores;
+ foreach my $part (@parts) {
+ my (@metakeys) = split(/,/,&Apache::lonnet::metadata($url,'keys'));
+ foreach my $key (@metakeys) {
+ if ($key =~ m/^stores_\Q$part\E_/) { push(@stores,$key); }
}
}
- return @parts;
+ return @stores;
}
# --- Get the symbolic name of a problem and the url
sub get_symb_and_url {
- my ($request) = @_;
+ my ($request,$silent) = @_;
(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 ''; }
+ if ($symb eq '') {
+ if (!$silent) {
+ $request->print("Unable to handle ambiguous references:$url:.");
+ return ();
+ }
+ }
return ($symb,$url);
}
-# --- Retrieve the fullname for a user. Return lastname, first middle ---
-# --- Generation is attached next to the lastname if it exists. ---
-sub get_fullname {
- my ($uname,$udom) = @_;
- my %name=&Apache::lonnet::get('environment', ['lastname','generation',
- 'firstname','middlename'],
- $udom,$uname);
- my $fullname;
- my ($tmp) = keys(%name);
- if ($tmp !~ /^(con_lost|error|no_such_host)/i) {
- $fullname = &Apache::loncoursedata::ProcessFullName
- (@name{qw/lastname generation firstname middlename/});
+#--- Format fullname, username:domain if different for display
+#--- Use anywhere where the student names are listed
+sub nameUserString {
+ my ($type,$fullname,$uname,$udom) = @_;
+ if ($type eq 'header') {
+ return '<b> Fullname </b><font color="#999999">(Username)</font> ';
} else {
- &Apache::lonnet::logthis('grades.pm: no name data for '.$uname.
- '@'.$udom.':'.$tmp);
+ return ' '.$fullname.'<font color="#999999"> ('.$uname.
+ ($ENV{'user.domain'} eq $udom ? '' : ' ('.$udom.')').')</font>';
}
- return $fullname;
}
#--- Get the partlist and the response type for a given problem. ---
#--- Indicate if a response type is coded handgraded or not. ---
sub response_type {
- my ($url) = shift;
+ my ($url,$symb) = shift;
+ $symb=($ENV{'form.symb'} ne '' ? $ENV{'form.symb'} : (&Apache::lonnet::symbread($url))) if ($symb eq '');
my $allkeys = &Apache::lonnet::metadata($url,'keys');
+ my %vPart;
+ foreach my $partid (&Apache::loncommon::get_env_multiple('form.vPart')) {
+ $vPart{$partid}=1;
+ }
my %seen = ();
- my (@partlist,%handgrade);
+ my (@partlist,%handgrade,%responseType);
foreach (split(/,/,&Apache::lonnet::metadata($url,'packages'))) {
- if (/^\w+response_\w+.*/) {
+ if (/^\w+response_.*/) {
my ($responsetype,$part) = split(/_/,$_,2);
my ($partid,$respid) = split(/_/,$part);
- $handgrade{$part} = $responsetype.':'.($allkeys =~ /parameter_$part\_handgrade/ ? 'yes' : 'no');
+ if (&Apache::loncommon::check_if_partid_hidden($partid,$symb)) {
+ next;
+ }
+ if (%vPart && !exists($vPart{$partid})) {
+ next;
+ }
+ $responsetype =~ s/response$//; # make it compatible w/ navmaps - should move to that!!
+ my ($value) = &Apache::lonnet::EXT('resource.'.$part.'.handgrade',$symb);
+ $handgrade{$part} = ($value eq 'yes' ? 'yes' : 'no');
+ if (!exists($responseType{$partid})) { $responseType{$partid}={}; }
+ $responseType{$partid}->{$respid}=$responsetype;
next if ($seen{$partid} > 0);
$seen{$partid}++;
push @partlist,$partid;
}
}
- return \@partlist,\%handgrade;
+ return \@partlist,\%handgrade,\%responseType;
+}
+
+sub get_display_part {
+ my ($partID,$url,$symb)=@_;
+ if (!defined($symb) || $symb eq '') {
+ $symb=$ENV{'form.symb'};
+ if ($symb eq '') { $symb=&Apache::lonnet::symbread($url) }
+ }
+ my $display=&Apache::lonnet::EXT('resource.'.$partID.'.display',$symb);
+ if (defined($display) and $display ne '') {
+ $display.= " (<font color=\"#999900\">id $partID</font>)";
+ } else {
+ $display=$partID;
+ }
+ return $display;
+}
+#--- Show resource title
+#--- and parts and response type
+sub showResourceInfo {
+ my ($url,$probTitle,$checkboxes) = @_;
+ my $col=3;
+ if ($checkboxes) { $col=4; }
+ my $result ='<table border="0">'.
+ '<tr><td colspan="'.$col.'"><font size="+1"><b>'.&mt('Current Resource').': </b>'.
+ $probTitle.'</font></td></tr>'."\n";
+ my ($partlist,$handgrade,$responseType) = &response_type($url);
+ my %resptype = ();
+ my $hdgrade='no';
+ my %partsseen;
+ for my $part_resID (sort keys(%$handgrade)) {
+ my $handgrade=$$handgrade{$part_resID};
+ my ($partID,$resID) = split(/_/,$part_resID);
+ my $responsetype = $responseType->{$partID}->{$resID};
+ $hdgrade = $handgrade if ($handgrade eq 'yes');
+ $result.='<tr>';
+ if ($checkboxes) {
+ if (exists($partsseen{$partID})) {
+ $result.="<td> </td>";
+ } else {
+ $result.="<td><input type='checkbox' name='vPart' value='$partID' checked='on' /></td>";
+ }
+ $partsseen{$partID}=1;
+ }
+ my $display_part=&get_display_part($partID,$url);
+ $result.='<td><b>Part: </b>'.$display_part.' <font color="#999999">'.
+ $resID.'</font></td>'.
+ '<td><b>Type: </b>'.$responsetype.'</td></tr>';
+# '<td><b>Handgrade: </b>'.$handgrade.'</td></tr>';
+ }
+ $result.='</table>'."\n";
+ return $result,$responseType,$hdgrade,$partlist,$handgrade;
+}
+
+
+sub get_order {
+ my ($partid,$respid,$symb,$uname,$udom)=@_;
+ my (undef,undef,$url)=&Apache::lonnet::decode_symb($symb);
+ $url=&Apache::lonnet::clutter($url);
+ my $subresult=&Apache::lonnet::ssi($url,
+ ('grade_target' => 'analyze'),
+ ('grade_domain' => $udom),
+ ('grade_symb' => $symb),
+ ('grade_courseid' =>
+ $ENV{'request.course.id'}),
+ ('grade_username' => $uname));
+ (undef,$subresult)=split(/_HASH_REF__/,$subresult,2);
+ my %analyze=&Apache::lonnet::str2hash($subresult);
+ return ($analyze{"$partid.$respid.shown"});
+}
+#--- Clean response type for display
+#--- Currently filters option/rank/radiobutton/match/essay response types only.
+sub cleanRecord {
+ my ($answer,$response,$symb,$partid,$respid,$record,$order,$version) = @_;
+ my $grayFont = '<font color="#999999">';
+ if ($response =~ /^(option|rank)$/) {
+ my %answer=&Apache::lonnet::str2hash($answer);
+ my %grading=&Apache::lonnet::str2hash($record->{$version."resource.$partid.$respid.submissiongrading"});
+ my ($toprow,$bottomrow);
+ foreach my $foil (@$order) {
+ if ($grading{$foil} == 1) {
+ $toprow.='<td><b>'.$answer{$foil}.' </b></td>';
+ } else {
+ $toprow.='<td><i>'.$answer{$foil}.' </i></td>';
+ }
+ $bottomrow.='<td>'.$grayFont.$foil.'</font> </td>';
+ }
+ return '<blockquote><table border="1">'.
+ '<tr valign="top"><td>Answer</td>'.$toprow.'</tr>'.
+ '<tr valign="top"><td>'.$grayFont.'Option ID</font></td>'.
+ $grayFont.$bottomrow.'</tr>'.'</table></blockquote>';
+ } elsif ($response eq 'match') {
+ my %answer=&Apache::lonnet::str2hash($answer);
+ my %grading=&Apache::lonnet::str2hash($record->{$version."resource.$partid.$respid.submissiongrading"});
+ my @items=&Apache::lonnet::str2array($record->{$version."resource.$partid.$respid.submissionitems"});
+ my ($toprow,$middlerow,$bottomrow);
+ foreach my $foil (@$order) {
+ my $item=shift(@items);
+ if ($grading{$foil} == 1) {
+ $toprow.='<td><b>'.$item.' </b></td>';
+ $middlerow.='<td><b>'.$grayFont.$answer{$foil}.' </font></b></td>';
+ } else {
+ $toprow.='<td><i>'.$item.' </i></td>';
+ $middlerow.='<td><i>'.$grayFont.$answer{$foil}.' </font></i></td>';
+ }
+ $bottomrow.='<td>'.$grayFont.$foil.'</font> </td>';
+ }
+ return '<blockquote><table border="1">'.
+ '<tr valign="top"><td>Answer</td>'.$toprow.'</tr>'.
+ '<tr valign="top"><td>'.$grayFont.'Item ID</font></td>'.
+ $middlerow.'</tr>'.
+ '<tr valign="top"><td>'.$grayFont.'Option ID</font></td>'.
+ $bottomrow.'</tr>'.'</table></blockquote>';
+ } elsif ($response eq 'radiobutton') {
+ my %answer=&Apache::lonnet::str2hash($answer);
+ my ($toprow,$bottomrow);
+ my $correct=($order->[0])+1;
+ for (my $i=1;$i<=$#$order;$i++) {
+ my $foil=$order->[$i];
+ if (exists($answer{$foil})) {
+ if ($i == $correct) {
+ $toprow.='<td><b>true</b></td>';
+ } else {
+ $toprow.='<td><i>true</i></td>';
+ }
+ } else {
+ $toprow.='<td>false</td>';
+ }
+ $bottomrow.='<td>'.$grayFont.$foil.'</font> </td>';
+ }
+ return '<blockquote><table border="1">'.
+ '<tr valign="top"><td>Answer</td>'.$toprow.'</tr>'.
+ '<tr valign="top"><td>'.$grayFont.'Option ID</font></td>'.
+ $grayFont.$bottomrow.'</tr>'.'</table></blockquote>';
+ } elsif ($response eq 'essay') {
+ if (! exists ($ENV{'form.'.$symb})) {
+ my (%keyhash) = &Apache::lonnet::dump('nohist_handgrade',
+ $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
+ $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
+
+ my $loginuser = $ENV{'user.name'}.':'.$ENV{'user.domain'};
+ $ENV{'form.keywords'} = $keyhash{$symb.'_keywords'} ne '' ? $keyhash{$symb.'_keywords'} : '';
+ $ENV{'form.kwclr'} = $keyhash{$loginuser.'_kwclr'} ne '' ? $keyhash{$loginuser.'_kwclr'} : 'red';
+ $ENV{'form.kwsize'} = $keyhash{$loginuser.'_kwsize'} ne '' ? $keyhash{$loginuser.'_kwsize'} : '0';
+ $ENV{'form.kwstyle'} = $keyhash{$loginuser.'_kwstyle'} ne '' ? $keyhash{$loginuser.'_kwstyle'} : '';
+ $ENV{'form.'.$symb} = 1; # so that we don't have to read it from disk for multiple sub of the same prob.
+ }
+ $answer =~ s-\n-<br />-g;
+ return '<br /><br /><blockquote><tt>'.&keywords_highlight($answer).'</tt></blockquote>';
+ }
+ return $answer;
+}
+
+#-- A couple of common js functions
+sub commonJSfunctions {
+ my $request = shift;
+ $request->print(<<COMMONJSFUNCTIONS);
+<script type="text/javascript" language="javascript">
+ function radioSelection(radioButton) {
+ var selection=null;
+ if (radioButton.length > 1) {
+ for (var i=0; i<radioButton.length; i++) {
+ if (radioButton[i].checked) {
+ return radioButton[i].value;
+ }
+ }
+ } else {
+ if (radioButton.checked) return radioButton.value;
+ }
+ return selection;
+ }
+
+ function pullDownSelection(selectOne) {
+ var selection="";
+ if (selectOne.length > 1) {
+ for (var i=0; i<selectOne.length; i++) {
+ if (selectOne[i].selected) {
+ return selectOne[i].value;
+ }
+ }
+ } else {
+ // only one value it must be the selected one
+ return selectOne.value;
+ }
+ }
+</script>
+COMMONJSFUNCTIONS
}
#--- Dumps the class list with usernames,list of sections,
#--- section, ids and fullnames for each user.
sub getclasslist {
my ($getsec,$filterlist) = @_;
+ $getsec = $getsec eq '' ? 'all' : $getsec;
my $classlist=&Apache::loncoursedata::get_classlist();
# Bail out if we were unable to get the classlist
return if (! defined($classlist));
#
my %sections;
my %fullnames;
- foreach (keys(%$classlist)) {
- # the following undefs are for 'domain', and 'username' respectively.
- my (undef,undef,$end,$start,$id,$section,$fullname,$status)=
- @{$classlist->{$_}};
+ foreach my $student (keys(%$classlist)) {
+ my $end =
+ $classlist->{$student}->[&Apache::loncoursedata::CL_END()];
+ my $start =
+ $classlist->{$student}->[&Apache::loncoursedata::CL_START()];
+ my $id =
+ $classlist->{$student}->[&Apache::loncoursedata::CL_ID()];
+ my $section =
+ $classlist->{$student}->[&Apache::loncoursedata::CL_SECTION()];
+ my $fullname =
+ $classlist->{$student}->[&Apache::loncoursedata::CL_FULLNAME()];
+ my $status =
+ $classlist->{$student}->[&Apache::loncoursedata::CL_STATUS()];
# filter students according to status selected
if ($filterlist && $ENV{'form.Status'} ne 'Any') {
if ($ENV{'form.Status'} ne $status) {
- delete ($classlist->{$_});
+ delete ($classlist->{$student});
next;
}
}
- $section = ($section ne '' ? $section : 'no');
+ $section = ($section ne '' ? $section : 'none');
if (&canview($section)) {
if ($getsec eq 'all' || $getsec eq $section) {
$sections{$section}++;
- $fullnames{$_}=$fullname;
+ $fullnames{$student}=$fullname;
} else {
- delete($classlist->{$_});
+ delete($classlist->{$student});
}
} else {
- delete($classlist->{$_});
+ delete($classlist->{$student});
}
}
my %seen = ();
@@ -199,7 +418,7 @@ sub student_gradeStatus {
my %record = &Apache::lonnet::restore($symb,$ENV{'request.course.id'},$udom,$uname);
my %partstatus = ();
foreach (@$partlist) {
- my ($status,$foo) = split(/_/,$record{"resource.$_.solved"},2);
+ my ($status,undef) = split(/_/,$record{"resource.$_.solved"},2);
$status = 'nothing' if ($status eq '');
$partstatus{$_} = $status;
my $subkey = "resource.$_.submitted_by";
@@ -225,6 +444,7 @@ sub jscriptNform {
'<input type="hidden" name="url" value="'.$url.'" />'."\n".
'<input type="hidden" name="saveState" value="'.$ENV{'form.saveState'}.'" />'."\n".
'<input type="hidden" name="probTitle" value="'.$ENV{'form.probTitle'}.'" />'."\n".
+ '<input type="hidden" name="Status" value="'.$ENV{'form.Status'}.'" />'."\n".
'<input type="hidden" name="command" value="submission" />'."\n".
'<input type="hidden" name="student" value="" />'."\n".
'<input type="hidden" name="userdom" value="" />'."\n".
@@ -286,7 +506,7 @@ sub verifyreceipt {
my $request = shift;
my $courseid = $ENV{'request.course.id'};
- my $receipt = unpack("%32C*",$Apache::lonnet::perlvar{'lonHostID'}).'-'.
+ my $receipt = &Apache::lonnet::recprefix($courseid).'-'.
$ENV{'form.receipt'};
$receipt =~ s/[^\-\d]//g;
my $url = $ENV{'form.url'};
@@ -297,22 +517,31 @@ sub verifyreceipt {
my $title.='<h3><font color="#339933">Verifying Submission Receipt '.
$receipt.'</h3></font>'."\n".
- '<font size=+1><b>Problem: </b>'.$ENV{'form.probTitle'}.'</font><br><br>'."\n";
+ '<font size=+1><b>Resource: </b>'.$ENV{'form.probTitle'}.'</font><br><br>'."\n";
my ($string,$contents,$matches) = ('','',0);
my (undef,undef,$fullname) = &getclasslist('all','0');
-
+
+ my $receiptparts=0;
+ if ($ENV{"course.$courseid.receiptalg"} eq 'receipt2') { $receiptparts=1; }
+ my $parts=['0'];
+ if ($receiptparts) { ($parts)=&response_type($url,$symb); }
foreach (sort {lc($$fullname{$a}) cmp lc($$fullname{$b}) } keys %$fullname) {
my ($uname,$udom)=split(/\:/);
- if ($receipt eq
- &Apache::lonnet::ireceipt($uname,$udom,$courseid,$symb)) {
- $contents.='<tr bgcolor="#ffffe6"><td> '."\n".
- '<a href="javascript:viewOneStudent(\''.$uname.'\',\''.$udom.
- '\')"; TARGET=_self>'.$$fullname{$_}.'</a> </td>'."\n".
- '<td> '.$uname.' </td>'.
- '<td> '.$udom.' </td></tr>'."\n";
-
- $matches++;
+ foreach my $part (@$parts) {
+ if ($receipt eq &Apache::lonnet::ireceipt($uname,$udom,$courseid,$symb,$part)) {
+ $contents.='<tr bgcolor="#ffffe6"><td> '."\n".
+ '<a href="javascript:viewOneStudent(\''.$uname.'\',\''.$udom.
+ '\')"; TARGET=_self>'.$$fullname{$_}.'</a> </td>'."\n".
+ '<td> '.$uname.' </td>'.
+ '<td> '.$udom.' </td>';
+ if ($receiptparts) {
+ $contents.='<td> '.$part.' </td>';
+ }
+ $contents.='</tr>'."\n";
+
+ $matches++;
+ }
}
}
if ($matches == 0) {
@@ -325,8 +554,11 @@ sub verifyreceipt {
'<table border="0"><tr bgcolor="#e6ffff">'."\n".
'<td><b> Fullname </b></td>'."\n".
'<td><b> Username </b></td>'."\n".
- '<td><b> Domain </b></td></tr>'."\n".
- $contents.
+ '<td><b> Domain </b></td>';
+ if ($receiptparts) {
+ $string.='<td> Problem Part </td>';
+ }
+ $string.='</tr>'."\n".$contents.
'</table></td></tr></table>'."\n";
}
return $string.&show_grading_menu_form($symb,$url);
@@ -345,26 +577,14 @@ sub listStudents {
my $getsec = $ENV{'form.section'} eq '' ? 'all' : $ENV{'form.section'};
my $submitonly= $ENV{'form.submitonly'} eq '' ? 'all' : $ENV{'form.submitonly'};
- my $result;
- my ($partlist,$handgrade) = &response_type($url);
- for (sort keys(%$handgrade)) {
- my ($responsetype,$handgrade)=split(/:/,$$handgrade{$_});
- $ENV{'form.handgrade'} = 'yes' if ($handgrade eq 'yes');
- $result.='<tr><td><b>Part </b>'.(split(/_/))[0].'</td>'.
- '<td><b>Type: </b>'.$responsetype.'</td>'.
- '<td><b>Handgrade: </b>'.$handgrade.'</font></td></tr>';
- }
- $result.='</table>'."\n";
-
- my $viewgrade = $ENV{'form.handgrade'} eq 'yes' ? 'View/Grade' : 'View';
+ my $viewgrade = $ENV{'form.showgrading'} eq 'yes' ? 'View/Grade/Regrade' : 'View';
$ENV{'form.probTitle'} = $ENV{'form.probTitle'} eq '' ?
&Apache::lonnet::gettitle($symb) : $ENV{'form.probTitle'};
- $result='<h3><font color="#339933"> '.
- $viewgrade.
- ' Submissions for a Student or a Group of Students</font></h3>'.
- '<table border="0"><tr><td colspan=3><font size=+1>'.
- '<b>Problem: </b>'.$ENV{'form.probTitle'}.'</font></td></tr>'.$result;
+ my $result='<h3><font color="#339933"> '.$viewgrade.
+ ' Submissions for a Student or a Group of Students</font></h3>';
+
+ my ($table,undef,$hdgrade,$partlist,$handgrade) = &showResourceInfo($url,$ENV{'form.probTitle'},($ENV{'form.showgrading'} eq 'yes'));
$request->print(<<LISTJAVASCRIPT);
<script type="text/javascript" language="javascript">
@@ -385,7 +605,7 @@ sub listStudents {
sense = "the student";
}
if (ctr == 0) {
- alert("Please select "+sense+" before clicking on the $viewgrade button.");
+ alert("Please select "+sense+" before clicking on the Next button.");
return false;
}
document.gradesub.submit();
@@ -396,45 +616,36 @@ sub listStudents {
formname.command.value = 'submission';
formname.submit();
}
-
- function pullDownSelection(selectOne) {
- var selection="";
- if (selectOne.length > 1) {
- for (var i=0; i<selectOne.length; i++) {
- if (selectOne[i].selected) {
- return selectOne[i].value;
- }
- }
- } else {
- if (selectOne.selected) return selectOne.value;
- }
- }
</script>
LISTJAVASCRIPT
+ &commonJSfunctions($request);
$request->print($result);
- my $checkhdgrade = $ENV{'form.handgrade'} eq 'yes' ? 'checked' : '';
- my $checklastsub = $ENV{'form.handgrade'} eq 'yes' ? '' : 'checked';
-
- my $gradeTable='<form action="/adm/grades" method="post" name="gradesub">'."\n".
- ' <b>View Problem: </b><input type="radio" name="vProb" value="no" checked /> no '."\n".
+ my $checkhdgrade = ($ENV{'form.handgrade'} eq 'yes' && scalar(@$partlist) > 1 ) ? 'checked' : '';
+ my $checklastsub = $checkhdgrade eq '' ? 'checked' : '';
+ my $gradeTable='<form action="/adm/grades" method="post" name="gradesub">'.
+ "\n".$table.
+ ' <b>View Problem Text: </b><input type="radio" name="vProb" value="no" checked="on" /> no '."\n".
'<input type="radio" name="vProb" value="yes" /> one student '."\n".
'<input type="radio" name="vProb" value="all" /> all students <br />'."\n".
+ ' <b>View Answer: </b><input type="radio" name="vAns" value="no" /> no '."\n".
+ '<input type="radio" name="vAns" value="yes" /> one student '."\n".
+ '<input type="radio" name="vAns" value="all" checked="on" /> all students <br />'."\n".
' <b>Submissions: </b>'."\n";
- if ($ENV{'form.handgrade'} eq 'yes') {
- $gradeTable.='<input type="radio" name="lastSub" value="hdgrade" '.$checkhdgrade.' /> handgrade only'."\n";
+ if ($ENV{'form.handgrade'} eq 'yes' && scalar(@$partlist) > 1) {
+ $gradeTable.='<input type="radio" name="lastSub" value="hdgrade" '.$checkhdgrade.' /> essay part only'."\n";
}
my $saveStatus = $ENV{'form.Status'} eq '' ? 'Active' : $ENV{'form.Status'};
$ENV{'form.Status'} = $saveStatus;
- $gradeTable.='<input type="radio" name="lastSub" value="lastonly" '.$checklastsub.' /> last sub only'."\n".
- '<input type="radio" name="lastSub" value="last" /> last sub & parts info'."\n".
+ $gradeTable.='<input type="radio" name="lastSub" value="lastonly" '.$checklastsub.' /> last submission only'."\n".
+ '<input type="radio" name="lastSub" value="last" /> last submission & parts info'."\n".
+ '<input type="radio" name="lastSub" value="datesub" /> by dates and submissions'."\n".
'<input type="radio" name="lastSub" value="all" /> all details'."\n".
'<input type="hidden" name="section" value="'.$getsec.'" />'."\n".
'<input type="hidden" name="submitonly" value="'.$submitonly.'" />'."\n".
- '<input type="hidden" name="response" value="'.$ENV{'form.response'}.'" />'."\n".
'<input type="hidden" name="handgrade" value="'.$ENV{'form.handgrade'}.'" /><br />'."\n".
'<input type="hidden" name="showgrading" value="'.$ENV{'form.showgrading'}.'" /><br />'."\n".
'<input type="hidden" name="saveState" value="'.$ENV{'form.saveState'}.'" />'."\n".
@@ -443,30 +654,36 @@ LISTJAVASCRIPT
'<input type="hidden" name="symb" value="'.$symb.'" />'."\n".
'<input type="hidden" name="saveStatusOld" value="'.$saveStatus.'" />'."\n";
- $gradeTable.='<b>Student Status:</b> '.
- &Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,1,'javascript:reLoadList(this.form);').'<br />';
+ if (exists($ENV{'form.gradingMenu'}) && exists($ENV{'form.Status'})) {
+ $gradeTable.='<input type="hidden" name="Status" value="'.$ENV{'form.Status'}.'" />'."\n";
+ } else {
+ $gradeTable.='<b>Student Status:</b> '.
+ &Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,1,'javascript:reLoadList(this.form);').'<br />';
+ }
- $gradeTable.='To '.lc($viewgrade).' a submission, click on the check box next to the student\'s name. Then '."\n".
- 'click on the '.$viewgrade.' button. To view the submissions for a group of students, click'."\n".
- ' on the check boxes for the group of students.<br />'."\n".
+ $gradeTable.='To '.lc($viewgrade).' a submission or a group of submissions, click on the check box(es) '.
+ 'next to the student\'s name(s). Then click on the Next button.<br />'."\n".
'<input type="hidden" name="command" value="processGroup" />'."\n";
$gradeTable.='<input type="button" '."\n".
'onClick="javascript:checkSelect(this.form.stuinfo);" '."\n".
- 'value="'.$viewgrade.'" />'."\n";
-
+ 'value="Next->" />'."\n";
+ $gradeTable.='<input type="checkbox" name="checkPlag" checked="on">Check For Plagiarism</input>';
my (undef, undef, $fullname) = &getclasslist($getsec,'1');
$gradeTable.='<table border="0"><tr><td bgcolor="#777777">'.
'<table border="0"><tr bgcolor="#e6ffff">';
my $loop = 0;
while ($loop < 2) {
- $gradeTable.='<td><b> Select </b></td><td><b> Fullname </b>'.
- '<font color="#999999">(Username)</font> </td>';
+ $gradeTable.='<td><b> No.</b> </td><td><b> Select </b></td>'.
+ '<td>'.&nameUserString('header').'</td>';
if ($ENV{'form.showgrading'} eq 'yes' && $submitonly ne 'all') {
foreach (sort(@$partlist)) {
- $gradeTable.='<td><b> Part '.(split(/_/))[0].' Status </b></td>';
+ my $display_part=&get_display_part((split(/_/))[0],$url,$symb);
+ $gradeTable.='<td><b> Part: '.$display_part.
+ ' Status </b></td>';
}
}
$loop++;
+# $gradeTable.='<td></td>' if ($loop%2 ==1);
}
$gradeTable.='</tr>'."\n";
@@ -476,27 +693,35 @@ LISTJAVASCRIPT
my %status = ();
if ($ENV{'form.showgrading'} eq 'yes' && $submitonly ne 'all') {
(%status) =&student_gradeStatus($url,$symb,$udom,$uname,$partlist);
- my $statusflg = '';
+ my $submitted = 0;
+ my $graded = 0;
foreach (keys(%status)) {
- $statusflg = 1 if ($status{$_} ne 'nothing');
+ $submitted = 1 if ($status{$_} ne 'nothing');
+ $graded = 1 if ($status{$_} !~ /^correct/);
+
my ($foo,$partid,$foo1) = split(/\./,$_);
if ($status{'resource.'.$partid.'.submitted_by'} ne '') {
- $statusflg = '';
+ $submitted = 0;
+ my ($part)=split(/\./,$partid);
$gradeTable.='<input type="hidden" name="'.
- $student.':submitted_by" value="'.
+ $student.':'.$part.':submitted_by" value="'.
$status{'resource.'.$partid.'.submitted_by'}.'" />';
}
}
- next if ($statusflg eq '' && $submitonly eq 'yes');
+ next if (!$submitted && ($submitonly eq 'yes' ||
+ $submitonly eq 'incorrect' ||
+ $submitonly eq 'graded'));
+ next if (!$graded && ($submitonly eq 'graded' ||
+ $submitonly eq 'incorrect'));
}
$ctr++;
if ( $perm{'vgr'} eq 'F' ) {
$gradeTable.='<tr bgcolor="#ffffe6">' if ($ctr%2 ==1);
- $gradeTable.='<td align="center"><input type=checkbox name="stuinfo" value="'.
+ $gradeTable.='<td align="right">'.$ctr.' </td>'.
+ '<td align="center"><input type=checkbox name="stuinfo" value="'.
$student.':'.$$fullname{$student}.' "></td>'."\n".
- '<td> '.$$fullname{$student}.' '."\n".
- '<font color="#999999">('.$uname.')</font></td>'."\n";
+ '<td>'.&nameUserString(undef,$$fullname{$student},$uname,$udom).'</td>'."\n";
if ($ENV{'form.showgrading'} eq 'yes' && $submitonly ne 'all') {
foreach (sort keys(%status)) {
@@ -504,11 +729,12 @@ LISTJAVASCRIPT
$gradeTable.='<td align="middle"> '.$status{$_}.' </td>'."\n";
}
}
+# $gradeTable.='<td></td>' if ($ctr%2 ==1);
$gradeTable.='</tr>'."\n" if ($ctr%2 ==0);
}
}
if ($ctr%2 ==1) {
- $gradeTable.='<td> </td><td> </td>';
+ $gradeTable.='<td> </td><td> </td><td> </td>';
if ($ENV{'form.showgrading'} eq 'yes' && $submitonly ne 'all') {
foreach (@$partlist) {
$gradeTable.='<td> </td>';
@@ -520,15 +746,18 @@ LISTJAVASCRIPT
$gradeTable.='</table></td></tr></table>'.
'<input type="button" '.
'onClick="javascript:checkSelect(this.form.stuinfo);" '.
- 'value="'.$viewgrade.'" /></form>'."\n";
+ 'value="Next->" /></form>'."\n";
if ($ctr == 0) {
my $num_students=(scalar(keys(%$fullname)));
if ($num_students eq 0) {
$gradeTable='<br /> <font color="red">There are no students currently enrolled.</font>';
} else {
+ my $submissions='submissions';
+ if ($submitonly eq 'incorrect') { $submissions = 'incorrect submissions'; }
+ if ($submitonly eq 'graded' ) { $submissions = 'ungraded submissions'; }
$gradeTable='<br /> <font color="red">'.
- 'No submissions found for this resource for any students. ('.$num_students.
- ' checked for submissions</font><br />';
+ 'No '.$submissions.' found for this resource for any students. ('.$num_students.
+ ' students checked for '.$submissions.')</font><br />';
}
} elsif ($ctr == 1) {
$gradeTable =~ s/type=checkbox/type=checkbox checked/;
@@ -543,8 +772,7 @@ LISTJAVASCRIPT
sub processGroup {
my ($request) = shift;
my $ctr = 0;
- my @stuchecked = (ref($ENV{'form.stuinfo'}) ? @{$ENV{'form.stuinfo'}}
- : ($ENV{'form.stuinfo'}));
+ my @stuchecked = &Apache::loncommon::get_env_multiple('form.stuinfo');
my $total = scalar(@stuchecked)-1;
foreach (@stuchecked) {
@@ -569,9 +797,9 @@ sub sub_page_js {
$request->print(<<SUBJAVASCRIPT);
<script type="text/javascript" language="javascript">
function updateRadio(formname,id,weight) {
- var gradeBox = eval("formname.GD_BOX"+id);
- var radioButton = eval("formname.RADVAL"+id);
- var oldpts = eval("formname.oldpts"+id+".value");
+ var gradeBox = formname["GD_BOX"+id];
+ var radioButton = formname["RADVAL"+id];
+ var oldpts = formname["oldpts"+id].value;
var pts = checkSolved(formname,id) == 'update' ? gradeBox.value : oldpts;
gradeBox.value = pts;
var resetbox = false;
@@ -593,7 +821,7 @@ sub sub_page_js {
var resp = confirm("You entered a value ("+pts+
") greater than the weight for the part. Accept?");
if (resp == false) {
- gradeBox.value = "";
+ gradeBox.value = oldpts;
return;
}
}
@@ -605,18 +833,17 @@ sub sub_page_js {
}
}
updateSelect(formname,id);
- var stores = eval("formname.stores"+id);
- stores.value = "0";
+ formname["stores"+id].value = "0";
}
function writeBox(formname,id,pts) {
- var gradeBox = eval("formname.GD_BOX"+id);
+ var gradeBox = formname["GD_BOX"+id];
if (checkSolved(formname,id) == 'update') {
gradeBox.value = pts;
} else {
- var oldpts = eval("formname.oldpts"+id+".value");
+ var oldpts = formname["oldpts"+id].value;
gradeBox.value = oldpts;
- var radioButton = eval("formname.RADVAL"+id);
+ var radioButton = formname["RADVAL"+id];
for (var i=0; i<radioButton.length; i++) {
radioButton[i].checked=false;
if (i == oldpts) {
@@ -624,8 +851,7 @@ sub sub_page_js {
}
}
}
- var stores = eval("formname.stores"+id);
- stores.value = "0";
+ formname["stores"+id].value = "0";
updateSelect(formname,id);
return;
}
@@ -635,17 +861,17 @@ sub sub_page_js {
updateSelect(formname,id);
return;
}
- gradeSelect = eval("formname.GD_SEL"+id);
+ gradeSelect = formname["GD_SEL"+id];
for (var i=0; i<gradeSelect.length; i++) {
if (gradeSelect[i].selected) {
var selectx=i;
}
}
- var stores = eval("formname.stores"+id);
+ var stores = formname["stores"+id];
if (selectx == stores.value) { return };
- var gradeBox = eval("formname.GD_BOX"+id);
+ var gradeBox = formname["GD_BOX"+id];
gradeBox.value = "";
- var radioButton = eval("formname.RADVAL"+id);
+ var radioButton = formname["RADVAL"+id];
for (var i=0; i<radioButton.length; i++) {
radioButton[i].checked=false;
}
@@ -653,34 +879,35 @@ sub sub_page_js {
}
function checkSolved(formname,id) {
- if (eval("formname.solved"+id+".value") == "correct_by_student") {
- alert("This problem has been graded correct by the computer. The score cannot be changed.");
- return "noupdate";
+ if (formname["solved"+id].value == "correct_by_student" && formname.overRideScore.value == 'no') {
+ var reply = confirm("This problem has been graded correct by the computer. Do you want to change the score?");
+ if (!reply) {return "noupdate";}
+ formname.overRideScore.value = 'yes';
}
return "update";
}
function updateSelect(formname,id) {
- var gradeSelect = eval("formname.GD_SEL"+id);
- gradeSelect[0].selected = true;
+ formname["GD_SEL"+id][0].selected = true;
return;
}
-//=========== Check that a point is assigned for all the parts (essay grading only) ============
+//=========== Check that a point is assigned for all the parts ============
function checksubmit(formname,val,total,parttot) {
- document.SCORE.gradeOpt.value = val;
+ formname.gradeOpt.value = val;
if (val == "Save & Next") {
for (i=0;i<=total;i++) {
for (j=0;j<parttot;j++) {
- var partid = eval("formname.partid"+i+"_"+j+".value");
- var selopt = eval("formname.GD_SEL"+i+"_"+partid);
- if (selopt[0].selected) {
- var points = eval("formname.GD_BOX"+i+"_"+partid+".value");
+ var partid = formname["partid"+i+"_"+j].value;
+ if (formname["GD_SEL"+i+"_"+partid][0].selected) {
+ var points = formname["GD_BOX"+i+"_"+partid].value;
if (points == "") {
- var name = eval("formname.name"+i+".value");
- var resp = confirm("You did not assign a score for "+name+", part "+partid+". Continue?");
+ var name = formname["name"+i].value;
+ var studentID = (name != '' ? name : formname["unamedom"+i].value);
+ var resp = confirm("You did not assign a score for "+studentID+
+ ", part "+partid+". Continue?");
if (resp == false) {
- eval("formname.GD_BOX"+i+"_"+partid+".focus()");
+ formname["GD_BOX"+i+"_"+partid].focus();
return false;
}
}
@@ -690,6 +917,13 @@ sub sub_page_js {
}
}
+ if (val == "Grade Student") {
+ formname.showgrading.value = "yes";
+ if (formname.Status.value == "") {
+ formname.Status.value = "Active";
+ }
+ formname.studentNo.value = total;
+ }
formname.submit();
}
@@ -698,11 +932,10 @@ sub sub_page_js {
noscore = new Array(100);
var ptr = 0;
for (i=1;i<total;i++) {
- var partid = eval("formname.q_"+i+".value");
- var selopt = eval("formname.GD_SEL"+i+"_"+partid);
- if (selopt[0].selected) {
- var points = eval("formname.GD_BOX"+i+"_"+partid+".value");
- var status = eval("formname.solved"+i+"_"+partid+".value");
+ var partid = formname["q_"+i].value;
+ if (formname["GD_SEL"+i+"_"+partid][0].selected) {
+ var points = formname["GD_BOX"+i+"_"+partid].value;
+ var status = formname["solved"+i+"_"+partid].value;
if (points == "" && status != "correct_by_student") {
noscore[ptr] = i;
ptr++;
@@ -738,18 +971,20 @@ SUBJAVASCRIPT
sub sub_page_kw_js {
my $request = shift;
my $iconpath = $request->dir_config('lonIconsURL');
+ &commonJSfunctions($request);
+ my $docopen=&Apache::lonhtmlcommon::javascript_docopen();
$request->print(<<SUBJAVASCRIPT);
<script type="text/javascript" language="javascript">
//===================== Show list of keywords ====================
- function keywords(keyform) {
- var nret = prompt("Keywords list, separated by a space. Add/delete to list if desired.",keyform.value);
+ function keywords(formname) {
+ var nret = prompt("Keywords list, separated by a space. Add/delete to list if desired.",formname.keywords.value);
if (nret==null) return;
- keyform.value = nret;
+ formname.keywords.value = nret;
- document.SCORE.refresh.value = "on";
- if (document.SCORE.keywords.value != "") {
- document.SCORE.submit();
+ if (formname.keywords.value != "") {
+ formname.refresh.value = "on";
+ formname.submit();
}
return;
}
@@ -775,10 +1010,9 @@ sub sub_page_kw_js {
}
var nret = prompt("Add selection to keyword list? Edit if desired.",cleantxt);
if (nret==null) return;
- var curlist = document.SCORE.keywords.value;
- document.SCORE.keywords.value = curlist+" "+nret;
- document.SCORE.refresh.value = "on";
+ document.SCORE.keywords.value = document.SCORE.keywords.value+" "+nret;
if (document.SCORE.keywords.value != "") {
+ document.SCORE.refresh.value = "on";
document.SCORE.submit();
}
return;
@@ -795,21 +1029,23 @@ sub sub_page_kw_js {
var Nmsg = msgform.savemsgN.value;
savedMsgHeader(Nmsg,usrctr,fullname);
var subject = msgform.msgsub.value;
- var rtrchk = eval("document.SCORE.includemsg"+usrctr);
- var msgchk = rtrchk.value;
+ var msgchk = document.SCORE["includemsg"+usrctr].value;
re = /msgsub/;
var shwsel = "";
if (re.test(msgchk)) { shwsel = "checked" }
- displaySubject(subject,shwsel);
+ subject = (document.SCORE.shownSub.value == 0 ? checkEntities(subject) : subject);
+ displaySubject(checkEntities(subject),shwsel);
for (var i=1; i<=Nmsg; i++) {
- var testpt = "savemsg"+i+",";
- re = /testpt/;
+ var testmsg = "savemsg"+i+",";
+ re = new RegExp(testmsg,"g");
shwsel = "";
if (re.test(msgchk)) { shwsel = "checked" }
- var message = eval("document.SCORE.savemsg"+i+".value");
- displaySavedMsg(i,message,shwsel);
+ var message = document.SCORE["savemsg"+i].value;
+ message = (document.SCORE["shownOnce"+i].value == 0 ? checkEntities(message) : message);
+ displaySavedMsg(i,message,shwsel); //I do not get it. w/o checkEntities on saved messages,
+ //any < is already converted to <, etc. However, only once!!
}
- newmsg = eval("document.SCORE.newmsg"+usrctr+".value");
+ newmsg = document.SCORE["newmsg"+usrctr].value;
shwsel = "";
re = /newmsg/;
if (re.test(msgchk)) { shwsel = "checked" }
@@ -818,7 +1054,22 @@ sub sub_page_kw_js {
return;
}
-// var pWin = null;
+ function checkEntities(strx) {
+ if (strx.length == 0) return strx;
+ var orgStr = ["&", "<", ">", '"'];
+ var newStr = ["&", "<", ">", """];
+ var counter = 0;
+ while (counter < 4) {
+ strx = strReplace(strx,orgStr[counter],newStr[counter]);
+ counter++;
+ }
+ return strx;
+ }
+
+ function strReplace(strx, orgStr, newStr) {
+ return strx.split(orgStr).join(newStr);
+ }
+
function savedMsgHeader(Nmsg,usrctr,fullname) {
var height = 70*Nmsg+250;
var scrollbar = "no";
@@ -826,20 +1077,25 @@ sub sub_page_kw_js {
height = 600;
scrollbar = "yes";
}
-// if (window.pWin) {window.pWin.close(); window.pWin=null}
- pWin = window.open('', 'MessageCenter', 'toolbar=no,location=no,scrollbars='+scrollbar+',screenx=70,screeny=75,width=600,height='+height);
+ var xpos = (screen.width-600)/2;
+ xpos = (xpos < 0) ? '0' : xpos;
+ var ypos = (screen.height-height)/2-30;
+ ypos = (ypos < 0) ? '0' : ypos;
+
+ pWin = window.open('', 'MessageCenter', 'resizable=yes,toolbar=no,location=no,scrollbars='+scrollbar+',screenx='+xpos+',screeny='+ypos+',width=600,height='+height);
pWin.focus();
pDoc = pWin.document;
+ pDoc.$docopen;
pDoc.write("<html><head>");
pDoc.write("<title>Message Central</title>");
pDoc.write("<script language=javascript>");
pDoc.write("function checkInput() {");
- pDoc.write(" opener.document.SCORE.msgsub.value = document.msgcenter.msgsub.value;");
+ pDoc.write(" opener.document.SCORE.msgsub.value = opener.checkEntities(document.msgcenter.msgsub.value);");
pDoc.write(" var nmsg = opener.document.SCORE.savemsgN.value;");
pDoc.write(" var usrctr = document.msgcenter.usrctr.value;");
- pDoc.write(" var newval = eval(\\"opener.document.SCORE.newmsg\\"+usrctr);");
- pDoc.write(" newval.value = document.msgcenter.newmsg.value;");
+ pDoc.write(" var newval = opener.document.SCORE[\\"newmsg\\"+usrctr];");
+ pDoc.write(" newval.value = opener.checkEntities(document.msgcenter.newmsg.value);");
pDoc.write(" var msgchk = \\"\\";");
pDoc.write(" if (document.msgcenter.subchk.checked) {");
@@ -847,10 +1103,12 @@ sub sub_page_kw_js {
pDoc.write(" }");
pDoc.write(" var includemsg = 0;");
pDoc.write(" for (var i=1; i<=nmsg; i++) {");
- pDoc.write(" var opnmsg = eval(\\"opener.document.SCORE.savemsg\\"+i);");
- pDoc.write(" var frmmsg = eval(\\"document.msgcenter.msg\\"+i);");
- pDoc.write(" opnmsg.value = frmmsg.value;");
- pDoc.write(" var chkbox = eval(\\"document.msgcenter.msgn\\"+i);");
+ pDoc.write(" var opnmsg = opener.document.SCORE[\\"savemsg\\"+i];");
+ pDoc.write(" var frmmsg = document.msgcenter[\\"msg\\"+i];");
+ pDoc.write(" opnmsg.value = opener.checkEntities(frmmsg.value);");
+ pDoc.write(" var showflg = opener.document.SCORE[\\"shownOnce\\"+i];");
+ pDoc.write(" showflg.value = \\"1\\";");
+ pDoc.write(" var chkbox = document.msgcenter[\\"msgn\\"+i];");
pDoc.write(" if (chkbox.checked) {");
pDoc.write(" msgchk += \\"savemsg\\"+i+\\",\\";");
pDoc.write(" includemsg = 1;");
@@ -860,9 +1118,9 @@ sub sub_page_kw_js {
pDoc.write(" msgchk += \\"newmsg\\"+usrctr;");
pDoc.write(" includemsg = 1;");
pDoc.write(" }");
- pDoc.write(" imgformname = eval(\\"opener.document.SCORE.mailicon\\"+usrctr);");
+ pDoc.write(" imgformname = opener.document.SCORE[\\"mailicon\\"+usrctr];");
pDoc.write(" imgformname.src = \\"$iconpath/\\"+((includemsg) ? \\"mailto.gif\\" : \\"mailbkgrd.gif\\");");
- pDoc.write(" var includemsg = eval(\\"opener.document.SCORE.includemsg\\"+usrctr);");
+ pDoc.write(" var includemsg = opener.document.SCORE[\\"includemsg\\"+usrctr];");
pDoc.write(" includemsg.value = msgchk;");
pDoc.write(" self.close()");
@@ -914,6 +1172,7 @@ sub sub_page_kw_js {
pDoc.write("<input type=\\"button\\" value=\\"Cancel\\" onClick=\\"self.close()\\"><br><br>");
pDoc.write("</form>");
pDoc.write("</body></html>");
+ pDoc.close();
}
//====================== Script for keyword highlight options ==============
@@ -947,20 +1206,25 @@ sub sub_page_kw_js {
return;
}
-// var hwdWin = null;
function highlightCentral() {
// if (window.hwdWin) window.hwdWin.close();
- hwdWin = window.open('', 'KeywordHighlightCentral', 'toolbar=no,location=no,scrollbars=no,width=400,height=300,screenx=100,screeny=75');
+ var xpos = (screen.width-400)/2;
+ xpos = (xpos < 0) ? '0' : xpos;
+ var ypos = (screen.height-330)/2-30;
+ ypos = (ypos < 0) ? '0' : ypos;
+
+ hwdWin = window.open('', 'KeywordHighlightCentral', 'resizeable=yes,toolbar=no,location=no,scrollbars=no,width=400,height=300,screenx='+xpos+',screeny='+ypos);
hwdWin.focus();
var hDoc = hwdWin.document;
+ hDoc.$docopen;
hDoc.write("<html><head>");
hDoc.write("<title>Highlight Central</title>");
hDoc.write("<script language=javascript>");
hDoc.write("function updateChoice(flag) {");
- hDoc.write(" opener.document.SCORE.kwclr.value = radioSelection(document.hlCenter.kwdclr);");
- hDoc.write(" opener.document.SCORE.kwsize.value = radioSelection(document.hlCenter.kwdsize);");
- hDoc.write(" opener.document.SCORE.kwstyle.value = radioSelection(document.hlCenter.kwdstyle);");
+ hDoc.write(" opener.document.SCORE.kwclr.value = opener.radioSelection(document.hlCenter.kwdclr);");
+ hDoc.write(" opener.document.SCORE.kwsize.value = opener.radioSelection(document.hlCenter.kwdsize);");
+ hDoc.write(" opener.document.SCORE.kwstyle.value = opener.radioSelection(document.hlCenter.kwdstyle);");
hDoc.write(" opener.document.SCORE.refresh.value = \\"on\\";");
hDoc.write(" if (opener.document.SCORE.keywords.value!=\\"\\"){");
hDoc.write(" opener.document.SCORE.submit();");
@@ -968,16 +1232,6 @@ sub sub_page_kw_js {
hDoc.write(" self.close()");
hDoc.write("}");
- hDoc.write("function radioSelection(radioButton) {");
- hDoc.write(" var selection=null;");
- hDoc.write(" for (var i=0; i<radioButton.length; i++) {");
- hDoc.write(" if (radioButton[i].checked) {");
- hDoc.write(" selection=radioButton[i].value;");
- hDoc.write(" return selection;");
- hDoc.write(" }");
- hDoc.write(" }");
- hDoc.write("}");
-
hDoc.write("<");
hDoc.write("/script>");
@@ -1011,6 +1265,7 @@ sub sub_page_kw_js {
hDoc.write("<input type=\\"button\\" value=\\"Cancel\\" onClick=\\"self.close()\\"><br><br>");
hDoc.write("</form>");
hDoc.write("</body></html>");
+ hDoc.close();
}
</script>
@@ -1032,16 +1287,17 @@ sub gradeBox {
'' : $$record{'resource.'.$partid.'.awarded'}*$wgt);
my $result='<input type="hidden" name="WGT'.$counter.'_'.$partid.'" value="'.$wgt.'" />'."\n";
+ my $display_part=&get_display_part($partid,undef,$symb);
$result.='<table border="0"><tr><td>'.
- '<b>Part </b>'.$partid.' <b>Points: </b></td><td>'."\n";
+ '<b>Part: </b>'.$display_part.' <b>Points: </b></td><td>'."\n";
my $ctr = 0;
$result.='<table border="0"><tr>'."\n"; # display radio buttons in a nice table 10 across
while ($ctr<=$wgt) {
- $result.= '<td><input type="radio" name="RADVAL'.$counter.'_'.$partid.'" '.
+ $result.= '<td><nobr><input type="radio" name="RADVAL'.$counter.'_'.$partid.'" '.
'onclick="javascript:writeBox(this.form,\''.$counter.'_'.$partid.'\','.
$ctr.')" value="'.$ctr.'" '.
- ($score eq $ctr ? 'checked':'').' /> '.$ctr."</td>\n";
+ ($score eq $ctr ? 'checked':'').' /> '.$ctr."</nobr></td>\n";
$result.=(($ctr+1)%10 == 0 ? '</tr><tr>' : '');
$ctr++;
}
@@ -1060,11 +1316,12 @@ sub gradeBox {
'onChange="javascript:clearRadBox(this.form,\''.$counter.'_'.$partid.'\')" >'."\n";
if ($$record{'resource.'.$partid.'.solved'} eq 'excused') {
$result.='<option> </option>'.
- '<option selected="on">excused</option></select>'."\n";
+ '<option selected="on">excused</option>';
} else {
$result.='<option selected="on"> </option>'.
- '<option>excused</option></select>'."\n";
+ '<option>excused</option>';
}
+ $result.='<option>reset status</option></select>'."\n";
$result.="  \n";
$result.='<input type="hidden" name="stores'.$counter.'_'.$partid.'" value="" />'."\n".
'<input type="hidden" name="oldpts'.$counter.'_'.$partid.'" value="'.$score.'" />'."\n".
@@ -1075,27 +1332,46 @@ sub gradeBox {
}
sub show_problem {
- my ($request,$symb,$uname,$udom,$removeform,$viewon) = @_;
- my $rendered=&Apache::loncommon::get_student_view($symb,$uname,$udom,
- $ENV{'request.course.id'});
+ my ($request,$symb,$uname,$udom,$removeform,$viewon,$mode) = @_;
+ my $rendered;
+ if ($mode eq 'both' or $mode eq 'text') {
+ $rendered=&Apache::loncommon::get_student_view($symb,$uname,$udom,
+ $ENV{'request.course.id'});
+ }
if ($removeform) {
$rendered=~s|<form(.*?)>||g;
$rendered=~s|</form>||g;
$rendered=~s|name="submit"|name="would_have_been_submit"|g;
}
- my $companswer=&Apache::loncommon::get_student_answers($symb,$uname,$udom,
- $ENV{'request.course.id'});
+ my $companswer;
+ if ($mode eq 'both' or $mode eq 'answer') {
+ $companswer=&Apache::loncommon::get_student_answers($symb,$uname,$udom,
+ $ENV{'request.course.id'});
+ }
if ($removeform) {
$companswer=~s|<form(.*?)>||g;
$companswer=~s|</form>||g;
- $rendered=~s|name="submit"|name="would_have_been_submit"|g;
+ $companswer=~s|name="submit"|name="would_have_been_submit"|g;
}
my $result.='<table border="0" width="100%"><tr><td bgcolor="#777777">';
$result.='<table border="0" width="100%">';
- $result.='<tr><td bgcolor="#e6ffff"><b> View of the problem - '.$ENV{'form.fullname'}.
- '</b></td></tr>' if ($viewon);
- $result.='<tr><td bgcolor="#ffffff">'.$rendered.'<br />';
- $result.='<b>Correct answer:</b><br />'.$companswer;
+ if ($viewon) {
+ $result.='<tr><td bgcolor="#e6ffff"><b> ';
+ if ($mode eq 'both' or $mode eq 'text') {
+ $result.='View of the problem - ';
+ } else {
+ $result.='Correct answer: ';
+ }
+ $result.=$ENV{'form.fullname'}.'</b></td></tr>';
+ }
+ if ($mode eq 'both') {
+ $result.='<tr><td bgcolor="#ffffff">'.$rendered.'<br />';
+ $result.='<b>Correct answer:</b><br />'.$companswer;
+ } elsif ($mode eq 'text') {
+ $result.='<tr><td bgcolor="#ffffff">'.$rendered;
+ } elsif ($mode eq 'answer') {
+ $result.='<tr><td bgcolor="#ffffff">'.$companswer;
+ }
$result.='</td></tr></table>';
$result.='</td></tr></table><br />';
return $result;
@@ -1107,40 +1383,62 @@ sub submission {
(my $url=$ENV{'form.url'})=~s-^http://($ENV{'SERVER_NAME'}|$ENV{'HTTP_HOST'})--;
my ($uname,$udom) = ($ENV{'form.student'},$ENV{'form.userdom'});
+ $udom = ($udom eq '' ? $ENV{'user.domain'} : $udom); #has form.userdom changed for a student?
my $usec = &Apache::lonnet::getsection($udom,$uname,$ENV{'request.course.id'});
- $ENV{'form.fullname'} = &get_fullname ($uname,$udom) if $ENV{'form.fullname'} eq '';
+ $ENV{'form.fullname'} = &Apache::loncommon::plainname($uname,$udom,'lastname') if $ENV{'form.fullname'} eq '';
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 (!&canview($usec)) {
- $request->print('<font color="red">Unable to view requested student.('.$uname.$udom.$usec.$ENV{'request.course.id'}.')</font>');
+ $request->print('<font color="red">Unable to view requested student.('.
+ $uname.'@'.$udom.' in section '.$usec.' in course id '.
+ $ENV{'request.course.id'}.')</font>');
$request->print(&show_grading_menu_form($symb,$url));
return;
}
+ if (!$ENV{'form.lastSub'}) { $ENV{'form.lastSub'} = 'datesub'; }
+ if (!$ENV{'form.vProb'}) { $ENV{'form.vProb'} = 'yes'; }
+ if (!$ENV{'form.vAns'}) { $ENV{'form.vAns'} = 'yes'; }
my $last = ($ENV{'form.lastSub'} eq 'last' ? 'last' : '');
+ my $checkIcon = '<img src="'.$request->dir_config('lonIconsURL').
+ '/check.gif" height="16" border="0" />';
# header info
if ($counter == 0) {
&sub_page_js($request);
- &sub_page_kw_js($request);
+ &sub_page_kw_js($request) if ($ENV{'form.handgrade'} eq 'yes');
$ENV{'form.probTitle'} = $ENV{'form.probTitle'} eq '' ?
&Apache::lonnet::gettitle($symb) : $ENV{'form.probTitle'};
$request->print('<h3> <font color="#339933">Submission Record</font></h3>'."\n".
- '<font size=+1> <b>Problem: </b>'.$ENV{'form.probTitle'}.'</font>'."\n");
+ '<font size=+1> <b>Resource: </b>'.$ENV{'form.probTitle'}.'</font>'."\n");
+
+ if ($ENV{'form.handgrade'} eq 'no') {
+ my $checkMark='<br /><br /> <b>Note:</b> Part(s) graded correct by the computer is marked with a '.
+ $checkIcon.' symbol.'."\n";
+ $request->print($checkMark);
+ }
# 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' or !$ENV{'form.vProb'}) {
- $request->print(&show_problem($request,$symb,$uname,$udom,0,1));
+ if ($ENV{'form.vProb'} eq 'yes' or $ENV{'form.vAns'} eq 'yes') {
+ my $mode;
+ if ($ENV{'form.vProb'} eq 'yes' && $ENV{'form.vAns'} eq 'yes') {
+ $mode='both';
+ } elsif ($ENV{'form.vProb'} eq 'yes') {
+ $mode='text';
+ } elsif ($ENV{'form.vAns'} eq 'yes') {
+ $mode='answer';
+ }
+ $request->print(&show_problem($request,$symb,$uname,$udom,0,1,$mode));
}
# kwclr is the only variable that is guaranteed to be non blank
# if this subroutine has been called once.
my %keyhash = ();
- if ($ENV{'form.kwclr'} eq '') {
+ if ($ENV{'form.kwclr'} eq '' && $ENV{'form.handgrade'} eq 'yes') {
%keyhash = &Apache::lonnet::dump('nohist_handgrade',
$ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
$ENV{'course.'.$ENV{'request.course.id'}.'.num'});
@@ -1153,39 +1451,50 @@ sub submission {
$ENV{'form.msgsub'} = $keyhash{$symb.'_subject'} ne '' ?
$keyhash{$symb.'_subject'} : $ENV{'form.probTitle'};
$ENV{'form.savemsgN'} = $keyhash{$symb.'_savemsgN'} ne '' ? $keyhash{$symb.'_savemsgN'} : '0';
-
}
+ my $overRideScore = $ENV{'form.overRideScore'} eq '' ? 'no' : $ENV{'form.overRideScore'};
$request->print('<form action="/adm/grades" method="post" name="SCORE">'."\n".
'<input type="hidden" name="command" value="handgrade" />'."\n".
'<input type="hidden" name="saveState" value="'.$ENV{'form.saveState'}.'" />'."\n".
+ '<input type="hidden" name="Status" value="'.$ENV{'form.Status'}.'" />'."\n".
+ '<input type="hidden" name="overRideScore" value="'.$overRideScore.'" />'."\n".
'<input type="hidden" name="probTitle" value="'.$ENV{'form.probTitle'}.'" />'."\n".
'<input type="hidden" name="refresh" value="off" />'."\n".
+ '<input type="hidden" name="studentNo" value="" />'."\n".
+ '<input type="hidden" name="gradeOpt" value="" />'."\n".
'<input type="hidden" name="symb" value="'.$symb.'" />'."\n".
'<input type="hidden" name="url" value="'.$url.'" />'."\n".
'<input type="hidden" name="showgrading" value="'.$ENV{'form.showgrading'}.'" />'."\n".
'<input type="hidden" name="vProb" value="'.$ENV{'form.vProb'}.'" />'."\n".
+ '<input type="hidden" name="vAns" value="'.$ENV{'form.vAns'}.'" />'."\n".
'<input type="hidden" name="lastSub" value="'.$ENV{'form.lastSub'}.'" />'."\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="response" value="'.$ENV{'form.response'}.'">'."\n".
'<input type="hidden" name="handgrade" value="'.$ENV{'form.handgrade'}.'">'."\n".
- '<input type="hidden" name="keywords" value="'.$ENV{'form.keywords'}.'" />'."\n".
- '<input type="hidden" name="kwclr" value="'.$ENV{'form.kwclr'}.'" />'."\n".
- '<input type="hidden" name="kwsize" value="'.$ENV{'form.kwsize'}.'" />'."\n".
- '<input type="hidden" name="kwstyle" value="'.$ENV{'form.kwstyle'}.'" />'."\n".
- '<input type="hidden" name="msgsub" value="'.$ENV{'form.msgsub'}.'" />'."\n".
- '<input type="hidden" name="savemsgN" value="'.$ENV{'form.savemsgN'}.'" />'."\n".
'<input type="hidden" name="NCT"'.
' value="'.($ENV{'form.NTSTU'} ne '' ? $ENV{'form.NTSTU'} : $total+1).'" />'."\n");
+ if ($ENV{'form.handgrade'} eq 'yes') {
+ $request->print('<input type="hidden" name="keywords" value="'.$ENV{'form.keywords'}.'" />'."\n".
+ '<input type="hidden" name="kwclr" value="'.$ENV{'form.kwclr'}.'" />'."\n".
+ '<input type="hidden" name="kwsize" value="'.$ENV{'form.kwsize'}.'" />'."\n".
+ '<input type="hidden" name="kwstyle" value="'.$ENV{'form.kwstyle'}.'" />'."\n".
+ '<input type="hidden" name="msgsub" value="'.$ENV{'form.msgsub'}.'" />'."\n".
+ '<input type="hidden" name="shownSub" value="0" />'."\n".
+ '<input type="hidden" name="savemsgN" value="'.$ENV{'form.savemsgN'}.'" />'."\n");
+ foreach my $partid (&Apache::loncommon::get_env_multiple('form.vPart')) {
+ $request->print('<input type="hidden" name="vPart" value="'.$partid.'" />'."\n");
+ }
+ }
my ($cts,$prnmsg) = (1,'');
while ($cts <= $ENV{'form.savemsgN'}) {
$prnmsg.='<input type="hidden" name="savemsg'.$cts.'" value="'.
- ($keyhash{$symb.'_savemsg'.$cts} eq '' ?
+ (!exists($keyhash{$symb.'_savemsg'.$cts}) ?
&Apache::lonfeedback::clear_out_html($ENV{'form.savemsg'.$cts}) :
&Apache::lonfeedback::clear_out_html($keyhash{$symb.'_savemsg'.$cts})).
- '" />'."\n";
+ '" />'."\n".
+ '<input type="hidden" name="shownOnce'.$cts.'" value="0" />'."\n";
$cts++;
}
$request->print($prnmsg);
@@ -1196,7 +1505,7 @@ sub submission {
#
$request->print(<<KEYWORDS);
<b>Keyword Options:</b>
-<a href="javascript:keywords(document.SCORE.keywords)"; TARGET=_self>List</a>
+<a href="javascript:keywords(document.SCORE)"; TARGET=_self>List</a>
<a href="#" onMouseDown="javascript:getSel(); return false"
CLASS="page">Paste Selection to List</a>
<a href="javascript:kwhighlight()"; TARGET=_self>Highlight Attribute</a><br /><br />
@@ -1212,26 +1521,33 @@ KEYWORDS
}
}
- if ($ENV{'form.vProb'} eq 'all') {
+ if ($ENV{'form.vProb'} eq 'all' or $ENV{'form.vAns'} eq 'all') {
$request->print('<br /><br /><br />') if ($counter > 0);
- $request->print(&show_problem($request,$symb,$uname,$udom,1,1));
+ my $mode;
+ if ($ENV{'form.vProb'} eq 'all' && $ENV{'form.vAns'} eq 'all') {
+ $mode='both';
+ } elsif ($ENV{'form.vProb'} eq 'all' ) {
+ $mode='text';
+ } elsif ($ENV{'form.vAns'} eq 'all') {
+ $mode='answer';
+ }
+ $request->print(&show_problem($request,$symb,$uname,$udom,1,1,$mode));
}
my %record = &Apache::lonnet::restore($symb,$ENV{'request.course.id'},$udom,$uname);
- my ($partlist,$handgrade) = &response_type($url);
+
+ my ($partlist,$handgrade,$responseType) = &response_type($url,$symb);
# Display student info
$request->print(($counter == 0 ? '' : '<br />'));
my $result='<table border="0" width=100%><tr><td bgcolor="#777777">'."\n".
'<table border="0" width=100%><tr bgcolor="#edffff"><td>'."\n";
- $result.='<b>Fullname: </b>'.$ENV{'form.fullname'}.
- '<font color="#999999"> Username: '.$uname.'</font>'.
- '<font color="#999999"> Domain: '.$udom.'</font><br />'."\n";
+ $result.='<b>Fullname: </b>'.&nameUserString(undef,$ENV{'form.fullname'},$uname,$udom).'<br />'."\n";
$result.='<input type="hidden" name="name'.$counter.
'" value="'.$ENV{'form.fullname'}.'" />'."\n";
- # If this is handgraded, then check for collaborators
+ # If any part of the problem is an essay-response (handgraded), then check for collaborators
my @col_fullnames;
my ($classlist,$fullname);
if ($ENV{'form.handgrade'} eq 'yes') {
@@ -1267,8 +1583,10 @@ KEYWORDS
$result.=$$fullname{$_}.' ';
}
$result.='<br />'."\n";
+ my ($part)=split(/\./,$_);
$result.='<input type="hidden" name="collaborator'.$counter.
- '" value="'.(join ':',@goodcollaborators).'" />'."\n";
+ '" value="'.$part.':'.(join ':',@goodcollaborators).'" />'.
+ "\n";
}
if (scalar(@badcollaborators) > 0) {
$result.='<table border="0"><tr bgcolor="#ffbbbb"><td>';
@@ -1294,107 +1612,161 @@ KEYWORDS
# (3) Last submission plus the parts info
# (4) The whole record for this student
if ($ENV{'form.lastSub'} =~ /^(lastonly|hdgrade)$/) {
- if ($ENV{'form.'.$uname.':'.$udom.':submitted_by'}) {
- my $submitby=''.
- '<b>Collaborative submission by: </b>'.
- '<a href="javascript:viewSubmitter(\''.
- $ENV{'form.'.$uname.':'.$udom.':submitted_by'}.
- '\')"; TARGET=_self>'.
- $$fullname{$ENV{'form.'.$uname.':'.$udom.':submitted_by'}}.'</a>';
- $request->print($submitby);
- } else {
- my ($string,$timestamp)=
- &get_last_submission (%record);
- my $lastsubonly=''.
- ($$timestamp eq '' ? '' : '<b>Date Submitted:</b> '.
- $$timestamp).'';
- if ($$timestamp eq '') {
- $lastsubonly.='<tr><td bgcolor="#ffffe6">'.$$string[0].'</td></tr>'."\n";
- } else {
- for my $part (sort keys(%$handgrade)) {
- foreach (@$string) {
- my ($partid,$respid) = /^resource\.(\w+)\.(\w+)\.submission/;
- if ($part eq ($partid.'_'.$respid)) {
- my ($ressub,$subval) = split(/:/,$_,2);
-# Similarity check
- my $similar='';
- my ($oname,$odom,$ocrsid,$oessay,$osim)=&most_similar($uname,$udom,$subval);
- if ($osim) {
- $osim=int($osim*100.0);
- $similar='<hr /><h3><font color="#FF0000">Essay is '.$osim.'% similar to an essay by '.&Apache::loncommon::plainname($oname,$odom).
- '</font></h3><blockquote><i>'.
- &keywords_highlight($oessay).'</i></blockquote><hr />';
- }
- $lastsubonly.='<tr><td bgcolor="#ffffe6"><b>Part '.
- $partid.'</b> <font color="#999999">( ID '.$respid.
- ' )</font> '.
- ($record{"resource.$partid.$respid.uploadedurl"}?
- '<a href="'.
- &Apache::lonnet::tokenwrapper($record{"resource.$partid.$respid.uploadedurl"}).
- '"><img src="/adm/lonIcons/unknown.gif" border=0"> File uploaded by student</a> <font color="red" size="1">Like all files provided by users, this file may contain virusses</font><br />':'').
- '<b>Answer: </b><blockquote>'.
- &keywords_highlight($subval).'</blockquote><br /> '.$similar.'</td></tr>'."\n"
- if ($ENV{'form.lastSub'} eq 'lastonly' ||
- ($ENV{'form.lastSub'} eq 'hdgrade' &&
- $$handgrade{$part} =~ /:yes$/));
+ my ($string,$timestamp)= &get_last_submission(\%record);
+ my $lastsubonly=''.
+ ($$timestamp eq '' ? '' : '<b>Date Submitted:</b> '.
+ $$timestamp)."</td></tr>\n";
+ if ($$timestamp eq '') {
+ $lastsubonly.='<tr><td bgcolor="#ffffe6">'.$$string[0];
+ } else {
+ my %seenparts;
+ for my $part (sort keys(%$handgrade)) {
+ my ($partid,$respid) = split(/_/,$part);
+ my $display_part=&get_display_part($partid,$url,$symb);
+ if ($ENV{"form.$uname:$udom:$partid:submitted_by"}) {
+ if (exists($seenparts{$partid})) { next; }
+ $seenparts{$partid}=1;
+ my $submitby='<b>Part:</b> '.$display_part.
+ ' <b>Collaborative submission by:</b> '.
+ '<a href="javascript:viewSubmitter(\''.
+ $ENV{"form.$uname:$udom:$partid:submitted_by"}.
+ '\')"; TARGET=_self>'.
+ $$fullname{$ENV{"form.$uname:$udom:$partid:submitted_by"}}.'</a><br />';
+ $request->print($submitby);
+ next;
+ }
+ my $responsetype = $responseType->{$partid}->{$respid};
+ if (!exists($record{"resource.$partid.$respid.submission"})) {
+ $lastsubonly.='<tr><td bgcolor="#ffffe6"><b>Part:</b> '.
+ $display_part.' <font color="#999999">( ID '.$respid.
+ ' )</font> '.
+ '<font color="red">Nothing submitted - no attempts</font><br /><br />';
+ next;
+ }
+ foreach (@$string) {
+ my ($partid,$respid) = /^resource\.([^\.]*)\.([^\.]*)\.submission/;
+ if ($part ne ($partid.'_'.$respid)) { next; }
+ my ($ressub,$subval) = split(/:/,$_,2);
+ # Similarity check
+ my $similar='';
+ if($ENV{'form.checkPlag'}){
+ my ($oname,$odom,$ocrsid,$oessay,$osim)=
+ &most_similar($uname,$udom,$subval);
+ if ($osim) {
+ $osim=int($osim*100.0);
+ $similar="<hr /><h3><font color=\"#FF0000\">Essay".
+ " is $osim% similar to an essay by ".
+ &Apache::loncommon::plainname($oname,$odom).
+ '</font></h3><blockquote><i>'.
+ &keywords_highlight($oessay).
+ '</i></blockquote><hr />';
}
}
+ my $order=&get_order($partid,$respid,$symb,$uname,$udom);
+ if ($ENV{'form.lastSub'} eq 'lastonly' ||
+ ($ENV{'form.lastSub'} eq 'hdgrade' &&
+ $$handgrade{$part} eq 'yes')) {
+ my $display_part=&get_display_part($partid,$url,$symb);
+ $lastsubonly.='<tr><td bgcolor="#ffffe6"><b>Part:</b> '.
+ $display_part.' <font color="#999999">( ID '.$respid.
+ ' )</font> ';
+ my @files;
+ if ($record{"resource.$partid.$respid.portfiles"}) {
+ my $file_url = '/uploaded/'.$udom.'/'.$uname.'/portfolio';
+ foreach my $file (split(',',$record{"resource.$partid.$respid.portfiles"})) {
+ push(@files,$file_url.$file);
+
+ &Apache::lonnet::logthis("found a portfolio file".$record{"resource.$partid.$respid.portfiles"});
+ &Apache::lonnet::logthis("uploaded URL file".$record{"resource.$partid.$respid.uploadedurl"});
+ }
+ }
+ if ($record{"resource.$partid.$respid.uploadedurl"}) {
+ push(@files,$record{"resource.$partid.$respid.uploadedurl"});
+ }
+ if (@files) {
+ $lastsubonly.='<br /><font color="red" size="1">Like all files provided by users, this file may contain virusses</font><br />';
+ foreach my $file (@files) {
+ &Apache::lonnet::allowuploaded('/adm/grades',$file);
+ $lastsubonly.='<br /><a href="'.$file.'" target="lonGRDs"><img src="'.&Apache::loncommon::icon($file).'" border=0"> '.$file.'</a>';
+ }
+ }
+ $lastsubonly.='<b>Submitted Answer: </b>'.
+ &cleanRecord($subval,$responsetype,$symb,$partid,
+ $respid,\%record,$order);
+ if ($similar) {$lastsubonly.="<br /><br />$similar\n";}
+ }
}
}
- $lastsubonly.='</td></tr>'."\n";
- $request->print($lastsubonly);
}
- } else {
+ $lastsubonly.='</td></tr><tr bgcolor="#ffffff"><td>'."\n";
+ $request->print($lastsubonly);
+ } elsif ($ENV{'form.lastSub'} eq 'datesub') {
+ my (undef,$responseType,undef,$parts) = &showResourceInfo($url);
+ $request->print(&displaySubByDates($symb,\%record,$parts,$responseType,$checkIcon,$uname,$udom));
+ } elsif ($ENV{'form.lastSub'} =~ /^(last|all)$/) {
$request->print(&Apache::loncommon::get_previous_attempt($symb,$uname,$udom,
$ENV{'request.course.id'},
$last,'.submission',
'Apache::grades::keywords_highlight'));
}
+
+ $request->print('<input type="hidden" name="unamedom'.$counter.'" value="'.$uname.':'
+ .$udom.'" />'."\n");
# return if view submission with no grading option
if ($ENV{'form.showgrading'} eq '' || (!&canmodify($usec))) {
- $request->print('</td></tr></table></td></tr></table></form>'."\n");
- $request->print(&show_grading_menu_form($symb,$url))
- if (($ENV{'form.command'} eq 'submission') ||
- ($ENV{'form.command'} eq 'processGroup' && $counter == $total));
+ my $toGrade.='<input type="button" value="Grade Student" '.
+ 'onClick="javascript:checksubmit(this.form,\'Grade Student\',\''
+ .$counter.'\');" TARGET=_self> '."\n" if (&canmodify($usec));
+ $toGrade.='</td></tr></table></td></tr></table>'."\n";
+ if (($ENV{'form.command'} eq 'submission') ||
+ ($ENV{'form.command'} eq 'processGroup' && $counter == $total)) {
+ $toGrade.='</form>'.&show_grading_menu_form($symb,$url)
+ }
+ $request->print($toGrade);
return;
+ } else {
+ $request->print('</td></tr></table></td></tr></table>'."\n");
}
- # Grading options
- $result='<input type="hidden" name="newmsg'.$counter.'" value="" />'."\n".
- '<input type="hidden" name="includemsg'.$counter.'" value="" />'."\n".
- '<input type="hidden" name="unamedom'.$counter.'" value="'.$uname.':'
- .$udom.'" />'."\n";
- my ($lastname,$givenn) = split(/,/,$ENV{'form.fullname'});
- my $msgfor = $givenn.' '.$lastname;
- if (scalar(@col_fullnames) > 0) {
- my $lastone = pop @col_fullnames;
- $msgfor .= ', '.(join ', ',@col_fullnames).' and '.$lastone.'.';
- }
- $msgfor =~ s/\'/\\'/g; #' stupid emacs - no! javascript
- $result.='<tr><td bgcolor="#ffffff">'."\n".
- ' <a href="javascript:msgCenter(document.SCORE,'.$counter.
- ',\''.$msgfor.'\')"; TARGET=_self>'.
- 'Compose Message to student'.(scalar(@col_fullnames) >= 1 ? 's' : '').'</a> '.
- '<img src="'.$request->dir_config('lonIconsURL').
- '/mailbkgrd.gif" width="14" height="10" name="mailicon'.$counter.'" />'."\n".
- '<br /> (Message will be sent when you click on Save & Next below.)'."\n"
- if ($ENV{'form.handgrade'} eq 'yes');
- $request->print($result);
+ # essay grading message center
+ if ($ENV{'form.handgrade'} eq 'yes') {
+ my ($lastname,$givenn) = split(/,/,$ENV{'form.fullname'});
+ my $msgfor = $givenn.' '.$lastname;
+ if (scalar(@col_fullnames) > 0) {
+ my $lastone = pop @col_fullnames;
+ $msgfor .= ', '.(join ', ',@col_fullnames).' and '.$lastone.'.';
+ }
+ $msgfor =~ s/\'/\\'/g; #' stupid emacs - no! javascript
+ $result='<input type="hidden" name="includemsg'.$counter.'" value="" />'."\n".
+ '<input type="hidden" name="newmsg'.$counter.'" value="" />'."\n";
+ $result.=' <a href="javascript:msgCenter(document.SCORE,'.$counter.
+ ',\''.$msgfor.'\')"; TARGET=_self>'.
+ 'Compose Message to student'.(scalar(@col_fullnames) >= 1 ? 's' : '').'</a> '.
+ '<img src="'.$request->dir_config('lonIconsURL').
+ '/mailbkgrd.gif" width="14" height="10" name="mailicon'.$counter.'" />'."\n".
+ '<br /> (Message will be sent when you click on Save & Next below.)'."\n"
+ if ($ENV{'form.handgrade'} eq 'yes');
+ $request->print($result);
+ }
my %seen = ();
my @partlist;
+ my @gradePartRespid;
for (sort keys(%$handgrade)) {
my ($partid,$respid) = split(/_/);
next if ($seen{$partid} > 0);
$seen{$partid}++;
- next if ($$handgrade{$_} =~ /:no$/);
+ next if ($$handgrade{$_} =~ /:no$/ && $ENV{'form.lastSub'} =~ /^(hdgrade)$/);
push @partlist,$partid;
+ push @gradePartRespid,$partid.'.'.$respid;
$request->print(&gradeBox($request,$symb,$uname,$udom,$counter,$partid,\%record));
}
$result='<input type="hidden" name="partlist'.$counter.
'" value="'.(join ":",@partlist).'" />'."\n";
+ $result.='<input type="hidden" name="gradePartRespid'.
+ '" value="'.(join ":",@gradePartRespid).'" />'."\n" if ($counter == 0);
my $ctr = 0;
while ($ctr < scalar(@partlist)) {
$result.='<input type="hidden" name="partid'.$counter.'_'.$ctr.'" value="'.
@@ -1405,28 +1777,22 @@ KEYWORDS
# print end of form
if ($counter == $total) {
- my $endform='<table border="0"><tr><td>'.
- '<input type="hidden" name="gradeOpt" value="" />'."\n";
- if ($ENV{'form.handgrade'} eq 'yes') {
- $endform.='<input type="button" value="Save & Next" '.
- 'onClick="javascript:checksubmit(this.form,\'Save & Next\','.
- $total.','.scalar(@partlist).');" TARGET=_self> '."\n";
- 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) ';
- } else {
- $endform.='<input type="hidden" name="NTSTU" value="1" />'."\n";
- }
- $endform.='<input type="button" value="Next" '.
- 'onClick="javascript:checksubmit(this.form,\'Next\');" TARGET=_self> '."\n".
- '<input type="button" value="Previous" '.
- 'onClick="javascript:checksubmit(this.form,\'Previous\');" TARGET=_self> ';
- $endform.='(Next and Previous do not save the scores.)'."\n"
- if ($ENV{'form.handgrade'} eq 'yes');
+ my $endform='<table border="0"><tr><td>'."\n";
+ $endform.='<input type="button" value="Save & Next" '.
+ 'onClick="javascript:checksubmit(this.form,\'Save & Next\','.
+ $total.','.scalar(@partlist).');" TARGET=_self> '."\n";
+ 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="button" value="Previous" '.
+ 'onClick="javascript:checksubmit(this.form,\'Previous\');" TARGET=_self> '."\n".
+ '<input type="button" value="Next" '.
+ 'onClick="javascript:checksubmit(this.form,\'Next\');" TARGET=_self> ';
+ $endform.='(Next and Previous (student) do not save the scores.)'."\n" ;
$endform.='</td><tr></table></form>';
$endform.=&show_grading_menu_form($symb,$url);
$request->print($endform);
@@ -1436,15 +1802,15 @@ KEYWORDS
#--- Retrieve the last submission for all the parts
sub get_last_submission {
- my (%returnhash)=@_;
+ my ($returnhash)=@_;
my (@string,$timestamp);
- if ($returnhash{'version'}) {
+ if ($$returnhash{'version'}) {
my %lasthash=();
my ($version);
- for ($version=1;$version<=$returnhash{'version'};$version++) {
- foreach (sort(split(/\:/,$returnhash{$version.':keys'}))) {
- $lasthash{$_}=$returnhash{$version.':'.$_};
- $timestamp = scalar(localtime($returnhash{$version.':timestamp'}));
+ for ($version=1;$version<=$$returnhash{'version'};$version++) {
+ foreach (sort(split(/\:/,$$returnhash{$version.':keys'}))) {
+ $lasthash{$_}=$$returnhash{$version.':'.$_};
+ $timestamp = scalar(localtime($$returnhash{$version.':timestamp'}));
}
}
foreach ((keys %lasthash)) {
@@ -1456,7 +1822,7 @@ sub get_last_submission {
}
}
}
- @string = $string[0] eq '' ? 'Nothing submitted - no attempts.' : @string;
+ @string = $string[0] eq '' ? '<font color="red">Nothing submitted - no attempts.</font>' : @string;
return \@string,\$timestamp;
}
@@ -1468,13 +1834,8 @@ sub keywords_highlight {
(my $styleoff = $styleon) =~ s/\</\<\//;
my @keylist = split(/[,\s+]/,$ENV{'form.keywords'});
foreach (@keylist) {
- $string =~ s/\b\Q$_\E(\b|\.)/\<font color\=$ENV{'form.kwclr'} $size\>$styleon$_$styleoff\<\/font\>/gi;
+ $string =~ s/\b\Q$_\E(\b|\.)/<font color\=$ENV{'form.kwclr'} $size\>$styleon$_$styleoff<\/font>/gi;
}
- # This is not really the right place to do this, but I cannot find a
- # better one at this time. So here we go - the m in the s:::mg causes
- # ^ to match the beginning of a new line. So we replace(???) the beginning
- # of the line with <br /> to make things formatted a little better.
- $string =~ s:^:<br />:mg;
return $string;
}
@@ -1486,7 +1847,6 @@ sub processHandGrade {
my $button = $ENV{'form.gradeOpt'};
my $ngrade = $ENV{'form.NCT'};
my $ntstu = $ENV{'form.NTSTU'};
-
if ($button eq 'Save & Next') {
my $ctr = 0;
while ($ctr < $ngrade) {
@@ -1518,17 +1878,21 @@ sub processHandGrade {
$ENV{'form.msgsub'},$message);
}
if ($ENV{'form.collaborator'.$ctr}) {
- my (@collaborators) = split(/:/,$ENV{'form.collaborator'.$ctr});
- foreach (@collaborators) {
- my ($errorflag,$pts,$wgt) = &saveHandGrade($request,$url,$symb,$_,$udom,$ctr,$ENV{'form.unamedom'.$ctr});
- if ($errorflag eq 'not_allowed') {
- $request->print("<font color=\"red\">Not allowed to modify grades for $_:$udom</font>");
- next;
- } else {
- if ($message ne '') {
- $msgstatus = &Apache::lonmsg::user_normal_msg ($_,$udom,
- $ENV{'form.msgsub'},
- $message);
+ my @collabstrs=&Apache::loncommon::get_env_multiple("form.collaborator$ctr");
+ foreach my $collabstr (@collabstrs) {
+ my ($part,@collaborators) = split(/:/,$collabstr);
+ foreach (@collaborators) {
+ my ($errorflag,$pts,$wgt) =
+ &saveHandGrade($request,$url,$symb,$_,$udom,$ctr,
+ $ENV{'form.unamedom'.$ctr},$part);
+ if ($errorflag eq 'not_allowed') {
+ $request->print("<font color=\"red\">Not allowed to modify grades for $_:$udom</font>");
+ next;
+ } else {
+ if ($message ne '') {
+ $msgstatus = &Apache::lonmsg::user_normal_msg($_,$udom,$ENV{'form.msgsub'},$message);
+ }
+
}
}
}
@@ -1537,48 +1901,49 @@ sub processHandGrade {
}
}
- # Keywords sorted in alphabatical order
- my $loginuser = $ENV{'user.name'}.':'.$ENV{'user.domain'};
- my %keyhash = ();
- $ENV{'form.keywords'} =~ s/,\s{0,}|\s+/ /g;
- $ENV{'form.keywords'} =~ s/^\s+|\s+$//;
- my (@keywords) = sort(split(/\s+/,$ENV{'form.keywords'}));
- $ENV{'form.keywords'} = join(' ',@keywords);
- $keyhash{$symb.'_keywords'} = $ENV{'form.keywords'};
- $keyhash{$symb.'_subject'} = $ENV{'form.msgsub'};
- $keyhash{$loginuser.'_kwclr'} = $ENV{'form.kwclr'};
- $keyhash{$loginuser.'_kwsize'} = $ENV{'form.kwsize'};
- $keyhash{$loginuser.'_kwstyle'} = $ENV{'form.kwstyle'};
-
- # message center - Order of message gets changed. Blank line is eliminated.
- # New messages are saved in ENV for the next student.
- # All messages are saved in nohist_handgrade.db
- my ($ctr,$idx) = (1,1);
- while ($ctr <= $ENV{'form.savemsgN'}) {
- if ($ENV{'form.savemsg'.$ctr} ne '') {
- $keyhash{$symb.'_savemsg'.$idx} = $ENV{'form.savemsg'.$ctr};
- $idx++;
+ if ($ENV{'form.handgrade'} eq 'yes') {
+ # Keywords sorted in alphabatical order
+ my $loginuser = $ENV{'user.name'}.':'.$ENV{'user.domain'};
+ my %keyhash = ();
+ $ENV{'form.keywords'} =~ s/,\s{0,}|\s+/ /g;
+ $ENV{'form.keywords'} =~ s/^\s+|\s+$//;
+ my (@keywords) = sort(split(/\s+/,$ENV{'form.keywords'}));
+ $ENV{'form.keywords'} = join(' ',@keywords);
+ $keyhash{$symb.'_keywords'} = $ENV{'form.keywords'};
+ $keyhash{$symb.'_subject'} = $ENV{'form.msgsub'};
+ $keyhash{$loginuser.'_kwclr'} = $ENV{'form.kwclr'};
+ $keyhash{$loginuser.'_kwsize'} = $ENV{'form.kwsize'};
+ $keyhash{$loginuser.'_kwstyle'} = $ENV{'form.kwstyle'};
+
+ # message center - Order of message gets changed. Blank line is eliminated.
+ # New messages are saved in ENV for the next student.
+ # All messages are saved in nohist_handgrade.db
+ my ($ctr,$idx) = (1,1);
+ while ($ctr <= $ENV{'form.savemsgN'}) {
+ if ($ENV{'form.savemsg'.$ctr} ne '') {
+ $keyhash{$symb.'_savemsg'.$idx} = $ENV{'form.savemsg'.$ctr};
+ $idx++;
+ }
+ $ctr++;
}
- $ctr++;
- }
- $ctr = 0;
- while ($ctr < $ngrade) {
- if ($ENV{'form.newmsg'.$ctr} ne '') {
- $keyhash{$symb.'_savemsg'.$idx} = $ENV{'form.newmsg'.$ctr};
- $ENV{'form.savemsg'.$idx} = $ENV{'form.newmsg'.$ctr};
- $idx++;
+ $ctr = 0;
+ while ($ctr < $ngrade) {
+ if ($ENV{'form.newmsg'.$ctr} ne '') {
+ $keyhash{$symb.'_savemsg'.$idx} = $ENV{'form.newmsg'.$ctr};
+ $ENV{'form.savemsg'.$idx} = $ENV{'form.newmsg'.$ctr};
+ $idx++;
+ }
+ $ctr++;
}
- $ctr++;
+ $ENV{'form.savemsgN'} = --$idx;
+ $keyhash{$symb.'_savemsgN'} = $ENV{'form.savemsgN'};
+ my $putresult = &Apache::lonnet::put
+ ('nohist_handgrade',\%keyhash,
+ $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
+ $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
}
- $ENV{'form.savemsgN'} = --$idx;
- $keyhash{$symb.'_savemsgN'} = $ENV{'form.savemsgN'};
- my $putresult = &Apache::lonnet::put
- ('nohist_handgrade',\%keyhash,
- $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
- $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
-
# Called by Save & Refresh from Highlight Attribute Window
- my (undef,undef,$fullname) = &getclasslist($ENV{'form.section'},'0');
+ my (undef,undef,$fullname) = &getclasslist($ENV{'form.section'},'1');
if ($ENV{'form.refresh'} eq 'on') {
my ($ctr,$total) = (0,0);
while ($ctr < $ngrade) {
@@ -1597,10 +1962,20 @@ sub processHandGrade {
return '';
}
+# Go directly to grade student - from submission or link from chart page
+ if ($button eq 'Grade Student') {
+ (undef,undef,$ENV{'form.handgrade'},undef,undef) = &showResourceInfo($url);
+ my $processUser = $ENV{'form.unamedom'.$ENV{'form.studentNo'}};
+ ($ENV{'form.student'},$ENV{'form.userdom'}) = split(/:/,$processUser);
+ $ENV{'form.fullname'} = $$fullname{$processUser};
+ &submission($request,0,0);
+ return '';
+ }
+
# Get the next/previous one or group of students
my $firststu = $ENV{'form.unamedom0'};
my $laststu = $ENV{'form.unamedom'.($ngrade-1)};
- $ctr = 2;
+ my $ctr = 2;
while ($laststu eq '') {
$laststu = $ENV{'form.unamedom'.($ngrade-$ctr)};
$ctr++;
@@ -1620,21 +1995,32 @@ sub processHandGrade {
}
}
$ctr = 0;
- my ($partlist,$handgrade) = &response_type($ENV{'form.url'});
@parsedlist = reverse @parsedlist if ($button eq 'Previous');
+ my ($partlist) = &response_type($url);
foreach my $student (@parsedlist) {
+ my $submitonly=$ENV{'form.submitonly'};
my ($uname,$udom) = split(/:/,$student);
- if ($ENV{'form.submitonly'} eq 'yes') {
- my (%status) = &student_gradeStatus($ENV{'form.url'},$symb,$udom,$uname,$partlist) ;
- my $statusflg = '';
+ if ($submitonly =~ /^(yes|graded|incorrect)$/) {
+# my %record = &Apache::lonnet::restore($symb,$ENV{'request.course.id'},$udom,$uname);
+ my %status=&student_gradeStatus($url,$symb,$udom,$uname,$partlist);
+ my $submitted = 0;
+ my $graded = 1;
foreach (keys(%status)) {
- $statusflg = 1 if ($status{$_} ne 'nothing');
- my ($foo,$partid,$foo1) = split(/\./);
- $statusflg = '' if ($status{'resource.'.$partid.'.submitted_by'} ne '');
+ $submitted = 1 if ($status{$_} ne 'nothing');
+ $graded = 0 if ($status{$_} =~ /^correct/);
+ my ($foo,$partid,$foo1) = split(/\./,$_);
+ if ($status{'resource.'.$partid.'.submitted_by'} ne '') {
+ $submitted = 0;
+ }
}
- next if ($statusflg eq '');
+ next if (!$submitted && ($submitonly eq 'yes' ||
+ $submitonly eq 'incorrect' ||
+ $submitonly eq 'graded'));
+ next if (!$graded && ($submitonly eq 'graded' ||
+ $submitonly eq 'incorrect'));
}
push @nextlist,$student if ($ctr < $ntstu);
+ last if ($ctr == $ntstu);
$ctr++;
}
@@ -1661,7 +2047,7 @@ sub processHandGrade {
#---- Save the score and award for each student, if changed
sub saveHandGrade {
- my ($request,$url,$symb,$stuname,$domain,$newflg,$submitter) = @_;
+ my ($request,$url,$symb,$stuname,$domain,$newflg,$submitter,$part) = @_;
my $usec = &Apache::lonnet::getsection($domain,$stuname,
$ENV{'request.course.id'});
if (!&canmodify($usec)) { return('not_allowed'); }
@@ -1669,37 +2055,59 @@ sub saveHandGrade {
my %newrecord = ();
my ($pts,$wgt) = ('','');
foreach (split(/:/,$ENV{'form.partlist'.$newflg})) {
- if ($ENV{'form.GD_SEL'.$newflg.'_'.$_} eq 'excused') {
+ #collaborator may vary for different parts
+ if ($submitter && $_ ne $part) { next; }
+ my $dropMenu = $ENV{'form.GD_SEL'.$newflg.'_'.$_};
+ if ($dropMenu eq 'excused') {
if ($record{'resource.'.$_.'.solved'} ne 'excused') {
$newrecord{'resource.'.$_.'.solved'} = 'excused';
if (exists($record{'resource.'.$_.'.awarded'})) {
$newrecord{'resource.'.$_.'.awarded'} = '';
}
+ $newrecord{'resource.'.$_.'.regrader'}="$ENV{'user.name'}:$ENV{'user.domain'}";
}
- } else {
+ } elsif ($dropMenu eq 'reset status'
+ && exists($record{'resource.'.$_.'.solved'})) { #don't bother if no old records -> no attempts
+ foreach my $key (keys (%record)) {
+ if ($key=~/^resource\.\Q$_\E\./) { $newrecord{$key} = ''; }
+ }
+ $newrecord{'resource.'.$_.'.regrader'}=
+ "$ENV{'user.name'}:$ENV{'user.domain'}";
+ } elsif ($dropMenu eq '') {
$pts = ($ENV{'form.GD_BOX'.$newflg.'_'.$_} ne '' ?
$ENV{'form.GD_BOX'.$newflg.'_'.$_} :
$ENV{'form.RADVAL'.$newflg.'_'.$_});
- return 'no_score' if ($pts eq '' && $ENV{'form.GD_SEL'.$newflg.'_'.$_} eq '');
+ if ($pts eq '' && $ENV{'form.GD_SEL'.$newflg.'_'.$_} eq '') {
+ next;
+ }
$wgt = $ENV{'form.WGT'.$newflg.'_'.$_} eq '' ? 1 :
$ENV{'form.WGT'.$newflg.'_'.$_};
my $partial= $pts/$wgt;
- $newrecord{'resource.'.$_.'.awarded'} = $partial
- if ($record{'resource.'.$_.'.awarded'} ne $partial);
+ if ($partial eq $record{'resource.'.$_.'.awarded'}) {
+ #do not update score for part if not changed.
+ next;
+ }
+ if ($record{'resource.'.$_.'.awarded'} ne $partial) {
+ $newrecord{'resource.'.$_.'.awarded'} = $partial;
+ }
my $reckey = 'resource.'.$_.'.solved';
if ($partial == 0) {
- $newrecord{$reckey} = 'incorrect_by_override'
- if ($record{$reckey} ne 'incorrect_by_override');
+ if ($record{$reckey} ne 'incorrect_by_override') {
+ $newrecord{$reckey} = 'incorrect_by_override';
+ }
} else {
- $newrecord{$reckey} = 'correct_by_override'
- if ($record{$reckey} ne 'correct_by_override');
+ if ($record{$reckey} ne 'correct_by_override') {
+ $newrecord{$reckey} = 'correct_by_override';
+ }
+ }
+ if ($submitter &&
+ ($record{'resource.'.$_.'.submitted_by'} ne $submitter)) {
+ $newrecord{'resource.'.$_.'.submitted_by'} = $submitter;
}
- $newrecord{'resource.'.$_.'.submitted_by'} = $submitter
- if ($submitter && ($record{'resource.'.$_.'.submitted_by'} ne $submitter));
- $newrecord{'resource.'.$_.'regrader'}="$ENV{'user.name'}:$ENV{'user.domain'}";
+ $newrecord{'resource.'.$_.'.regrader'}=
+ "$ENV{'user.name'}:$ENV{'user.domain'}";
}
}
-
if (scalar(keys(%newrecord)) > 0) {
&Apache::lonnet::cstore(\%newrecord,$symb,
$ENV{'request.course.id'},$domain,$stuname);
@@ -1718,10 +2126,10 @@ sub viewgrades_js {
$request->print(<<VIEWJAVASCRIPT);
<script type="text/javascript" language="javascript">
function writePoint(partid,weight,point) {
- var radioButton = eval("document.classgrade.RADVAL_"+partid);
- var textbox = eval("document.classgrade.TEXTVAL_"+partid);
+ var radioButton = document.classgrade["RADVAL_"+partid];
+ var textbox = document.classgrade["TEXTVAL_"+partid];
if (point == "textval") {
- var point = eval("document.classgrade.TEXTVAL_"+partid+".value");
+ point = document.classgrade["TEXTVAL_"+partid].value;
if (isNaN(point) || parseFloat(point) < 0) {
alert("A number equal or greater than 0 is expected. Entered value = "+parseFloat(point));
var resetbox = false;
@@ -1752,15 +2160,13 @@ sub viewgrades_js {
}
} else {
- textbox.value = point;
+ textbox.value = parseFloat(point);
}
for (i=0;i<document.classgrade.total.value;i++) {
- var user = eval("document.classgrade.ctr"+i+".value");
- var scorename = eval("document.classgrade.GD_"+user+
- "_"+partid+"_awarded");
- var saveval = eval("document.classgrade.GD_"+user+
- "_"+partid+"_solved_s.value");
- var selname = eval("document.classgrade.GD_"+user+"_"+partid+"_solved");
+ var user = document.classgrade["ctr"+i].value;
+ var scorename = document.classgrade["GD_"+user+"_"+partid+"_awarded"];
+ var saveval = document.classgrade["GD_"+user+"_"+partid+"_solved_s"].value;
+ var selname = document.classgrade["GD_"+user+"_"+partid+"_solved"];
if (saveval != "correct") {
scorename.value = point;
if (selname[0].selected != true) {
@@ -1768,15 +2174,14 @@ sub viewgrades_js {
}
}
}
- var selval = eval("document.classgrade.SELVAL_"+partid);
- selval[0].selected = true;
+ document.classgrade["SELVAL_"+partid][0].selected = true;
}
function writeRadText(partid,weight) {
- var selval = eval("document.classgrade.SELVAL_"+partid);
- var radioButton = eval("document.classgrade.RADVAL_"+partid);
- var textbox = eval("document.classgrade.TEXTVAL_"+partid);
- if (selval[1].selected) {
+ var selval = document.classgrade["SELVAL_"+partid];
+ var radioButton = document.classgrade["RADVAL_"+partid];
+ var textbox = document.classgrade["TEXTVAL_"+partid];
+ if (selval[1].selected || selval[2].selected) {
for (var i=0; i<radioButton.length; i++) {
radioButton[i].checked=false;
@@ -1784,30 +2189,29 @@ sub viewgrades_js {
textbox.value = "";
for (i=0;i<document.classgrade.total.value;i++) {
- var user = eval("document.classgrade.ctr"+i+".value");
- var scorename = eval("document.classgrade.GD_"+user+
- "_"+partid+"_awarded");
- var saveval = eval("document.classgrade.GD_"+user+
- "_"+partid+"_solved_s.value");
- var selname = eval("document.classgrade.GD_"+user+
- "_"+partid+"_solved");
+ var user = document.classgrade["ctr"+i].value;
+ var scorename = document.classgrade["GD_"+user+"_"+partid+"_awarded"];
+ var saveval = document.classgrade["GD_"+user+"_"+partid+"_solved_s"].value;
+ var selname = document.classgrade["GD_"+user+"_"+partid+"_solved"];
if (saveval != "correct") {
scorename.value = "";
- selname[1].selected = true;
+ if (selval[1].selected) {
+ selname[1].selected = true;
+ } else {
+ selname[2].selected = true;
+ if (Number(document.classgrade["GD_"+user+"_"+partid+"_tries"].value))
+ {document.classgrade["GD_"+user+"_"+partid+"_tries"].value = '0';}
+ }
}
}
} else {
for (i=0;i<document.classgrade.total.value;i++) {
- var user = eval("document.classgrade.ctr"+i+".value");
- var scorename = eval("document.classgrade.GD_"+user+
- "_"+partid+"_awarded");
- var saveval = eval("document.classgrade.GD_"+user+
- "_"+partid+"_solved_s.value");
- var selname = eval("document.classgrade.GD_"+user+
- "_"+partid+"_solved");
+ var user = document.classgrade["ctr"+i].value;
+ var scorename = document.classgrade["GD_"+user+"_"+partid+"_awarded"];
+ var saveval = document.classgrade["GD_"+user+"_"+partid+"_solved_s"].value;
+ var selname = document.classgrade["GD_"+user+"_"+partid+"_solved"];
if (saveval != "correct") {
- scorename.value = eval("document.classgrade.GD_"+user+
- "_"+partid+"_awarded_s.value");;
+ scorename.value = document.classgrade["GD_"+user+"_"+partid+"_awarded_s"].value;
selname[0].selected = true;
}
}
@@ -1815,10 +2219,10 @@ sub viewgrades_js {
}
function changeSelect(partid,user) {
- var selval = eval("document.classgrade.GD_"+user+'_'+partid+"_solved");
- var textbox = eval("document.classgrade.GD_"+user+'_'+partid+"_awarded");
+ var selval = document.classgrade["GD_"+user+'_'+partid+"_solved"];
+ var textbox = document.classgrade["GD_"+user+'_'+partid+"_awarded"];
var point = textbox.value;
- var weight = eval("document.classgrade.weight_"+partid+".value");
+ var weight = document.classgrade["weight_"+partid].value;
if (isNaN(point) || parseFloat(point) < 0) {
alert("A number equal or greater than 0 is expected. Entered value = "+parseFloat(point));
@@ -1837,19 +2241,21 @@ sub viewgrades_js {
}
function changeOneScore(partid,user) {
- var selval = eval("document.classgrade.GD_"+user+'_'+partid+"_solved");
- if (selval[1].selected) {
- var boxval = eval("document.classgrade.GD_"+user+'_'+partid+"_awarded");
- boxval.value = "";
+ var selval = document.classgrade["GD_"+user+'_'+partid+"_solved"];
+ if (selval[1].selected || selval[2].selected) {
+ document.classgrade["GD_"+user+'_'+partid+"_awarded"].value = "";
+ if (selval[2].selected) {
+ document.classgrade["GD_"+user+'_'+partid+"_tries"].value = "0";
+ }
}
}
function resetEntry(numpart) {
for (ctpart=0;ctpart<numpart;ctpart++) {
- var partid = eval("document.classgrade.partid_"+ctpart+".value");
- var radioButton = eval("document.classgrade.RADVAL_"+partid);
- var textbox = eval("document.classgrade.TEXTVAL_"+partid);
- var selval = eval("document.classgrade.SELVAL_"+partid);
+ var partid = document.classgrade["partid_"+ctpart].value;
+ var radioButton = document.classgrade["RADVAL_"+partid];
+ var textbox = document.classgrade["TEXTVAL_"+partid];
+ var selval = document.classgrade["SELVAL_"+partid];
for (var i=0; i<radioButton.length; i++) {
radioButton[i].checked=false;
@@ -1858,16 +2264,13 @@ sub viewgrades_js {
selval[0].selected = true;
for (i=0;i<document.classgrade.total.value;i++) {
- var user = eval("document.classgrade.ctr"+i+".value");
- var resetscore = eval("document.classgrade.GD_"+user+
- "_"+partid+"_awarded");
- resetscore.value = eval("document.classgrade.GD_"+user+
- "_"+partid+"_awarded_s.value");
-
- var saveselval = eval("document.classgrade.GD_"+user+
- "_"+partid+"_solved_s.value");
-
- var selname = eval("document.classgrade.GD_"+user+"_"+partid+"_solved");
+ var user = document.classgrade["ctr"+i].value;
+ var resetscore = document.classgrade["GD_"+user+"_"+partid+"_awarded"];
+ resetscore.value = document.classgrade["GD_"+user+"_"+partid+"_awarded_s"].value;
+ var resettries = document.classgrade["GD_"+user+"_"+partid+"_tries"];
+ resettries.value = document.classgrade["GD_"+user+"_"+partid+"_tries_s"].value;
+ var saveselval = document.classgrade["GD_"+user+"_"+partid+"_solved_s"].value;
+ var selname = document.classgrade["GD_"+user+"_"+partid+"_solved"];
if (saveselval == "excused") {
if (selname[1].selected == false) { selname[1].selected = true;}
} else {
@@ -1887,9 +2290,15 @@ sub viewgrades {
&viewgrades_js($request);
my ($symb,$url) = ($ENV{'form.symb'},$ENV{'form.url'});
- my $result='<h3><font color="#339933">Manual Grading</font></h3>';
+ #need to make sure we have the correct data for later EXT calls,
+ #thus invalidate the cache
+ &Apache::lonnet::devalidatecourseresdata(
+ $ENV{'course.'.$ENV{'request.course.id'}.'.num'},
+ $ENV{'course.'.$ENV{'request.course.id'}.'.domain'});
+ &Apache::lonnet::clear_EXT_cache_status();
- $result.='<font size=+1><b>Problem: </b>'.$ENV{'form.probTitle'}.'</font>'."\n";
+ my $result='<h3><font color="#339933">'.&mt('Manual Grading').'</font></h3>';
+ $result.='<font size=+1><b>Current Resource: </b>'.$ENV{'form.probTitle'}.'</font>'."\n";
#view individual student submission form - called using Javascript viewOneStudent
$result.=&jscriptNform($url,$symb);
@@ -1901,21 +2310,23 @@ sub viewgrades {
'<input type="hidden" name="command" value="editgrades" />'."\n".
'<input type="hidden" name="section" value="'.$ENV{'form.section'}.'" />'."\n".
'<input type="hidden" name="saveState" value="'.$ENV{'form.saveState'}.'" />'."\n".
+ '<input type="hidden" name="Status" value="'.$ENV{'form.Status'}.'" />'."\n".
'<input type="hidden" name="probTitle" value="'.$ENV{'form.probTitle'}.'" />'."\n";
- $result.='<h3>Assign Common Grade To ';
+ my $sectionClass;
if ($ENV{'form.section'} eq 'all') {
- $result.='Class </h3>';
- } elsif ($ENV{'form.section'} eq 'no') {
- $result.='Students in no Section </h3>';
+ $sectionClass='Class </h3>';
+ } elsif ($ENV{'form.section'} eq 'none') {
+ $sectionClass='Students in no Section </h3>';
} else {
- $result.='Students in Section '.$ENV{'form.section'}.'</h3>';
+ $sectionClass='Students in Section '.$ENV{'form.section'}.'</h3>';
}
+ $result.='<h3>Assign Common Grade To '.$sectionClass;
$result.= '<table border=0><tr><td bgcolor="#777777">'."\n".
'<table border=0><tr bgcolor="#ffffdd"><td>';
#radio buttons/text box for assigning points for a section or class.
#handles different parts of a problem
- my ($partlist,$handgrade) = &response_type($ENV{'form.url'});
+ my ($partlist,$handgrade) = &response_type($url,$symb);
my %weight = ();
my $ctsparts = 0;
$result.='<table border="0">';
@@ -1924,7 +2335,7 @@ sub viewgrades {
my ($partid,$respid) = split (/_/,$_,2);
next if $seen{$partid};
$seen{$partid}++;
- my ($responsetype,$handgrade)=split(/:/,$$handgrade{$_});
+ my $handgrade=$$handgrade{$_};
my $wgt = &Apache::lonnet::EXT('resource.'.$partid.'.weight',$symb);
$weight{$partid} = $wgt eq '' ? '1' : $wgt;
@@ -1932,7 +2343,8 @@ sub viewgrades {
$ctsparts.'" value="'.$partid.'" />'."\n";
$result.='<input type="hidden" name="weight_'.
$partid.'" value="'.$weight{$partid}.'" />'."\n";
- $result.='<tr><td><b>Part '.$partid.' Point:</b> </td><td>';
+ my $display_part=&get_display_part($partid,$url,$symb);
+ $result.='<tr><td><b>Part:</b> '.$display_part.' <b>Point:</b> </td><td>';
$result.='<table border="0"><tr>';
my $ctr = 0;
while ($ctr<=$weight{$partid}) { # display radio buttons in a nice table 10 across
@@ -1951,41 +2363,37 @@ sub viewgrades {
'onChange="javascript:writeRadText(\''.$partid.'\','.
$weight{$partid}.')"> '.
'<option selected="on"> </option>'.
- '<option>excused</option></select></td></tr>'."\n";
+ '<option>excused</option>'.
+ '<option>reset status</option></select></td></tr>'."\n";
$ctsparts++;
}
$result.='</table>'.'</td></tr></table>'.'</td></tr></table>'."\n".
'<input type="hidden" name="totalparts" value="'.$ctsparts.'" />';
$result.='<input type="button" value="Reset" '.
'onClick="javascript:resetEntry('.$ctsparts.');" TARGET=_self>';
-# $result.=' <input type="button" value="Submit Changes" name="subButton1'.
-# 'onClick="javascript:submit();" TARGET=_self />'."\n";
#table listing all the students in a section/class
#header of table
- $result.= '<h3>Assign Grade to Specific Students in ';
- if ($ENV{'form.section'} eq 'all') {
- $result.='the Class </h3>';
- } elsif ($ENV{'form.section'} eq 'no') {
- $result.='no Section </h3>';
- } else {
- $result.='Section '.$ENV{'form.section'}.'</h3>';
- }
+ $result.= '<h3>Assign Grade to Specific Students in '.$sectionClass;
$result.= '<table border=0><tr><td bgcolor="#777777">'."\n".
- '<table border=0><tr bgcolor="#deffff">'.
- '<td><b>Fullname</b> <font color="#999999">(Username)</font></td>'."\n";
- my (@parts) = sort(&getpartlist($url));
+ '<table border=0><tr bgcolor="#deffff"><td> <b>No.</b> </td>'.
+ '<td>'.&nameUserString('header')."</td>\n";
+ my (@parts) = sort(&getpartlist($url,$symb));
foreach my $part (@parts) {
my $display=&Apache::lonnet::metadata($url,$part.'.display');
+ $display =~ s|^Number of Attempts|Tries<br />|; # makes the column narrower
if (!$display) { $display = &Apache::lonnet::metadata($url,$part.'.name'); }
+ my ($partid) = &split_part_type($part);
+ my $display_part=&get_display_part($partid,$url,$symb);
if ($display =~ /^Partial Credit Factor/) {
- my ($partid) = &split_part_type($part);
- $result.='<td><b>Score Part '.$partid.'<br />(weight = '.
- $weight{$partid}.')</b></td>'."\n";
+ $result.='<td><b>Score Part:</b> '.$display_part.
+ ' <br /><b>(weight = '.$weight{$partid}.')</b></td>'."\n";
next;
+ } else {
+ $display =~s/\[Part: \Q$partid\E\]/Part:<\/b> $display_part/;
}
$display =~ s|Problem Status|Grade Status<br />|;
- $result.='<td><b>'.$display.'</b></td>'."\n";
+ $result.='<td><b>'.$display.'</td>'."\n";
}
$result.='</tr>';
@@ -1994,20 +2402,18 @@ sub viewgrades {
my (undef,undef,$fullname) = &getclasslist($ENV{'form.section'},'1');
my $ctr = 0;
foreach (sort {lc($$fullname{$a}) cmp lc($$fullname{$b}) } keys %$fullname) {
- my $uname = $_;
- $uname=~s/:/_/;
- $result.='<input type="hidden" name="ctr'.$ctr.'" value="'.$uname.'" />'."\n";
- $result.=&viewstudentgrade($url,$symb,$ENV{'request.course.id'},
- $_,$$fullname{$_},\@parts,\%weight);
$ctr++;
+ $result.=&viewstudentgrade($url,$symb,$ENV{'request.course.id'},
+ $_,$$fullname{$_},\@parts,\%weight,$ctr);
}
$result.='</table></td></tr></table>';
$result.='<input type="hidden" name="total" value="'.$ctr.'" />'."\n";
- $result.='<input type="button" value="Submit Changes" '.
+ $result.='<input type="button" value="Save" '.
'onClick="javascript:submit();" TARGET=_self /></form>'."\n";
if (scalar(%$fullname) eq 0) {
my $colspan=3+scalar(@parts);
- $result='<font color="red">There are no students in section "'.$ENV{'form.section'}.'" with enrollment status "'.$ENV{'form.Status'}.'" to modify or grade.</font>';
+ $result='<font color="red">There are no students in section "'.$ENV{'form.section'}.
+ '" with enrollment status "'.$ENV{'form.Status'}.'" to modify or grade.</font>';
}
$result.=&show_grading_menu_form($symb,$url);
return $result;
@@ -2015,22 +2421,25 @@ sub viewgrades {
#--- call by previous routine to display each student
sub viewstudentgrade {
- my ($url,$symb,$courseid,$student,$fullname,$parts,$weight) = @_;
+ my ($url,$symb,$courseid,$student,$fullname,$parts,$weight,$ctr) = @_;
my ($uname,$udom) = split(/:/,$student);
$student=~s/:/_/;
my %record=&Apache::lonnet::restore($symb,$courseid,$udom,$uname);
- my $result='<tr bgcolor="#ffffdd"><td>'.
+ my $result='<tr bgcolor="#ffffdd"><td align="right">'.
+ '<input type="hidden" name="ctr'.($ctr-1).'" value="'.$student.'" />'.
+ "\n".$ctr.' </td><td> '.
'<a href="javascript:viewOneStudent(\''.$uname.'\',\''.$udom.
'\')"; TARGET=_self>'.$fullname.'</a> '.
'<font color="#999999">('.$uname.($ENV{'user.domain'} eq $udom ? '' : ':'.$udom).')</font></td>'."\n";
foreach my $apart (@$parts) {
my ($part,$type) = &split_part_type($apart);
my $score=$record{"resource.$part.$type"};
+ $result.='<td align="middle">';
if ($type eq 'awarded') {
my $pts = $score eq '' ? '' : $score*$$weight{$part};
$result.='<input type="hidden" name="'.
'GD_'.$student.'_'.$part.'_awarded_s" value="'.$pts.'" />'."\n";
- $result.='<td align="middle"><input type="text" name="'.
+ $result.='<input type="text" name="'.
'GD_'.$student.'_'.$part.'_awarded" '.
'onChange="javascript:changeSelect(\''.$part.'\',\''.$student.
'\')" value="'.$pts.'" size="4" /></td>'."\n";
@@ -2039,19 +2448,18 @@ sub viewstudentgrade {
$status = 'nothing' if ($status eq '');
$result.='<input type="hidden" name="'.'GD_'.$student.'_'.
$part.'_solved_s" value="'.$status.'" />'."\n";
- $result.='<td align="middle"><select name="'.
+ $result.=' <select name="'.
'GD_'.$student.'_'.$part.'_solved" '.
'onChange="javascript:changeOneScore(\''.$part.'\',\''.$student.'\')" >'."\n";
- my $optsel = '<option selected="on"> </option><option>excused</option>'."\n";
- $optsel = '<option> </option><option selected="on">excused</option>'."\n"
- if ($status eq 'excused');
- $result.=$optsel;
- $result.="</select></td>\n";
+ $result.= (($status eq 'excused') ? '<option> </option><option selected="on">excused</option>'
+ : '<option selected="on"> </option><option>excused</option>')."\n";
+ $result.='<option>reset status</option>';
+ $result.="</select> </td>\n";
} else {
$result.='<input type="hidden" name="'.
'GD_'.$student.'_'.$part.'_'.$type.'_s" value="'.$score.'" />'.
"\n";
- $result.='<td align="middle"><input type="text" name="'.
+ $result.='<input type="text" name="'.
'GD_'.$student.'_'.$part.'_'.$type.'" '.
'value="'.$score.'" size="4" /></td>'."\n";
}
@@ -2068,11 +2476,13 @@ sub editgrades {
my $symb=$ENV{'form.symb'};
my $url =$ENV{'form.url'};
my $title='<h3><font color="#339933">Current Grade Status</font></h3>';
- $title.='<font size=+1><b>Problem: </b>'.$ENV{'form.probTitle'}.'</font><br />'."\n";
+ $title.='<font size=+1><b>Current Resource: </b>'.$ENV{'form.probTitle'}.'</font><br />'."\n";
$title.='<font size=+1><b>Section: </b>'.$ENV{'form.section'}.'</font>'."\n";
+
my $result= '<table border="0"><tr><td bgcolor="#777777">'."\n";
$result.= '<table border="0"><tr bgcolor="#deffff">'.
- '<td rowspan=2><b>Username</b></td><td rowspan=2><b>Domain</b></td><td rowspan=2><b>Fullname</b></td>'."\n";
+ '<td rowspan=2 valign="center"> <b>No.</b> </td>'.
+ '<td rowspan=2 valign="center">'.&nameUserString('header')."</td>\n";
my %scoreptr = (
'correct' =>'correct_by_override',
@@ -2088,7 +2498,7 @@ sub editgrades {
my %columns = ();
my ($i,$ctr,$count,$rec_update) = (0,0,0,0);
- my (@parts) = sort(&getpartlist($url));
+ my (@parts) = sort(&getpartlist($url,$symb));
my $header;
while ($ctr < $ENV{'form.totalparts'}) {
my $partid = $ENV{'form.partid_'.$ctr};
@@ -2106,21 +2516,24 @@ sub editgrades {
if ($type eq 'awarded' || $type eq 'solved') { next; }
my $display=&Apache::lonnet::metadata($url,$stores.'.display');
$display =~ s/\[Part: (\w)+\]//;
- $header .= '<td align="center"> <b>Old</b> '.$display.' </td>'.
- '<td align="center"> <b>New</b> '.$display.' </td>';
+ $display =~ s/Number of Attempts/Tries/;
+ $header .= '<td align="center"> <b>Old '.$display.'</b> </td>'.
+ '<td align="center"> <b>New '.$display.'</b> </td>';
$columns{$partid}+=2;
}
}
foreach my $partid (@partid) {
+ my $display_part=&get_display_part($partid,$url,$symb);
$result .= '<td colspan="'.$columns{$partid}.
- '" align="center"><b>Part '.$partid.
- '</b> (Weight = '.$weight{$partid}.')</td>';
+ '" align="center"><b>Part:</b> '.$display_part.
+ ' (Weight = '.$weight{$partid}.')</td>';
}
$result .= '</tr><tr bgcolor="#deffff">';
$result .= $header;
$result .= '</tr>'."\n";
my $noupdate;
+ my ($updateCtr,$noupdateCtr) = (1,1);
for ($i=0; $i<$ENV{'form.total'}; $i++) {
my $line;
my $user = $ENV{'form.ctr'.$i};
@@ -2129,12 +2542,10 @@ sub editgrades {
my ($uname,$udom)=split(/_/,$user);
my %newrecord;
my $updateflag = 0;
- $line .= '<tr bgcolor="#ffffde"><td>'.$uname.' </td><td>'.
- $udom.' </td><td>'.
- $$fullname{$usercolon}.' </td>';
+ $line .= '<td>'.&nameUserString(undef,$$fullname{$usercolon},$uname,$udom).'</td>';
my $usec=$classlist->{"$uname:$udom"}[5];
if (!&canmodify($usec)) {
- my $numcols=scalar(@partid)*(scalar(@parts)-1)*2;
+ my $numcols=scalar(@partid)*4+2;
$noupdate.=$line."<td colspan=\"$numcols\"><font color=\"red\">Not allowed to modify student</font></td></tr>";
next;
}
@@ -2155,19 +2566,29 @@ sub editgrades {
} elsif ($partial == 0) {
$score = 'incorrect_by_override';
}
- $score = 'excused' if (($ENV{'form.GD_'.$user.'_'.$_.'_solved'} eq 'excused') &&
- ($score ne 'excused'));
- $line .= '<td align="center">'.$old_aw.' </td>'.
- '<td align="center">'.$awarded.
- ($score eq 'excused' ? $score : '').' </td>';
+ my $dropMenu = $ENV{'form.GD_'.$user.'_'.$_.'_solved'};
+ $score = 'excused' if (($dropMenu eq 'excused') && ($score ne 'excused'));
- if (!($old_part eq $partial && $old_score eq $score)) {
+ if ($dropMenu eq 'reset status' &&
+ $old_score ne '') { # ignore if no previous attempts => nothing to reset
+ $newrecord{'resource.'.$_.'.tries'} = 0;
+ $newrecord{'resource.'.$_.'.solved'} = '';
+ $newrecord{'resource.'.$_.'.award'} = '';
+ $newrecord{'resource.'.$_.'.awarded'} = 0;
+ $newrecord{'resource.'.$_.'.regrader'}="$ENV{'user.name'}:$ENV{'user.domain'}";
+ $updateflag = 1;
+ } elsif (!($old_part eq $partial && $old_score eq $score)) {
$updateflag = 1;
$newrecord{'resource.'.$_.'.awarded'} = $partial if $partial ne '';
$newrecord{'resource.'.$_.'.solved'} = $score;
$rec_update++;
}
+ $line .= '<td align="center">'.$old_aw.' </td>'.
+ '<td align="center">'.$awarded.
+ ($score eq 'excused' ? $score : '').' </td>';
+
+
my $partid=$_;
foreach my $stores (@parts) {
my ($part,$type) = &split_part_type($stores);
@@ -2177,7 +2598,7 @@ sub editgrades {
my $awarded = $ENV{'form.GD_'.$user.'_'.$part.'_'.$type};
if ($awarded ne '' && $awarded ne $old_aw) {
$newrecord{'resource.'.$part.'.'.$type}= $awarded;
- $newrecord{'resource.'.$part.'regrader'}="$ENV{'user.name'}:$ENV{'user.domain'}";
+ $newrecord{'resource.'.$part.'.regrader'}="$ENV{'user.name'}:$ENV{'user.domain'}";
$updateflag=1;
}
$line .= '<td align="center">'.$old_aw.' </td>'.
@@ -2189,18 +2610,21 @@ sub editgrades {
$count++;
&Apache::lonnet::cstore(\%newrecord,$symb,$ENV{'request.course.id'},
$udom,$uname);
- $result.=$line;
+ $result.='<tr bgcolor="#ffffde"><td align="right"> '.$updateCtr.' </td>'.$line;
+ $updateCtr++;
} else {
- $noupdate.=$line;
+ $noupdate.='<tr bgcolor="#ffffde"><td align="right"> '.$noupdateCtr.' </td>'.$line;
+ $noupdateCtr++;
}
}
if ($noupdate) {
- my $numcols=(scalar(@partid)*(scalar(@parts)-1)*2)+3;
- $result .= '<tr bgcolor="#ffffff"><td align="center" colspan="'.$numcols.'">No Changes Occured For the Students Below</td></tr>'.$noupdate;
+# my $numcols=(scalar(@partid)*(scalar(@parts)-1)*2)+3;
+ my $numcols=scalar(@partid)*4+2;
+ $result .= '<tr bgcolor="#ffffff"><td align="center" colspan="'.$numcols.'">No Changes Occurred For the Students Below</td></tr><tr bgcolor="#ffffde">'.$noupdate;
}
$result .= '</table></td></tr></table>'."\n".
&show_grading_menu_form ($symb,$url);
- my $msg = '<b>Number of records updated = '.$rec_update.
+ my $msg = '<br /><b>Number of records updated = '.$rec_update.
' for '.$count.' student'.($count <= 1 ? '' : 's').'.</b><br />'.
'<b>Total number of students = '.$ENV{'form.total'}.'</b><br />';
return $title.$msg.$result;
@@ -2306,19 +2730,8 @@ sub csvuploadmap_header {
$javascript=&csvupload_javascript_forward_associate();
}
- my $result='<table border="0">';
- $result.='<tr><td colspan=3><font size=+1><b>Problem: </b>'.$ENV{'form.probTitle'}.'</font></td></tr>';
- my ($partlist,$handgrade) = &response_type($url);
- my ($resptype,$hdgrade)=('','no');
- for (sort keys(%$handgrade)) {
- my ($responsetype,$handgrade)=split(/:/,$$handgrade{$_});
- $resptype = $responsetype;
- $hdgrade = $handgrade if ($handgrade eq 'yes');
- $result.='<tr><td><b>Part </b>'.(split(/_/))[0].'</td>'.
- '<td><b>Type: </b>'.$responsetype.'</td>'.
- '<td><b>Handgrade: </b>'.$handgrade.'</font></td></tr>';
- }
- $result.='</table>';
+ my ($result) = &showResourceInfo($url,$ENV{'form.probTitle'});
+
$request->print(<<ENDPICK);
<form method="post" enctype="multipart/form-data" action="/adm/grades" name="gradesupload">
<h3><font color="#339933">Uploading Class Grades</font></h3>
@@ -2346,13 +2759,13 @@ to this page if the data selected is ins
$javascript
</script>
ENDPICK
-return '';
+ return '';
}
sub csvupload_fields {
- my ($url) = @_;
- my (@parts) = &getpartlist($url);
+ my ($url,$symb) = @_;
+ my (@parts) = &getpartlist($url,$symb);
my @fields=(['username','Student Username'],['domain','Student Domain']);
foreach my $part (sort(@parts)) {
my @datum;
@@ -2392,9 +2805,11 @@ sub upcsvScores_form {
</script>
CSVFORMJS
$ENV{'form.probTitle'} = &Apache::lonnet::gettitle($symb);
+ my ($table) = &showResourceInfo($url,$ENV{'form.probTitle'});
+ $result.=$table;
$result.='<br /><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 problem - '.$ENV{'form.probTitle'}.
+ $result.=' <b>Specify a file containing the class scores for current resource'.
'.</b></td></tr>'."\n";
$result.='<tr bgcolor=#ffffe6><td>'."\n";
my $upfile_select=&Apache::loncommon::upfile_select_html();
@@ -2413,7 +2828,6 @@ ENDUPFORM
$result.='</td></tr></table>'."\n";
$result.='</td></tr></table><br /><br />'."\n";
$result.=&show_grading_menu_form($symb,$url);
-
return $result;
}
@@ -2434,7 +2848,7 @@ sub csvuploadmap {
&csvuploadmap_header($request,$symb,$url,$datatoken,$#records+1);
my ($i,$keyfields);
if (@records) {
- my @fields=&csvupload_fields($url);
+ my @fields=&csvupload_fields($url,$symb);
if ($ENV{'form.upfile_associate'} eq 'reverse') {
&Apache::loncommon::csv_print_samples($request,\@records);
@@ -2484,7 +2898,9 @@ sub csvuploadassign {
foreach my $grade (@gradedata) {
my %entries=&Apache::loncommon::record_sep($grade);
my $username=$entries{$fields{'username'}};
+ $username=~s/\s//g;
my $domain=$entries{$fields{'domain'}};
+ $domain=~s/\s//g;
if (!exists($$classlist{"$username:$domain"})) {
push(@skipped,"$username:$domain");
next;
@@ -2527,7 +2943,7 @@ sub csvuploadassign {
#
#-------------------------------------------------------------------
#
-#-------------- Next few routines handles grading by page/sequence
+#-------------- Next few routines handle grading by page/sequence
#
#--- Select a page/sequence and a student to grade
sub pickStudentPage {
@@ -2541,41 +2957,15 @@ function checkPickOne(formname) {
alert("Please select the student you wish to grade.");
return;
}
- var ptr = pullDownSelection(formname.selectpage);
- formname.page.value = eval("formname.page"+ptr+".value");
- formname.title.value = eval("formname.title"+ptr+".value");
+ ptr = pullDownSelection(formname.selectpage);
+ formname.page.value = formname["page"+ptr].value;
+ formname.title.value = formname["title"+ptr].value;
formname.submit();
}
-function radioSelection(radioButton) {
- var selection=null;
- if (radioButton.length > 1) {
- for (var i=0; i<radioButton.length; i++) {
- if (radioButton[i].checked) {
- return radioButton[i].value;
- }
- }
- } else {
- if (radioButton.checked) return radioButton.value;
- }
- return selection;
-}
-
-function pullDownSelection(selectOne) {
- var selection="";
- if (selectOne.length > 1) {
- for (var i=0; i<selectOne.length; i++) {
- if (selectOne[i].selected) {
- return selectOne[i].value;
- }
- }
- } else {
- if (selectOne.selected) return selectOne.value;
- }
-}
</script>
LISTJAVASCRIPT
-
+ &commonJSfunctions($request);
my ($symb,$url) = &get_symb_and_url($request);
my $cdom = $ENV{"course.$ENV{'request.course.id'}.domain"};
my $cnum = $ENV{"course.$ENV{'request.course.id'}.num"};
@@ -2587,7 +2977,9 @@ LISTJAVASCRIPT
$result.='<form action="/adm/grades" method="post" name="displayPage">'."\n";
$result.=' <b>Problems from:</b> <select name="selectpage">'."\n";
my ($titles,$symbx) = &getSymbMap($request);
- my ($curpage,$type,$mapId) = ($symb =~ /(.*?\.(page|sequence))___(\d+)___/);
+ my ($curpage) =&Apache::lonnet::decode_symb($symb);
+# my ($curpage,$mapId) =&Apache::lonnet::decode_symb($symb);
+# my $type=($curpage =~ /\.(page|sequence)/);
my $ctr=0;
foreach (@$titles) {
my ($minder,$showtitle) = ($_ =~ /(\d+)\.(.*)/);
@@ -2607,50 +2999,49 @@ LISTJAVASCRIPT
$result.='<input type="hidden" name="page" />'."\n".
'<input type="hidden" name="title" />'."\n";
- $result.=' <b>View Problems: </b><input type="radio" name="vProb" value="no" checked /> no '."\n".
+ $result.=' <b>View Problems Text: </b><input type="radio" name="vProb" value="no" checked="on" /> no '."\n".
'<input type="radio" name="vProb" value="yes" /> yes '."<br>\n";
$result.=' <b>Submission Details: </b>'.
'<input type="radio" name="lastSub" value="none" /> none'."\n".
- '<input type="radio" name="lastSub" value="datesub" checked /> dates and submissions'."\n".
+ '<input type="radio" name="lastSub" value="datesub" checked /> by dates and submissions'."\n".
'<input type="radio" name="lastSub" value="all" /> all details'."\n";
$result.='<input type="hidden" name="section" value="'.$getsec.'" />'."\n".
- '<input type="hidden" name="Status" value="'.$ENV{'form.Status'}.'" />'."\n".
+ '<input type="hidden" name="Status" value="'.$ENV{'form.Status'}.'" />'."\n".
'<input type="hidden" name="command" value="displayPage" />'."\n".
'<input type="hidden" name="url" value="'.$url.'" />'."\n".
'<input type="hidden" name="symb" value="'.$symb.'" />'."\n".
'<input type="hidden" name="saveState" value="'.$ENV{'form.saveState'}.'" />'."<br />\n";
$result.=' <input type="button" '.
- 'onClick="javascript:checkPickOne(this.form);"value="Submit" /><br />'."\n";
+ 'onClick="javascript:checkPickOne(this.form);"value="Next->" /><br />'."\n";
$request->print($result);
- my $studentTable.=' <b>Select a student you wish to grade</b><br>'.
+ my $studentTable.=' <b>Select a student you wish to grade and then click on the Next button.</b><br>'.
'<table border="0"><tr><td bgcolor="#777777">'.
'<table border="0"><tr bgcolor="#e6ffff">'.
- '<td><b> Fullname <font color="#999999">(username)</font></b></td>'.
- '<td><b> Fullname <font color="#999999">(username)</font></b></td>'.
- '<td><b> Fullname <font color="#999999">(username)</font></b></td>'.
- '<td><b> Fullname <font color="#999999">(username)</font></b></td></tr>';
+ '<td align="right"> <b>No.</b></td>'.
+ '<td>'.&nameUserString('header').'</td>'.
+ '<td align="right"> <b>No.</b></td>'.
+ '<td>'.&nameUserString('header').'</td></tr>';
my (undef,undef,$fullname) = &getclasslist($getsec,'1');
my $ptr = 1;
foreach my $student (sort {lc($$fullname{$a}) cmp lc($$fullname{$b}) } keys %$fullname) {
my ($uname,$udom) = split(/:/,$student);
- $studentTable.=($ptr%4 == 1 ? '<tr bgcolor="#ffffe6"><td>' : '</td><td>');
- $studentTable.='<input type="radio" name="student" value="'.$student.'" /> '.$$fullname{$student}.
- '<font color="#999999"> ('.$uname.($udom eq $cdom ? '':':'.$udom).')</font>'."\n";
- $studentTable.=($ptr%4 == 0 ? '</td></tr>' : '');
+ $studentTable.=($ptr%2 == 1 ? '<tr bgcolor="#ffffe6">' : '</td>');
+ $studentTable.='<td align="right">'.$ptr.' </td>';
+ $studentTable.='<td> <input type="radio" name="student" value="'.$student.'" /> '
+ .&nameUserString(undef,$$fullname{$student},$uname,$udom)."\n";
+ $studentTable.=($ptr%2 == 0 ? '</td></tr>' : '');
$ptr++;
}
- $studentTable.='</td><td> </td><td> </td><td> ' if ($ptr%4 == 2);
- $studentTable.='</td><td> </td><td> ' if ($ptr%4 == 3);
- $studentTable.='</td><td> ' if ($ptr%4 == 0);
+ $studentTable.='</td><td> </td><td> ' if ($ptr%2 == 0);
$studentTable.='</td></tr></table></td></tr></table>'."\n";
- $studentTable.='<br /> <input type="button" '.
- 'onClick="javascript:checkPickOne(this.form);"value="Submit" /></form>'."\n";
+ $studentTable.='<input type="button" '.
+ 'onClick="javascript:checkPickOne(this.form);"value="Next->" /></form>'."\n";
$studentTable.=&show_grading_menu_form($symb,$url);
$request->print($studentTable);
@@ -2660,55 +3051,22 @@ LISTJAVASCRIPT
sub getSymbMap {
my ($request) = @_;
- my $navmap = Apache::lonnavmaps::navmap-> new($ENV{'request.course.fn'}.'.db',
- $ENV{'request.course.fn'}.'_parms.db',1, 1);
- $navmap->init();
-
- # End navmap using boilerplate
-
- my $iterator = Apache::lonnavmaps::iterator->new($navmap, undef, undef, undef, undef, 1, undef, 1);
- my $depth = 1;
- my $curRes = $iterator->next();
+ my $navmap = Apache::lonnavmaps::navmap->new();
my %symbx = ();
my @titles = ();
- my $minder=0;
- my $seenBeginMap = 0;
- while ($depth > 0 || !$seenBeginMap) {
- if ($curRes == $iterator->BEGIN_MAP()) {$depth++; $seenBeginMap = 1; }
- if ($curRes == $iterator->END_MAP()) { $depth--; }
-
- if (ref($curRes) && $curRes->is_map()) {
- my ($mapUrl, $id, $resUrl) = split(/___/, $curRes->symb()); # check map contains at least one problem
- my $map = $navmap->getResourceByUrl($resUrl); # add to navmaps
-
- my $mapiterator = $navmap->getIterator($map->map_start(),
- $map->map_finish());
-
- my $mapdepth = 1;
- my $countProblems = 0;
- $mapiterator->next(); # skip the first BEGIN_MAP
- my $mapcurRes = $mapiterator->next(); # for "current resource"
- while ($mapdepth > 0) {
- if($mapcurRes == $mapiterator->BEGIN_MAP) { $mapdepth++; }
- if($mapcurRes == $mapiterator->END_MAP) { $mapdepth--; }
-
- if (ref($mapcurRes) && $mapcurRes->is_problem() && !$mapcurRes->randomout) {
- $countProblems++;
- }
- $mapcurRes = $mapiterator->next();
- }
- if ($countProblems > 0) {
- my $title = $curRes->compTitle();
- push @titles,$minder.'.'.$title; # minder, just in case two titles are identical
- $symbx{$minder.'.'.$title} = $curRes->symb();
- $minder++;
- }
- }
- $curRes = $iterator->next();
- }
+ my $minder = 0;
- $navmap->untieHashes();
+ # Gather every sequence that has problems.
+ my @sequences = $navmap->retrieveResources(undef, sub { shift->is_map(); }, 1);
+ for my $sequence ($navmap->getById('0.0'), @sequences) {
+ if ($navmap->hasResource($sequence, sub { shift->is_problem(); }, 0) ) {
+ my $title = $minder.'.'.$sequence->compTitle();
+ push @titles, $title; # minder in case two titles are identical
+ $symbx{$title} = $sequence->symb();
+ $minder++;
+ }
+ }
return \@titles,\%symbx;
}
@@ -2725,21 +3083,27 @@ sub displayPage {
my ($classlist,undef,$fullname) = &getclasslist($getsec,'1');
my ($uname,$udom) = split(/:/,$ENV{'form.student'});
my $usec=$classlist->{$ENV{'form.student'}}[5];
+
+ #need to make sure we have the correct data for later EXT calls,
+ #thus invalidate the cache
+ &Apache::lonnet::devalidatecourseresdata(
+ $ENV{'course.'.$ENV{'request.course.id'}.'.num'},
+ $ENV{'course.'.$ENV{'request.course.id'}.'.domain'});
+ &Apache::lonnet::clear_EXT_cache_status();
+
if (!&canview($usec)) {
$request->print('<font color="red">Unable to view requested student.('.$ENV{'form.student'}.')</font>');
$request->print(&show_grading_menu_form($symb,$url));
return;
}
my $result='<h3><font color="#339933"> '.$ENV{'form.title'}.'</font></h3>';
- $result.='<h3> Student: '.$$fullname{$ENV{'form.student'}}.
- '<font color="#999999"> ('.$uname.($udom eq $cdom ? '':':'.$udom).')</font></h3>'."\n";
-
+ $result.='<h3> Student: '.&nameUserString(undef,$$fullname{$ENV{'form.student'}},$uname,$udom).
+ '</h3>'."\n";
&sub_page_js($request);
$request->print($result);
- my $navmap = Apache::lonnavmaps::navmap-> new($ENV{'request.course.fn'}.'.db',
- $ENV{'request.course.fn'}.'_parms.db',1, 1);
- my ($mapUrl, $id, $resUrl) = split(/___/, $ENV{'form.page'});
+ my $navmap = Apache::lonnavmaps::navmap->new();
+ my ($mapUrl, $id, $resUrl)=&Apache::lonnet::decode_symb($ENV{'form.page'});
my $map = $navmap->getResourceByUrl($resUrl); # add to navmaps
my $iterator = $navmap->getIterator($map->map_start(),
@@ -2747,50 +3111,51 @@ sub displayPage {
my $studentTable='<form action="/adm/grades" method="post" name="gradePage">'."\n".
'<input type="hidden" name="command" value="gradeByPage" />'."\n".
+ '<input type="hidden" name="fullname" value="'.$$fullname{$ENV{'form.student'}}.'" />'."\n".
'<input type="hidden" name="student" value="'.$ENV{'form.student'}.'" />'."\n".
'<input type="hidden" name="page" value="'.$pageTitle.'" />'."\n".
'<input type="hidden" name="title" value="'.$ENV{'form.title'}.'" />'."\n".
'<input type="hidden" name="url" value="'.$url.'" />'."\n".
'<input type="hidden" name="symb" value="'.$symb.'" />'."\n".
+ '<input type="hidden" name="overRideScore" value="no" />'."\n".
'<input type="hidden" name="saveState" value="'.$ENV{'form.saveState'}.'" />'."\n";
my $checkIcon = '<img src="'.$request->dir_config('lonIconsURL').
'/check.gif" height="16" border="0" />';
- $studentTable.=' <b>Note:</b> A problem graded correct ('.$checkIcon.
- ') by the computer cannot be changed.'."\n".
+ $studentTable.=' <b>Note:</b> Problems graded correct by the computer are marked with a '.$checkIcon.
+ ' symbol.'."\n".
'<table border="0"><tr><td bgcolor="#777777">'.
'<table border="0"><tr bgcolor="#e6ffff">'.
- '<td align="center"><b> No </b></td>'.
- '<td><b> '.($ENV{'form.vProb'} eq 'no' ? 'Title' : 'Problem View').'/Grade</b></td></tr>';
+ '<td align="center"><b> Prob. </b></td>'.
+ '<td><b> '.($ENV{'form.vProb'} eq 'no' ? 'Title' : 'Problem Text').'/Grade</b></td></tr>';
- my ($depth,$question) = (1,1);
+ my ($depth,$question,$prob) = (1,1,1);
$iterator->next(); # skip the first BEGIN_MAP
my $curRes = $iterator->next(); # for "current resource"
while ($depth > 0) {
if($curRes == $iterator->BEGIN_MAP) { $depth++; }
if($curRes == $iterator->END_MAP) { $depth--; }
- if (ref($curRes) && $curRes->is_problem() && !$curRes->randomout) {
+ if (ref($curRes) && $curRes->is_problem()) {
my $parts = $curRes->parts();
my $title = $curRes->compTitle();
my $symbx = $curRes->symb();
- $studentTable.='<tr bgcolor="#ffffe6"><td align="center" valign="top" >'.$question.
+ $studentTable.='<tr bgcolor="#ffffe6"><td align="center" valign="top" >'.$prob.
(scalar(@{$parts}) == 1 ? '' : '<br>('.scalar(@{$parts}).' parts)').'</td>';
$studentTable.='<td valign="top">';
- if ($ENV{'form.vProb'} eq 'yes') {
- $studentTable.=&show_problem($request,$symbx,$uname,$udom,1);
+ if ($ENV{'form.vProb'} eq 'yes' ) {
+ $studentTable.=&show_problem($request,$symbx,$uname,$udom,1,
+ undef,'both');
} else {
- my $companswer = &Apache::loncommon::get_student_answers(
- $symbx,$uname,$udom,$ENV{'request.course.id'});
+ my $companswer = &Apache::loncommon::get_student_answers($symbx,$uname,$udom,$ENV{'request.course.id'});
$companswer =~ s|<form(.*?)>||g;
$companswer =~ s|</form>||g;
-
# while ($companswer =~ /(<a href\=\"javascript:newWindow.*?Script Vars<\/a>)/s) { #<a href="javascript:newWindow</a>
-# $request->print('match='.$1.'<br>');
-# $companswer =~ s/$1/ /s;
+# $companswer =~ s/$1/ /ms;
+# $request->print('match='.$1."<br>\n");
# }
-# $companswer =~ s/<table border=\"1\">/<table border=\"0\">/g;
+# $companswer =~ s|<table border=\"1\">|<table border=\"0\">|g;
$studentTable.=' <b>'.$title.'</b> <br> <b>Correct answer:</b><br>'.$companswer;
}
@@ -2800,41 +3165,18 @@ sub displayPage {
if ($record{'version'} eq '') {
$studentTable.='<br /> <font color="red">No recorded submission for this problem</font><br />';
} else {
- $studentTable.='<table border="0" width="100%"><tr><td bgcolor="#777777">'.
- '<table border="0" width="100%"><tr bgcolor="#e6ffff">'.
- '<td><b>Date/Time</b></td>'.
- '<td><b>Submission</b></td>'.
- '<td><b>Status </b></td></tr>';
- my ($version);
- for ($version=1;$version<=$record{'version'};$version++) {
- my $timestamp = scalar(localtime($record{$version.':timestamp'}));
- $studentTable.='<tr bgcolor="#ffffff" valign="top"><td>'.$timestamp.'</td>';
- my @versionKeys = split(/\:/,$record{$version.':keys'});
- my @displaySub = ();
- foreach my $partid (@{$parts}) {
- my $responseType = $curRes->responseType($partid);
- my @matchKey = grep /^resource\.$partid\..*?\.submission$/,@versionKeys;
- next if ($record{"$version:resource.$partid.solved"} eq '');
-# next if ($record{"$version:resource.$partid.award"} eq 'APPROX_ANS' &&
-# $record{"$version:resource.$partid.solved"} eq '');
- $displaySub[0].=(exists $record{$version.':'.$matchKey[0]}) ?
- '<b>Part '.$partid.' Type:'.$responseType.':endtype'.
- ($record{"$version:resource.$partid.tries"} eq '' ? 'Trial not counted' :
- 'Trial '.$record{"$version:resource.$partid.tries"}).'</b> '.
- $record{$version.':'.$matchKey[0]}.'<br />' : '';
- $displaySub[1].=(exists $record{"$version:resource.$partid.award"}) ?
- '<b>Part '.$partid.'</b> '.
- $record{"$version:resource.$partid.award"}.'/'.
- $record{"$version:resource.$partid.solved"}.'<br />' : '';
- $displaySub[2].=(exists $record{"$version:resource.$partid.regrader"}) ?
- $record{"$version:resource.$partid.regrader"}.' (<b>Part:</b> '.$partid.')' : '';
+ my %responseType = ();
+ foreach my $partid (@{$parts}) {
+ my @responseIds =$curRes->responseIds($partid);
+ my @responseType =$curRes->responseType($partid);
+ my %responseIds;
+ for (my $i=0;$i<=$#responseIds;$i++) {
+ $responseIds{$responseIds[$i]}=$responseType[$i];
}
- $displaySub[2].=(exists $record{"$version:resource.regrader"}) ?
- $record{"$version:resource.regrader"} : '';
- $studentTable.='<td>'.$displaySub[0].' </td><td>'.$displaySub[1].
- ($displaySub[2] eq '' ? '' : 'Manually graded by '.$displaySub[2]).' </td></tr>';
+ $responseType{$partid} = \%responseIds;
}
- $studentTable.='</table></td></tr></table>';
+ $studentTable.= &displaySubByDates($symbx,\%record,$parts,\%responseType,$checkIcon,$uname,$udom);
+
}
} elsif ($ENV{'form.lastSub'} eq 'all') {
my $last = ($ENV{'form.lastSub'} eq 'last' ? 'last' : '');
@@ -2849,6 +3191,7 @@ sub displayPage {
$studentTable.='<input type="hidden" name="q_'.$question.'" value="'.$partid.'" />'."\n";
$question++;
}
+ $prob++;
}
$studentTable.='</td></tr>';
@@ -2856,10 +3199,8 @@ sub displayPage {
$curRes = $iterator->next();
}
- $navmap->untieHashes();
-
$studentTable.='</td></tr></table></td></tr></table>'."\n".
- ' <input type="button" value="Save" '.
+ '<input type="button" value="Save" '.
'onClick="javascript:checkSubmitPage(this.form,'.$question.');" TARGET=_self />'.
'</form>'."\n";
$studentTable.=&show_grading_menu_form($symb,$url);
@@ -2868,6 +3209,84 @@ sub displayPage {
return '';
}
+sub displaySubByDates {
+ my ($symb,$record,$parts,$responseType,$checkIcon,$uname,$udom) = @_;
+ my $isCODE=0;
+ if (exists($record->{'resource.CODE'})) { $isCODE=1; }
+ my $studentTable='<table border="0" width="100%"><tr><td bgcolor="#777777">'.
+ '<table border="0" width="100%"><tr bgcolor="#e6ffff">'.
+ '<td><b>Date/Time</b></td>'.
+ ($isCODE?'<td><b>CODE</b></td>':'').
+ '<td><b>Submission</b></td>'.
+ '<td><b>Status </b></td></tr>';
+ my ($version);
+ my %mark;
+ my %orders;
+ $mark{'correct_by_student'} = $checkIcon;
+ if (!exists($$record{'1:timestamp'})) {
+ return '<br /> <font color="red">Nothing submitted - no attempts</font><br />';
+ }
+ for ($version=1;$version<=$$record{'version'};$version++) {
+ my $timestamp = scalar(localtime($$record{$version.':timestamp'}));
+ $studentTable.='<tr bgcolor="#ffffff" valign="top"><td>'.$timestamp.'</td>';
+ if ($isCODE) {
+ $studentTable.='<td>'.$record->{$version.':resource.CODE'}.'</td>';
+ }
+ my @versionKeys = split(/\:/,$$record{$version.':keys'});
+ my @displaySub = ();
+ foreach my $partid (@{$parts}) {
+ my @matchKey = sort(grep /^resource\.\Q$partid\E\..*?\.submission$/,@versionKeys);
+# next if ($$record{"$version:resource.$partid.solved"} eq '');
+ my $display_part=&get_display_part($partid,undef,$symb);
+ foreach my $matchKey (@matchKey) {
+ if (exists($$record{$version.':'.$matchKey}) &&
+ $$record{$version.':'.$matchKey} ne '') {
+ my ($responseId)=($matchKey=~ /^resource\.\Q$partid\E\.(.*?)\.submission$/);
+ $displaySub[0].='<b>Part:</b> '.$display_part.' ';
+ $displaySub[0].='<font color="#999999">(ID '.
+ $responseId.')</font> <b>';
+ if ($$record{"$version:resource.$partid.tries"} eq '') {
+ $displaySub[0].='Trial not counted';
+ } else {
+ $displaySub[0].='Trial '.
+ $$record{"$version:resource.$partid.tries"};
+ }
+ my $responseType=$responseType->{$partid}->{$responseId};
+ if (!exists($orders{$partid})) { $orders{$partid}={}; }
+ if (!exists($orders{$partid}->{$responseId})) {
+ $orders{$partid}->{$responseId}=
+ &get_order($partid,$responseId,$symb,$uname,$udom);
+ }
+ $displaySub[0].='</b> '.
+ &cleanRecord($$record{$version.':'.$matchKey},$responseType,$symb,$partid,$responseId,$record,$orders{$partid}->{$responseId},"$version:").'<br />';
+ }
+ }
+ if (exists $$record{"$version:resource.$partid.award"}) {
+ $displaySub[1].='<b>Part:</b> '.$display_part.' '.
+ lc($$record{"$version:resource.$partid.award"}).' '.
+ $mark{$$record{"$version:resource.$partid.solved"}}.
+ '<br />';
+ }
+ if (exists $$record{"$version:resource.$partid.regrader"}) {
+ $displaySub[2].=$$record{"$version:resource.$partid.regrader"}.
+ ' (<b>'.&mt('Part').':</b> '.$display_part.')';
+ }
+ }
+ # needed because old essay regrader has not parts info
+ if (exists $$record{"$version:resource.regrader"}) {
+ $displaySub[2].=$$record{"$version:resource.regrader"};
+ }
+ $studentTable.='<td>'.$displaySub[0].' </td><td>'.$displaySub[1];
+ if ($displaySub[2]) {
+ $studentTable.='Manually graded by '.$displaySub[2];
+ }
+ $studentTable.=' </td></tr>';
+
+ }
+ $studentTable.='</table></td></tr></table>';
+ return $studentTable;
+}
+
sub updateGradeByPage {
my ($request) = shift;
@@ -2884,14 +3303,13 @@ sub updateGradeByPage {
return;
}
my $result='<h3><font color="#339933"> '.$ENV{'form.title'}.'</font></h3>';
- $result.='<h3> Student: '.$$fullname{$ENV{'form.student'}}.
- '<font color="#999999"> ('.$uname.($udom eq $cdom ? '':':'.$udom).')</font></h3>'."\n";
+ $result.='<h3> Student: '.&nameUserString(undef,$ENV{'form.fullname'},$uname,$udom).
+ '</h3>'."\n";
$request->print($result);
- my $navmap = Apache::lonnavmaps::navmap-> new($ENV{'request.course.fn'}.'.db',
- $ENV{'request.course.fn'}.'_parms.db',1, 1);
- my ($mapUrl, $id, $resUrl) = split(/___/, $ENV{'form.page'});
+ my $navmap = Apache::lonnavmaps::navmap->new();
+ my ($mapUrl, $id, $resUrl) = &Apache::lonnet::decode_symb( $ENV{'form.page'});
my $map = $navmap->getResourceByUrl($resUrl); # add to navmaps
my $iterator = $navmap->getIterator($map->map_start(),
@@ -2899,14 +3317,14 @@ sub updateGradeByPage {
my $studentTable='<table border="0"><tr><td bgcolor="#777777">'.
'<table border="0"><tr bgcolor="#e6ffff">'.
- '<td align="center"><b> No </b></td>'.
+ '<td align="center"><b> Prob. </b></td>'.
'<td><b> Title </b></td>'.
'<td><b> Previous Score </b></td>'.
'<td><b> New Score </b></td></tr>';
$iterator->next(); # skip the first BEGIN_MAP
my $curRes = $iterator->next(); # for "current resource"
- my ($depth,$question,$changeflag)= (1,1,0);
+ my ($depth,$question,$prob,$changeflag)= (1,1,1,0);
while ($depth > 0) {
if($curRes == $iterator->BEGIN_MAP) { $depth++; }
if($curRes == $iterator->END_MAP) { $depth--; }
@@ -2915,7 +3333,7 @@ sub updateGradeByPage {
my $parts = $curRes->parts();
my $title = $curRes->compTitle();
my $symbx = $curRes->symb();
- $studentTable.='<tr bgcolor="#ffffe6"><td align="center" valign="top" >'.$question.
+ $studentTable.='<tr bgcolor="#ffffe6"><td align="center" valign="top" >'.$prob.
(scalar(@{$parts}) == 1 ? '' : '<br>('.scalar(@{$parts}).' parts)').'</td>';
$studentTable.='<td valign="top"> <b>'.$title.'</b> </td>';
@@ -2931,31 +3349,40 @@ sub updateGradeByPage {
my $score;
if ($partial > 0) {
$score = 'correct_by_override';
- } elsif ($partial == 0) {
+ } elsif ($newpts ne '') { #empty is taken as 0
$score = 'incorrect_by_override';
}
- if ($ENV{'form.GD_SEL'.$question.'_'.$partid} eq 'excused') {
+ my $dropMenu = $ENV{'form.GD_SEL'.$question.'_'.$partid};
+ if ($dropMenu eq 'excused') {
$partial = '';
$score = 'excused';
+ } elsif ($dropMenu eq 'reset status'
+ && $ENV{'form.solved'.$question.'_'.$partid} ne '') { #update only if previous record exists
+ $newrecord{'resource.'.$partid.'.tries'} = 0;
+ $newrecord{'resource.'.$partid.'.solved'} = '';
+ $newrecord{'resource.'.$partid.'.award'} = '';
+ $newrecord{'resource.'.$partid.'.awarded'} = 0;
+ $newrecord{'resource.'.$partid.'.regrader'} = "$ENV{'user.name'}:$ENV{'user.domain'}";
+ $changeflag++;
+ $newpts = '';
}
+ my $display_part=&get_display_part($partid,undef,
+ $curRes->symb());
my $oldstatus = $ENV{'form.solved'.$question.'_'.$partid};
- $displayPts[0].=' <b>Part</b> '.$partid.' = '.
+ $displayPts[0].=' <b>Part:</b> '.$display_part.' = '.
(($oldstatus eq 'excused') ? 'excused' : $oldpts).
' <br>';
- $displayPts[1].=' <b>Part</b> '.$partid.' = '.
- ($oldstatus eq 'correct_by_student' ? $oldpts :
- (($score eq 'excused') ? 'excused' : $newpts)).
+ $displayPts[1].=' <b>Part:</b> '.$display_part.' = '.
+ (($score eq 'excused') ? 'excused' : $newpts).
' <br>';
$question++;
- if (($oldstatus eq 'correct_by_student') ||
- ($newpts eq $oldpts && $score eq $oldstatus))
- {
- next;
- }
+ next if ($dropMenu eq 'reset status' || ($newpts == $oldpts && $score ne 'excused'));
+
$newrecord{'resource.'.$partid.'.awarded'} = $partial if $partial ne '';
- $newrecord{'resource.'.$partid.'.solved'} = $score;
- $newrecord{'resource.'.$partid.'.regrader'}="$ENV{'user.name'}:$ENV{'user.domain'}";
+ $newrecord{'resource.'.$partid.'.solved'} = $score if $score ne '';
+ $newrecord{'resource.'.$partid.'.regrader'} = "$ENV{'user.name'}:$ENV{'user.domain'}"
+ if (scalar(keys(%newrecord)) > 0);
$changeflag++;
}
@@ -2963,16 +3390,16 @@ sub updateGradeByPage {
&Apache::lonnet::cstore(\%newrecord,$symbx,$ENV{'request.course.id'},
$udom,$uname);
}
+
$studentTable.='<td valign="top">'.$displayPts[0].'</td>'.
'<td valign="top">'.$displayPts[1].'</td>'.
'</tr>';
+ $prob++;
}
$curRes = $iterator->next();
}
- $navmap->untieHashes();
-
$studentTable.='</td></tr></table></td></tr></table>';
$studentTable.=&show_grading_menu_form($ENV{'form.symb'},$ENV{'form.url'});
my $grademsg=($changeflag == 0 ? 'No score was changed or updated.' :
@@ -3004,7 +3431,7 @@ sub getSequenceDropDown {
my ($request,$symb)=@_;
my $result='<select name="selectpage">'."\n";
my ($titles,$symbx) = &getSymbMap($request);
- my ($curpage,$type,$mapId) = ($symb =~ /(.*?\.(page|sequence))___(\d+)___/);
+ my ($curpage)=&Apache::lonnet::decode_symb($symb);
my $ctr=0;
foreach (@$titles) {
my ($minder,$showtitle) = ($_ =~ /(\d+)\.(.*)/);
@@ -3017,16 +3444,28 @@ sub getSequenceDropDown {
return $result;
}
+sub scantron_filenames {
+ my $cdom=$ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
+ my $cname=$ENV{'course.'.$ENV{'request.course.id'}.'.num'};
+ my @files=&Apache::lonnet::dirlist('userfiles',$cdom,$cname,
+ &Apache::loncommon::propath($cdom,$cname));
+ my @possiblenames;
+ foreach my $filename (sort(@files)) {
+ ($filename)=split(/&/,$filename);
+ if ($filename!~/^scantron_orig_/) { next ; }
+ $filename=~s/^scantron_orig_//;
+ push(@possiblenames,$filename);
+ }
+ return @possiblenames;
+}
+
sub scantron_uploads {
- if (!-e $Apache::lonnet::perlvar{'lonScansDir'}) { return ''};
+ my ($file2grade) = @_;
my $result= '<select name="scantron_selectfile">';
- opendir(DIR,$Apache::lonnet::perlvar{'lonScansDir'});
- my @files=sort(readdir(DIR));
- foreach my $filename (@files) {
- if ($filename eq '.' or $filename eq '..') { next; }
- $result.="<option>$filename</option>\n";
+ $result.="<option></option>";
+ foreach my $filename (sort(&scantron_filenames())) {
+ $result.="<option".($filename eq $file2grade ? ' selected="on"':'').">$filename</option>\n";
}
- closedir(DIR);
$result.="</select>";
return $result;
}
@@ -3034,6 +3473,7 @@ sub scantron_uploads {
sub scantron_scantab {
my $fh=Apache::File->new($Apache::lonnet::perlvar{'lonTabDir'}.'/scantronformat.tab');
my $result='<select name="scantron_format">'."\n";
+ $result.='<option></option>'."\n";
foreach my $line (<$fh>) {
my ($name,$descrip)=split(/:/,$line);
if ($name =~ /^\#/) { next; }
@@ -3044,60 +3484,179 @@ sub scantron_scantab {
return $result;
}
+sub scantron_CODElist {
+ my $cdom = $ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
+ my $cnum = $ENV{'course.'.$ENV{'request.course.id'}.'.num'};
+ my @names=&Apache::lonnet::getkeys('CODEs',$cdom,$cnum);
+ my $namechoice='<option></option>';
+ foreach my $name (sort {uc($a) cmp uc($b)} @names) {
+ if ($name =~ /^error: 2 /) { next; }
+ $namechoice.='<option value="'.$name.'">'.$name.'</option>';
+ }
+ $namechoice='<select name="scantron_CODElist">'.$namechoice.'</select>';
+ return $namechoice;
+}
+
+sub scantron_CODEunique {
+ my $result='<nobr>
+ <input type="radio" name="scantron_CODEunique"
+ value="Yes" checked="on" /> Yes
+ </nobr>
+ <nobr>
+ <input type="radio" name="scantron_CODEunique"
+ value="No" /> No
+ </nobr>';
+ return $result;
+}
+
sub scantron_selectphase {
- my ($r) = @_;
+ my ($r,$file2grade) = @_;
my ($symb,$url)=&get_symb_and_url($r);
if (!$symb) {return '';}
my $sequence_selector=&getSequenceDropDown($r,$symb);
my $default_form_data=&defaultFormData($symb,$url);
my $grading_menu_button=&show_grading_menu_form($symb,$url);
- my $file_selector=&scantron_uploads();
+ my $file_selector=&scantron_uploads($file2grade);
my $format_selector=&scantron_scantab();
+ my $CODE_selector=&scantron_CODElist();
+ my $CODE_unique=&scantron_CODEunique();
my $result;
+ #FIXME allow instructor to be able to download the scantron file
+ # and to upload it,
$result.= <<SCANTRONFORM;
-<form method="post" enctype="multipart/form-data" action="/adm/grades" name="scantro_process">
- <input type="hidden" name="command" value="scantron_process" />
- $default_form_data
- <table width="100%" border="0">
+ <table width="100%" border="0">
<tr>
+ <form method="post" enctype="multipart/form-data" action="/adm/grades" name="scantron_process">
<td bgcolor="#777777">
+ <input type="hidden" name="command" value="scantron_warning" />
+ $default_form_data
<table width="100%" border="0">
<tr bgcolor="#e6ffff">
- <td>
- <b>Specify file location and which Folder/Sequence to grade</b>
+ <td colspan="2">
+ <b>Specify file and which Folder/Sequence to grade</b>
</td>
</tr>
<tr bgcolor="#ffffe6">
+ <td> Sequence to grade: </td><td> $sequence_selector </td>
+ </tr>
+ <tr bgcolor="#ffffe6">
+ <td> Filename of scoring office file: </td><td> $file_selector </td>
+ </tr>
+ <tr bgcolor="#ffffe6">
+ <td> Format of data file: </td><td> $format_selector </td>
+ </tr>
+ <tr bgcolor="#ffffe6">
+ <td> Saved CODEs to validate against: </td><td> $CODE_selector</td>
+ </tr>
+ <tr bgcolor="#ffffe6">
+ <td> Each CODE is only to be used once:</td><td> $CODE_unique </td>
+ </tr>
+ <tr bgcolor="#ffffe6">
+ <td> Options: </td>
<td>
- Sequence to grade: $sequence_selector
+ <input type="checkbox" name="scantron_options_redo" value="redo_skipped"/> Do only previously skipped records <br />
+ <input type="checkbox" name="scantron_options_ignore" value="ignore_corrections"/> Remove all exisiting corrections
</td>
</tr>
<tr bgcolor="#ffffe6">
+ <td colspan="2">
+ <input type="submit" value="Validate Scantron Records" />
+ </td>
+ </tr>
+ </table>
+ </td>
+ </form>
+ </tr>
+SCANTRONFORM
+
+ $r->print($result);
+
+ if (&Apache::lonnet::allowed('usc',$ENV{'request.role.domain'}) ||
+ &Apache::lonnet::allowed('usc',$ENV{'request.course.id'})) {
+
+ $r->print(<<SCANTRONFORM);
+ <tr>
+ <td bgcolor="#777777">
+ <table width="100%" border="0">
+ <tr bgcolor="#e6ffff">
<td>
- Filename of scoring office file: $file_selector
- </td>
+ <b>Specify a Scantron data file to upload.</b>
+ </td>
</tr>
<tr bgcolor="#ffffe6">
<td>
- Format of data file: $format_selector
- </td>
+SCANTRONFORM
+ my $default_form_data=&defaultFormData(&get_symb_and_url($r,1));
+ my $cdom= $ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
+ my $cnum= $ENV{'course.'.$ENV{'request.course.id'}.'.num'};
+ $r->print(<<UPLOAD);
+ <script type="text/javascript" language="javascript">
+ function checkUpload(formname) {
+ if (formname.upfile.value == "") {
+ alert("Please use the browse button to select a file from your local directory.");
+ return false;
+ }
+ formname.submit();
+ }
+ </script>
+
+ <form enctype='multipart/form-data' action='/adm/grades' name='rules' method='post'>
+ $default_form_data
+ <input name='courseid' type='hidden' value='$cnum' />
+ <input name='domainid' type='hidden' value='$cdom' />
+ <input name='command' value='scantronupload_save' type='hidden' />
+ File to upload:<input type="file" name="upfile" size="50" />
+ <br />
+ <input type="button" onClick="javascript:checkUpload(this.form);" value="Upload Scantron Data" />
+ </form>
+UPLOAD
+
+ $r->print(<<SCANTRONFORM);
+ </td>
</tr>
</table>
</td>
</tr>
+SCANTRONFORM
+ }
+ $r->print(<<SCANTRONFORM);
+ <tr>
+ <form action='/adm/grades' name='scantron_download'>
+ <td bgcolor="#777777">
+ <input type="hidden" name="command" value="scantron_download" />
+ <table width="100%" border="0">
+ <tr bgcolor="#e6ffff">
+ <td colspan="2">
+ <b>Download a scoring office file</b>
+ </td>
+ </tr>
+ <tr bgcolor="#ffffe6">
+ <td> Filename of scoring office file: </td><td> $file_selector </td>
+ </tr>
+ <tr bgcolor="#ffffe6">
+ <td colspan="2">
+ <input type="submit" value="Show List of Files" />
+ </td>
+ </tr>
+ </table>
+ </td>
+ </form>
+ </tr>
+SCANTRONFORM
+
+ $r->print(<<SCANTRONFORM);
</table>
- <input type="submit" value="Submit" />
-</form>
$grading_menu_button
SCANTRONFORM
- return $result;
+ return
}
sub get_scantron_config {
my ($which) = @_;
my $fh=Apache::File->new($Apache::lonnet::perlvar{'lonTabDir'}.'/scantronformat.tab');
my %config;
+ #FIXME probably should move to XML it has already gotten a bit much now
foreach my $line (<$fh>) {
my ($name,$descrip)=split(/:/,$line);
if ($name ne $which ) { next; }
@@ -3114,6 +3673,12 @@ sub get_scantron_config {
$config{'Qlength'}=$config[8];
$config{'Qoff'}=$config[9];
$config{'Qon'}=$config[10];
+ $config{'PaperID'}=$config[11];
+ $config{'PaperIDlength'}=$config[12];
+ $config{'FirstName'}=$config[13];
+ $config{'FirstNamelength'}=$config[14];
+ $config{'LastName'}=$config[15];
+ $config{'LastNamelength'}=$config[16];
last;
}
return %config;
@@ -3129,21 +3694,99 @@ sub username_to_idmap {
return %idmap;
}
+sub scantron_fixup_scanline {
+ my ($scantron_config,$scan_data,$line,$whichline,$field,$args)=@_;
+ if ($field eq 'ID') {
+ if (length($args->{'newid'}) > $$scantron_config{'IDlength'}) {
+ return ($line,1,'New value too large');
+ }
+ if (length($args->{'newid'}) < $$scantron_config{'IDlength'}) {
+ $args->{'newid'}=sprintf('%-'.$$scantron_config{'IDlength'}.'s',
+ $args->{'newid'});
+ }
+ substr($line,$$scantron_config{'IDstart'}-1,
+ $$scantron_config{'IDlength'})=$args->{'newid'};
+ if ($args->{'newid'}=~/^\s*$/) {
+ &scan_data($scan_data,"$whichline.user",
+ $args->{'username'}.':'.$args->{'domain'});
+ }
+ } elsif ($field eq 'CODE') {
+ if ($args->{'CODE_ignore_dup'}) {
+ &scan_data($scan_data,"$whichline.CODE_ignore_dup",'1');
+ }
+ &scan_data($scan_data,"$whichline.useCODE",'1');
+ if ($args->{'CODE'} ne 'use_unfound') {
+ if (length($args->{'CODE'}) > $$scantron_config{'CODElength'}) {
+ return ($line,1,'New CODE value too large');
+ }
+ if (length($args->{'CODE'}) < $$scantron_config{'CODElength'}) {
+ $args->{'CODE'}=sprintf('%-'.$$scantron_config{'CODElength'}.'s',$args->{'CODE'});
+ }
+ substr($line,$$scantron_config{'CODEstart'}-1,
+ $$scantron_config{'CODElength'})=$args->{'CODE'};
+ }
+ } elsif ($field eq 'answer') {
+ my $length=$scantron_config->{'Qlength'};
+ my $off=$scantron_config->{'Qoff'};
+ my $on=$scantron_config->{'Qon'};
+ my $answer=${off}x$length;
+ if ($args->{'response'} eq 'none') {
+ &scan_data($scan_data,
+ "$whichline.no_bubble.".$args->{'question'},'1');
+ } else {
+ substr($answer,$args->{'response'},1)=$on;
+ &scan_data($scan_data,
+ "$whichline.no_bubble.".$args->{'question'},undef,'1');
+ }
+ my $where=$length*($args->{'question'}-1)+$scantron_config->{'Qstart'};
+ substr($line,$where-1,$length)=$answer;
+ }
+ return $line;
+}
+
+sub scan_data {
+ my ($scan_data,$key,$value,$delete)=@_;
+ my $filename=$ENV{'form.scantron_selectfile'};
+ if (defined($value)) {
+ $scan_data->{$filename.'_'.$key} = $value;
+ }
+ if ($delete) { delete($scan_data->{$filename.'_'.$key}); }
+ return $scan_data->{$filename.'_'.$key};
+}
+
sub scantron_parse_scanline {
- my ($line,$scantron_config)=@_;
+ my ($line,$whichline,$scantron_config,$scan_data,$justHeader)=@_;
my %record;
my $questions=substr($line,$$scantron_config{'Qstart'}-1);
my $data=substr($line,0,$$scantron_config{'Qstart'}-1);
if ($$scantron_config{'CODElocation'} ne 0) {
if ($$scantron_config{'CODElocation'} < 0) {
- $record{'scantron.CODE'}=substr($data,$$scantron_config{'CODEstart'}-1,
+ $record{'scantron.CODE'}=substr($data,
+ $$scantron_config{'CODEstart'}-1,
$$scantron_config{'CODElength'});
+ if (&scan_data($scan_data,"$whichline.useCODE")) {
+ $record{'scantron.useCODE'}=1;
+ }
+ if (&scan_data($scan_data,"$whichline.CODE_ignore_dup")) {
+ $record{'scantron.CODE_ignore_dup'}=1;
+ }
} else {
#FIXME interpret first N questions
}
}
$record{'scantron.ID'}=substr($data,$$scantron_config{'IDstart'}-1,
$$scantron_config{'IDlength'});
+ $record{'scantron.PaperID'}=
+ substr($data,$$scantron_config{'PaperID'}-1,
+ $$scantron_config{'PaperIDlength'});
+ $record{'scantron.FirstName'}=
+ substr($data,$$scantron_config{'FirstName'}-1,
+ $$scantron_config{'FirstNamelength'});
+ $record{'scantron.LastName'}=
+ substr($data,$$scantron_config{'LastName'}-1,
+ $$scantron_config{'LastNamelength'});
+ if ($justHeader) { return \%record; }
+
my @alphabet=('A'..'Z');
my $questnum=0;
while ($questions) {
@@ -3151,59 +3794,795 @@ sub scantron_parse_scanline {
my $currentquest=substr($questions,0,$$scantron_config{'Qlength'});
substr($questions,0,$$scantron_config{'Qlength'})='';
if (length($currentquest) < $$scantron_config{'Qlength'}) { next; }
- my (@array)=split(/$$scantron_config{'Qon'}/,$currentquest);
- if (scalar(@array) gt 2) {
- #FIXME do something intelligent with double bubbles
- Apache->request->print("<br ><b>Wha!!!</b> <pre>".scalar(@array).
- '-'.$currentquest.'-'.$questnum.'</pre><br />');
- }
+ my @array=split($$scantron_config{'Qon'},$currentquest,-1);
if (length($array[0]) eq $$scantron_config{'Qlength'}) {
$record{"scantron.$questnum.answer"}='';
+ if (!&scan_data($scan_data,"$whichline.no_bubble.$questnum")) {
+ push(@{$record{"scantron.missingerror"}},$questnum);
+ }
} else {
$record{"scantron.$questnum.answer"}=$alphabet[length($array[0])];
}
+ if (scalar(@array) gt 2) {
+ push(@{$record{'scantron.doubleerror'}},$questnum);
+ my @ans=@array;
+ my $i=length($ans[0]);shift(@ans);
+ while ($#ans) {
+ $i+=length($ans[0])+1;
+ $record{"scantron.$questnum.answer"}.=$alphabet[$i];
+ shift(@ans);
+ }
+ }
}
$record{'scantron.maxquest'}=$questnum;
return \%record;
}
sub scantron_add_delay {
+ my ($delayqueue,$scanline,$errormessage,$errorcode)=@_;
+ push(@$delayqueue,
+ {'line' => $scanline, 'emsg' => $errormessage,
+ 'ecode' => $errorcode }
+ );
}
sub scantron_find_student {
- my ($scantron_record,$idmap)=@_;
+ my ($scantron_record,$scan_data,$idmap,$line)=@_;
my $scanID=$$scantron_record{'scantron.ID'};
+ if ($scanID =~ /^\s*$/) {
+ return &scan_data($scan_data,"$line.user");
+ }
foreach my $id (keys(%$idmap)) {
- Apache->request->print('<pre>checking studnet -'.$id.'- againt -'.$scanID.'- </pre>');
- if (lc($id) eq lc($scanID)) { Apache->request->print('success');return $$idmap{$id}; }
+ if (lc($id) eq lc($scanID)) {
+ return $$idmap{$id};
+ }
}
return undef;
}
sub scantron_filter {
my ($curres)=@_;
- if (ref($curres) && $curres->is_problem() && !$curres->randomout) {
+ # randomout is dysfunctional at best for this purpose
+ if (ref($curres) && $curres->is_problem()) { #&& !$curres->randomout) {
return 1;
}
return 0;
}
+sub scantron_process_corrections {
+ my ($r) = @_;
+ my %scantron_config=&get_scantron_config($ENV{'form.scantron_format'});
+ my ($scanlines,$scan_data)=&scantron_getfile();
+ my $classlist=&Apache::loncoursedata::get_classlist();
+ my $which=$ENV{'form.scantron_line'};
+ my $line=&scantron_get_line($scanlines,$scan_data,$which);
+ my ($skip,$err,$errmsg);
+ if ($ENV{'form.scantron_skip_record'}) {
+ $skip=1;
+ } elsif ($ENV{'form.scantron_corrections'} =~ /^(duplicate|incorrect)ID$/) {
+ my $newstudent=$ENV{'form.scantron_username'}.':'.
+ $ENV{'form.scantron_domain'};
+ my $newid=$classlist->{$newstudent}->[&Apache::loncoursedata::CL_ID];
+ ($line,$err,$errmsg)=
+ &scantron_fixup_scanline(\%scantron_config,$scan_data,$line,$which,
+ 'ID',{'newid'=>$newid,
+ 'username'=>$ENV{'form.scantron_username'},
+ 'domain'=>$ENV{'form.scantron_domain'}});
+ } elsif ($ENV{'form.scantron_corrections'} =~ /^(duplicate|incorrect)CODE$/) {
+ my $resolution=$ENV{'form.scantron_CODE_resolution'};
+ my $newCODE;
+ my %args;
+ if ($resolution eq 'use_unfound') {
+ $newCODE='use_unfound';
+ } elsif ($resolution eq 'use_found') {
+ $newCODE=$ENV{'form.scantron_CODE_selectedvalue'};
+ } elsif ($resolution eq 'use_typed') {
+ $newCODE=$ENV{'form.scantron_CODE_newvalue'};
+ } elsif ($resolution =~ /^use_closest_(\d+)/) {
+ $newCODE=$ENV{"form.scantron_CODE_closest_$1"};
+ }
+ if ($ENV{'form.scantron_corrections'} eq 'duplicateCODE') {
+ $args{'CODE_ignore_dup'}=1;
+ }
+ $args{'CODE'}=$newCODE;
+ ($line,$err,$errmsg)=
+ &scantron_fixup_scanline(\%scantron_config,$scan_data,$line,$which,
+ 'CODE',\%args);
+ } elsif ($ENV{'form.scantron_corrections'} =~ /^(missing|double)bubble$/) {
+ foreach my $question (split(',',$ENV{'form.scantron_questions'})) {
+ ($line,$err,$errmsg)=
+ &scantron_fixup_scanline(\%scantron_config,$scan_data,$line,
+ $which,'answer',
+ { 'question'=>$question,
+ 'response'=>$ENV{"form.scantron_correct_Q_$question"}});
+ if ($err) { last; }
+ }
+ }
+ if ($err) {
+ $r->print("Unable to accept last correction, an error occurred :$errmsg:");
+ } else {
+ &scantron_put_line($scanlines,$scan_data,$which,$line,$skip);
+ &scantron_putfile($scanlines,$scan_data);
+ }
+}
+
+sub reset_skipping_status {
+ my ($scanlines,$scan_data)=&scantron_getfile();
+ &scan_data($scan_data,'remember_skipping',undef,1);
+ &scantron_putfile(undef,$scan_data);
+}
+
+sub allow_skipping {
+ my ($scan_data,$i)=@_;
+ my %remembered=split(':',&scan_data($scan_data,'remember_skipping'));
+ delete($remembered{$i});
+ &scan_data($scan_data,'remember_skipping',join(':',%remembered));
+}
+
+sub should_be_skipped {
+ my ($scan_data,$i)=@_;
+ if ($ENV{'form.scantron_options_redo'} !~ /^redo_/) {
+ # not redoing old skips
+ return 0;
+ }
+ my %remembered=split(':',&scan_data($scan_data,'remember_skipping'));
+ if (exists($remembered{$i})) { return 0; }
+ return 1;
+}
+
+sub remember_current_skipped {
+ my ($scanlines,$scan_data)=&scantron_getfile();
+ my %to_remember;
+ for (my $i=0;$i<=$scanlines->{'count'};$i++) {
+ if ($scanlines->{'skipped'}[$i]) {
+ $to_remember{$i}=1;
+ }
+ }
+ &Apache::lonnet::logthis('remembering '.join(':',%to_remember));
+ &scan_data($scan_data,'remember_skipping',join(':',%to_remember));
+ &scantron_putfile(undef,$scan_data);
+}
+
+sub check_for_error {
+ my ($r,$result)=@_;
+ if ($result ne 'ok' && $result ne 'not_found' ) {
+ $r->print("An error occured ($result) when trying to Remove the existing corrections.");
+ }
+}
+
+sub scantron_warning_screen {
+ my ($button_text)=@_;
+ my $title=&Apache::lonnet::gettitle($ENV{'form.selectpage'});
+ return (<<STUFF);
+<p>
+<font color="red">Please double check the information
+ below before clicking on '$button_text'</font>
+</p>
+<table>
+<tr><td><b>Sequence To be Graded:</b></td><td>$title</td></tr>
+<tr><td><b>Data File that will be used:</b></td><td><tt>$ENV{'form.scantron_selectfile'}</tt></td></tr>
+</table>
+</font>
+<br />
+<p> If this information is correct, please click on '$button_text'.</p>
+<p> If something is incorrect, please click the 'Grading Menu' button to start over.</p>
+
+<br />
+STUFF
+}
+
+sub scantron_do_warning {
+ my ($r)=@_;
+ my ($symb,$url)=&get_symb_and_url($r);
+ if (!$symb) {return '';}
+ my $default_form_data=&defaultFormData($symb,$url);
+ $r->print(&scantron_form_start().$default_form_data);
+ my $warning=&scantron_warning_screen('Validate Records');
+ $r->print(<<STUFF);
+$warning
+<input type="submit" name="submit" value="Validate Records" />
+<input type="hidden" name="command" value="scantron_validate" />
+</form>
+STUFF
+ $r->print("<br />".&show_grading_menu_form($symb,$url)."</body></html>");
+ return '';
+}
+
+sub scantron_form_start {
+ my ($max_bubble)=@_;
+ my $result= <<SCANTRONFORM;
+<form method="post" enctype="multipart/form-data" action="/adm/grades" name="scantronupload">
+ <input type="hidden" name="selectpage" value="$ENV{'form.selectpage'}" />
+ <input type="hidden" name="scantron_format" value="$ENV{'form.scantron_format'}" />
+ <input type="hidden" name="scantron_selectfile" value="$ENV{'form.scantron_selectfile'}" />
+ <input type="hidden" name="scantron_maxbubble" value="$max_bubble" />
+ <input type="hidden" name="scantron_CODElist" value="$ENV{'form.scantron_CODElist'}" />
+ <input type="hidden" name="scantron_CODEunique" value="$ENV{'form.scantron_CODEunique'}" />
+ <input type="hidden" name="scantron_options_redo" value="$ENV{'form.scantron_options_redo'}" />
+ <input type="hidden" name="scantron_options_ignore" value="$ENV{'form.scantron_options_ignore'}" />
+SCANTRONFORM
+ return $result;
+}
+
+sub scantron_validate_file {
+ my ($r) = @_;
+ my ($symb,$url)=&get_symb_and_url($r);
+ if (!$symb) {return '';}
+ my $default_form_data=&defaultFormData($symb,$url);
+
+ # do the detection of only doing skipped records first befroe we delete
+ # them when doing the corrections reset
+ if ($ENV{'form.scantron_options_redo'} ne 'redo_skipped_ready') {
+ &reset_skipping_status();
+ }
+ if ($ENV{'form.scantron_options_redo'} eq 'redo_skipped') {
+ &remember_current_skipped();
+ &scantron_remove_file('skipped');
+ $ENV{'form.scantron_options_redo'}='redo_skipped_ready';
+ }
+
+ if ($ENV{'form.scantron_options_ignore'} eq 'ignore_corrections') {
+ &check_for_error($r,&scantron_remove_file('corrected'));
+ &check_for_error($r,&scantron_remove_file('skipped'));
+ &check_for_error($r,&scantron_remove_scan_data());
+ $ENV{'form.scantron_options_ignore'}='done';
+ }
+
+ if ($ENV{'form.scantron_corrections'}) {
+ &scantron_process_corrections($r);
+ }
+ $r->print("<p>Gathering neccessary info.</p>");$r->rflush();
+ #get the student pick code ready
+ $r->print(&Apache::loncommon::studentbrowser_javascript());
+ my $max_bubble=&scantron_get_maxbubble($r);
+ my $result=&scantron_form_start($max_bubble).$default_form_data;
+ $r->print($result);
+
+ my @validate_phases=( 'ID',
+ 'CODE',
+ 'doublebubble',
+ 'missingbubbles');
+ if (!$ENV{'form.validatepass'}) {
+ $ENV{'form.validatepass'} = 0;
+ }
+ my $currentphase=$ENV{'form.validatepass'};
+
+ my $stop=0;
+ while (!$stop && $currentphase < scalar(@validate_phases)) {
+ $r->print("<p> Validating ".$validate_phases[$currentphase]."</p>");
+ $r->rflush();
+ my $which="scantron_validate_".$validate_phases[$currentphase];
+ {
+ no strict 'refs';
+ ($stop,$currentphase)=&$which($r,$currentphase);
+ }
+ }
+ if (!$stop) {
+ my $warning=&scantron_warning_screen('Start Grading');
+ $r->print(<<STUFF);
+Validation process complete.<br />
+$warning
+<input type="submit" name="submit" value="Start Grading" />
+<input type="hidden" name="command" value="scantron_process" />
+STUFF
+
+ } else {
+ $r->print('<input type="hidden" name="command" value="scantron_validate" />');
+ $r->print("<input type='hidden' name='validatepass' value='".$currentphase."' />");
+ }
+ if ($stop) {
+ $r->print('<input type="submit" name="submit" value="Continue ->" />');
+ $r->print(' using corrected info <br />');
+ $r->print("<input type='submit' value='Skip' name='scantron_skip_record' />");
+ $r->print(" this scanline saving it for later.");
+ }
+ $r->print(" </form><br />".&show_grading_menu_form($symb,$url).
+ "</body></html>");
+ return '';
+}
+
+sub scantron_remove_file {
+ my ($which)=@_;
+ my $cname=$ENV{'course.'.$ENV{'request.course.id'}.'.num'};
+ my $cdom=$ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
+ my $file='scantron_';
+ if ($which eq 'corrected' || $which eq 'skipped') {
+ $file.=$which.'_';
+ } else {
+ return 'refused';
+ }
+ $file.=$ENV{'form.scantron_selectfile'};
+ return &Apache::lonnet::removeuserfile($cname,$cdom,$file);
+}
+
+sub scantron_remove_scan_data {
+ my $cname=$ENV{'course.'.$ENV{'request.course.id'}.'.num'};
+ my $cdom=$ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
+ my @keys=&Apache::lonnet::getkeys('nohist_scantrondata',$cdom,$cname);
+ my @todelete;
+ my $filename=$ENV{'form.scantron_selectfile'};
+ foreach my $key (@keys) {
+ if ($key=~/^\Q$filename\E_/) {
+ if ($ENV{'form.scantron_options_redo'} eq 'redo_skipped_ready' &&
+ $key=~/remember_skipping/) {
+ next;
+ }
+ push(@todelete,$key);
+ }
+ }
+ my $result;
+ if (@todelete) {
+ $result=&Apache::lonnet::del('nohist_scantrondata',\@todelete,$cdom,$cname);
+ }
+ return $result;
+}
+
+sub scantron_getfile {
+ #FIXME really would prefer a scantron directory
+ my $cname=$ENV{'course.'.$ENV{'request.course.id'}.'.num'};
+ my $cdom=$ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
+ my $lines;
+ $lines=&Apache::lonnet::getfile('/uploaded/'.$cdom.'/'.$cname.'/'.
+ 'scantron_orig_'.$ENV{'form.scantron_selectfile'});
+ my %scanlines;
+ $scanlines{'orig'}=[(split("\n",$lines,-1))];
+ my $temp=$scanlines{'orig'};
+ $scanlines{'count'}=$#$temp;
+
+ $lines=&Apache::lonnet::getfile('/uploaded/'.$cdom.'/'.$cname.'/'.
+ 'scantron_corrected_'.$ENV{'form.scantron_selectfile'});
+ if ($lines eq '-1') {
+ $scanlines{'corrected'}=[];
+ } else {
+ $scanlines{'corrected'}=[(split("\n",$lines,-1))];
+ }
+ $lines=&Apache::lonnet::getfile('/uploaded/'.$cdom.'/'.$cname.'/'.
+ 'scantron_skipped_'.$ENV{'form.scantron_selectfile'});
+ if ($lines eq '-1') {
+ $scanlines{'skipped'}=[];
+ } else {
+ $scanlines{'skipped'}=[(split("\n",$lines,-1))];
+ }
+ my @tmp=&Apache::lonnet::dump('nohist_scantrondata',$cdom,$cname);
+ if ($tmp[0] =~ /^(error:|no_such_host)/) { @tmp=(); }
+ my %scan_data = @tmp;
+ return (\%scanlines,\%scan_data);
+}
+
+sub lonnet_putfile {
+ my ($contents,$filename)=@_;
+ my $docuname=$ENV{'course.'.$ENV{'request.course.id'}.'.num'};
+ my $docudom=$ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
+ my $docuhome=$ENV{'course.'.$ENV{'request.course.id'}.'.home'};
+ $ENV{'form.sillywaytopassafilearound'}=$contents;
+ &Apache::lonnet::finishuserfileupload($docuname,$docudom,$docuhome,'sillywaytopassafilearound',$filename);
+
+}
+
+sub scantron_putfile {
+ my ($scanlines,$scan_data) = @_;
+ #FIXME really would prefer a scantron directory
+ my $cname=$ENV{'course.'.$ENV{'request.course.id'}.'.num'};
+ my $cdom=$ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
+ if ($scanlines) {
+ my $prefix='scantron_';
+# no need to update orig, shouldn't change
+# &lonnet_putfile(join("\n",@{$scanlines->{'orig'}}),$prefix.'orig_'.
+# $ENV{'form.scantron_selectfile'});
+ &lonnet_putfile(join("\n",@{$scanlines->{'corrected'}}),
+ $prefix.'corrected_'.
+ $ENV{'form.scantron_selectfile'});
+ &lonnet_putfile(join("\n",@{$scanlines->{'skipped'}}),
+ $prefix.'skipped_'.
+ $ENV{'form.scantron_selectfile'});
+ }
+ &Apache::lonnet::put('nohist_scantrondata',$scan_data,$cdom,$cname);
+}
+
+sub scantron_get_line {
+ my ($scanlines,$scan_data,$i)=@_;
+ if (&should_be_skipped($scan_data,$i)) { return undef; }
+ if ($scanlines->{'skipped'}[$i]) { return undef; }
+ if ($scanlines->{'corrected'}[$i]) {return $scanlines->{'corrected'}[$i];}
+ return $scanlines->{'orig'}[$i];
+}
+
+sub get_todo_count {
+ my ($scanlines,$scan_data)=@_;
+ my $count=0;
+ for (my $i=0;$i<=$scanlines->{'count'};$i++) {
+ my $line=&scantron_get_line($scanlines,$scan_data,$i);
+ if ($line=~/^[\s\cz]*$/) { next; }
+ $count++;
+ }
+ return $count;
+}
+
+sub scantron_put_line {
+ my ($scanlines,$scan_data,$i,$newline,$skip)=@_;
+ if ($skip) {
+ $scanlines->{'skipped'}[$i]=$newline;
+ &allow_skipping($scan_data,$i);
+ return;
+ }
+ $scanlines->{'corrected'}[$i]=$newline;
+}
+
+sub scantron_validate_ID {
+ my ($r,$currentphase) = @_;
+
+ #get student info
+ my $classlist=&Apache::loncoursedata::get_classlist();
+ my %idmap=&username_to_idmap($classlist);
+
+ #get scantron line setup
+ my %scantron_config=&get_scantron_config($ENV{'form.scantron_format'});
+ my ($scanlines,$scan_data)=&scantron_getfile();
+
+ my %found=('ids'=>{},'usernames'=>{});
+ for (my $i=0;$i<=$scanlines->{'count'};$i++) {
+ my $line=&scantron_get_line($scanlines,$scan_data,$i);
+ if ($line=~/^[\s\cz]*$/) { next; }
+ my $scan_record=&scantron_parse_scanline($line,$i,\%scantron_config,
+ $scan_data);
+ my $id=$$scan_record{'scantron.ID'};
+ my $found;
+ foreach my $checkid (keys(%idmap)) {
+ if (lc($checkid) eq lc($id)) { $found=$checkid;last; }
+ }
+ if ($found) {
+ my $username=$idmap{$found};
+ if ($found{'ids'}{$found}) {
+ &scantron_get_correction($r,$i,$scan_record,\%scantron_config,
+ $line,'duplicateID',$found);
+ return(1,$currentphase);
+ } elsif ($found{'usernames'}{$username}) {
+ &scantron_get_correction($r,$i,$scan_record,\%scantron_config,
+ $line,'duplicateID',$username);
+ return(1,$currentphase);
+ }
+ #FIXME store away line we previously saw the ID on to use above
+ $found{'ids'}{$found}++;
+ $found{'usernames'}{$username}++;
+ } else {
+ if ($id =~ /^\s*$/) {
+ my $username=&scan_data($scan_data,"$i.user");
+ if (defined($username) && $found{'usernames'}{$username}) {
+ &scantron_get_correction($r,$i,$scan_record,
+ \%scantron_config,
+ $line,'duplicateID',$username);
+ return(1,$currentphase);
+ } elsif (!defined($username)) {
+ &scantron_get_correction($r,$i,$scan_record,
+ \%scantron_config,
+ $line,'incorrectID');
+ return(1,$currentphase);
+ }
+ $found{'usernames'}{$username}++;
+ } else {
+ &scantron_get_correction($r,$i,$scan_record,\%scantron_config,
+ $line,'incorrectID');
+ return(1,$currentphase);
+ }
+ }
+ }
+
+ return (0,$currentphase+1);
+}
+
+sub scantron_get_correction {
+ my ($r,$i,$scan_record,$scan_config,$line,$error,$arg)=@_;
+
+#FIXME in the case of a duplicated ID the previous line, probaly need
+#to show both the current line and the previous one and allow skipping
+#the previous one or the current one
+
+ $r->print("<p><b>An error was detected ($error)</b>");
+ if ( defined($$scan_record{'scantron.PaperID'}) ) {
+ $r->print(" for PaperID <tt>".
+ $$scan_record{'scantron.PaperID'}."</tt> \n");
+ } else {
+ $r->print(" in scanline $i <pre>".
+ $line."</pre> \n");
+ }
+ $r->print('<input type="hidden" name="scantron_corrections" value="'.$error.'" />'."\n");
+ $r->print('<input type="hidden" name="scantron_line" value="'.$i.'" />'."\n");
+ if ($error =~ /ID$/) {
+ if ($error eq 'incorrectID') {
+ $r->print("The encoded ID is not in the classlist</p>\n");
+ } elsif ($error eq 'duplicateID') {
+ $r->print("The encoded ID has also been used by a previous paper $arg</p>\n");
+ }
+ $r->print("<p>The ID on the form is <tt>".
+ $$scan_record{'scantron.ID'}."</tt><br />\n");
+ $r->print("The name on the paper is ".
+ $$scan_record{'scantron.LastName'}.",".
+ $$scan_record{'scantron.FirstName'}."</p>");
+ $r->print("<p>How should I handle this? <br /> \n");
+ $r->print("\n<ul><li> ");
+ #FIXME it would be nice if this sent back the user ID and
+ #could do partial userID matches
+ $r->print(&Apache::loncommon::selectstudent_link('scantronupload',
+ 'scantron_username','scantron_domain'));
+ $r->print(": <input type='text' name='scantron_username' value='' />");
+ $r->print("\n@".
+ &Apache::loncommon::select_dom_form($ENV{'request.role.domain'},'scantron_domain'));
+
+ $r->print('</li>');
+ } elsif ($error =~ /CODE$/) {
+ if ($error eq 'incorrectCODE') {
+ $r->print("</p><p>The encoded CODE is not in the list of possible CODEs</p>\n");
+ } elsif ($error eq 'duplicateCODE') {
+ $r->print("</p><p>The encoded CODE has also been used by a previous paper ".join(', ',@{$arg}).", and CODEs are supposed to be unique</p>\n");
+ }
+ $r->print("<p>The CODE on the form is <tt>'".
+ $$scan_record{'scantron.CODE'}."'</tt><br />\n");
+ $r->print("<p>The ID on the form is <tt>".
+ $$scan_record{'scantron.ID'}."</tt><br />\n");
+ $r->print("The name on the paper is ".
+ $$scan_record{'scantron.LastName'}.",".
+ $$scan_record{'scantron.FirstName'}."</p>");
+ $r->print("<p>How should I handle this? <br /> \n");
+ $r->print("\n<br /> ");
+ my $i=0;
+ if ($error eq 'incorrectCODE') {
+ my ($max,$closest)=&scantron_get_closely_matching_CODEs($arg,$$scan_record{'scantron.CODE'});
+ foreach my $testcode (@{$closest}) {
+ my $checked='';
+ if (!$i) { $checked=' checked="on" '; }
+ $r->print("<input type='radio' name='scantron_CODE_resolution' value='use_closest_$i' $checked /> Use the similar CODE <b><tt>".$testcode."</tt></b> instead.<input type='hidden' name='scantron_CODE_closest_$i' value='$testcode' />");
+ $r->print("\n<br />");
+ $i++;
+ }
+ }
+ my $checked; if (!$i) { $checked=' checked="on" '; }
+ $r->print("<input type='radio' name='scantron_CODE_resolution' value='use_unfound' $checked /> Use the CODE <b><tt>".$$scan_record{'scantron.CODE'}."</tt></b> that is was on the paper, ignoring the error.");
+ $r->print("\n<br />");
+
+ $r->print(<<ENDSCRIPT);
+<script type="text/javascript">
+function change_radio(field) {
+ var slct=document.scantronupload.scantron_CODE_resolution;
+ var i;
+ for (i=0;i<slct.length;i++) {
+ if (slct[i].value==field) { slct[i].checked=true; }
+ }
+}
+</script>
+ENDSCRIPT
+ my $href="/adm/pickcode?".
+ "form=".&Apache::lonnet::escape("scantronupload").
+ "&scantron_format=".&Apache::lonnet::escape($ENV{'form.scantron_format'}).
+ "&scantron_CODElist=".&Apache::lonnet::escape($ENV{'form.scantron_CODElist'}).
+ "&curCODE=".&Apache::lonnet::escape($$scan_record{'scantron.CODE'}).
+ "&scantron_selectfile=".&Apache::lonnet::escape($ENV{'form.scantron_selectfile'});
+ $r->print("<input type='radio' name='scantron_CODE_resolution' value='use_found' /> <a target='_blank' href='$href'>Select</a> a CODE from the list of all CODEs and use it. Selected CODE is <input readonly='true' type='text' size='8' name='scantron_CODE_selectedvalue' onfocus=\"javascript:change_radio('use_found')\" onchange=\"javascript:change_radio('use_found')\" />");
+ $r->print("\n<br />");
+ $r->print("<input type='radio' name='scantron_CODE_resolution' value='use_typed' /> Use <input type='text' size='8' name='scantron_CODE_newvalue' onfocus=\"javascript:change_radio('use_typed')\" onkeypress=\"javascript:change_radio('use_typed')\" /> as the CODE.");
+ $r->print("\n<br /><br />");
+ } elsif ($error eq 'doublebubble') {
+ $r->print("<p>There have been multiple bubbles scanned for a some question(s)</p>\n");
+ $r->print('<input type="hidden" name="scantron_questions" value="'.
+ join(',',@{$arg}).'" />');
+ $r->print("<p>Please indicate which bubble should be used for grading</p>");
+ foreach my $question (@{$arg}) {
+ my $selected=$$scan_record{"scantron.$question.answer"};
+ &scantron_bubble_selector($r,$scan_config,$question,split('',$selected));
+ }
+ } elsif ($error eq 'missingbubble') {
+ $r->print("<p>There have been <b>no</b> bubbles scanned for some question(s)</p>\n");
+ $r->print("<p>Please indicate which bubble should be used for grading</p>");
+ $r->print("Some questions have no scanned bubbles\n");
+ $r->print('<input type="hidden" name="scantron_questions" value="'.
+ join(',',@{$arg}).'" />');
+ foreach my $question (@{$arg}) {
+ my $selected=$$scan_record{"scantron.$question.answer"};
+ &scantron_bubble_selector($r,$scan_config,$question);
+ }
+ } else {
+ $r->print("\n<ul>");
+ }
+ $r->print("\n</li></ul>");
+
+}
+
+sub scantron_bubble_selector {
+ my ($r,$scan_config,$quest,@selected)=@_;
+ my $max=$$scan_config{'Qlength'};
+ my @alphabet=('A'..'Z');
+ $r->print("<table border='1'><tr><td rowspan='2'>$quest</td>");
+ for (my $i=0;$i<$max+1;$i++) {
+ $r->print('<td align="center">');
+ if ($selected[0] eq $alphabet[$i]) { $r->print('X'); shift(@selected) }
+ else { $r->print(' '); }
+ $r->print('</td>');
+ }
+ $r->print('<td></td></tr><tr>');
+ for (my $i=0;$i<$max;$i++) {
+ $r->print('<td><input type="radio" name="scantron_correct_Q_'.$quest.
+ '" value="'.$i.'" />'.$alphabet[$i]."</td>");
+ }
+ $r->print('<td><input type="radio" name="scantron_correct_Q_'.$quest.
+ '" value="none" /> No bubble </td>');
+ $r->print('</tr></table>');
+}
+
+sub num_matches {
+ my ($orig,$code) = @_;
+ my @code=split(//,$code);
+ my @orig=split(//,$orig);
+ my $same=0;
+ for (my $i=0;$i<scalar(@code);$i++) {
+ if ($code[$i] eq $orig[$i]) { $same++; }
+ }
+ return $same;
+}
+
+sub scantron_get_closely_matching_CODEs {
+ my ($allcodes,$CODE)=@_;
+ my @CODEs;
+ foreach my $testcode (sort(keys(%{$allcodes}))) {
+ push(@{$CODEs[&num_matches($CODE,$testcode)]},$testcode);
+ }
+
+ return ($#CODEs,$CODEs[-1]);
+}
+
+sub get_codes {
+ my $old_name=$ENV{'form.scantron_CODElist'};
+ my $cdom =$ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
+ my $cnum =$ENV{'course.'.$ENV{'request.course.id'}.'.num'};
+ my %result=&Apache::lonnet::get('CODEs',[$old_name],$cdom,$cnum);
+ my %allcodes=map {(&Apache::lonprintout::num_to_letters($_),1)} split(',',$result{$old_name});
+ return %allcodes;
+}
+
+sub scantron_validate_CODE {
+ my ($r,$currentphase) = @_;
+ my %scantron_config=&get_scantron_config($ENV{'form.scantron_format'});
+ if ($scantron_config{'CODElocation'} &&
+ $scantron_config{'CODEstart'} &&
+ $scantron_config{'CODElength'}) {
+ if (!defined($ENV{'form.scantron_CODElist'})) {
+ &FIXME_blow_up()
+ }
+ } else {
+ return (0,$currentphase+1);
+ }
+
+ my %usedCODEs;
+
+ my %allcodes=&get_codes();
+
+ my ($scanlines,$scan_data)=&scantron_getfile();
+ for (my $i=0;$i<=$scanlines->{'count'};$i++) {
+ my $line=&scantron_get_line($scanlines,$scan_data,$i);
+ if ($line=~/^[\s\cz]*$/) { next; }
+ my $scan_record=&scantron_parse_scanline($line,$i,\%scantron_config,
+ $scan_data);
+ my $CODE=$$scan_record{'scantron.CODE'};
+ my $error=0;
+ if (!&Apache::lonnet::validCODE($CODE)) {
+ &scantron_get_correction($r,$i,$scan_record,
+ \%scantron_config,
+ $line,'incorrectCODE',\%allcodes);
+ return(1,$currentphase);
+ }
+ if (%allcodes && !exists($allcodes{$CODE})
+ && !$$scan_record{'scantron.useCODE'}) {
+ &scantron_get_correction($r,$i,$scan_record,
+ \%scantron_config,
+ $line,'incorrectCODE',\%allcodes);
+ return(1,$currentphase);
+ }
+ if (exists($usedCODEs{$CODE})
+ && $ENV{'form.scantron_CODEunique'} eq 'yes'
+ && !$$scan_record{'scantron.CODE_ignore_dup'}) {
+ &scantron_get_correction($r,$i,$scan_record,
+ \%scantron_config,
+ $line,'duplicateCODE',$usedCODEs{$CODE});
+ return(1,$currentphase);
+ }
+ push (@{$usedCODEs{$CODE}},$$scan_record{'scantron.PaperID'});
+ }
+ return (0,$currentphase+1);
+}
+
+sub scantron_validate_doublebubble {
+ my ($r,$currentphase) = @_;
+ #get student info
+ my $classlist=&Apache::loncoursedata::get_classlist();
+ my %idmap=&username_to_idmap($classlist);
+
+ #get scantron line setup
+ my %scantron_config=&get_scantron_config($ENV{'form.scantron_format'});
+ my ($scanlines,$scan_data)=&scantron_getfile();
+ for (my $i=0;$i<=$scanlines->{'count'};$i++) {
+ my $line=&scantron_get_line($scanlines,$scan_data,$i);
+ if ($line=~/^[\s\cz]*$/) { next; }
+ my $scan_record=&scantron_parse_scanline($line,$i,\%scantron_config,
+ $scan_data);
+ if (!defined($$scan_record{'scantron.doubleerror'})) { next; }
+ &scantron_get_correction($r,$i,$scan_record,\%scantron_config,$line,
+ 'doublebubble',
+ $$scan_record{'scantron.doubleerror'});
+ return (1,$currentphase);
+ }
+ return (0,$currentphase+1);
+}
+
+sub scantron_get_maxbubble {
+ my ($r)=@_;
+ if (defined($ENV{'form.scantron_maxbubble'}) &&
+ $ENV{'form.scantron_maxbubble'}) {
+ return $ENV{'form.scantron_maxbubble'};
+ }
+ my $navmap=Apache::lonnavmaps::navmap->new();
+ my (undef,undef,$sequence)=
+ &Apache::lonnet::decode_symb($ENV{'form.selectpage'});
+ my $map=$navmap->getResourceByUrl($sequence);
+ my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0);
+ &Apache::lonnet::delenv('form.counter');
+ foreach my $resource (@resources) {
+ my $result=&Apache::lonnet::ssi($resource->src());
+ }
+ &Apache::lonnet::delenv('scantron\.');
+ my $envfile=$ENV{'user.environment'};
+ $envfile=~/\/([^\/]+)\.id$/;
+ $envfile=$1;
+ &Apache::lonnet::transfer_profile_to_env($r->dir_config('lonIDsDir'),
+ $envfile);
+ $ENV{'form.scantron_maxbubble'}=$ENV{'form.counter'}-1;
+ return $ENV{'form.scantron_maxbubble'};
+}
+
+sub scantron_validate_missingbubbles {
+ my ($r,$currentphase) = @_;
+ #get student info
+ my $classlist=&Apache::loncoursedata::get_classlist();
+ my %idmap=&username_to_idmap($classlist);
+
+ #get scantron line setup
+ my %scantron_config=&get_scantron_config($ENV{'form.scantron_format'});
+ my ($scanlines,$scan_data)=&scantron_getfile();
+ my $max_bubble=&scantron_get_maxbubble();
+ if (!$max_bubble) { $max_bubble=2**31; }
+ for (my $i=0;$i<=$scanlines->{'count'};$i++) {
+ my $line=&scantron_get_line($scanlines,$scan_data,$i);
+ if ($line=~/^[\s\cz]*$/) { next; }
+ my $scan_record=&scantron_parse_scanline($line,$i,\%scantron_config,
+ $scan_data);
+ if (!defined($$scan_record{'scantron.missingerror'})) { next; }
+ my @to_correct;
+ foreach my $missing (@{$$scan_record{'scantron.missingerror'}}) {
+ if ($missing > $max_bubble) { next; }
+ push(@to_correct,$missing);
+ }
+ if (@to_correct) {
+ &scantron_get_correction($r,$i,$scan_record,\%scantron_config,
+ $line,'missingbubble',\@to_correct);
+ return (1,$currentphase);
+ }
+
+ }
+ return (0,$currentphase+1);
+}
+
sub scantron_process_students {
my ($r) = @_;
- my (undef,undef,$sequence)=split(/___/,$ENV{'form.selectpage'});
+ my (undef,undef,$sequence)=&Apache::lonnet::decode_symb($ENV{'form.selectpage'});
my ($symb,$url)=&get_symb_and_url($r);
if (!$symb) {return '';}
my $default_form_data=&defaultFormData($symb,$url);
my %scantron_config=&get_scantron_config($ENV{'form.scantron_format'});
- my $scanlines=Apache::File->new($Apache::lonnet::perlvar{'lonScansDir'}."/$ENV{'form.scantron_selectfile'}");
- my @scanlines=<$scanlines>;
+ my ($scanlines,$scan_data)=&scantron_getfile();
my $classlist=&Apache::loncoursedata::get_classlist();
my %idmap=&username_to_idmap($classlist);
- my $navmap=Apache::lonnavmaps::navmap->new($ENV{'request.course.fn'}.'.db',$ENV{'request.course.fn'}.'_parms.db',1, 1);
+ my $navmap=Apache::lonnavmaps::navmap->new();
my $map=$navmap->getResourceByUrl($sequence);
my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0);
- $r->print("geto ".scalar(@resources)."<br />");
+# $r->print("geto ".scalar(@resources)."<br />");
my $result= <<SCANTRONFORM;
<form method="post" enctype="multipart/form-data" action="/adm/grades" name="scantronupload">
<input type="hidden" name="command" value="scantron_configphase" />
@@ -3212,88 +4591,219 @@ SCANTRONFORM
$r->print($result);
my @delayqueue;
- my $totalcorrect;
- my $totalincorrect;
-
- my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,
- 'Scantron Status','Scantron Progress',scalar(@scanlines));
- foreach my $line (@scanlines) {
- my $studentcorrect;
- my $studentincorrect;
-
- chomp($line);
- my $scan_record=&scantron_parse_scanline($line,\%scantron_config);
- my ($uname,$udom);
- if ($uname=&scantron_find_student($scan_record,\%idmap)) {
- &scantron_add_delay(\@delayqueue,$line,
- 'Unable to find a student that matches');
- }
- $r->print('<pre>doing studnet'.$uname.'</pre>');
- ($uname,$udom)=split(/:/,$uname);
- &Apache::lonnet::delenv('form.counter');
- &Apache::lonnet::appenv(%$scan_record);
-# &Apache::lonhomework::showhash(%ENV);
- $Apache::lonxml::debug=1;
- &Apache::lonxml::debug("line is $line");
+ my %completedstudents;
+
+ my $count=&get_todo_count($scanlines,$scan_data);
+ my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Scantron Status',
+ 'Scantron Progress',$count,
+ 'inline',undef,'scantronupload');
+ &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,
+ 'Processing first student');
+ my $start=&Time::HiRes::time();
+ my $i=-1;
+ my ($uname,$udom,$started);
+ while ($i<$scanlines->{'count'}) {
+ ($uname,$udom)=('','');
+ $i++;
+ my $line=&scantron_get_line($scanlines,$scan_data,$i);
+ if ($line=~/^[\s\cz]*$/) { next; }
+ if ($started) {
+ &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,
+ 'last student');
+ }
+ $started=1;
+ my $scan_record=&scantron_parse_scanline($line,$i,\%scantron_config,
+ $scan_data);
+ unless ($uname=&scantron_find_student($scan_record,$scan_data,
+ \%idmap,$i)) {
+ &scantron_add_delay(\@delayqueue,$line,
+ 'Unable to find a student that matches',1);
+ next;
+ }
+ if (exists $completedstudents{$uname}) {
+ &scantron_add_delay(\@delayqueue,$line,
+ 'Student '.$uname.' has multiple sheets',2);
+ next;
+ }
+ ($uname,$udom)=split(/:/,$uname);
+ &Apache::lonnet::delenv('form.counter');
+ &Apache::lonnet::appenv(%$scan_record);
- my $i=0;
+ my $i=0;
foreach my $resource (@resources) {
$i++;
- my $result=&Apache::lonnet::ssi($resource->src(),
- ('submitted' =>'scantron',
- 'grade_target' =>'grade',
- 'grade_username'=>$uname,
- 'grade_domain' =>$udom,
- 'grade_courseid'=>$ENV{'request.course.id'},
- 'grade_symb' =>$resource->symb()));
- my %score=&Apache::lonnet::restore($resource->symb(),
- $ENV{'request.course.id'},
- $udom,$uname);
- foreach my $part ($resource->{PARTS}) {
- if ($score{'resource.'.$part.'.solved'} =~ /^correct/) {
- $studentcorrect++;
- $totalcorrect++;
- } else {
- $studentincorrect++;
- $totalincorrect++;
- }
+ my %form=('submitted' =>'scantron',
+ 'grade_target' =>'grade',
+ 'grade_username'=>$uname,
+ 'grade_domain' =>$udom,
+ 'grade_courseid'=>$ENV{'request.course.id'},
+ 'grade_symb' =>$resource->symb());
+ if (exists($scan_record->{'scantron.CODE'}) &&
+ $scan_record->{'scantron.CODE'}) {
+ $form{'CODE'}=$scan_record->{'scantron.CODE'};
+ } else {
+ $form{'CODE'}='';
}
- $r->print('<pre>'.
- $resource->symb().'-'.
- $resource->src().'-'.'</pre>result is'.$result);
- &Apache::lonhomework::showhash(%score);
- # if ($i eq 3) {last;}
- }
+ my $result=&Apache::lonnet::ssi($resource->src(),%form);
+ if ($result ne '') {
+ &Apache::lonnet::logthis("scantron grading error -> $result");
+ &Apache::lonnet::logthis("scantron grading error info name $uname domain $udom course $ENV{'request.course.id'} url ".$resource->src());
+ }
+ if (&Apache::loncommon::connection_aborted($r)) { last; }
+ }
+ $completedstudents{$uname}={'line'=>$line};
+ if (&Apache::loncommon::connection_aborted($r)) { last; }
+ } continue {
&Apache::lonnet::delenv('form.counter');
&Apache::lonnet::delenv('scantron\.');
- &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,
- 'last student Who got a '.$studentcorrect.' correct and '.
- $studentincorrect.' incorrect. The class has gotten '.
- $totalcorrect.' correct and '.$totalincorrect.' incorrect');
- last;
- #FIXME
- #get iterator for $sequence
- #foreach question 'submit' the students answer to the server
- # through grade target {
- # generate data to pass back that includes grade recevied
- #}
- }
- $Apache::lonxml::debug=0;
- foreach my $delay (@delayqueue) {
- #FIXME
- #print out each delayed student with interface to select how
- # to repair student provided info
- #Expected errors include
- # 1 bad/no stuid/username
- # 2 invalid bubblings
-
}
+ &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
+# my $lasttime = &Time::HiRes::time()-$start;
+# $r->print("<p>took $lasttime</p>");
+
+ $r->print("</form>");
+ $r->print(&show_grading_menu_form($symb,$url));
+ return '';
+}
+
+sub scantron_upload_scantron_data {
+ my ($r)=@_;
+ $r->print(&Apache::loncommon::coursebrowser_javascript($ENV{'request.role.domain'}));
+ my $select_link=&Apache::loncommon::selectcourse_link('rules','courseid',
+ 'domainid',
+ 'coursename');
+ my $domsel=&Apache::loncommon::select_dom_form($ENV{'request.role.domain'},
+ 'domainid');
+ my $default_form_data=&defaultFormData(&get_symb_and_url($r,1));
+ $r->print(<<UPLOAD);
+<script type="text/javascript" language="javascript">
+ function checkUpload(formname) {
+ if (formname.upfile.value == "") {
+ alert("Please use the browse button to select a file from your local directory.");
+ return false;
+ }
+ formname.submit();
+ }
+</script>
+
+<form enctype='multipart/form-data' action='/adm/grades' name='rules' method='post'>
+$default_form_data
+<table>
+<tr><td>$select_link </td></tr>
+<tr><td>Course ID: </td><td><input name='courseid' type='text' /> </td></tr>
+<tr><td>Course Name: </td><td><input name='coursename' type='text' /></td></tr>
+<tr><td>Domain: </td><td>$domsel </td></tr>
+<tr><td>File to upload:</td><td><input type="file" name="upfile" size="50" /></td></tr>
+</table>
+<input name='command' value='scantronupload_save' type='hidden' />
+<input type="button" onClick="javascript:checkUpload(this.form);" value="Upload Scantron Data" />
+</form>
+UPLOAD
+ return '';
+}
+
+sub scantron_upload_scantron_data_save {
+ my($r)=@_;
+ my ($symb,$url)=&get_symb_and_url($r,1);
+ my $doanotherupload=
+ '<br /><form action="/adm/grades" method="post">'."\n".
+ '<input type="hidden" name="command" value="scantronupload" />'."\n".
+ '<input type="submit" name="submit" value="Do Another Upload" />'."\n".
+ '</form>'."\n";
+ if (!&Apache::lonnet::allowed('usc',$ENV{'form.domainid'}) &&
+ !&Apache::lonnet::allowed('usc',
+ $ENV{'form.domainid'}.'_'.$ENV{'form.courseid'})) {
+ $r->print("You are not allowed to upload Scantron data to the requested course.<br />");
+ if ($symb) {
+ $r->print(&show_grading_menu_form($symb,$url));
+ } else {
+ $r->print($doanotherupload);
+ }
+ return '';
+ }
+ my %coursedata=&Apache::lonnet::coursedescription($ENV{'form.domainid'}.'_'.$ENV{'form.courseid'});
+ $r->print("Doing upload to ".$coursedata{'description'}." <br />");
+ my $home=&Apache::lonnet::homeserver($ENV{'form.courseid'},
+ $ENV{'form.domainid'});
+ my $fname=$ENV{'form.upfile.filename'};
#FIXME
- # if delay queue exists 2 submits one to process delayed students one
- # to ignore delayed students, possibly saving the delay queue for later
-
- $navmap->untieHashes();
+ #copied from lonnet::userfileupload()
+ #make that function able to target a specified course
+ # Replace Windows backslashes by forward slashes
+ $fname=~s/\\/\//g;
+ # Get rid of everything but the actual filename
+ $fname=~s/^.*\/([^\/]+)$/$1/;
+ # Replace spaces by underscores
+ $fname=~s/\s+/\_/g;
+ # Replace all other weird characters by nothing
+ $fname=~s/[^\w\.\-]//g;
+ # See if there is anything left
+ unless ($fname) { return 'error: no uploaded file'; }
+ my $uploadedfile=$fname;
+ $fname='scantron_orig_'.$fname;
+ if (length($ENV{'form.upfile'}) < 2) {
+ $r->print("<font color='red'>Error:</font> The file you attempted to upload, <tt>".&HTML::Entities::encode($ENV{'form.upfile.filename'},'<>&"')."</tt>, contained no information. Please check that you entered the correct filename.");
+ } else {
+ my $result=&Apache::lonnet::finishuserfileupload($ENV{'form.courseid'},$ENV{'form.domainid'},$home,'upfile',$fname);
+ if ($result =~ m|^/uploaded/|) {
+ $r->print("<font color='green'>Success:</font> Successfully uploaded ".(length($ENV{'form.upfile'})-1)." bytes of data into location <tt>".$result."</tt>");
+ } else {
+ $r->print("<font color='red'>Error:</font> An error (".$result.") occurred when attempting to upload the file, <tt>".&HTML::Entities::encode($ENV{'form.upfile.filename'},'<>&"')."</tt>");
+ }
+ }
+ if ($symb) {
+ $r->print(&scantron_selectphase($r,$uploadedfile));
+ } else {
+ $r->print($doanotherupload);
+ }
+ return '';
+}
+
+sub valid_file {
+ my ($requested_file)=@_;
+ foreach my $filename (sort(&scantron_filenames())) {
+ &Apache::lonnet::logthis("$requested_file $filename");
+ if ($requested_file eq $filename) { return 1; }
+ }
+ return 0;
}
+
+sub scantron_download_scantron_data {
+ my ($r)=@_;
+ my $default_form_data=&defaultFormData(&get_symb_and_url($r,1));
+ my $cname=$ENV{'course.'.$ENV{'request.course.id'}.'.num'};
+ my $cdom=$ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
+ my $file=$ENV{'form.scantron_selectfile'};
+ if (! &valid_file($file)) {
+ $r->print(<<ERROR);
+ <p>
+ The requested file name was invalid.
+ </p>
+ERROR
+ $r->print(&show_grading_menu_form(&get_symb_and_url($r,1)));
+ return;
+ }
+ my $orig='/uploaded/'.$cdom.'/'.$cname.'/scantron_orig_'.$file;
+ my $corrected='/uploaded/'.$cdom.'/'.$cname.'/scantron_corrected_'.$file;
+ my $skipped='/uploaded/'.$cdom.'/'.$cname.'/scantron_skipped_'.$file;
+ &Apache::lonnet::allowuploaded('/adm/grades',$orig);
+ &Apache::lonnet::allowuploaded('/adm/grades',$corrected);
+ &Apache::lonnet::allowuploaded('/adm/grades',$skipped);
+ $r->print(<<DOWNLOAD);
+ <p>
+ <a href="$orig">Original</a> file as uploaded by the scantron office.
+ </p>
+ <p>
+ <a href="$corrected">Corrections</a>, a file of corrected records that were used in grading.
+ </p>
+ <p>
+ <a href="$skipped">Skipped</a>, a file of records that were skipped.
+ </p>
+DOWNLOAD
+ $r->print(&show_grading_menu_form(&get_symb_and_url($r,1)));
+ return '';
+}
+
#-------- end of section for handling grading scantron forms -------
#
#-------------------------------------------------------------------
@@ -3304,7 +4814,7 @@ SCANTRONFORM
#--- Show a Grading Menu button - Calls the next routine ---
sub show_grading_menu_form {
my ($symb,$url)=@_;
- my $result.='<form action="/adm/grades" method="post">'."\n".
+ my $result.='<br /><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="saveState" value="'.$ENV{'form.saveState'}.'" />'."\n".
@@ -3335,12 +4845,19 @@ sub gradingmenu {
$request->print(<<GRADINGMENUJS);
<script type="text/javascript" language="javascript">
- function checkChoice(formname) {
- var cmd = formname.command;
- formname.saveState.value = "saveCmd="+radioSelection(cmd)+":saveSec="+pullDownSelection(formname.section)+
- ":saveSub="+radioSelection(formname.submitonly)+":saveStatus="+pullDownSelection(formname.Status);
- if (cmd[0].checked || cmd[1].checked || cmd[2].checked || cmd[3].checked || cmd[4].checked) formname.submit();
- if (cmd[5].checked) {
+ function checkChoice(formname,val,cmdx) {
+ if (val <= 2) {
+ var cmd = radioSelection(formname.radioChoice);
+ var cmdsave = cmd;
+ } else {
+ cmd = cmdx;
+ cmdsave = 'submission';
+ }
+ formname.command.value = cmd;
+ formname.saveState.value = "saveCmd="+cmdsave+":saveSec="+pullDownSelection(formname.section)+
+ ":saveSub="+pullDownSelection(formname.submitonly)+":saveStatus="+pullDownSelection(formname.Status);
+ if (val < 5) formname.submit();
+ if (val == 5) {
if (!checkReceiptNo(formname,'notOK')) { return false;}
formname.submit();
}
@@ -3357,137 +4874,99 @@ sub gradingmenu {
formname.receipt.focus();
return false;
}
- formname.command[5].checked = true;
return true;
}
-
- function radioSelection(radioButton) {
- var selection=null;
- if (radioButton.length > 1) {
- for (var i=0; i<radioButton.length; i++) {
- if (radioButton[i].checked) {
- return radioButton[i].value;
- }
- }
- } else {
- if (radioButton.checked) return radioButton.value;
- }
- return selection;
- }
-
- function pullDownSelection(selectOne) {
- var selection="";
- if (selectOne.length > 1) {
- for (var i=0; i<selectOne.length; i++) {
- if (selectOne[i].selected) {
- return selectOne[i].value;
- }
- }
- } else {
- if (selectOne.selected) return selectOne.value;
- }
- }
-
</script>
GRADINGMENUJS
-
- my $result='<h3> <font color="#339933">Manual Grading/View Submission</font></h3>'.
- '<table border="0">'.
- '<tr><td colspan=3><font size=+1><b>Problem: </b>'.$probTitle.'</font></td></tr>'."\n";
- my ($partlist,$handgrade) = &response_type($url);
- my ($resptype,$hdgrade)=('','no');
- for (sort keys(%$handgrade)) {
- my ($responsetype,$handgrade)=split(/:/,$$handgrade{$_});
- $resptype = $responsetype;
- $hdgrade = $handgrade if ($handgrade eq 'yes');
- $result.='<tr><td><b>Part </b>'.(split(/_/))[0].'</td>'.
- '<td><b>Type: </b>'.$responsetype.'</td>'.
- '<td><b>Handgrade: </b>'.$handgrade.'</font></td></tr>';
- }
- $result.='</table>'."\n";
-
+ &commonJSfunctions($request);
+ my $result='<h3> <font color="#339933">Manual Grading/View Submission</font></h3>';
+ my ($table,undef,$hdgrade) = &showResourceInfo($url,$probTitle);
+ $result.=$table;
my (undef,$sections) = &getclasslist('all','0');
my $savedState = &savedState();
- my $saveCmd = ($$savedState{'saveCmd'} eq '' ? 'pickStudentPage' : $$savedState{'saveCmd'});
+ my $saveCmd = ($$savedState{'saveCmd'} eq '' ? 'submission' : $$savedState{'saveCmd'});
my $saveSec = ($$savedState{'saveSec'} eq '' ? 'all' : $$savedState{'saveSec'});
- my $saveSub = ($$savedState{'saveSub'} eq '' ? 'yes' : $$savedState{'saveSub'});
+ my $saveSub = ($$savedState{'saveSub'} eq '' ? 'all' : $$savedState{'saveSub'});
my $saveStatus = ($$savedState{'saveStatus'} eq '' ? 'Active' : $$savedState{'saveStatus'});
$result.='<form action="/adm/grades" method="post" name="gradingMenu">'."\n".
'<input type="hidden" name="symb" value="'.$symb.'" />'."\n".
'<input type="hidden" name="url" value="'.$url.'" />'."\n".
- '<input type="hidden" name="response" value="'.$resptype.'" />'."\n".
'<input type="hidden" name="handgrade" value="'.$hdgrade.'" />'."\n".
'<input type="hidden" name="probTitle" value="'.$probTitle.'" />'."\n".
+ '<input type="hidden" name="command" value="" />'."\n".
'<input type="hidden" name="saveState" value="" />'."\n".
+ '<input type="hidden" name="gradingMenu" value="1" />'."\n".
'<input type="hidden" name="showgrading" value="yes" />'."\n";
- $result.='<table width=100% border=0><tr><td bgcolor=#777777>'."\n".
- '<table width=100% border=0><tr bgcolor="#e6ffff"><td>'."\n".
+ $result.='<table width="100%" border=0><tr><td bgcolor=#777777>'."\n".
+ '<table width=100% border=0><tr bgcolor="#e6ffff"><td colspan="2">'."\n".
' <b>Select a Grading/Viewing Option</b></td></tr>'."\n".
- '<tr bgcolor=#ffffe6><td>'."\n";
+ '<tr bgcolor="#ffffe6" valign="top"><td>'."\n";
- $result.='<table width=100% border=0>'.
- '<tr bgcolor="#ffffe6" valign="top"><td colspan="2">'.
- '<input type="radio" name="command" value="pickStudentPage" '.
- ($saveCmd eq 'pickStudentPage' ? 'checked' : '').'> '.
- 'Handgrade/View Submission for a student by page/sequence</td></tr>'."\n".
+ $result.='<table width="100%" border=0>';
+ $result.='<tr bgcolor="#ffffe6" valign="top"><td>'."\n".
+ ' '.&mt('Select Section').': <select name="section">'."\n";
+ if (ref($sections)) {
+ foreach (sort (@$sections)) {
+ $result.='<option value="'.$_.'" '.
+ ($saveSec eq $_ ? 'selected="on"':'').'>'.$_.'</option>'."\n";
+ }
+ }
+ $result.= '<option value="all" '.($saveSec eq 'all' ? 'selected="on"' : ''). '>all</select> ';
- '<tr bgcolor="#ffffe6"valign="top"><td colspan="2">'.
- '<input type="radio" name="command" value="viewgrades" '.
+ $result.=&mt('Student Status').':</b>'.&Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,1,undef);
+
+ $result.='</td></tr>';
+
+ $result.='<tr bgcolor="#ffffe6"valign="top"><td>'.
+ '<input type="radio" name="radioChoice" value="submission" '.
+ ($saveCmd eq 'submission' ? 'checked' : '').'> '.'<b>'.&mt('Current Resource').':</b> '.&mt('For one or more students').
+ ' <select name="submitonly">'.
+ '<option value="yes" '.
+ ($saveSub eq 'yes' ? 'selected="on"' : '').'>with submissions</option>'.
+ '<option value="graded" '.
+ ($saveSub eq 'graded' ? 'selected="on"' : '').'>with ungraded submissions</option>'.
+ '<option value="incorrect" '.
+ ($saveSub eq 'incorrect' ? 'selected="on"' : '').'>with incorrect submissions</option>'.
+ '<option value="all" '.
+ ($saveSub eq 'all' ? 'selected="on"' : '').'>with any status</option></select></td></tr>'."\n";
+
+ $result.='<tr bgcolor="#ffffe6"valign="top"><td>'.
+ '<input type="radio" name="radioChoice" value="viewgrades" '.
($saveCmd eq 'viewgrades' ? 'checked' : '').'> '.
- 'Grade by section or class</td></tr>'."\n".
+ '<b>Current Resource:</b> For all students in selected section or course</td></tr>'."\n";
- '<tr bgcolor="#ffffe6"valign="top"><td><input type="radio" name="command" value="submission" '.
- ($saveCmd eq 'submission' ? 'checked' : '').'> '.
- ($hdgrade eq 'yes' ? 'View/Grade essay response of' : 'View').
- ' an individual student </td>'."\n".
- '<td>--> For students who has: '.
- '<input type="radio" name="submitonly" value="yes" '.
- ($saveSub eq 'yes' ? 'checked' : '').' /> submitted'.
- '<input type="radio" name="submitonly" value="all" '.
- ($saveSub eq 'all' ? 'checked' : '').' /> everybody</td></tr>'."\n".
-
- '<tr bgcolor="#ffffe6"valign="top"><td colspan="2">'.
- '<input type="radio" name="command" value="csvform" '.
- ($saveCmd eq 'csvform' ? 'checked' : '').'> '.
- 'Upload scores from file</td></tr>'."\n";
+ $result.='<tr bgcolor="#ffffe6" valign="top"><td>'.
+ '<input type="radio" name="radioChoice" value="pickStudentPage" '.
+ ($saveCmd eq 'pickStudentPage' ? 'checked' : '').'> '.
+ 'The <b>complete</b> set/page/sequence: For one student</td></tr>'."\n";
+
+ $result.='<tr bgcolor="#ffffe6"><td><br />'.
+ '<input type="button" onClick="javascript:checkChoice(this.form,\'2\');" value="Next->" />'.
+ '</td></tr></table>'."\n";
+
+ $result.='</td><td valign="top">';
+
+ $result.='<table width="100%" border=0>';
+ $result.='<tr bgcolor="#ffffe6"><td>'.
+ '<input type="button" onClick="javascript:checkChoice(this.form,\'3\',\'csvform\');" value="'.&mt('Upload').'" />'.
+ ' '.&mt('scores from file').' </td></tr>'."\n";
$result.='<tr bgcolor="#ffffe6"valign="top"><td colspan="2">'.
- '<input type="radio" name="command" value="scantron_selectphase" '.
- ($saveCmd eq 'scantron_selectphase' ? 'checked="on"' : '').' /> '.
- 'Grade scantron forms</td></tr>'."\n";
+ '<input type="button" onClick="javascript:checkChoice(this.form,\'4\',\'scantron_selectphase\');'.
+ '" value="'.&mt('Grade').'" /> scantron forms</td></tr>'."\n";
if ((&Apache::lonnet::allowed('mgr',$ENV{'request.course.id'})) && ($symb)) {
$result.='<tr bgcolor="#ffffe6"valign="top"><td>'.
- '<input type="radio" name="command" value="verify" onChecked="javascript:this.form.receipt.focus()" '.
- ($saveCmd eq 'verify' ? 'checked' : '').'> '.
- 'Verify a submission receipt issued by this server</td>'.
- '<td>--> Receipt no: '.unpack("%32C*",$Apache::lonnet::perlvar{'lonHostID'}).
+ '<input type="button" onClick="javascript:checkChoice(this.form,\'5\',\'verify\');" value="'.&mt('Verify').'" />'.
+ ' '.&mt('receipt').': '.
+ &Apache::lonnet::recprefix($ENV{'request.course.id'}).
'-<input type="text" name="receipt" size="4" onChange="javascript:checkReceiptNo(this.form,\'OK\')">'.
'</td></tr>'."\n";
}
- $result.='<tr bgcolor="#ffffe6"valign="top"><td colspan="2"><br />'."\n".
- ' Select section: <select name="section">'."\n";
- if (ref($sections)) {
- foreach (sort (@$sections)) {$result.='<option value="'.$_.'" '.
- ($saveSec eq $_ ? 'selected="on"' : '').'>'.$_.'</option>'."\n";}
- }
- $result.= '<option value="all" '.($saveSec eq 'all' ? 'selected="on"' : ''). '>all</select> ';
-
- $result.='Student Status:</b>'.&Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,1,undef);
- $result.=' <font color="red">(Applies to the first three options only.)</font>'."\n";
-
- if (ref($sections)) {
- $result.=' (Section "no" implies the students were not assigned a section.)<br />'
- if (grep /no/,@$sections);
- }
- $result.='</td></tr>';
-
- $result.='<tr bgcolor="#ffffe6"><td colspan="2"><br />'.
- '<input type="button" onClick="javascript:checkChoice(this.form);" value="View/Grade" />'."\n".
- '</form></td></tr></table>'."\n".
+ $result.='</form></td></tr></table>'."\n".
'</td></tr></table>'."\n".
'</td></tr></table>'."\n";
return $result;
@@ -3498,23 +4977,27 @@ sub handler {
undef(%perm);
if ($ENV{'browser.mathml'}) {
- $request->content_type('text/xml');
+ &Apache::loncommon::content_type($request,'text/xml');
} else {
- $request->content_type('text/html');
+ &Apache::loncommon::content_type($request,'text/html');
}
$request->send_http_header;
return '' if $request->header_only;
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'});
my $url=$ENV{'form.url'};
my $symb=$ENV{'form.symb'};
- my $command=$ENV{'form.command'};
+ my @commands=&Apache::loncommon::get_env_multiple('form.command');
+ my $command=$commands[0];
+ if ($#commands > 0) {
+ &Apache::lonnet::logthis("grades got multiple commands ".join(':',@commands));
+ }
if (!$url) {
my ($temp1,$temp2);
- ($temp1,$temp2,$ENV{'form.url'})=split(/___/,$symb);
+ ($temp1,$temp2,$ENV{'form.url'})=&Apache::lonnet::decode_symb($symb);
$url = $ENV{'form.url'};
}
&send_header($request);
- if ($url eq '' && $symb eq '') {
+ if ($url eq '' && $symb eq '' && $command eq '') {
if ($ENV{'user.adv'}) {
if (($ENV{'form.codeone'}) && ($ENV{'form.codetwo'}) &&
($ENV{'form.codethree'})) {
@@ -3523,7 +5006,7 @@ sub handler {
my ($tsymb,$tuname,$tudom,$tcrsid)=
&Apache::lonnet::checkin($token);
if ($tsymb) {
- my ($map,$id,$url)=split(/\_\_\_/,$tsymb);
+ my ($map,$id,$url)=&Apache::lonnet::decode_symb($tsymb);
if (&Apache::lonnet::allowed('mgr',$tcrsid)) {
$request->print(&Apache::lonnet::ssi_body('/res/'.$url,
('grade_username' => $tuname,
@@ -3555,7 +5038,6 @@ sub handler {
delete($perm{'mgr'});
}
}
-
if ($command eq 'submission' && $perm{'vgr'}) {
($ENV{'form.student'} eq '' ? &listStudents($request) : &submission($request,0,0));
} elsif ($command eq 'pickStudentPage' && $perm{'vgr'}) {
@@ -3595,10 +5077,25 @@ sub handler {
}
} elsif ($command eq 'scantron_selectphase' && $perm{'mgr'}) {
$request->print(&scantron_selectphase($request));
+ } elsif ($command eq 'scantron_warning' && $perm{'mgr'}) {
+ $request->print(&scantron_do_warning($request));
+ } elsif ($command eq 'scantron_validate' && $perm{'mgr'}) {
+ $request->print(&scantron_validate_file($request));
} elsif ($command eq 'scantron_process' && $perm{'mgr'}) {
$request->print(&scantron_process_students($request));
+ } elsif ($command eq 'scantronupload' &&
+ (&Apache::lonnet::allowed('usc',$ENV{'request.role.domain'})||
+ &Apache::lonnet::allowed('usc',$ENV{'request.course.id'}))) {
+ $request->print(&scantron_upload_scantron_data($request));
+ } elsif ($command eq 'scantronupload_save' &&
+ (&Apache::lonnet::allowed('usc',$ENV{'request.role.domain'})||
+ &Apache::lonnet::allowed('usc',$ENV{'request.course.id'}))) {
+ $request->print(&scantron_upload_scantron_data_save($request));
+ } elsif ($command eq 'scantron_download' &&
+ &Apache::lonnet::allowed('usc',$ENV{'request.course.id'})) {
+ $request->print(&scantron_download_scantron_data($request));
} elsif ($command) {
- $request->print("Access Denied");
+ $request->print("Access Denied ($command)");
}
}
&send_footer($request);
@@ -3614,12 +5111,12 @@ sub send_header {
#remotewindow.close();
#</script>");
$request->print(&Apache::loncommon::bodytag('Grading'));
+ $request->rflush();
}
sub send_footer {
my ($request)= @_;
- $request->print('</body>');
- $request->print(&Apache::lontexconvert::footer());
+ $request->print('</body></html>');
}
1;