--- loncom/homework/grades.pm 2006/01/25 22:58:26 1.302.2.1
+++ loncom/homework/grades.pm 2006/05/30 12:45:36 1.359
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# The LON-CAPA Grading handler
#
-# $Id: grades.pm,v 1.302.2.1 2006/01/25 22:58:26 albertel Exp $
+# $Id: grades.pm,v 1.359 2006/05/30 12:45:36 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -40,6 +40,10 @@ use Apache::lonmsg qw(:user_normal_msg);
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,7 +83,7 @@ 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)));
@@ -88,7 +93,7 @@ sub get_symb_and_url {
return ();
}
}
- return ($symb,$url);
+ return ($symb);
}
#--- Format fullname, username:domain if different for display
@@ -106,8 +111,8 @@ sub nameUserString {
#--- 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>)";
@@ -156,13 +158,13 @@ sub get_display_part {
#--- 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;
@@ -180,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>';
@@ -207,9 +209,11 @@ sub get_order {
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);
@@ -290,6 +294,37 @@ sub cleanRecord {
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;
}
@@ -429,7 +464,7 @@ sub canview {
#--- Retrieve the grade status of a student for all the parts
sub student_gradeStatus {
- my ($url,$symb,$udom,$uname,$partlist) = @_;
+ my ($symb,$udom,$uname,$partlist) = @_;
my %record = &Apache::lonnet::restore($symb,$env{'request.course.id'},$udom,$uname);
my %partstatus = ();
foreach (@$partlist) {
@@ -446,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".
@@ -456,7 +491,6 @@ 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".
@@ -467,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 --------------------
#
@@ -528,15 +589,11 @@ sub verifyreceipt {
my $receipt = &Apache::lonnet::recprefix($courseid).'-'.
$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');
@@ -544,7 +601,7 @@ sub verifyreceipt {
my $receiptparts=0;
if ($env{"course.$courseid.receiptalg"} eq 'receipt2') { $receiptparts=1; }
my $parts=['0'];
- if ($receiptparts) { ($parts)=&response_type($url,$symb); }
+ if ($receiptparts) { ($parts)=&response_type($symb); }
foreach (sort
{
if (lc($$fullname{$a}) ne lc($$fullname{$b})) {
@@ -572,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".
@@ -586,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.
@@ -596,7 +653,7 @@ sub verifyreceipt {
sub listStudents {
my ($request) = shift;
- my ($symb,$url) = &get_symb_and_url($request);
+ 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'};
@@ -609,7 +666,7 @@ sub listStudents {
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">
@@ -668,14 +725,20 @@ LISTJAVASCRIPT
$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>'."\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>'.
+
'<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="symb" value="'.$symb.'" />'."\n".
'<input type="hidden" name="saveStatusOld" value="'.$saveStatus.'" />'."\n";
@@ -708,7 +771,7 @@ LISTJAVASCRIPT
&& $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>';
}
@@ -744,7 +807,7 @@ LISTJAVASCRIPT
if ($env{'form.showgrading'} eq 'yes'
&& $submitonly ne 'queued'
&& $submitonly ne 'all') {
- (%status) =&student_gradeStatus($url,$symb,$udom,$uname,$partlist);
+ (%status) =&student_gradeStatus($symb,$udom,$uname,$partlist);
my $submitted = 0;
my $graded = 0;
my $incorrect = 0;
@@ -826,7 +889,7 @@ 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 '';
}
@@ -1082,6 +1145,81 @@ 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);
@@ -1197,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\\">");
@@ -1280,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();
}
@@ -1328,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\\">");
@@ -1373,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();
}
@@ -1383,45 +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) {
+ 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."</label></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" '.
@@ -1430,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') {
@@ -1451,12 +1530,45 @@ sub gradeBox {
'<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="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'});
@@ -1468,6 +1580,7 @@ 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'});
}
@@ -1504,20 +1617,19 @@ 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 $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));
+ $request->print(&show_grading_menu_form($symb));
return;
}
@@ -1555,6 +1667,7 @@ sub submission {
} elsif ($env{'form.vAns'} eq 'yes') {
$mode='answer';
}
+ &Apache::lonxml::clear_problem_counter();
$request->print(&show_problem($request,$symb,$uname,$udom,0,1,$mode));
}
@@ -1577,7 +1690,7 @@ sub submission {
}
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".
@@ -1587,14 +1700,13 @@ sub submission {
'<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="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') {
@@ -1636,9 +1748,9 @@ 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);
}
@@ -1654,16 +1766,17 @@ KEYWORDS
} 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 ($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.='<input type="hidden" name="name'.$counter.
@@ -1744,7 +1857,7 @@ KEYWORDS
my %seenparts;
for my $part (sort keys(%$handgrade)) {
my ($partid,$respid) = split(/_/,$part);
- my $display_part=&get_display_part($partid,$url,$symb);
+ my $display_part=&get_display_part($partid,$symb);
if ($env{"form.$uname:$udom:$partid:submitted_by"}) {
if (exists($seenparts{$partid})) { next; }
$seenparts{$partid}=1;
@@ -1788,28 +1901,18 @@ KEYWORDS
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 />';
}
@@ -1824,7 +1927,7 @@ 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);
+ my (undef,$responseType,undef,$parts) = &showResourceInfo($symb);
$request->print(&displaySubByDates($symb,\%record,$parts,$responseType,$checkIcon,$uname,$udom));
} elsif ($env{'form.lastSub'} =~ /^(last|all)$/) {
$request->print(&Apache::loncommon::get_previous_attempt($symb,$uname,$udom,
@@ -1844,7 +1947,7 @@ KEYWORDS
$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)
+ $toGrade.='</form>'.&show_grading_menu_form($symb);
}
$request->print($toGrade);
return;
@@ -1865,8 +1968,8 @@ KEYWORDS
'<input type="hidden" name="newmsg'.$counter.'" value="" />'."\n";
$result.=' <a href="javascript:msgCenter(document.SCORE,'.$counter.
',\''.$msgfor.'\')"; TARGET=_self>'.
- &mt('Compose message to student').(scalar(@col_fullnames) >= 1 ? 's' : '').'</a> ('.
- &mt('incl. grades').' <input type="checkbox" name="withgrades'.$counter.'" />)'.
+ &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 /> ('.
@@ -1887,14 +1990,13 @@ KEYWORDS
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.
@@ -1927,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 '';
@@ -1976,8 +2080,8 @@ sub keywords_highlight {
#--- Called from submission routine
sub processHandGrade {
my ($request) = shift;
- my $url = $env{'form.url'};
- my $symb = $env{'form.symb'};
+ 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'};
@@ -1988,7 +2092,7 @@ sub processHandGrade {
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 ($errorflag,$pts,$wgt) = &saveHandGrade($request,$symb,$uname,$udom,$ctr);
if ($errorflag eq 'no_score') {
$ctr++;
next;
@@ -2014,9 +2118,9 @@ sub processHandGrade {
&Apache::lonnet::clutter($url).
"?symb=$symb\">$env{'form.probTitle'}</a>";
}
- $msgstatus = &Apache::lonmsg::user_normal_msg ($uname,$udom,
- $subject.' ['.
- &Apache::lonnet::declutter($url).']',$message);
+ $msgstatus = &Apache::lonmsg::user_normal_msg($uname,$udom,
+ $subject.' ['.
+ &Apache::lonnet::declutter($url).']',$message);
$request->print('<br />'.&mt('Sending message to [_1]@[_2]',$uname,$udom).': '.
$msgstatus);
}
@@ -2024,18 +2128,17 @@ sub processHandGrade {
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,
+ &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("<font color=\"red\">Not allowed to modify grades for $collaborator:$udom</font>");
next;
} else {
if ($message ne '') {
- $msgstatus = &Apache::lonmsg::user_normal_msg($_,$udom,$env{'form.msgsub'},$message);
+ $msgstatus = &Apache::lonmsg::user_normal_msg($collaborator,$udom,$env{'form.msgsub'},$message);
}
-
}
}
}
@@ -2105,7 +2208,7 @@ 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);
+ (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};
@@ -2143,7 +2246,7 @@ 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 ($uname,$udom) = split(/:/,$student);
@@ -2157,7 +2260,7 @@ sub processHandGrade {
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 %status=&student_gradeStatus($symb,$udom,$uname,$partlist);
my $submitted = 0;
my $ungraded = 0;
my $incorrect = 0;
@@ -2196,7 +2299,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 '';
@@ -2204,21 +2307,20 @@ sub processHandGrade {
#---- Save the score and award for each student, if changed
sub saveHandGrade {
- my ($request,$url,$symb,$stuname,$domain,$newflg,$submitter,$part) = @_;
- my @v_flag;
+ my ($request,$symb,$stuname,$domain,$newflg,$submitter,$part) = @_;
+ my @version_parts;
my $usec = &Apache::lonnet::getsection($domain,$stuname,
$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) = ('','');
my %aggregate = ();
my $aggregateflag = 0;
-
my @parts = split(/:/,$env{'form.partlist'.$newflg});
foreach my $new_part (@parts) {
- #collaborator may vary for different 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') {
@@ -2248,7 +2350,7 @@ sub saveHandGrade {
my $solvedstatus = $record{'resource.'.$new_part.'.solved'};
if ($aggtries > 0) {
- &decrement($symb,$new_part,\%aggregate,$aggtries,$totaltries,$solvedstatus);
+ &decrement_aggs($symb,$new_part,\%aggregate,$aggtries,$totaltries,$solvedstatus);
$aggregateflag = 1;
}
} elsif ($dropMenu eq '') {
@@ -2263,6 +2365,7 @@ sub saveHandGrade {
my $partial= $pts/$wgt;
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;
@@ -2286,22 +2389,26 @@ sub saveHandGrade {
}
$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') {
- push (@v_flag,$new_part);
+ 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 (scalar(keys(%newrecord)) > 0) {
- if (scalar(@v_flag)) {
- &version_portfiles(\%record, \@parts_graded, $env{'request.course.id'}, $symb, $domain, $stuname, \@v_flag);
+ 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);
-
my @ungraded_parts;
foreach my $part (@parts) {
if ( !defined($record{'resource.'.$part.'.awarded'})
@@ -2321,6 +2428,69 @@ sub saveHandGrade {
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 {
+ 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 $msgstatus = &Apache::lonmsg::user_normal_msg($stuname,$domain,
+ $subject.' [File Returned]',$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) = @_;
@@ -2382,61 +2552,77 @@ sub get_last_resets {
# ----------- Handles creating versions for portfolio files as answers
sub version_portfiles {
- my ($record, $parts_graded, $courseid, $symb, $domain, $stuname, $v_flag) = @_;
+ 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 = &Apache::loncommon::propath($domain,
- $stuname).
- '/userfiles/portfolio';
+ 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 @v_portfiles;
+ my @versioned_portfiles;
my @portfiles = split(/,/,$$record{$key});
- &Apache::lonnet::logthis("should be unmarking and remarking $key",@portfiles);
foreach my $file (@portfiles) {
- &Apache::lonnet::unmark_as_readonly($domain,$stuname,[$symb,$env{'request.course.id'}],$file);
+ &Apache::lonnet::unmark_as_readonly($domain,$stu_name,[$symb,$env{'request.course.id'}],$file);
my ($directory,$answer_file) =($file =~ /^(.*?)([^\/]*)$/);
- my $version = 0;
my ($answer_name,$answer_ver,$answer_ext) =
&file_name_version_ext($answer_file);
- my @dir_list = &Apache::lonnet::dirlist($directory,$domain,$stuname,$portfolio_root);
- 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++;
- $env{'form.copy'} = &Apache::lonnet::getfile("/uploaded/$domain/$stuname/portfolio$directory$answer_file");
- if($env{'form.copy'} eq '-1') {
- &Apache::lonnet::logthis('problem getting file '.$directory.$answer_file);
- } else {
- my $new_answer = $answer_name.'.'.$version.'.'.$answer_ext;
- my $copy_result = &Apache::lonnet::finishuserfileupload(
- $stuname,$domain,'copy',
- '/portfolio'.$directory.$new_answer);
- push(@v_portfiles, $directory.$new_answer);
- &Apache::lonnet::mark_as_readonly($domain,$stuname,
- ['/portfolio'.$directory.$new_answer],
- [$symb,$env{'request.course.id'},'graded']);
+ 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(',',@v_portfiles);
+ $$record{$key} = join(',',@versioned_portfiles);
+ push(@returned_keys,$key);
}
}
- return 'ok';
-
+ 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 {
@@ -2634,7 +2820,7 @@ 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(
@@ -2646,12 +2832,11 @@ sub viewgrades {
$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".
@@ -2671,7 +2856,7 @@ sub viewgrades {
'<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">';
@@ -2688,7 +2873,7 @@ 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;
@@ -2724,7 +2909,8 @@ 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');
@@ -2732,7 +2918,7 @@ sub viewgrades {
if (!$display) { $display = &Apache::lonnet::metadata($url,$part.'.name'); }
my ($partid) = &split_part_type($part);
push(@partids, $partid);
- my $display_part=&get_display_part($partid,$url,$symb);
+ 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";
@@ -2760,7 +2946,7 @@ sub viewgrades {
return $a cmp $b;
} (keys(%$fullname))) {
$ctr++;
- $result.=&viewstudentgrade($url,$symb,$env{'request.course.id'},
+ $result.=&viewstudentgrade($symb,$env{'request.course.id'},
$_,$$fullname{$_},\@parts,\%weight,$ctr,\%last_resets);
}
$result.='</table></td></tr></table>';
@@ -2772,13 +2958,13 @@ sub viewgrades {
$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,$last_resets) = @_;
+ my ($symb,$courseid,$student,$fullname,$parts,$weight,$ctr,$last_resets) = @_;
my ($uname,$udom) = split(/:/,$student);
my %record=&Apache::lonnet::restore($symb,$courseid,$udom,$uname);
my %aggregates = ();
@@ -2809,7 +2995,7 @@ sub viewstudentgrade {
$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="'.
@@ -2846,8 +3032,7 @@ 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";
@@ -2871,7 +3056,7 @@ sub editgrades {
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};
@@ -2879,6 +3064,7 @@ sub editgrades {
$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>';
@@ -2896,7 +3082,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>';
@@ -3036,7 +3222,7 @@ 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 />';
@@ -3139,7 +3325,7 @@ ENDPICK
}
sub csvuploadmap_header {
- my ($request,$symb,$url,$datatoken,$distotal)= @_;
+ my ($request,$symb,$datatoken,$distotal)= @_;
my $javascript;
if ($env{'form.upfile_associate'} eq 'reverse') {
$javascript=&csvupload_javascript_reverse_associate();
@@ -3147,14 +3333,14 @@ sub csvuploadmap_header {
$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
@@ -3169,7 +3355,6 @@ to this page if the data selected is ins
<input type="hidden" name="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="csvuploadoptions" />
@@ -3183,11 +3368,12 @@ ENDPICK
}
sub csvupload_fields {
- my ($url,$symb) = @_;
- my (@parts) = &getpartlist($url,$symb);
+ 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');
@@ -3230,14 +3416,14 @@ CSVFORMJS
sub upcsvScores_form {
my ($request) = shift;
- my ($symb,$url)=&get_symb_and_url($request);
+ my ($symb)=&get_symb($request);
if (!$symb) {return '';}
my $result=&checkforfile_js();
$env{'form.probTitle'} = &Apache::lonnet::gettitle($symb);
- my ($table) = &showResourceInfo($url,$env{'form.probTitle'});
+ 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";
@@ -3246,7 +3432,6 @@ sub upcsvScores_form {
$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'}" />
@@ -3257,14 +3442,14 @@ $upfile_select
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;
@@ -3276,10 +3461,10 @@ sub csvuploadmap {
}
my @records=&Apache::loncommon::upfile_record_sep();
if ($env{'form.noFirstLine'}) { shift(@records); }
- &csvuploadmap_header($request,$symb,$url,$datatoken,$#records+1);
+ &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') {
&Apache::loncommon::csv_print_samples($request,\@records);
@@ -3291,19 +3476,24 @@ 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 csvuploadoptions {
my ($request)= @_;
- my ($symb,$url)=&get_symb_and_url($request);
+ my ($symb)=&get_symb($request);
my $checked=(($env{'form.noFirstLine'})?'1':'0');
my $ignore=&mt('Ignore First Line');
$request->print(<<ENDPICK);
@@ -3341,7 +3531,7 @@ ENDPICK
# 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,$url));
+ $request->print(&show_grading_menu_form($symb));
return '';
}
@@ -3364,8 +3554,9 @@ sub get_fields {
sub csvuploadassign {
my ($request)= @_;
- my ($symb,$url)=&get_symb_and_url($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); }
@@ -3418,12 +3609,20 @@ sub csvuploadassign {
my $part=$1;
my $wgt =&Apache::lonnet::EXT('resource.'.$part.'.weight',
$symb,$domain,$username);
- $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;
+ 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;} }
@@ -3454,7 +3653,7 @@ sub csvuploadassign {
}
$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) {
@@ -3462,8 +3661,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 ---------
#
@@ -3492,7 +3691,7 @@ function checkPickOne(formname) {
</script>
LISTJAVASCRIPT
&commonJSfunctions($request);
- my ($symb,$url) = &get_symb_and_url($request);
+ 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'};
@@ -3514,7 +3713,7 @@ LISTJAVASCRIPT
'>'.$showtitle.'</option>'."\n";
$ctr++;
}
- $result.= '</select>'."<br>\n";
+ $result.= '</select>'."<br />\n";
$ctr=0;
foreach (@$titles) {
my ($minder,$showtitle) = ($_ =~ /(\d+)\.(.*)/);
@@ -3536,7 +3735,6 @@ LISTJAVASCRIPT
$result.='<input type="hidden" name="section" value="'.$getsec.'" />'."\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";
@@ -3545,7 +3743,7 @@ LISTJAVASCRIPT
$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>'.
@@ -3575,7 +3773,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 '';
@@ -3608,7 +3806,7 @@ sub getSymbMap {
sub displayPage {
my ($request) = shift;
- my ($symb,$url) = &get_symb_and_url($request);
+ 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'};
@@ -3626,7 +3824,7 @@ sub displayPage {
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(&show_grading_menu_form($symb));
return;
}
my $result='<h3><font color="#339933"> '.$env{'form.title'}.'</font></h3>';
@@ -3640,7 +3838,7 @@ sub displayPage {
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,$url));
+ $request->print(&show_grading_menu_form($symb));
return;
}
my $iterator = $navmap->getIterator($map->map_start(),
@@ -3652,7 +3850,6 @@ sub displayPage {
'<input type="hidden" name="student" value="'.$env{'form.student'}.'" />'."\n".
'<input type="hidden" name="page" value="'.$pageTitle.'" />'."\n".
'<input type="hidden" name="title" value="'.$env{'form.title'}.'" />'."\n".
- '<input type="hidden" name="url" value="'.$url.'" />'."\n".
'<input type="hidden" name="symb" value="'.$symb.'" />'."\n".
'<input type="hidden" name="overRideScore" value="no" />'."\n".
'<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."\n";
@@ -3667,6 +3864,7 @@ sub displayPage {
'<td align="center"><b> Prob. </b></td>'.
'<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"
@@ -3679,7 +3877,7 @@ sub displayPage {
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' ) {
$studentTable.=&show_problem($request,$symbx,$uname,$udom,1,
@@ -3690,10 +3888,10 @@ sub displayPage {
$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);
@@ -3740,7 +3938,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 '';
@@ -3749,6 +3947,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">'.
@@ -3763,8 +3962,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>';
@@ -3772,40 +3980,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.')';
}
}
@@ -3836,7 +4061,7 @@ sub updateGradeByPage {
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(&show_grading_menu_form($env{'form.symb'}));
return;
}
my $result='<h3><font color="#339933"> '.$env{'form.title'}.'</font></h3>';
@@ -3850,8 +4075,8 @@ sub updateGradeByPage {
my $map = $navmap->getResourceByUrl($resUrl); # add to navmaps
if (!$map) {
$request->print('<font color="red">Unable to grade requested sequence. ('.$resUrl.')</font>');
- my ($symb,$url)=&get_symb_and_url($request);
- $request->print(&show_grading_menu_form($symb,$url));
+ my ($symb)=&get_symb($request);
+ $request->print(&show_grading_menu_form($symb));
return;
}
my $iterator = $navmap->getIterator($map->map_start(),
@@ -3876,7 +4101,7 @@ 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=();
@@ -3918,15 +4143,14 @@ sub updateGradeByPage {
$aggregateflag = 1;
}
}
- my $display_part=&get_display_part($partid,undef,
- $curRes->symb());
+ 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'));
@@ -3958,7 +4182,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.'));
@@ -3976,10 +4200,9 @@ 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";
}
@@ -4005,7 +4228,7 @@ sub scantron_filenames {
my $cdom=$env{'course.'.$env{'request.course.id'}.'.domain'};
my $cname=$env{'course.'.$env{'request.course.id'}.'.num'};
my @files=&Apache::lonnet::dirlist('userfiles',$cdom,$cname,
- &Apache::loncommon::propath($cdom,$cname));
+ &propath($cdom,$cname));
my @possiblenames;
foreach my $filename (sort(@files)) {
($filename)=split(/&/,$filename);
@@ -4058,22 +4281,22 @@ sub scantron_CODElist {
sub scantron_CODEunique {
my $result='<nobr>
<label><input type="radio" name="scantron_CODEunique"
- value="Yes" checked="on" /> Yes </label>
+ value="yes" checked="checked" /> Yes </label>
</nobr>
<nobr>
<label><input type="radio" name="scantron_CODEunique"
- value="No" /> No </label>
+ 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();
@@ -4113,7 +4336,8 @@ sub scantron_selectphase {
<td> Options: </td>
<td>
<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>
+ <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">
@@ -4144,7 +4368,7 @@ SCANTRONFORM
<tr bgcolor="#ffffe6">
<td>
SCANTRONFORM
- my $default_form_data=&defaultFormData(&get_symb_and_url($r,1));
+ 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);
@@ -4442,8 +4666,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;
@@ -4538,7 +4769,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);
}
@@ -4585,9 +4815,9 @@ 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);
if ( $env{'form.selectpage'} eq '' ||
$env{'form.scantron_selectfile'} eq '' ||
@@ -4610,7 +4840,7 @@ $warning
<input type="hidden" name="command" value="scantron_validate" />
STUFF
}
- $r->print("</form><br />".&show_grading_menu_form($symb,$url)."</body></html>");
+ $r->print("</form><br />".&show_grading_menu_form($symb));
return '';
}
@@ -4626,15 +4856,16 @@ sub scantron_form_start {
<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
@@ -4660,11 +4891,12 @@ sub scantron_validate_file {
$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');
@@ -4697,13 +4929,19 @@ 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 '';
}
@@ -4833,6 +5071,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) = @_;
@@ -4903,7 +5180,7 @@ 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 {
@@ -4979,13 +5256,15 @@ 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("<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 />");
+ "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') {
@@ -5159,28 +5438,29 @@ sub scantron_validate_doublebubble {
return (0,$currentphase+1);
}
-sub scantron_get_maxbubble {
- my ($r)=@_;
+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'});
+
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().'?symb='.&Apache::lonnet::escape($resource->symb()));
+ 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;
+ $env{'form.scantron_maxbubble'} =
+ &Apache::lonxml::get_problem_counter()-1;
+
return $env{'form.scantron_maxbubble'};
}
@@ -5219,9 +5499,9 @@ 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 ($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 ($scanlines,$scan_data)=&scantron_getfile();
@@ -5274,7 +5554,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;
@@ -5302,7 +5583,7 @@ SCANTRONFORM
$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);
@@ -5310,7 +5591,7 @@ 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 '';
}
@@ -5322,7 +5603,7 @@ sub scantron_upload_scantron_data {
'coursename');
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) {
@@ -5352,7 +5633,7 @@ 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".
@@ -5363,7 +5644,7 @@ sub scantron_upload_scantron_data_save {
$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);
}
@@ -5408,7 +5689,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;
@@ -5416,7 +5696,7 @@ sub valid_file {
sub scantron_download_scantron_data {
my ($r)=@_;
- my $default_form_data=&defaultFormData(&get_symb_and_url($r,1));
+ 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'};
@@ -5426,7 +5706,7 @@ sub scantron_download_scantron_data {
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;
@@ -5446,7 +5726,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 '';
}
@@ -5458,10 +5738,9 @@ DOWNLOAD
#
#--- 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="command" value="gradingmenu" />'."\n".
'<input type="submit" name="submit" value="Grading Menu" />'."\n".
@@ -5484,7 +5763,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);
@@ -5526,7 +5805,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();
@@ -5537,7 +5816,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".
@@ -5545,12 +5823,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)) {
@@ -5567,27 +5845,27 @@ GRADINGMENUJS
$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').
+ ($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"' : '').'>'.&mt('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>'.
+ ($saveSub eq 'queued' ? 'selected="on"' : '').' />'.&mt('in grading queue').'</option>'.
'<option value="graded" '.
- ($saveSub eq 'graded' ? 'selected="on"' : '').'>'.&mt('with ungraded submissions').'</option>'.
+ ($saveSub eq 'graded' ? 'selected="on"' : '').' />'.&mt('with ungraded submissions').'</option>'.
'<option value="incorrect" '.
- ($saveSub eq 'incorrect' ? 'selected="on"' : '').'>'.&mt('with incorrect submissions').'</option>'.
+ ($saveSub eq 'incorrect' ? 'selected="on"' : '').' />'.&mt('with incorrect submissions').'</option>'.
'<option value="all" '.
- ($saveSub eq 'all' ? 'selected="on"' : '').'>'.&mt('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>'.
'<label><input type="radio" name="radioChoice" value="viewgrades" '.
- ($saveCmd eq 'viewgrades' ? 'checked' : '').'> '.
+ ($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>'.
'<label><input type="radio" name="radioChoice" value="pickStudentPage" '.
- ($saveCmd eq 'pickStudentPage' ? 'checked' : '').'> '.
+ ($saveCmd eq 'pickStudentPage' ? 'checked' : '').' /> '.
'The <b>complete</b> set/page/sequence: For one student</label></td></tr>'."\n";
$result.='<tr bgcolor="#ffffe6"><td><br />'.
@@ -5596,7 +5874,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";
@@ -5610,7 +5888,7 @@ GRADINGMENUJS
'<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\')">'.
+ '-<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">'.
@@ -5660,20 +5938,14 @@ 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 '') {
+ $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'})) {
@@ -5763,27 +6035,10 @@ sub handler {
$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__;