version 1.126, 2003/07/28 18:04:39
|
version 1.130.2.1.2.6, 2003/09/29 21:31:30
|
Line 96 sub get_fullname {
|
Line 96 sub get_fullname {
|
return $fullname; |
return $fullname; |
} |
} |
|
|
|
#--- Format fullname, username:domain if different for display |
|
#--- Use anywhere where the student names are listed |
|
sub nameUserString { |
|
my ($type,$fullname,$uname,$udom) = @_; |
|
if ($type eq 'header') { |
|
return '<b> Fullname </b><font color="#999999">(Username)</font> '; |
|
} else { |
|
return ' '.$fullname.'<font color="#999999"> ('.$uname. |
|
($ENV{'user.domain'} eq $udom ? '' : ' ('.$udom.')').')</font>'; |
|
} |
|
} |
|
|
#--- Get the partlist and the response type for a given problem. --- |
#--- Get the partlist and the response type for a given problem. --- |
#--- Indicate if a response type is coded handgraded or not. --- |
#--- Indicate if a response type is coded handgraded or not. --- |
sub response_type { |
sub response_type { |
Line 109 sub response_type {
|
Line 121 sub response_type {
|
my ($responsetype,$part) = split(/_/,$_,2); |
my ($responsetype,$part) = split(/_/,$_,2); |
my ($partid,$respid) = split(/_/,$part); |
my ($partid,$respid) = split(/_/,$part); |
$responsetype =~ s/response$//; # make it compatible w/ navmaps - should move to that!! |
$responsetype =~ s/response$//; # make it compatible w/ navmaps - should move to that!! |
# my ($value) = &Apache::lonnet::EXT('resource.'.$part.'.handgrade',$symb); |
my ($value) = &Apache::lonnet::EXT('resource.'.$part.'.handgrade',$symb); |
# $handgrade{$part} = $responsetype.':'.($value eq 'yes' ? 'yes' : 'no'); #a bug $value is 'yes' regardless |
$handgrade{$part} = $responsetype.':'.($value eq 'yes' ? 'yes' : 'no'); |
$handgrade{$part} = $responsetype.':'.(($allkeys =~ /parameter_$part\_handgrade/) ? 'yes' : 'no'); |
|
next if ($seen{$partid} > 0); |
next if ($seen{$partid} > 0); |
$seen{$partid}++; |
$seen{$partid}++; |
push @partlist,$partid; |
push @partlist,$partid; |
Line 299 sub student_gradeStatus {
|
Line 310 sub student_gradeStatus {
|
my %record = &Apache::lonnet::restore($symb,$ENV{'request.course.id'},$udom,$uname); |
my %record = &Apache::lonnet::restore($symb,$ENV{'request.course.id'},$udom,$uname); |
my %partstatus = (); |
my %partstatus = (); |
foreach (@$partlist) { |
foreach (@$partlist) { |
my ($status,$foo) = split(/_/,$record{"resource.$_.solved"},2); |
my ($status,undef) = split(/_/,$record{"resource.$_.solved"},2); |
$status = 'nothing' if ($status eq ''); |
$status = 'nothing' if ($status eq ''); |
$partstatus{$_} = $status; |
$partstatus{$_} = $status; |
my $subkey = "resource.$_.submitted_by"; |
my $subkey = "resource.$_.submitted_by"; |
Line 540 LISTJAVASCRIPT
|
Line 551 LISTJAVASCRIPT
|
my $loop = 0; |
my $loop = 0; |
while ($loop < 2) { |
while ($loop < 2) { |
$gradeTable.='<td><b> No.</b> </td><td><b> Select </b></td>'. |
$gradeTable.='<td><b> No.</b> </td><td><b> Select </b></td>'. |
'<td><b> Fullname </b>'. |
'<td>'.&nameUserString('header').'</td>'; |
'<font color="#999999">(Username)</font> </td>'; |
|
if ($ENV{'form.showgrading'} eq 'yes' && $submitonly ne 'all') { |
if ($ENV{'form.showgrading'} eq 'yes' && $submitonly ne 'all') { |
foreach (sort(@$partlist)) { |
foreach (sort(@$partlist)) { |
$gradeTable.='<td><b> Part '.(split(/_/))[0].' Status </b></td>'; |
$gradeTable.='<td><b> Part '.(split(/_/))[0].' Status </b></td>'; |
Line 578 LISTJAVASCRIPT
|
Line 588 LISTJAVASCRIPT
|
$gradeTable.='<td align="right">'.$ctr.' </td>'. |
$gradeTable.='<td align="right">'.$ctr.' </td>'. |
'<td align="center"><input type=checkbox name="stuinfo" value="'. |
'<td align="center"><input type=checkbox name="stuinfo" value="'. |
$student.':'.$$fullname{$student}.' "></td>'."\n". |
$student.':'.$$fullname{$student}.' "></td>'."\n". |
'<td> '.$$fullname{$student}.' '."\n". |
'<td>'.&nameUserString(undef,$$fullname{$student},$uname,$udom).'</td>'."\n"; |
'<font color="#999999">('.$uname.')</font></td>'."\n"; |
|
|
|
if ($ENV{'form.showgrading'} eq 'yes' && $submitonly ne 'all') { |
if ($ENV{'form.showgrading'} eq 'yes' && $submitonly ne 'all') { |
foreach (sort keys(%status)) { |
foreach (sort keys(%status)) { |
Line 755 sub sub_page_js {
|
Line 764 sub sub_page_js {
|
for (i=0;i<=total;i++) { |
for (i=0;i<=total;i++) { |
for (j=0;j<parttot;j++) { |
for (j=0;j<parttot;j++) { |
var partid = formname["partid"+i+"_"+j].value; |
var partid = formname["partid"+i+"_"+j].value; |
var selopt = formname["GD_SEL"+i+"_"+partid]; |
if (formname["GD_SEL"+i+"_"+partid][0].selected) { |
if (selopt[0].selected) { |
|
var points = formname["GD_BOX"+i+"_"+partid].value; |
var points = formname["GD_BOX"+i+"_"+partid].value; |
if (points == "") { |
if (points == "") { |
var name = formname["name"+i].value; |
var name = formname["name"+i].value; |
var resp = confirm("You did not assign a score for "+name+", part "+partid+". Continue?"); |
var studentID = (name != '' ? name : formname["unamedom"+i].value); |
|
var resp = confirm("You did not assign a score for "+studentID+ |
|
", part "+partid+". Continue?"); |
if (resp == false) { |
if (resp == false) { |
formname["GD_BOX"+i+"_"+partid].focus(); |
formname["GD_BOX"+i+"_"+partid].focus(); |
return false; |
return false; |
Line 788 sub sub_page_js {
|
Line 798 sub sub_page_js {
|
var ptr = 0; |
var ptr = 0; |
for (i=1;i<total;i++) { |
for (i=1;i<total;i++) { |
var partid = formname["q_"+i].value; |
var partid = formname["q_"+i].value; |
var selopt = formname["GD_SEL"+i+"_"+partid]; |
if (formname["GD_SEL"+i+"_"+partid][0].selected) { |
if (selopt[0].selected) { |
|
var points = formname["GD_BOX"+i+"_"+partid].value; |
var points = formname["GD_BOX"+i+"_"+partid].value; |
var status = formname["solved"+i+"_"+partid].value; |
var status = formname["solved"+i+"_"+partid].value; |
if (points == "" && status != "correct_by_student") { |
if (points == "" && status != "correct_by_student") { |
Line 837 sub sub_page_kw_js {
|
Line 846 sub sub_page_kw_js {
|
if (nret==null) return; |
if (nret==null) return; |
formname.keywords.value = nret; |
formname.keywords.value = nret; |
|
|
formname.refresh.value = "on"; |
|
if (formname.keywords.value != "") { |
if (formname.keywords.value != "") { |
|
formname.refresh.value = "on"; |
formname.submit(); |
formname.submit(); |
} |
} |
return; |
return; |
Line 865 sub sub_page_kw_js {
|
Line 874 sub sub_page_kw_js {
|
} |
} |
var nret = prompt("Add selection to keyword list? Edit if desired.",cleantxt); |
var nret = prompt("Add selection to keyword list? Edit if desired.",cleantxt); |
if (nret==null) return; |
if (nret==null) return; |
var curlist = document.SCORE.keywords.value; |
document.SCORE.keywords.value = document.SCORE.keywords.value+" "+nret; |
document.SCORE.keywords.value = curlist+" "+nret; |
|
document.SCORE.refresh.value = "on"; |
|
if (document.SCORE.keywords.value != "") { |
if (document.SCORE.keywords.value != "") { |
|
document.SCORE.refresh.value = "on"; |
document.SCORE.submit(); |
document.SCORE.submit(); |
} |
} |
return; |
return; |
Line 885 sub sub_page_kw_js {
|
Line 893 sub sub_page_kw_js {
|
var Nmsg = msgform.savemsgN.value; |
var Nmsg = msgform.savemsgN.value; |
savedMsgHeader(Nmsg,usrctr,fullname); |
savedMsgHeader(Nmsg,usrctr,fullname); |
var subject = msgform.msgsub.value; |
var subject = msgform.msgsub.value; |
var rtrchk = document.SCORE["includemsg"+usrctr]; |
var msgchk = document.SCORE["includemsg"+usrctr].value; |
var msgchk = rtrchk.value; |
|
re = /msgsub/; |
re = /msgsub/; |
var shwsel = ""; |
var shwsel = ""; |
if (re.test(msgchk)) { shwsel = "checked" } |
if (re.test(msgchk)) { shwsel = "checked" } |
Line 934 sub sub_page_kw_js {
|
Line 941 sub sub_page_kw_js {
|
height = 600; |
height = 600; |
scrollbar = "yes"; |
scrollbar = "yes"; |
} |
} |
// if (window.pWin) {window.pWin.close(); window.pWin=null} |
|
var xpos = (screen.width-600)/2; |
var xpos = (screen.width-600)/2; |
xpos = (xpos < 0) ? '0' : xpos; |
xpos = (xpos < 0) ? '0' : xpos; |
var ypos = (screen.height-height)/2-30; |
var ypos = (screen.height-height)/2-30; |
Line 943 sub sub_page_kw_js {
|
Line 949 sub sub_page_kw_js {
|
pWin = window.open('', 'MessageCenter', 'toolbar=no,location=no,scrollbars='+scrollbar+',screenx='+xpos+',screeny='+ypos+',width=600,height='+height); |
pWin = window.open('', 'MessageCenter', 'toolbar=no,location=no,scrollbars='+scrollbar+',screenx='+xpos+',screeny='+ypos+',width=600,height='+height); |
pWin.focus(); |
pWin.focus(); |
pDoc = pWin.document; |
pDoc = pWin.document; |
|
pDoc.open('text/html','replace'); |
pDoc.write("<html><head>"); |
pDoc.write("<html><head>"); |
pDoc.write("<title>Message Central</title>"); |
pDoc.write("<title>Message Central</title>"); |
|
|
Line 1029 sub sub_page_kw_js {
|
Line 1036 sub sub_page_kw_js {
|
pDoc.write("<input type=\\"button\\" value=\\"Cancel\\" onClick=\\"self.close()\\"><br><br>"); |
pDoc.write("<input type=\\"button\\" value=\\"Cancel\\" onClick=\\"self.close()\\"><br><br>"); |
pDoc.write("</form>"); |
pDoc.write("</form>"); |
pDoc.write("</body></html>"); |
pDoc.write("</body></html>"); |
|
pDoc.close(); |
} |
} |
|
|
//====================== Script for keyword highlight options ============== |
//====================== Script for keyword highlight options ============== |
Line 1072 sub sub_page_kw_js {
|
Line 1080 sub sub_page_kw_js {
|
hwdWin = window.open('', 'KeywordHighlightCentral', 'toolbar=no,location=no,scrollbars=no,width=400,height=300,screenx='+xpos+',screeny='+ypos); |
hwdWin = window.open('', 'KeywordHighlightCentral', 'toolbar=no,location=no,scrollbars=no,width=400,height=300,screenx='+xpos+',screeny='+ypos); |
hwdWin.focus(); |
hwdWin.focus(); |
var hDoc = hwdWin.document; |
var hDoc = hwdWin.document; |
|
hDoc.open('text/html','replace'); |
hDoc.write("<html><head>"); |
hDoc.write("<html><head>"); |
hDoc.write("<title>Highlight Central</title>"); |
hDoc.write("<title>Highlight Central</title>"); |
|
|
Line 1120 sub sub_page_kw_js {
|
Line 1129 sub sub_page_kw_js {
|
hDoc.write("<input type=\\"button\\" value=\\"Cancel\\" onClick=\\"self.close()\\"><br><br>"); |
hDoc.write("<input type=\\"button\\" value=\\"Cancel\\" onClick=\\"self.close()\\"><br><br>"); |
hDoc.write("</form>"); |
hDoc.write("</form>"); |
hDoc.write("</body></html>"); |
hDoc.write("</body></html>"); |
|
hDoc.close(); |
} |
} |
|
|
</script> |
</script> |
Line 1353 KEYWORDS
|
Line 1363 KEYWORDS
|
my $result='<table border="0" width=100%><tr><td bgcolor="#777777">'."\n". |
my $result='<table border="0" width=100%><tr><td bgcolor="#777777">'."\n". |
'<table border="0" width=100%><tr bgcolor="#edffff"><td>'."\n"; |
'<table border="0" width=100%><tr bgcolor="#edffff"><td>'."\n"; |
|
|
$result.='<b>Fullname: </b>'.$ENV{'form.fullname'}. |
$result.='<b>Fullname: </b>'.&nameUserString(undef,$ENV{'form.fullname'},$uname,$udom).'<br />'."\n"; |
'<font color="#999999"> Username: '.$uname. |
|
($ENV{'user.domain'} eq $udom ? '' : ' ('.$udom.')').'</font><br />'."\n"; |
|
$result.='<input type="hidden" name="name'.$counter. |
$result.='<input type="hidden" name="name'.$counter. |
'" value="'.$ENV{'form.fullname'}.'" />'."\n"; |
'" value="'.$ENV{'form.fullname'}.'" />'."\n"; |
|
|
Line 1533 KEYWORDS
|
Line 1541 KEYWORDS
|
|
|
my %seen = (); |
my %seen = (); |
my @partlist; |
my @partlist; |
|
my @gradePartRespid; |
for (sort keys(%$handgrade)) { |
for (sort keys(%$handgrade)) { |
my ($partid,$respid) = split(/_/); |
my ($partid,$respid) = split(/_/); |
next if ($seen{$partid} > 0); |
next if ($seen{$partid} > 0); |
$seen{$partid}++; |
$seen{$partid}++; |
next if ($$handgrade{$_} =~ /:no$/ && $ENV{'form.lastSub'} =~ /^(hdgrade)$/); |
next if ($$handgrade{$_} =~ /:no$/ && $ENV{'form.lastSub'} =~ /^(hdgrade)$/); |
push @partlist,$partid; |
push @partlist,$partid; |
|
push @gradePartRespid,$partid.'.'.$respid; |
|
|
$request->print(&gradeBox($request,$symb,$uname,$udom,$counter,$partid,\%record)); |
$request->print(&gradeBox($request,$symb,$uname,$udom,$counter,$partid,\%record)); |
} |
} |
$result='<input type="hidden" name="partlist'.$counter. |
$result='<input type="hidden" name="partlist'.$counter. |
'" value="'.(join ":",@partlist).'" />'."\n"; |
'" value="'.(join ":",@partlist).'" />'."\n"; |
|
$result.='<input type="hidden" name="gradePartRespid'. |
|
'" value="'.(join ":",@gradePartRespid).'" />'."\n" if ($counter == 0); |
my $ctr = 0; |
my $ctr = 0; |
while ($ctr < scalar(@partlist)) { |
while ($ctr < scalar(@partlist)) { |
$result.='<input type="hidden" name="partid'.$counter.'_'.$ctr.'" value="'. |
$result.='<input type="hidden" name="partid'.$counter.'_'.$ctr.'" value="'. |
Line 1769 sub processHandGrade {
|
Line 1781 sub processHandGrade {
|
} |
} |
} |
} |
$ctr = 0; |
$ctr = 0; |
my ($partlist,$handgrade) = &response_type($ENV{'form.url'},$symb); |
|
@parsedlist = reverse @parsedlist if ($button eq 'Previous'); |
@parsedlist = reverse @parsedlist if ($button eq 'Previous'); |
foreach my $student (@parsedlist) { |
foreach my $student (@parsedlist) { |
my ($uname,$udom) = split(/:/,$student); |
my ($uname,$udom) = split(/:/,$student); |
if ($ENV{'form.submitonly'} eq 'yes') { |
if ($ENV{'form.submitonly'} eq 'yes') { |
my (%status) = &student_gradeStatus($ENV{'form.url'},$symb,$udom,$uname,$partlist) ; |
my %record = &Apache::lonnet::restore($symb,$ENV{'request.course.id'},$udom,$uname); |
my $statusflg = ''; |
my $statusflg = ''; |
foreach (keys(%status)) { |
foreach (split(/:/,$ENV{'form.gradePartRespid'})){ |
$statusflg = 1 if ($status{$_} ne 'nothing'); |
$statusflg = 1 if (exists ($record{'resource.'.$_.'.submission'})); |
my ($foo,$partid,$foo1) = split(/\./); |
|
$statusflg = '' if ($status{'resource.'.$partid.'.submitted_by'} ne ''); |
|
} |
} |
next if ($statusflg eq ''); |
next if ($statusflg eq ''); |
} |
} |
push @nextlist,$student if ($ctr < $ntstu); |
push @nextlist,$student if ($ctr < $ntstu); |
|
last if ($ctr == $ntstu); |
$ctr++; |
$ctr++; |
} |
} |
|
|
Line 2121 sub viewgrades {
|
Line 2131 sub viewgrades {
|
$result.= '<h3>Assign Grade to Specific Students in '.$sectionClass; |
$result.= '<h3>Assign Grade to Specific Students in '.$sectionClass; |
$result.= '<table border=0><tr><td bgcolor="#777777">'."\n". |
$result.= '<table border=0><tr><td bgcolor="#777777">'."\n". |
'<table border=0><tr bgcolor="#deffff"><td> <b>No.</b> </td>'. |
'<table border=0><tr bgcolor="#deffff"><td> <b>No.</b> </td>'. |
'<td> <b>Fullname</b> <font color="#999999">(Username)</font></td>'."\n"; |
'<td>'.&nameUserString('header')."</td>\n"; |
my (@parts) = sort(&getpartlist($url)); |
my (@parts) = sort(&getpartlist($url)); |
foreach my $part (@parts) { |
foreach my $part (@parts) { |
my $display=&Apache::lonnet::metadata($url,$part.'.display'); |
my $display=&Apache::lonnet::metadata($url,$part.'.display'); |
Line 2165 sub viewgrades {
|
Line 2175 sub viewgrades {
|
|
|
#--- call by previous routine to display each student |
#--- call by previous routine to display each student |
sub viewstudentgrade { |
sub viewstudentgrade { |
my ($$url,$symb,$courseid,$student,$fullname,$parts,$weight,$ctr) = @_; |
my ($url,$symb,$courseid,$student,$fullname,$parts,$weight,$ctr) = @_; |
my ($uname,$udom) = split(/:/,$student); |
my ($uname,$udom) = split(/:/,$student); |
$student=~s/:/_/; |
$student=~s/:/_/; |
my %record=&Apache::lonnet::restore($symb,$courseid,$udom,$uname); |
my %record=&Apache::lonnet::restore($symb,$courseid,$udom,$uname); |
Line 2221 sub editgrades {
|
Line 2231 sub editgrades {
|
$title.='<font size=+1><b>Section: </b>'.$ENV{'form.section'}.'</font>'."\n"; |
$title.='<font size=+1><b>Section: </b>'.$ENV{'form.section'}.'</font>'."\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"><td rowspan=2> <b>No.</b> </td>'. |
$result.= '<table border="0"><tr bgcolor="#deffff">'. |
'<td rowspan=2> <b>Fullname</b> <font color="#999999">(username)</font></td>'."\n"; |
'<td rowspan=2 valign="center"> <b>No.</b> </td>'. |
|
'<td rowspan=2 valign="center">'.&nameUserString('header')."</td>\n"; |
|
|
my %scoreptr = ( |
my %scoreptr = ( |
'correct' =>'correct_by_override', |
'correct' =>'correct_by_override', |
Line 2281 sub editgrades {
|
Line 2292 sub editgrades {
|
my ($uname,$udom)=split(/_/,$user); |
my ($uname,$udom)=split(/_/,$user); |
my %newrecord; |
my %newrecord; |
my $updateflag = 0; |
my $updateflag = 0; |
$line .= '<td> '.$$fullname{$usercolon}. |
$line .= '<td>'.&nameUserString(undef,$$fullname{$usercolon},$uname,$udom).'</td>'; |
' <font color="#999999">('.$uname.($udom eq $ENV{'user.domain'} ? '' : '$udom').')</font></td>'; |
|
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; |
Line 2500 to this page if the data selected is ins
|
Line 2510 to this page if the data selected is ins
|
$javascript |
$javascript |
</script> |
</script> |
ENDPICK |
ENDPICK |
$request->print(&show_grading_menu_form($symb,$url)); |
|
return ''; |
return ''; |
|
|
} |
} |
Line 2761 LISTJAVASCRIPT
|
Line 2770 LISTJAVASCRIPT
|
'<table border="0"><tr><td bgcolor="#777777">'. |
'<table border="0"><tr><td bgcolor="#777777">'. |
'<table border="0"><tr bgcolor="#e6ffff">'. |
'<table border="0"><tr bgcolor="#e6ffff">'. |
'<td align="right"> <b>No.</b></td>'. |
'<td align="right"> <b>No.</b></td>'. |
'<td><b> Fullname <font color="#999999">(username)</font></b></td>'. |
'<td>'.&nameUserString('header').'</td>'. |
'<td align="right"> <b>No.</b></td>'. |
'<td align="right"> <b>No.</b></td>'. |
'<td><b> Fullname <font color="#999999">(username)</font></b></td></tr>'; |
'<td>'.&nameUserString('header').'</td></tr>'; |
|
|
my (undef,undef,$fullname) = &getclasslist($getsec,'1'); |
my (undef,undef,$fullname) = &getclasslist($getsec,'1'); |
my $ptr = 1; |
my $ptr = 1; |
Line 2771 LISTJAVASCRIPT
|
Line 2780 LISTJAVASCRIPT
|
my ($uname,$udom) = split(/:/,$student); |
my ($uname,$udom) = split(/:/,$student); |
$studentTable.=($ptr%2 == 1 ? '<tr bgcolor="#ffffe6">' : '</td>'); |
$studentTable.=($ptr%2 == 1 ? '<tr bgcolor="#ffffe6">' : '</td>'); |
$studentTable.='<td align="right">'.$ptr.' </td>'; |
$studentTable.='<td align="right">'.$ptr.' </td>'; |
$studentTable.='<td> <input type="radio" name="student" value="'.$student.'" /> '.$$fullname{$student}. |
$studentTable.='<td> <input type="radio" name="student" value="'.$student.'" /> ' |
'<font color="#999999"> ('.$uname.($udom eq $cdom ? '':':'.$udom).')</font>'."\n"; |
.&nameUserString(undef,$$fullname{$student},$uname,$udom)."\n"; |
$studentTable.=($ptr%2 == 0 ? '</td></tr>' : ''); |
$studentTable.=($ptr%2 == 0 ? '</td></tr>' : ''); |
$ptr++; |
$ptr++; |
} |
} |
Line 2791 sub getSymbMap {
|
Line 2800 sub getSymbMap {
|
my ($request) = @_; |
my ($request) = @_; |
my $navmap = Apache::lonnavmaps::navmap-> new($ENV{'request.course.fn'}.'.db', |
my $navmap = Apache::lonnavmaps::navmap-> new($ENV{'request.course.fn'}.'.db', |
$ENV{'request.course.fn'}.'_parms.db'); |
$ENV{'request.course.fn'}.'_parms.db'); |
$navmap->init(); |
# $navmap->init(); |
|
|
my %symbx = (); |
my %symbx = (); |
my @titles = (); |
my @titles = (); |
Line 2831 sub displayPage {
|
Line 2840 sub displayPage {
|
return; |
return; |
} |
} |
my $result='<h3><font color="#339933"> '.$ENV{'form.title'}.'</font></h3>'; |
my $result='<h3><font color="#339933"> '.$ENV{'form.title'}.'</font></h3>'; |
$result.='<h3> Student: '.$$fullname{$ENV{'form.student'}}. |
$result.='<h3> Student: '.&nameUserString(undef,$$fullname{$ENV{'form.student'}},$uname,$udom). |
'<font color="#999999"> ('.$uname.($udom eq $cdom ? '':':'.$udom).')</font></h3>'."\n"; |
'</h3>'."\n"; |
|
|
&sub_page_js($request); |
&sub_page_js($request); |
$request->print($result); |
$request->print($result); |
|
|
Line 2995 sub updateGradeByPage {
|
Line 3003 sub updateGradeByPage {
|
return; |
return; |
} |
} |
my $result='<h3><font color="#339933"> '.$ENV{'form.title'}.'</font></h3>'; |
my $result='<h3><font color="#339933"> '.$ENV{'form.title'}.'</font></h3>'; |
$result.='<h3> Student: '.$ENV{'form.fullname'}. |
$result.='<h3> Student: '.&nameUserString(undef,$ENV{'form.fullname'},$uname,$udom). |
'<font color="#999999"> ('.$uname.($udom eq $cdom ? '':':'.$udom).')</font></h3>'."\n"; |
'</h3>'."\n"; |
|
|
$request->print($result); |
$request->print($result); |
|
|
Line 3138 sub getSequenceDropDown {
|
Line 3146 sub getSequenceDropDown {
|
} |
} |
|
|
sub scantron_uploads { |
sub scantron_uploads { |
|
#FIXME need to support scantron files put in another location, |
|
# maybe the course directory? a scantron dir in the course directory? |
if (!-e $Apache::lonnet::perlvar{'lonScansDir'}) { return ''}; |
if (!-e $Apache::lonnet::perlvar{'lonScansDir'}) { return ''}; |
my $result= '<select name="scantron_selectfile">'; |
my $result= '<select name="scantron_selectfile">'; |
opendir(DIR,$Apache::lonnet::perlvar{'lonScansDir'}); |
opendir(DIR,$Apache::lonnet::perlvar{'lonScansDir'}); |
Line 3174 sub scantron_selectphase {
|
Line 3184 sub scantron_selectphase {
|
my $file_selector=&scantron_uploads(); |
my $file_selector=&scantron_uploads(); |
my $format_selector=&scantron_scantab(); |
my $format_selector=&scantron_scantab(); |
my $result; |
my $result; |
|
#FIXME allow instructor to be able to download the scantron file |
|
# and to upload it, |
$result.= <<SCANTRONFORM; |
$result.= <<SCANTRONFORM; |
<form method="post" enctype="multipart/form-data" action="/adm/grades" name="scantro_process"> |
<form method="post" enctype="multipart/form-data" action="/adm/grades" name="scantro_process"> |
<input type="hidden" name="command" value="scantron_process" /> |
<input type="hidden" name="command" value="scantron_validate" /> |
$default_form_data |
$default_form_data |
<table width="100%" border="0"> |
<table width="100%" border="0"> |
<tr> |
<tr> |
Line 3202 sub scantron_selectphase {
|
Line 3214 sub scantron_selectphase {
|
Format of data file: $format_selector |
Format of data file: $format_selector |
</td> |
</td> |
</tr> |
</tr> |
|
<tr bgcolor="#ffffe6"> |
|
<td> |
|
<!-- FIXME this is lazy, a single parse of the set should let me know what this is --> |
|
Last line to expect an answer on: |
|
<input type="text" name="scantron_maxbubble" /> |
|
</td> |
|
</tr> |
</table> |
</table> |
</td> |
</td> |
</tr> |
</tr> |
</table> |
</table> |
<input type="submit" value="Submit" /> |
<input type="submit" value="Validate Scantron Records" /> |
</form> |
</form> |
$grading_menu_button |
$grading_menu_button |
SCANTRONFORM |
SCANTRONFORM |
Line 3218 sub get_scantron_config {
|
Line 3237 sub get_scantron_config {
|
my ($which) = @_; |
my ($which) = @_; |
my $fh=Apache::File->new($Apache::lonnet::perlvar{'lonTabDir'}.'/scantronformat.tab'); |
my $fh=Apache::File->new($Apache::lonnet::perlvar{'lonTabDir'}.'/scantronformat.tab'); |
my %config; |
my %config; |
|
#FIXME probably should move to XML it has already gotten a bit much now |
foreach my $line (<$fh>) { |
foreach my $line (<$fh>) { |
my ($name,$descrip)=split(/:/,$line); |
my ($name,$descrip)=split(/:/,$line); |
if ($name ne $which ) { next; } |
if ($name ne $which ) { next; } |
Line 3234 sub get_scantron_config {
|
Line 3254 sub get_scantron_config {
|
$config{'Qlength'}=$config[8]; |
$config{'Qlength'}=$config[8]; |
$config{'Qoff'}=$config[9]; |
$config{'Qoff'}=$config[9]; |
$config{'Qon'}=$config[10]; |
$config{'Qon'}=$config[10]; |
|
$config{'PaperID'}=$config[11]; |
|
$config{'PaperIDlength'}=$config[12]; |
|
$config{'FirstName'}=$config[13]; |
|
$config{'FirstNamelength'}=$config[14]; |
|
$config{'LastName'}=$config[15]; |
|
$config{'LastNamelength'}=$config[16]; |
last; |
last; |
} |
} |
return %config; |
return %config; |
Line 3249 sub username_to_idmap {
|
Line 3275 sub username_to_idmap {
|
return %idmap; |
return %idmap; |
} |
} |
|
|
|
sub scantron_fixup_scanline { |
|
my ($scantron_config,$scan_data,$line,$whichline,$field,$newvalue,$arg)=@_; |
|
if ($field eq 'ID') { |
|
if ($newvalue > $$scantron_config{'IDlength'}) { |
|
return ($line,1,'New value to large'); |
|
} |
|
if ($newvalue < $$scantron_config{'IDlength'}) { |
|
$newvalue=sprintf('%-'.$$scantron_config{'IDlength'}.'s', |
|
$newvalue); |
|
} |
|
substr($line,$$scantron_config{'IDstart'}-1, |
|
$$scantron_config{'IDlength'})=$newvalue; |
|
} elsif ($field eq 'answer') { |
|
my $length=$scantron_config->{'Qlength'}; |
|
my $off=$scantron_config->{'Qoff'}; |
|
my $on=$scantron_config->{'Qon'}; |
|
my $answer=${off}x$length; |
|
if ($arg eq 'none') { |
|
&scan_data($scan_data,"$whichline.no_bubble.$newvalue",'1'); |
|
} else { |
|
substr($answer,$arg,1)=$on; |
|
&scan_data($scan_data,"$whichline.no_bubble.$newvalue",undef,'1'); |
|
} |
|
my $where=$length*($newvalue-1)+$scantron_config->{'Qstart'}; |
|
Apache->request->print("where $where arg $arg "); |
|
Apache->request->print('b:<pre>'.$line.'</pre>'); |
|
substr($line,$where-1,$length)=$answer; |
|
Apache->request->print('a:<pre>'.$line.'</pre>'); |
|
} |
|
return $line; |
|
} |
|
|
|
sub scan_data { |
|
my ($scan_data,$key,$value,$delete)=@_; |
|
my $filename=$ENV{'form.scantron_selectfile'}; |
|
if (defined($value)) { |
|
$scan_data->{$filename.'_'.$key} = $value; |
|
} |
|
if ($delete) { delete($scan_data->{$filename.'_'.$key}); } |
|
return $scan_data->{$filename.'_'.$key}; |
|
} |
|
|
sub scantron_parse_scanline { |
sub scantron_parse_scanline { |
my ($line,$scantron_config)=@_; |
my ($line,$whichline,$scantron_config,$scan_data)=@_; |
my %record; |
my %record; |
my $questions=substr($line,$$scantron_config{'Qstart'}-1); |
my $questions=substr($line,$$scantron_config{'Qstart'}-1); |
my $data=substr($line,0,$$scantron_config{'Qstart'}-1); |
my $data=substr($line,0,$$scantron_config{'Qstart'}-1); |
Line 3264 sub scantron_parse_scanline {
|
Line 3332 sub scantron_parse_scanline {
|
} |
} |
$record{'scantron.ID'}=substr($data,$$scantron_config{'IDstart'}-1, |
$record{'scantron.ID'}=substr($data,$$scantron_config{'IDstart'}-1, |
$$scantron_config{'IDlength'}); |
$$scantron_config{'IDlength'}); |
|
$record{'scantron.PaperID'}= |
|
substr($data,$$scantron_config{'PaperID'}-1, |
|
$$scantron_config{'PaperIDlength'}); |
|
$record{'scantron.FirstName'}= |
|
substr($data,$$scantron_config{'FirstName'}-1, |
|
$$scantron_config{'FirstNamelength'}); |
|
$record{'scantron.LastName'}= |
|
substr($data,$$scantron_config{'LastName'}-1, |
|
$$scantron_config{'LastNamelength'}); |
my @alphabet=('A'..'Z'); |
my @alphabet=('A'..'Z'); |
my $questnum=0; |
my $questnum=0; |
while ($questions) { |
while ($questions) { |
Line 3271 sub scantron_parse_scanline {
|
Line 3348 sub scantron_parse_scanline {
|
my $currentquest=substr($questions,0,$$scantron_config{'Qlength'}); |
my $currentquest=substr($questions,0,$$scantron_config{'Qlength'}); |
substr($questions,0,$$scantron_config{'Qlength'})=''; |
substr($questions,0,$$scantron_config{'Qlength'})=''; |
if (length($currentquest) < $$scantron_config{'Qlength'}) { next; } |
if (length($currentquest) < $$scantron_config{'Qlength'}) { next; } |
my (@array)=split(/$$scantron_config{'Qon'}/,$currentquest); |
my @array=split($$scantron_config{'Qon'},$currentquest,-1); |
if (scalar(@array) gt 2) { |
|
#FIXME do something intelligent with double bubbles |
|
Apache->request->print("<br ><b>Wha!!!</b> <pre>".scalar(@array). |
|
'-'.$currentquest.'-'.$questnum.'</pre><br />'); |
|
} |
|
if (length($array[0]) eq $$scantron_config{'Qlength'}) { |
if (length($array[0]) eq $$scantron_config{'Qlength'}) { |
$record{"scantron.$questnum.answer"}=''; |
$record{"scantron.$questnum.answer"}=''; |
|
if (!&scan_data($scan_data,"$whichline.no_bubble.$questnum")) { |
|
push(@{$record{"scantron.missingerror"}},$questnum); |
|
} |
} else { |
} else { |
$record{"scantron.$questnum.answer"}=$alphabet[length($array[0])]; |
$record{"scantron.$questnum.answer"}=$alphabet[length($array[0])]; |
} |
} |
|
if (scalar(@array) gt 2) { |
|
push(@{$record{'scantron.doubleerror'}},$questnum); |
|
my @ans=@array; |
|
my $i=length($ans[0]);shift(@ans); |
|
while (@ans) { |
|
$i+=length($ans[0])+1; |
|
$record{"scantron.$questnum.answer"}.=$alphabet[$i]; |
|
shift(@ans); |
|
} |
|
} |
} |
} |
$record{'scantron.maxquest'}=$questnum; |
$record{'scantron.maxquest'}=$questnum; |
return \%record; |
return \%record; |
} |
} |
|
|
sub scantron_add_delay { |
sub scantron_add_delay { |
|
my ($delayqueue,$scanline,$errormessage,$errorcode)=@_; |
|
Apache->request->print('add_delay_error '.$_[2] ); |
|
push(@$delayqueue, |
|
{'line' => $scanline, 'emsg' => $errormessage, |
|
'ecode' => $errorcode } |
|
); |
} |
} |
|
|
sub scantron_find_student { |
sub scantron_find_student { |
my ($scantron_record,$idmap)=@_; |
my ($scantron_record,$idmap)=@_; |
my $scanID=$$scantron_record{'scantron.ID'}; |
my $scanID=$$scantron_record{'scantron.ID'}; |
foreach my $id (keys(%$idmap)) { |
foreach my $id (keys(%$idmap)) { |
Apache->request->print('<pre>checking studnet -'.$id.'- againt -'.$scanID.'- </pre>'); |
#Apache->request->print('<pre>checking studnet -'.$id.'- againt -'.$scanID.'- </pre>'); |
if (lc($id) eq lc($scanID)) { Apache->request->print('success');return $$idmap{$id}; } |
if (lc($id) eq lc($scanID)) { |
|
#Apache->request->print('success'); |
|
return $$idmap{$id}; |
|
} |
} |
} |
return undef; |
return undef; |
} |
} |
Line 3308 sub scantron_filter {
|
Line 3402 sub scantron_filter {
|
return 0; |
return 0; |
} |
} |
|
|
|
#FIXME I think I am doing this in the wrong order, I think it would be |
|
#better to make a several passes analyzing all of the lines in the |
|
#file for common errors wrong/invalid PID/username duplicated |
|
#PID/username, missing bubbles, double bubbles, missing/invalid CODE |
|
#and then get the instructor to fix all of these errors, then grade |
|
#the corrected one, I'll still need to catch error conditions, but |
|
#maybe most will taken care even before we start |
|
|
|
sub scantron_process_corrections { |
|
my ($r) = @_; |
|
my %scantron_config=&get_scantron_config($ENV{'form.scantron_format'}); |
|
my ($scanlines,$scan_data)=&scantron_getfile(); |
|
my $classlist=&Apache::loncoursedata::get_classlist(); |
|
my $which=$ENV{'form.scantron_line'}; |
|
my $line=&scantron_get_line($scanlines,$which); |
|
my ($skip,$err,$errmsg); |
|
if ($ENV{'form.scantron_skip_record'}) { |
|
$skip=1; |
|
} elsif ($ENV{'form.scantron_corrections'} =~ /^(duplicate|incorrect)ID$/) { |
|
my $newstudent=$ENV{'form.scantron_username'}.':'. |
|
$ENV{'form.scantron_domain'}; |
|
my $newid=$classlist->{$newstudent}->[&Apache::loncoursedata::CL_ID]; |
|
($line,$err,$errmsg)= |
|
&scantron_fixup_scanline(\%scantron_config,$scan_data,$line,$which, |
|
'ID',$newid); |
|
} elsif ($ENV{'form.scantron_corrections'} =~ /^(missing|double)bubble$/) { |
|
foreach my $question (split(',',$ENV{'form.scantron_questions'})) { |
|
($line,$err,$errmsg)= |
|
&scantron_fixup_scanline(\%scantron_config,$scan_data,$line, |
|
$which,'answer',$question, |
|
$ENV{"form.scantron_correct_Q_$question"}); |
|
if ($err) { last; } |
|
} |
|
} |
|
if ($err) { |
|
$r->print("Unable to accept last correction, an error occurred :$errmsg:"); |
|
} else { |
|
&scantron_put_line($scanlines,$which,$line,$skip); |
|
&scantron_putfile($scanlines,$scan_data); |
|
} |
|
} |
|
|
|
|
|
sub scantron_validate_file { |
|
my ($r) = @_; |
|
my ($symb,$url)=&get_symb_and_url($r); |
|
if (!$symb) {return '';} |
|
my $default_form_data=&defaultFormData($symb,$url); |
|
|
|
if ($ENV{'form.scantron_corrections'}) { |
|
&scantron_process_corrections($r); |
|
} |
|
#get the student pick code ready |
|
$r->print(&Apache::loncommon::studentbrowser_javascript()); |
|
my $result= <<SCANTRONFORM; |
|
<form method="post" enctype="multipart/form-data" action="/adm/grades" name="scantronupload"> |
|
<input type="hidden" name="command" value="scantron_validate" /> |
|
<input type="hidden" name="selectpage" value="$ENV{'form.selectpage'}" /> |
|
<input type="hidden" name="scantron_format" value="$ENV{'form.scantron_format'}" /> |
|
<input type="hidden" name="scantron_selectfile" value="$ENV{'form.scantron_selectfile'}" /> |
|
<input type="hidden" name="scantron_maxbubble" value="$ENV{'form.scantron_maxbubble'}" /> |
|
$default_form_data |
|
SCANTRONFORM |
|
$r->print($result); |
|
|
|
my @validate_phases=( 'ID', |
|
'CODE', |
|
'doublebubble', |
|
'missingbubbles'); |
|
if (!$ENV{'form.validatepass'}) { |
|
$ENV{'form.valiadatepass'} = 0; |
|
} |
|
my $currentphase=$ENV{'form.valiadatepass'}; |
|
|
|
if ($ENV{'form.scantron_selectfile'}=~m-^/-) { |
|
#first pass copy file to classdir |
|
|
|
} |
|
my $stop=0; |
|
while (!$stop && $currentphase < scalar(@validate_phases)) { |
|
my $which="scantron_validate_".$validate_phases[$currentphase]; |
|
{ |
|
no strict 'refs'; |
|
($stop,$currentphase)=&$which($r,$currentphase); |
|
} |
|
} |
|
$r->print("<input type='hidden' name='validatepass' value='".$currentphase."' />"); |
|
return ''; |
|
} |
|
|
|
sub scantron_getfile { |
|
#my $scanlines=Apache::File->new($Apache::lonnet::perlvar{'lonScansDir'}."/$ENV{'form.scantron_selectfile'}"); |
|
#FIXME really would prefer a scantron directory but tokenwrapper |
|
# doesn't allow access to subdirs of userfiles |
|
my $cname=$ENV{'course.'.$ENV{'request.course.id'}.'.num'}; |
|
my $cdom=$ENV{'course.'.$ENV{'request.course.id'}.'.domain'}; |
|
my $lines; |
|
$lines=&Apache::lonnet::getfile('/uploaded/'.$cdom.'/'.$cname.'/'. |
|
'scantron_orig_'.$ENV{'form.scantron_selectfile'}); |
|
if ($lines eq '-1') { |
|
#FIXME need to actually replicate file to course space |
|
} |
|
my %scanlines; |
|
$scanlines{'orig'}=[split("\n",$lines)]; |
|
my $temp=$scanlines{'orig'}; |
|
$scanlines{'count'}=$#$temp; |
|
|
|
$lines=&Apache::lonnet::getfile('/uploaded/'.$cdom.'/'.$cname.'/'. |
|
'scantron_corrected_'.$ENV{'form.scantron_selectfile'}); |
|
if ($lines eq '-1') { |
|
$scanlines{'corrected'}=[]; |
|
} else { |
|
$scanlines{'corrected'}=[split("\n",$lines)]; |
|
} |
|
$lines=&Apache::lonnet::getfile('/uploaded/'.$cdom.'/'.$cname.'/'. |
|
'scantron_skipped_'.$ENV{'form.scantron_selectfile'}); |
|
if ($lines eq '-1') { |
|
$scanlines{'skipped'}=[]; |
|
} else { |
|
$scanlines{'skipped'}=[split("\n",$lines)]; |
|
} |
|
my @tmp=&Apache::lonnet::dump('scantrondata',$cdom,$cname); |
|
if ($tmp[0] =~ /^(error:|no_such_host)/) { @tmp=(); } |
|
my %scan_data = @tmp; |
|
return (\%scanlines,\%scan_data); |
|
} |
|
|
|
sub lonnet_putfile { |
|
my ($contents,$filename)=@_; |
|
my $docuname=$ENV{'course.'.$ENV{'request.course.id'}.'.num'}; |
|
my $docudom=$ENV{'course.'.$ENV{'request.course.id'}.'.domain'}; |
|
my $docuhome=$ENV{'course.'.$ENV{'request.course.id'}.'.home'}; |
|
$ENV{'form.sillywaytopassafilearound'}=$contents; |
|
&Apache::lonnet::finishuserfileupload($docuname,$docudom,$docuhome,'sillywaytopassafilearound',$filename); |
|
|
|
} |
|
|
|
sub scantron_putfile { |
|
my ($scanlines,$scan_data) = @_; |
|
#FIXME really would prefer a scantron directory but tokenwrapper |
|
# doesn't allow access to subdirs of userfiles |
|
my $cname=$ENV{'course.'.$ENV{'request.course.id'}.'.num'}; |
|
my $cdom=$ENV{'course.'.$ENV{'request.course.id'}.'.domain'}; |
|
my $prefix='scantron_'; |
|
# no need to update orig, shouldn't change |
|
# &lonnet_putfile(join("\n",@{$scanlines->{'orig'}}),$prefix.'orig_'. |
|
# $ENV{'form.scantron_selectfile'}); |
|
&lonnet_putfile(join("\n",@{$scanlines->{'corrected'}}), |
|
$prefix.'corrected_'. |
|
$ENV{'form.scantron_selectfile'}); |
|
&lonnet_putfile(join("\n",@{$scanlines->{'skipped'}}), |
|
$prefix.'skipped_'. |
|
$ENV{'form.scantron_selectfile'}); |
|
&Apache::lonnet::put('scantrondata',$scan_data,$cdom,$cname); |
|
} |
|
|
|
sub scantron_get_line { |
|
my ($scanlines,$i)=@_; |
|
if ($scanlines->{'skipped'}[$i]) {return undef;} |
|
if ($scanlines->{'corrected'}[$i]) {return $scanlines->{'corrected'}[$i];} |
|
return $scanlines->{'orig'}[$i]; |
|
} |
|
|
|
sub scantron_put_line { |
|
my ($scanlines,$i,$newline,$skip)=@_; |
|
if ($skip) { $scanlines->{'skipped'}[$i]=$newline;return; } |
|
$scanlines->{'corrected'}[$i]=$newline; |
|
} |
|
|
|
sub scantron_validate_ID { |
|
my ($r,$currentphase) = @_; |
|
|
|
#get student info |
|
my $classlist=&Apache::loncoursedata::get_classlist(); |
|
my %idmap=&username_to_idmap($classlist); |
|
|
|
#get scantron line setup |
|
my %scantron_config=&get_scantron_config($ENV{'form.scantron_format'}); |
|
my ($scanlines,$scan_data)=&scantron_getfile(); |
|
|
|
my %found=('ids'=>{},'usernames'=>{}); |
|
for (my $i=0;$i<=$scanlines->{'count'};$i++) { |
|
my $line=&scantron_get_line($scanlines,$i); |
|
if (!$line) { next; } |
|
my $scan_record=&scantron_parse_scanline($line,$i,\%scantron_config, |
|
$scan_data); |
|
my $id=$$scan_record{'scantron.ID'}; |
|
$r->print("<p>Checking ID ".$$scan_record{'scantron.ID'}. |
|
" on paper ID ".$$scan_record{'scantron.PaperID'}."</p>\n"); |
|
my $found; |
|
foreach my $checkid (keys(%idmap)) { |
|
if (lc($checkid) eq lc($id)) { |
|
if ($checkid ne $id) { |
|
$r->print("<p>Using $checkid for encoded $id</p>\n"); |
|
} |
|
$found=$checkid;last; |
|
} |
|
} |
|
if ($found) { |
|
if ($found{'ids'}{$found}) { |
|
#FIXME store away line we prviously saw the ID on |
|
&scantron_get_correction($r,$i,$scan_record,\%scantron_config, |
|
$line,'duplicateID',$found); |
|
return(1); |
|
} else { |
|
$found{'ids'}{$found}++; |
|
} |
|
} else { |
|
&scantron_get_correction($r,$i,$scan_record,\%scantron_config, |
|
$line,'incorrectID'); |
|
return(1); |
|
} |
|
} |
|
|
|
return (0,$currentphase+1); |
|
} |
|
|
|
sub scantron_get_correction { |
|
my ($r,$i,$scan_record,$scan_config,$line,$error,$arg)=@_; |
|
|
|
#FIXME in the case of a duplicated ID the previous line, probaly need |
|
#to show both the current line and the previous one and allow skipping |
|
#the previous one or the current one |
|
|
|
$r->print("<p>This scantron record has an error ($error). "); |
|
if ( defined($$scan_record{'scantron.PaperID'}) ) { |
|
$r->print("The current PaperID is <tt>". |
|
$$scan_record{'scantron.PaperID'}."</tt> \n"); |
|
} else { |
|
$r->print("The current scanline is <pre>". |
|
$line."</pre> \n"); |
|
} |
|
$r->print('<input type="hidden" name="scantron_corrections" value="'.$error.'" />'."\n"); |
|
$r->print('<input type="hidden" name="scantron_line" value="'.$i.'" />'."\n"); |
|
if ($error =~ /ID$/) { |
|
if ($error eq 'unknownID') { |
|
$r->print("The encoded ID is not in the classlist</p>\n"); |
|
} elsif ($error eq 'duplicateID') { |
|
$r->print("The encoded ID has also been used by a previous paper $arg</p>\n"); |
|
} |
|
$r->print("<p>Original ID is <tt>".$$scan_record{'scantron.ID'}. |
|
"</tt><br />\n"); |
|
$r->print("Name on paper is ".$$scan_record{'scantron.LastName'}.",". |
|
$$scan_record{'scantron.FirstName'}."</p>"); |
|
$r->print("<p>Please correct <br /> \n"); |
|
$r->print("\n<ul><li> Pick a specific user -- username:<input type='text' name='scantron_username' value='' />"); |
|
$r->print("\ndomain:". |
|
&Apache::loncommon::select_dom_form(undef,'scantron_domain')); |
|
#FIXME it would be nice if this sent back the user ID and |
|
#could do partial userID matches |
|
$r->print(&Apache::loncommon::selectstudent_link('scantronupload', |
|
'scantron_username','scantron_domain')); |
|
$r->print('</li>'); |
|
} elsif ($error eq 'doublebubble') { |
|
$r->print("There have been multiple bubbles scanned for a single question\n"); |
|
$r->print('<input type="hidden" name="scantron_questions" value="'. |
|
join(',',@{$arg}).'" />'); |
|
foreach my $question (@{$arg}) { |
|
my $selected=$$scan_record{"scantron.$question.answer"}; |
|
$r->print("<p> For question $question, selected bubbles were ". |
|
join(" ",split('',$selected)). |
|
" <br />Please pick which one should be used for grading<br />"); |
|
&scantron_bubble_selector($r,$scan_config,$question); |
|
} |
|
} elsif ($error eq 'missingbubble') { |
|
$r->print("Some questions have no scanned bubbles\n"); |
|
$r->print('<input type="hidden" name="scantron_questions" value="'. |
|
join(',',@{$arg}).'" />'); |
|
foreach my $question (@{$arg}) { |
|
my $selected=$$scan_record{"scantron.$question.answer"}; |
|
$r->print("<p>Question $question, Please select a bubble to use "); |
|
&scantron_bubble_selector($r,$scan_config,$question); |
|
} |
|
} else { |
|
$r->print("\n<ul>"); |
|
} |
|
$r->print("<li>Skip this scanline saving it for later "); |
|
$r->print("\n<input type='checkbox' name='scantron_skip_record' /> </li></ul>"); |
|
&scantron_end_validate_form($r); |
|
} |
|
|
|
sub scantron_bubble_selector { |
|
my ($r,$scan_config,$quest)=@_; |
|
my $max=$$scan_config{'Qlength'}; |
|
my @alphabet=('A'..'Z'); |
|
for (my $i=0;$i<$max;$i++) { |
|
$r->print('<input type="radio" name="scantron_correct_Q_'.$quest. |
|
'" value="'.$i.'" />'.$alphabet[$i]); |
|
} |
|
$r->print('<input type="radio" name="scantron_correct_Q_'.$quest. |
|
'" value="none" /> Nothing'); |
|
$r->print('<br />'); |
|
} |
|
|
|
sub scantron_validate_CODE { |
|
my ($r,$currentphase) = @_; |
|
#FIXME doesn't do anything yet |
|
return (0,$currentphase+1); |
|
} |
|
|
|
sub scantron_validate_doublebubble { |
|
my ($r,$currentphase) = @_; |
|
#get student info |
|
my $classlist=&Apache::loncoursedata::get_classlist(); |
|
my %idmap=&username_to_idmap($classlist); |
|
|
|
#get scantron line setup |
|
my %scantron_config=&get_scantron_config($ENV{'form.scantron_format'}); |
|
my ($scanlines,$scan_data)=&scantron_getfile(); |
|
for (my $i=0;$i<=$scanlines->{'count'};$i++) { |
|
my $line=&scantron_get_line($scanlines,$i); |
|
if (!$line) { next; } |
|
my $scan_record=&scantron_parse_scanline($line,$i,\%scantron_config, |
|
$scan_data); |
|
if (!defined($$scan_record{'scantron.doubleerror'})) { next; } |
|
&scantron_get_correction($r,$i,$scan_record,\%scantron_config,$line, |
|
'doublebubble', |
|
$$scan_record{'scantron.doubleerror'}); |
|
return (1,$currentphase); |
|
} |
|
return (0,$currentphase+1); |
|
} |
|
|
|
sub scantron_validate_missingbubbles { |
|
my ($r,$currentphase) = @_; |
|
#get student info |
|
my $classlist=&Apache::loncoursedata::get_classlist(); |
|
my %idmap=&username_to_idmap($classlist); |
|
|
|
#get scantron line setup |
|
my %scantron_config=&get_scantron_config($ENV{'form.scantron_format'}); |
|
my ($scanlines,$scan_data)=&scantron_getfile(); |
|
my $max_bubble=$ENV{'form.scantron_maxbubble'}; |
|
if (!$max_bubble) { $max_bubble=2**31; } |
|
for (my $i=0;$i<=$scanlines->{'count'};$i++) { |
|
my $line=&scantron_get_line($scanlines,$i); |
|
if (!$line) { next; } |
|
my $scan_record=&scantron_parse_scanline($line,$i,\%scantron_config, |
|
$scan_data); |
|
if (!defined($$scan_record{'scantron.missingerror'})) { next; } |
|
my @to_correct; |
|
foreach my $missing (@{$$scan_record{'scantron.missingerror'}}) { |
|
if ($missing gt $max_bubble) { next; } |
|
push(@to_correct,$missing); |
|
} |
|
if (@to_correct) { |
|
&scantron_get_correction($r,$i,$scan_record,\%scantron_config, |
|
$line,'missingbubble',\@to_correct); |
|
return (1,$currentphase); |
|
} |
|
|
|
} |
|
return (0,$currentphase+1); |
|
} |
|
|
|
sub scantron_end_validate_form { |
|
my ($r) = @_; |
|
$r->print('<input type="submit" name="submit" /></form></body></html>'); |
|
} |
|
|
sub scantron_process_students { |
sub scantron_process_students { |
my ($r) = @_; |
my ($r) = @_; |
my (undef,undef,$sequence)=split(/___/,$ENV{'form.selectpage'}); |
my (undef,undef,$sequence)=split(/___/,$ENV{'form.selectpage'}); |
Line 3316 sub scantron_process_students {
|
Line 3770 sub scantron_process_students {
|
my $default_form_data=&defaultFormData($symb,$url); |
my $default_form_data=&defaultFormData($symb,$url); |
|
|
my %scantron_config=&get_scantron_config($ENV{'form.scantron_format'}); |
my %scantron_config=&get_scantron_config($ENV{'form.scantron_format'}); |
my $scanlines=Apache::File->new($Apache::lonnet::perlvar{'lonScansDir'}."/$ENV{'form.scantron_selectfile'}"); |
my ($scanlines,$scan_data)=&scantron_getfile(); |
my @scanlines=<$scanlines>; |
|
my $classlist=&Apache::loncoursedata::get_classlist(); |
my $classlist=&Apache::loncoursedata::get_classlist(); |
my %idmap=&username_to_idmap($classlist); |
my %idmap=&username_to_idmap($classlist); |
my $navmap=Apache::lonnavmaps::navmap->new($ENV{'request.course.fn'}.'.db',$ENV{'request.course.fn'}.'_parms.db',1, 1); |
my $navmap=Apache::lonnavmaps::navmap->new($ENV{'request.course.fn'}.'.db',$ENV{'request.course.fn'}.'_parms.db',1, 1); |
my $map=$navmap->getResourceByUrl($sequence); |
my $map=$navmap->getResourceByUrl($sequence); |
my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0); |
my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0); |
$r->print("geto ".scalar(@resources)."<br />"); |
# $r->print("geto ".scalar(@resources)."<br />"); |
my $result= <<SCANTRONFORM; |
my $result= <<SCANTRONFORM; |
<form method="post" enctype="multipart/form-data" action="/adm/grades" name="scantronupload"> |
<form method="post" enctype="multipart/form-data" action="/adm/grades" name="scantronupload"> |
<input type="hidden" name="command" value="scantron_configphase" /> |
<input type="hidden" name="command" value="scantron_configphase" /> |
Line 3332 SCANTRONFORM
|
Line 3785 SCANTRONFORM
|
$r->print($result); |
$r->print($result); |
|
|
my @delayqueue; |
my @delayqueue; |
my $totalcorrect; |
my %completedstudents; |
my $totalincorrect; |
|
|
my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Scantron Status', |
my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r, |
'Scantron Progress',$scanlines->{'count'}); |
'Scantron Status','Scantron Progress',scalar(@scanlines)); |
&Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state, |
foreach my $line (@scanlines) { |
'Processing first student'); |
my $studentcorrect; |
my $start=&Time::HiRes::time(); |
my $studentincorrect; |
my $i=0; |
|
while ($i<=$scanlines->{'count'}) { |
chomp($line); |
$i++; |
my $scan_record=&scantron_parse_scanline($line,\%scantron_config); |
my $line=&scantron_get_line($scanlines,$i); |
|
if (!$line) { next; } |
|
$r->print('<pre>line is'.$line.'</pre>'); |
|
my $scan_record=&scantron_parse_scanline($line,$i,\%scantron_config, |
|
$scan_data); |
my ($uname,$udom); |
my ($uname,$udom); |
if ($uname=&scantron_find_student($scan_record,\%idmap)) { |
unless ($uname=&scantron_find_student($scan_record,\%idmap)) { |
&scantron_add_delay(\@delayqueue,$line, |
&scantron_add_delay(\@delayqueue,$line, |
'Unable to find a student that matches'); |
'Unable to find a student that matches',1); |
|
next; |
|
} |
|
if (exists $completedstudents{$uname}) { |
|
&scantron_add_delay(\@delayqueue,$line, |
|
'Student '.$uname.' has multiple sheets',2); |
|
next; |
} |
} |
$r->print('<pre>doing studnet'.$uname.'</pre>'); |
$r->print('<pre>doing studnet'.$uname.'</pre>'); |
($uname,$udom)=split(/:/,$uname); |
($uname,$udom)=split(/:/,$uname); |
&Apache::lonnet::delenv('form.counter'); |
&Apache::lonnet::delenv('form.counter'); |
&Apache::lonnet::appenv(%$scan_record); |
&Apache::lonnet::appenv(%$scan_record); |
# &Apache::lonhomework::showhash(%ENV); |
# &Apache::lonhomework::showhash(%ENV); |
$Apache::lonxml::debug=1; |
# $Apache::lonxml::debug=1; |
&Apache::lonxml::debug("line is $line"); |
# &Apache::lonxml::debug("line is $line"); |
|
|
my $i=0; |
my $i=0; |
foreach my $resource (@resources) { |
foreach my $resource (@resources) { |
Line 3366 SCANTRONFORM
|
Line 3829 SCANTRONFORM
|
'grade_domain' =>$udom, |
'grade_domain' =>$udom, |
'grade_courseid'=>$ENV{'request.course.id'}, |
'grade_courseid'=>$ENV{'request.course.id'}, |
'grade_symb' =>$resource->symb())); |
'grade_symb' =>$resource->symb())); |
my %score=&Apache::lonnet::restore($resource->symb(), |
# my %score=&Apache::lonnet::restore($resource->symb(), |
$ENV{'request.course.id'}, |
# $ENV{'request.course.id'}, |
$udom,$uname); |
# $udom,$uname); |
foreach my $part ($resource->{PARTS}) { |
# foreach my $part ($resource->{PARTS}) { |
if ($score{'resource.'.$part.'.solved'} =~ /^correct/) { |
# if ($score{'resource.'.$part.'.solved'} =~ /^correct/) { |
$studentcorrect++; |
# $studentcorrect++; |
$totalcorrect++; |
# $totalcorrect++; |
} else { |
# } else { |
$studentincorrect++; |
# $studentincorrect++; |
$totalincorrect++; |
# $totalincorrect++; |
} |
# } |
} |
# } |
$r->print('<pre>'. |
# $r->print('<pre>'. |
$resource->symb().'-'. |
# $resource->symb().'-'. |
$resource->src().'-'.'</pre>result is'.$result); |
# $resource->src().'-'.'</pre>result is'.$result); |
&Apache::lonhomework::showhash(%score); |
# &Apache::lonhomework::showhash(%score); |
# if ($i eq 3) {last;} |
# if ($i eq 3) {last;} |
} |
} |
|
$completedstudents{$uname}={'line'=>$line}; |
|
} continue { |
&Apache::lonnet::delenv('form.counter'); |
&Apache::lonnet::delenv('form.counter'); |
&Apache::lonnet::delenv('scantron\.'); |
&Apache::lonnet::delenv('scantron\.'); |
&Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state, |
&Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state, |
'last student Who got a '.$studentcorrect.' correct and '. |
'last student'); |
$studentincorrect.' incorrect. The class has gotten '. |
#last; |
$totalcorrect.' correct and '.$totalincorrect.' incorrect'); |
|
last; |
|
#FIXME |
#FIXME |
#get iterator for $sequence |
#get iterator for $sequence |
#foreach question 'submit' the students answer to the server |
#foreach question 'submit' the students answer to the server |
Line 3398 SCANTRONFORM
|
Line 3861 SCANTRONFORM
|
# generate data to pass back that includes grade recevied |
# generate data to pass back that includes grade recevied |
#} |
#} |
} |
} |
$Apache::lonxml::debug=0; |
&Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state); |
|
my $lasttime = &Time::HiRes::time()-$start; |
|
$r->print("<p>took $lasttime</p>"); |
|
|
|
#$Apache::lonxml::debug=0; |
foreach my $delay (@delayqueue) { |
foreach my $delay (@delayqueue) { |
#FIXME |
#FIXME |
#print out each delayed student with interface to select how |
#print out each delayed student with interface to select how |
Line 3681 sub handler {
|
Line 4148 sub handler {
|
} |
} |
} elsif ($command eq 'scantron_selectphase' && $perm{'mgr'}) { |
} elsif ($command eq 'scantron_selectphase' && $perm{'mgr'}) { |
$request->print(&scantron_selectphase($request)); |
$request->print(&scantron_selectphase($request)); |
|
} elsif ($command eq 'scantron_validate' && $perm{'mgr'}) { |
|
$request->print(&scantron_validate_file($request)); |
} elsif ($command eq 'scantron_process' && $perm{'mgr'}) { |
} elsif ($command eq 'scantron_process' && $perm{'mgr'}) { |
$request->print(&scantron_process_students($request)); |
$request->print(&scantron_process_students($request)); |
} elsif ($command) { |
} elsif ($command) { |
Line 3700 sub send_header {
|
Line 4169 sub send_header {
|
#remotewindow.close(); |
#remotewindow.close(); |
#</script>"); |
#</script>"); |
$request->print(&Apache::loncommon::bodytag('Grading')); |
$request->print(&Apache::loncommon::bodytag('Grading')); |
|
$request->rflush(); |
} |
} |
|
|
sub send_footer { |
sub send_footer { |