version 1.654, 2011/10/01 15:55:51
|
version 1.658, 2011/10/10 10:13:17
|
Line 45 use Apache::lonlocal;
|
Line 45 use Apache::lonlocal;
|
use Apache::lonenc; |
use Apache::lonenc; |
use Apache::lonstathelpers; |
use Apache::lonstathelpers; |
use Apache::lonquickgrades; |
use Apache::lonquickgrades; |
|
use Apache::bridgetask(); |
use String::Similarity; |
use String::Similarity; |
use LONCAPA; |
use LONCAPA; |
|
|
Line 1414 INNERJS
|
Line 1415 INNERJS
|
adds => 'Add selection to keyword list? Edit if desired.', |
adds => 'Add selection to keyword list? Edit if desired.', |
comp => 'Compose Message for: ', |
comp => 'Compose Message for: ', |
incl => 'Include', |
incl => 'Include', |
|
type => 'Type', |
subj => 'Subject', |
subj => 'Subject', |
mesa => 'Message', |
mesa => 'Message', |
new => 'New', |
new => 'New', |
Line 1422 INNERJS
|
Line 1424 INNERJS
|
kehi => 'Keyword Highlight Options', |
kehi => 'Keyword Highlight Options', |
txtc => 'Text Color', |
txtc => 'Text Color', |
font => 'Font Size', |
font => 'Font Size', |
|
fnst => 'Font Style', |
); |
); |
$request->print(&Apache::lonhtmlcommon::scripttag(<<SUBJAVASCRIPT)); |
$request->print(&Apache::lonhtmlcommon::scripttag(<<SUBJAVASCRIPT)); |
|
|
Line 1543 INNERJS
|
Line 1546 INNERJS
|
|
|
pDoc.write('<table border="0" width="100%"><tr><td bgcolor="#777777">'); |
pDoc.write('<table border="0" width="100%"><tr><td bgcolor="#777777">'); |
pDoc.write('<table border="0" width="100%"><tr bgcolor="#DDFFFF">'); |
pDoc.write('<table border="0" width="100%"><tr bgcolor="#DDFFFF">'); |
pDoc.write("<td><b>Type<\\/b><\\/td><td><b>$lt{'incl'}<\\/b><\\/td><td><b>$lt{'mesa'}<\\/td><\\/tr>"); |
pDoc.write("<td><b>$lt{'type'}<\\/b><\\/td><td><b>$lt{'incl'}<\\/b><\\/td><td><b>$lt{'mesa'}<\\/td><\\/tr>"); |
} |
} |
function displaySubject(msg,shwsel) { |
function displaySubject(msg,shwsel) { |
pDoc = pWin.document; |
pDoc = pWin.document; |
Line 1628 INNERJS
|
Line 1631 INNERJS
|
|
|
hDoc.write('<table border="0" width="100%"><tr><td bgcolor="#777777">'); |
hDoc.write('<table border="0" width="100%"><tr><td bgcolor="#777777">'); |
hDoc.write('<table border="0" width="100%"><tr bgcolor="#DDFFFF">'); |
hDoc.write('<table border="0" width="100%"><tr bgcolor="#DDFFFF">'); |
hDoc.write("<td><b>$lt{'txtc'}<\\/b><\\/td><td><b>$lt{'font'}<\\/b><\\/td><td><b>Font Style<\\/td><\\/tr>"); |
hDoc.write("<td><b>$lt{'txtc'}<\\/b><\\/td><td><b>$lt{'font'}<\\/b><\\/td><td><b>$lt{'fnst'}<\\/td><\\/tr>"); |
} |
} |
|
|
function highlightbody(clrval,clrtxt,clrsel,szval,sztxt,szsel,syval,sytxt,sysel) { |
function highlightbody(clrval,clrtxt,clrsel,szval,sztxt,szsel,syval,sytxt,sysel) { |
Line 2022 sub submission {
|
Line 2025 sub submission {
|
|
|
my %lt = &Apache::lonlocal::texthash( |
my %lt = &Apache::lonlocal::texthash( |
keyw => 'Keyword Options', |
keyw => 'Keyword Options', |
|
list => 'List', |
past => 'Paste Selection to List', |
past => 'Paste Selection to List', |
high => 'Hightlight Attribute', |
high => 'Hightlight Attribute', |
); |
); |
Line 2030 sub submission {
|
Line 2034 sub submission {
|
# |
# |
$request->print(<<KEYWORDS); |
$request->print(<<KEYWORDS); |
<br /><b>$lt{'keyw'}:</b> |
<br /><b>$lt{'keyw'}:</b> |
<a href="javascript:keywords(document.SCORE);" target="_self">List</a> |
<a href="javascript:keywords(document.SCORE);" target="_self">$lt{'list'}</a> |
<a href="#" onmousedown="javascript:getSel(); return false" |
<a href="#" onmousedown="javascript:getSel(); return false" |
CLASS="page">$lt{'past'}</a> |
CLASS="page">$lt{'past'}</a> |
<a href="javascript:kwhighlight();" target="_self">$lt{'high'}</a><br /><br /> |
<a href="javascript:kwhighlight();" target="_self">$lt{'high'}</a><br /><br /> |
Line 4086 sub csvuploadassign {
|
Line 4090 sub csvuploadassign {
|
my ($classlist) = &getclasslist('all',0); |
my ($classlist) = &getclasslist('all',0); |
my @notallowed; |
my @notallowed; |
my @skipped; |
my @skipped; |
|
my @warnings; |
my $countdone=0; |
my $countdone=0; |
foreach my $grade (@gradedata) { |
foreach my $grade (@gradedata) { |
my %entries=&Apache::loncommon::record_sep($grade); |
my %entries=&Apache::loncommon::record_sep($grade); |
Line 4135 sub csvuploadassign {
|
Line 4140 sub csvuploadassign {
|
my $award=($pcr == 0) ? 'incorrect_by_override' |
my $award=($pcr == 0) ? 'incorrect_by_override' |
: 'correct_by_override'; |
: 'correct_by_override'; |
if ($pcr>1) { |
if ($pcr>1) { |
push(@skipped,&mt("[_1]: point value larger than weight","$username:$domain")); |
push(@warnings,&mt("[_1]: point value larger than weight","$username:$domain")); |
} |
} |
$grades{"resource.$part.awarded"}=$pcr; |
$grades{"resource.$part.awarded"}=$pcr; |
$grades{"resource.$part.solved"}=$award; |
$grades{"resource.$part.solved"}=$award; |
Line 4181 sub csvuploadassign {
|
Line 4186 sub csvuploadassign {
|
} |
} |
} |
} |
$request->print('<br />'.&Apache::lonhtmlcommon::confirm_success(&mt("Saved scores for [quant,_1,student]",$countdone),$countdone==0)); |
$request->print('<br />'.&Apache::lonhtmlcommon::confirm_success(&mt("Saved scores for [quant,_1,student]",$countdone),$countdone==0)); |
|
if (@warnings) { |
|
$request->print('<br />'.&Apache::lonhtmlcommon::confirm_success(&mt('Warnings generated for the following saved scores:'),1).'<br />'); |
|
$request->print(join(', ',@warnings)); |
|
} |
if (@skipped) { |
if (@skipped) { |
$request->print('<br />'.&Apache::lonhtmlcommon::confirm_success(&mt('No scores stored for the following username(s):'),1).'<br />'); |
$request->print('<br />'.&Apache::lonhtmlcommon::confirm_success(&mt('No scores stored for the following username(s):'),1).'<br />'); |
$request->print(join(', ',@skipped)); |
$request->print(join(', ',@skipped)); |
Line 6863 sub scantron_get_correction {
|
Line 6872 sub scantron_get_correction {
|
#the previous one or the current one |
#the previous one or the current one |
|
|
if ( $$scan_record{'scantron.PaperID'} =~ /\S/) { |
if ( $$scan_record{'scantron.PaperID'} =~ /\S/) { |
$r->print("<p>".&mt("<b>An error was detected ($error)</b>". |
$r->print( |
" for PaperID <tt>[_1]</tt>", |
'<p class="LC_warning">' |
$$scan_record{'scantron.PaperID'})."</p> \n"); |
.&mt('An error was detected ([_1]) for PaperID [_2]', |
|
"<b>$error</b>", |
|
'<tt>'.$$scan_record{'scantron.PaperID'}.'</tt>') |
|
."</p> \n"); |
} else { |
} else { |
$r->print("<p>".&mt("<b>An error was detected ($error)</b>". |
$r->print( |
" in scanline [_1] <pre>[_2]</pre>", |
'<p class="LC_warning">' |
$i,$line)."</p> \n"); |
.&mt('An error was detected ([_1]) in scanline [_2] [_3]', |
} |
"<b>$error</b>", $i, "<pre>$line</pre>") |
my $message="<p>".&mt("The ID on the form is <tt>[_1]</tt><br />". |
."</p> \n"); |
"The name on the paper is [_2],[_3]", |
} |
$$scan_record{'scantron.ID'}, |
my $message = |
$$scan_record{'scantron.LastName'}, |
'<p>' |
$$scan_record{'scantron.FirstName'})."</p>"; |
.&mt('The ID on the form is [_1]', |
|
"<tt>$$scan_record{'scantron.ID'}</tt>") |
|
.'<br />' |
|
.&mt('The name on the paper is [_2], [_3]', |
|
$$scan_record{'scantron.LastName'}, |
|
$$scan_record{'scantron.FirstName'}) |
|
.'</p>'; |
|
|
$r->print('<input type="hidden" name="scantron_corrections" value="'.$error.'" />'."\n"); |
$r->print('<input type="hidden" name="scantron_corrections" value="'.$error.'" />'."\n"); |
$r->print('<input type="hidden" name="scantron_line" value="'.$i.'" />'."\n"); |
$r->print('<input type="hidden" name="scantron_line" value="'.$i.'" />'."\n"); |
Line 6885 sub scantron_get_correction {
|
Line 6903 sub scantron_get_correction {
|
|
|
if ($error =~ /ID$/) { |
if ($error =~ /ID$/) { |
if ($error eq 'incorrectID') { |
if ($error eq 'incorrectID') { |
$r->print("<p>".&mt("The encoded ID is not in the classlist"). |
$r->print('<p class="LC_warning">'.&mt("The encoded ID is not in the classlist"). |
"</p>\n"); |
"</p>\n"); |
} elsif ($error eq 'duplicateID') { |
} elsif ($error eq 'duplicateID') { |
$r->print("<p>".&mt("The encoded ID has also been used by a previous paper [_1]",$arg)."</p>\n"); |
$r->print('<p class="LC_warning">'.&mt("The encoded ID has also been used by a previous paper [_1]",$arg)."</p>\n"); |
} |
} |
$r->print($message); |
$r->print($message); |
$r->print("<p>".&mt("How should I handle this?")." <br /> \n"); |
$r->print("<p>".&mt("How should I handle this?")." <br /> \n"); |
Line 6904 sub scantron_get_correction {
|
Line 6922 sub scantron_get_correction {
|
$r->print('</li>'); |
$r->print('</li>'); |
} elsif ($error =~ /CODE$/) { |
} elsif ($error =~ /CODE$/) { |
if ($error eq 'incorrectCODE') { |
if ($error eq 'incorrectCODE') { |
$r->print("<p>".&mt("The encoded CODE is not in the list of possible CODEs.")."</p>\n"); |
$r->print('<p class="LC_warning">'.&mt("The encoded CODE is not in the list of possible CODEs.")."</p>\n"); |
} elsif ($error eq 'duplicateCODE') { |
} elsif ($error eq 'duplicateCODE') { |
$r->print("<p>".&mt("The encoded CODE has also been used by a previous paper [_1], and CODEs are supposed to be unique.",join(', ',@{$arg}))."</p>\n"); |
$r->print('<p class="LC_warning">'.&mt("The encoded CODE has also been used by a previous paper [_1], and CODEs are supposed to be unique.",join(', ',@{$arg}))."</p>\n"); |
} |
} |
$r->print("<p>".&mt("The CODE on the form is <tt>'[_1]'</tt>", |
$r->print("<p>".&mt('The CODE on the form is [_1]', |
$$scan_record{'scantron.CODE'})."<br />\n"); |
"<tt>'$$scan_record{'scantron.CODE'}'</tt>") |
|
."</p>\n"); |
$r->print($message); |
$r->print($message); |
$r->print("<p>".&mt("How should I handle this?")." <br /> \n"); |
$r->print("<p>".&mt("How should I handle this?")."</p>\n"); |
$r->print("\n<br /> "); |
$r->print("\n<br /> "); |
my $i=0; |
my $i=0; |
if ($error eq 'incorrectCODE' |
if ($error eq 'incorrectCODE' |
Line 6976 ENDSCRIPT
|
Line 6995 ENDSCRIPT
|
"</label><input type='text' size='8' name='scantron_CODE_newvalue' onfocus=\"javascript:change_radio('use_typed')\" onkeypress=\"javascript:change_radio('use_typed')\" />")); |
"</label><input type='text' size='8' name='scantron_CODE_newvalue' onfocus=\"javascript:change_radio('use_typed')\" onkeypress=\"javascript:change_radio('use_typed')\" />")); |
$r->print("\n<br /><br />"); |
$r->print("\n<br /><br />"); |
} elsif ($error eq 'doublebubble') { |
} elsif ($error eq 'doublebubble') { |
$r->print("<p>".&mt("There have been multiple bubbles scanned for some question(s)")."</p>\n"); |
$r->print('<p class="LC_warning">'.&mt("There have been multiple bubbles scanned for some question(s)")."</p>\n"); |
|
|
# The form field scantron_questions is acutally a list of line numbers. |
# The form field scantron_questions is acutally a list of line numbers. |
# represented by this form so: |
# represented by this form so: |
Line 6994 ENDSCRIPT
|
Line 7013 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>".&mt("There have been <b>no</b> bubbles scanned for some question(s)")."</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 7821 SCANTRONFORM
|
Line 7840 SCANTRONFORM
|
$studentrecord .= $recording; |
$studentrecord .= $recording; |
} |
} |
if ($studentrecord ne $studentdata) { |
if ($studentrecord ne $studentdata) { |
$r->print('<p><span class="LC_error">'); |
$r->print('<p><span class="LC_warning">'); |
if ($scancode eq '') { |
if ($scancode eq '') { |
$r->print(&mt('Mismatch grading bubble sheet for user: [_1] with ID: [_2].', |
$r->print(&mt('Mismatch grading bubblesheet for user: [_1] with ID: [_2].', |
$uname.':'.$udom,$scan_record->{'scantron.ID'})); |
$uname.':'.$udom,$scan_record->{'scantron.ID'})); |
} else { |
} else { |
$r->print(&mt('Mismatch grading bubble sheet for user: [_1] with ID: [_2] and CODE: [_3].', |
$r->print(&mt('Mismatch grading bubblesheet for user: [_1] with ID: [_2] and CODE: [_3].', |
$uname.':'.$udom,$scan_record->{'scantron.ID'},$scancode)); |
$uname.':'.$udom,$scan_record->{'scantron.ID'},$scancode)); |
} |
} |
$r->print('</span><br />'.&Apache::loncommon::start_data_table()."\n". |
$r->print('</span><br />'.&Apache::loncommon::start_data_table()."\n". |
Line 7834 SCANTRONFORM
|
Line 7853 SCANTRONFORM
|
'<th>'.&mt('Source').'</th><th>'.&mt('Bubbled responses').'</th>'. |
'<th>'.&mt('Source').'</th><th>'.&mt('Bubbled responses').'</th>'. |
&Apache::loncommon::end_data_table_header_row()."\n". |
&Apache::loncommon::end_data_table_header_row()."\n". |
&Apache::loncommon::start_data_table_row(). |
&Apache::loncommon::start_data_table_row(). |
'<td>'.&mt('Bubble Sheet').'</td>'. |
'<td>'.&mt('Bubblesheet').'</td>'. |
'<td><span class="LC_nobreak">'.$studentdata.'</span></td>'. |
'<td><span class="LC_nobreak"><tt>'.$studentdata.'</tt></span></td>'. |
&Apache::loncommon::end_data_table_row(). |
&Apache::loncommon::end_data_table_row(). |
&Apache::loncommon::start_data_table_row(). |
&Apache::loncommon::start_data_table_row(). |
'<td>Stored submissions</td>'. |
'<td>'.&mt('Stored submissions').'</td>'. |
'<td><span class="LC_nobreak">'.$studentrecord.'</span></td>'."\n". |
'<td><span class="LC_nobreak"><tt>'.$studentrecord.'</tt></span></td>'."\n". |
&Apache::loncommon::end_data_table_row(). |
&Apache::loncommon::end_data_table_row(). |
&Apache::loncommon::end_data_table().'</p>'); |
&Apache::loncommon::end_data_table().'</p>'); |
} else { |
} else { |