version 1.394, 2007/04/15 18:25:56
|
version 1.415, 2007/06/16 23:00:09
|
Line 41 use Apache::Constants qw(:common);
|
Line 41 use Apache::Constants qw(:common);
|
use Apache::lonlocal; |
use Apache::lonlocal; |
use Apache::lonenc; |
use Apache::lonenc; |
use String::Similarity; |
use String::Similarity; |
use lib '/home/httpd/lib/perl'; |
|
use LONCAPA; |
use LONCAPA; |
|
|
use POSIX qw(floor); |
use POSIX qw(floor); |
Line 102 sub get_symb {
|
Line 101 sub get_symb {
|
sub nameUserString { |
sub nameUserString { |
my ($type,$fullname,$uname,$udom) = @_; |
my ($type,$fullname,$uname,$udom) = @_; |
if ($type eq 'header') { |
if ($type eq 'header') { |
return '<b> Fullname </b><font color="#999999">(Username)</font>'; |
return '<b> Fullname </b><span class="LC_internal_info">(Username)</span>'; |
} else { |
} else { |
return ' '.$fullname.'<font color="#999999"> ('.$uname. |
return ' '.$fullname.'<span class="LC_internal_info"> ('.$uname. |
($env{'user.domain'} eq $udom ? '' : ' ('.$udom.')').')</font>'; |
($env{'user.domain'} eq $udom ? '' : ' ('.$udom.')').')</span>'; |
} |
} |
} |
} |
|
|
Line 151 sub get_display_part {
|
Line 150 sub get_display_part {
|
my ($partID,$symb)=@_; |
my ($partID,$symb)=@_; |
my $display=&Apache::lonnet::EXT('resource.'.$partID.'.display',$symb); |
my $display=&Apache::lonnet::EXT('resource.'.$partID.'.display',$symb); |
if (defined($display) and $display ne '') { |
if (defined($display) and $display ne '') { |
$display.= " (<font color=\"#999900\">id $partID</font>)"; |
$display.= " (<span class=\"LC_internal_info\">id $partID</span>)"; |
} else { |
} else { |
$display=$partID; |
$display=$partID; |
} |
} |
Line 164 sub showResourceInfo {
|
Line 163 sub showResourceInfo {
|
my ($symb,$probTitle,$checkboxes) = @_; |
my ($symb,$probTitle,$checkboxes) = @_; |
my $col=3; |
my $col=3; |
if ($checkboxes) { $col=4; } |
if ($checkboxes) { $col=4; } |
my $result ='<table border="0">'. |
my $result = '<h3>'.&mt('Current Resource').': '.$probTitle.'</h3>'."\n"; |
'<tr><td colspan="'.$col.'"><font size="+1"><b>'.&mt('Current Resource').': </b>'. |
$result .='<table border="0">'; |
$probTitle.'</font></td></tr>'."\n"; |
|
my ($partlist,$handgrade,$responseType) = &response_type($symb); |
my ($partlist,$handgrade,$responseType) = &response_type($symb); |
my %resptype = (); |
my %resptype = (); |
my $hdgrade='no'; |
my $hdgrade='no'; |
Line 181 sub showResourceInfo {
|
Line 179 sub showResourceInfo {
|
if (exists($partsseen{$partID})) { |
if (exists($partsseen{$partID})) { |
$result.="<td> </td>"; |
$result.="<td> </td>"; |
} else { |
} else { |
$result.="<td><input type='checkbox' name='vPart' value='$partID' checked='on' /></td>"; |
$result.="<td><input type='checkbox' name='vPart' value='$partID' checked='checked' /></td>"; |
} |
} |
$partsseen{$partID}=1; |
$partsseen{$partID}=1; |
} |
} |
my $display_part=&get_display_part($partID,$symb); |
my $display_part=&get_display_part($partID,$symb); |
$result.='<td><b>Part: </b>'.$display_part.' <font color="#999999">'. |
$result.='<td><b>Part: </b>'.$display_part.' <span class="LC_internal_info">'. |
$resID.'</font></td>'. |
$resID.'</span></td>'. |
'<td><b>Type: </b>'.$responsetype.'</td></tr>'; |
'<td><b>Type: </b>'.$responsetype.'</td></tr>'; |
# '<td><b>Handgrade: </b>'.$handgrade.'</td></tr>'; |
# '<td><b>Handgrade: </b>'.$handgrade.'</td></tr>'; |
} |
} |
Line 218 sub get_order {
|
Line 216 sub get_order {
|
sub cleanRecord { |
sub cleanRecord { |
my ($answer,$response,$symb,$partid,$respid,$record,$order,$version, |
my ($answer,$response,$symb,$partid,$respid,$record,$order,$version, |
$uname,$udom) = @_; |
$uname,$udom) = @_; |
my $grayFont = '<font color="#999999">'; |
my $grayFont = '<span class="LC_internal_info">'; |
if ($response =~ /^(option|rank)$/) { |
if ($response =~ /^(option|rank)$/) { |
my %answer=&Apache::lonnet::str2hash($answer); |
my %answer=&Apache::lonnet::str2hash($answer); |
my %grading=&Apache::lonnet::str2hash($record->{$version."resource.$partid.$respid.submissiongrading"}); |
my %grading=&Apache::lonnet::str2hash($record->{$version."resource.$partid.$respid.submissiongrading"}); |
Line 229 sub cleanRecord {
|
Line 227 sub cleanRecord {
|
} else { |
} else { |
$toprow.='<td><i>'.$answer{$foil}.' </i></td>'; |
$toprow.='<td><i>'.$answer{$foil}.' </i></td>'; |
} |
} |
$bottomrow.='<td>'.$grayFont.$foil.'</font> </td>'; |
$bottomrow.='<td>'.$grayFont.$foil.'</span> </td>'; |
} |
} |
return '<blockquote><table border="1">'. |
return '<blockquote><table border="1">'. |
'<tr valign="top"><td>Answer</td>'.$toprow.'</tr>'. |
'<tr valign="top"><td>Answer</td>'.$toprow.'</tr>'. |
'<tr valign="top"><td>'.$grayFont.'Option ID</font></td>'. |
'<tr valign="top"><td>'.$grayFont.'Option ID</span></td>'. |
$grayFont.$bottomrow.'</tr>'.'</table></blockquote>'; |
$grayFont.$bottomrow.'</tr>'.'</table></blockquote>'; |
} elsif ($response eq 'match') { |
} elsif ($response eq 'match') { |
my %answer=&Apache::lonnet::str2hash($answer); |
my %answer=&Apache::lonnet::str2hash($answer); |
Line 244 sub cleanRecord {
|
Line 242 sub cleanRecord {
|
my $item=shift(@items); |
my $item=shift(@items); |
if ($grading{$foil} == 1) { |
if ($grading{$foil} == 1) { |
$toprow.='<td><b>'.$item.' </b></td>'; |
$toprow.='<td><b>'.$item.' </b></td>'; |
$middlerow.='<td><b>'.$grayFont.$answer{$foil}.' </font></b></td>'; |
$middlerow.='<td><b>'.$grayFont.$answer{$foil}.' </span></b></td>'; |
} else { |
} else { |
$toprow.='<td><i>'.$item.' </i></td>'; |
$toprow.='<td><i>'.$item.' </i></td>'; |
$middlerow.='<td><i>'.$grayFont.$answer{$foil}.' </font></i></td>'; |
$middlerow.='<td><i>'.$grayFont.$answer{$foil}.' </span></i></td>'; |
} |
} |
$bottomrow.='<td>'.$grayFont.$foil.'</font> </td>'; |
$bottomrow.='<td>'.$grayFont.$foil.'</span> </td>'; |
} |
} |
return '<blockquote><table border="1">'. |
return '<blockquote><table border="1">'. |
'<tr valign="top"><td>Answer</td>'.$toprow.'</tr>'. |
'<tr valign="top"><td>Answer</td>'.$toprow.'</tr>'. |
'<tr valign="top"><td>'.$grayFont.'Item ID</font></td>'. |
'<tr valign="top"><td>'.$grayFont.'Item ID</span></td>'. |
$middlerow.'</tr>'. |
$middlerow.'</tr>'. |
'<tr valign="top"><td>'.$grayFont.'Option ID</font></td>'. |
'<tr valign="top"><td>'.$grayFont.'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); |
Line 272 sub cleanRecord {
|
Line 270 sub cleanRecord {
|
} else { |
} else { |
$toprow.='<td>false</td>'; |
$toprow.='<td>false</td>'; |
} |
} |
$bottomrow.='<td>'.$grayFont.$foil.'</font> </td>'; |
$bottomrow.='<td>'.$grayFont.$foil.'</span> </td>'; |
} |
} |
return '<blockquote><table border="1">'. |
return '<blockquote><table border="1">'. |
'<tr valign="top"><td>Answer</td>'.$toprow.'</tr>'. |
'<tr valign="top"><td>Answer</td>'.$toprow.'</tr>'. |
'<tr valign="top"><td>'.$grayFont.'Option ID</font></td>'. |
'<tr valign="top"><td>'.$grayFont.'Option ID</span></td>'. |
$grayFont.$bottomrow.'</tr>'.'</table></blockquote>'; |
$grayFont.$bottomrow.'</tr>'.'</table></blockquote>'; |
} elsif ($response eq 'essay') { |
} elsif ($response eq 'essay') { |
if (! exists ($env{'form.'.$symb})) { |
if (! exists ($env{'form.'.$symb})) { |
Line 595 sub verifyreceipt {
|
Line 593 sub verifyreceipt {
|
$receipt =~ s/[^\-\d]//g; |
$receipt =~ s/[^\-\d]//g; |
my ($symb) = &get_symb($request); |
my ($symb) = &get_symb($request); |
|
|
my $title.='<h3><font color="#339933">Verifying Submission Receipt '. |
my $title.='<h3><span class="LC_info">Verifying Submission Receipt '. |
$receipt.'</h3></font>'."\n". |
$receipt.'</h3></span>'."\n". |
'<font size=+1><b>Resource: </b>'.$env{'form.probTitle'}.'</font><br /><br />'."\n"; |
'<h4><b>Resource: </b>'.$env{'form.probTitle'}.'</h4><br /><br />'."\n"; |
|
|
my ($string,$contents,$matches) = ('','',0); |
my ($string,$contents,$matches) = ('','',0); |
my (undef,undef,$fullname) = &getclasslist('all','0'); |
my (undef,undef,$fullname) = &getclasslist('all','0'); |
Line 668 sub listStudents {
|
Line 666 sub listStudents {
|
$env{'form.probTitle'} = $env{'form.probTitle'} eq '' ? |
$env{'form.probTitle'} = $env{'form.probTitle'} eq '' ? |
&Apache::lonnet::gettitle($symb) : $env{'form.probTitle'}; |
&Apache::lonnet::gettitle($symb) : $env{'form.probTitle'}; |
|
|
my $result='<h3><font color="#339933"> '.$viewgrade. |
my $result='<h3><span class="LC_info"> '.$viewgrade. |
' Submissions for a Student or a Group of Students</font></h3>'; |
' Submissions for a Student or a Group of Students</span></h3>'; |
|
|
my ($table,undef,$hdgrade,$partlist,$handgrade) = &showResourceInfo($symb,$env{'form.probTitle'},($env{'form.showgrading'} eq 'yes')); |
my ($table,undef,$hdgrade,$partlist,$handgrade) = &showResourceInfo($symb,$env{'form.probTitle'},($env{'form.showgrading'} eq 'yes')); |
|
|
Line 709 LISTJAVASCRIPT
|
Line 707 LISTJAVASCRIPT
|
&commonJSfunctions($request); |
&commonJSfunctions($request); |
$request->print($result); |
$request->print($result); |
|
|
my $checkhdgrade = ($env{'form.handgrade'} eq 'yes' && scalar(@$partlist) > 1 ) ? 'checked' : ''; |
my $checkhdgrade = ($env{'form.handgrade'} eq 'yes' && scalar(@$partlist) > 1 ) ? 'checked="checked"' : ''; |
my $checklastsub = $checkhdgrade eq '' ? 'checked' : ''; |
my $checklastsub = $checkhdgrade eq '' ? 'checked="checked"' : ''; |
my $gradeTable='<form action="/adm/grades" method="post" name="gradesub">'. |
my $gradeTable='<form action="/adm/grades" method="post" name="gradesub">'. |
"\n".$table. |
"\n".$table. |
' <b>View Problem Text: </b><label><input type="radio" name="vProb" value="no" checked="on" /> no </label>'."\n". |
' <b>View Problem Text: </b><label><input type="radio" name="vProb" value="no" checked="checked" /> no </label>'."\n". |
'<label><input type="radio" name="vProb" value="yes" /> one student </label>'."\n". |
'<label><input type="radio" name="vProb" value="yes" /> one student </label>'."\n". |
'<label><input type="radio" name="vProb" value="all" /> all students </label><br />'."\n". |
'<label><input type="radio" name="vProb" value="all" /> all students </label><br />'."\n". |
' <b>View Answer: </b><label><input type="radio" name="vAns" value="no" /> no </label>'."\n". |
' <b>View Answer: </b><label><input type="radio" name="vAns" value="no" /> no </label>'."\n". |
'<label><input type="radio" name="vAns" value="yes" /> one student </label>'."\n". |
'<label><input type="radio" name="vAns" value="yes" /> one student </label>'."\n". |
'<label><input type="radio" name="vAns" value="all" checked="on" /> all students </label><br />'."\n". |
'<label><input type="radio" name="vAns" value="all" checked="checked" /> all students </label><br />'."\n". |
' <b>Submissions: </b>'."\n"; |
' <b>Submissions: </b>'."\n"; |
if ($env{'form.handgrade'} eq 'yes' && scalar(@$partlist) > 1) { |
if ($env{'form.handgrade'} eq 'yes' && scalar(@$partlist) > 1) { |
$gradeTable.='<label><input type="radio" name="lastSub" value="hdgrade" '.$checkhdgrade.' /> essay part only </label>'."\n"; |
$gradeTable.='<label><input type="radio" name="lastSub" value="hdgrade" '.$checkhdgrade.' /> essay part only </label>'."\n"; |
Line 764 LISTJAVASCRIPT
|
Line 762 LISTJAVASCRIPT
|
'onClick="javascript:checkSelect(this.form.stuinfo);" '."\n". |
'onClick="javascript:checkSelect(this.form.stuinfo);" '."\n". |
'value="Next->" /> <br />'."\n"; |
'value="Next->" /> <br />'."\n"; |
$gradeTable.=&check_buttons(); |
$gradeTable.=&check_buttons(); |
$gradeTable.='<label><input type="checkbox" name="checkPlag" checked="on" />Check For Plagiarism</label>'; |
$gradeTable.='<label><input type="checkbox" name="checkPlag" checked="checked" />Check For Plagiarism</label>'; |
my ($classlist, undef, $fullname) = &getclasslist($getsec,'1'); |
my ($classlist, undef, $fullname) = &getclasslist($getsec,'1'); |
$gradeTable.='<table border="0"><tr><td bgcolor="#777777">'. |
$gradeTable.='<table border="0"><tr><td bgcolor="#777777">'. |
'<table border="0"><tr bgcolor="#e6ffff">'; |
'<table border="0"><tr bgcolor="#e6ffff">'; |
Line 881 LISTJAVASCRIPT
|
Line 879 LISTJAVASCRIPT
|
if ($ctr == 0) { |
if ($ctr == 0) { |
my $num_students=(scalar(keys(%$fullname))); |
my $num_students=(scalar(keys(%$fullname))); |
if ($num_students eq 0) { |
if ($num_students eq 0) { |
$gradeTable='<br /> <font color="red">There are no students currently enrolled.</font>'; |
$gradeTable='<br /> <span class="LC_warning">There are no students currently enrolled.</span>'; |
} else { |
} else { |
my $submissions='submissions'; |
my $submissions='submissions'; |
if ($submitonly eq 'incorrect') { $submissions = 'incorrect submissions'; } |
if ($submitonly eq 'incorrect') { $submissions = 'incorrect submissions'; } |
if ($submitonly eq 'graded' ) { $submissions = 'ungraded submissions'; } |
if ($submitonly eq 'graded' ) { $submissions = 'ungraded submissions'; } |
if ($submitonly eq 'queued' ) { $submissions = 'queued submissions'; } |
if ($submitonly eq 'queued' ) { $submissions = 'queued submissions'; } |
$gradeTable='<br /> <font color="red">'. |
$gradeTable='<br /> <span class="LC_warning">'. |
'No '.$submissions.' found for this resource for any students. ('.$num_students. |
'No '.$submissions.' found for this resource for any students. ('.$num_students. |
' students checked for '.$submissions.')</font><br />'; |
' students checked for '.$submissions.')</span><br />'; |
} |
} |
} elsif ($ctr == 1) { |
} elsif ($ctr == 1) { |
$gradeTable =~ s/type=checkbox/type=checkbox checked/; |
$gradeTable =~ s/type=checkbox/type=checkbox checked/; |
Line 953 sub processGroup {
|
Line 951 sub processGroup {
|
my @stuchecked = &Apache::loncommon::get_env_multiple('form.stuinfo'); |
my @stuchecked = &Apache::loncommon::get_env_multiple('form.stuinfo'); |
my $total = scalar(@stuchecked)-1; |
my $total = scalar(@stuchecked)-1; |
|
|
foreach (@stuchecked) { |
foreach my $student (@stuchecked) { |
my ($uname,$udom,$fullname) = split(/:/); |
my ($uname,$udom,$fullname) = split(/:/,$student); |
$env{'form.student'} = $uname; |
$env{'form.student'} = $uname; |
$env{'form.userdom'} = $udom; |
$env{'form.userdom'} = $udom; |
$env{'form.fullname'} = $fullname; |
$env{'form.fullname'} = $fullname; |
Line 1344 INNERJS
|
Line 1342 INNERJS
|
|
|
pDoc.write("<form action=\\"inactive\\" name=\\"msgcenter\\">"); |
pDoc.write("<form action=\\"inactive\\" name=\\"msgcenter\\">"); |
pDoc.write("<input value=\\""+usrctr+"\\" name=\\"usrctr\\" type=\\"hidden\\">"); |
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("<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><td bgcolor=\\"#777777\\">"); |
pDoc.write("<table border=0 width=100%><tr bgcolor=\\"#ddffff\\">"); |
pDoc.write("<table border=0 width=100%><tr bgcolor=\\"#ddffff\\">"); |
Line 1429 INNERJS
|
Line 1427 INNERJS
|
hDoc.$docopen; |
hDoc.$docopen; |
hDoc.write('$start_page_highlight_central'); |
hDoc.write('$start_page_highlight_central'); |
hDoc.write("<form action=\\"inactive\\" name=\\"hlCenter\\">"); |
hDoc.write("<form action=\\"inactive\\" name=\\"hlCenter\\">"); |
hDoc.write("<font color=\\"green\\" size=+1> Keyword Highlight Options</font><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><td bgcolor=\\"#777777\\">"); |
hDoc.write("<table border=0 width=100%><tr bgcolor=\\"#ddffff\\">"); |
hDoc.write("<table border=0 width=100%><tr bgcolor=\\"#ddffff\\">"); |
Line 1480 sub gradeBox {
|
Line 1478 sub gradeBox {
|
'/check.gif" height="16" border="0" />'; |
'/check.gif" height="16" border="0" />'; |
my $wgt = &Apache::lonnet::EXT('resource.'.$partid.'.weight',$symb,$udom,$uname); |
my $wgt = &Apache::lonnet::EXT('resource.'.$partid.'.weight',$symb,$udom,$uname); |
my $wgtmsg = ($wgt > 0 ? '(problem weight)' : |
my $wgtmsg = ($wgt > 0 ? '(problem weight)' : |
'<font color="red">problem weight assigned by computer</font>'); |
'<span class="LC_info">problem weight assigned by computer</span>'); |
$wgt = ($wgt > 0 ? $wgt : '1'); |
$wgt = ($wgt > 0 ? $wgt : '1'); |
my $score = ($$record{'resource.'.$partid.'.awarded'} eq '' ? |
my $score = ($$record{'resource.'.$partid.'.awarded'} eq '' ? |
'' : &compute_points($$record{'resource.'.$partid.'.awarded'},$wgt)); |
'' : &compute_points($$record{'resource.'.$partid.'.awarded'},$wgt)); |
Line 1502 sub gradeBox {
|
Line 1500 sub gradeBox {
|
$result.= '<td><span style="white-space: nowrap;"><label><input type="radio" name="RADVAL'.$counter.'_'.$partid.'" '. |
$result.= '<td><span style="white-space: nowrap;"><label><input type="radio" name="RADVAL'.$counter.'_'.$partid.'" '. |
'onclick="javascript:writeBox(this.form,\''.$counter.'_'.$partid.'\','. |
'onclick="javascript:writeBox(this.form,\''.$counter.'_'.$partid.'\','. |
$thisweight.')" value="'.$thisweight.'" '. |
$thisweight.')" value="'.$thisweight.'" '. |
($score eq $thisweight ? 'checked':'').' /> '.$thisweight."</label></span></td>\n"; |
($score eq $thisweight ? 'checked="checked"':'').' /> '.$thisweight."</label></span></td>\n"; |
$result.=(($ctr+1)%10 == 0 ? '</tr><tr>' : ''); |
$result.=(($ctr+1)%10 == 0 ? '</tr><tr>' : ''); |
$thisweight += $increment; |
$thisweight += $increment; |
$ctr++; |
$ctr++; |
Line 1520 sub gradeBox {
|
Line 1518 sub gradeBox {
|
'onChange="javascript:clearRadBox(this.form,\''.$counter.'_'.$partid.'\')" >'."\n"; |
'onChange="javascript:clearRadBox(this.form,\''.$counter.'_'.$partid.'\')" >'."\n"; |
if ($$record{'resource.'.$partid.'.solved'} eq 'excused') { |
if ($$record{'resource.'.$partid.'.solved'} eq 'excused') { |
$result.='<option></option>'. |
$result.='<option></option>'. |
'<option selected="on">excused</option>'; |
'<option selected="selected">excused</option>'; |
} else { |
} else { |
$result.='<option selected="on"></option>'. |
$result.='<option selected="selected"></option>'. |
'<option>excused</option>'; |
'<option>excused</option>'; |
} |
} |
$result.='<option>reset status</option></select>'."\n"; |
$result.='<option>reset status</option></select>'."\n"; |
Line 1626 sub show_problem {
|
Line 1624 sub show_problem {
|
$result.='</td></tr></table><br />'; |
$result.='</td></tr></table><br />'; |
return $result; |
return $result; |
} |
} |
|
|
|
sub files_exist { |
|
my ($r, $symb) = @_; |
|
my @students = &Apache::loncommon::get_env_multiple('form.stuinfo'); |
|
|
|
foreach my $student (@students) { |
|
my ($uname,$udom,$fullname) = split(/:/,$student); |
|
my %record = &Apache::lonnet::restore($symb,$env{'request.course.id'}, |
|
$udom,$uname); |
|
my ($string,$timestamp)= &get_last_submission(\%record); |
|
foreach my $submission (@$string) { |
|
my ($partid,$respid) = |
|
($submission =~ /^resource\.([^\.]*)\.([^\.]*)\.submission/); |
|
my $files=&get_submitted_files($udom,$uname,$partid,$respid, |
|
\%record); |
|
return 1 if (@$files); |
|
} |
|
} |
|
return 0; |
|
} |
|
|
sub download_all_link { |
sub download_all_link { |
my ($r,$symb) = @_; |
my ($r,$symb) = @_; |
my $courseid=$env{'request.course.id'}; |
my $all_students = |
my @stuchecked = &Apache::loncommon::get_env_multiple('form.stuinfo'); |
join("\n", &Apache::loncommon::get_env_multiple('form.stuinfo')); |
my $parts; |
|
my $total = scalar(@stuchecked)-1; |
my $parts = |
my $all_students; |
join("\n",&Apache::loncommon::get_env_multiple('form.vPart')); |
foreach my $stu_info (@stuchecked) { |
|
$all_students .= $stu_info."\n"; |
|
} |
|
foreach my $part (&Apache::loncommon::get_env_multiple('form.vPart')) { |
|
$parts .= $part."\n"; |
|
} |
|
my $identifier = &Apache::loncommon::get_cgi_id(); |
my $identifier = &Apache::loncommon::get_cgi_id(); |
&Apache::lonnet::appenv('cgi.'.$identifier.'.students' => $all_students, |
&Apache::lonnet::appenv('cgi.'.$identifier.'.students' => $all_students, |
'cgi.'.$identifier.'.symb' => $symb, |
'cgi.'.$identifier.'.symb' => $symb, |
'cgi.'.$identifier.'.parts' => $parts, |
'cgi.'.$identifier.'.parts' => $parts,); |
'cgi.'.$identifier.'.courseid' => $courseid); |
$r->print('<a href="/cgi-bin/multidownload.pl?'.$identifier.'">'. |
$r->print('<a href="/cgi-bin/multidownload.pl?'.$identifier.'">Download All Submitted Documents</a>'); |
&mt('Download All Submitted Documents').'</a>'); |
return |
return |
} |
} |
|
|
# --------------------------- show submissions of a student, option to grade |
# --------------------------- show submissions of a student, option to grade |
sub submission { |
sub submission { |
my ($request,$counter,$total) = @_; |
my ($request,$counter,$total) = @_; |
Line 1660 sub submission {
|
Line 1675 sub submission {
|
if ($symb eq '') { $request->print("Unable to handle ambiguous references:."); return ''; } |
if ($symb eq '') { $request->print("Unable to handle ambiguous references:."); return ''; } |
|
|
if (!&canview($usec)) { |
if (!&canview($usec)) { |
$request->print('<font color="red">Unable to view requested student.('. |
$request->print('<span class="LC_warning">Unable to view requested student.('. |
$uname.'@'.$udom.' in section '.$usec.' in course id '. |
$uname.':'.$udom.' in section '.$usec.' in course id '. |
$env{'request.course.id'}.')</font>'); |
$env{'request.course.id'}.')</span>'); |
$request->print(&show_grading_menu_form($symb)); |
$request->print(&show_grading_menu_form($symb)); |
return; |
return; |
} |
} |
Line 1681 sub submission {
|
Line 1696 sub submission {
|
&sub_page_kw_js($request) if ($env{'form.handgrade'} eq 'yes'); |
&sub_page_kw_js($request) if ($env{'form.handgrade'} eq 'yes'); |
$env{'form.probTitle'} = $env{'form.probTitle'} eq '' ? |
$env{'form.probTitle'} = $env{'form.probTitle'} eq '' ? |
&Apache::lonnet::gettitle($symb) : $env{'form.probTitle'}; |
&Apache::lonnet::gettitle($symb) : $env{'form.probTitle'}; |
&download_all_link($request,$symb); |
if ($env{'form.handgrade'} eq 'yes' && &files_exist($request, $symb)) { |
$request->print('<h3> <font color="#339933">Submission Record</font></h3>'."\n". |
&download_all_link($request, $symb); |
'<font size=+1> <b>Resource: </b>'.$env{'form.probTitle'}.'</font>'."\n"); |
} |
|
$request->print('<h3> <span class="LC_info">Submission Record</span></h3>'."\n". |
|
'<h4> <b>Resource: </b>'.$env{'form.probTitle'}.'</h4>'."\n"); |
|
|
if ($env{'form.handgrade'} eq 'no') { |
if ($env{'form.handgrade'} eq 'no') { |
my $checkMark='<br /><br /> <b>Note:</b> Part(s) graded correct by the computer is marked with a '. |
my $checkMark='<br /><br /> <b>Note:</b> Part(s) graded correct by the computer is marked with a '. |
Line 1912 KEYWORDS
|
Line 1929 KEYWORDS
|
my $responsetype = $responseType->{$partid}->{$respid}; |
my $responsetype = $responseType->{$partid}->{$respid}; |
if (!exists($record{"resource.$partid.$respid.submission"})) { |
if (!exists($record{"resource.$partid.$respid.submission"})) { |
$lastsubonly.='<tr><td bgcolor="#ffffe6"><b>Part:</b> '. |
$lastsubonly.='<tr><td bgcolor="#ffffe6"><b>Part:</b> '. |
$display_part.' <font color="#999999">( ID '.$respid. |
$display_part.' <span class="LC_internal_info">( ID '.$respid. |
' )</font> '. |
' )</span> '. |
'<font color="red">Nothing submitted - no attempts</font><br /><br />'; |
'<span class="LC_warning">Nothing submitted - no attempts</span><br /><br />'; |
next; |
next; |
} |
} |
foreach (@$string) { |
foreach (@$string) { |
Line 1928 KEYWORDS
|
Line 1945 KEYWORDS
|
&most_similar($uname,$udom,$subval); |
&most_similar($uname,$udom,$subval); |
if ($osim) { |
if ($osim) { |
$osim=int($osim*100.0); |
$osim=int($osim*100.0); |
$similar="<hr /><h3><font color=\"#FF0000\">Essay". |
$similar="<hr /><h3><span class=\"LC_warning\">Essay". |
" is $osim% similar to an essay by ". |
" is $osim% similar to an essay by ". |
&Apache::loncommon::plainname($oname,$odom). |
&Apache::loncommon::plainname($oname,$odom). |
'</font></h3><blockquote><i>'. |
'</span></h3><blockquote><i>'. |
&keywords_highlight($oessay). |
&keywords_highlight($oessay). |
'</i></blockquote><hr />'; |
'</i></blockquote><hr />'; |
} |
} |
Line 1941 KEYWORDS
|
Line 1958 KEYWORDS
|
($env{'form.lastSub'} eq 'hdgrade' && |
($env{'form.lastSub'} eq 'hdgrade' && |
$$handgrade{$$part[0].'_'.$$part[1]} eq 'yes')) { |
$$handgrade{$$part[0].'_'.$$part[1]} eq 'yes')) { |
my $display_part=&get_display_part($partid,$symb); |
my $display_part=&get_display_part($partid,$symb); |
$lastsubonly.='<tr><td bgcolor="#ffffe6">Debug -'.'<b>Part:</b> '. |
$lastsubonly.='<tr><td bgcolor="#ffffe6"><b>Part:</b> '. |
$display_part.' <font color="#999999">( hhhh ID '.$respid. |
$display_part.' <span class="LC_internal_info">( ID '.$respid. |
' )</font> '; |
' )</span> '; |
my $files=&get_submitted_files($udom,$uname,$partid,$respid,\%record); |
my $files=&get_submitted_files($udom,$uname,$partid,$respid,\%record); |
if (@$files) { |
if (@$files) { |
$lastsubonly.='<br /><font color="red" size="1">Like all files provided by users, this file may contain virusses</font><br />'; |
$lastsubonly.='<br /><span class="LC_warning">Like all files provided by users, this file may contain virusses</span><br />'; |
my $file_counter = 0; |
my $file_counter = 0; |
foreach my $file (@$files) { |
foreach my $file (@$files) { |
$file_counter ++; |
$file_counter ++; |
Line 2064 KEYWORDS
|
Line 2081 KEYWORDS
|
'<option>3</option><option>5</option>'. |
'<option>3</option><option>5</option>'. |
'<option>7</option><option>10</option></select>'."\n"; |
'<option>7</option><option>10</option></select>'."\n"; |
my $nsel = ($env{'form.NTSTU'} ne '' ? $env{'form.NTSTU'} : '1'); |
my $nsel = ($env{'form.NTSTU'} ne '' ? $env{'form.NTSTU'} : '1'); |
$ntstu =~ s/<option>$nsel</<option selected="on">$nsel</; |
$ntstu =~ s/<option>$nsel</<option selected="selected">$nsel</; |
$endform.=$ntstu.'student(s) '; |
$endform.=$ntstu.'student(s) '; |
$endform.='<input type="button" value="Previous" '. |
$endform.='<input type="button" value="Previous" '. |
'onClick="javascript:checksubmit(this.form,\'Previous\');" TARGET=_self> '."\n". |
'onClick="javascript:checksubmit(this.form,\'Previous\');" TARGET=_self> '."\n". |
Line 2088 sub get_last_submission {
|
Line 2105 sub get_last_submission {
|
my %lasthash=(); |
my %lasthash=(); |
my ($version); |
my ($version); |
for ($version=1;$version<=$$returnhash{'version'};$version++) { |
for ($version=1;$version<=$$returnhash{'version'};$version++) { |
foreach (sort(split(/\:/,$$returnhash{$version.':keys'}))) { |
foreach my $key (sort(split(/\:/, |
$lasthash{$_}=$$returnhash{$version.':'.$_}; |
$$returnhash{$version.':keys'}))) { |
$timestamp = scalar(localtime($$returnhash{$version.':timestamp'})); |
$lasthash{$key}=$$returnhash{$version.':'.$key}; |
|
$timestamp = |
|
scalar(localtime($$returnhash{$version.':timestamp'})); |
} |
} |
} |
} |
foreach ((keys %lasthash)) { |
foreach my $key (keys(%lasthash)) { |
if ($_ =~ /\.submission$/) { |
next if ($key !~ /\.submission$/); |
my ($partid,$foo) = split(/submission$/,$_); |
|
my $draft = $lasthash{$partid.'awarddetail'} eq 'DRAFT' ? |
my ($partid,$foo) = split(/submission$/,$key); |
'<font color="red">Draft Copy</font> ' : ''; |
my $draft = $lasthash{$partid.'awarddetail'} eq 'DRAFT' ? |
push @string, (join(':',$_,$draft.$lasthash{$_})); |
'<span class="LC_warning">Draft Copy</span> ' : ''; |
} |
push(@string, join(':', $key, $draft.$lasthash{$key})); |
} |
} |
} |
} |
@string = $string[0] eq '' ? '<font color="red">Nothing submitted - no attempts.</font>' : @string; |
if (!@string) { |
return \@string,\$timestamp; |
$string[0] = |
|
'<span class="LC_warning">Nothing submitted - no attempts.</span>'; |
|
} |
|
return (\@string,\$timestamp); |
} |
} |
|
|
#--- High light keywords, with style choosen by user. |
#--- High light keywords, with style choosen by user. |
Line 2113 sub keywords_highlight {
|
Line 2135 sub keywords_highlight {
|
my $styleon = $env{'form.kwstyle'} eq '' ? '' : $env{'form.kwstyle'}; |
my $styleon = $env{'form.kwstyle'} eq '' ? '' : $env{'form.kwstyle'}; |
(my $styleoff = $styleon) =~ s/\</\<\//; |
(my $styleoff = $styleon) =~ s/\</\<\//; |
my @keylist = split(/[,\s+]/,$env{'form.keywords'}); |
my @keylist = split(/[,\s+]/,$env{'form.keywords'}); |
foreach (@keylist) { |
foreach my $keyword (@keylist) { |
$string =~ s/\b\Q$_\E(\b|\.)/<font color\=$env{'form.kwclr'} $size\>$styleon$_$styleoff<\/font>/gi; |
$string =~ s/\b\Q$keyword\E(\b|\.)/<font color\=$env{'form.kwclr'} $size\>$styleon$keyword$styleoff<\/font>/gi; |
} |
} |
return $string; |
return $string; |
} |
} |
Line 2140 sub processHandGrade {
|
Line 2162 sub processHandGrade {
|
next; |
next; |
} |
} |
if ($errorflag eq 'not_allowed') { |
if ($errorflag eq 'not_allowed') { |
$request->print("<font color=\"red\">Not allowed to modify grades for $uname:$udom</font>"); |
$request->print("<span class=\"LC_warning\">Not allowed to modify grades for $uname:$udom</span>"); |
$ctr++; |
$ctr++; |
next; |
next; |
} |
} |
Line 2369 sub processHandGrade {
|
Line 2391 sub processHandGrade {
|
$ctr++; |
$ctr++; |
} |
} |
if ($total < 0) { |
if ($total < 0) { |
my $the_end = '<h3><font color="red">LON-CAPA User Message</font></h3><br />'."\n"; |
my $the_end = '<h3><span class="LC_info">LON-CAPA User Message</span></h3><br />'."\n"; |
$the_end.='<b>Message: </b> No more students for this section or class.<br /><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.='Click on the button below to return to the grading menu.<br /><br />'."\n"; |
$the_end.=&show_grading_menu_form($symb); |
$the_end.=&show_grading_menu_form($symb); |
Line 2542 sub handback_files {
|
Line 2564 sub handback_files {
|
$newflg.'_'.$part_resp.'_returndoc'.$file_counter, |
$newflg.'_'.$part_resp.'_returndoc'.$file_counter, |
$save_file_name); |
$save_file_name); |
if ($result !~ m|^/uploaded/|) { |
if ($result !~ m|^/uploaded/|) { |
$request->print('<font color="red"> An errror occured ('.$result. |
$request->print('<span class="LC_error">An error occurred ('.$result. |
') while trying to upload '.$newflg.'_'.$part_resp.'_returndoc'.$file_counter.'</font><br />'); |
') while trying to upload '.$newflg.'_'.$part_resp.'_returndoc'.$file_counter.'</span><br />'); |
} else { |
} else { |
# mark the file as read only |
# mark the file as read only |
my @files = ($save_file_name); |
my @files = ($save_file_name); |
Line 2939 sub viewgrades {
|
Line 2961 sub viewgrades {
|
$env{'course.'.$env{'request.course.id'}.'.domain'}); |
$env{'course.'.$env{'request.course.id'}.'.domain'}); |
&Apache::lonnet::clear_EXT_cache_status(); |
&Apache::lonnet::clear_EXT_cache_status(); |
|
|
my $result='<h3><font color="#339933">'.&mt('Manual Grading').'</font></h3>'; |
my $result='<h3><span class="LC_info">'.&mt('Manual Grading').'</span></h3>'; |
$result.='<font size=+1><b>Current Resource: </b>'.$env{'form.probTitle'}.'</font>'."\n"; |
$result.='<h4><b>Current Resource: </b>'.$env{'form.probTitle'}.'</h4>'."\n"; |
|
|
#view individual student submission form - called using Javascript viewOneStudent |
#view individual student submission form - called using Javascript viewOneStudent |
$result.=&jscriptNform($symb); |
$result.=&jscriptNform($symb); |
Line 3005 sub viewgrades {
|
Line 3027 sub viewgrades {
|
$result.= '</td><td><select name="SELVAL_'.$partid.'"'. |
$result.= '</td><td><select name="SELVAL_'.$partid.'"'. |
'onChange="javascript:writeRadText(\''.$partid.'\','. |
'onChange="javascript:writeRadText(\''.$partid.'\','. |
$weight{$partid}.')"> '. |
$weight{$partid}.')"> '. |
'<option selected="on"> </option>'. |
'<option selected="selected"> </option>'. |
'<option>excused</option>'. |
'<option>excused</option>'. |
'<option>reset status</option></select></td>'. |
'<option>reset status</option></select></td>'. |
'<td><label><input type="checkbox" name="FORCE_'.$partid.'" /> Override "Correct"</label></td></tr>'."\n"; |
'<td><label><input type="checkbox" name="FORCE_'.$partid.'" /> Override "Correct"</label></td></tr>'."\n"; |
Line 3068 sub viewgrades {
|
Line 3090 sub viewgrades {
|
'onClick="javascript:submit();" TARGET=_self /></form>'."\n"; |
'onClick="javascript:submit();" TARGET=_self /></form>'."\n"; |
if (scalar(%$fullname) eq 0) { |
if (scalar(%$fullname) eq 0) { |
my $colspan=3+scalar(@parts); |
my $colspan=3+scalar(@parts); |
$result='<font color="red">There are no students in section "'.$env{'form.section'}. |
$result='<span class="LC_warning">There are no students in section "'.$env{'form.section'}. |
'" with enrollment status "'.$env{'form.Status'}.'" to modify or grade.</font>'; |
'" with enrollment status "'.$env{'form.Status'}.'" to modify or grade.</span>'; |
} |
} |
$result.=&show_grading_menu_form($symb); |
$result.=&show_grading_menu_form($symb); |
return $result; |
return $result; |
Line 3086 sub viewstudentgrade {
|
Line 3108 sub viewstudentgrade {
|
"\n".$ctr.' </td><td> '. |
"\n".$ctr.' </td><td> '. |
'<a href="javascript:viewOneStudent(\''.$uname.'\',\''.$udom. |
'<a href="javascript:viewOneStudent(\''.$uname.'\',\''.$udom. |
'\')"; TARGET=_self>'.$fullname.'</a> '. |
'\')"; TARGET=_self>'.$fullname.'</a> '. |
'<font color="#999999">('.$uname.($env{'user.domain'} eq $udom ? '' : ':'.$udom).')</font></td>'."\n"; |
'<span class="LC_internal_info">('.$uname.($env{'user.domain'} eq $udom ? '' : ':'.$udom).')</span></td>'."\n"; |
$student=~s/:/_/; # colon doen't work in javascript for names |
$student=~s/:/_/; # colon doen't work in javascript for names |
foreach my $apart (@$parts) { |
foreach my $apart (@$parts) { |
my ($part,$type) = &split_part_type($apart); |
my ($part,$type) = &split_part_type($apart); |
Line 3123 sub viewstudentgrade {
|
Line 3145 sub viewstudentgrade {
|
$result.=' <select name="'. |
$result.=' <select name="'. |
'GD_'.$student.'_'.$part.'_solved" '. |
'GD_'.$student.'_'.$part.'_solved" '. |
'onChange="javascript:changeOneScore(\''.$part.'\',\''.$student.'\')" >'."\n"; |
'onChange="javascript:changeOneScore(\''.$part.'\',\''.$student.'\')" >'."\n"; |
$result.= (($status eq 'excused') ? '<option> </option><option selected="on">excused</option>' |
$result.= (($status eq 'excused') ? '<option> </option><option selected="selected">excused</option>' |
: '<option selected="on"> </option><option>excused</option>')."\n"; |
: '<option selected="selected"> </option><option>excused</option>')."\n"; |
$result.='<option>reset status</option>'; |
$result.='<option>reset status</option>'; |
$result.="</select> </td>\n"; |
$result.="</select> </td>\n"; |
} else { |
} else { |
Line 3146 sub editgrades {
|
Line 3168 sub editgrades {
|
my ($request) = @_; |
my ($request) = @_; |
|
|
my $symb=&get_symb($request); |
my $symb=&get_symb($request); |
my $title='<h3><font color="#339933">Current Grade Status</font></h3>'; |
my $title='<h3><span class="LC_info">Current Grade Status</span></h3>'; |
$title.='<font size=+1><b>Current Resource: </b>'.$env{'form.probTitle'}.'</font><br />'."\n"; |
$title.='<h4><b>Current Resource: </b>'.$env{'form.probTitle'}.'</h4><br />'."\n"; |
$title.='<font size=+1><b>Section: </b>'.$env{'form.section'}.'</font>'."\n"; |
$title.='<h4><b>Section: </b>'.$env{'form.section'}.'</h4>'."\n"; |
|
|
my $result= '<table border="0"><tr><td bgcolor="#777777">'."\n"; |
my $result= '<table border="0"><tr><td bgcolor="#777777">'."\n"; |
$result.= '<table border="0"><tr bgcolor="#deffff">'. |
$result.= '<table border="0"><tr bgcolor="#deffff">'. |
Line 3216 sub editgrades {
|
Line 3238 sub editgrades {
|
my $usec=$classlist->{"$uname:$udom"}[5]; |
my $usec=$classlist->{"$uname:$udom"}[5]; |
if (!&canmodify($usec)) { |
if (!&canmodify($usec)) { |
my $numcols=scalar(@partid)*4+2; |
my $numcols=scalar(@partid)*4+2; |
$noupdate.=$line."<td colspan=\"$numcols\"><font color=\"red\">Not allowed to modify student</font></td></tr>"; |
$noupdate.=$line."<td colspan=\"$numcols\"><span class=\"LC_warning\">Not allowed to modify student</span></td></tr>"; |
next; |
next; |
} |
} |
my %aggregate = (); |
my %aggregate = (); |
Line 3451 sub csvuploadmap_header {
|
Line 3473 sub csvuploadmap_header {
|
my $ignore=&mt('Ignore First Line'); |
my $ignore=&mt('Ignore First Line'); |
$request->print(<<ENDPICK); |
$request->print(<<ENDPICK); |
<form method="post" enctype="multipart/form-data" action="/adm/grades" name="gradesupload"> |
<form method="post" enctype="multipart/form-data" action="/adm/grades" name="gradesupload"> |
<h3><font color="#339933">Uploading Class Grades</font></h3> |
<h3><span class="LC_info">Uploading Class Grades</span></h3> |
$result |
$result |
<hr /> |
<hr /> |
<h3>Identify fields</h3> |
<h3>Identify fields</h3> |
Line 3614 sub csvuploadoptions {
|
Line 3636 sub csvuploadoptions {
|
my $ignore=&mt('Ignore First Line'); |
my $ignore=&mt('Ignore First Line'); |
$request->print(<<ENDPICK); |
$request->print(<<ENDPICK); |
<form method="post" enctype="multipart/form-data" action="/adm/grades" name="gradesupload"> |
<form method="post" enctype="multipart/form-data" action="/adm/grades" name="gradesupload"> |
<h3><font color="#339933">Uploading Class Grade Options</font></h3> |
<h3><span class="LC_info">Uploading Class Grade Options</span></h3> |
<input type="hidden" name="command" value="csvuploadassign" /> |
<input type="hidden" name="command" value="csvuploadassign" /> |
<!-- |
<!-- |
<p> |
<p> |
Line 3748 sub csvuploadassign {
|
Line 3770 sub csvuploadassign {
|
$grades{$store_key}=$entries{$fields{$dest}}; |
$grades{$store_key}=$entries{$fields{$dest}}; |
} |
} |
} |
} |
if (! %grades) { push(@skipped,"$username:$domain no data to store"); } |
if (! %grades) { push(@skipped,"$username:$domain no data to save"); } |
$grades{"resource.regrader"}="$env{'user.name'}:$env{'user.domain'}"; |
$grades{"resource.regrader"}="$env{'user.name'}:$env{'user.domain'}"; |
# &Apache::lonnet::logthis(" storing ".(join('-',%grades))); |
# &Apache::lonnet::logthis(" storing ".(join('-',%grades))); |
my $result=&Apache::lonnet::cstore(\%grades,$symb, |
my $result=&Apache::lonnet::cstore(\%grades,$symb, |
Line 3758 sub csvuploadassign {
|
Line 3780 sub csvuploadassign {
|
$request->print('.'); |
$request->print('.'); |
} else { |
} else { |
$request->print("<p> |
$request->print("<p> |
<font color='red'> |
<span class=\"LC_error\"> |
Failed to store student $username\@$domain. |
Failed to save student $username:$domain. |
Message when trying to store was ($result) |
Message when trying to save was ($result) |
</font> |
</span> |
</p>" ); |
</p>" ); |
} |
} |
$request->rflush(); |
$request->rflush(); |
$countdone++; |
$countdone++; |
} |
} |
$request->print("<br />Stored $countdone students\n"); |
$request->print("<br />Saved $countdone students\n"); |
if (@skipped) { |
if (@skipped) { |
$request->print('<p><font size="+1"><b>Skipped Students</b></font></p>'); |
$request->print('<p><h4><b>Skipped Students</b></h4></p>'); |
foreach my $student (@skipped) { $request->print("$student<br />\n"); } |
foreach my $student (@skipped) { $request->print("$student<br />\n"); } |
} |
} |
if (@notallowed) { |
if (@notallowed) { |
$request->print('<p><font size="+1" color="red"><b>Students Not Allowed to Modify</b></font></p>'); |
$request->print('<p><span class="LC_error">Students Not Allowed to Modify</span></p>'); |
foreach my $student (@notallowed) { $request->print("$student<br />\n"); } |
foreach my $student (@notallowed) { $request->print("$student<br />\n"); } |
} |
} |
$request->print("<br />\n"); |
$request->print("<br />\n"); |
Line 3812 LISTJAVASCRIPT
|
Line 3834 LISTJAVASCRIPT
|
my $cnum = $env{"course.$env{'request.course.id'}.num"}; |
my $cnum = $env{"course.$env{'request.course.id'}.num"}; |
my $getsec = $env{'form.section'} eq '' ? 'all' : $env{'form.section'}; |
my $getsec = $env{'form.section'} eq '' ? 'all' : $env{'form.section'}; |
|
|
my $result='<h3><font color="#339933"> '. |
my $result='<h3><span class="LC_info"> '. |
'Manual Grading by Page or Sequence</font></h3>'; |
'Manual Grading by Page or Sequence</span></h3>'; |
|
|
$result.='<form action="/adm/grades" method="post" name="displayPage">'."\n"; |
$result.='<form action="/adm/grades" method="post" name="displayPage">'."\n"; |
$result.=' <b>Problems from:</b> <select name="selectpage">'."\n"; |
$result.=' <b>Problems from:</b> <select name="selectpage">'."\n"; |
Line 3825 LISTJAVASCRIPT
|
Line 3847 LISTJAVASCRIPT
|
foreach (@$titles) { |
foreach (@$titles) { |
my ($minder,$showtitle) = ($_ =~ /(\d+)\.(.*)/); |
my ($minder,$showtitle) = ($_ =~ /(\d+)\.(.*)/); |
$result.='<option value="'.$ctr.'" '. |
$result.='<option value="'.$ctr.'" '. |
($$symbx{$_} =~ /$curpage$/ ? 'selected="on"' : ''). |
($$symbx{$_} =~ /$curpage$/ ? 'selected="selected"' : ''). |
'>'.$showtitle.'</option>'."\n"; |
'>'.$showtitle.'</option>'."\n"; |
$ctr++; |
$ctr++; |
} |
} |
Line 3840 LISTJAVASCRIPT
|
Line 3862 LISTJAVASCRIPT
|
$result.='<input type="hidden" name="page" />'."\n". |
$result.='<input type="hidden" name="page" />'."\n". |
'<input type="hidden" name="title" />'."\n"; |
'<input type="hidden" name="title" />'."\n"; |
|
|
$result.=' <b>View Problems Text: </b><label><input type="radio" name="vProb" value="no" checked="on" /> no </label>'."\n". |
$result.=' <b>View Problems Text: </b><label><input type="radio" name="vProb" value="no" checked="checked" /> no </label>'."\n". |
'<label><input type="radio" name="vProb" value="yes" /> yes </label>'."<br />\n"; |
'<label><input type="radio" name="vProb" value="yes" /> yes </label>'."<br />\n"; |
|
|
$result.=' <b>Submission Details: </b>'. |
$result.=' <b>Submission Details: </b>'. |
'<label><input type="radio" name="lastSub" value="none" /> none</label>'."\n". |
'<label><input type="radio" name="lastSub" value="none" /> none</label>'."\n". |
'<label><input type="radio" name="lastSub" value="datesub" checked /> by dates and submissions</label>'."\n". |
'<label><input type="radio" name="lastSub" value="datesub" checked="checked" /> 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>'."\n"; |
|
|
$result.='<input type="hidden" name="section" value="'.$getsec.'" />'."\n". |
$result.='<input type="hidden" name="section" value="'.$getsec.'" />'."\n". |
Line 3943 sub displayPage {
|
Line 3965 sub displayPage {
|
&Apache::lonnet::clear_EXT_cache_status(); |
&Apache::lonnet::clear_EXT_cache_status(); |
|
|
if (!&canview($usec)) { |
if (!&canview($usec)) { |
$request->print('<font color="red">Unable to view requested student.('.$env{'form.student'}.')</font>'); |
$request->print('<span class="LC_warning">Unable to view requested student.('.$env{'form.student'}.')</span>'); |
$request->print(&show_grading_menu_form($symb)); |
$request->print(&show_grading_menu_form($symb)); |
return; |
return; |
} |
} |
my $result='<h3><font color="#339933"> '.$env{'form.title'}.'</font></h3>'; |
my $result='<h3><span class="LC_info"> '.$env{'form.title'}.'</span></h3>'; |
$result.='<h3> Student: '.&nameUserString(undef,$$fullname{$env{'form.student'}},$uname,$udom). |
$result.='<h3> Student: '.&nameUserString(undef,$$fullname{$env{'form.student'}},$uname,$udom). |
'</h3>'."\n"; |
'</h3>'."\n"; |
if (&Apache::lonnet::validCODE($env{'form.CODE'})) { |
if (&Apache::lonnet::validCODE($env{'form.CODE'})) { |
Line 3962 sub displayPage {
|
Line 3984 sub displayPage {
|
my ($mapUrl, $id, $resUrl)=&Apache::lonnet::decode_symb($env{'form.page'}); |
my ($mapUrl, $id, $resUrl)=&Apache::lonnet::decode_symb($env{'form.page'}); |
my $map = $navmap->getResourceByUrl($resUrl); # add to navmaps |
my $map = $navmap->getResourceByUrl($resUrl); # add to navmaps |
if (!$map) { |
if (!$map) { |
$request->print('<font color="red">Unable to view requested sequence. ('.$resUrl.')</font>'); |
$request->print('<span class="LC_warning">Unable to view requested sequence. ('.$resUrl.')</span>'); |
$request->print(&show_grading_menu_form($symb)); |
$request->print(&show_grading_menu_form($symb)); |
return; |
return; |
} |
} |
Line 4029 sub displayPage {
|
Line 4051 sub displayPage {
|
|
|
if ($env{'form.lastSub'} eq 'datesub') { |
if ($env{'form.lastSub'} eq 'datesub') { |
if ($record{'version'} eq '') { |
if ($record{'version'} eq '') { |
$studentTable.='<br /> <font color="red">No recorded submission for this problem</font><br />'; |
$studentTable.='<br /> <span class="LC_warning">No recorded submission for this problem</span><br />'; |
} else { |
} else { |
my %responseType = (); |
my %responseType = (); |
foreach my $partid (@{$parts}) { |
foreach my $partid (@{$parts}) { |
Line 4091 sub displaySubByDates {
|
Line 4113 sub displaySubByDates {
|
my %orders; |
my %orders; |
$mark{'correct_by_student'} = $checkIcon; |
$mark{'correct_by_student'} = $checkIcon; |
if (!exists($$record{'1:timestamp'})) { |
if (!exists($$record{'1:timestamp'})) { |
return '<br /> <font color="red">Nothing submitted - no attempts</font><br />'; |
return '<br /> <span class="LC_warning">Nothing submitted - no attempts</span><br />'; |
} |
} |
|
|
my $interaction; |
my $interaction; |
Line 4125 sub displaySubByDates {
|
Line 4147 sub displaySubByDates {
|
: ($matchKey=~ /^resource\.\Q$partid\E\.(.*?)\.submission$/)); |
: ($matchKey=~ /^resource\.\Q$partid\E\.(.*?)\.submission$/)); |
#&Apache::lonnet::logthis("match $matchKey $responseId (".$$record{$version.':'.$matchKey}); |
#&Apache::lonnet::logthis("match $matchKey $responseId (".$$record{$version.':'.$matchKey}); |
$displaySub[0].='<b>Part:</b> '.$display_part.' '; |
$displaySub[0].='<b>Part:</b> '.$display_part.' '; |
$displaySub[0].='<font color="#999999">(ID '. |
$displaySub[0].='<span class="LC_internal_info">(ID '. |
$responseId.')</font> <b>'; |
$responseId.')</span> <b>'; |
if ($$record{"$where.$partid.tries"} eq '') { |
if ($$record{"$where.$partid.tries"} eq '') { |
$displaySub[0].='Trial not counted'; |
$displaySub[0].='Trial not counted'; |
} else { |
} else { |
Line 4191 sub updateGradeByPage {
|
Line 4213 sub updateGradeByPage {
|
my ($uname,$udom) = split(/:/,$env{'form.student'}); |
my ($uname,$udom) = split(/:/,$env{'form.student'}); |
my $usec=$classlist->{$env{'form.student'}}[5]; |
my $usec=$classlist->{$env{'form.student'}}[5]; |
if (!&canmodify($usec)) { |
if (!&canmodify($usec)) { |
$request->print('<font color="red">Unable to modify requested student.('.$env{'form.student'}.'</font>'); |
$request->print('<span class="LC_warning">Unable to modify requested student.('.$env{'form.student'}.'</span>'); |
$request->print(&show_grading_menu_form($env{'form.symb'})); |
$request->print(&show_grading_menu_form($env{'form.symb'})); |
return; |
return; |
} |
} |
my $result='<h3><font color="#339933"> '.$env{'form.title'}.'</font></h3>'; |
my $result='<h3><span class="LC_info"> '.$env{'form.title'}.'</span></h3>'; |
$result.='<h3> Student: '.&nameUserString(undef,$env{'form.fullname'},$uname,$udom). |
$result.='<h3> Student: '.&nameUserString(undef,$env{'form.fullname'},$uname,$udom). |
'</h3>'."\n"; |
'</h3>'."\n"; |
|
|
Line 4205 sub updateGradeByPage {
|
Line 4227 sub updateGradeByPage {
|
my ($mapUrl, $id, $resUrl) = &Apache::lonnet::decode_symb( $env{'form.page'}); |
my ($mapUrl, $id, $resUrl) = &Apache::lonnet::decode_symb( $env{'form.page'}); |
my $map = $navmap->getResourceByUrl($resUrl); # add to navmaps |
my $map = $navmap->getResourceByUrl($resUrl); # add to navmaps |
if (!$map) { |
if (!$map) { |
$request->print('<font color="red">Unable to grade requested sequence. ('.$resUrl.')</font>'); |
$request->print('<span class="LC_warning">Unable to grade requested sequence. ('.$resUrl.')</span>'); |
my ($symb)=&get_symb($request); |
my ($symb)=&get_symb($request); |
$request->print(&show_grading_menu_form($symb)); |
$request->print(&show_grading_menu_form($symb)); |
return; |
return; |
Line 4361 sub getSequenceDropDown {
|
Line 4383 sub getSequenceDropDown {
|
foreach (@$titles) { |
foreach (@$titles) { |
my ($minder,$showtitle) = ($_ =~ /(\d+)\.(.*)/); |
my ($minder,$showtitle) = ($_ =~ /(\d+)\.(.*)/); |
$result.='<option value="'.$$symbx{$_}.'" '. |
$result.='<option value="'.$$symbx{$_}.'" '. |
($$symbx{$_} =~ /$curpage$/ ? 'selected="on"' : ''). |
($$symbx{$_} =~ /$curpage$/ ? 'selected="selected"' : ''). |
'>'.$showtitle.'</option>'."\n"; |
'>'.$showtitle.'</option>'."\n"; |
$ctr++; |
$ctr++; |
} |
} |
Line 4389 sub scantron_uploads {
|
Line 4411 sub scantron_uploads {
|
my $result= '<select name="scantron_selectfile">'; |
my $result= '<select name="scantron_selectfile">'; |
$result.="<option></option>"; |
$result.="<option></option>"; |
foreach my $filename (sort(&scantron_filenames())) { |
foreach my $filename (sort(&scantron_filenames())) { |
$result.="<option".($filename eq $file2grade ? ' selected="on"':'').">$filename</option>\n"; |
$result.="<option".($filename eq $file2grade ? ' selected="selected"':'').">$filename</option>\n"; |
} |
} |
$result.="</select>"; |
$result.="</select>"; |
return $result; |
return $result; |
Line 4885 sub scantron_process_corrections {
|
Line 4907 sub scantron_process_corrections {
|
} |
} |
} |
} |
if ($err) { |
if ($err) { |
$r->print("<font color='red'>Unable to accept last correction, an error occurred :$errmsg:</font>"); |
$r->print("<span class=\"LC_warning\">Unable to accept last correction, an error occurred :$errmsg:</span>"); |
} else { |
} else { |
&scantron_put_line($scanlines,$scan_data,$which,$line,$skip); |
&scantron_put_line($scanlines,$scan_data,$which,$line,$skip); |
&scantron_putfile($scanlines,$scan_data); |
&scantron_putfile($scanlines,$scan_data); |
Line 4940 sub remember_current_skipped {
|
Line 4962 sub remember_current_skipped {
|
sub check_for_error { |
sub check_for_error { |
my ($r,$result)=@_; |
my ($r,$result)=@_; |
if ($result ne 'ok' && $result ne 'not_found' ) { |
if ($result ne 'ok' && $result ne 'not_found' ) { |
$r->print("An error occured ($result) when trying to Remove the existing corrections."); |
$r->print("An error occurred ($result) when trying to Remove the existing corrections."); |
} |
} |
} |
} |
|
|
Line 4953 sub scantron_warning_screen {
|
Line 4975 sub scantron_warning_screen {
|
$scantron_config{'CODEstart'} && |
$scantron_config{'CODEstart'} && |
$scantron_config{'CODElength'}) { |
$scantron_config{'CODElength'}) { |
$CODElist=$env{'form.scantron_CODElist'}; |
$CODElist=$env{'form.scantron_CODElist'}; |
if ($env{'form.scantron_CODElist'} eq '') { $CODElist='<font color="red">None</font>'; } |
if ($env{'form.scantron_CODElist'} eq '') { $CODElist='<span class="LC_warning">None</span>'; } |
$CODElist= |
$CODElist= |
'<tr><td><b>List of CODES to validate against:</b></td><td><tt>'. |
'<tr><td><b>List of CODES to validate against:</b></td><td><tt>'. |
$env{'form.scantron_CODElist'}.'</tt></td></tr>'; |
$env{'form.scantron_CODElist'}.'</tt></td></tr>'; |
} |
} |
return (<<STUFF); |
return (<<STUFF); |
<p> |
<p> |
<font color="red">Please double check the information |
<span class="LC_warning">Please double check the information |
below before clicking on '$button_text'</font> |
below before clicking on '$button_text'</span> |
</p> |
</p> |
<table> |
<table> |
<tr><td><b>Sequence to be Graded:</b></td><td>$title</td></tr> |
<tr><td><b>Sequence to be Graded:</b></td><td>$title</td></tr> |
<tr><td><b>Data File that will be used:</b></td><td><tt>$env{'form.scantron_selectfile'}</tt></td></tr> |
<tr><td><b>Data File that will be used:</b></td><td><tt>$env{'form.scantron_selectfile'}</tt></td></tr> |
$CODElist |
$CODElist |
</table> |
</table> |
</font> |
|
<br /> |
<br /> |
<p> If this information is correct, please click on '$button_text'.</p> |
<p> If this information is correct, please click on '$button_text'.</p> |
<p> If something is incorrect, please click the 'Grading Menu' button to start over.</p> |
<p> If something is incorrect, please click the 'Grading Menu' button to start over.</p> |
Line 4988 sub scantron_do_warning {
|
Line 5009 sub scantron_do_warning {
|
$env{'form.scantron_format'} eq '' ) { |
$env{'form.scantron_format'} eq '' ) { |
$r->print("<p>You have forgetten to specify some information. Please go Back and try again.</p>"); |
$r->print("<p>You have forgetten to specify some information. Please go Back and try again.</p>"); |
if ( $env{'form.selectpage'} eq '') { |
if ( $env{'form.selectpage'} eq '') { |
$r->print('<p><font color="red">You have not selected a Sequence to grade</font></p>'); |
$r->print('<p><span class="LC_error">You have not selected a Sequence to grade</span></p>'); |
} |
} |
if ( $env{'form.scantron_selectfile'} eq '') { |
if ( $env{'form.scantron_selectfile'} eq '') { |
$r->print('<p><font color="red">You have not selected a file that contains the student\'s response data.</font></p>'); |
$r->print('<p><span class="LC_error">You have not selected a file that contains the student\'s response data.</span></p>'); |
} |
} |
if ( $env{'form.scantron_format'} eq '') { |
if ( $env{'form.scantron_format'} eq '') { |
$r->print('<p><font color="red">You have not selected a the format of the student\'s response data.</font></p>'); |
$r->print('<p><span class="LC_error">You have not selected a the format of the student\'s response data.</span></p>'); |
} |
} |
} else { |
} else { |
my $warning=&scantron_warning_screen('Grading: Validate Records'); |
my $warning=&scantron_warning_screen('Grading: Validate Records'); |
Line 5403 sub scantron_get_correction {
|
Line 5424 sub scantron_get_correction {
|
if ($closest > 0) { |
if ($closest > 0) { |
foreach my $testcode (@{$closest}) { |
foreach my $testcode (@{$closest}) { |
my $checked=''; |
my $checked=''; |
if (!$i) { $checked=' checked="on" '; } |
if (!$i) { $checked=' checked="checked" '; } |
$r->print("<label><input type='radio' name='scantron_CODE_resolution' value='use_closest_$i' $checked /> Use the similar CODE <b><tt>".$testcode."</tt></b> instead.</label><input type='hidden' name='scantron_CODE_closest_$i' value='$testcode' />"); |
$r->print("<label><input type='radio' name='scantron_CODE_resolution' value='use_closest_$i' $checked /> Use the similar CODE <b><tt>".$testcode."</tt></b> instead.</label><input type='hidden' name='scantron_CODE_closest_$i' value='$testcode' />"); |
$r->print("\n<br />"); |
$r->print("\n<br />"); |
$i++; |
$i++; |
Line 5411 sub scantron_get_correction {
|
Line 5432 sub scantron_get_correction {
|
} |
} |
} |
} |
if ($$scan_record{'scantron.CODE'}=~/\S/ ) { |
if ($$scan_record{'scantron.CODE'}=~/\S/ ) { |
my $checked; if (!$i) { $checked=' checked="on" '; } |
my $checked; if (!$i) { $checked=' checked="checked" '; } |
$r->print("<label><input type='radio' name='scantron_CODE_resolution' value='use_unfound' $checked /> Use the CODE <b><tt>".$$scan_record{'scantron.CODE'}."</tt></b> that is was on the paper, ignoring the error.</label>"); |
$r->print("<label><input type='radio' name='scantron_CODE_resolution' value='use_unfound' $checked /> Use the CODE <b><tt>".$$scan_record{'scantron.CODE'}."</tt></b> that is was on the paper, ignoring the error.</label>"); |
$r->print("\n<br />"); |
$r->print("\n<br />"); |
} |
} |
Line 5846 sub scantron_upload_scantron_data_save {
|
Line 5867 sub scantron_upload_scantron_data_save {
|
my $uploadedfile=$fname; |
my $uploadedfile=$fname; |
$fname='scantron_orig_'.$fname; |
$fname='scantron_orig_'.$fname; |
if (length($env{'form.upfile'}) < 2) { |
if (length($env{'form.upfile'}) < 2) { |
$r->print("<font color='red'>Error:</font> The file you attempted to upload, <tt>".&HTML::Entities::encode($env{'form.upfile.filename'},'<>&"')."</tt>, contained no information. Please check that you entered the correct filename."); |
$r->print("<span class=\"LC_error\">Error:</span> The file you attempted to upload, <tt>".&HTML::Entities::encode($env{'form.upfile.filename'},'<>&"')."</tt>, contained no information. Please check that you entered the correct filename."); |
} else { |
} else { |
my $result=&Apache::lonnet::finishuserfileupload($env{'form.courseid'},$env{'form.domainid'},'upfile',$fname); |
my $result=&Apache::lonnet::finishuserfileupload($env{'form.courseid'},$env{'form.domainid'},'upfile',$fname); |
if ($result =~ m|^/uploaded/|) { |
if ($result =~ m|^/uploaded/|) { |
$r->print("<font color='green'>Success:</font> Successfully uploaded ".(length($env{'form.upfile'})-1)." bytes of data into location <tt>".$result."</tt>"); |
$r->print("<span class=\"LC_success\">Success:</span> Successfully uploaded ".(length($env{'form.upfile'})-1)." bytes of data into location <tt>".$result."</tt>"); |
} else { |
} else { |
$r->print("<font color='red'>Error:</font> An error (".$result.") occurred when attempting to upload the file, <tt>".&HTML::Entities::encode($env{'form.upfile.filename'},'<>&"')."</tt>"); |
$r->print("<span class=\"LC_error\">Error:</span> An error (".$result.") occurred when attempting to upload the file, <tt>".&HTML::Entities::encode($env{'form.upfile.filename'},'<>&"')."</tt>"); |
} |
} |
} |
} |
if ($symb) { |
if ($symb) { |
Line 5981 sub gradingmenu {
|
Line 6002 sub gradingmenu {
|
</script> |
</script> |
GRADINGMENUJS |
GRADINGMENUJS |
&commonJSfunctions($request); |
&commonJSfunctions($request); |
my $result='<h3> <font color="#339933">Manual Grading/View Submission</font></h3>'; |
my $result='<h3> <span class="LC_info">Manual Grading/View Submission</span></h3>'; |
my ($table,undef,$hdgrade) = &showResourceInfo($symb,$probTitle); |
my ($table,undef,$hdgrade) = &showResourceInfo($symb,$probTitle); |
$result.=$table; |
$result.=$table; |
my (undef,$sections) = &getclasslist('all','0'); |
my (undef,$sections) = &getclasslist('all','0'); |
Line 6011 GRADINGMENUJS
|
Line 6032 GRADINGMENUJS
|
if (ref($sections)) { |
if (ref($sections)) { |
foreach (sort (@$sections)) { |
foreach (sort (@$sections)) { |
$result.='<option value="'.$_.'" '. |
$result.='<option value="'.$_.'" '. |
($saveSec eq $_ ? 'selected="on"':'').'>'.$_.'</option>'."\n"; |
($saveSec eq $_ ? 'selected="selected"':'').'>'.$_.'</option>'."\n"; |
} |
} |
} |
} |
$result.= '<option value="all" '.($saveSec eq 'all' ? 'selected="on"' : ''). '>all</option></select> '; |
$result.= '<option value="all" '.($saveSec eq 'all' ? 'selected="selected"' : ''). '>all</option></select> '; |
|
|
$result.=&mt('Student Status').':</b>'.&Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,1,undef); |
$result.=&mt('Student Status').':'.&Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,1,undef); |
|
|
$result.='</td></tr>'; |
$result.='</td></tr>'; |
|
|
$result.='<tr bgcolor="#ffffe6"valign="top"><td><label>'. |
$result.='<tr bgcolor="#ffffe6"valign="top"><td><label>'. |
'<input type="radio" name="radioChoice" value="submission" '. |
'<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="checked"' : '').' /> '.'<b>'.&mt('Current Resource').':</b> '.&mt('For one or more students'). |
'</label> <select name="submitonly">'. |
'</label> <select name="submitonly">'. |
'<option value="yes" '. |
'<option value="yes" '. |
($saveSub eq 'yes' ? 'selected="on"' : '').' />'.&mt('with submissions').'</option>'. |
($saveSub eq 'yes' ? 'selected="selected"' : '').'>'.&mt('with submissions').'</option>'. |
'<option value="queued" '. |
'<option value="queued" '. |
($saveSub eq 'queued' ? 'selected="on"' : '').' />'.&mt('in grading queue').'</option>'. |
($saveSub eq 'queued' ? 'selected="selected"' : '').'>'.&mt('in grading queue').'</option>'. |
'<option value="graded" '. |
'<option value="graded" '. |
($saveSub eq 'graded' ? 'selected="on"' : '').' />'.&mt('with ungraded submissions').'</option>'. |
($saveSub eq 'graded' ? 'selected="selected"' : '').'>'.&mt('with ungraded submissions').'</option>'. |
'<option value="incorrect" '. |
'<option value="incorrect" '. |
($saveSub eq 'incorrect' ? 'selected="on"' : '').' />'.&mt('with incorrect submissions').'</option>'. |
($saveSub eq 'incorrect' ? 'selected="selected"' : '').'>'.&mt('with incorrect submissions').'</option>'. |
'<option value="all" '. |
'<option value="all" '. |
($saveSub eq 'all' ? 'selected="on"' : '').' />'.&mt('with any status').'</option></select></td></tr>'."\n"; |
($saveSub eq 'all' ? 'selected="selected"' : '').'>'.&mt('with any status').'</option></select></td></tr>'."\n"; |
|
|
$result.='<tr bgcolor="#ffffe6"valign="top"><td>'. |
$result.='<tr bgcolor="#ffffe6"valign="top"><td>'. |
'<label><input type="radio" name="radioChoice" value="viewgrades" '. |
'<label><input type="radio" name="radioChoice" value="viewgrades" '. |
($saveCmd eq 'viewgrades' ? 'checked' : '').' /> '. |
($saveCmd eq 'viewgrades' ? 'checked="checked"' : '').' /> '. |
'<b>Current Resource:</b> For all students in selected section or course</label></td></tr>'."\n"; |
'<b>Current Resource:</b> For all students in selected section or course</label></td></tr>'."\n"; |
|
|
$result.='<tr bgcolor="#ffffe6" valign="top"><td>'. |
$result.='<tr bgcolor="#ffffe6" valign="top"><td>'. |
'<label><input type="radio" name="radioChoice" value="pickStudentPage" '. |
'<label><input type="radio" name="radioChoice" value="pickStudentPage" '. |
($saveCmd eq 'pickStudentPage' ? 'checked' : '').' /> '. |
($saveCmd eq 'pickStudentPage' ? 'checked="checked"' : '').' /> '. |
'The <b>complete</b> set/page/sequence: For one student</label></td></tr>'."\n"; |
'The <b>complete</b> set/page/sequence: For one student</label></td></tr>'."\n"; |
|
|
$result.='<tr bgcolor="#ffffe6"><td><br />'. |
$result.='<tr bgcolor="#ffffe6"><td><br />'. |
Line 6056 GRADINGMENUJS
|
Line 6077 GRADINGMENUJS
|
'<input type="button" onClick="javascript:checkChoice(this.form,\'3\',\'csvform\');" value="'.&mt('Upload').'" />'. |
'<input type="button" onClick="javascript:checkChoice(this.form,\'3\',\'csvform\');" value="'.&mt('Upload').'" />'. |
' '.&mt('scores from file').' </td></tr>'."\n"; |
' '.&mt('scores from file').' </td></tr>'."\n"; |
|
|
|
$result.='<tr bgcolor="#ffffe6"><td>'. |
|
'<input type="button" onClick="javascript:checkChoice(this.form,\'6\',\'processclicker\');" value="'.&mt('Process').'" />'. |
|
' '.&mt('clicker file').' </td></tr>'."\n"; |
|
|
$result.='<tr bgcolor="#ffffe6"valign="top"><td colspan="2">'. |
$result.='<tr bgcolor="#ffffe6"valign="top"><td colspan="2">'. |
'<input type="button" onClick="javascript:checkChoice(this.form,\'4\',\'scantron_selectphase\');'. |
'<input type="button" onClick="javascript:checkChoice(this.form,\'4\',\'scantron_selectphase\');'. |
'" value="'.&mt('Grade').'" /> scantron forms</td></tr>'."\n"; |
'" value="'.&mt('Grade').'" /> scantron forms</td></tr>'."\n"; |
Line 6075 GRADINGMENUJS
|
Line 6100 GRADINGMENUJS
|
'<input type="button" onClick="javascript:this.form.command.value=\'codelist\';this.form.action=\'/adm/pickcode\';this.form.submit();'. |
'<input type="button" onClick="javascript:this.form.command.value=\'codelist\';this.form.action=\'/adm/pickcode\';this.form.submit();'. |
'" value="'.&mt('View').'" /> saved CODEs.</td></tr>'."\n"; |
'" value="'.&mt('View').'" /> saved CODEs.</td></tr>'."\n"; |
|
|
$result.='</form></td></tr></table>'."\n". |
$result.='</table>'."\n". |
'</td></tr></table>'."\n". |
'</td></tr></table>'."\n". |
'</td></tr></table>'."\n"; |
'</td></tr></table></form>'."\n"; |
return $result; |
return $result; |
} |
} |
|
|
Line 6103 sub init_perm {
|
Line 6128 sub init_perm {
|
} |
} |
} |
} |
|
|
|
sub gather_clicker_ids { |
|
my %clicker_ids; |
|
|
|
my $classlist = &Apache::loncoursedata::get_classlist(); |
|
|
|
# Set up a couple variables. |
|
my $username_idx = &Apache::loncoursedata::CL_SNAME(); |
|
my $domain_idx = &Apache::loncoursedata::CL_SDOM(); |
|
|
|
foreach my $student (keys(%$classlist)) { |
|
|
|
my $username = $classlist->{$student}->[$username_idx]; |
|
my $domain = $classlist->{$student}->[$domain_idx]; |
|
my $clickers = |
|
(&Apache::lonnet::userenvironment($domain,$username,'clickers'))[1]; |
|
foreach my $id (split(/\,/,$clickers)) { |
|
$id=~s/^[\#0]+//; |
|
if (exists($clicker_ids{$id})) { |
|
$clicker_ids{$id}.=','.$username.':'.$domain; |
|
} else { |
|
$clicker_ids{$id}=$username.':'.$domain; |
|
} |
|
} |
|
} |
|
return %clicker_ids; |
|
} |
|
|
|
sub gather_adv_clicker_ids { |
|
my %clicker_ids; |
|
my $cnum=$env{'course.'.$env{'request.course.id'}.'.num'}; |
|
my $cdom=$env{'course.'.$env{'request.course.id'}.'.domain'}; |
|
my %coursepersonnel=&Apache::lonnet::get_course_adv_roles($cdom.'/'.$cnum); |
|
foreach my $element (sort(keys(%coursepersonnel))) { |
|
foreach my $person (split(/\,/,$coursepersonnel{$element})) { |
|
my ($puname,$pudom)=split(/\:/,$person); |
|
my $clickers = |
|
(&Apache::lonnet::userenvironment($pudom,$puname,'clickers'))[1]; |
|
foreach my $id (split(/\,/,$clickers)) { |
|
$id=~s/^[\#0]+//; |
|
if (exists($clicker_ids{$id})) { |
|
$clicker_ids{$id}.=','.$puname.':'.$pudom; |
|
} else { |
|
$clicker_ids{$id}=$puname.':'.$pudom; |
|
} |
|
} |
|
} |
|
} |
|
return %clicker_ids; |
|
} |
|
|
|
sub clicker_grading_parameters { |
|
return ('gradingmechanism' => 'scalar', |
|
'upfiletype' => 'scalar', |
|
'specificid' => 'scalar', |
|
'pcorrect' => 'scalar', |
|
'pincorrect' => 'scalar'); |
|
} |
|
|
|
sub process_clicker { |
|
my ($r)=@_; |
|
my ($symb)=&get_symb($r); |
|
if (!$symb) {return '';} |
|
my $result=&checkforfile_js(); |
|
$env{'form.probTitle'} = &Apache::lonnet::gettitle($symb); |
|
my ($table) = &showResourceInfo($symb,$env{'form.probTitle'}); |
|
$result.=$table; |
|
$result.='<br /><table width="100%" border="0"><tr><td bgcolor="#777777">'."\n"; |
|
$result.='<table width="100%" border="0"><tr bgcolor="#e6ffff"><td>'."\n"; |
|
$result.=' <b>'.&mt('Specify a file containing the clicker information for this resource'). |
|
'.</b></td></tr>'."\n"; |
|
$result.='<tr bgcolor=#ffffe6><td>'."\n"; |
|
# Attempt to restore parameters from last session, set defaults if not present |
|
my %Saveable_Parameters=&clicker_grading_parameters(); |
|
&Apache::loncommon::restore_course_settings('grades_clicker', |
|
\%Saveable_Parameters); |
|
if (!$env{'form.pcorrect'}) { $env{'form.pcorrect'}=100; } |
|
if (!$env{'form.pincorrect'}) { $env{'form.pincorrect'}=100; } |
|
if (!$env{'form.gradingmechanism'}) { $env{'form.gradingmechanism'}='attendance'; } |
|
if (!$env{'form.upfiletype'}) { $env{'form.upfiletype'}='iclicker'; } |
|
|
|
my %checked; |
|
foreach my $gradingmechanism ('attendance','personnel','specific') { |
|
if ($env{'form.gradingmechanism'} eq $gradingmechanism) { |
|
$checked{$gradingmechanism}="checked='checked'"; |
|
} |
|
} |
|
|
|
my $upload=&mt("Upload File"); |
|
my $type=&mt("Type"); |
|
my $attendance=&mt("Award points just for participation"); |
|
my $personnel=&mt("Correctness determined from response by course personnel"); |
|
my $specific=&mt("Correctness determined from response with clicker ID(s)"); |
|
my $pcorrect=&mt("Percentage points for correct solution"); |
|
my $pincorrect=&mt("Percentage points for incorrect solution"); |
|
my $selectform=&Apache::loncommon::select_form($env{'form.upfiletype'},'upfiletype', |
|
('iclicker' => 'i>clicker')); |
|
|
|
$result.=<<ENDUPFORM; |
|
<script type="text/javascript"> |
|
function sanitycheck() { |
|
// Accept only integer percentages |
|
document.forms.gradesupload.pcorrect.value=Math.round(document.forms.gradesupload.pcorrect.value); |
|
document.forms.gradesupload.pincorrect.value=Math.round(document.forms.gradesupload.pincorrect.value); |
|
// Find out grading choice |
|
for (i=0; i<document.forms.gradesupload.gradingmechanism.length; i++) { |
|
if (document.forms.gradesupload.gradingmechanism[i].checked) { |
|
gradingchoice=document.forms.gradesupload.gradingmechanism[i].value; |
|
} |
|
} |
|
// By default, new choice equals user selection |
|
newgradingchoice=gradingchoice; |
|
// Not good to give more points for false answers than correct ones |
|
if (Math.round(document.forms.gradesupload.pcorrect.value)<Math.round(document.forms.gradesupload.pincorrect.value)) { |
|
document.forms.gradesupload.pcorrect.value=document.forms.gradesupload.pincorrect.value; |
|
} |
|
// If new choice is attendance only, and old choice was correctness-based, restore defaults |
|
if ((gradingchoice=='attendance') && (document.forms.gradesupload.waschecked.value!='attendance')) { |
|
document.forms.gradesupload.pcorrect.value=100; |
|
document.forms.gradesupload.pincorrect.value=100; |
|
} |
|
// If the values are different, cannot be attendance only |
|
if ((Math.round(document.forms.gradesupload.pcorrect.value)!=Math.round(document.forms.gradesupload.pincorrect.value)) && |
|
(gradingchoice=='attendance')) { |
|
newgradingchoice='personnel'; |
|
} |
|
// Change grading choice to new one |
|
for (i=0; i<document.forms.gradesupload.gradingmechanism.length; i++) { |
|
if (document.forms.gradesupload.gradingmechanism[i].value==newgradingchoice) { |
|
document.forms.gradesupload.gradingmechanism[i].checked=true; |
|
} else { |
|
document.forms.gradesupload.gradingmechanism[i].checked=false; |
|
} |
|
} |
|
// Remember the old state |
|
document.forms.gradesupload.waschecked.value=newgradingchoice; |
|
} |
|
</script> |
|
<form method="post" enctype="multipart/form-data" action="/adm/grades" name="gradesupload"> |
|
<input type="hidden" name="symb" value="$symb" /> |
|
<input type="hidden" name="command" value="processclickerfile" /> |
|
<input type="hidden" name="probTitle" value="$env{'form.probTitle'}" /> |
|
<input type="hidden" name="saveState" value="$env{'form.saveState'}" /> |
|
<input type="file" name="upfile" size="50" /> |
|
<br /><label>$type: $selectform</label> |
|
<br /><label>$attendance: <input type="radio" name="gradingmechanism" value="attendance" $checked{'attendance'} onClick="sanitycheck()" /></label> |
|
<br /><label>$personnel: <input type="radio" name="gradingmechanism" value="personnel" $checked{'personnel'} onClick="sanitycheck()" /></label> |
|
<br /><label>$specific: <input type="radio" name="gradingmechanism" value="specific" $checked{'specific'} onClick="sanitycheck()" /></label> |
|
<input type="text" name="specificid" value="$env{'form.specificid'}" size="20" /> |
|
<input type="hidden" name="waschecked" value="$env{'form.gradingmechanism'}" /> |
|
<br /><label>$pcorrect: <input type="text" name="pcorrect" size="4" value="$env{'form.pcorrect'}" onChange="sanitycheck()" /></label> |
|
<br /><label>$pincorrect: <input type="text" name="pincorrect" size="4" value="$env{'form.pincorrect'}" onChange="sanitycheck()" /></label> |
|
<br /><input type="button" onClick="javascript:checkUpload(this.form);" value="$upload" /> |
|
</form> |
|
ENDUPFORM |
|
$result.='</td></tr></table>'."\n". |
|
'</td></tr></table><br /><br />'."\n"; |
|
$result.=&show_grading_menu_form($symb); |
|
return $result; |
|
} |
|
|
|
sub process_clicker_file { |
|
my ($r)=@_; |
|
my ($symb)=&get_symb($r); |
|
if (!$symb) {return '';} |
|
|
|
my %Saveable_Parameters=&clicker_grading_parameters(); |
|
&Apache::loncommon::store_course_settings('grades_clicker', |
|
\%Saveable_Parameters); |
|
|
|
my ($result) = &showResourceInfo($symb,$env{'form.probTitle'}); |
|
if (($env{'form.gradingmechanism'} eq 'specific') && ($env{'form.specificid'}!~/\w/)) { |
|
$result.='<span class="LC_error">'.&mt('You need to specify a clicker ID for the correct answer').'</span>'; |
|
return $result.&show_grading_menu_form($symb); |
|
} |
|
my %clicker_ids=&gather_clicker_ids(); |
|
my %correct_ids; |
|
if ($env{'form.gradingmechanism'} eq 'personnel') { |
|
%correct_ids=&gather_adv_clicker_ids(); |
|
} |
|
if ($env{'form.gradingmechanism'} eq 'specific') { |
|
foreach my $correct_id (split(/[\s\,]/,$env{'form.specificid'})) {; |
|
$correct_id=~tr/a-z/A-Z/; |
|
$correct_id=~s/\s//gs; |
|
$correct_id=~s/^[\#0]+//; |
|
if ($correct_id) { |
|
$correct_ids{$correct_id}='specified'; |
|
} |
|
} |
|
} |
|
if ($env{'form.gradingmechanism'} eq 'attendance') { |
|
$result.=&mt('Score based on attendance only'); |
|
} else { |
|
my $number=0; |
|
$result.='<p><b>'.&mt('Correctness determined by the following IDs').'</b>'; |
|
foreach my $id (sort(keys(%correct_ids))) { |
|
$result.='<br /><tt>'.$id.'</tt> - '; |
|
if ($correct_ids{$id} eq 'specified') { |
|
$result.=&mt('specified'); |
|
} else { |
|
my ($uname,$udom)=split(/\:/,$correct_ids{$id}); |
|
$result.=&Apache::loncommon::plainname($uname,$udom); |
|
} |
|
$number++; |
|
} |
|
$result.="</p>\n"; |
|
if ($number==0) { |
|
$result.='<span class="LC_error">'.&mt('No IDs found to determine correct answer').'</span>'; |
|
return $result.&show_grading_menu_form($symb); |
|
} |
|
} |
|
if (length($env{'form.upfile'}) < 2) { |
|
$result.=&mt('[_1] Error: [_2] The file you attempted to upload, [_3] contained no information. Please check that you entered the correct filename.', |
|
'<span class="LC_error">', |
|
'</span>', |
|
'<span class="LC_filename">'.&HTML::Entities::encode($env{'form.upfile.filename'},'<>&"').'</span>'); |
|
return $result.&show_grading_menu_form($symb); |
|
} |
|
|
|
# Were able to get all the info needed, now analyze the file |
|
|
|
$result.=&Apache::loncommon::studentbrowser_javascript(); |
|
my $heading=&mt('Scanning clicker file'); |
|
$result.=(<<ENDHEADER); |
|
<br /><table width="100%" border="0"><tr><td bgcolor="#777777"> |
|
<table width="100%" border="0"><tr bgcolor="#e6ffff"><td> |
|
<b>$heading</b></td></tr><tr bgcolor=#ffffe6><td> |
|
<form method="post" action="/adm/grades" name="clickeranalysis"> |
|
<input type="hidden" name="symb" value="$symb" /> |
|
<input type="hidden" name="command" value="assignclickergrades" /> |
|
<input type="hidden" name="probTitle" value="$env{'form.probTitle'}" /> |
|
<input type="hidden" name="saveState" value="$env{'form.saveState'}" /> |
|
<input type="hidden" name="gradingmechanism" value="$env{'form.gradingmechanism'}" /> |
|
<input type="hidden" name="pcorrect" value="$env{'form.pcorrect'}" /> |
|
<input type="hidden" name="pincorrect" value="$env{'form.pincorrect'}" /> |
|
ENDHEADER |
|
my %responses; |
|
my @questiontitles; |
|
my $errormsg=''; |
|
my $number=0; |
|
if ($env{'form.upfiletype'} eq 'iclicker') { |
|
($errormsg,$number)=&iclicker_eval(\@questiontitles,\%responses); |
|
} |
|
$result.='<br />'.&mt('Found [_1] question(s)',$number).'<br />'. |
|
'<input type="hidden" name="number" value="'.$number.'" />'. |
|
&mt('Awarding [_1] percent for correct and [_2] percent for incorrect responses', |
|
$env{'form.pcorrect'},$env{'form.pincorrect'}). |
|
'<br />'; |
|
# Remember Question Titles |
|
# FIXME: Possibly need delimiter other than ":" |
|
for (my $i=0;$i<$number;$i++) { |
|
$result.='<input type="hidden" name="question:'.$i.'" value="'. |
|
&HTML::Entities::encode($questiontitles[$i],'"&<>').'" />'; |
|
} |
|
my $correct_count=0; |
|
my $student_count=0; |
|
my $unknown_count=0; |
|
# Match answers with usernames |
|
# FIXME: Possibly need delimiter other than ":" |
|
foreach my $id (keys(%responses)) { |
|
if ($correct_ids{$id}) { |
|
$result.="\n".'<input type="hidden" name="correct:'.$correct_count.':'.$correct_ids{$id}.'" value="'.$responses{$id}.'" />'; |
|
$correct_count++; |
|
} elsif ($clicker_ids{$id}) { |
|
$result.="\n".'<input type="hidden" name="student:'.$clicker_ids{$id}.'" value="'.$responses{$id}.'" />'; |
|
$student_count++; |
|
} else { |
|
$result.="\n<hr />".&mt('Unregistered Clicker')." <tt>".$id."</tt><br />"; |
|
$result.="\n".'<input type="hidden" name="unknown:'.$id.'" value="'.$responses{$id}.'" />'. |
|
"\n".&mt("Username").": <input type='text' name='uname".$id."' /> ". |
|
"\n".&mt("Domain").": ". |
|
&Apache::loncommon::select_dom_form($env{'course.'.$env{'request.course.id'}.'.domain'},'udom'.$id).' '. |
|
&Apache::loncommon::selectstudent_link('clickeranalysis','uname'.$id,'udom'.$id); |
|
$unknown_count++; |
|
} |
|
} |
|
$result.='<hr />'. |
|
&mt('Found [_1] registered and [_2] unregistered clickers.',$student_count,$unknown_count); |
|
if ($env{'form.gradingmechanism'} ne 'attendance') { |
|
if ($correct_count==0) { |
|
$errormsg.="Found no correct answers answers for grading!"; |
|
} elsif ($correct_count>1) { |
|
$result.='<br /><span class="LC_warning">'.&mt("Found [_1] entries for grading!",$correct_count).'</span>'; |
|
} |
|
} |
|
if ($errormsg) { |
|
$result.='<br /><span class="LC_error">'.&mt($errormsg).'</span>'; |
|
} else { |
|
$result.='<br /><input type="submit" name="finalize" value="'.&mt('Finalize Grading').'" />'; |
|
} |
|
$result.='</form></td></tr></table>'."\n". |
|
'</td></tr></table><br /><br />'."\n"; |
|
return $result.&show_grading_menu_form($symb); |
|
} |
|
|
|
sub iclicker_eval { |
|
my ($questiontitles,$responses)=@_; |
|
my $number=0; |
|
my $errormsg=''; |
|
foreach my $line (split(/[\n\r]/,$env{'form.upfile'})) { |
|
my %components=&Apache::loncommon::record_sep($line); |
|
my @entries=map {$components{$_}} (sort(keys(%components))); |
|
if ($entries[0] eq 'Question') { |
|
for (my $i=3;$i<$#entries;$i+=6) { |
|
$$questiontitles[$number]=$entries[$i]; |
|
$number++; |
|
} |
|
} |
|
if ($entries[0]=~/^\#/) { |
|
my $id=$entries[0]; |
|
my @idresponses; |
|
$id=~s/^[\#0]+//; |
|
for (my $i=0;$i<$number;$i++) { |
|
my $idx=3+$i*6; |
|
push(@idresponses,$entries[$idx]); |
|
} |
|
$$responses{$id}=join(',',@idresponses); |
|
} |
|
} |
|
return ($errormsg,$number); |
|
} |
|
|
|
sub assign_clicker_grades { |
|
my ($r)=@_; |
|
my ($symb)=&get_symb($r); |
|
if (!$symb) {return '';} |
|
my ($result) = &showResourceInfo($symb,$env{'form.probTitle'}); |
|
my $heading=&mt('Assigning grades based on clicker file'); |
|
$result.=(<<ENDHEADER); |
|
<br /><table width="100%" border="0"><tr><td bgcolor="#777777"> |
|
<table width="100%" border="0"><tr bgcolor="#e6ffff"><td> |
|
<b>$heading</b></td></tr><tr bgcolor=#ffffe6><td> |
|
ENDHEADER |
|
# Get correct result |
|
# FIXME: Possibly need delimiter other than ":" |
|
my @correct=(); |
|
my $gradingmechanism=$env{'form.gradingmechanism'}; |
|
my $number=$env{'form.number'}; |
|
if ($gradingmechanism ne 'attendance') { |
|
foreach my $key (keys(%env)) { |
|
if ($key=~/^form\.correct\:/) { |
|
my @input=split(/\,/,$env{$key}); |
|
for (my $i=0;$i<=$#input;$i++) { |
|
if (($correct[$i]) && ($input[$i]) && |
|
($correct[$i] ne $input[$i])) { |
|
$result.='<br /><span class="LC_warning">'. |
|
&mt('More than one correct result given for question "[_1]": [_2] versus [_3].', |
|
$env{'form.question:'.$i},$correct[$i],$input[$i]).'</span>'; |
|
} elsif ($input[$i]) { |
|
$correct[$i]=$input[$i]; |
|
} |
|
} |
|
} |
|
} |
|
for (my $i=0;$i<$number;$i++) { |
|
if (!$correct[$i]) { |
|
$result.='<br /><span class="LC_error">'. |
|
&mt('No correct result given for question "[_1]"!', |
|
$env{'form.question:'.$i}).'</span>'; |
|
} |
|
} |
|
$result.='<br />'.&mt("Correct answer: [_1]",join(', ',map { ($_?$_:'-') } @correct)); |
|
} |
|
# Start grading |
|
my $pcorrect=$env{'form.pcorrect'}; |
|
my $pincorrect=$env{'form.pincorrect'}; |
|
foreach my $key (keys(%env)) { |
|
if ($key=~/^form\.student\:(.*)$/) { |
|
my $user=$1; |
|
my @answer=split(/\,/,$env{$key}); |
|
my $sum=0; |
|
for (my $i=0;$i<$number;$i++) { |
|
if ($answer[$i]) { |
|
if ($gradingmechanism eq 'attendance') { |
|
$sum+=$pcorrect; |
|
} else { |
|
if ($answer[$i] eq $correct[$i]) { |
|
$sum+=$pcorrect; |
|
} else { |
|
$sum+=$pincorrect; |
|
} |
|
} |
|
} |
|
} |
|
my $ave=$sum/$number; |
|
$result.='<br />'.$user.' - '.$env{$key}.': '.$ave; |
|
} |
|
} |
|
# We are done |
|
$result.='</td></tr></table>'."\n". |
|
'</td></tr></table><br /><br />'."\n"; |
|
return $result.&show_grading_menu_form($symb); |
|
} |
|
|
sub handler { |
sub handler { |
my $request=$_[0]; |
my $request=$_[0]; |
|
|
Line 6150 sub handler {
|
Line 6568 sub handler {
|
} |
} |
} else { |
} else { |
&init_perm(); |
&init_perm(); |
&Apache::lonnet::logthis("command is $command"); |
|
foreach my $key (keys %perm) { |
|
&Apache::lonnet::logthis("key is $key"); |
|
} |
|
if ($command eq 'submission' && $perm{'vgr'}) { |
if ($command eq 'submission' && $perm{'vgr'}) { |
($env{'form.student'} eq '' ? &listStudents($request) : &submission($request,0,0)); |
($env{'form.student'} eq '' ? &listStudents($request) : &submission($request,0,0)); |
} elsif ($command eq 'pickStudentPage' && $perm{'vgr'}) { |
} elsif ($command eq 'pickStudentPage' && $perm{'vgr'}) { |
Line 6174 sub handler {
|
Line 6588 sub handler {
|
$request->print(&editgrades($request)); |
$request->print(&editgrades($request)); |
} elsif ($command eq 'verify' && $perm{'vgr'}) { |
} elsif ($command eq 'verify' && $perm{'vgr'}) { |
$request->print(&verifyreceipt($request)); |
$request->print(&verifyreceipt($request)); |
|
} elsif ($command eq 'processclicker' && $perm{'mgr'}) { |
|
$request->print(&process_clicker($request)); |
|
} elsif ($command eq 'processclickerfile' && $perm{'mgr'}) { |
|
$request->print(&process_clicker_file($request)); |
|
} elsif ($command eq 'assignclickergrades' && $perm{'mgr'}) { |
|
$request->print(&assign_clicker_grades($request)); |
} elsif ($command eq 'csvform' && $perm{'mgr'}) { |
} elsif ($command eq 'csvform' && $perm{'mgr'}) { |
$request->print(&upcsvScores_form($request)); |
$request->print(&upcsvScores_form($request)); |
} elsif ($command eq 'csvupload' && $perm{'mgr'}) { |
} elsif ($command eq 'csvupload' && $perm{'mgr'}) { |