--- loncom/homework/grades.pm 2007/10/12 00:03:11 1.456
+++ loncom/homework/grades.pm 2007/10/26 00:39:09 1.467
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# The LON-CAPA Grading handler
#
-# $Id: grades.pm,v 1.456 2007/10/12 00:03:11 banghart Exp $
+# $Id: grades.pm,v 1.467 2007/10/26 00:39:09 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -57,9 +57,7 @@ my %first_bubble_line = (); # First bubb
sub save_bubble_lines {
- &Apache::lonnet::logthis("Saving bubble_lines...");
foreach my $line (keys(%bubble_lines_per_response)) {
- &Apache::lonnet::logthis("Saving form.scantron.bubblelines.$line value: $bubble_lines_per_response{$line}");
$env{"form.scantron.bubblelines.$line"} = $bubble_lines_per_response{$line};
$env{"form.scantron.first_bubble_line.$line"} =
$first_bubble_line{$line};
@@ -72,7 +70,6 @@ sub restore_bubble_lines {
%bubble_lines_per_response = ();
while ($env{"form.scantron.bubblelines.$line"}) {
my $value = $env{"form.scantron.bubblelines.$line"};
- &Apache::lonnet::logthis("Restoring form.scantron.bubblelines.$line value: $value");
$bubble_lines_per_response{$line} = $value;
$first_bubble_line{$line} =
$env{"form.scantron.first_bubble_line.$line"};
@@ -87,12 +84,14 @@ sub restore_bubble_lines {
sub get_response_bubbles {
my ($parsed_line, $response) = @_;
- my $bubble_line = $first_bubble_line{$response};
- my $bubble_lines= $bubble_lines_per_response{$response};
+
+ my $bubble_line = $first_bubble_line{$response-1} +1;
+ my $bubble_lines= $bubble_lines_per_response{$response-1};
+
my $selected = "";
for (my $bline = 0; $bline < $bubble_lines; $bline++) {
- $selected .= $$parsed_line{"scantron.$bubble_line.answer"};
+ $selected .= $$parsed_line{"scantron.$bubble_line.answer"}.":";
$bubble_line++;
}
return $selected;
@@ -333,8 +332,8 @@ sub cleanRecord {
$bottomrow.='<td>'.$grayFont.$foil.'</span> </td>';
}
return '<blockquote><table border="1">'.
- '<tr valign="top"><td>Answer</td>'.$toprow.'</tr>'.
- '<tr valign="top"><td>'.$grayFont.'Option ID</span></td>'.
+ '<tr valign="top"><td>'.&mt('Answer').'</td>'.$toprow.'</tr>'.
+ '<tr valign="top"><td>'.$grayFont.&mt('Option ID').'</span></td>'.
$grayFont.$bottomrow.'</tr>'.'</table></blockquote>';
} elsif ($response eq 'match') {
my %answer=&Apache::lonnet::str2hash($answer);
@@ -353,10 +352,10 @@ sub cleanRecord {
$bottomrow.='<td>'.$grayFont.$foil.'</span> </td>';
}
return '<blockquote><table border="1">'.
- '<tr valign="top"><td>Answer</td>'.$toprow.'</tr>'.
- '<tr valign="top"><td>'.$grayFont.'Item ID</span></td>'.
+ '<tr valign="top"><td>'.&mt('Answer').'</td>'.$toprow.'</tr>'.
+ '<tr valign="top"><td>'.$grayFont.&mt('Item ID').'</span></td>'.
$middlerow.'</tr>'.
- '<tr valign="top"><td>'.$grayFont.'Option ID</span></td>'.
+ '<tr valign="top"><td>'.$grayFont.&mt('Option ID').'</span></td>'.
$bottomrow.'</tr>'.'</table></blockquote>';
} elsif ($response eq 'radiobutton') {
my %answer=&Apache::lonnet::str2hash($answer);
@@ -366,18 +365,18 @@ sub cleanRecord {
foreach my $foil (@$order) {
if (exists($answer{$foil})) {
if ($foil eq $correct) {
- $toprow.='<td><b>true</b></td>';
+ $toprow.='<td><b>'.&mt('true').'</b></td>';
} else {
- $toprow.='<td><i>true</i></td>';
+ $toprow.='<td><i>'.&mt('true').'</i></td>';
}
} else {
- $toprow.='<td>false</td>';
+ $toprow.='<td>'.&mt('false').'</td>';
}
$bottomrow.='<td>'.$grayFont.$foil.'</span> </td>';
}
return '<blockquote><table border="1">'.
- '<tr valign="top"><td>Answer</td>'.$toprow.'</tr>'.
- '<tr valign="top"><td>'.$grayFont.'Option ID</span></td>'.
+ '<tr valign="top"><td>'.&mt('Answer').'</td>'.$toprow.'</tr>'.
+ '<tr valign="top"><td>'.$grayFont.&mt('Option ID').'</span></td>'.
$grayFont.$bottomrow.'</tr>'.'</table></blockquote>';
} elsif ($response eq 'essay') {
if (! exists ($env{'form.'.$symb})) {
@@ -1481,43 +1480,43 @@ INNERJS
pDoc.write("<form action=\\"inactive\\" name=\\"msgcenter\\">");
pDoc.write("<input value=\\""+usrctr+"\\" name=\\"usrctr\\" type=\\"hidden\\">");
- pDoc.write("<h3><span class=\\"LC_info\\"> Compose Message for \"+fullname+\"</span></h3><br /><br />");
+ pDoc.write("<h3><span class=\\"LC_info\\"> Compose Message for \"+fullname+\"<\\/span><\\/h3><br /><br />");
pDoc.write("<table border=0 width=100%><tr><td bgcolor=\\"#777777\\">");
pDoc.write("<table border=0 width=100%><tr bgcolor=\\"#ddffff\\">");
- pDoc.write("<td><b>Type</b></td><td><b>Include</b></td><td><b>Message</td></tr>");
+ pDoc.write("<td><b>Type<\\/b><\\/td><td><b>Include<\\/b><\\/td><td><b>Message<\\/td><\\/tr>");
}
function displaySubject(msg,shwsel) {
pDoc = pWin.document;
pDoc.write("<tr bgcolor=\\"#ffffdd\\">");
- pDoc.write("<td>Subject</td>");
- pDoc.write("<td align=\\"center\\"><input name=\\"subchk\\" type=\\"checkbox\\"" +shwsel+"></td>");
- pDoc.write("<td><input name=\\"msgsub\\" type=\\"text\\" value=\\""+msg+"\\"size=\\"60\\" maxlength=\\"80\\"></td></tr>");
+ pDoc.write("<td>Subject<\\/td>");
+ pDoc.write("<td align=\\"center\\"><input name=\\"subchk\\" type=\\"checkbox\\"" +shwsel+"><\\/td>");
+ pDoc.write("<td><input name=\\"msgsub\\" type=\\"text\\" value=\\""+msg+"\\"size=\\"60\\" maxlength=\\"80\\"><\\/td><\\/tr>");
}
function displaySavedMsg(ctr,msg,shwsel) {
pDoc = pWin.document;
pDoc.write("<tr bgcolor=\\"#ffffdd\\">");
- pDoc.write("<td align=\\"center\\">"+ctr+"</td>");
- pDoc.write("<td align=\\"center\\"><input name=\\"msgn"+ctr+"\\" type=\\"checkbox\\"" +shwsel+"></td>");
- pDoc.write("<td><textarea name=\\"msg"+ctr+"\\" cols=\\"60\\" rows=\\"3\\">"+msg+"</textarea></td></tr>");
+ pDoc.write("<td align=\\"center\\">"+ctr+"<\\/td>");
+ pDoc.write("<td align=\\"center\\"><input name=\\"msgn"+ctr+"\\" type=\\"checkbox\\"" +shwsel+"><\\/td>");
+ pDoc.write("<td><textarea name=\\"msg"+ctr+"\\" cols=\\"60\\" rows=\\"3\\">"+msg+"<\\/textarea><\\/td><\\/tr>");
}
function newMsg(newmsg,shwsel) {
pDoc = pWin.document;
pDoc.write("<tr bgcolor=\\"#ffffdd\\">");
- pDoc.write("<td align=\\"center\\">New</td>");
- pDoc.write("<td align=\\"center\\"><input name=\\"newmsgchk\\" type=\\"checkbox\\"" +shwsel+"></td>");
- pDoc.write("<td><textarea name=\\"newmsg\\" cols=\\"60\\" rows=\\"3\\" onchange=\\"javascript:this.form.newmsgchk.checked=true\\" >"+newmsg+"</textarea></td></tr>");
+ pDoc.write("<td align=\\"center\\">New<\\/td>");
+ pDoc.write("<td align=\\"center\\"><input name=\\"newmsgchk\\" type=\\"checkbox\\"" +shwsel+"><\\/td>");
+ pDoc.write("<td><textarea name=\\"newmsg\\" cols=\\"60\\" rows=\\"3\\" onchange=\\"javascript:this.form.newmsgchk.checked=true\\" >"+newmsg+"<\\/textarea><\\/td><\\/tr>");
}
function msgTail() {
pDoc = pWin.document;
- pDoc.write("</table>");
- pDoc.write("</td></tr></table> ");
+ 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("</form>");
+ pDoc.write("<\\/form>");
pDoc.write('$end_page_msg_central');
pDoc.close();
}
@@ -1566,32 +1565,32 @@ INNERJS
hDoc.$docopen;
hDoc.write('$start_page_highlight_central');
hDoc.write("<form action=\\"inactive\\" name=\\"hlCenter\\">");
- hDoc.write("<h3><span class=\\"LC_info\\"> Keyword Highlight Options</span></h3><br /><br />");
+ hDoc.write("<h3><span class=\\"LC_info\\"> Keyword Highlight Options<\\/span><\\/h3><br /><br />");
hDoc.write("<table border=0 width=100%><tr><td bgcolor=\\"#777777\\">");
hDoc.write("<table border=0 width=100%><tr bgcolor=\\"#ddffff\\">");
- hDoc.write("<td><b>Text Color</b></td><td><b>Font Size</b></td><td><b>Font Style</td></tr>");
+ hDoc.write("<td><b>Text Color<\\/b><\\/td><td><b>Font Size<\\/b><\\/td><td><b>Font Style<\\/td><\\/tr>");
}
function highlightbody(clrval,clrtxt,clrsel,szval,sztxt,szsel,syval,sytxt,sysel) {
var hDoc = hwdWin.document;
hDoc.write("<tr bgcolor=\\"#ffffdd\\">");
hDoc.write("<td align=\\"left\\">");
- hDoc.write("<input name=\\"kwdclr\\" type=\\"radio\\" value=\\""+clrval+"\\" "+clrsel+"> "+clrtxt+"</td>");
+ hDoc.write("<input name=\\"kwdclr\\" type=\\"radio\\" value=\\""+clrval+"\\" "+clrsel+"> "+clrtxt+"<\\/td>");
hDoc.write("<td align=\\"left\\">");
- hDoc.write("<input name=\\"kwdsize\\" type=\\"radio\\" value=\\""+szval+"\\" "+szsel+"> "+sztxt+"</td>");
+ hDoc.write("<input name=\\"kwdsize\\" type=\\"radio\\" value=\\""+szval+"\\" "+szsel+"> "+sztxt+"<\\/td>");
hDoc.write("<td align=\\"left\\">");
- hDoc.write("<input name=\\"kwdstyle\\" type=\\"radio\\" value=\\""+syval+"\\" "+sysel+"> "+sytxt+"</td>");
- hDoc.write("</tr>");
+ hDoc.write("<input name=\\"kwdstyle\\" type=\\"radio\\" value=\\""+syval+"\\" "+sysel+"> "+sytxt+"<\\/td>");
+ hDoc.write("<\\/tr>");
}
function highlightend() {
var hDoc = hwdWin.document;
- hDoc.write("</table>");
- hDoc.write("</td></tr></table> ");
+ 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("</form>");
+ hDoc.write("<\\/form>");
hDoc.write('$end_page_highlight_central');
hDoc.close();
}
@@ -1616,13 +1615,13 @@ sub gradeBox {
'" 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)' :
- '<span class="LC_info">problem weight assigned by computer</span>');
+ my $wgtmsg = ($wgt > 0) ? &mt('(problem weight)')
+ : '<span class="LC_info">'.&mt('problem weight assigned by computer').'</span>';
$wgt = ($wgt > 0 ? $wgt : '1');
my $score = ($$record{'resource.'.$partid.'.awarded'} eq '' ?
'' : &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,$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'};
@@ -1704,7 +1703,7 @@ sub handback_box {
'<span class="LC_filename">'.$file_disp.'</span>');
$result.='<input type="file" name="'.$prefix.'returndoc'.$file_counter.'" />'."\n";
$result.='<input type="hidden" name="'.$prefix.'origdoc'.$file_counter.'" value="'.$file.'" /><br />';
- $result.='(File will be uploaded when you click on Save & Next below.)<br />';
+ $result.='(File will be uploaded when you click on Save & Next below.)<br />';
$file_counter++;
}
}
@@ -1961,7 +1960,7 @@ KEYWORDS
# This is where output for one specific student would start
my $bgcolor='#DDEEDD';
- if (int($counter/2) eq $counter) { $bgcolor='#DDDDEE'; }
+ if ($counter%2) { $bgcolor='#DDDDEE'; }
$request->print("\n\n".
'<p><table border="2"><tr><th bgcolor="'.$bgcolor.'">'.$env{'form.fullname'}.'</th></tr><tr><td bgcolor="'.$bgcolor.'">');
@@ -1991,60 +1990,13 @@ KEYWORDS
'" value="'.$env{'form.fullname'}.'" />'."\n";
# If any part of the problem is an essay-response (handgraded), then check for collaborators
- my @col_fullnames;
- my ($classlist,$fullname);
+ my $fullname;
+ my $col_fullnames = [];
if ($env{'form.handgrade'} eq 'yes') {
- ($classlist,undef,$fullname) = &getclasslist('all','0');
- for (keys (%$handgrade)) {
- my $ncol = &Apache::lonnet::EXT('resource.'.$_.
- '.maxcollaborators',
- $symb,$udom,$uname);
- next if ($ncol <= 0);
- s/\_/\./g;
- next if ($record{'resource.'.$_.'.collaborators'} eq '');
- my @goodcollaborators = ();
- my @badcollaborators = ();
- foreach (split(/,?\s+/,$record{'resource.'.$_.'.collaborators'})) {
- $_ =~ s/[\$\^\(\)]//g;
- next if ($_ eq '');
- my ($co_name,$co_dom) = split /\@|:/,$_;
- $co_dom = $udom if (! defined($co_dom) || $co_dom =~ /^domain$/i);
- next if ($co_name eq $uname && $co_dom eq $udom);
- # Doing this grep allows 'fuzzy' specification
- my @Matches = grep /^$co_name:$co_dom$/i,keys %$classlist;
- if (! scalar(@Matches)) {
- push @badcollaborators,$_;
- } else {
- push @goodcollaborators, @Matches;
- }
- }
- if (scalar(@goodcollaborators) != 0) {
- $result.='<b>Collaborators: </b>';
- foreach (@goodcollaborators) {
- my ($lastname,$givenn) = split(/,/,$$fullname{$_});
- push @col_fullnames, $givenn.' '.$lastname;
- $result.=$$fullname{$_}.' ';
- }
- $result.='<br />'."\n";
- my ($part)=split(/\./,$_);
- $result.='<input type="hidden" name="collaborator'.$counter.
- '" value="'.$part.':'.(join ':',@goodcollaborators).'" />'.
- "\n";
- }
- if (scalar(@badcollaborators) > 0) {
- $result.='<table border="0"><tr bgcolor="#ffbbbb"><td>';
- $result.='This student has submitted ';
- $result.=(scalar(@badcollaborators) == 1) ? 'an invalid collaborator' : 'invalid collaborators';
- $result .= ': '.join(', ',@badcollaborators);
- $result .= '</td></tr></table>';
- }
- if (scalar(@badcollaborators > $ncol)) {
- $result .= '<table border="0"><tr bgcolor="#ffbbbb"><td>';
- $result .= 'This student has submitted too many '.
- 'collaborators. Maximum is '.$ncol.'.';
- $result .= '</td></tr></table>';
- }
- }
+ (my $sub_result,$fullname,$col_fullnames)=
+ &check_collaborators($symb,$uname,$udom,\%record,$handgrade,
+ $counter);
+ $result.=$sub_result;
}
$request->print($result."\n");
@@ -2180,16 +2132,16 @@ KEYWORDS
if ($env{'form.handgrade'} eq 'yes') {
my ($lastname,$givenn) = split(/,/,$env{'form.fullname'});
my $msgfor = $givenn.' '.$lastname;
- if (scalar(@col_fullnames) > 0) {
- my $lastone = pop @col_fullnames;
- $msgfor .= ', '.(join ', ',@col_fullnames).' and '.$lastone.'.';
+ if (scalar(@$col_fullnames) > 0) {
+ my $lastone = pop(@$col_fullnames);
+ $msgfor .= ', '.(join ', ',@$col_fullnames).' and '.$lastone.'.';
}
$msgfor =~ s/\'/\\'/g; #' stupid emacs - no! javascript
$result='<input type="hidden" name="includemsg'.$counter.'" value="" />'."\n".
'<input type="hidden" name="newmsg'.$counter.'" value="" />'."\n";
$result.=' <a href="javascript:msgCenter(document.SCORE,'.$counter.
',\''.$msgfor.'\');" target="_self">'.
- &mt('Compose message to student').(scalar(@col_fullnames) >= 1 ? 's' : '').'</a><label> ('.
+ &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".
@@ -2267,6 +2219,62 @@ KEYWORDS
return '';
}
+sub check_collaborators {
+ my ($symb,$uname,$udom,$record,$handgrade,$counter) = @_;
+ my ($result,@col_fullnames);
+ my ($classlist,undef,$fullname) = &getclasslist('all','0');
+ foreach my $part (keys(%$handgrade)) {
+ my $ncol = &Apache::lonnet::EXT('resource.'.$part.
+ '.maxcollaborators',
+ $symb,$udom,$uname);
+ next if ($ncol <= 0);
+ $part =~ s/\_/\./g;
+ next if ($record->{'resource.'.$part.'.collaborators'} eq '');
+ my (@good_collaborators, @bad_collaborators);
+ foreach my $possible_collaborator
+ (split(/,?\s+/,$record->{'resource.'.$part.'.collaborators'})) {
+ $possible_collaborator =~ s/[\$\^\(\)]//g;
+ next if ($possible_collaborator eq '');
+ my ($co_name,$co_dom) = split(/\@|:/,$possible_collaborator);
+ $co_dom = $udom if (! defined($co_dom) || $co_dom =~ /^domain$/i);
+ next if ($co_name eq $uname && $co_dom eq $udom);
+ # Doing this grep allows 'fuzzy' specification
+ my @matches = grep(/^\Q$co_name\E:\Q$co_dom\E$/i,
+ keys(%$classlist));
+ if (! scalar(@matches)) {
+ push(@bad_collaborators, $possible_collaborator);
+ } else {
+ push(@good_collaborators, @matches);
+ }
+ }
+ if (scalar(@good_collaborators) != 0) {
+ $result.='<br />'.&mt('Collaborators: ');
+ foreach my $name (@good_collaborators) {
+ my ($lastname,$givenn) = split(/,/,$$fullname{$name});
+ push(@col_fullnames, $givenn.' '.$lastname);
+ $result.=$fullname->{$name}.' ';
+ }
+ $result.='<br />'."\n";
+ my ($part)=split(/\./,$part);
+ $result.='<input type="hidden" name="collaborator'.$counter.
+ '" value="'.$part.':'.(join ':',@good_collaborators).'" />'.
+ "\n";
+ }
+ if (scalar(@bad_collaborators) > 0) {
+ $result.='<div class="LC_warning">';
+ $result.=&mt('This student has submitted [quant,_1,invalid collaborator]: [_2]',scalar(@bad_collaborators),join(', ',@bad_collaborators));
+ $result .= '</div>';
+ }
+ if (scalar(@bad_collaborators > $ncol)) {
+ $result .= '<div class="LC_warning">';
+ $result .= &mt('This student has submitted too many '.
+ 'collaborators. Maximum is [_1].',$ncol);
+ $result .= '</div>';
+ }
+ }
+ return ($result,$fullname,\@col_fullnames);
+}
+
#--- Retrieve the last submission for all the parts
sub get_last_submission {
my ($returnhash)=@_;
@@ -3913,7 +3921,8 @@ sub csvuploadassign {
if ($wgt) {
$entries{$fields{$dest}}=~s/\s//g;
my $pcr=$entries{$fields{$dest}} / $wgt;
- my $award='correct_by_override';
+ my $award=($pcr == 0) ? 'incorrect_by_override'
+ : 'correct_by_override';
$grades{"resource.$part.awarded"}=$pcr;
$grades{"resource.$part.solved"}=$award;
$points{$part}=1;
@@ -4264,30 +4273,33 @@ sub displaySubByDates {
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">'.
- '<td><b>Date/Time</b></td>'.
- ($isCODE?'<td><b>CODE</b></td>':'').
- '<td><b>Submission</b></td>'.
- '<td><b>Status </b></td></tr>';
+ my $studentTable=&Apache::loncommon::start_data_table().
+ &Apache::loncommon::start_data_table_header_row().
+ '<th>'.&mt('Date/Time').'</th>'.
+ ($isCODE?'<th>'.&mt('CODE').'</th>':'').
+ '<th>'.&mt('Submission').'</th>'.
+ '<th>'.&mt('Status').'</th>'.
+ &Apache::loncommon::end_data_table_header_row();
my ($version);
my %mark;
my %orders;
$mark{'correct_by_student'} = $checkIcon;
if (!exists($$record{'1:timestamp'})) {
- return '<br /> <span class="LC_warning">Nothing submitted - no attempts</span><br />';
+ return '<br /> <span class="LC_warning">'.&mt('Nothing submitted - no attempts').'</span><br />';
}
my $interaction;
for ($version=1;$version<=$$record{'version'};$version++) {
- my $timestamp = scalar(localtime($$record{$version.':timestamp'}));
+ my $timestamp =
+ &Apache::lonlocal::locallocaltime($$record{$version.':timestamp'});
if (exists($$record{$version.':resource.0.version'})) {
$interaction = $$record{$version.':resource.0.version'};
}
my $where = ($isTask ? "$version:resource.$interaction"
: "$version:resource");
- $studentTable.='<tr bgcolor="#ffffff" valign="top"><td>'.$timestamp.'</td>';
+ $studentTable.=&Apache::loncommon::start_data_table_row().
+ '<td>'.$timestamp.'</td>';
if ($isCODE) {
$studentTable.='<td>'.$record->{$version.':resource.CODE'}.'</td>';
}
@@ -4306,14 +4318,14 @@ sub displaySubByDates {
my ($responseId)= ($isTask ? ($matchKey=~ /^resource\.(.*?)\.\Q$partid\E\.award$/)
: ($matchKey=~ /^resource\.\Q$partid\E\.(.*?)\.submission$/));
- $displaySub[0].='<b>Part:</b> '.$display_part.' ';
- $displaySub[0].='<span class="LC_internal_info">(ID '.
+ $displaySub[0].='<b>'.&mt('Part:').'</b> '.$display_part.' ';
+ $displaySub[0].='<span class="LC_internal_info">('.&mt('ID').' '.
$responseId.')</span> <b>';
if ($$record{"$where.$partid.tries"} eq '') {
- $displaySub[0].='Trial not counted';
+ $displaySub[0].=&mt('Trial not counted');
} else {
- $displaySub[0].='Trial '.
- $$record{"$where.$partid.tries"};
+ $displaySub[0].=&mt('Trial [_1]',
+ $$record{"$where.$partid.tries"});
}
my $responseType=($isTask ? 'Task'
: $responseType->{$partid}->{$responseId});
@@ -4353,12 +4365,12 @@ sub displaySubByDates {
}
$studentTable.='<td>'.$displaySub[0].' </td><td>'.$displaySub[1];
if ($displaySub[2]) {
- $studentTable.='Manually graded by '.$displaySub[2];
+ $studentTable.=&mt('Manually graded by [_1]',$displaySub[2]);
}
- $studentTable.=' </td></tr>';
-
+ $studentTable.=' </td>'.
+ &Apache::loncommon::end_data_table_row();
}
- $studentTable.='</table></td></tr></table>';
+ $studentTable.=&Apache::loncommon::end_data_table();
return $studentTable;
}
@@ -4894,11 +4906,10 @@ SCANTRONFORM
</tr>
SCANTRONFORM
- $r->print(<<SCANTRONFORM);
- </table>
-$grading_menu_button
-SCANTRONFORM
- &Apache::lonpickcode::code_list($r,1);
+ $r->print('<tr><td bgcolor="#777777">');
+ &Apache::lonpickcode::code_list($r,2);
+ $r->print('</td></tr></table>');
+ $r->print($grading_menu_button);
return
}
@@ -5270,7 +5281,12 @@ sub scantron_parse_scanline {
|| (&occurence_count($currentquest, "[A-Z]") > 1)) {
push(@{$record{'scantron.doubleerror'}},$questnum);
for (my $ans = 0; $ans < $answers_needed; $ans++) {
- $record{"scantron.$ansnum.answer"}='';
+ my $bubble = substr($currentquest, $ans, 1);
+ if ($bubble =~ /[A-Z]/ ) {
+ $record{"scantron.$ansnum.answer"} = $bubble;
+ } else {
+ $record{"scantron.$ansnum.answer"}='';
+ }
$ansnum++;
}
@@ -5305,7 +5321,12 @@ sub scantron_parse_scanline {
|| (&occurence_count($currentquest, '\d') > 1)) {
push(@{$record{'scantron.doubleerror'}},$questnum);
for (my $ans = 0; $ans < $answers_needed; $ans++) {
- $record{"scantron.$ansnum.answer"}='';
+ my $bubble = substr($currentquest, $ans, 1);
+ if ($bubble =~ /\d/) {
+ $record{"scantron.$ansnum.answer"} = $alphabet[$bubble];
+ } else {
+ $record{"scantron.$ansnum.answer"}=' ';
+ }
$ansnum++;
}
@@ -5352,7 +5373,7 @@ sub scantron_parse_scanline {
}
} elsif (scalar(@array) lt 2) {
- my $location = [length($array[0])];
+ my $location = length($array[0]);
my $line_num = $location / $$scantron_config{'Qlength'};
my $bubble = $alphabet[$location % $$scantron_config{'Qlength'}];
@@ -5375,20 +5396,22 @@ sub scantron_parse_scanline {
my $first_answer = $ansnum;
for (my $ans =0; $ans < $answers_needed; $ans++) {
- $record{"scantron.$ansnum.answer"} = '';
- $ans++;
+ my $item = $first_answer+$ans;
+ $record{"scantron.$item.answer"} = '';
}
my @ans=@array;
- my $i=length($ans[0]);shift(@ans);
+ my $i=0;
+ my $increment = 0;
while ($#ans) {
- $i+=length($ans[0])+1;
- my $line = $i/$$scantron_config{'Qlength'} + $first_answer;
+ $i+=length($ans[0]) + $increment;
+ my $line = int($i/$$scantron_config{'Qlength'} + $first_answer);
my $bubble = $i%$$scantron_config{'Qlength'};
-
$record{"scantron.$line.answer"}.=$alphabet[$bubble];
shift(@ans);
+ $increment = 1;
}
+ $ansnum += $answers_needed;
}
}
}
@@ -5748,7 +5771,6 @@ SCANTRONFORM
my $line = 0;
while (defined($env{"form.scantron.bubblelines.$line"})) {
- &Apache::lonnet::logthis("Saving chunk for $line");
my $chunk =
'<input type="hidden" name="scantron.bubblelines.'.$line.'" value="'.$env{"form.scantron.bubblelines.$line"}.'" />'."\n";
$chunk .=
@@ -5814,7 +5836,6 @@ sub scantron_validate_file {
}
my $currentphase=$env{'form.validatepass'};
- &Apache::lonnet::logthis("Phase: $currentphase");
my $stop=0;
while (!$stop && $currentphase < scalar(@validate_phases)) {
@@ -6425,10 +6446,10 @@ ENDSCRIPT
$r->print($message);
$r->print("<p>Please indicate which bubble should be used for grading</p>");
foreach my $question (@{$arg}) {
-
my $selected = &get_response_bubbles($scan_record, $question);
+ my @select_array = split(/:/,$selected);
&scantron_bubble_selector($r,$scan_config,$question,
- split('',$selected));
+ @select_array);
}
} elsif ($error eq 'missingbubble') {
$r->print("<p>There have been <b>no</b> bubbles scanned for some question(s)</p>\n");
@@ -6459,22 +6480,24 @@ ENDSCRIPT
$r - Apache request object
$scan_config - hash from &get_scantron_config()
$quest - number of the bubble line to make a corrector for
- $selected - array of letters of previously selected bubbles
+ $lines - array of answer lines.
=cut
sub scantron_bubble_selector {
- my ($r,$scan_config,$quest,@selected)=@_;
+ my ($r,$scan_config,$quest,@lines)=@_;
my $max=$$scan_config{'Qlength'};
+
my $scmode=$$scan_config{'Qon'};
+ my $bubble_length = scalar(@lines);
+
if ($scmode eq 'number' || $scmode eq 'letter') { $max=10; }
my $response = $quest-1;
my $lines = $bubble_lines_per_response{$response};
- &Apache::lonnet::logthis("Question $quest, lines: $lines");
my $total_lines = $lines*2;
my @alphabet=('A'..'Z');
@@ -6484,11 +6507,7 @@ sub scantron_bubble_selector {
if ($l != 0) {
$r->print('<tr>');
}
-
- # FIXME: This loop probably has to be considerably more clever for
- # multiline bubbles: User can multibubble by having bubbles in
- # several lines. User can skip lines legitimately etc. etc.
-
+ my @selected = split(//,$lines[$l]);
for (my $i=0;$i<$max;$i++) {
$r->print("\n".'<td align="center">');
if ($selected[0] eq $alphabet[$i]) {
@@ -6738,14 +6757,11 @@ sub scantron_validate_doublebubble {
=cut
sub scantron_get_maxbubble {
- &Apache::lonnet::logthis("get_max_bubble");
if (defined($env{'form.scantron_maxbubble'}) &&
$env{'form.scantron_maxbubble'}) {
- &Apache::lonnet::logthis("cached");
&restore_bubble_lines();
return $env{'form.scantron_maxbubble'};
}
- &Apache::lonnet::logthis("computing");
my (undef, undef, $sequence) =
&Apache::lonnet::decode_symb($env{'form.selectpage'});
@@ -6783,9 +6799,9 @@ sub scantron_get_maxbubble {
foreach my $part_id (@{$analysis{'parts'}}) {
- my ($trash, $part) = split(/\./, $part_id);
- my $lines = $analysis{"$part_id.bubble_lines"}[0];
+
+ my $lines = $analysis{"$part_id.bubble_lines"};;
# TODO - make this a persistent hash not an array.
@@ -7191,10 +7207,6 @@ sub grading_menu {
my $probTitle = &Apache::lonnet::gettitle($symb);
my ($table,undef,$hdgrade) = &showResourceInfo($symb,$probTitle);
- #
- # Define menu data
- $env{'form.probTitle'} = &Apache::lonnet::gettitle($symb);
- my ($table) = &showResourceInfo($symb,$env{'form.probTitle'});
$request->print($table);
my %fields = ('symb'=>&Apache::lonenc::check_encrypt($symb),
'handgrade'=>$hdgrade,
@@ -7230,11 +7242,9 @@ sub grading_menu {
$fields{'command'} = 'verify';
$url = &Apache::lonhtmlcommon::build_url('grades/',\%fields);
push (@menu, { url => "",
- jscript => ' onClick="javascript:checkChoice2(document.forms.gradingMenu,\'5\',\'verify\')" ',
name => &mt('Verify Receipt'),
short_description =>
&mt('')});
-
#
# Create the menu
my $Str;
@@ -7256,10 +7266,10 @@ sub grading_menu {
$menudata->{'url'}.'" >'.
$menudata->{'name'}."</a></h3>\n";
} else {
- $Str .=' <h3><a '.
+ $Str .=' <h3><input type="button" value="Verify Receipt" '.
$menudata->{'jscript'}.
- ' href="javascript:checkChoice2(document.forms.gradingMenu,\'5\',\'verify\')" >'.
- $menudata->{'name'}."</a></h3>\n";
+ ' onClick="javascript:checkChoice(document.forms.gradingMenu,\'5\',\'verify\')" '.
+ ' /></h3>';
$Str .= (' 'x8).
' receipt: '.&Apache::lonnet::recprefix($env{'request.course.id'}).
'-<input type="text" name="receipt" size="4" onChange="javascript:checkReceiptNo(this.form,\'OK\')" />';
@@ -7280,30 +7290,14 @@ sub grading_menu {
cmdsave = 'submission';
}
formname.command.value = cmd;
- formname.saveState.value = "saveCmd="+cmdsave+":saveSec="+pullDownSelection(formname.section)+
- ":saveSub="+pullDownSelection(formname.submitonly)+":saveStatus="+pullDownSelection(formname.Status);
- if (val < 5) formname.submit();
- if (val == 5) {
- if (!checkReceiptNo(formname,'notOK')) { return false;}
- formname.submit();
- }
- if (val < 7) formname.submit();
- }
- function checkChoice2(formname,val,cmdx) {
- if (val <= 2) {
- var cmd = radioSelection(formname.radioChoice);
- var cmdsave = cmd;
- } else {
- cmd = cmdx;
- cmdsave = 'submission';
- }
- formname.command.value = cmd;
if (val < 5) formname.submit();
if (val == 5) {
- if (!checkReceiptNo(formname,'notOK')) { return false;}
- formname.submit();
+ if (!checkReceiptNo(formname,'notOK')) {
+ return false;
+ } else {
+ formname.submit();
+ }
}
- if (val < 7) formname.submit();
}
function checkReceiptNo(formname,nospace) {
@@ -7322,43 +7316,6 @@ sub grading_menu {
</script>
GRADINGMENUJS
&commonJSfunctions($request);
- my $result='<h3> <span class="LC_info">Manual Grading/View Submission</span></h3>';
- $result.=$table;
- my (undef,$sections) = &getclasslist('all','0');
- my $savedState = &savedState();
- my $saveCmd = ($$savedState{'saveCmd'} eq '' ? 'submission' : $$savedState{'saveCmd'});
- my $saveSec = ($$savedState{'saveSec'} eq '' ? 'all' : $$savedState{'saveSec'});
- my $saveSub = ($$savedState{'saveSub'} eq '' ? 'all' : $$savedState{'saveSub'});
- my $saveStatus = ($$savedState{'saveStatus'} eq '' ? 'Active' : $$savedState{'saveStatus'});
-
- $result.='<form action="/adm/grades" method="post" name="gradingMenu">'."\n".
- '<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".
- '<input type="hidden" name="handgrade" value="'.$hdgrade.'" />'."\n".
- '<input type="hidden" name="probTitle" value="'.$probTitle.'" ue="" />'."\n".
- '<input type="hidden" name="saveState" value="" />'."\n".
- '<input type="hidden" name="gradingMenu" value="1" />'."\n".
- '<input type="hidden" name="showgrading" value="yes" />'."\n";
-
- $result.='<table width="100%" border="0"><tr><td bgcolor=#777777>'."\n".
- '<table width="100%" border="0"><tr bgcolor="#e6ffff"><td 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.='<tr bgcolor="#ffffe6" valign="top">'."\n";
- $result.='<td><b>'.&mt('Sections').'</b></td>';
-# $result.='<td>Groups</td>';
- $result.='<td><b>'.&mt('Access Status').'</td>'."\n";
- $result.='</tr>';
- $result.='<tr bgcolor="#ffffe6" valign="top"><td>'."\n".
- ' <select name="section" multiple="multiple" size="3">'."\n";
- if (ref($sections)) {
- foreach (sort (@$sections)) {
- $result.='<option value="'.$_.'" '.
- ($saveSec eq $_ ? 'selected="selected"':'').'>'.$_.'</option>'."\n";
- }
- }
- $result.= '<option value="all" '.($saveSec eq 'all' ? 'selected="selected"' : ''). '>all</option></select> ';
return $Str;
}
@@ -8127,7 +8084,6 @@ sub handler {
} elsif ($command eq 'csvuploadassign' && $perm{'mgr'} ) {
$request->print(&csvuploadassign($request));
} elsif ($command eq 'scantron_selectphase' && $perm{'mgr'}) {
- &Apache::lonnet::logthis("Selecting pyhase");
$request->print(&scantron_selectphase($request));
} elsif ($command eq 'scantron_warning' && $perm{'mgr'}) {
$request->print(&scantron_do_warning($request));