version 1.596.2.6, 2011/10/10 18:55:39
|
version 1.596.2.13, 2012/08/09 23:25:48
|
Line 52 use POSIX qw(floor);
|
Line 52 use POSIX qw(floor);
|
|
|
|
|
my %perm=(); |
my %perm=(); |
|
my %old_essays=(); |
|
|
# These variables are used to recover from ssi errors |
# These variables are used to recover from ssi errors |
|
|
Line 260 sub showResourceInfo {
|
Line 261 sub showResourceInfo {
|
sub reset_caches { |
sub reset_caches { |
&reset_analyze_cache(); |
&reset_analyze_cache(); |
&reset_perm(); |
&reset_perm(); |
|
&reset_old_essays(); |
} |
} |
|
|
{ |
{ |
Line 416 sub cleanRecord {
|
Line 418 sub cleanRecord {
|
'<tr valign="top"><td>'.$grayFont.&mt('Item ID').'</span></td>'. |
'<tr valign="top"><td>'.$grayFont.&mt('Item ID').'</span></td>'. |
$middlerow.'</tr>'. |
$middlerow.'</tr>'. |
'<tr valign="top"><td>'.$grayFont.&mt('Option ID').'</span></td>'. |
'<tr valign="top"><td>'.$grayFont.&mt('Option ID').'</span></td>'. |
$bottomrow.'</tr>'.'</table></blockquote>'; |
$bottomrow.'</tr></table></blockquote>'; |
} elsif ($response eq 'radiobutton') { |
} elsif ($response eq 'radiobutton') { |
my %answer=&Apache::lonnet::str2hash($answer); |
my %answer=&Apache::lonnet::str2hash($answer); |
my ($toprow,$bottomrow); |
my ($toprow,$bottomrow); |
Line 738 sub compute_points {
|
Line 740 sub compute_points {
|
# |
# |
|
|
sub most_similar { |
sub most_similar { |
my ($uname,$udom,$uessay,$old_essays)=@_; |
my ($uname,$udom,$symb,$uessay)=@_; |
|
|
|
unless ($symb) { return ''; } |
|
|
|
unless (ref($old_essays{$symb}) eq 'HASH') { return ''; } |
|
|
# ignore spaces and punctuation |
# ignore spaces and punctuation |
|
|
Line 755 sub most_similar {
|
Line 761 sub most_similar {
|
my $scrsid=''; |
my $scrsid=''; |
my $sessay=''; |
my $sessay=''; |
# go through all essays ... |
# go through all essays ... |
foreach my $tkey (keys(%$old_essays)) { |
foreach my $tkey (keys(%{$old_essays{$symb}})) { |
my ($tname,$tdom,$tcrsid)=map {&unescape($_)} (split(/\./,$tkey)); |
my ($tname,$tdom,$tcrsid)=map {&unescape($_)} (split(/\./,$tkey)); |
# ... except the same student |
# ... except the same student |
next if (($tname eq $uname) && ($tdom eq $udom)); |
next if (($tname eq $uname) && ($tdom eq $udom)); |
my $tessay=$old_essays->{$tkey}; |
my $tessay=$old_essays{$symb}{$tkey}; |
$tessay=~s/\W+/ /gs; |
$tessay=~s/\W+/ /gs; |
# String similarity gives up if not even limit |
# String similarity gives up if not even limit |
my $tsimilar=&String::Similarity::similarity($uessay,$tessay,$limit); |
my $tsimilar=&String::Similarity::similarity($uessay,$tessay,$limit); |
Line 769 sub most_similar {
|
Line 775 sub most_similar {
|
$sname=$tname; |
$sname=$tname; |
$sdom=$tdom; |
$sdom=$tdom; |
$scrsid=$tcrsid; |
$scrsid=$tcrsid; |
$sessay=$old_essays->{$tkey}; |
$sessay=$old_essays{$symb}{$tkey}; |
} |
} |
} |
} |
if ($limit>0.6) { |
if ($limit>0.6) { |
Line 2009 sub submission {
|
Line 2015 sub submission {
|
'" src="'.$request->dir_config('lonIconsURL'). |
'" src="'.$request->dir_config('lonIconsURL'). |
'/check.gif" height="16" border="0" />'; |
'/check.gif" height="16" border="0" />'; |
|
|
my %old_essays; |
|
# header info |
# header info |
if ($counter == 0) { |
if ($counter == 0) { |
&sub_page_js($request); |
&sub_page_js($request); |
Line 2106 sub submission {
|
Line 2111 sub submission {
|
keyw => 'Keyword Options', |
keyw => 'Keyword Options', |
list => 'List', |
list => 'List', |
past => 'Paste Selection to List', |
past => 'Paste Selection to List', |
high => 'Hightlight Attribute', |
high => 'Highlight Attribute', |
); |
); |
# |
# |
# Print out the keyword options line |
# Print out the keyword options line |
Line 2125 KEYWORDS
|
Line 2130 KEYWORDS
|
my ($adom,$aname,$apath)=($essayurl=~/^($LONCAPA::domain_re)\/($LONCAPA::username_re)\/(.*)$/); |
my ($adom,$aname,$apath)=($essayurl=~/^($LONCAPA::domain_re)\/($LONCAPA::username_re)\/(.*)$/); |
$apath=&escape($apath); |
$apath=&escape($apath); |
$apath=~s/\W/\_/gs; |
$apath=~s/\W/\_/gs; |
%old_essays=&Apache::lonnet::dump('nohist_essay_'.$apath,$adom,$aname); |
&init_old_essays($symb,$apath,$adom,$aname); |
} |
} |
} |
} |
|
|
Line 2262 KEYWORDS
|
Line 2267 KEYWORDS
|
} |
} |
if($env{'form.checkPlag'}){ |
if($env{'form.checkPlag'}){ |
my ($oname,$odom,$ocrsid,$oessay,$osim)= |
my ($oname,$odom,$ocrsid,$oessay,$osim)= |
&most_similar($uname,$udom,$subval,\%old_essays); |
&most_similar($uname,$udom,$symb,$subval); |
if ($osim) { |
if ($osim) { |
$osim=int($osim*100.0); |
$osim=int($osim*100.0); |
my %old_course_desc = |
my %old_course_desc = |
Line 2468 sub check_collaborators {
|
Line 2473 sub check_collaborators {
|
(split(/[,;\s]+/,$record->{'resource.'.$part.'.collaborators'})) { |
(split(/[,;\s]+/,$record->{'resource.'.$part.'.collaborators'})) { |
$possible_collaborator =~ s/[\$\^\(\)]//g; |
$possible_collaborator =~ s/[\$\^\(\)]//g; |
next if ($possible_collaborator eq ''); |
next if ($possible_collaborator eq ''); |
my ($co_name,$co_dom) = split(/\@|:/,$possible_collaborator); |
my ($co_name,$co_dom) = split(/:/,$possible_collaborator); |
$co_dom = $udom if (! defined($co_dom) || $co_dom =~ /^domain$/i); |
$co_dom = $udom if (! defined($co_dom) || $co_dom =~ /^domain$/i); |
next if ($co_name eq $uname && $co_dom eq $udom); |
next if ($co_name eq $uname && $co_dom eq $udom); |
# Doing this grep allows 'fuzzy' specification |
# Doing this grep allows 'fuzzy' specification |
Line 2481 sub check_collaborators {
|
Line 2486 sub check_collaborators {
|
} |
} |
} |
} |
if (scalar(@good_collaborators) != 0) { |
if (scalar(@good_collaborators) != 0) { |
$result.='<br />'.&mt('Collaborators: ').'<ol>'; |
$result.='<br />'.&mt('Collaborators:').'<ol>'; |
foreach my $name (@good_collaborators) { |
foreach my $name (@good_collaborators) { |
my ($lastname,$givenn) = split(/,/,$$fullname{$name}); |
my ($lastname,$givenn) = split(/,/,$$fullname{$name}); |
push(@col_fullnames, $givenn.' '.$lastname); |
push(@col_fullnames, $givenn.' '.$lastname); |
Line 7051 sub scantron_get_correction {
|
Line 7056 sub scantron_get_correction {
|
.&mt('The ID on the form is [_1]', |
.&mt('The ID on the form is [_1]', |
"<tt>$$scan_record{'scantron.ID'}</tt>") |
"<tt>$$scan_record{'scantron.ID'}</tt>") |
.'<br />' |
.'<br />' |
.&mt('The name on the paper is [_2], [_3]', |
.&mt('The name on the paper is [_1], [_2]', |
$$scan_record{'scantron.LastName'}, |
$$scan_record{'scantron.LastName'}, |
$$scan_record{'scantron.FirstName'}) |
$$scan_record{'scantron.FirstName'}) |
.'</p>'; |
.'</p>'; |
Line 7176 ENDSCRIPT
|
Line 7181 ENDSCRIPT
|
} |
} |
$r->print(&verify_bubbles_checked(@lines_to_correct)); |
$r->print(&verify_bubbles_checked(@lines_to_correct)); |
} elsif ($error eq 'missingbubble') { |
} elsif ($error eq 'missingbubble') { |
$r->print('<p class="LC_warning">.&mt("There have been [_1]no[_2] bubbles scanned for some question(s)",'<b>','</b>')."</p>\n"); |
$r->print('<p class="LC_warning">'.&mt("There have been [_1]no[_2] bubbles scanned for some question(s)",'<b>','</b>')."</p>\n"); |
$r->print($message); |
$r->print($message); |
$r->print("<p>".&mt("Please indicate which bubble should be used for grading.")."</p>"); |
$r->print("<p>".&mt("Please indicate which bubble should be used for grading.")."</p>"); |
$r->print(&mt("Some questions have no scanned bubbles.")."\n"); |
$r->print(&mt("Some questions have no scanned bubbles.")."\n"); |
Line 8464 sub checkscantron_results {
|
Line 8469 sub checkscantron_results {
|
} |
} |
} |
} |
$r->print('<p>'. |
$r->print('<p>'. |
&mt('Comparison of bubblesheet data (including corrections) with corresponding submission records (most recent submission) for [_1][quant,_2,student][_3] ([_4] bubblesheet lines/student).', |
&mt('Comparison of bubblesheet data (including corrections) with corresponding submission records (most recent submission) for [_1][quant,_2,student][_3] ([quant,_4,bubblesheet line] per student).', |
'<b>', |
'<b>', |
$numstudents, |
$numstudents, |
'</b>', |
'</b>', |
Line 8964 sub init_perm {
|
Line 8969 sub init_perm {
|
} |
} |
} |
} |
|
|
|
sub init_old_essays { |
|
my ($symb,$apath,$adom,$aname) = @_; |
|
if ($symb ne '') { |
|
my %essays = &Apache::lonnet::dump('nohist_essay_'.$apath,$adom,$aname); |
|
if (keys(%essays) > 0) { |
|
$old_essays{$symb} = \%essays; |
|
} |
|
} |
|
return; |
|
} |
|
|
|
sub reset_old_essays { |
|
undef(%old_essays); |
|
} |
|
|
sub gather_clicker_ids { |
sub gather_clicker_ids { |
my %clicker_ids; |
my %clicker_ids; |
|
|
Line 9382 sub assign_clicker_grades {
|
Line 9402 sub assign_clicker_grades {
|
# FIXME: This should probably look for the first handgradeable part |
# FIXME: This should probably look for the first handgradeable part |
my $part=$$partlist[0]; |
my $part=$$partlist[0]; |
# Start screen output |
# Start screen output |
my ($result) = &showResourceInfo($symb,$env{'form.probTitle'}).'<br />'; |
my ($result) = &showResourceInfo($symb,$env{'form.probTitle'}); |
|
|
$result .= &Apache::loncommon::start_data_table(). |
$result .= '<br />'. |
|
&Apache::loncommon::start_data_table(). |
&Apache::loncommon::start_data_table_header_row(). |
&Apache::loncommon::start_data_table_header_row(). |
'<th>'.&mt('Assigning grades based on clicker file').'</th>'. |
'<th>'.&mt('Assigning grades based on clicker file').'</th>'. |
&Apache::loncommon::end_data_table_header_row(). |
&Apache::loncommon::end_data_table_header_row(). |
Line 9572 sub handler {
|
Line 9593 sub handler {
|
} else { |
} else { |
&init_perm(); |
&init_perm(); |
if (!$env{'request.course.id'}) { |
if (!$env{'request.course.id'}) { |
# Not in a course. |
unless ((&Apache::lonnet::allowed('usc',$env{'request.role.domain'})) && |
$env{'user.error.msg'}="/adm/grades::vgr:0:0:Cannot display grades page outside course context"; |
($command =~ /^scantronupload/)) { |
return HTTP_NOT_ACCEPTABLE; |
# Not in a course. |
|
$env{'user.error.msg'}="/adm/grades::vgr:0:0:Cannot display grades page outside course context"; |
|
return HTTP_NOT_ACCEPTABLE; |
|
} |
} elsif (!%perm) { |
} elsif (!%perm) { |
$request->internal_redirect('/adm/quickgrades'); |
$request->internal_redirect('/adm/quickgrades'); |
} |
} |