--- loncom/homework/grades.pm 2004/12/03 22:44:36 1.233
+++ loncom/homework/grades.pm 2006/06/12 22:14:29 1.363
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# The LON-CAPA Grading handler
#
-# $Id: grades.pm,v 1.233 2004/12/03 22:44:36 albertel Exp $
+# $Id: grades.pm,v 1.363 2006/06/12 22:14:29 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -36,10 +36,14 @@ use Apache::lonhtmlcommon;
use Apache::lonnavmaps;
use Apache::lonhomework;
use Apache::loncoursedata;
-use Apache::lonmsg qw(:user_normal_msg);
+use Apache::lonmsg();
use Apache::Constants qw(:common);
use Apache::lonlocal;
use String::Similarity;
+use lib '/home/httpd/lib/perl';
+use LONCAPA;
+
+use POSIX qw(floor);
my %oldessays=();
my %perm=();
@@ -48,7 +52,8 @@ my %perm=();
#
# --- Retrieve the parts from the metadata file.---
sub getpartlist {
- my ($url,$symb) = @_;
+ my ($symb) = @_;
+ my (undef,undef,$url) = &Apache::lonnet::decode_symb($symb);
my $partorder = &Apache::lonnet::metadata($url, 'partorder');
my @parts;
if ($partorder) {
@@ -78,17 +83,17 @@ sub getpartlist {
}
# --- Get the symbolic name of a problem and the url
-sub get_symb_and_url {
+sub get_symb {
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)));
+ (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 '') {
if (!$silent) {
$request->print("Unable to handle ambiguous references:$url:.");
return ();
}
}
- return ($symb,$url);
+ return ($symb);
}
#--- Format fullname, username:domain if different for display
@@ -96,18 +101,18 @@ sub get_symb_and_url {
sub nameUserString {
my ($type,$fullname,$uname,$udom) = @_;
if ($type eq 'header') {
- return '<b> Fullname </b><font color="#999999">(Username)</font> ';
+ return '<b> Fullname </b><font color="#999999">(Username)</font>';
} else {
return ' '.$fullname.'<font color="#999999"> ('.$uname.
- ($ENV{'user.domain'} eq $udom ? '' : ' ('.$udom.')').')</font>';
+ ($env{'user.domain'} eq $udom ? '' : ' ('.$udom.')').')</font>';
}
}
#--- 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,$symb) = shift;
- $symb=($ENV{'form.symb'} ne '' ? $ENV{'form.symb'} : (&Apache::lonnet::symbread($url))) if ($symb eq '');
+ my ($symb) = shift;
+ my (undef,undef,$url) = &Apache::lonnet::decode_symb($symb);
my $allkeys = &Apache::lonnet::metadata($url,'keys');
my %vPart;
foreach my $partid (&Apache::loncommon::get_env_multiple('form.vPart')) {
@@ -116,9 +121,10 @@ sub response_type {
my %seen = ();
my (@partlist,%handgrade,%responseType);
foreach (split(/,/,&Apache::lonnet::metadata($url,'packages'))) {
- if (/^\w+response_.*/) {
+ if (/^\w+response_.*/ || /^Task_/) {
my ($responsetype,$part) = split(/_/,$_,2);
my ($partid,$respid) = split(/_/,$part);
+ if ($responsetype eq 'Task') { $respid='0'; }
if (&Apache::loncommon::check_if_partid_hidden($partid,$symb)) {
next;
}
@@ -135,15 +141,11 @@ sub response_type {
push @partlist,$partid;
}
}
- return \@partlist,\%handgrade,\%responseType;
+ 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 ($partID,$symb)=@_;
my $display=&Apache::lonnet::EXT('resource.'.$partID.'.display',$symb);
if (defined($display) and $display ne '') {
$display.= " (<font color=\"#999900\">id $partID</font>)";
@@ -152,16 +154,17 @@ sub get_display_part {
}
return $display;
}
+
#--- Show resource title
#--- and parts and response type
sub showResourceInfo {
- my ($url,$probTitle,$checkboxes) = @_;
+ my ($symb,$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 ($partlist,$handgrade,$responseType) = &response_type($symb);
my %resptype = ();
my $hdgrade='no';
my %partsseen;
@@ -179,7 +182,7 @@ sub showResourceInfo {
}
$partsseen{$partID}=1;
}
- my $display_part=&get_display_part($partID,$url);
+ my $display_part=&get_display_part($partID,$symb);
$result.='<td><b>Part: </b>'.$display_part.' <font color="#999999">'.
$resID.'</font></td>'.
'<td><b>Type: </b>'.$responsetype.'</td></tr>';
@@ -199,16 +202,18 @@ sub get_order {
('grade_domain' => $udom),
('grade_symb' => $symb),
('grade_courseid' =>
- $ENV{'request.course.id'}),
+ $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.
+#--- Currently filters option/rank/radiobutton/match/essay/Task
+# response types only.
sub cleanRecord {
- my ($answer,$response,$symb,$partid,$respid,$record,$order,$version) = @_;
+ my ($answer,$response,$symb,$partid,$respid,$record,$order,$version,
+ $uname,$udom) = @_;
my $grayFont = '<font color="#999999">';
if ($response =~ /^(option|rank)$/) {
my %answer=&Apache::lonnet::str2hash($answer);
@@ -270,20 +275,56 @@ sub cleanRecord {
'<tr valign="top"><td>'.$grayFont.'Option ID</font></td>'.
$grayFont.$bottomrow.'</tr>'.'</table></blockquote>';
} elsif ($response eq 'essay') {
- if (! exists ($ENV{'form.'.$symb})) {
+ 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'});
+ $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.
+ 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>';
+ } elsif ( $response eq 'organic') {
+ my $result='Smile representation: "<tt>'.$answer.'</tt>"';
+ my $jme=$record->{$version."resource.$partid.$respid.molecule"};
+ $result.=&Apache::chemresponse::jme_img($jme,$answer,400);
+ return $result;
+ } elsif ( $response eq 'Task') {
+ if ( $answer eq 'SUBMITTED') {
+ my $files = $record->{$version."resource.$respid.$partid.bridgetask.portfiles"};
+ my $result = &Apache::bridgetask::file_list($files,$uname,$udom);
+ return $result;
+ } elsif ( grep(/^\Q$version\E.*?\.instance$/, keys(%{$record})) ) {
+ my @matches = grep(/^\Q$version\E.*?\.instance$/,
+ keys(%{$record}));
+ return join('<br />',($version,@matches));
+
+
+ } else {
+ my $result =
+ '<p>'
+ .&mt('Overall result: [_1]',
+ $record->{$version."resource.$respid.$partid.status"})
+ .'</p>';
+
+ $result .= '<ul>';
+ my @grade = grep(/^\Q${version}resource.$respid.$partid.\E[^.]*[.]status$/,
+ keys(%{$record}));
+ foreach my $grade (sort(@grade)) {
+ my ($dim) = ($grade =~/[.]([^.]+)[.]status$/);
+ $result.= '<li>'.&mt("Dimension: [_1], status [_2] ",
+ $dim, $record->{$grade}).
+ '</li>';
+ }
+ $result.='</ul>';
+ return $result;
+ }
+
}
return $answer;
}
@@ -328,7 +369,16 @@ COMMONJSFUNCTIONS
#--- section, ids and fullnames for each user.
sub getclasslist {
my ($getsec,$filterlist) = @_;
- $getsec = $getsec eq '' ? 'all' : $getsec;
+ my @getsec;
+ if (!ref($getsec)) {
+ if ($getsec ne '' && $getsec ne 'all') {
+ @getsec=($getsec);
+ }
+ } else {
+ @getsec=@{$getsec};
+ }
+ if (grep(/^all$/,@getsec)) { undef(@getsec); }
+
my $classlist=&Apache::loncoursedata::get_classlist();
# Bail out if we were unable to get the classlist
return if (! defined($classlist));
@@ -349,15 +399,15 @@ sub getclasslist {
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) {
+ if ($filterlist && $env{'form.Status'} ne 'Any') {
+ if ($env{'form.Status'} ne $status) {
delete ($classlist->{$student});
next;
}
}
$section = ($section ne '' ? $section : 'none');
if (&canview($section)) {
- if ($getsec eq 'all' || $getsec eq $section) {
+ if (!@getsec || grep(/^\Q$section\E$/,@getsec)) {
$sections{$section}++;
$fullnames{$student}=$fullname;
} else {
@@ -414,8 +464,8 @@ sub canview {
#--- Retrieve the grade status of a student for all the parts
sub student_gradeStatus {
- my ($url,$symb,$udom,$uname,$partlist) = @_;
- my %record = &Apache::lonnet::restore($symb,$ENV{'request.course.id'},$udom,$uname);
+ my ($symb,$udom,$uname,$partlist) = @_;
+ my %record = &Apache::lonnet::restore($symb,$env{'request.course.id'},$udom,$uname);
my %partstatus = ();
foreach (@$partlist) {
my ($status,undef) = split(/_/,$record{"resource.$_.solved"},2);
@@ -431,7 +481,7 @@ sub student_gradeStatus {
# Use by verifyscript and viewgrades
# Shows a student's view of problem and submission
sub jscriptNform {
- my ($url,$symb) = @_;
+ my ($symb) = @_;
my $jscript='<script type="text/javascript" language="javascript">'."\n".
' function viewOneStudent(user,domain) {'."\n".
' document.onestudent.student.value = user;'."\n".
@@ -441,10 +491,9 @@ sub jscriptNform {
'</script>'."\n";
$jscript.= '<form action="/adm/grades" method="post" name="onestudent">'."\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".
- '<input type="hidden" name="probTitle" value="'.$ENV{'form.probTitle'}.'" />'."\n".
- '<input type="hidden" name="Status" value="'.$ENV{'form.Status'}.'" />'."\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".
@@ -452,6 +501,33 @@ sub jscriptNform {
return $jscript;
}
+# Given the score (as a number [0-1] and the weight) what is the final
+# point value? This function will round to the nearest tenth, third,
+# or quarter if one of those is within the tolerance of .00001.
+sub compute_points {
+ my ($score, $weight) = @_;
+
+ my $tolerance = .00001;
+ my $points = $score * $weight;
+
+ # Check for nearness to 1/x.
+ my $check_for_nearness = sub {
+ my ($factor) = @_;
+ my $num = ($points * $factor) + $tolerance;
+ my $floored_num = floor($num);
+ if ($num - $floored_num < 2 * $tolerance * $factor) {
+ return $floored_num / $factor;
+ }
+ return $points;
+ };
+
+ $points = $check_for_nearness->(10);
+ $points = $check_for_nearness->(3);
+ $points = $check_for_nearness->(4);
+
+ return $points;
+}
+
#------------------ End of general use routines --------------------
#
@@ -465,6 +541,10 @@ sub most_similar {
$uessay=~s/\W+/ /gs;
+# ignore empty submissions (occuring when only files are sent)
+
+ unless ($uessay=~/\w+/) { return ''; }
+
# these will be returned. Do not care if not at least 50 percent similar
my $limit=0.6;
my $sname='';
@@ -505,28 +585,30 @@ sub most_similar {
sub verifyreceipt {
my $request = shift;
- my $courseid = $ENV{'request.course.id'};
+ my $courseid = $env{'request.course.id'};
my $receipt = &Apache::lonnet::recprefix($courseid).'-'.
- $ENV{'form.receipt'};
+ $env{'form.receipt'};
$receipt =~ s/[^\-\d]//g;
- my $url = $ENV{'form.url'};
- my $symb = $ENV{'form.symb'};
- unless ($symb) {
- $symb = &Apache::lonnet::symbread($url);
- }
+ my $symb = &Apache::lonnet::symbread();
my $title.='<h3><font color="#339933">Verifying Submission Receipt '.
$receipt.'</h3></font>'."\n".
- '<font size=+1><b>Resource: </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; }
+ 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) {
+ if ($receiptparts) { ($parts)=&response_type($symb); }
+ foreach (sort
+ {
+ if (lc($$fullname{$a}) ne lc($$fullname{$b})) {
+ return (lc($$fullname{$a}) cmp lc($$fullname{$b}));
+ }
+ return $a cmp $b;
+ } (keys(%$fullname))) {
my ($uname,$udom)=split(/\:/);
foreach my $part (@$parts) {
if ($receipt eq &Apache::lonnet::ireceipt($uname,$udom,$courseid,$symb,$part)) {
@@ -547,7 +629,7 @@ sub verifyreceipt {
if ($matches == 0) {
$string = $title.'No match found for the above receipt.';
} else {
- $string = &jscriptNform($url,$symb).$title.
+ $string = &jscriptNform($symb).$title.
'The above receipt matches the following student'.
($matches <= 1 ? '.' : 's.')."\n".
'<table border="0"><tr><td bgcolor="#777777">'."\n".
@@ -561,7 +643,7 @@ sub verifyreceipt {
$string.='</tr>'."\n".$contents.
'</table></td></tr></table>'."\n";
}
- return $string.&show_grading_menu_form($symb,$url);
+ return $string.&show_grading_menu_form($symb);
}
#--- This is called by a number of programs.
@@ -571,20 +653,20 @@ sub verifyreceipt {
sub listStudents {
my ($request) = shift;
- 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"};
- my $getsec = $ENV{'form.section'} eq '' ? 'all' : $ENV{'form.section'};
- my $submitonly= $ENV{'form.submitonly'} eq '' ? 'all' : $ENV{'form.submitonly'};
-
- 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'};
+ my ($symb) = &get_symb($request);
+ my $cdom = $env{"course.$env{'request.course.id'}.domain"};
+ my $cnum = $env{"course.$env{'request.course.id'}.num"};
+ my $getsec = $env{'form.section'} eq '' ? 'all' : $env{'form.section'};
+ my $submitonly= $env{'form.submitonly'} eq '' ? 'all' : $env{'form.submitonly'};
+
+ 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'};
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'));
+ my ($table,undef,$hdgrade,$partlist,$handgrade) = &showResourceInfo($symb,$env{'form.probTitle'},($env{'form.showgrading'} eq 'yes'));
$request->print(<<LISTJAVASCRIPT);
<script type="text/javascript" language="javascript">
@@ -622,40 +704,46 @@ LISTJAVASCRIPT
&commonJSfunctions($request);
$request->print($result);
- my $checkhdgrade = ($ENV{'form.handgrade'} eq 'yes' && scalar(@$partlist) > 1 ) ? 'checked' : '';
+ 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>View Problem Text: </b><label><input type="radio" name="vProb" value="no" checked="on" /> no </label>'."\n".
+ '<label><input type="radio" name="vProb" value="yes" /> one student </label>'."\n".
+ '<label><input type="radio" name="vProb" value="all" /> all students </label><br />'."\n".
+ ' <b>View Answer: </b><label><input type="radio" name="vAns" value="no" /> no </label>'."\n".
+ '<label><input type="radio" name="vAns" value="yes" /> one student </label>'."\n".
+ '<label><input type="radio" name="vAns" value="all" checked="on" /> all students </label><br />'."\n".
' <b>Submissions: </b>'."\n";
- if ($ENV{'form.handgrade'} eq 'yes' && scalar(@$partlist) > 1) {
- $gradeTable.='<input type="radio" name="lastSub" value="hdgrade" '.$checkhdgrade.' /> essay part only'."\n";
+ if ($env{'form.handgrade'} eq 'yes' && scalar(@$partlist) > 1) {
+ $gradeTable.='<label><input type="radio" name="lastSub" value="hdgrade" '.$checkhdgrade.' /> essay part only </label>'."\n";
}
- my $saveStatus = $ENV{'form.Status'} eq '' ? 'Active' : $ENV{'form.Status'};
- $ENV{'form.Status'} = $saveStatus;
+ my $saveStatus = $env{'form.Status'} eq '' ? 'Active' : $env{'form.Status'};
+ $env{'form.Status'} = $saveStatus;
+
+ $gradeTable.='<label><input type="radio" name="lastSub" value="lastonly" '.$checklastsub.' /> last submission only </label>'."\n".
+ '<label><input type="radio" name="lastSub" value="last" /> last submission & parts info </label>'."\n".
+ '<label><input type="radio" name="lastSub" value="datesub" /> by dates and submissions </label>'."\n".
+ '<label><input type="radio" name="lastSub" value="all" /> all details</label><br />'."\n".
+ ' <b>Grading Increments:</b> <select name="increment">'.
+ '<option value="1">Whole Points</option>'.
+ '<option value=".5">Half Points</option>'.
+ '<option value=".25">Quarter Points</option>'.
+ '<option value=".1">Tenths of a Point</option>'.
+ '</select>'.
- $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="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".
- '<input type="hidden" name="probTitle" value="'.$ENV{'form.probTitle'}.'" />'."\n".
- '<input type="hidden" name="url" value="'.$url.'" />'."\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".
+ '<input type="hidden" name="probTitle" value="'.$env{'form.probTitle'}.'" />'."\n".
'<input type="hidden" name="symb" value="'.$symb.'" />'."\n".
'<input type="hidden" name="saveStatusOld" value="'.$saveStatus.'" />'."\n";
- if (exists($ENV{'form.gradingMenu'}) && exists($ENV{'form.Status'})) {
- $gradeTable.='<input type="hidden" name="Status" value="'.$ENV{'form.Status'}.'" />'."\n";
+ 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 />';
@@ -664,23 +752,31 @@ LISTJAVASCRIPT
$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";
+
+# checkall buttons
+ $gradeTable.=&check_script('gradesub', 'stuinfo');
$gradeTable.='<input type="button" '."\n".
'onClick="javascript:checkSelect(this.form.stuinfo);" '."\n".
- 'value="Next->" />'."\n";
- $gradeTable.='<input type="checkbox" name="checkPlag" checked="on">Check For Plagiarism</input>';
- my (undef, undef, $fullname) = &getclasslist($getsec,'1');
+ 'value="Next->" /> <br />'."\n";
+ $gradeTable.=&check_buttons();
+ $gradeTable.='<label><input type="checkbox" name="checkPlag" checked="on" />Check For Plagiarism</label>';
+ my ($classlist, 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> No.</b> </td><td><b> Select </b></td>'.
- '<td>'.&nameUserString('header').'</td>';
- if ($ENV{'form.showgrading'} eq 'yes' && $submitonly ne 'all') {
+ '<td>'.&nameUserString('header').' Section/Group</td>';
+ if ($env{'form.showgrading'} eq 'yes'
+ && $submitonly ne 'queued'
+ && $submitonly ne 'all') {
foreach (sort(@$partlist)) {
- my $display_part=&get_display_part((split(/_/))[0],$url,$symb);
+ my $display_part=&get_display_part((split(/_/))[0],$symb);
$gradeTable.='<td><b> Part: '.$display_part.
' Status </b></td>';
}
+ } elsif ($submitonly eq 'queued') {
+ $gradeTable.='<td><b> '.&mt('Queue Status').' </b></td>';
}
$loop++;
# $gradeTable.='<td></td>' if ($loop%2 ==1);
@@ -688,17 +784,38 @@ LISTJAVASCRIPT
$gradeTable.='</tr>'."\n";
my $ctr = 0;
- foreach my $student (sort {lc($$fullname{$a}) cmp lc($$fullname{$b}) } keys %$fullname) {
+ foreach my $student (sort
+ {
+ if (lc($$fullname{$a}) ne lc($$fullname{$b})) {
+ return (lc($$fullname{$a}) cmp lc($$fullname{$b}));
+ }
+ return $a cmp $b;
+ }
+ (keys(%$fullname))) {
my ($uname,$udom) = split(/:/,$student);
+
my %status = ();
- if ($ENV{'form.showgrading'} eq 'yes' && $submitonly ne 'all') {
- (%status) =&student_gradeStatus($url,$symb,$udom,$uname,$partlist);
+
+ if ($submitonly eq 'queued') {
+ my %queue_status =
+ &Apache::bridgetask::get_student_status($symb,$cdom,$cnum,
+ $udom,$uname);
+ next if (!defined($queue_status{'gradingqueue'}));
+ $status{'gradingqueue'} = $queue_status{'gradingqueue'};
+ }
+
+ if ($env{'form.showgrading'} eq 'yes'
+ && $submitonly ne 'queued'
+ && $submitonly ne 'all') {
+ (%status) =&student_gradeStatus($symb,$udom,$uname,$partlist);
my $submitted = 0;
my $graded = 0;
+ my $incorrect = 0;
foreach (keys(%status)) {
$submitted = 1 if ($status{$_} ne 'nothing');
- $graded = 1 if ($status{$_} !~ /^correct/);
-
+ $graded = 1 if ($status{$_} =~ /^ungraded/);
+ $incorrect = 1 if ($status{$_} =~ /^incorrect/);
+
my ($foo,$partid,$foo1) = split(/\./,$_);
if ($status{'resource.'.$partid.'.submitted_by'} ne '') {
$submitted = 0;
@@ -708,25 +825,30 @@ LISTJAVASCRIPT
$status{'resource.'.$partid.'.submitted_by'}.'" />';
}
}
+
next if (!$submitted && ($submitonly eq 'yes' ||
$submitonly eq 'incorrect' ||
$submitonly eq 'graded'));
- next if (!$graded && ($submitonly eq 'graded' ||
- $submitonly eq 'incorrect'));
+ next if (!$graded && ($submitonly eq 'graded'));
+ next if (!$incorrect && $submitonly eq 'incorrect');
}
$ctr++;
+ my $section = $classlist->{$student}->[&Apache::loncoursedata::CL_SECTION()];
+
if ( $perm{'vgr'} eq 'F' ) {
$gradeTable.='<tr bgcolor="#ffffe6">' if ($ctr%2 ==1);
$gradeTable.='<td align="right">'.$ctr.' </td>'.
- '<td align="center"><input type=checkbox name="stuinfo" value="'.
- $student.':'.$$fullname{$student}.' "></td>'."\n".
- '<td>'.&nameUserString(undef,$$fullname{$student},$uname,$udom).'</td>'."\n";
+ '<td align="center"><label><input type=checkbox name="stuinfo" value="'.
+ $student.':'.$$fullname{$student}.':::SECTION'.$section.
+ ') " /> </label></td>'."\n".'<td>'.
+ &nameUserString(undef,$$fullname{$student},$uname,$udom).
+ ' '.$section.'</td>'."\n";
- if ($ENV{'form.showgrading'} eq 'yes' && $submitonly ne 'all') {
+ if ($env{'form.showgrading'} eq 'yes' && $submitonly ne 'all') {
foreach (sort keys(%status)) {
next if (/^resource.*?submitted_by$/);
- $gradeTable.='<td align="middle"> '.$status{$_}.' </td>'."\n";
+ $gradeTable.='<td align="center"> '.$status{$_}.' </td>'."\n";
}
}
# $gradeTable.='<td></td>' if ($ctr%2 ==1);
@@ -735,15 +857,19 @@ LISTJAVASCRIPT
}
if ($ctr%2 ==1) {
$gradeTable.='<td> </td><td> </td><td> </td>';
- if ($ENV{'form.showgrading'} eq 'yes' && $submitonly ne 'all') {
+ if ($env{'form.showgrading'} eq 'yes'
+ && $submitonly ne 'queued'
+ && $submitonly ne 'all') {
foreach (@$partlist) {
$gradeTable.='<td> </td>';
}
+ } elsif ($submitonly eq 'queued') {
+ $gradeTable.='<td> </td>';
}
$gradeTable.='</tr>';
}
- $gradeTable.='</table></td></tr></table>'.
+ $gradeTable.='</table></td></tr></table>'."\n".
'<input type="button" '.
'onClick="javascript:checkSelect(this.form.stuinfo);" '.
'value="Next->" /></form>'."\n";
@@ -755,6 +881,7 @@ LISTJAVASCRIPT
my $submissions='submissions';
if ($submitonly eq 'incorrect') { $submissions = 'incorrect submissions'; }
if ($submitonly eq 'graded' ) { $submissions = 'ungraded submissions'; }
+ if ($submitonly eq 'queued' ) { $submissions = 'queued submissions'; }
$gradeTable='<br /> <font color="red">'.
'No '.$submissions.' found for this resource for any students. ('.$num_students.
' students checked for '.$submissions.')</font><br />';
@@ -762,12 +889,58 @@ LISTJAVASCRIPT
} elsif ($ctr == 1) {
$gradeTable =~ s/type=checkbox/type=checkbox checked/;
}
- $gradeTable.=&show_grading_menu_form($symb,$url);
+ $gradeTable.=&show_grading_menu_form($symb);
$request->print($gradeTable);
return '';
}
#---- Called from the listStudents routine
+
+sub check_script {
+ my ($form, $type)=@_;
+ my $chkallscript='<script type="text/javascript">
+ function checkall() {
+ for (i=0; i<document.forms.'.$form.'.elements.length; i++) {
+ ele = document.forms.'.$form.'.elements[i];
+ if (ele.name == "'.$type.'") {
+ document.forms.'.$form.'.elements[i].checked=true;
+ }
+ }
+ }
+
+ function checksec() {
+ for (i=0; i<document.forms.'.$form.'.elements.length; i++) {
+ ele = document.forms.'.$form.'.elements[i];
+ string = document.forms.'.$form.'.chksec.value;
+ if
+ (ele.value.indexOf(":::SECTION"+string)>0) {
+ document.forms.'.$form.'.elements[i].checked=true;
+ }
+ }
+ }
+
+
+ function uncheckall() {
+ for (i=0; i<document.forms.'.$form.'.elements.length; i++) {
+ ele = document.forms.'.$form.'.elements[i];
+ if (ele.name == "'.$type.'") {
+ document.forms.'.$form.'.elements[i].checked=false;
+ }
+ }
+ }
+
+</script>'."\n";
+ return $chkallscript;
+}
+
+sub check_buttons {
+ my $buttons.='<input type="button" onclick="checkall()" value="Check All" />';
+ $buttons.='<input type="button" onclick="uncheckall()" value="Uncheck All" /> ';
+ $buttons.='<input type="button" onclick="checksec()" value="Check Section/Group" />';
+ $buttons.='<input type="text" size="5" name="chksec" /> ';
+ return $buttons;
+}
+
# Displays the submissions for one student or a group of students
sub processGroup {
my ($request) = shift;
@@ -777,9 +950,9 @@ sub processGroup {
foreach (@stuchecked) {
my ($uname,$udom,$fullname) = split(/:/);
- $ENV{'form.student'} = $uname;
- $ENV{'form.userdom'} = $udom;
- $ENV{'form.fullname'} = $fullname;
+ $env{'form.student'} = $uname;
+ $env{'form.userdom'} = $udom;
+ $env{'form.fullname'} = $fullname;
&submission($request,$ctr,$total);
$ctr++;
}
@@ -972,7 +1145,83 @@ sub sub_page_kw_js {
my $request = shift;
my $iconpath = $request->dir_config('lonIconsURL');
&commonJSfunctions($request);
+
+ my $inner_js_msg_central=<<INNERJS;
+ <script text="text/javascript">
+ function checkInput() {
+ opener.document.SCORE.msgsub.value = opener.checkEntities(document.msgcenter.msgsub.value);
+ var nmsg = opener.document.SCORE.savemsgN.value;
+ var usrctr = document.msgcenter.usrctr.value;
+ var newval = opener.document.SCORE["newmsg"+usrctr];
+ newval.value = opener.checkEntities(document.msgcenter.newmsg.value);
+
+ var msgchk = "";
+ if (document.msgcenter.subchk.checked) {
+ msgchk = "msgsub,";
+ }
+ var includemsg = 0;
+ for (var i=1; i<=nmsg; i++) {
+ var opnmsg = opener.document.SCORE["savemsg"+i];
+ var frmmsg = document.msgcenter["msg"+i];
+ opnmsg.value = opener.checkEntities(frmmsg.value);
+ var showflg = opener.document.SCORE["shownOnce"+i];
+ showflg.value = "1";
+ var chkbox = document.msgcenter["msgn"+i];
+ if (chkbox.checked) {
+ msgchk += "savemsg"+i+",";
+ includemsg = 1;
+ }
+ }
+ if (document.msgcenter.newmsgchk.checked) {
+ msgchk += "newmsg"+usrctr;
+ includemsg = 1;
+ }
+ imgformname = opener.document.SCORE["mailicon"+usrctr];
+ imgformname.src = "$iconpath/"+((includemsg) ? "mailto.gif" : "mailbkgrd.gif");
+ var includemsg = opener.document.SCORE["includemsg"+usrctr];
+ includemsg.value = msgchk;
+
+ self.close()
+
+ }
+ </script>
+INNERJS
+
+ my $inner_js_highlight_central=<<INNERJS;
+ <script type="text/javascript">
+ function updateChoice(flag) {
+ opener.document.SCORE.kwclr.value = opener.radioSelection(document.hlCenter.kwdclr);
+ opener.document.SCORE.kwsize.value = opener.radioSelection(document.hlCenter.kwdsize);
+ opener.document.SCORE.kwstyle.value = opener.radioSelection(document.hlCenter.kwdstyle);
+ opener.document.SCORE.refresh.value = "on";
+ if (opener.document.SCORE.keywords.value!=""){
+ opener.document.SCORE.submit();
+ }
+ self.close()
+ }
+</script>
+INNERJS
+
+ my $start_page_msg_central =
+ &Apache::loncommon::start_page('Message Central',$inner_js_msg_central,
+ {'js_ready' => 1,
+ 'only_body' => 1,
+ 'bgcolor' =>'#FFFFFF',});
+ my $end_page_msg_central =
+ &Apache::loncommon::end_page({'js_ready' => 1});
+
+
+ my $start_page_highlight_central =
+ &Apache::loncommon::start_page('Highlight Central',
+ $inner_js_highlight_central,
+ {'js_ready' => 1,
+ 'only_body' => 1,
+ 'bgcolor' =>'#FFFFFF',});
+ my $end_page_highlight_central =
+ &Apache::loncommon::end_page({'js_ready' => 1});
+
my $docopen=&Apache::lonhtmlcommon::javascript_docopen();
+ $docopen=~s/^document\.//;
$request->print(<<SUBJAVASCRIPT);
<script type="text/javascript" language="javascript">
@@ -1086,55 +1335,11 @@ sub sub_page_kw_js {
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 = 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 = 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) {");
- pDoc.write(" msgchk = \\"msgsub,\\";");
- pDoc.write(" }");
- pDoc.write(" var includemsg = 0;");
- pDoc.write(" for (var i=1; i<=nmsg; 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;");
- pDoc.write(" }");
- pDoc.write(" }");
- pDoc.write(" if (document.msgcenter.newmsgchk.checked) {");
- pDoc.write(" msgchk += \\"newmsg\\"+usrctr;");
- pDoc.write(" includemsg = 1;");
- pDoc.write(" }");
- pDoc.write(" imgformname = opener.document.SCORE[\\"mailicon\\"+usrctr];");
- pDoc.write(" imgformname.src = \\"$iconpath/\\"+((includemsg) ? \\"mailto.gif\\" : \\"mailbkgrd.gif\\");");
- pDoc.write(" var includemsg = opener.document.SCORE[\\"includemsg\\"+usrctr];");
- pDoc.write(" includemsg.value = msgchk;");
-
- pDoc.write(" self.close()");
-
- pDoc.write("}");
-
- pDoc.write("<");
- pDoc.write("/script>");
-
- pDoc.write("</head><body bgcolor=white>");
+ pDoc.write('$start_page_msg_central');
pDoc.write("<form action=\\"inactive\\" name=\\"msgcenter\\">");
pDoc.write("<input value=\\""+usrctr+"\\" name=\\"usrctr\\" type=\\"hidden\\">");
- pDoc.write("<font color=\\"green\\" size=+1> Compose Message for \"+fullname+\"</font><br><br>");
+ pDoc.write("<font color=\\"green\\" size=+1> Compose Message for \"+fullname+\"</font><br /><br />");
pDoc.write("<table border=0 width=100%><tr><td bgcolor=\\"#777777\\">");
pDoc.write("<table border=0 width=100%><tr bgcolor=\\"#ddffff\\">");
@@ -1169,9 +1374,9 @@ sub sub_page_kw_js {
pDoc.write("</table>");
pDoc.write("</td></tr></table> ");
pDoc.write("<input type=\\"button\\" value=\\"Save\\" onClick=\\"javascript:checkInput()\\"> ");
- pDoc.write("<input type=\\"button\\" value=\\"Cancel\\" onClick=\\"self.close()\\"><br><br>");
+ pDoc.write("<input type=\\"button\\" value=\\"Cancel\\" onClick=\\"self.close()\\"><br /><br />");
pDoc.write("</form>");
- pDoc.write("</body></html>");
+ pDoc.write('$end_page_msg_central');
pDoc.close();
}
@@ -1217,28 +1422,9 @@ sub sub_page_kw_js {
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 = 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();");
- hDoc.write(" }");
- hDoc.write(" self.close()");
- hDoc.write("}");
-
- hDoc.write("<");
- hDoc.write("/script>");
-
- hDoc.write("</head><body bgcolor=white>");
-
+ hDoc.write('$start_page_highlight_central');
hDoc.write("<form action=\\"inactive\\" name=\\"hlCenter\\">");
- hDoc.write("<font color=\\"green\\" size=+1> Keyword Highlight Options</font><br><br>");
+ hDoc.write("<font color=\\"green\\" size=+1> Keyword Highlight Options</font><br /><br />");
hDoc.write("<table border=0 width=100%><tr><td bgcolor=\\"#777777\\">");
hDoc.write("<table border=0 width=100%><tr bgcolor=\\"#ddffff\\">");
@@ -1262,9 +1448,9 @@ sub sub_page_kw_js {
hDoc.write("</table>");
hDoc.write("</td></tr></table> ");
hDoc.write("<input type=\\"button\\" value=\\"Save\\" onClick=\\"javascript:updateChoice(1)\\"> ");
- hDoc.write("<input type=\\"button\\" value=\\"Cancel\\" onClick=\\"self.close()\\"><br><br>");
+ hDoc.write("<input type=\\"button\\" value=\\"Cancel\\" onClick=\\"self.close()\\"><br /><br />");
hDoc.write("</form>");
- hDoc.write("</body></html>");
+ hDoc.write('$end_page_highlight_central');
hDoc.close();
}
@@ -1272,37 +1458,50 @@ sub sub_page_kw_js {
SUBJAVASCRIPT
}
+sub get_increment {
+ my $increment = $env{'form.increment'};
+ if ($increment != 1 && $increment != .5 && $increment != .25 &&
+ $increment != .1) {
+ $increment = 1;
+ }
+ return $increment;
+}
+
#--- displays the grading box, used in essay type problem and grading by page/sequence
sub gradeBox {
my ($request,$symb,$uname,$udom,$counter,$partid,$record) = @_;
-
my $checkIcon = '<img src="'.$request->dir_config('lonIconsURL').
'/check.gif" height="16" border="0" />';
-
my $wgt = &Apache::lonnet::EXT('resource.'.$partid.'.weight',$symb,$udom,$uname);
my $wgtmsg = ($wgt > 0 ? '(problem weight)' :
'<font color="red">problem weight assigned by computer</font>');
$wgt = ($wgt > 0 ? $wgt : '1');
my $score = ($$record{'resource.'.$partid.'.awarded'} eq '' ?
- '' : $$record{'resource.'.$partid.'.awarded'}*$wgt);
+ '' : &compute_points($$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);
+ my $display_part=&get_display_part($partid,$symb);
+ my %last_resets = &get_last_resets($symb,$env{'request.course.id'},
+ [$partid]);
+ my $aggtries = $$record{'resource.'.$partid.'.tries'};
+ if ($last_resets{$partid}) {
+ $aggtries = &get_num_tries($record,$last_resets{$partid},$partid);
+ }
$result.='<table border="0"><tr><td>'.
'<b>Part: </b>'.$display_part.' <b>Points: </b></td><td>'."\n";
-
my $ctr = 0;
+ my $thisweight = 0;
+ my $increment = &get_increment();
$result.='<table border="0"><tr>'."\n"; # display radio buttons in a nice table 10 across
- while ($ctr<=$wgt) {
- $result.= '<td><nobr><input type="radio" name="RADVAL'.$counter.'_'.$partid.'" '.
+ while ($thisweight<=$wgt) {
+ $result.= '<td><nobr><label><input type="radio" name="RADVAL'.$counter.'_'.$partid.'" '.
'onclick="javascript:writeBox(this.form,\''.$counter.'_'.$partid.'\','.
- $ctr.')" value="'.$ctr.'" '.
- ($score eq $ctr ? 'checked':'').' /> '.$ctr."</nobr></td>\n";
+ $thisweight.')" value="'.$thisweight.'" '.
+ ($score eq $thisweight ? 'checked':'').' /> '.$thisweight."</label></nobr></td>\n";
$result.=(($ctr+1)%10 == 0 ? '</tr><tr>' : '');
+ $thisweight += $increment;
$ctr++;
}
$result.='</tr></table>';
-
$result.='</td><td> <b>or</b> </td>'."\n";
$result.='<td><input type="text" name="GD_BOX'.$counter.'_'.$partid.'"'.
($score ne ''? ' value = "'.$score.'"':'').' size="4" '.
@@ -1311,7 +1510,6 @@ sub gradeBox {
$result.='<td>/'.$wgt.' '.$wgtmsg.
($$record{'resource.'.$partid.'.solved'} eq 'correct_by_student' ? ' '.$checkIcon : '').
' </td><td>'."\n";
-
$result.='<select name="GD_SEL'.$counter.'_'.$partid.'" '.
'onChange="javascript:clearRadBox(this.form,\''.$counter.'_'.$partid.'\')" >'."\n";
if ($$record{'resource.'.$partid.'.solved'} eq 'excused') {
@@ -1326,17 +1524,54 @@ sub gradeBox {
$result.='<input type="hidden" name="stores'.$counter.'_'.$partid.'" value="" />'."\n".
'<input type="hidden" name="oldpts'.$counter.'_'.$partid.'" value="'.$score.'" />'."\n".
'<input type="hidden" name="solved'.$counter.'_'.$partid.'" value="'.
- $$record{'resource.'.$partid.'.solved'}.'" />'."\n";
+ $$record{'resource.'.$partid.'.solved'}.'" />'."\n".
+ '<input type="hidden" name="totaltries'.$counter.'_'.$partid.'" value="'.
+ $$record{'resource.'.$partid.'.tries'}.'" />'."\n".
+ '<input type="hidden" name="aggtries'.$counter.'_'.$partid.'" value="'.
+ $aggtries.'" />'."\n";
$result.='</td></tr></table>'."\n";
+ $result.=&handback_box($symb,$uname,$udom,$counter,$partid,$record);
return $result;
}
+sub handback_box {
+ my ($symb,$uname,$udom,$counter,$partid,$record) = @_;
+ my ($partlist,$handgrade,$responseType) = &response_type($symb);
+ my (@respids);
+ foreach my $part_resp (sort(keys(%$handgrade))) {
+ my ($part,$resp) = split(/_/,$part_resp);
+ if ($part eq $partid) {
+ push @respids,$resp;
+ }
+ }
+ my $result;
+ foreach my $respid (@respids) {
+ my $prefix = $counter.'_'.$partid.'_'.$respid.'_';
+ my $files=&get_submitted_files($udom,$uname,$partid,$respid,$record);
+ next if (!@$files);
+ my $file_counter = 1;
+ foreach my $file (@$files) {
+ my ($file_path, $file_disp) = ($file =~ m|(.+/)(.+)$|);
+ my ($name,$version,$ext) = &file_name_version_ext($file_disp);
+ $file_disp = "$name.$ext";
+ $file = $file_path.$file_disp;
+ $result.=&mt('Return commented version of [_1] to student.',
+ '<span class="LC_filename">'.$file_disp.'</span>');
+ $result.='<input type="file" name="'.$prefix.'returndoc'.$file_counter.'" />'."\n";
+ $result.='<input type="hidden" name="'.$prefix.'origdoc'.$file_counter.'" value="'.$file.'" /><br />';
+ $file_counter++;
+ }
+ }
+ return $result;
+}
+
sub show_problem {
my ($request,$symb,$uname,$udom,$removeform,$viewon,$mode) = @_;
my $rendered;
+ &Apache::lonxml::remember_problem_counter();
if ($mode eq 'both' or $mode eq 'text') {
$rendered=&Apache::loncommon::get_student_view($symb,$uname,$udom,
- $ENV{'request.course.id'});
+ $env{'request.course.id'});
}
if ($removeform) {
$rendered=~s|<form(.*?)>||g;
@@ -1345,8 +1580,9 @@ sub show_problem {
}
my $companswer;
if ($mode eq 'both' or $mode eq 'answer') {
+ &Apache::lonxml::restore_problem_counter();
$companswer=&Apache::loncommon::get_student_answers($symb,$uname,$udom,
- $ENV{'request.course.id'});
+ $env{'request.course.id'});
}
if ($removeform) {
$companswer=~s|<form(.*?)>||g;
@@ -1362,7 +1598,7 @@ sub show_problem {
} else {
$result.='Correct answer: ';
}
- $result.=$ENV{'form.fullname'}.'</b></td></tr>';
+ $result.=$env{'form.fullname'}.'</b></td></tr>';
}
if ($mode eq 'both') {
$result.='<tr><td bgcolor="#ffffff">'.$rendered.'<br />';
@@ -1381,41 +1617,40 @@ sub show_problem {
sub submission {
my ($request,$counter,$total) = @_;
- (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'} = &Apache::loncommon::plainname($uname,$udom,'lastname') if $ENV{'form.fullname'} eq '';
+ 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'} = &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 ''; }
+ my $symb = &get_symb($request);
+ if ($symb eq '') { $request->print("Unable to handle ambiguous references:."); return ''; }
if (!&canview($usec)) {
$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));
+ $env{'request.course.id'}.')</font>');
+ $request->print(&show_grading_menu_form($symb));
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' : '');
+ 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) if ($ENV{'form.handgrade'} eq 'yes');
- $ENV{'form.probTitle'} = $ENV{'form.probTitle'} eq '' ?
- &Apache::lonnet::gettitle($symb) : $ENV{'form.probTitle'};
+ &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>Resource: </b>'.$ENV{'form.probTitle'}.'</font>'."\n");
+ '<font size=+1> <b>Resource: </b>'.$env{'form.probTitle'}.'</font>'."\n");
- if ($ENV{'form.handgrade'} eq 'no') {
+ 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);
@@ -1423,75 +1658,75 @@ sub submission {
# 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.vAns'} eq 'yes') {
+ 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') {
+ if ($env{'form.vProb'} eq 'yes' && $env{'form.vAns'} eq 'yes') {
$mode='both';
- } elsif ($ENV{'form.vProb'} eq 'yes') {
+ } elsif ($env{'form.vProb'} eq 'yes') {
$mode='text';
- } elsif ($ENV{'form.vAns'} eq 'yes') {
+ } elsif ($env{'form.vAns'} eq 'yes') {
$mode='answer';
}
+ &Apache::lonxml::clear_problem_counter();
$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 '' && $ENV{'form.handgrade'} eq 'yes') {
+ 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'});
+ $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.msgsub'} = $keyhash{$symb.'_subject'} ne '' ?
- $keyhash{$symb.'_subject'} : $ENV{'form.probTitle'};
- $ENV{'form.savemsgN'} = $keyhash{$symb.'_savemsgN'} ne '' ? $keyhash{$symb.'_savemsgN'} : '0';
+ 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.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'};
+ my $overRideScore = $env{'form.overRideScore'} eq '' ? 'no' : $env{'form.overRideScore'};
- $request->print('<form action="/adm/grades" method="post" name="SCORE">'."\n".
+ $request->print('<form action="/adm/grades" method="post" name="SCORE" enctype="multipart/form-data">'."\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="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="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="handgrade" value="'.$ENV{'form.handgrade'}.'">'."\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="handgrade" value="'.$env{'form.handgrade'}.'" />'."\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".
+ ' 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");
+ '<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'}) {
+ while ($cts <= $env{'form.savemsgN'}) {
$prnmsg.='<input type="hidden" name="savemsg'.$cts.'" value="'.
(!exists($keyhash{$symb.'_savemsg'.$cts}) ?
- &Apache::lonfeedback::clear_out_html($ENV{'form.savemsg'.$cts}) :
+ &Apache::lonfeedback::clear_out_html($env{'form.savemsg'.$cts}) :
&Apache::lonfeedback::clear_out_html($keyhash{$symb.'_savemsg'.$cts})).
'" />'."\n".
'<input type="hidden" name="shownOnce'.$cts.'" value="0" />'."\n";
@@ -1499,7 +1734,7 @@ sub submission {
}
$request->print($prnmsg);
- if ($ENV{'form.handgrade'} eq 'yes' && $ENV{'form.showgrading'} eq 'yes') {
+ if ($env{'form.handgrade'} eq 'yes' && $env{'form.showgrading'} eq 'yes') {
#
# Print out the keyword options line
#
@@ -1513,44 +1748,44 @@ KEYWORDS
#
# Load the other essays for similarity check
#
- my $essayurl=&Apache::lonnet::declutter($url);
+ my (undef,undef,$essayurl) = &Apache::lonnet::decode_symb($symb);
my ($adom,$aname,$apath)=($essayurl=~/^(\w+)\/(\w+)\/(.*)$/);
- $apath=&Apache::lonnet::escape($apath);
+ $apath=&escape($apath);
$apath=~s/\W/\_/gs;
%oldessays=&Apache::lonnet::dump('nohist_essay_'.$apath,$adom,$aname);
}
}
- if ($ENV{'form.vProb'} eq 'all' or $ENV{'form.vAns'} eq 'all') {
+ if ($env{'form.vProb'} eq 'all' or $env{'form.vAns'} eq 'all') {
$request->print('<br /><br /><br />') if ($counter > 0);
my $mode;
- if ($ENV{'form.vProb'} eq 'all' && $ENV{'form.vAns'} eq 'all') {
+ if ($env{'form.vProb'} eq 'all' && $env{'form.vAns'} eq 'all') {
$mode='both';
- } elsif ($ENV{'form.vProb'} eq 'all' ) {
+ } elsif ($env{'form.vProb'} eq 'all' ) {
$mode='text';
- } elsif ($ENV{'form.vAns'} eq 'all') {
+ } elsif ($env{'form.vAns'} eq 'all') {
$mode='answer';
}
+ &Apache::lonxml::clear_problem_counter();
$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,$responseType) = &response_type($url,$symb);
+ my %record = &Apache::lonnet::restore($symb,$env{'request.course.id'},$udom,$uname);
+ my ($partlist,$handgrade,$responseType) = &response_type($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";
+ 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>'.&nameUserString(undef,$ENV{'form.fullname'},$uname,$udom).'<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";
+ '" value="'.$env{'form.fullname'}.'" />'."\n";
# 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') {
+ if ($env{'form.handgrade'} eq 'yes') {
($classlist,undef,$fullname) = &getclasslist('all','0');
for (keys (%$handgrade)) {
my $ncol = &Apache::lonnet::EXT('resource.'.$_.
@@ -1611,7 +1846,7 @@ KEYWORDS
# (for multi-response type part)
# (3) Last submission plus the parts info
# (4) The whole record for this student
- if ($ENV{'form.lastSub'} =~ /^(lastonly|hdgrade)$/) {
+ if ($env{'form.lastSub'} =~ /^(lastonly|hdgrade)$/) {
my ($string,$timestamp)= &get_last_submission(\%record);
my $lastsubonly=''.
($$timestamp eq '' ? '' : '<b>Date Submitted:</b> '.
@@ -1622,16 +1857,16 @@ KEYWORDS
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"}) {
+ my $display_part=&get_display_part($partid,$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"}.
+ $env{"form.$uname:$udom:$partid:submitted_by"}.
'\')"; TARGET=_self>'.
- $$fullname{$ENV{"form.$uname:$udom:$partid:submitted_by"}}.'</a><br />';
+ $$fullname{$env{"form.$uname:$udom:$partid:submitted_by"}}.'</a><br />';
$request->print($submitby);
next;
}
@@ -1649,7 +1884,7 @@ KEYWORDS
my ($ressub,$subval) = split(/:/,$_,2);
# Similarity check
my $similar='';
- if($ENV{'form.checkPlag'}){
+ if($env{'form.checkPlag'}){
my ($oname,$odom,$ocrsid,$oessay,$osim)=
&most_similar($uname,$udom,$subval);
if ($osim) {
@@ -1663,32 +1898,23 @@ KEYWORDS
}
}
my $order=&get_order($partid,$respid,$symb,$uname,$udom);
- if ($ENV{'form.lastSub'} eq 'lastonly' ||
- ($ENV{'form.lastSub'} eq 'hdgrade' &&
+ if ($env{'form.lastSub'} eq 'lastonly' ||
+ ($env{'form.lastSub'} eq 'hdgrade' &&
$$handgrade{$part} eq 'yes')) {
- my $display_part=&get_display_part($partid,$url,$symb);
+ my $display_part=&get_display_part($partid,$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) {
+ my $files=&get_submitted_files($udom,$uname,$partid,$respid,\%record);
+ 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) {
+ my $file_counter = 0;
+ foreach my $file (@$files) {
+ $file_counter ++;
&Apache::lonnet::allowuploaded('/adm/grades',$file);
- $lastsubonly.='<br /><a href="'.$file.'" target="lonGRDs"><img src="'.&Apache::loncommon::icon($file).'" border=0"> '.$file.'</a>';
+ $lastsubonly.='<br /><a href="'.$file.'?rawmode=1" target="lonGRDs"><img src="'.&Apache::loncommon::icon($file).'" border=0"> '.$file.'</a>';
}
+ $lastsubonly.='<br />';
}
$lastsubonly.='<b>Submitted Answer: </b>'.
&cleanRecord($subval,$responsetype,$symb,$partid,
@@ -1700,12 +1926,12 @@ KEYWORDS
}
$lastsubonly.='</td></tr><tr bgcolor="#ffffff"><td>'."\n";
$request->print($lastsubonly);
- } elsif ($ENV{'form.lastSub'} eq 'datesub') {
- my (undef,$responseType,undef,$parts) = &showResourceInfo($url);
+ } elsif ($env{'form.lastSub'} eq 'datesub') {
+ my (undef,$responseType,undef,$parts) = &showResourceInfo($symb);
$request->print(&displaySubByDates($symb,\%record,$parts,$responseType,$checkIcon,$uname,$udom));
- } elsif ($ENV{'form.lastSub'} =~ /^(last|all)$/) {
+ } elsif ($env{'form.lastSub'} =~ /^(last|all)$/) {
$request->print(&Apache::loncommon::get_previous_attempt($symb,$uname,$udom,
- $ENV{'request.course.id'},
+ $env{'request.course.id'},
$last,'.submission',
'Apache::grades::keywords_highlight'));
}
@@ -1714,14 +1940,14 @@ KEYWORDS
.$udom.'" />'."\n");
# return if view submission with no grading option
- if ($ENV{'form.showgrading'} eq '' || (!&canmodify($usec))) {
+ if ($env{'form.showgrading'} eq '' || (!&canmodify($usec))) {
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)
+ if (($env{'form.command'} eq 'submission') ||
+ ($env{'form.command'} eq 'processGroup' && $counter == $total)) {
+ $toGrade.='</form>'.&show_grading_menu_form($symb);
}
$request->print($toGrade);
return;
@@ -1730,8 +1956,8 @@ KEYWORDS
}
# essay grading message center
- if ($ENV{'form.handgrade'} eq 'yes') {
- my ($lastname,$givenn) = split(/,/,$ENV{'form.fullname'});
+ 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;
@@ -1742,25 +1968,35 @@ KEYWORDS
'<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> '.
+ &mt('Compose message to student').(scalar(@col_fullnames) >= 1 ? 's' : '').'</a><label> ('.
+ &mt('incl. grades').' <input type="checkbox" name="withgrades'.$counter.'" /></label>)'.
'<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');
+ '<br /> ('.
+ &mt('Message will be sent when you click on Save & Next below.').")\n";
$request->print($result);
}
+ if ($perm{'vgr'}) {
+ $request->print('<br />'.
+ &Apache::loncommon::track_student_link(&mt('View recent activity'),
+ $uname,$udom,'check'));
+ }
+ if ($perm{'opa'}) {
+ $request->print('<br />'.
+ &Apache::loncommon::pprmlink(&mt('Set/Change parameters'),
+ $uname,$udom,$symb,'check'));
+ }
my %seen = ();
my @partlist;
my @gradePartRespid;
- for (sort keys(%$handgrade)) {
- my ($partid,$respid) = split(/_/);
+ for my $part_resp (sort(keys(%$handgrade))) {
+ my ($partid,$respid) = split(/_/, $part_resp);
next if ($seen{$partid} > 0);
$seen{$partid}++;
- next if ($$handgrade{$_} =~ /:no$/ && $ENV{'form.lastSub'} =~ /^(hdgrade)$/);
+ next if ($$handgrade{$part_resp} =~ /: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.
@@ -1785,7 +2021,7 @@ KEYWORDS
'<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');
+ 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" '.
@@ -1793,8 +2029,10 @@ KEYWORDS
'<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.="<input type='hidden' value='".&get_increment().
+ "' name='increment' />";
$endform.='</td><tr></table></form>';
- $endform.=&show_grading_menu_form($symb,$url);
+ $endform.=&show_grading_menu_form($symb);
$request->print($endform);
}
return '';
@@ -1829,12 +2067,12 @@ sub get_last_submission {
#--- High light keywords, with style choosen by user.
sub keywords_highlight {
my $string = shift;
- my $size = $ENV{'form.kwsize'} eq '0' ? '' : 'size='.$ENV{'form.kwsize'};
- my $styleon = $ENV{'form.kwstyle'} eq '' ? '' : $ENV{'form.kwstyle'};
+ my $size = $env{'form.kwsize'} eq '0' ? '' : 'size='.$env{'form.kwsize'};
+ my $styleon = $env{'form.kwstyle'} eq '' ? '' : $env{'form.kwstyle'};
(my $styleoff = $styleon) =~ s/\</\<\//;
- my @keylist = split(/[,\s+]/,$ENV{'form.keywords'});
+ 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;
}
return $string;
}
@@ -1842,16 +2080,19 @@ sub keywords_highlight {
#--- Called from submission routine
sub processHandGrade {
my ($request) = shift;
- my $url = $ENV{'form.url'};
- my $symb = $ENV{'form.symb'};
- my $button = $ENV{'form.gradeOpt'};
- my $ngrade = $ENV{'form.NCT'};
- my $ntstu = $ENV{'form.NTSTU'};
+ my $symb = &get_symb($request);
+ my (undef,undef,$url) = &Apache::lonnet::decode_symb($symb);
+ my $button = $env{'form.gradeOpt'};
+ my $ngrade = $env{'form.NCT'};
+ my $ntstu = $env{'form.NTSTU'};
+ my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+ my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+
if ($button eq 'Save & Next') {
my $ctr = 0;
while ($ctr < $ngrade) {
- my ($uname,$udom) = split(/:/,$ENV{'form.unamedom'.$ctr});
- my ($errorflag,$pts,$wgt) = &saveHandGrade($request,$url,$symb,$uname,$udom,$ctr);
+ my ($uname,$udom) = split(/:/,$env{'form.unamedom'.$ctr});
+ my ($errorflag,$pts,$wgt) = &saveHandGrade($request,$symb,$uname,$udom,$ctr);
if ($errorflag eq 'no_score') {
$ctr++;
next;
@@ -1861,38 +2102,44 @@ sub processHandGrade {
$ctr++;
next;
}
- my $includemsg = $ENV{'form.includemsg'.$ctr};
+ my $includemsg = $env{'form.includemsg'.$ctr};
my ($subject,$message,$msgstatus) = ('','','');
if ($includemsg =~ /savemsg|newmsg\Q$ctr\E/) {
- $subject = $ENV{'form.msgsub'} if ($includemsg =~ /^msgsub/);
+ $subject = $env{'form.msgsub'} if ($includemsg =~ /msgsub/);
+ unless ($subject=~/\w/) { $subject=&mt('Grading Feedback'); }
+ $subject.=' ['.&Apache::lonnet::declutter($url).']';
my (@msgnum) = split(/,/,$includemsg);
foreach (@msgnum) {
- $message.=$ENV{'form.'.$_} if ($_ =~ /savemsg|newmsg/ && $_ ne '');
+ $message.=$env{'form.'.$_} if ($_ =~ /savemsg|newmsg/ && $_ ne '');
}
$message =&Apache::lonfeedback::clear_out_html($message);
- $message.="\n\nPoint".($pts > 1 ? 's':'').' awarded = '.$pts.' out of '.$wgt;
- $message.=" for <a href=\"".
+ if ($env{'form.withgrades'.$ctr}) {
+ $message.="\n\nPoint".($pts > 1 ? 's':'').' awarded = '.$pts.' out of '.$wgt;
+ $message.=" for <a href=\"".
&Apache::lonnet::clutter($url).
- "?symb=$symb\">$ENV{'form.probTitle'}</a>";
- $msgstatus = &Apache::lonmsg::user_normal_msg ($uname,$udom,
- $ENV{'form.msgsub'},$message);
+ "?symb=$symb\">$env{'form.probTitle'}</a>";
+ }
+ $msgstatus = &Apache::lonmsg::user_normal_msg($uname,$udom,
+ $subject,
+ $message);
+ $request->print('<br />'.&mt('Sending message to [_1]@[_2]',$uname,$udom).': '.
+ $msgstatus);
}
- if ($ENV{'form.collaborator'.$ctr}) {
+ if ($env{'form.collaborator'.$ctr}) {
my @collabstrs=&Apache::loncommon::get_env_multiple("form.collaborator$ctr");
foreach my $collabstr (@collabstrs) {
my ($part,@collaborators) = split(/:/,$collabstr);
- foreach (@collaborators) {
+ foreach my $collaborator (@collaborators) {
my ($errorflag,$pts,$wgt) =
- &saveHandGrade($request,$url,$symb,$_,$udom,$ctr,
- $ENV{'form.unamedom'.$ctr},$part);
+ &saveHandGrade($request,$symb,$collaborator,$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>");
+ $request->print("<span class=\"LC_error\">".&mt('Not allowed to modify grades for [_1]',"$collaborator:$udom")."</span>");
next;
} else {
if ($message ne '') {
- $msgstatus = &Apache::lonmsg::user_normal_msg($_,$udom,$ENV{'form.msgsub'},$message);
+ $msgstatus = &Apache::lonmsg::user_normal_msg($collaborator,$udom,$subject,$message);
}
-
}
}
}
@@ -1901,61 +2148,59 @@ sub processHandGrade {
}
}
- if ($ENV{'form.handgrade'} eq 'yes') {
+ if ($env{'form.handgrade'} eq 'yes') {
# Keywords sorted in alphabatical order
- my $loginuser = $ENV{'user.name'}.':'.$ENV{'user.domain'};
+ 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'};
+ $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.
+ # 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};
+ while ($ctr <= $env{'form.savemsgN'}) {
+ if ($env{'form.savemsg'.$ctr} ne '') {
+ $keyhash{$symb.'_savemsg'.$idx} = $env{'form.savemsg'.$ctr};
$idx++;
}
$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};
+ if ($env{'form.newmsg'.$ctr} ne '') {
+ $keyhash{$symb.'_savemsg'.$idx} = $env{'form.newmsg'.$ctr};
+ $env{'form.savemsg'.$idx} = $env{'form.newmsg'.$ctr};
$idx++;
}
$ctr++;
}
- $ENV{'form.savemsgN'} = --$idx;
- $keyhash{$symb.'_savemsgN'} = $ENV{'form.savemsgN'};
+ $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'});
+ ('nohist_handgrade',\%keyhash,$cdom,$cnum);
}
# Called by Save & Refresh from Highlight Attribute Window
- my (undef,undef,$fullname) = &getclasslist($ENV{'form.section'},'1');
- if ($ENV{'form.refresh'} eq 'on') {
+ my (undef,undef,$fullname) = &getclasslist($env{'form.section'},'1');
+ if ($env{'form.refresh'} eq 'on') {
my ($ctr,$total) = (0,0);
while ($ctr < $ngrade) {
- $total++ if $ENV{'form.unamedom'.$ctr} ne '';
+ $total++ if $env{'form.unamedom'.$ctr} ne '';
$ctr++;
}
- $ENV{'form.NTSTU'}=$ngrade;
+ $env{'form.NTSTU'}=$ngrade;
$ctr = 0;
while ($ctr < $total) {
- my $processUser = $ENV{'form.unamedom'.$ctr};
- ($ENV{'form.student'},$ENV{'form.userdom'}) = split(/:/,$processUser);
- $ENV{'form.fullname'} = $$fullname{$processUser};
+ my $processUser = $env{'form.unamedom'.$ctr};
+ ($env{'form.student'},$env{'form.userdom'}) = split(/:/,$processUser);
+ $env{'form.fullname'} = $$fullname{$processUser};
&submission($request,$ctr,$total-1);
$ctr++;
}
@@ -1964,27 +2209,33 @@ sub processHandGrade {
# 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};
+ (undef,undef,$env{'form.handgrade'},undef,undef) = &showResourceInfo($symb);
+ 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)};
+ my $firststu = $env{'form.unamedom0'};
+ my $laststu = $env{'form.unamedom'.($ngrade-1)};
my $ctr = 2;
while ($laststu eq '') {
- $laststu = $ENV{'form.unamedom'.($ngrade-$ctr)};
+ $laststu = $env{'form.unamedom'.($ngrade-$ctr)};
$ctr++;
$laststu = $firststu if ($ctr > $ngrade);
}
my (@parsedlist,@nextlist);
my ($nextflg) = 0;
- foreach (sort {lc($$fullname{$a}) cmp lc($$fullname{$b}) } keys %$fullname) {
+ foreach (sort
+ {
+ if (lc($$fullname{$a}) ne lc($$fullname{$b})) {
+ return (lc($$fullname{$a}) cmp lc($$fullname{$b}));
+ }
+ return $a cmp $b;
+ } (keys(%$fullname))) {
if ($nextflg == 1 && $button =~ /Next$/) {
push @parsedlist,$_;
}
@@ -1996,18 +2247,28 @@ sub processHandGrade {
}
$ctr = 0;
@parsedlist = reverse @parsedlist if ($button eq 'Previous');
- my ($partlist) = &response_type($url);
+ my ($partlist) = &response_type($symb);
foreach my $student (@parsedlist) {
- my $submitonly=$ENV{'form.submitonly'};
+ my $submitonly=$env{'form.submitonly'};
my ($uname,$udom) = split(/:/,$student);
+
+ if ($submitonly eq 'queued') {
+ my %queue_status =
+ &Apache::bridgetask::get_student_status($symb,$cdom,$cnum,
+ $udom,$uname);
+ next if (!defined($queue_status{'gradingqueue'}));
+ }
+
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 %record = &Apache::lonnet::restore($symb,$env{'request.course.id'},$udom,$uname);
+ my %status=&student_gradeStatus($symb,$udom,$uname,$partlist);
my $submitted = 0;
- my $graded = 1;
+ my $ungraded = 0;
+ my $incorrect = 0;
foreach (keys(%status)) {
$submitted = 1 if ($status{$_} ne 'nothing');
- $graded = 0 if ($status{$_} =~ /^correct/);
+ $ungraded = 1 if ($status{$_} =~ /^ungraded/);
+ $incorrect = 1 if ($status{$_} =~ /^incorrect/);
my ($foo,$partid,$foo1) = split(/\./,$_);
if ($status{'resource.'.$partid.'.submitted_by'} ne '') {
$submitted = 0;
@@ -2016,8 +2277,8 @@ sub processHandGrade {
next if (!$submitted && ($submitonly eq 'yes' ||
$submitonly eq 'incorrect' ||
$submitonly eq 'graded'));
- next if (!$graded && ($submitonly eq 'graded' ||
- $submitonly eq 'incorrect'));
+ next if (!$ungraded && ($submitonly eq 'graded'));
+ next if (!$incorrect && $submitonly eq 'incorrect');
}
push @nextlist,$student if ($ctr < $ntstu);
last if ($ctr == $ntstu);
@@ -2029,9 +2290,9 @@ sub processHandGrade {
foreach (sort @nextlist) {
my ($uname,$udom,$submitter) = split(/:/);
- $ENV{'form.student'} = $uname;
- $ENV{'form.userdom'} = $udom;
- $ENV{'form.fullname'} = $$fullname{$_};
+ $env{'form.student'} = $uname;
+ $env{'form.userdom'} = $udom;
+ $env{'form.fullname'} = $$fullname{$_};
&submission($request,$ctr,$total);
$ctr++;
}
@@ -2039,7 +2300,7 @@ sub processHandGrade {
my $the_end = '<h3><font color="red">LON-CAPA User Message</font></h3><br />'."\n";
$the_end.='<b>Message: </b> No more students for this section or class.<br /><br />'."\n";
$the_end.='Click on the button below to return to the grading menu.<br /><br />'."\n";
- $the_end.=&show_grading_menu_form ($symb,$url);
+ $the_end.=&show_grading_menu_form($symb);
$request->print($the_end);
}
return '';
@@ -2047,50 +2308,73 @@ sub processHandGrade {
#---- Save the score and award for each student, if changed
sub saveHandGrade {
- my ($request,$url,$symb,$stuname,$domain,$newflg,$submitter,$part) = @_;
+ my ($request,$symb,$stuname,$domain,$newflg,$submitter,$part) = @_;
+ my @version_parts;
my $usec = &Apache::lonnet::getsection($domain,$stuname,
- $ENV{'request.course.id'});
+ $env{'request.course.id'});
if (!&canmodify($usec)) { return('not_allowed'); }
- my %record = &Apache::lonnet::restore($symb,$ENV{'request.course.id'},$domain,$stuname);
+ my %record = &Apache::lonnet::restore($symb,$env{'request.course.id'},$domain,$stuname);
+ my @parts_graded;
my %newrecord = ();
my ($pts,$wgt) = ('','');
- foreach (split(/:/,$ENV{'form.partlist'.$newflg})) {
- #collaborator may vary for different parts
- if ($submitter && $_ ne $part) { next; }
- my $dropMenu = $ENV{'form.GD_SEL'.$newflg.'_'.$_};
+ my %aggregate = ();
+ my $aggregateflag = 0;
+ my @parts = split(/:/,$env{'form.partlist'.$newflg});
+ foreach my $new_part (@parts) {
+ #collaborator ($submi may vary for different parts
+ if ($submitter && $new_part ne $part) { next; }
+ my $dropMenu = $env{'form.GD_SEL'.$newflg.'_'.$new_part};
if ($dropMenu eq 'excused') {
- if ($record{'resource.'.$_.'.solved'} ne 'excused') {
- $newrecord{'resource.'.$_.'.solved'} = 'excused';
- if (exists($record{'resource.'.$_.'.awarded'})) {
- $newrecord{'resource.'.$_.'.awarded'} = '';
+ if ($record{'resource.'.$new_part.'.solved'} ne 'excused') {
+ $newrecord{'resource.'.$new_part.'.solved'} = 'excused';
+ if (exists($record{'resource.'.$new_part.'.awarded'})) {
+ $newrecord{'resource.'.$new_part.'.awarded'} = '';
}
- $newrecord{'resource.'.$_.'.regrader'}="$ENV{'user.name'}:$ENV{'user.domain'}";
+ $newrecord{'resource.'.$new_part.'.regrader'}="$env{'user.name'}:$env{'user.domain'}";
}
} elsif ($dropMenu eq 'reset status'
- && exists($record{'resource.'.$_.'.solved'})) { #don't bother if no old records -> no attempts
+ && exists($record{'resource.'.$new_part.'.solved'})) { #don't bother if no old records -> no attempts
foreach my $key (keys (%record)) {
- if ($key=~/^resource\.\Q$_\E\./) { $newrecord{$key} = ''; }
+ if ($key=~/^resource\.\Q$new_part\E\./) { $newrecord{$key} = ''; }
}
- $newrecord{'resource.'.$_.'.regrader'}=
- "$ENV{'user.name'}:$ENV{'user.domain'}";
+ $newrecord{'resource.'.$new_part.'.regrader'}=
+ "$env{'user.name'}:$env{'user.domain'}";
+ my $totaltries = $record{'resource.'.$part.'.tries'};
+
+ my %last_resets = &get_last_resets($symb,$env{'request.course.id'},
+ [$new_part]);
+ my $aggtries =$totaltries;
+ if ($last_resets{$new_part}) {
+ $aggtries = &get_num_tries(\%record,$last_resets{$new_part},
+ $new_part);
+ }
+
+ my $solvedstatus = $record{'resource.'.$new_part.'.solved'};
+ if ($aggtries > 0) {
+ &decrement_aggs($symb,$new_part,\%aggregate,$aggtries,$totaltries,$solvedstatus);
+ $aggregateflag = 1;
+ }
} elsif ($dropMenu eq '') {
- $pts = ($ENV{'form.GD_BOX'.$newflg.'_'.$_} ne '' ?
- $ENV{'form.GD_BOX'.$newflg.'_'.$_} :
- $ENV{'form.RADVAL'.$newflg.'_'.$_});
- if ($pts eq '' && $ENV{'form.GD_SEL'.$newflg.'_'.$_} eq '') {
+ $pts = ($env{'form.GD_BOX'.$newflg.'_'.$new_part} ne '' ?
+ $env{'form.GD_BOX'.$newflg.'_'.$new_part} :
+ $env{'form.RADVAL'.$newflg.'_'.$new_part});
+ if ($pts eq '' && $env{'form.GD_SEL'.$newflg.'_'.$new_part} eq '') {
next;
}
- $wgt = $ENV{'form.WGT'.$newflg.'_'.$_} eq '' ? 1 :
- $ENV{'form.WGT'.$newflg.'_'.$_};
+ $wgt = $env{'form.WGT'.$newflg.'_'.$new_part} eq '' ? 1 :
+ $env{'form.WGT'.$newflg.'_'.$new_part};
my $partial= $pts/$wgt;
- if ($partial eq $record{'resource.'.$_.'.awarded'}) {
+ if ($partial eq $record{'resource.'.$new_part.'.awarded'}) {
#do not update score for part if not changed.
+ &handback_files($request,$symb,$stuname,$domain,$newflg,$new_part,\%newrecord);
next;
+ } else {
+ push @parts_graded, $new_part;
}
- if ($record{'resource.'.$_.'.awarded'} ne $partial) {
- $newrecord{'resource.'.$_.'.awarded'} = $partial;
+ if ($record{'resource.'.$new_part.'.awarded'} ne $partial) {
+ $newrecord{'resource.'.$new_part.'.awarded'} = $partial;
}
- my $reckey = 'resource.'.$_.'.solved';
+ my $reckey = 'resource.'.$new_part.'.solved';
if ($partial == 0) {
if ($record{$reckey} ne 'incorrect_by_override') {
$newrecord{$reckey} = 'incorrect_by_override';
@@ -2101,18 +2385,267 @@ sub saveHandGrade {
}
}
if ($submitter &&
- ($record{'resource.'.$_.'.submitted_by'} ne $submitter)) {
- $newrecord{'resource.'.$_.'.submitted_by'} = $submitter;
+ ($record{'resource.'.$new_part.'.submitted_by'} ne $submitter)) {
+ $newrecord{'resource.'.$new_part.'.submitted_by'} = $submitter;
}
- $newrecord{'resource.'.$_.'.regrader'}=
- "$ENV{'user.name'}:$ENV{'user.domain'}";
- }
- }
- if (scalar(keys(%newrecord)) > 0) {
+ $newrecord{'resource.'.$new_part.'.regrader'}=
+ "$env{'user.name'}:$env{'user.domain'}";
+ &handback_files($request,$symb,$stuname,$domain,$newflg,$new_part,\%newrecord);
+ }
+ # unless problem has been graded, set flag to version the submitted files
+ unless ($record{'resource.'.$new_part.'.solved'} =~ /^correct_/ ||
+ $record{'resource.'.$new_part.'.solved'} eq 'incorrect_by_override' ||
+ $dropMenu eq 'reset status')
+ {
+ push (@version_parts,$new_part);
+ }
+ }
+ my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+ my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+
+ if (%newrecord) {
+ if (@version_parts) {
+ my @changed_keys = &version_portfiles(\%record, \@parts_graded, $env{'request.course.id'}, $symb, $domain, $stuname, \@version_parts);
+ @newrecord{@changed_keys} = @record{@changed_keys};
+ }
&Apache::lonnet::cstore(\%newrecord,$symb,
- $ENV{'request.course.id'},$domain,$stuname);
+ $env{'request.course.id'},$domain,$stuname);
+ my @ungraded_parts;
+ foreach my $part (@parts) {
+ if ( !defined($record{'resource.'.$part.'.awarded'})
+ && !defined($newrecord{'resource.'.$part.'.awarded'}) ) {
+ push(@ungraded_parts, $part);
+ }
+ }
+ if ( !@ungraded_parts ) {
+ &Apache::bridgetask::remove_from_queue('gradingqueue',$symb,$cdom,
+ $cnum,$domain,$stuname);
+ }
+ }
+ if ($aggregateflag) {
+ &Apache::lonnet::cinc('nohist_resourcetracker',\%aggregate,
+ $cdom,$cnum);
+ }
+ return ('',$pts,$wgt);
+}
+
+sub handback_files {
+ my ($request,$symb,$stuname,$domain,$newflg,$new_part,$newrecord) = @_;
+ my $portfolio_root = &propath($domain,$stuname).'/userfiles/portfolio';
+ my ($partlist,$handgrade,$responseType) = &response_type($symb);
+ foreach my $part_resp (sort(keys(%$handgrade))) {
+ my ($part_id, $resp_id) = split(/_/,$part_resp);
+ if (($env{'form.'.$newflg.'_'.$part_resp.'_returndoc1'}) && ($new_part == $part_id)) {
+ # if multiple files are uploaded names will be 'returndoc2','returndoc3'
+ my $file_counter = 1;
+ while ($env{'form.'.$newflg.'_'.$part_resp.'_returndoc'.$file_counter}) {
+ my $fname=$env{'form.'.$newflg.'_'.$part_resp.'_returndoc'.$file_counter.'.filename'};
+ my ($directory,$answer_file) =
+ ($env{'form.'.$newflg.'_'.$part_resp.'_origdoc'.$file_counter} =~ /^(.*?)([^\/]*)$/);
+ my ($answer_name,$answer_ver,$answer_ext) =
+ &file_name_version_ext($answer_file);
+ my ($portfolio_path) = ($directory =~ /^.+$stuname\/portfolio(.*)/);
+ my @dir_list = &Apache::lonnet::dirlist($portfolio_path,$domain,$stuname,$portfolio_root);
+ my $version = &get_next_version($answer_name, $answer_ext, \@dir_list);
+ my $new_answer = &version_selected_portfile($domain, $stuname, $portfolio_path, $answer_file, $version);
+ $$newrecord{"resource.$new_part.$resp_id.handback"} = $new_answer;
+ $version++;
+ # fix file name
+ my ($save_file_name) = (($directory.$answer_name.".$version.".$answer_ext) =~ /^.+\/${stuname}\/(.*)/);
+ my $result=&Apache::lonnet::finishuserfileupload($stuname,$domain,
+ $newflg.'_'.$part_resp.'_returndoc'.$file_counter,
+ $save_file_name);
+ if ($result !~ m|^/uploaded/|) {
+ $request->print('<font color="red"> An errror occured ('.$result.
+ ') while trying to upload '.$newflg.'_'.$part_resp.'_returndoc'.$file_counter.'</font><br />');
+ } else {
+ # mark the file as read only
+ my @files = ($save_file_name);
+ my @what = ($symb,'handback');
+ &Apache::lonnet::mark_as_readonly($domain,$stuname,\@files,\@what);
+ my $subject = "File Handed Back by Instructor ";
+ my $message = "A file has been returned that was originally submitted in reponse to: <br />";
+ $message .= "<strong>".&Apache::lonnet::gettitle($symb)."</strong><br />";
+ $message .= " The returned file is named: <br /><strong>".$save_file_name."</strong><br />";
+ $message .= " and can be found in your portfolio space.";
+ &Apache::lonnet::logthis($message);
+ my $url = (&Apache::lonnet::decode_symb($symb))[2];
+ $url = &Apache::lonnet::declutter($url);
+ my $msgstatus = &Apache::lonmsg::user_normal_msg($stuname,$domain,
+ $subject.' (File Returned) ['.$url.']',$message);
+ }
+ $request->print("<br />".$fname." will be the uploaded file name");
+ $request->print(" ".$env{'form.'.$newflg.'_'.$part_resp.'_origdoc'.$file_counter});
+ $file_counter++;
+ }
+ }
+ }
+ return;
+}
+
+sub get_submitted_files {
+ my ($udom,$uname,$partid,$respid,$record) = @_;
+ 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);
+ }
+ }
+ if ($$record{"resource.$partid.$respid.uploadedurl"}) {
+ push(@files,$$record{"resource.$partid.$respid.uploadedurl"});
+ }
+ return (\@files);
+}
+
+# ----------- Provides number of tries since last reset.
+sub get_num_tries {
+ my ($record,$last_reset,$part) = @_;
+ my $timestamp = '';
+ my $num_tries = 0;
+ if ($$record{'version'}) {
+ for (my $version=$$record{'version'};$version>=1;$version--) {
+ if (exists($$record{$version.':resource.'.$part.'.solved'})) {
+ $timestamp = $$record{$version.':timestamp'};
+ if ($timestamp > $last_reset) {
+ $num_tries ++;
+ } else {
+ last;
+ }
+ }
+ }
}
- return '',$pts,$wgt;
+ return $num_tries;
+}
+
+# ----------- Determine decrements required in aggregate totals
+sub decrement_aggs {
+ my ($symb,$part,$aggregate,$aggtries,$totaltries,$solvedstatus) = @_;
+ my %decrement = (
+ attempts => 0,
+ users => 0,
+ correct => 0
+ );
+ $decrement{'attempts'} = $aggtries;
+ if ($solvedstatus =~ /^correct/) {
+ $decrement{'correct'} = 1;
+ }
+ if ($aggtries == $totaltries) {
+ $decrement{'users'} = 1;
+ }
+ foreach my $type (keys (%decrement)) {
+ $$aggregate{$symb."\0".$part."\0".$type} = -$decrement{$type};
+ }
+ return;
+}
+
+# ----------- Determine timestamps for last reset of aggregate totals for parts
+sub get_last_resets {
+ my ($symb,$courseid,$partids) =@_;
+ my %last_resets;
+ my $cdom = $env{'course.'.$courseid.'.domain'};
+ my $cname = $env{'course.'.$courseid.'.num'};
+ my @keys;
+ foreach my $part (@{$partids}) {
+ push(@keys,"$symb\0$part\0resettime");
+ }
+ my %results=&Apache::lonnet::get('nohist_resourcetracker',\@keys,
+ $cdom,$cname);
+ foreach my $part (@{$partids}) {
+ $last_resets{$part}=$results{"$symb\0$part\0resettime"};
+ }
+ return %last_resets;
+}
+
+# ----------- Handles creating versions for portfolio files as answers
+sub version_portfiles {
+ my ($record, $parts_graded, $courseid, $symb, $domain, $stu_name, $v_flag) = @_;
+ my $version_parts = join('|',@$v_flag);
+ my @returned_keys;
+ my $parts = join('|', @$parts_graded);
+ my $portfolio_root = &propath($domain,$stu_name).
+ '/userfiles/portfolio';
+ foreach my $key (keys(%$record)) {
+ my $new_portfiles;
+ if ($key =~ /^resource\.($version_parts)\./ && $key =~ /\.portfiles$/ ) {
+ my @versioned_portfiles;
+ my @portfiles = split(/,/,$$record{$key});
+ foreach my $file (@portfiles) {
+ &Apache::lonnet::unmark_as_readonly($domain,$stu_name,[$symb,$env{'request.course.id'}],$file);
+ my ($directory,$answer_file) =($file =~ /^(.*?)([^\/]*)$/);
+ my ($answer_name,$answer_ver,$answer_ext) =
+ &file_name_version_ext($answer_file);
+ my @dir_list = &Apache::lonnet::dirlist($directory,$domain,$stu_name,$portfolio_root);
+ my $version = &get_next_version($answer_name, $answer_ext, \@dir_list);
+ my $new_answer = &version_selected_portfile($domain, $stu_name, $directory, $answer_file, $version);
+ if ($new_answer ne 'problem getting file') {
+ push(@versioned_portfiles, $directory.$new_answer);
+ &Apache::lonnet::mark_as_readonly($domain,$stu_name,
+ ['/portfolio'.$directory.$new_answer],
+ [$symb,$env{'request.course.id'},'graded']);
+ }
+ }
+ $$record{$key} = join(',',@versioned_portfiles);
+ push(@returned_keys,$key);
+ }
+ }
+ return (@returned_keys);
+}
+
+sub get_next_version {
+ my ($answer_name, $answer_ext, $dir_list) = @_;
+ my $version;
+ foreach my $row (@$dir_list) {
+ my ($file) = split(/\&/,$row,2);
+ my ($file_name,$file_version,$file_ext) =
+ &file_name_version_ext($file);
+ if (($file_name eq $answer_name) &&
+ ($file_ext eq $answer_ext)) {
+ # gets here if filename and extension match, regardless of version
+ if ($file_version ne '') {
+ # a versioned file is found so save it for later
+ if ($file_version > $version) {
+ $version = $file_version;
+ }
+ }
+ }
+ }
+ $version ++;
+ return($version);
+}
+
+sub version_selected_portfile {
+ my ($domain,$stu_name,$directory,$file_name,$version) = @_;
+ my ($answer_name,$answer_ver,$answer_ext) =
+ &file_name_version_ext($file_name);
+ my $new_answer;
+ $env{'form.copy'} = &Apache::lonnet::getfile("/uploaded/$domain/$stu_name/portfolio$directory$file_name");
+ if($env{'form.copy'} eq '-1') {
+ &Apache::lonnet::logthis('problem getting file '.$file_name);
+ $new_answer = 'problem getting file';
+ } else {
+ $new_answer = $answer_name.'.'.$version.'.'.$answer_ext;
+ my $copy_result = &Apache::lonnet::finishuserfileupload(
+ $stu_name,$domain,'copy',
+ '/portfolio'.$directory.$new_answer);
+ }
+ return ($new_answer);
+}
+
+sub file_name_version_ext {
+ my ($file)=@_;
+ my @file_parts = split(/\./, $file);
+ my ($name,$version,$ext);
+ if (@file_parts > 1) {
+ $ext=pop(@file_parts);
+ if (@file_parts > 1 && $file_parts[-1] =~ /^\d+$/) {
+ $version=pop(@file_parts);
+ }
+ $name=join('.',@file_parts);
+ } else {
+ $name=join('.',@file_parts);
+ }
+ return($name,$version,$ext);
}
#--------------------------------------------------------------------------------------
@@ -2164,6 +2697,7 @@ sub viewgrades_js {
}
for (i=0;i<document.classgrade.total.value;i++) {
var user = document.classgrade["ctr"+i].value;
+ user = user.replace(new RegExp(':', 'g'),"_");
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"];
@@ -2180,6 +2714,7 @@ sub viewgrades_js {
function writeRadText(partid,weight) {
var selval = document.classgrade["SELVAL_"+partid];
var radioButton = document.classgrade["RADVAL_"+partid];
+ var override = document.classgrade["FORCE_"+partid].checked;
var textbox = document.classgrade["TEXTVAL_"+partid];
if (selval[1].selected || selval[2].selected) {
for (var i=0; i<radioButton.length; i++) {
@@ -2190,10 +2725,11 @@ sub viewgrades_js {
for (i=0;i<document.classgrade.total.value;i++) {
var user = document.classgrade["ctr"+i].value;
+ user = user.replace(new RegExp(':', 'g'),"_");
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") {
+ if ((saveval != "correct") || override) {
scorename.value = "";
if (selval[1].selected) {
selname[1].selected = true;
@@ -2207,10 +2743,11 @@ sub viewgrades_js {
} else {
for (i=0;i<document.classgrade.total.value;i++) {
var user = document.classgrade["ctr"+i].value;
+ user = user.replace(new RegExp(':', 'g'),"_");
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") {
+ if ((saveval != "correct") || override) {
scorename.value = document.classgrade["GD_"+user+"_"+partid+"_awarded_s"].value;
selname[0].selected = true;
}
@@ -2247,7 +2784,7 @@ sub viewgrades_js {
if (selval[2].selected) {
document.classgrade["GD_"+user+'_'+partid+"_tries"].value = "0";
}
- }
+ }
}
function resetEntry(numpart) {
@@ -2265,6 +2802,7 @@ sub viewgrades_js {
for (i=0;i<document.classgrade.total.value;i++) {
var user = document.classgrade["ctr"+i].value;
+ user = user.replace(new RegExp(':', 'g'),"_");
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"];
@@ -2289,44 +2827,43 @@ sub viewgrades {
my ($request) = shift;
&viewgrades_js($request);
- my ($symb,$url) = ($ENV{'form.symb'},$ENV{'form.url'});
+ my ($symb) = &get_symb($request);
#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'});
+ $env{'course.'.$env{'request.course.id'}.'.num'},
+ $env{'course.'.$env{'request.course.id'}.'.domain'});
&Apache::lonnet::clear_EXT_cache_status();
my $result='<h3><font color="#339933">'.&mt('Manual Grading').'</font></h3>';
- $result.='<font size=+1><b>Current Resource: </b>'.$ENV{'form.probTitle'}.'</font>'."\n";
+ $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);
+ $result.=&jscriptNform($symb);
#beginning of class grading form
$result.= '<form action="/adm/grades" method="post" name="classgrade">'."\n".
'<input type="hidden" name="symb" value="'.$symb.'" />'."\n".
- '<input type="hidden" name="url" value="'.$url.'" />'."\n".
'<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";
+ '<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";
my $sectionClass;
- if ($ENV{'form.section'} eq 'all') {
+ if ($env{'form.section'} eq 'all') {
$sectionClass='Class </h3>';
- } elsif ($ENV{'form.section'} eq 'none') {
+ } elsif ($env{'form.section'} eq 'none') {
$sectionClass='Students in no Section </h3>';
} else {
- $sectionClass='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($url,$symb);
+ my ($partlist,$handgrade) = &response_type($symb);
my %weight = ();
my $ctsparts = 0;
$result.='<table border="0">';
@@ -2343,14 +2880,14 @@ sub viewgrades {
$ctsparts.'" value="'.$partid.'" />'."\n";
$result.='<input type="hidden" name="weight_'.
$partid.'" value="'.$weight{$partid}.'" />'."\n";
- my $display_part=&get_display_part($partid,$url,$symb);
+ my $display_part=&get_display_part($partid,$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
- $result.= '<td><input type="radio" name="RADVAL_'.$partid.'" '.
+ $result.= '<td><label><input type="radio" name="RADVAL_'.$partid.'" '.
'onclick="javascript:writePoint(\''.$partid.'\','.$weight{$partid}.
- ','.$ctr.')" />'.$ctr."</td>\n";
+ ','.$ctr.')" />'.$ctr."</label></td>\n";
$result.=(($ctr+1)%10 == 0 ? '</tr><tr>' : '');
$ctr++;
}
@@ -2364,7 +2901,8 @@ sub viewgrades {
$weight{$partid}.')"> '.
'<option selected="on"> </option>'.
'<option>excused</option>'.
- '<option>reset status</option></select></td></tr>'."\n";
+ '<option>reset status</option></select></td>'.
+ '<td><label><input type="checkbox" name="FORCE_'.$partid.'" /> Override "Correct"</label></td></tr>'."\n";
$ctsparts++;
}
$result.='</table>'.'</td></tr></table>'.'</td></tr></table>'."\n".
@@ -2378,13 +2916,16 @@ sub viewgrades {
$result.= '<table border=0><tr><td bgcolor="#777777">'."\n".
'<table border=0><tr bgcolor="#deffff"><td> <b>No.</b> </td>'.
'<td>'.&nameUserString('header')."</td>\n";
- my (@parts) = sort(&getpartlist($url,$symb));
+ my (@parts) = sort(&getpartlist($symb));
+ my (undef,undef,$url)=&Apache::lonnet::decode_symb($symb);
+ my @partids = ();
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);
+ push(@partids, $partid);
+ my $display_part=&get_display_part($partid,$symb);
if ($display =~ /^Partial Credit Factor/) {
$result.='<td><b>Score Part:</b> '.$display_part.
' <br /><b>(weight = '.$weight{$partid}.')</b></td>'."\n";
@@ -2397,14 +2938,23 @@ sub viewgrades {
}
$result.='</tr>';
+ my %last_resets =
+ &get_last_resets($symb,$env{'request.course.id'},\@partids);
+
#get info for each student
#list all the students - with points and grade status
- my (undef,undef,$fullname) = &getclasslist($ENV{'form.section'},'1');
+ my (undef,undef,$fullname) = &getclasslist($env{'form.section'},'1');
my $ctr = 0;
- foreach (sort {lc($$fullname{$a}) cmp lc($$fullname{$b}) } keys %$fullname) {
+ foreach (sort
+ {
+ if (lc($$fullname{$a}) ne lc($$fullname{$b})) {
+ return (lc($$fullname{$a}) cmp lc($$fullname{$b}));
+ }
+ return $a cmp $b;
+ } (keys(%$fullname))) {
$ctr++;
- $result.=&viewstudentgrade($url,$symb,$ENV{'request.course.id'},
- $_,$$fullname{$_},\@parts,\%weight,$ctr);
+ $result.=&viewstudentgrade($symb,$env{'request.course.id'},
+ $_,$$fullname{$_},\@parts,\%weight,$ctr,\%last_resets);
}
$result.='</table></td></tr></table>';
$result.='<input type="hidden" name="total" value="'.$ctr.'" />'."\n";
@@ -2412,31 +2962,47 @@ sub viewgrades {
'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);
+ $result.=&show_grading_menu_form($symb);
return $result;
}
#--- call by previous routine to display each student
sub viewstudentgrade {
- my ($url,$symb,$courseid,$student,$fullname,$parts,$weight,$ctr) = @_;
+ my ($symb,$courseid,$student,$fullname,$parts,$weight,$ctr,$last_resets) = @_;
my ($uname,$udom) = split(/:/,$student);
- $student=~s/:/_/;
my %record=&Apache::lonnet::restore($symb,$courseid,$udom,$uname);
+ my %aggregates = ();
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";
+ '<font color="#999999">('.$uname.($env{'user.domain'} eq $udom ? '' : ':'.$udom).')</font></td>'."\n";
+ $student=~s/:/_/; # colon doen't work in javascript for names
foreach my $apart (@$parts) {
my ($part,$type) = &split_part_type($apart);
my $score=$record{"resource.$part.$type"};
- $result.='<td align="middle">';
+ $result.='<td align="center">';
+ my ($aggtries,$totaltries);
+ unless (exists($aggregates{$part})) {
+ $totaltries = $record{'resource.'.$part.'.tries'};
+
+ $aggtries = $totaltries;
+ if ($$last_resets{$part}) {
+ $aggtries = &get_num_tries(\%record,$$last_resets{$part},
+ $part);
+ }
+ $result.='<input type="hidden" name="'.
+ 'GD_'.$student.'_'.$part.'_aggtries" value="'.$aggtries.'" />'."\n";
+ $result.='<input type="hidden" name="'.
+ 'GD_'.$student.'_'.$part.'_totaltries" value="'.$totaltries.'" />'."\n";
+ $aggregates{$part} = 1;
+ }
if ($type eq 'awarded') {
- my $pts = $score eq '' ? '' : $score*$$weight{$part};
+ my $pts = $score eq '' ? '' : &compute_points($score,$$weight{$part});
$result.='<input type="hidden" name="'.
'GD_'.$student.'_'.$part.'_awarded_s" value="'.$pts.'" />'."\n";
$result.='<input type="text" name="'.
@@ -2473,11 +3039,10 @@ sub viewstudentgrade {
sub editgrades {
my ($request) = @_;
- my $symb=$ENV{'form.symb'};
- my $url =$ENV{'form.url'};
+ my $symb=&get_symb($request);
my $title='<h3><font color="#339933">Current Grade Status</font></h3>';
- $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";
+ $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">'.
@@ -2491,21 +3056,22 @@ sub editgrades {
'ungraded' =>'ungraded_attempted',
'nothing' => '',
);
- my ($classlist,undef,$fullname) = &getclasslist($ENV{'form.section'},'0');
+ my ($classlist,undef,$fullname) = &getclasslist($env{'form.section'},'0');
my (@partid);
my %weight = ();
my %columns = ();
my ($i,$ctr,$count,$rec_update) = (0,0,0,0);
- my (@parts) = sort(&getpartlist($url,$symb));
+ my (@parts) = sort(&getpartlist($symb));
my $header;
- while ($ctr < $ENV{'form.totalparts'}) {
- my $partid = $ENV{'form.partid_'.$ctr};
+ while ($ctr < $env{'form.totalparts'}) {
+ my $partid = $env{'form.partid_'.$ctr};
push @partid,$partid;
- $weight{$partid} = $ENV{'form.weight_'.$partid};
+ $weight{$partid} = $env{'form.weight_'.$partid};
$ctr++;
}
+ my (undef,undef,$url) = &Apache::lonnet::decode_symb($symb);
foreach my $partid (@partid) {
$header .= '<td align="center"> <b>Old Score</b> </td>'.
'<td align="center"> <b>New Score</b> </td>';
@@ -2523,7 +3089,7 @@ sub editgrades {
}
}
foreach my $partid (@partid) {
- my $display_part=&get_display_part($partid,$url,$symb);
+ my $display_part=&get_display_part($partid,$symb);
$result .= '<td colspan="'.$columns{$partid}.
'" align="center"><b>Part:</b> '.$display_part.
' (Weight = '.$weight{$partid}.')</td>';
@@ -2534,49 +3100,57 @@ sub editgrades {
$result .= '</tr>'."\n";
my $noupdate;
my ($updateCtr,$noupdateCtr) = (1,1);
- for ($i=0; $i<$ENV{'form.total'}; $i++) {
+ for ($i=0; $i<$env{'form.total'}; $i++) {
my $line;
- my $user = $ENV{'form.ctr'.$i};
- my $usercolon = $user;
- $usercolon =~s/_/:/;
- my ($uname,$udom)=split(/_/,$user);
+ my $user = $env{'form.ctr'.$i};
+ my ($uname,$udom)=split(/:/,$user);
my %newrecord;
my $updateflag = 0;
- $line .= '<td>'.&nameUserString(undef,$$fullname{$usercolon},$uname,$udom).'</td>';
+ $line .= '<td>'.&nameUserString(undef,$$fullname{$user},$uname,$udom).'</td>';
my $usec=$classlist->{"$uname:$udom"}[5];
if (!&canmodify($usec)) {
my $numcols=scalar(@partid)*4+2;
$noupdate.=$line."<td colspan=\"$numcols\"><font color=\"red\">Not allowed to modify student</font></td></tr>";
next;
}
+ my %aggregate = ();
+ my $aggregateflag = 0;
+ $user=~s/:/_/; # colon doen't work in javascript for names
foreach (@partid) {
- my $old_aw = $ENV{'form.GD_'.$user.'_'.$_.'_awarded_s'};
+ my $old_aw = $env{'form.GD_'.$user.'_'.$_.'_awarded_s'};
my $old_part_pcr = $old_aw/($weight{$_} ne '0' ? $weight{$_}:1);
my $old_part = $old_aw eq '' ? '' : $old_part_pcr;
- my $old_score = $scoreptr{$ENV{'form.GD_'.$user.'_'.$_.'_solved_s'}};
-
- my $awarded = $ENV{'form.GD_'.$user.'_'.$_.'_awarded'};
+ my $old_score = $scoreptr{$env{'form.GD_'.$user.'_'.$_.'_solved_s'}};
+ my $awarded = $env{'form.GD_'.$user.'_'.$_.'_awarded'};
my $pcr = $awarded/($weight{$_} ne '0' ? $weight{$_} : 1);
my $partial = $awarded eq '' ? '' : $pcr;
my $score;
if ($partial eq '') {
- $score = $scoreptr{$ENV{'form.GD_'.$user.'_'.$_.'_solved_s'}};
+ $score = $scoreptr{$env{'form.GD_'.$user.'_'.$_.'_solved_s'}};
} elsif ($partial > 0) {
$score = 'correct_by_override';
} elsif ($partial == 0) {
$score = 'incorrect_by_override';
}
- my $dropMenu = $ENV{'form.GD_'.$user.'_'.$_.'_solved'};
+ my $dropMenu = $env{'form.GD_'.$user.'_'.$_.'_solved'};
$score = 'excused' if (($dropMenu eq 'excused') && ($score ne 'excused'));
+ $newrecord{'resource.'.$_.'.regrader'}=
+ "$env{'user.name'}:$env{'user.domain'}";
if ($dropMenu eq 'reset status' &&
$old_score ne '') { # ignore if no previous attempts => nothing to reset
- $newrecord{'resource.'.$_.'.tries'} = 0;
+ $newrecord{'resource.'.$_.'.tries'} = '';
$newrecord{'resource.'.$_.'.solved'} = '';
$newrecord{'resource.'.$_.'.award'} = '';
- $newrecord{'resource.'.$_.'.awarded'} = 0;
- $newrecord{'resource.'.$_.'.regrader'}="$ENV{'user.name'}:$ENV{'user.domain'}";
+ $newrecord{'resource.'.$_.'.awarded'} = '';
$updateflag = 1;
+ if ($env{'form.GD_'.$user.'_'.$_.'_aggtries'} > 0) {
+ my $aggtries = $env{'form.GD_'.$user.'_'.$_.'_aggtries'};
+ my $totaltries = $env{'form.GD_'.$user.'_'.$_.'_totaltries'};
+ my $solvedstatus = $env{'form.GD_'.$user.'_'.$_.'_solved_s'};
+ &decrement_aggs($symb,$_,\%aggregate,$aggtries,$totaltries,$solvedstatus);
+ $aggregateflag = 1;
+ }
} elsif (!($old_part eq $partial && $old_score eq $score)) {
$updateflag = 1;
$newrecord{'resource.'.$_.'.awarded'} = $partial if $partial ne '';
@@ -2594,11 +3168,11 @@ sub editgrades {
my ($part,$type) = &split_part_type($stores);
if ($part !~ m/^\Q$partid\E/) { next;}
if ($type eq 'awarded' || $type eq 'solved') { next; }
- my $old_aw = $ENV{'form.GD_'.$user.'_'.$part.'_'.$type.'_s'};
- my $awarded = $ENV{'form.GD_'.$user.'_'.$part.'_'.$type};
+ my $old_aw = $env{'form.GD_'.$user.'_'.$part.'_'.$type.'_s'};
+ 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>'.
@@ -2606,16 +3180,48 @@ sub editgrades {
}
}
$line.='</tr>'."\n";
+
+ my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+ my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+
if ($updateflag) {
$count++;
- &Apache::lonnet::cstore(\%newrecord,$symb,$ENV{'request.course.id'},
+ &Apache::lonnet::cstore(\%newrecord,$symb,$env{'request.course.id'},
$udom,$uname);
+
+ if (&Apache::bridgetask::in_queue('gradingqueue',$symb,$cdom,
+ $cnum,$udom,$uname)) {
+ # need to figure out if should be in queue.
+ my %record =
+ &Apache::lonnet::restore($symb,$env{'request.course.id'},
+ $udom,$uname);
+ my $all_graded = 1;
+ my $none_graded = 1;
+ foreach my $part (@parts) {
+ if ( $record{'resource.'.$part.'.awarded'} eq '' ) {
+ $all_graded = 0;
+ } else {
+ $none_graded = 0;
+ }
+ }
+
+ if ($all_graded || $none_graded) {
+ &Apache::bridgetask::remove_from_queue('gradingqueue',
+ $symb,$cdom,$cnum,
+ $udom,$uname);
+ }
+ }
+
$result.='<tr bgcolor="#ffffde"><td align="right"> '.$updateCtr.' </td>'.$line;
$updateCtr++;
} else {
$noupdate.='<tr bgcolor="#ffffde"><td align="right"> '.$noupdateCtr.' </td>'.$line;
$noupdateCtr++;
}
+ if ($aggregateflag) {
+ &Apache::lonnet::cinc('nohist_resourcetracker',\%aggregate,
+ $cdom,$cnum);
+ }
}
if ($noupdate) {
# my $numcols=(scalar(@partid)*(scalar(@parts)-1)*2)+3;
@@ -2623,10 +3229,10 @@ sub editgrades {
$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);
+ &show_grading_menu_form ($symb);
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 />';
+ '<b>Total number of students = '.$env{'form.total'}.'</b><br />';
return $title.$msg.$result;
}
@@ -2649,24 +3255,26 @@ sub split_part_type {
#
#--- Javascript to handle csv upload
sub csvupload_javascript_reverse_associate {
+ my $error1=&mt('You need to specify the username or ID');
+ my $error2=&mt('You need to specify at least one grading field');
return(<<ENDPICK);
function verify(vf) {
var foundsomething=0;
var founduname=0;
- var founddomain=0;
+ var foundID=0;
for (i=0;i<=vf.nfields.value;i++) {
tw=eval('vf.f'+i+'.selectedIndex');
- if (i==0 && tw!=0) { founduname=1; }
- if (i==1 && tw!=0) { founddomain=1; }
- if (i!=0 && i!=1 && tw!=0) { foundsomething=1; }
- }
- if (founduname==0 || founddomain==0) {
- alert('You need to specify at both the username and domain');
- return;
+ if (i==0 && tw!=0) { foundID=1; }
+ if (i==1 && tw!=0) { founduname=1; }
+ if (i!=0 && i!=1 && i!=2 && tw!=0) { foundsomething=1; }
+ }
+ if (founduname==0 && foundID==0) {
+ alert('$error1');
+ return;
}
if (foundsomething==0) {
- alert('You need to specify at least one grading field');
- return;
+ alert('$error2');
+ return;
}
vf.submit();
}
@@ -2687,24 +3295,26 @@ ENDPICK
}
sub csvupload_javascript_forward_associate {
+ my $error1=&mt('You need to specify the username or ID');
+ my $error2=&mt('You need to specify at least one grading field');
return(<<ENDPICK);
function verify(vf) {
var foundsomething=0;
var founduname=0;
- var founddomain=0;
+ var foundID=0;
for (i=0;i<=vf.nfields.value;i++) {
tw=eval('vf.f'+i+'.selectedIndex');
- if (tw==1) { founduname=1; }
- if (tw==2) { founddomain=1; }
- if (tw>2) { foundsomething=1; }
- }
- if (founduname==0 || founddomain==0) {
- alert('You need to specify at both the username and domain');
- return;
+ if (tw==1) { foundID=1; }
+ if (tw==2) { founduname=1; }
+ if (tw>3) { foundsomething=1; }
+ }
+ if (founduname==0 && foundID==0) {
+ alert('$error1');
+ return;
}
if (foundsomething==0) {
- alert('You need to specify at least one grading field');
- return;
+ alert('$error2');
+ return;
}
vf.submit();
}
@@ -2722,38 +3332,39 @@ ENDPICK
}
sub csvuploadmap_header {
- my ($request,$symb,$url,$datatoken,$distotal)= @_;
+ my ($request,$symb,$datatoken,$distotal)= @_;
my $javascript;
- if ($ENV{'form.upfile_associate'} eq 'reverse') {
+ if ($env{'form.upfile_associate'} eq 'reverse') {
$javascript=&csvupload_javascript_reverse_associate();
} else {
$javascript=&csvupload_javascript_forward_associate();
}
- my ($result) = &showResourceInfo($url,$ENV{'form.probTitle'});
-
+ my ($result) = &showResourceInfo($symb,$env{'form.probTitle'});
+ my $checked=(($env{'form.noFirstLine'})?' checked="checked"':'');
+ my $ignore=&mt('Ignore First Line');
$request->print(<<ENDPICK);
<form method="post" enctype="multipart/form-data" action="/adm/grades" name="gradesupload">
<h3><font color="#339933">Uploading Class Grades</font></h3>
$result
-<hr>
+<hr />
<h3>Identify fields</h3>
Total number of records found in file: $distotal <hr />
Enter as many fields as you can. The system will inform you and bring you back
to this page if the data selected is insufficient to run your class.<hr />
<input type="button" value="Reverse Association" onClick="javascript:this.form.associate.value='Reverse Association';submit(this.form);" />
+<label><input type="checkbox" name="noFirstLine" $checked />$ignore</label>
<input type="hidden" name="associate" value="" />
<input type="hidden" name="phase" value="three" />
<input type="hidden" name="datatoken" value="$datatoken" />
-<input type="hidden" name="fileupload" value="$ENV{'form.fileupload'}" />
-<input type="hidden" name="upfiletype" value="$ENV{'form.upfiletype'}" />
+<input type="hidden" name="fileupload" value="$env{'form.fileupload'}" />
+<input type="hidden" name="upfiletype" value="$env{'form.upfiletype'}" />
<input type="hidden" name="upfile_associate"
- value="$ENV{'form.upfile_associate'}" />
+ value="$env{'form.upfile_associate'}" />
<input type="hidden" name="symb" value="$symb" />
-<input type="hidden" name="url" value="$url" />
-<input type="hidden" name="saveState" value="$ENV{'form.saveState'}" />
-<input type="hidden" name="probTitle" value="$ENV{'form.probTitle'}" />
-<input type="hidden" name="command" value="csvuploadassign" />
+<input type="hidden" name="saveState" value="$env{'form.saveState'}" />
+<input type="hidden" name="probTitle" value="$env{'form.probTitle'}" />
+<input type="hidden" name="command" value="csvuploadoptions" />
<hr />
<script type="text/javascript" language="Javascript">
$javascript
@@ -2764,15 +3375,21 @@ ENDPICK
}
sub csvupload_fields {
- my ($url,$symb) = @_;
- my (@parts) = &getpartlist($url,$symb);
- my @fields=(['username','Student Username'],['domain','Student Domain']);
+ my ($symb) = @_;
+ my (@parts) = &getpartlist($symb);
+ my @fields=(['ID','Student ID'],
+ ['username','Student Username'],
+ ['domain','Student Domain']);
+ my (undef,undef,$url) = &Apache::lonnet::decode_symb($symb);
foreach my $part (sort(@parts)) {
my @datum;
my $display=&Apache::lonnet::metadata($url,$part.'.display');
my $name=$part;
if (!$display) { $display = $name; }
@datum=($name,$display);
+ if ($name=~/^stores_(.*)_awarded/) {
+ push(@fields,['stores_'.$1.'_points',"Points [Part: $1]"]);
+ }
push(@fields,\@datum);
}
return (@fields);
@@ -2789,10 +3406,7 @@ sub csvuploadmap_footer {
ENDPICK
}
-sub upcsvScores_form {
- my ($request) = shift;
- my ($symb,$url)=&get_symb_and_url($request);
- if (!$symb) {return '';}
+sub checkforfile_js {
my $result =<<CSVFORMJS;
<script type="text/javascript" language="javascript">
function checkUpload(formname) {
@@ -2804,53 +3418,62 @@ sub upcsvScores_form {
}
</script>
CSVFORMJS
- $ENV{'form.probTitle'} = &Apache::lonnet::gettitle($symb);
- my ($table) = &showResourceInfo($url,$ENV{'form.probTitle'});
+ return $result;
+}
+
+sub upcsvScores_form {
+ my ($request) = shift;
+ my ($symb)=&get_symb($request);
+ if (!$symb) {return '';}
+ my $result=&checkforfile_js();
+ $env{'form.probTitle'} = &Apache::lonnet::gettitle($symb);
+ my ($table) = &showResourceInfo($symb,$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.='<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 current resource'.
'.</b></td></tr>'."\n";
$result.='<tr bgcolor=#ffffe6><td>'."\n";
my $upfile_select=&Apache::loncommon::upfile_select_html();
+ my $ignore=&mt('Ignore First Line');
$result.=<<ENDUPFORM;
<form method="post" enctype="multipart/form-data" action="/adm/grades" name="gradesupload">
<input type="hidden" name="symb" value="$symb" />
-<input type="hidden" name="url" value="$url" />
<input type="hidden" name="command" value="csvuploadmap" />
-<input type="hidden" name="probTitle" value="$ENV{'form.probTitle'}" />
-<input type="hidden" name="saveState" value="$ENV{'form.saveState'}" />
+<input type="hidden" name="probTitle" value="$env{'form.probTitle'}" />
+<input type="hidden" name="saveState" value="$env{'form.saveState'}" />
$upfile_select
<br /><input type="button" onClick="javascript:checkUpload(this.form);" value="Upload Scores" />
-
+<label><input type="checkbox" name="noFirstLine" />$ignore</label>
</form>
ENDUPFORM
$result.='</td></tr></table>'."\n";
$result.='</td></tr></table><br /><br />'."\n";
- $result.=&show_grading_menu_form($symb,$url);
+ $result.=&show_grading_menu_form($symb);
return $result;
}
sub csvuploadmap {
my ($request)= @_;
- my ($symb,$url)=&get_symb_and_url($request);
+ my ($symb)=&get_symb($request);
if (!$symb) {return '';}
my $datatoken;
- if (!$ENV{'form.datatoken'}) {
+ if (!$env{'form.datatoken'}) {
$datatoken=&Apache::loncommon::upfile_store($request);
} else {
- $datatoken=$ENV{'form.datatoken'};
+ $datatoken=$env{'form.datatoken'};
&Apache::loncommon::load_tmp_file($request);
}
my @records=&Apache::loncommon::upfile_record_sep();
- &csvuploadmap_header($request,$symb,$url,$datatoken,$#records+1);
+ if ($env{'form.noFirstLine'}) { shift(@records); }
+ &csvuploadmap_header($request,$symb,$datatoken,$#records+1);
my ($i,$keyfields);
if (@records) {
- my @fields=&csvupload_fields($url,$symb);
+ my @fields=&csvupload_fields($symb);
- if ($ENV{'form.upfile_associate'} eq 'reverse') {
+ if ($env{'form.upfile_associate'} eq 'reverse') {
&Apache::loncommon::csv_print_samples($request,\@records);
$i=&Apache::loncommon::csv_print_select_table($request,\@records,
\@fields);
@@ -2860,49 +3483,122 @@ sub csvuploadmap {
unshift(@fields,['none','']);
$i=&Apache::loncommon::csv_samples_select_table($request,\@records,
\@fields);
- my %sone=&Apache::loncommon::record_sep($records[0]);
- $keyfields=join(',',sort(keys(%sone)));
+ foreach my $rec (@records) {
+ my %temp = &Apache::loncommon::record_sep($rec);
+ if (%temp) {
+ $keyfields=join(',',sort(keys(%temp)));
+ last;
+ }
+ }
}
}
&csvuploadmap_footer($request,$i,$keyfields);
- $request->print(&show_grading_menu_form($symb,$url));
+ $request->print(&show_grading_menu_form($symb));
return '';
}
-sub csvuploadassign {
+sub csvuploadoptions {
my ($request)= @_;
- my ($symb,$url)=&get_symb_and_url($request);
- if (!$symb) {return '';}
- &Apache::loncommon::load_tmp_file($request);
- my @gradedata = &Apache::loncommon::upfile_record_sep();
- my @keyfields = split(/\,/,$ENV{'form.keyfields'});
- my %fields=();
- for (my $i=0; $i<=$ENV{'form.nfields'}; $i++) {
- if ($ENV{'form.upfile_associate'} eq 'reverse') {
- if ($ENV{'form.f'.$i} ne 'none') {
- $fields{$keyfields[$i]}=$ENV{'form.f'.$i};
+ my ($symb)=&get_symb($request);
+ my $checked=(($env{'form.noFirstLine'})?'1':'0');
+ my $ignore=&mt('Ignore First Line');
+ $request->print(<<ENDPICK);
+<form method="post" enctype="multipart/form-data" action="/adm/grades" name="gradesupload">
+<h3><font color="#339933">Uploading Class Grade Options</font></h3>
+<input type="hidden" name="command" value="csvuploadassign" />
+<!--
+<p>
+<label>
+ <input type="checkbox" name="show_full_results" />
+ Show a table of all changes
+</label>
+</p>
+-->
+<p>
+<label>
+ <input type="checkbox" name="overwite_scores" checked="checked" />
+ Overwrite any existing score
+</label>
+</p>
+ENDPICK
+ my %fields=&get_fields();
+ if (!defined($fields{'domain'})) {
+ my $domform = &Apache::loncommon::select_dom_form($env{'request.role.domain'},'default_domain');
+ $request->print("\n<p> Users are in domain: ".$domform."</p>\n");
+ }
+ foreach my $key (sort(keys(%env))) {
+ if ($key !~ /^form\.(.*)$/) { next; }
+ my $cleankey=$1;
+ if ($cleankey eq 'command') { next; }
+ $request->print('<input type="hidden" name="'.$cleankey.
+ '" value="'.$env{$key}.'" />'."\n");
+ }
+ # FIXME do a check for any duplicated user ids...
+ # FIXME do a check for any invalid user ids?...
+ $request->print('<input type="submit" value="Assign Grades" /><br />
+<hr /></form>'."\n");
+ $request->print(&show_grading_menu_form($symb));
+ return '';
+}
+
+sub get_fields {
+ my %fields;
+ my @keyfields = split(/\,/,$env{'form.keyfields'});
+ for (my $i=0; $i<=$env{'form.nfields'}; $i++) {
+ if ($env{'form.upfile_associate'} eq 'reverse') {
+ if ($env{'form.f'.$i} ne 'none') {
+ $fields{$keyfields[$i]}=$env{'form.f'.$i};
}
} else {
- if ($ENV{'form.f'.$i} ne 'none') {
- $fields{$ENV{'form.f'.$i}}=$keyfields[$i];
+ if ($env{'form.f'.$i} ne 'none') {
+ $fields{$env{'form.f'.$i}}=$keyfields[$i];
}
}
}
+ return %fields;
+}
+
+sub csvuploadassign {
+ my ($request)= @_;
+ my ($symb)=&get_symb($request);
+ if (!$symb) {return '';}
+ my $error_msg = '';
+ &Apache::loncommon::load_tmp_file($request);
+ my @gradedata = &Apache::loncommon::upfile_record_sep();
+ if ($env{'form.noFirstLine'}) { shift(@gradedata); }
+ my %fields=&get_fields();
$request->print('<h3>Assigning Grades</h3>');
- my $courseid=$ENV{'request.course.id'};
+ my $courseid=$env{'request.course.id'};
my ($classlist) = &getclasslist('all',0);
my @notallowed;
my @skipped;
my $countdone=0;
foreach my $grade (@gradedata) {
my %entries=&Apache::loncommon::record_sep($grade);
+ my $domain;
+ if ($entries{$fields{'domain'}}) {
+ $domain=$entries{$fields{'domain'}};
+ } else {
+ $domain=$env{'form.default_domain'};
+ }
+ $domain=~s/\s//g;
my $username=$entries{$fields{'username'}};
$username=~s/\s//g;
- my $domain=$entries{$fields{'domain'}};
- $domain=~s/\s//g;
+ if (!$username) {
+ my $id=$entries{$fields{'ID'}};
+ $id=~s/\s//g;
+ my %ids=&Apache::lonnet::idget($domain,$id);
+ $username=$ids{$id};
+ }
if (!exists($$classlist{"$username:$domain"})) {
- push(@skipped,"$username:$domain");
+ my $id=$entries{$fields{'ID'}};
+ $id=~s/\s//g;
+ if ($id) {
+ push(@skipped,"$id:$domain");
+ } else {
+ push(@skipped,"$username:$domain");
+ }
next;
}
my $usec=$classlist->{"$username:$domain"}[5];
@@ -2910,25 +3606,61 @@ sub csvuploadassign {
push(@notallowed,"$username:$domain");
next;
}
+ my %points;
my %grades;
foreach my $dest (keys(%fields)) {
- if ($dest eq 'username' || $dest eq 'domain') { next; }
- if ($entries{$fields{$dest}} eq '') { next; }
- my $store_key=$dest;
- $store_key=~s/^stores/resource/;
- $store_key=~s/_/\./g;
- $grades{$store_key}=$entries{$fields{$dest}};
- }
- $grades{"resource.regrader"}="$ENV{'user.name'}:$ENV{'user.domain'}";
- &Apache::lonnet::cstore(\%grades,$symb,$ENV{'request.course.id'},
- $domain,$username);
- $request->print('.');
+ if ($dest eq 'ID' || $dest eq 'username' ||
+ $dest eq 'domain') { next; }
+ if ($entries{$fields{$dest}} =~ /^\s*$/) { next; }
+ if ($dest=~/stores_(.*)_points/) {
+ my $part=$1;
+ my $wgt =&Apache::lonnet::EXT('resource.'.$part.'.weight',
+ $symb,$domain,$username);
+ if ($wgt) {
+ $entries{$fields{$dest}}=~s/\s//g;
+ my $pcr=$entries{$fields{$dest}} / $wgt;
+ my $award='correct_by_override';
+ $grades{"resource.$part.awarded"}=$pcr;
+ $grades{"resource.$part.solved"}=$award;
+ $points{$part}=1;
+ } else {
+ $error_msg = "<br />" .
+ &mt("Some point values were assigned"
+ ." for problems with a weight "
+ ."of zero. These values were "
+ ."ignored.");
+ }
+ } else {
+ if ($dest=~/stores_(.*)_awarded/) { if ($points{$1}) {next;} }
+ if ($dest=~/stores_(.*)_solved/) { if ($points{$1}) {next;} }
+ my $store_key=$dest;
+ $store_key=~s/^stores/resource/;
+ $store_key=~s/_/\./g;
+ $grades{$store_key}=$entries{$fields{$dest}};
+ }
+ }
+ if (! %grades) { push(@skipped,"$username:$domain no data to store"); }
+ $grades{"resource.regrader"}="$env{'user.name'}:$env{'user.domain'}";
+# &Apache::lonnet::logthis(" storing ".(join('-',%grades)));
+ my $result=&Apache::lonnet::cstore(\%grades,$symb,
+ $env{'request.course.id'},
+ $domain,$username);
+ if ($result eq 'ok') {
+ $request->print('.');
+ } else {
+ $request->print("<p>
+ <font color='red'>
+ Failed to store student $username\@$domain.
+ Message when trying to store was ($result)
+ </font>
+ </p>" );
+ }
$request->rflush();
$countdone++;
}
$request->print("<br />Stored $countdone students\n");
if (@skipped) {
- $request->print('<p<font size="+1"><b>Skipped Students</b></font></p>');
+ $request->print('<p><font size="+1"><b>Skipped Students</b></font></p>');
foreach my $student (@skipped) { $request->print("$student<br />\n"); }
}
if (@notallowed) {
@@ -2936,8 +3668,8 @@ sub csvuploadassign {
foreach my $student (@notallowed) { $request->print("$student<br />\n"); }
}
$request->print("<br />\n");
- $request->print(&show_grading_menu_form($symb,$url));
- return '';
+ $request->print(&show_grading_menu_form($symb));
+ return $error_msg;
}
#------------- end of section for handling csv file upload ---------
#
@@ -2966,10 +3698,10 @@ function checkPickOne(formname) {
</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"};
- my $getsec = $ENV{'form.section'} eq '' ? 'all' : $ENV{'form.section'};
+ my ($symb) = &get_symb($request);
+ my $cdom = $env{"course.$env{'request.course.id'}.domain"};
+ my $cnum = $env{"course.$env{'request.course.id'}.num"};
+ my $getsec = $env{'form.section'} eq '' ? 'all' : $env{'form.section'};
my $result='<h3><font color="#339933"> '.
'Manual Grading by Page or Sequence</font></h3>';
@@ -2988,7 +3720,7 @@ LISTJAVASCRIPT
'>'.$showtitle.'</option>'."\n";
$ctr++;
}
- $result.= '</select>'."<br>\n";
+ $result.= '</select>'."<br />\n";
$ctr=0;
foreach (@$titles) {
my ($minder,$showtitle) = ($_ =~ /(\d+)\.(.*)/);
@@ -2999,27 +3731,26 @@ LISTJAVASCRIPT
$result.='<input type="hidden" name="page" />'."\n".
'<input type="hidden" name="title" />'."\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>View Problems Text: </b><label><input type="radio" name="vProb" value="no" checked="on" /> no </label>'."\n".
+ '<label><input type="radio" name="vProb" value="yes" /> yes </label>'."<br />\n";
$result.=' <b>Submission Details: </b>'.
- '<input type="radio" name="lastSub" value="none" /> none'."\n".
- '<input type="radio" name="lastSub" value="datesub" checked /> by dates and submissions'."\n".
- '<input type="radio" name="lastSub" value="all" /> all details'."\n";
+ '<label><input type="radio" name="lastSub" value="none" /> none</label>'."\n".
+ '<label><input type="radio" name="lastSub" value="datesub" checked /> by dates and submissions</label>'."\n".
+ '<label><input type="radio" name="lastSub" value="all" /> all details</label>'."\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";
+ '<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."<br />\n";
$result.=' <input type="button" '.
'onClick="javascript:checkPickOne(this.form);"value="Next->" /><br />'."\n";
$request->print($result);
- my $studentTable.=' <b>Select a student you wish to grade and then click on the Next button.</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 align="right"> <b>No.</b></td>'.
@@ -3029,12 +3760,18 @@ LISTJAVASCRIPT
my (undef,undef,$fullname) = &getclasslist($getsec,'1');
my $ptr = 1;
- foreach my $student (sort {lc($$fullname{$a}) cmp lc($$fullname{$b}) } keys %$fullname) {
+ foreach my $student (sort
+ {
+ if (lc($$fullname{$a}) ne lc($$fullname{$b})) {
+ return (lc($$fullname{$a}) cmp lc($$fullname{$b}));
+ }
+ return $a cmp $b;
+ } (keys(%$fullname))) {
my ($uname,$udom) = split(/:/,$student);
$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.='<td> <label><input type="radio" name="student" value="'.$student.'" /> '
+ .&nameUserString(undef,$$fullname{$student},$uname,$udom)."</label>\n";
$studentTable.=($ptr%2 == 0 ? '</td></tr>' : '');
$ptr++;
}
@@ -3043,7 +3780,7 @@ LISTJAVASCRIPT
$studentTable.='<input type="button" '.
'onClick="javascript:checkPickOne(this.form);"value="Next->" /></form>'."\n";
- $studentTable.=&show_grading_menu_form($symb,$url);
+ $studentTable.=&show_grading_menu_form($symb);
$request->print($studentTable);
return '';
@@ -3058,7 +3795,8 @@ sub getSymbMap {
my $minder = 0;
# Gather every sequence that has problems.
- my @sequences = $navmap->retrieveResources(undef, sub { shift->is_map(); }, 1);
+ my @sequences = $navmap->retrieveResources(undef, sub { shift->is_map(); },
+ 1,0,1);
for my $sequence ($navmap->getById('0.0'), @sequences) {
if ($navmap->hasResource($sequence, sub { shift->is_problem(); }, 0) ) {
my $title = $minder.'.'.$sequence->compTitle();
@@ -3075,50 +3813,53 @@ sub getSymbMap {
sub displayPage {
my ($request) = shift;
- 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"};
- my $getsec = $ENV{'form.section'} eq '' ? 'all' : $ENV{'form.section'};
- my $pageTitle = $ENV{'form.page'};
+ my ($symb) = &get_symb($request);
+ my $cdom = $env{"course.$env{'request.course.id'}.domain"};
+ my $cnum = $env{"course.$env{'request.course.id'}.num"};
+ my $getsec = $env{'form.section'} eq '' ? 'all' : $env{'form.section'};
+ my $pageTitle = $env{'form.page'};
my ($classlist,undef,$fullname) = &getclasslist($getsec,'1');
- my ($uname,$udom) = split(/:/,$ENV{'form.student'});
- my $usec=$classlist->{$ENV{'form.student'}}[5];
+ 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'});
+ $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));
+ $request->print('<font color="red">Unable to view requested student.('.$env{'form.student'}.')</font>');
+ $request->print(&show_grading_menu_form($symb));
return;
}
- my $result='<h3><font color="#339933"> '.$ENV{'form.title'}.'</font></h3>';
- $result.='<h3> Student: '.&nameUserString(undef,$$fullname{$ENV{'form.student'}},$uname,$udom).
+ my $result='<h3><font color="#339933"> '.$env{'form.title'}.'</font></h3>';
+ $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();
- my ($mapUrl, $id, $resUrl)=&Apache::lonnet::decode_symb($ENV{'form.page'});
+ my ($mapUrl, $id, $resUrl)=&Apache::lonnet::decode_symb($env{'form.page'});
my $map = $navmap->getResourceByUrl($resUrl); # add to navmaps
-
+ if (!$map) {
+ $request->print('<font color="red">Unable to view requested sequence. ('.$resUrl.')</font>');
+ $request->print(&show_grading_menu_form($symb));
+ return;
+ }
my $iterator = $navmap->getIterator($map->map_start(),
$map->map_finish());
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="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="title" value="'.$env{'form.title'}.'" />'."\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";
+ '<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."\n";
my $checkIcon = '<img src="'.$request->dir_config('lonIconsURL').
'/check.gif" height="16" border="0" />';
@@ -3128,8 +3869,9 @@ sub displayPage {
'<table border="0"><tr><td bgcolor="#777777">'.
'<table border="0"><tr bgcolor="#e6ffff">'.
'<td align="center"><b> Prob. </b></td>'.
- '<td><b> '.($ENV{'form.vProb'} eq 'no' ? 'Title' : 'Problem Text').'/Grade</b></td></tr>';
+ '<td><b> '.($env{'form.vProb'} eq 'no' ? 'Title' : 'Problem Text').'/Grade</b></td></tr>';
+ &Apache::lonxml::clear_problem_counter();
my ($depth,$question,$prob) = (1,1,1);
$iterator->next(); # skip the first BEGIN_MAP
my $curRes = $iterator->next(); # for "current resource"
@@ -3137,31 +3879,31 @@ sub displayPage {
if($curRes == $iterator->BEGIN_MAP) { $depth++; }
if($curRes == $iterator->END_MAP) { $depth--; }
- if (ref($curRes) && $curRes->is_problem()) {
+ if (ref($curRes) && $curRes->is_problem() && !$curRes->randomout) {
my $parts = $curRes->parts();
my $title = $curRes->compTitle();
my $symbx = $curRes->symb();
$studentTable.='<tr bgcolor="#ffffe6"><td align="center" valign="top" >'.$prob.
- (scalar(@{$parts}) == 1 ? '' : '<br>('.scalar(@{$parts}).' parts)').'</td>';
+ (scalar(@{$parts}) == 1 ? '' : '<br />('.scalar(@{$parts}).' parts)').'</td>';
$studentTable.='<td valign="top">';
- if ($ENV{'form.vProb'} eq 'yes' ) {
+ 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>
# $companswer =~ s/$1/ /ms;
-# $request->print('match='.$1."<br>\n");
+# $request->print('match='.$1."<br />\n");
# }
# $companswer =~ s|<table border=\"1\">|<table border=\"0\">|g;
- $studentTable.=' <b>'.$title.'</b> <br> <b>Correct answer:</b><br>'.$companswer;
+ $studentTable.=' <b>'.$title.'</b> <br /> <b>Correct answer:</b><br />'.$companswer;
}
- my %record = &Apache::lonnet::restore($symbx,$ENV{'request.course.id'},$udom,$uname);
+ my %record = &Apache::lonnet::restore($symbx,$env{'request.course.id'},$udom,$uname);
- if ($ENV{'form.lastSub'} eq 'datesub') {
+ if ($env{'form.lastSub'} eq 'datesub') {
if ($record{'version'} eq '') {
$studentTable.='<br /> <font color="red">No recorded submission for this problem</font><br />';
} else {
@@ -3178,10 +3920,10 @@ sub displayPage {
$studentTable.= &displaySubByDates($symbx,\%record,$parts,\%responseType,$checkIcon,$uname,$udom);
}
- } elsif ($ENV{'form.lastSub'} eq 'all') {
- my $last = ($ENV{'form.lastSub'} eq 'last' ? 'last' : '');
+ } elsif ($env{'form.lastSub'} eq 'all') {
+ my $last = ($env{'form.lastSub'} eq 'last' ? 'last' : '');
$studentTable.=&Apache::loncommon::get_previous_attempt($symbx,$uname,$udom,
- $ENV{'request.course.id'},
+ $env{'request.course.id'},
'','.submission');
}
@@ -3203,7 +3945,7 @@ sub displayPage {
'<input type="button" value="Save" '.
'onClick="javascript:checkSubmitPage(this.form,'.$question.');" TARGET=_self />'.
'</form>'."\n";
- $studentTable.=&show_grading_menu_form($symb,$url);
+ $studentTable.=&show_grading_menu_form($symb);
$request->print($studentTable);
return '';
@@ -3212,6 +3954,7 @@ sub displayPage {
sub displaySubByDates {
my ($symb,$record,$parts,$responseType,$checkIcon,$uname,$udom) = @_;
my $isCODE=0;
+ my $isTask = ($symb =~/\.task$/);
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">'.
@@ -3226,8 +3969,17 @@ sub displaySubByDates {
if (!exists($$record{'1:timestamp'})) {
return '<br /> <font color="red">Nothing submitted - no attempts</font><br />';
}
+
+ my $interaction;
for ($version=1;$version<=$$record{'version'};$version++) {
my $timestamp = scalar(localtime($$record{$version.':timestamp'}));
+ if (exists($$record{$version.':resource.0.version'})) {
+ $interaction = $$record{$version.':resource.0.version'};
+ }
+
+ my $where = ($isTask ? "$version:resource.$interaction"
+ : "$version:resource");
+ #&Apache::lonnet::logthis(" got $where");
$studentTable.='<tr bgcolor="#ffffff" valign="top"><td>'.$timestamp.'</td>';
if ($isCODE) {
$studentTable.='<td>'.$record->{$version.':resource.CODE'}.'</td>';
@@ -3235,40 +3987,57 @@ sub displaySubByDates {
my @versionKeys = split(/\:/,$$record{$version.':keys'});
my @displaySub = ();
foreach my $partid (@{$parts}) {
- my @matchKey = sort(grep /^resource\.\Q$partid\E\..*?\.submission$/,@versionKeys);
+ my @matchKey = ($isTask ? sort(grep /^resource\.\d+\.\Q$partid\E\.award$/,@versionKeys)
+ : 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);
+ my $display_part=&get_display_part($partid,$symb);
foreach my $matchKey (@matchKey) {
if (exists($$record{$version.':'.$matchKey}) &&
$$record{$version.':'.$matchKey} ne '') {
- my ($responseId)=($matchKey=~ /^resource\.\Q$partid\E\.(.*?)\.submission$/);
+
+ my ($responseId)= ($isTask ? ($matchKey=~ /^resource\.(.*?)\.\Q$partid\E\.award$/)
+ : ($matchKey=~ /^resource\.\Q$partid\E\.(.*?)\.submission$/));
+ #&Apache::lonnet::logthis("match $matchKey $responseId (".$$record{$version.':'.$matchKey});
$displaySub[0].='<b>Part:</b> '.$display_part.' ';
$displaySub[0].='<font color="#999999">(ID '.
$responseId.')</font> <b>';
- if ($$record{"$version:resource.$partid.tries"} eq '') {
+ if ($$record{"$where.$partid.tries"} eq '') {
$displaySub[0].='Trial not counted';
} else {
$displaySub[0].='Trial '.
- $$record{"$version:resource.$partid.tries"};
+ $$record{"$where.$partid.tries"};
}
- my $responseType=$responseType->{$partid}->{$responseId};
+ my $responseType=($isTask ? 'Task'
+ : $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 />';
+ &cleanRecord($$record{$version.':'.$matchKey},$responseType,$symb,$partid,$responseId,$record,$orders{$partid}->{$responseId},"$version:",$uname,$udom).'<br />';
}
}
- if (exists $$record{"$version:resource.$partid.award"}) {
+ if (exists($$record{"$where.$partid.checkedin"})) {
+ $displaySub[1].='Checked in by '.
+ $$record{"$where.$partid.checkedin"}.' into slot '.
+ $$record{"$where.$partid.checkedin.slot"}.
+ '<br />';
+ }
+ if (exists $$record{"$where.$partid.award"}) {
$displaySub[1].='<b>Part:</b> '.$display_part.' '.
- lc($$record{"$version:resource.$partid.award"}).' '.
- $mark{$$record{"$version:resource.$partid.solved"}}.
+ lc($$record{"$where.$partid.award"}).' '.
+ $mark{$$record{"$where.$partid.solved"}}.
'<br />';
}
- if (exists $$record{"$version:resource.$partid.regrader"}) {
- $displaySub[2].=$$record{"$version:resource.$partid.regrader"}.
+ if (exists $$record{"$where.$partid.regrader"}) {
+ $displaySub[2].=$$record{"$where.$partid.regrader"}.
+ ' (<b>'.&mt('Part').':</b> '.$display_part.')';
+ } elsif ($$record{"$version:resource.$partid.regrader"} =~ /\S/) {
+ $displaySub[2].=
+ $$record{"$version:resource.$partid.regrader"}.
' (<b>'.&mt('Part').':</b> '.$display_part.')';
}
}
@@ -3290,28 +4059,33 @@ sub displaySubByDates {
sub updateGradeByPage {
my ($request) = shift;
- my $cdom = $ENV{"course.$ENV{'request.course.id'}.domain"};
- my $cnum = $ENV{"course.$ENV{'request.course.id'}.num"};
- my $getsec = $ENV{'form.section'} eq '' ? 'all' : $ENV{'form.section'};
- my $pageTitle = $ENV{'form.page'};
+ my $cdom = $env{"course.$env{'request.course.id'}.domain"};
+ my $cnum = $env{"course.$env{'request.course.id'}.num"};
+ my $getsec = $env{'form.section'} eq '' ? 'all' : $env{'form.section'};
+ my $pageTitle = $env{'form.page'};
my ($classlist,undef,$fullname) = &getclasslist($getsec,'1');
- my ($uname,$udom) = split(/:/,$ENV{'form.student'});
- my $usec=$classlist->{$ENV{'form.student'}}[5];
+ my ($uname,$udom) = split(/:/,$env{'form.student'});
+ my $usec=$classlist->{$env{'form.student'}}[5];
if (!&canmodify($usec)) {
- $request->print('<font color="red">Unable to modify requested student.('.$ENV{'form.student'}.'</font>');
- $request->print(&show_grading_menu_form($ENV{'form.symb'},$ENV{'form.url'}));
+ $request->print('<font color="red">Unable to modify requested student.('.$env{'form.student'}.'</font>');
+ $request->print(&show_grading_menu_form($env{'form.symb'}));
return;
}
- my $result='<h3><font color="#339933"> '.$ENV{'form.title'}.'</font></h3>';
- $result.='<h3> Student: '.&nameUserString(undef,$ENV{'form.fullname'},$uname,$udom).
+ my $result='<h3><font color="#339933"> '.$env{'form.title'}.'</font></h3>';
+ $result.='<h3> Student: '.&nameUserString(undef,$env{'form.fullname'},$uname,$udom).
'</h3>'."\n";
$request->print($result);
my $navmap = Apache::lonnavmaps::navmap->new();
- my ($mapUrl, $id, $resUrl) = &Apache::lonnet::decode_symb( $ENV{'form.page'});
+ my ($mapUrl, $id, $resUrl) = &Apache::lonnet::decode_symb( $env{'form.page'});
my $map = $navmap->getResourceByUrl($resUrl); # add to navmaps
-
+ if (!$map) {
+ $request->print('<font color="red">Unable to grade requested sequence. ('.$resUrl.')</font>');
+ my ($symb)=&get_symb($request);
+ $request->print(&show_grading_menu_form($symb));
+ return;
+ }
my $iterator = $navmap->getIterator($map->map_start(),
$map->map_finish());
@@ -3334,17 +4108,19 @@ sub updateGradeByPage {
my $title = $curRes->compTitle();
my $symbx = $curRes->symb();
$studentTable.='<tr bgcolor="#ffffe6"><td align="center" valign="top" >'.$prob.
- (scalar(@{$parts}) == 1 ? '' : '<br>('.scalar(@{$parts}).' parts)').'</td>';
+ (scalar(@{$parts}) == 1 ? '' : '<br />('.scalar(@{$parts}).' parts)').'</td>';
$studentTable.='<td valign="top"> <b>'.$title.'</b> </td>';
my %newrecord=();
my @displayPts=();
+ my %aggregate = ();
+ my $aggregateflag = 0;
foreach my $partid (@{$parts}) {
- my $newpts = $ENV{'form.GD_BOX'.$question.'_'.$partid};
- my $oldpts = $ENV{'form.oldpts'.$question.'_'.$partid};
+ my $newpts = $env{'form.GD_BOX'.$question.'_'.$partid};
+ my $oldpts = $env{'form.oldpts'.$question.'_'.$partid};
- my $wgt = $ENV{'form.WGT'.$question.'_'.$partid} != 0 ?
- $ENV{'form.WGT'.$question.'_'.$partid} : 1;
+ my $wgt = $env{'form.WGT'.$question.'_'.$partid} != 0 ?
+ $env{'form.WGT'.$question.'_'.$partid} : 1;
my $partial = $newpts/$wgt;
my $score;
if ($partial > 0) {
@@ -3352,44 +4128,56 @@ sub updateGradeByPage {
} elsif ($newpts ne '') { #empty is taken as 0
$score = 'incorrect_by_override';
}
- my $dropMenu = $ENV{'form.GD_SEL'.$question.'_'.$partid};
+ 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
+ && $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'}";
+ $newrecord{'resource.'.$partid.'.regrader'} = "$env{'user.name'}:$env{'user.domain'}";
$changeflag++;
$newpts = '';
+
+ my $aggtries = $env{'form.aggtries'.$question.'_'.$partid};
+ my $totaltries = $env{'form.totaltries'.$question.'_'.$partid};
+ my $solvedstatus = $env{'form.solved'.$question.'_'.$partid};
+ if ($aggtries > 0) {
+ &decrement_aggs($symbx,$partid,\%aggregate,$aggtries,$totaltries,$solvedstatus);
+ $aggregateflag = 1;
+ }
}
- my $display_part=&get_display_part($partid,undef,
- $curRes->symb());
- my $oldstatus = $ENV{'form.solved'.$question.'_'.$partid};
+ my $display_part=&get_display_part($partid,$curRes->symb());
+ my $oldstatus = $env{'form.solved'.$question.'_'.$partid};
$displayPts[0].=' <b>Part:</b> '.$display_part.' = '.
(($oldstatus eq 'excused') ? 'excused' : $oldpts).
- ' <br>';
+ ' <br />';
$displayPts[1].=' <b>Part:</b> '.$display_part.' = '.
(($score eq 'excused') ? 'excused' : $newpts).
- ' <br>';
+ ' <br />';
$question++;
next if ($dropMenu eq 'reset status' || ($newpts == $oldpts && $score ne 'excused'));
$newrecord{'resource.'.$partid.'.awarded'} = $partial if $partial ne '';
$newrecord{'resource.'.$partid.'.solved'} = $score if $score ne '';
- $newrecord{'resource.'.$partid.'.regrader'} = "$ENV{'user.name'}:$ENV{'user.domain'}"
+ $newrecord{'resource.'.$partid.'.regrader'} = "$env{'user.name'}:$env{'user.domain'}"
if (scalar(keys(%newrecord)) > 0);
$changeflag++;
}
if (scalar(keys(%newrecord)) > 0) {
- &Apache::lonnet::cstore(\%newrecord,$symbx,$ENV{'request.course.id'},
+ &Apache::lonnet::cstore(\%newrecord,$symbx,$env{'request.course.id'},
$udom,$uname);
}
+ if ($aggregateflag) {
+ &Apache::lonnet::cinc('nohist_resourcetracker',\%aggregate,
+ $env{'course.'.$env{'request.course.id'}.'.domain'},
+ $env{'course.'.$env{'request.course.id'}.'.num'});
+ }
$studentTable.='<td valign="top">'.$displayPts[0].'</td>'.
'<td valign="top">'.$displayPts[1].'</td>'.
@@ -3401,7 +4189,7 @@ sub updateGradeByPage {
}
$studentTable.='</td></tr></table></td></tr></table>';
- $studentTable.=&show_grading_menu_form($ENV{'form.symb'},$ENV{'form.url'});
+ $studentTable.=&show_grading_menu_form($env{'form.symb'});
my $grademsg=($changeflag == 0 ? 'No score was changed or updated.' :
'The scores were changed for '.
$changeflag.' problem'.($changeflag == 1 ? '.' : 's.'));
@@ -3419,12 +4207,11 @@ sub updateGradeByPage {
#------ start of section for handling grading by page/sequence ---------
sub defaultFormData {
- my ($symb,$url)=@_;
+ my ($symb)=@_;
return '
<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".
- '<input type="hidden" name="probTitle" value="'.$ENV{'form.probTitle'}.'" />'."\n";
+ '<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."\n".
+ '<input type="hidden" name="probTitle" value="'.$env{'form.probTitle'}.'" />'."\n";
}
sub getSequenceDropDown {
@@ -3445,10 +4232,10 @@ sub getSequenceDropDown {
}
sub scantron_filenames {
- my $cdom=$ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
- my $cname=$ENV{'course.'.$ENV{'request.course.id'}.'.num'};
+ 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));
+ &propath($cdom,$cname));
my @possiblenames;
foreach my $filename (sort(@files)) {
($filename)=split(/&/,$filename);
@@ -3485,12 +4272,13 @@ sub scantron_scantab {
}
sub scantron_CODElist {
- my $cdom = $ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
- my $cnum = $ENV{'course.'.$ENV{'request.course.id'}.'.num'};
+ my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+ my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
my @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; }
+ if ($name =~ /^type\0/) { next; }
$namechoice.='<option value="'.$name.'">'.$name.'</option>';
}
$namechoice='<select name="scantron_CODElist">'.$namechoice.'</select>';
@@ -3499,23 +4287,23 @@ sub scantron_CODElist {
sub scantron_CODEunique {
my $result='<nobr>
- <input type="radio" name="scantron_CODEunique"
- value="Yes" checked="on" /> Yes
+ <label><input type="radio" name="scantron_CODEunique"
+ value="yes" checked="checked" /> Yes </label>
</nobr>
<nobr>
- <input type="radio" name="scantron_CODEunique"
- value="No" /> No
+ <label><input type="radio" name="scantron_CODEunique"
+ value="no" /> No </label>
</nobr>';
return $result;
}
sub scantron_selectphase {
my ($r,$file2grade) = @_;
- my ($symb,$url)=&get_symb_and_url($r);
+ my ($symb)=&get_symb($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 $default_form_data=&defaultFormData($symb);
+ my $grading_menu_button=&show_grading_menu_form($symb);
my $file_selector=&scantron_uploads($file2grade);
my $format_selector=&scantron_scantab();
my $CODE_selector=&scantron_CODElist();
@@ -3554,13 +4342,14 @@ sub scantron_selectphase {
<tr bgcolor="#ffffe6">
<td> Options: </td>
<td>
- <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
+ <label><input type="checkbox" name="scantron_options_redo" value="redo_skipped"/> Do only previously skipped records</label> <br />
+ <label><input type="checkbox" name="scantron_options_ignore" value="ignore_corrections"/> Remove all exisiting corrections</label> <br />
+ <label><input type="checkbox" name="scantron_options_hidden" value="ignore_hidden"/> Skip hidden resources when grading</label>
</td>
</tr>
<tr bgcolor="#ffffe6">
<td colspan="2">
- <input type="submit" value="Validate Scantron Records" />
+ <input type="submit" value="Grading: Validate Scantron Records" />
</td>
</tr>
</table>
@@ -3571,8 +4360,8 @@ SCANTRONFORM
$r->print($result);
- if (&Apache::lonnet::allowed('usc',$ENV{'request.role.domain'}) ||
- &Apache::lonnet::allowed('usc',$ENV{'request.course.id'})) {
+ if (&Apache::lonnet::allowed('usc',$env{'request.role.domain'}) ||
+ &Apache::lonnet::allowed('usc',$env{'request.course.id'})) {
$r->print(<<SCANTRONFORM);
<tr>
@@ -3586,9 +4375,9 @@ SCANTRONFORM
<tr bgcolor="#ffffe6">
<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'};
+ my $default_form_data=&defaultFormData(&get_symb($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) {
@@ -3635,7 +4424,7 @@ SCANTRONFORM
</tr>
<tr bgcolor="#ffffe6">
<td colspan="2">
- <input type="submit" value="Show List of Files" />
+ <input type="submit" value="Download: Show List of Associated Files" />
</td>
</tr>
</table>
@@ -3734,7 +4523,14 @@ sub scantron_fixup_scanline {
&scan_data($scan_data,
"$whichline.no_bubble.".$args->{'question'},'1');
} else {
- substr($answer,$args->{'response'},1)=$on;
+ if ($on eq 'letter') {
+ my @alphabet=('A'..'Z');
+ $answer=$alphabet[$args->{'response'}];
+ } elsif ($on eq 'number') {
+ $answer=$args->{'response'}+1;
+ } else {
+ substr($answer,$args->{'response'},1)=$on;
+ }
&scan_data($scan_data,
"$whichline.no_bubble.".$args->{'question'},undef,'1');
}
@@ -3746,7 +4542,7 @@ sub scantron_fixup_scanline {
sub scan_data {
my ($scan_data,$key,$value,$delete)=@_;
- my $filename=$ENV{'form.scantron_selectfile'};
+ my $filename=$env{'form.scantron_selectfile'};
if (defined($value)) {
$scan_data->{$filename.'_'.$key} = $value;
}
@@ -3759,8 +4555,11 @@ sub scantron_parse_scanline {
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) {
+ if (!($$scantron_config{'CODElocation'} eq 0 ||
+ $$scantron_config{'CODElocation'} eq 'none')) {
+ if ($$scantron_config{'CODElocation'} < 0 ||
+ $$scantron_config{'CODElocation'} eq 'letter' ||
+ $$scantron_config{'CODElocation'} eq 'number') {
$record{'scantron.CODE'}=substr($data,
$$scantron_config{'CODEstart'}-1,
$$scantron_config{'CODElength'});
@@ -3794,25 +4593,57 @@ 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,-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);
- }
+ if ($$scantron_config{'Qon'} eq 'letter') {
+ if ($currentquest eq '?') {
+ push(@{$record{'scantron.doubleerror'}},$questnum);
+ $record{"scantron.$questnum.answer"}='';
+ } elsif (!$currentquest
+ || $currentquest eq $$scantron_config{'Qoff'}
+ || $currentquest !~ /^[A-Z]$/) {
+ $record{"scantron.$questnum.answer"}='';
+ if (!&scan_data($scan_data,"$whichline.no_bubble.$questnum")) {
+ push(@{$record{"scantron.missingerror"}},$questnum);
+ }
+ } else {
+ $record{"scantron.$questnum.answer"}=$currentquest;
+ }
+ } elsif ($$scantron_config{'Qon'} eq 'number') {
+ if ($currentquest eq '?') {
+ push(@{$record{'scantron.doubleerror'}},$questnum);
+ $record{"scantron.$questnum.answer"}='';
+ } elsif (!$currentquest
+ || $currentquest eq $$scantron_config{'Qoff'}
+ || $currentquest !~ /^\d$/) {
+ $record{"scantron.$questnum.answer"}='';
+ if (!&scan_data($scan_data,"$whichline.no_bubble.$questnum")) {
+ push(@{$record{"scantron.missingerror"}},$questnum);
+ }
+ } else {
+ $record{"scantron.$questnum.answer"}=
+ $alphabet[$currentquest-1];
+ }
} else {
- $record{"scantron.$questnum.answer"}=$alphabet[length($array[0])];
+ 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);
+ }
+ }
}
- 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;
@@ -3842,8 +4673,15 @@ sub scantron_find_student {
sub scantron_filter {
my ($curres)=@_;
- # randomout is dysfunctional at best for this purpose
- if (ref($curres) && $curres->is_problem()) { #&& !$curres->randomout) {
+
+ if (ref($curres) && $curres->is_problem()) {
+ # if the user has asked to not have either hidden
+ # or 'randomout' controlled resources to be graded
+ # don't include them
+ if ($env{'form.scantron_options_hidden'} eq 'ignore_hidden'
+ && $curres->randomout) {
+ return 0;
+ }
return 1;
}
return 0;
@@ -3851,55 +4689,55 @@ sub scantron_filter {
sub scantron_process_corrections {
my ($r) = @_;
- my %scantron_config=&get_scantron_config($ENV{'form.scantron_format'});
+ 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 $which=$env{'form.scantron_line'};
my $line=&scantron_get_line($scanlines,$scan_data,$which);
my ($skip,$err,$errmsg);
- if ($ENV{'form.scantron_skip_record'}) {
+ 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'};
+ } 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'};
+ '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'};
+ $newCODE=$env{'form.scantron_CODE_selectedvalue'};
} elsif ($resolution eq 'use_typed') {
- $newCODE=$ENV{'form.scantron_CODE_newvalue'};
+ $newCODE=$env{'form.scantron_CODE_newvalue'};
} elsif ($resolution =~ /^use_closest_(\d+)/) {
- $newCODE=$ENV{"form.scantron_CODE_closest_$1"};
+ $newCODE=$env{"form.scantron_CODE_closest_$1"};
}
- if ($ENV{'form.scantron_corrections'} eq 'duplicateCODE') {
+ 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'})) {
+ } 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"}});
+ 'response'=>$env{"form.scantron_correct_Q_$question"}});
if ($err) { last; }
}
}
if ($err) {
- $r->print("Unable to accept last correction, an error occurred :$errmsg:");
+ $r->print("<font color='red'>Unable to accept last correction, an error occurred :$errmsg:</font>");
} else {
&scantron_put_line($scanlines,$scan_data,$which,$line,$skip);
&scantron_putfile($scanlines,$scan_data);
@@ -3921,7 +4759,7 @@ sub allow_skipping {
sub should_be_skipped {
my ($scan_data,$i)=@_;
- if ($ENV{'form.scantron_options_redo'} !~ /^redo_/) {
+ if ($env{'form.scantron_options_redo'} !~ /^redo_/) {
# not redoing old skips
return 0;
}
@@ -3938,7 +4776,6 @@ sub remember_current_skipped {
$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);
}
@@ -3952,15 +4789,27 @@ sub check_for_error {
sub scantron_warning_screen {
my ($button_text)=@_;
- my $title=&Apache::lonnet::gettitle($ENV{'form.selectpage'});
+ my $title=&Apache::lonnet::gettitle($env{'form.selectpage'});
+ my %scantron_config=&get_scantron_config($env{'form.scantron_format'});
+ my $CODElist="a";
+ if ($scantron_config{'CODElocation'} &&
+ $scantron_config{'CODEstart'} &&
+ $scantron_config{'CODElength'}) {
+ $CODElist=$env{'form.scantron_CODElist'};
+ if ($CODElist eq '') { $CODElist='<font color="red">None</font>'; }
+ $CODElist=
+ '<tr><td><b>List of CODES to validate against:</b></td><td><tt>'.
+ $CODElist.'</tt></td></tr>';
+ }
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>
+<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>
+$CODElist
</table>
</font>
<br />
@@ -3973,18 +4822,32 @@ STUFF
sub scantron_do_warning {
my ($r)=@_;
- my ($symb,$url)=&get_symb_and_url($r);
+ my ($symb)=&get_symb($r);
if (!$symb) {return '';}
- my $default_form_data=&defaultFormData($symb,$url);
+ my $default_form_data=&defaultFormData($symb);
$r->print(&scantron_form_start().$default_form_data);
- my $warning=&scantron_warning_screen('Validate Records');
- $r->print(<<STUFF);
+ if ( $env{'form.selectpage'} eq '' ||
+ $env{'form.scantron_selectfile'} eq '' ||
+ $env{'form.scantron_format'} eq '' ) {
+ $r->print("<p>You have forgetten to specify some information. Please go Back and try again.</p>");
+ if ( $env{'form.selectpage'} eq '') {
+ $r->print('<p><font color="red">You have not selected a Sequence to grade</font></p>');
+ }
+ if ( $env{'form.scantron_selectfile'} eq '') {
+ $r->print('<p><font color="red">You have not selected a file that contains the student\'s response data.</font></p>');
+ }
+ if ( $env{'form.scantron_format'} eq '') {
+ $r->print('<p><font color="red">You have not selected a the format of the student\'s response data.</font></p>');
+ }
+ } else {
+ my $warning=&scantron_warning_screen('Grading: Validate Records');
+ $r->print(<<STUFF);
$warning
-<input type="submit" name="submit" value="Validate Records" />
+<input type="submit" name="submit" value="Grading: Validate Records" />
<input type="hidden" name="command" value="scantron_validate" />
-</form>
STUFF
- $r->print("<br />".&show_grading_menu_form($symb,$url)."</body></html>");
+ }
+ $r->print("</form><br />".&show_grading_menu_form($symb));
return '';
}
@@ -3992,60 +4855,62 @@ 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="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'}" />
+ <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'}" />
+ <input type="hidden" name="scantron_options_hidden" value="$env{'form.scantron_options_hidden'}" />
SCANTRONFORM
return $result;
}
sub scantron_validate_file {
my ($r) = @_;
- my ($symb,$url)=&get_symb_and_url($r);
+ my ($symb)=&get_symb($r);
if (!$symb) {return '';}
- my $default_form_data=&defaultFormData($symb,$url);
+ my $default_form_data=&defaultFormData($symb);
# 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') {
+ if ($env{'form.scantron_options_redo'} ne 'redo_skipped_ready') {
&reset_skipping_status();
}
- if ($ENV{'form.scantron_options_redo'} eq 'redo_skipped') {
+ if ($env{'form.scantron_options_redo'} eq 'redo_skipped') {
&remember_current_skipped();
&scantron_remove_file('skipped');
- $ENV{'form.scantron_options_redo'}='redo_skipped_ready';
+ $env{'form.scantron_options_redo'}='redo_skipped_ready';
}
- if ($ENV{'form.scantron_options_ignore'} eq 'ignore_corrections') {
+ 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';
+ $env{'form.scantron_options_ignore'}='done';
}
- if ($ENV{'form.scantron_corrections'}) {
+ 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 $max_bubble=&scantron_get_maxbubble();
my $result=&scantron_form_start($max_bubble).$default_form_data;
$r->print($result);
- my @validate_phases=( 'ID',
+ my @validate_phases=( 'sequence',
+ 'ID',
'CODE',
'doublebubble',
'missingbubbles');
- if (!$ENV{'form.validatepass'}) {
- $ENV{'form.validatepass'} = 0;
+ if (!$env{'form.validatepass'}) {
+ $env{'form.validatepass'} = 0;
}
- my $currentphase=$ENV{'form.validatepass'};
+ my $currentphase=$env{'form.validatepass'};
my $stop=0;
while (!$stop && $currentphase < scalar(@validate_phases)) {
@@ -4071,39 +4936,45 @@ STUFF
$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.");
+ if ($validate_phases[$currentphase] eq 'sequence') {
+ $r->print('<input type="submit" name="submit" value="Ignore -> " />');
+ $r->print(' this error <br />');
+
+ $r->print(" <p>Or click the 'Grading Menu' button to start over.</p>");
+ } else {
+ $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>");
+ $r->print(" </form><br />".&show_grading_menu_form($symb));
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 $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'};
+ $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 $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'};
+ 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' &&
+ if ($env{'form.scantron_options_redo'} eq 'redo_skipped_ready' &&
$key=~/remember_skipping/) {
next;
}
@@ -4119,25 +4990,25 @@ sub scantron_remove_scan_data {
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 $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'});
+ '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'});
+ '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'});
+ 'scantron_skipped_'.$env{'form.scantron_selectfile'});
if ($lines eq '-1') {
$scanlines{'skipped'}=[];
} else {
@@ -4151,30 +5022,29 @@ sub scantron_getfile {
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);
+ my $docuname=$env{'course.'.$env{'request.course.id'}.'.num'};
+ my $docudom=$env{'course.'.$env{'request.course.id'}.'.domain'};
+ $env{'form.sillywaytopassafilearound'}=$contents;
+ &Apache::lonnet::finishuserfileupload($docuname,$docudom,'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'};
+ 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'});
+# $env{'form.scantron_selectfile'});
&lonnet_putfile(join("\n",@{$scanlines->{'corrected'}}),
$prefix.'corrected_'.
- $ENV{'form.scantron_selectfile'});
+ $env{'form.scantron_selectfile'});
&lonnet_putfile(join("\n",@{$scanlines->{'skipped'}}),
$prefix.'skipped_'.
- $ENV{'form.scantron_selectfile'});
+ $env{'form.scantron_selectfile'});
}
&Apache::lonnet::put('nohist_scantrondata',$scan_data,$cdom,$cname);
}
@@ -4208,6 +5078,45 @@ sub scantron_put_line {
$scanlines->{'corrected'}[$i]=$newline;
}
+sub scantron_filter_not_exam {
+ my ($curres)=@_;
+
+ if (ref($curres) && $curres->is_problem() && !$curres->is_exam()) {
+ # if the user has asked to not have either hidden
+ # or 'randomout' controlled resources to be graded
+ # don't include them
+ if ($env{'form.scantron_options_hidden'} eq 'ignore_hidden'
+ && $curres->randomout) {
+ return 0;
+ }
+ return 1;
+ }
+ return 0;
+}
+
+sub scantron_validate_sequence {
+ my ($r,$currentphase) = @_;
+
+ my $navmap=Apache::lonnavmaps::navmap->new();
+ my (undef,undef,$sequence)=
+ &Apache::lonnet::decode_symb($env{'form.selectpage'});
+
+ my $map=$navmap->getResourceByUrl($sequence);
+
+ $r->print('<input type="hidden" name="validate_sequence_exam"
+ value="ignore" />');
+ if ($env{'form.validate_sequence_exam'} ne 'ignore') {
+ my @resources=
+ $navmap->retrieveResources($map,\&scantron_filter_not_exam,1,0);
+ if (@resources) {
+ $r->print("<p>".&mt('Some resources in the sequence currently are not set to exam mode. Grading these resources currently may not work correctly.')."</p>");
+ return (1,$currentphase);
+ }
+ }
+
+ return (0,$currentphase+1);
+}
+
sub scantron_validate_ID {
my ($r,$currentphase) = @_;
@@ -4216,7 +5125,7 @@ sub scantron_validate_ID {
my %idmap=&username_to_idmap($classlist);
#get scantron line setup
- my %scantron_config=&get_scantron_config($ENV{'form.scantron_format'});
+ my %scantron_config=&get_scantron_config($env{'form.scantron_format'});
my ($scanlines,$scan_data)=&scantron_getfile();
my %found=('ids'=>{},'usernames'=>{});
@@ -4278,13 +5187,19 @@ sub scantron_get_correction {
#the previous one or the current one
$r->print("<p><b>An error was detected ($error)</b>");
- if ( defined($$scan_record{'scantron.PaperID'}) ) {
+ if ( $$scan_record{'scantron.PaperID'} =~ /\S/) {
$r->print(" for PaperID <tt>".
$$scan_record{'scantron.PaperID'}."</tt> \n");
} else {
$r->print(" in scanline $i <pre>".
$line."</pre> \n");
}
+ my $message="<p>The ID on the form is <tt>".
+ $$scan_record{'scantron.ID'}."</tt><br />\n".
+ "The name on the paper is ".
+ $$scan_record{'scantron.LastName'}.",".
+ $$scan_record{'scantron.FirstName'}."</p>";
+
$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$/) {
@@ -4293,11 +5208,7 @@ sub scantron_get_correction {
} 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($message);
$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
@@ -4306,7 +5217,7 @@ sub scantron_get_correction {
'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'));
+ &Apache::loncommon::select_dom_form($env{'request.role.domain'},'scantron_domain'));
$r->print('</li>');
} elsif ($error =~ /CODE$/) {
@@ -4317,27 +5228,28 @@ sub scantron_get_correction {
}
$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($message);
$r->print("<p>How should I handle this? <br /> \n");
$r->print("\n<br /> ");
my $i=0;
- if ($error eq 'incorrectCODE') {
+ if ($error eq 'incorrectCODE'
+ && $$scan_record{'scantron.CODE'}=~/\S/ ) {
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++;
+ if ($closest > 0) {
+ foreach my $testcode (@{$closest}) {
+ my $checked='';
+ if (!$i) { $checked=' checked="on" '; }
+ $r->print("<label><input type='radio' name='scantron_CODE_resolution' value='use_closest_$i' $checked /> Use the similar CODE <b><tt>".$testcode."</tt></b> instead.</label><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 />");
+ if ($$scan_record{'scantron.CODE'}=~/\S/ ) {
+ my $checked; if (!$i) { $checked=' checked="on" '; }
+ $r->print("<label><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.</label>");
+ $r->print("\n<br />");
+ }
$r->print(<<ENDSCRIPT);
<script type="text/javascript">
@@ -4351,19 +5263,22 @@ function change_radio(field) {
</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.");
+ "form=".&escape("scantronupload").
+ "&scantron_format=".&escape($env{'form.scantron_format'}).
+ "&scantron_CODElist=".&escape($env{'form.scantron_CODElist'}).
+ "&curCODE=".&escape($$scan_record{'scantron.CODE'}).
+ "&scantron_selectfile=".&escape($env{'form.scantron_selectfile'});
+ if ($env{'form.scantron_CODElist'} =~ /\S/) {
+ $r->print("<label><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.</label> 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("<label><input type='radio' name='scantron_CODE_resolution' value='use_typed' /> Use </label><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($message);
$r->print("<p>Please indicate which bubble should be used for grading</p>");
foreach my $question (@{$arg}) {
my $selected=$$scan_record{"scantron.$question.answer"};
@@ -4371,6 +5286,7 @@ ENDSCRIPT
}
} elsif ($error eq 'missingbubble') {
$r->print("<p>There have been <b>no</b> bubbles scanned for some question(s)</p>\n");
+ $r->print($message);
$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="'.
@@ -4389,21 +5305,26 @@ ENDSCRIPT
sub scantron_bubble_selector {
my ($r,$scan_config,$quest,@selected)=@_;
my $max=$$scan_config{'Qlength'};
+
+ my $scmode=$$scan_config{'Qon'};
+ if ($scmode eq 'number' || $scmode eq 'letter') { $max=10; }
+
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">');
+ $r->print("\n".'<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>');
+ $r->print('</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("\n".
+ '<td><label><input type="radio" name="scantron_correct_Q_'.
+ $quest.'" value="'.$i.'" />'.$alphabet[$i]."</label></td>");
}
- $r->print('<td><input type="radio" name="scantron_correct_Q_'.$quest.
- '" value="none" /> No bubble </td>');
+ $r->print('<td><label><input type="radio" name="scantron_correct_Q_'.
+ $quest.'" value="none" /> No bubble </label></td>');
$r->print('</tr></table>');
}
@@ -4429,21 +5350,34 @@ sub scantron_get_closely_matching_CODEs
}
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});
+ my ($old_name, $cdom, $cnum) = @_;
+ if (!$old_name) {
+ $old_name=$env{'form.scantron_CODElist'};
+ }
+ if (!$cdom) {
+ $cdom =$env{'course.'.$env{'request.course.id'}.'.domain'};
+ }
+ if (!$cnum) {
+ $cnum =$env{'course.'.$env{'request.course.id'}.'.num'};
+ }
+ my %result=&Apache::lonnet::get('CODEs',[$old_name,"type\0$old_name"],
+ $cdom,$cnum);
+ my %allcodes;
+ if ($result{"type\0$old_name"} eq 'number') {
+ %allcodes=map {($_,1)} split(',',$result{$old_name});
+ } else {
+ %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'});
+ 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'})) {
+ if (!defined($env{'form.scantron_CODElist'})) {
&FIXME_blow_up()
}
} else {
@@ -4476,7 +5410,7 @@ sub scantron_validate_CODE {
return(1,$currentphase);
}
if (exists($usedCODEs{$CODE})
- && $ENV{'form.scantron_CODEunique'} eq 'yes'
+ && $env{'form.scantron_CODEunique'} eq 'yes'
&& !$$scan_record{'scantron.CODE_ignore_dup'}) {
&scantron_get_correction($r,$i,$scan_record,
\%scantron_config,
@@ -4495,7 +5429,7 @@ sub scantron_validate_doublebubble {
my %idmap=&username_to_idmap($classlist);
#get scantron line setup
- my %scantron_config=&get_scantron_config($ENV{'form.scantron_format'});
+ 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);
@@ -4511,29 +5445,30 @@ sub scantron_validate_doublebubble {
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'};
+sub scantron_get_maxbubble {
+ 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'});
+ &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');
+
+ &Apache::lonxml::clear_problem_counter();
+
foreach my $resource (@resources) {
- my $result=&Apache::lonnet::ssi($resource->src());
+ my $result=&Apache::lonnet::ssi($resource->src(),
+ ('symb' => $resource->symb()));
}
&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'};
+ $env{'form.scantron_maxbubble'} =
+ &Apache::lonxml::get_problem_counter()-1;
+
+ return $env{'form.scantron_maxbubble'};
}
sub scantron_validate_missingbubbles {
@@ -4543,7 +5478,7 @@ sub scantron_validate_missingbubbles {
my %idmap=&username_to_idmap($classlist);
#get scantron line setup
- my %scantron_config=&get_scantron_config($ENV{'form.scantron_format'});
+ 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; }
@@ -4570,12 +5505,12 @@ sub scantron_validate_missingbubbles {
sub scantron_process_students {
my ($r) = @_;
- my (undef,undef,$sequence)=&Apache::lonnet::decode_symb($ENV{'form.selectpage'});
- my ($symb,$url)=&get_symb_and_url($r);
+ my (undef,undef,$sequence)=&Apache::lonnet::decode_symb($env{'form.selectpage'});
+ my ($symb)=&get_symb($r);
if (!$symb) {return '';}
- my $default_form_data=&defaultFormData($symb,$url);
+ my $default_form_data=&defaultFormData($symb);
- my %scantron_config=&get_scantron_config($ENV{'form.scantron_format'});
+ my %scantron_config=&get_scantron_config($env{'form.scantron_format'});
my ($scanlines,$scan_data)=&scantron_getfile();
my $classlist=&Apache::loncoursedata::get_classlist();
my %idmap=&username_to_idmap($classlist);
@@ -4626,7 +5561,8 @@ SCANTRONFORM
next;
}
($uname,$udom)=split(/:/,$uname);
- &Apache::lonnet::delenv('form.counter');
+
+ &Apache::lonxml::clear_problem_counter();
&Apache::lonnet::appenv(%$scan_record);
my $i=0;
@@ -4636,7 +5572,7 @@ SCANTRONFORM
'grade_target' =>'grade',
'grade_username'=>$uname,
'grade_domain' =>$udom,
- 'grade_courseid'=>$ENV{'request.course.id'},
+ 'grade_courseid'=>$env{'request.course.id'},
'grade_symb' =>$resource->symb());
if (exists($scan_record->{'scantron.CODE'}) &&
$scan_record->{'scantron.CODE'}) {
@@ -4647,14 +5583,14 @@ SCANTRONFORM
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());
+ &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::lonxml::clear_problem_counter();
&Apache::lonnet::delenv('scantron\.');
}
&Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
@@ -4662,19 +5598,19 @@ SCANTRONFORM
# $r->print("<p>took $lasttime</p>");
$r->print("</form>");
- $r->print(&show_grading_menu_form($symb,$url));
+ $r->print(&show_grading_menu_form($symb));
return '';
}
sub scantron_upload_scantron_data {
my ($r)=@_;
- $r->print(&Apache::loncommon::coursebrowser_javascript($ENV{'request.role.domain'}));
+ $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'},
+ my $domsel=&Apache::loncommon::select_dom_form($env{'request.role.domain'},
'domainid');
- my $default_form_data=&defaultFormData(&get_symb_and_url($r,1));
+ my $default_form_data=&defaultFormData(&get_symb($r,1));
$r->print(<<UPLOAD);
<script type="text/javascript" language="javascript">
function checkUpload(formname) {
@@ -4704,28 +5640,26 @@ UPLOAD
sub scantron_upload_scantron_data_save {
my($r)=@_;
- my ($symb,$url)=&get_symb_and_url($r,1);
+ my ($symb)=&get_symb($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'}) &&
+ if (!&Apache::lonnet::allowed('usc',$env{'form.domainid'}) &&
!&Apache::lonnet::allowed('usc',
- $ENV{'form.domainid'}.'_'.$ENV{'form.courseid'})) {
+ $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));
+ $r->print(&show_grading_menu_form($symb));
} else {
$r->print($doanotherupload);
}
return '';
}
- my %coursedata=&Apache::lonnet::coursedescription($ENV{'form.domainid'}.'_'.$ENV{'form.courseid'});
+ 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'};
+ my $fname=$env{'form.upfile.filename'};
#FIXME
#copied from lonnet::userfileupload()
#make that function able to target a specified course
@@ -4741,14 +5675,14 @@ sub scantron_upload_scantron_data_save {
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.");
+ 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);
+ my $result=&Apache::lonnet::finishuserfileupload($env{'form.courseid'},$env{'form.domainid'},'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>");
+ $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>");
+ $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) {
@@ -4762,7 +5696,6 @@ sub scantron_upload_scantron_data_save {
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;
@@ -4770,17 +5703,17 @@ sub valid_file {
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'};
+ my $default_form_data=&defaultFormData(&get_symb($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)));
+ $r->print(&show_grading_menu_form(&get_symb($r,1)));
return;
}
my $orig='/uploaded/'.$cdom.'/'.$cname.'/scantron_orig_'.$file;
@@ -4800,7 +5733,7 @@ ERROR
<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)));
+ $r->print(&show_grading_menu_form(&get_symb($r,1)));
return '';
}
@@ -4808,16 +5741,14 @@ DOWNLOAD
#
#-------------------------------------------------------------------
-
#-------------------------- Menu interface -------------------------
#
#--- Show a Grading Menu button - Calls the next routine ---
sub show_grading_menu_form {
- my ($symb,$url)=@_;
+ my ($symb)=@_;
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".
+ '<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."\n".
'<input type="hidden" name="command" value="gradingmenu" />'."\n".
'<input type="submit" name="submit" value="Grading Menu" />'."\n".
'</form>'."\n";
@@ -4827,8 +5758,8 @@ sub show_grading_menu_form {
# -- Retrieve choices for grading form
sub savedState {
my %savedState = ();
- if ($ENV{'form.saveState'}) {
- foreach (split(/:/,$ENV{'form.saveState'})) {
+ if ($env{'form.saveState'}) {
+ foreach (split(/:/,$env{'form.saveState'})) {
my ($key,$value) = split(/=/,$_,2);
$savedState{$key} = $value;
}
@@ -4839,7 +5770,7 @@ sub savedState {
#--- Displays the main menu page -------
sub gradingmenu {
my ($request) = @_;
- my ($symb,$url)=&get_symb_and_url($request);
+ my ($symb)=&get_symb($request);
if (!$symb) {return '';}
my $probTitle = &Apache::lonnet::gettitle($symb);
@@ -4861,6 +5792,7 @@ sub gradingmenu {
if (!checkReceiptNo(formname,'notOK')) { return false;}
formname.submit();
}
+ if (val < 7) formname.submit();
}
function checkReceiptNo(formname,nospace) {
@@ -4880,7 +5812,7 @@ sub gradingmenu {
GRADINGMENUJS
&commonJSfunctions($request);
my $result='<h3> <font color="#339933">Manual Grading/View Submission</font></h3>';
- my ($table,undef,$hdgrade) = &showResourceInfo($url,$probTitle);
+ my ($table,undef,$hdgrade) = &showResourceInfo($symb,$probTitle);
$result.=$table;
my (undef,$sections) = &getclasslist('all','0');
my $savedState = &savedState();
@@ -4891,7 +5823,6 @@ GRADINGMENUJS
$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="handgrade" value="'.$hdgrade.'" />'."\n".
'<input type="hidden" name="probTitle" value="'.$probTitle.'" />'."\n".
'<input type="hidden" name="command" value="" />'."\n".
@@ -4899,12 +5830,12 @@ GRADINGMENUJS
'<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 colspan="2">'."\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" valign="top"><td>'."\n";
- $result.='<table width="100%" border=0>';
+ $result.='<table width="100%" border="0">';
$result.='<tr bgcolor="#ffffe6" valign="top"><td>'."\n".
' '.&mt('Select Section').': <select name="section">'."\n";
if (ref($sections)) {
@@ -4913,34 +5844,36 @@ GRADINGMENUJS
($saveSec eq $_ ? 'selected="on"':'').'>'.$_.'</option>'."\n";
}
}
- $result.= '<option value="all" '.($saveSec eq 'all' ? 'selected="on"' : ''). '>all</select> ';
+ $result.= '<option value="all" '.($saveSec eq 'all' ? 'selected="on"' : ''). '>all</option></select> ';
$result.=&mt('Student Status').':</b>'.&Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,1,undef);
$result.='</td></tr>';
- $result.='<tr bgcolor="#ffffe6"valign="top"><td>'.
+ $result.='<tr bgcolor="#ffffe6"valign="top"><td><label>'.
'<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">'.
+ ($saveCmd eq 'submission' ? 'checked' : '').' /> '.'<b>'.&mt('Current Resource').':</b> '.&mt('For one or more students').
+ '</label> <select name="submitonly">'.
'<option value="yes" '.
- ($saveSub eq 'yes' ? 'selected="on"' : '').'>with submissions</option>'.
+ ($saveSub eq 'yes' ? 'selected="on"' : '').' />'.&mt('with submissions').'</option>'.
+ '<option value="queued" '.
+ ($saveSub eq 'queued' ? 'selected="on"' : '').' />'.&mt('in grading queue').'</option>'.
'<option value="graded" '.
- ($saveSub eq 'graded' ? 'selected="on"' : '').'>with ungraded submissions</option>'.
+ ($saveSub eq 'graded' ? 'selected="on"' : '').' />'.&mt('with ungraded submissions').'</option>'.
'<option value="incorrect" '.
- ($saveSub eq 'incorrect' ? 'selected="on"' : '').'>with incorrect submissions</option>'.
+ ($saveSub eq 'incorrect' ? 'selected="on"' : '').' />'.&mt('with incorrect submissions').'</option>'.
'<option value="all" '.
- ($saveSub eq 'all' ? 'selected="on"' : '').'>with any status</option></select></td></tr>'."\n";
+ ($saveSub eq 'all' ? 'selected="on"' : '').' />'.&mt('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' : '').'> '.
- '<b>Current Resource:</b> For all students in selected section or course</td></tr>'."\n";
+ '<label><input type="radio" name="radioChoice" value="viewgrades" '.
+ ($saveCmd eq 'viewgrades' ? 'checked' : '').' /> '.
+ '<b>Current Resource:</b> For all students in selected section or course</label></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";
+ '<label><input type="radio" name="radioChoice" value="pickStudentPage" '.
+ ($saveCmd eq 'pickStudentPage' ? 'checked' : '').' /> '.
+ 'The <b>complete</b> set/page/sequence: For one student</label></td></tr>'."\n";
$result.='<tr bgcolor="#ffffe6"><td><br />'.
'<input type="button" onClick="javascript:checkChoice(this.form,\'2\');" value="Next->" />'.
@@ -4948,7 +5881,7 @@ GRADINGMENUJS
$result.='</td><td valign="top">';
- $result.='<table width="100%" border=0>';
+ $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";
@@ -4957,14 +5890,20 @@ GRADINGMENUJS
'<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)) {
+ if ((&Apache::lonnet::allowed('mgr',$env{'request.course.id'})) && ($symb)) {
$result.='<tr bgcolor="#ffffe6"valign="top"><td>'.
'<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\')">'.
+ &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">'.
+ '<input type="button" onClick="javascript:this.form.action=\'/adm/helper/resettimes.helper\';this.form.submit();'.
+ '" value="'.&mt('Manage').'" /> access times.</td></tr>'."\n";
+ $result.='<tr bgcolor="#ffffe6"valign="top"><td colspan="2">'.
+ '<input type="button" onClick="javascript:this.form.command.value=\'codelist\';this.form.action=\'/adm/pickcode\';this.form.submit();'.
+ '" value="'.&mt('View').'" /> saved CODEs.</td></tr>'."\n";
$result.='</form></td></tr></table>'."\n".
'</td></tr></table>'."\n".
@@ -4972,11 +5911,33 @@ GRADINGMENUJS
return $result;
}
+sub reset_perm {
+ undef(%perm);
+}
+
+sub init_perm {
+ &reset_perm();
+ foreach my $test_perm ('vgr','mgr','opa') {
+
+ my $scope = $env{'request.course.id'};
+ if (!($perm{$test_perm}=&Apache::lonnet::allowed($test_perm,$scope))) {
+
+ $scope .= '/'.$env{'request.course.sec'};
+ if ( $perm{$test_perm}=
+ &Apache::lonnet::allowed($test_perm,$scope)) {
+ $perm{$test_perm.'_section'}=$env{'request.course.sec'};
+ } else {
+ delete($perm{$test_perm});
+ }
+ }
+ }
+}
+
sub handler {
my $request=$_[0];
- undef(%perm);
- if ($ENV{'browser.mathml'}) {
+ &reset_perm();
+ if ($env{'browser.mathml'}) {
&Apache::loncommon::content_type($request,'text/xml');
} else {
&Apache::loncommon::content_type($request,'text/html');
@@ -4984,25 +5945,19 @@ sub handler {
$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 $symb=&get_symb($request,1);
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'})=&Apache::lonnet::decode_symb($symb);
- $url = $ENV{'form.url'};
- }
- &send_header($request);
- if ($url eq '' && $symb eq '' && $command eq '') {
- if ($ENV{'user.adv'}) {
- if (($ENV{'form.codeone'}) && ($ENV{'form.codetwo'}) &&
- ($ENV{'form.codethree'})) {
- my $token=$ENV{'form.codeone'}.'*'.$ENV{'form.codetwo'}.'*'.
- $ENV{'form.codethree'};
+ $request->print(&Apache::loncommon::start_page('Grading'));
+ if ($symb eq '' && $command eq '') {
+ if ($env{'user.adv'}) {
+ if (($env{'form.codeone'}) && ($env{'form.codetwo'}) &&
+ ($env{'form.codethree'})) {
+ my $token=$env{'form.codeone'}.'*'.$env{'form.codetwo'}.'*'.
+ $env{'form.codethree'};
my ($tsymb,$tuname,$tudom,$tcrsid)=
&Apache::lonnet::checkin($token);
if ($tsymb) {
@@ -5024,22 +5979,9 @@ sub handler {
}
}
} else {
- if (!($perm{'vgr'}=&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'}))) {
- if ($perm{'vgr'}=&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'}.'/'.$ENV{'request.course.sec'})) {
- $perm{'vgr_section'}=$ENV{'request.course.sec'};
- } else {
- delete($perm{'vgr'});
- }
- }
- if (!($perm{'mgr'}=&Apache::lonnet::allowed('mgr',$ENV{'request.course.id'}))) {
- if ($perm{'mgr'}=&Apache::lonnet::allowed('mgr',$ENV{'request.course.id'}.'/'.$ENV{'request.course.sec'})) {
- $perm{'mgr_section'}=$ENV{'request.course.sec'};
- } else {
- delete($perm{'mgr'});
- }
- }
+ &init_perm();
if ($command eq 'submission' && $perm{'vgr'}) {
- ($ENV{'form.student'} eq '' ? &listStudents($request) : &submission($request,0,0));
+ ($env{'form.student'} eq '' ? &listStudents($request) : &submission($request,0,0));
} elsif ($command eq 'pickStudentPage' && $perm{'vgr'}) {
&pickStudentPage($request);
} elsif ($command eq 'displayPage' && $perm{'vgr'}) {
@@ -5064,17 +6006,19 @@ sub handler {
$request->print(&csvupload($request));
} elsif ($command eq 'csvuploadmap' && $perm{'mgr'} ) {
$request->print(&csvuploadmap($request));
- } elsif ($command eq 'csvuploadassign' && $perm{'mgr'}) {
- if ($ENV{'form.associate'} ne 'Reverse Association') {
- $request->print(&csvuploadassign($request));
+ } elsif ($command eq 'csvuploadoptions' && $perm{'mgr'}) {
+ if ($env{'form.associate'} ne 'Reverse Association') {
+ $request->print(&csvuploadoptions($request));
} else {
- if ( $ENV{'form.upfile_associate'} ne 'reverse' ) {
- $ENV{'form.upfile_associate'} = 'reverse';
+ if ( $env{'form.upfile_associate'} ne 'reverse' ) {
+ $env{'form.upfile_associate'} = 'reverse';
} else {
- $ENV{'form.upfile_associate'} = 'forward';
+ $env{'form.upfile_associate'} = 'forward';
}
$request->print(&csvuploadmap($request));
}
+ } elsif ($command eq 'csvuploadassign' && $perm{'mgr'} ) {
+ $request->print(&csvuploadassign($request));
} elsif ($command eq 'scantron_selectphase' && $perm{'mgr'}) {
$request->print(&scantron_selectphase($request));
} elsif ($command eq 'scantron_warning' && $perm{'mgr'}) {
@@ -5084,41 +6028,24 @@ sub handler {
} 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'}))) {
+ (&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'}))) {
+ (&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'})) {
+ &Apache::lonnet::allowed('usc',$env{'request.course.id'})) {
$request->print(&scantron_download_scantron_data($request));
} elsif ($command) {
$request->print("Access Denied ($command)");
}
}
- &send_footer($request);
+ $request->print(&Apache::loncommon::end_page());
return '';
}
-sub send_header {
- my ($request)= @_;
- $request->print(&Apache::lontexconvert::header());
-# $request->print("
-#<script>
-#remotewindow=open('','homeworkremote');
-#remotewindow.close();
-#</script>");
- $request->print(&Apache::loncommon::bodytag('Grading'));
- $request->rflush();
-}
-
-sub send_footer {
- my ($request)= @_;
- $request->print('</body></html>');
-}
-
1;
__END__;