loncom/homework/grades.pm - diff

Return to grades.pm CVS log

Up to [LON-CAPA] / loncom / homework

Diff for /loncom/homework/grades.pm between versions 1.440 and 1.450

version 1.440, 2007/09/10 23:03:35	version 1.450, 2007/10/09 23:03:22
Line 47 use POSIX qw(floor);	Line 47 use POSIX qw(floor);


my %perm=();	my %perm=();
my %bubble_lines_per_response; # no. bubble lines for each response.	my %bubble_lines_per_response = (); # no. bubble lines for each response.
# index is "symb.part_id"	# index is "symb.part_id"

	my %first_bubble_line = (); # First bubble line no. for each bubble.

	# Save and restore the bubble lines array to the form env.


	sub save_bubble_lines {
	&Apache::lonnet::logthis("Saving bubble_lines...");
	foreach my $line (keys(%bubble_lines_per_response)) {
	&Apache::lonnet::logthis("Saving form.scantron.bubblelines.$line value: $bubble_lines_per_response{$line}");
	$env{"form.scantron.bubblelines.$line"} = $bubble_lines_per_response{$line};
	$env{"form.scantron.first_bubble_line.$line"} =
	$first_bubble_line{$line};
	}
	}


	sub restore_bubble_lines {
	my $line = 0;
	%bubble_lines_per_response = ();
	while ($env{"form.scantron.bubblelines.$line"}) {
	my $value = $env{"form.scantron.bubblelines.$line"};
	&Apache::lonnet::logthis("Restoring form.scantron.bubblelines.$line value: $value");
	$bubble_lines_per_response{$line} = $value;
	$first_bubble_line{$line} =
	$env{"form.scantron.first_bubble_line.$line"};
	$line++;
	}

	}

	# Given the parsed scanline, get the response for
	# 'answer' number n:

	sub get_response_bubbles {
	my ($parsed_line, $response) = @_;

	my $bubble_line = $first_bubble_line{$response};
	my $bubble_lines= $bubble_lines_per_response{$response};
	my $selected = "";

	for (my $bline = 0; $bline < $bubble_lines; $bline++) {
	$selected .= $$parsed_line{"scantron.$bubble_line.answer"};
	$bubble_line++;
	}
	return $selected;
	}


# ----- These first few routines are general use routines.----	# ----- These first few routines are general use routines.----

	# Return the number of occurences of a pattern in a string.

	sub occurence_count {
	my ($string, $pattern) = @_;

	my @matches = ($string =~ /$pattern/g);

	return scalar(@matches);
	}


	# Take a string known to have digits and convert all the
	# digits into letters in the range J,A..I.

	sub digits_to_letters {
	my ($input) = @_;

	my @alphabet = ('J', 'A'..'I');

	my @input = split(//, $input);
	my $output ='';
	for (my $i = 0; $i < scalar(@input); $i++) {
	if ($input[$i] =~ /\d/) {
	$output .= $alphabet[$input[$i]];
	} else {
	$output .= $input[$i];
	}
	}
	return $output;
	}

#	#
# --- Retrieve the parts from the metadata file.---	# --- Retrieve the parts from the metadata file.---
sub getpartlist {	sub getpartlist {
Line 396 COMMONJSFUNCTIONS	Line 475 COMMONJSFUNCTIONS
#--- Dumps the class list with usernames,list of sections,	#--- Dumps the class list with usernames,list of sections,
#--- section, ids and fullnames for each user.	#--- section, ids and fullnames for each user.
sub getclasslist {	sub getclasslist {
my ($getsec,$filterlist) = @_;	my ($getsec,$filterlist,$getgroup) = @_;
my @getsec;	my @getsec;
	my @getgroup;
	my $stu_status = join(':',&Apache::loncommon::get_env_multiple('form.Status'));
if (!ref($getsec)) {	if (!ref($getsec)) {
if ($getsec ne '' && $getsec ne 'all') {	if ($getsec ne '' && $getsec ne 'all') {
@getsec=($getsec);	@getsec=($getsec);
Line 406 sub getclasslist {	Line 487 sub getclasslist {
@getsec=@{$getsec};	@getsec=@{$getsec};
}	}
if (grep(/^all$/,@getsec)) { undef(@getsec); }	if (grep(/^all$/,@getsec)) { undef(@getsec); }
	if (!ref($getgroup)) {
	if ($getgroup ne '' && $getgroup ne 'all') {
	@getgroup=($getgroup);
	}
	} else {
	@getgroup=@{$getgroup};
	}
	if (grep(/^all$/,@getgroup)) { undef(@getgroup); }

my $classlist=&Apache::loncoursedata::get_classlist();	my ($classlist,$keylist)=&Apache::loncoursedata::get_classlist();
# Bail out if we were unable to get the classlist	# Bail out if we were unable to get the classlist
return if (! defined($classlist));	return if (! defined($classlist));
	&Apache::loncoursedata::get_group_memberships($classlist,$keylist);
#	#
my %sections;	my %sections;
my %fullnames;	my %fullnames;
Line 426 sub getclasslist {	Line 516 sub getclasslist {
$classlist->{$student}->[&Apache::loncoursedata::CL_FULLNAME()];	$classlist->{$student}->[&Apache::loncoursedata::CL_FULLNAME()];
my $status =	my $status =
$classlist->{$student}->[&Apache::loncoursedata::CL_STATUS()];	$classlist->{$student}->[&Apache::loncoursedata::CL_STATUS()];
	my $group =
	$classlist->{$student}->[&Apache::loncoursedata::CL_GROUP()];
# filter students according to status selected	# filter students according to status selected
if ($filterlist && $env{'form.Status'} ne 'Any') {	if ($filterlist && (!($stu_status =~ /Any/))) {
if ($env{'form.Status'} ne $status) {	if (!($stu_status =~ $status)) {
delete ($classlist->{$student});	delete($classlist->{$student});
next;	next;
}	}
}	}
	# filter students according to groups selected
	if (@getgroup) {
	my $exclude = 1;
	foreach my $grp(@getgroup) {
	if ($group eq $grp) {
	$exclude = 0;
	}
	}
	if ($exclude) {
	delete($classlist->{$student});
	}
	}
$section = ($section ne '' ? $section : 'none');	$section = ($section ne '' ? $section : 'none');
if (&canview($section)) {	if (&canview($section)) {
if (!@getsec \|\| grep(/^\Q$section\E$/,@getsec)) {	if (!@getsec \|\| grep(/^\Q$section\E$/,@getsec)) {
$sections{$section}++;	$sections{$section}++;
$fullnames{$student}=$fullname;	if ($classlist->{$student}) {
	$fullnames{$student}=$fullname;
	}
} else {	} else {
delete($classlist->{$student});	delete($classlist->{$student});
}	}
Line 510 sub student_gradeStatus {	Line 616 sub student_gradeStatus {
# Shows a student's view of problem and submission	# Shows a student's view of problem and submission
sub jscriptNform {	sub jscriptNform {
my ($symb) = @_;	my ($symb) = @_;
	my $stu_status = join(':',&Apache::loncommon::get_env_multiple('form.Status'));
my $jscript='<script type="text/javascript" language="javascript">'."\n".	my $jscript='<script type="text/javascript" language="javascript">'."\n".
' function viewOneStudent(user,domain) {'."\n".	' function viewOneStudent(user,domain) {'."\n".
' document.onestudent.student.value = user;'."\n".	' document.onestudent.student.value = user;'."\n".
Line 521 sub jscriptNform {	Line 628 sub jscriptNform {
'<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".	'<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".
'<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."\n".	'<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."\n".
'<input type="hidden" name="probTitle" value="'.$env{'form.probTitle'}.'" />'."\n".	'<input type="hidden" name="probTitle" value="'.$env{'form.probTitle'}.'" />'."\n".
'<input type="hidden" name="Status" value="'.$env{'form.Status'}.'" />'."\n".	'<input type="hidden" name="Status" value="'.$stu_status.'" />'."\n".
'<input type="hidden" name="command" value="submission" />'."\n".	'<input type="hidden" name="command" value="submission" />'."\n".
'<input type="hidden" name="student" value="" />'."\n".	'<input type="hidden" name="student" value="" />'."\n".
'<input type="hidden" name="userdom" value="" />'."\n".	'<input type="hidden" name="userdom" value="" />'."\n".
Line 529 sub jscriptNform {	Line 636 sub jscriptNform {
return $jscript;	return $jscript;
}	}



# Given the score (as a number [0-1] and the weight) what is the final	# Given the score (as a number [0-1] and the weight) what is the final
# point value? This function will round to the nearest tenth, third,	# point value? This function will round to the nearest tenth, third,
# or quarter if one of those is within the tolerance of .00001.	# or quarter if one of those is within the tolerance of .00001.
Line 685 sub listStudents {	Line 794 sub listStudents {
my $cdom = $env{"course.$env{'request.course.id'}.domain"};	my $cdom = $env{"course.$env{'request.course.id'}.domain"};
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 $getgroup = $env{'form.group'} eq '' ? 'all' : $env{'form.group'};
my $submitonly= $env{'form.submitonly'} eq '' ? 'all' : $env{'form.submitonly'};	my $submitonly= $env{'form.submitonly'} eq '' ? 'all' : $env{'form.submitonly'};

my $viewgrade = $env{'form.showgrading'} eq 'yes' ? 'View/Grade/Regrade' : 'View';	my $viewgrade = $env{'form.showgrading'} eq 'yes' ? 'View/Grade/Regrade' : 'View';
$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'};
Line 746 LISTJAVASCRIPT	Line 855 LISTJAVASCRIPT
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";
}	}
	my $stu_status = join(':',&Apache::loncommon::get_env_multiple('form.Status'));
my $saveStatus = $env{'form.Status'} eq '' ? 'Active' : $env{'form.Status'};	my $saveStatus = $stu_status eq '' ? 'Active' : $stu_status;
$env{'form.Status'} = $saveStatus;	$env{'form.Status'} = $saveStatus;
$gradeTable.='<label><input type="radio" name="lastSub" value="lastonly" '.$checklastsub.' /> last submission only </label>'."\n".	$gradeTable.='<label><input type="radio" name="lastSub" value="lastonly" '.$checklastsub.' /> last submission only </label>'."\n".
'<label><input type="radio" name="lastSub" value="last" /> last submission & parts info </label>'."\n".	'<label><input type="radio" name="lastSub" value="last" /> last submission & parts info </label>'."\n".
Line 769 LISTJAVASCRIPT	Line 878 LISTJAVASCRIPT
'<input type="hidden" name="saveStatusOld" value="'.$saveStatus.'" />'."\n";	'<input type="hidden" name="saveStatusOld" value="'.$saveStatus.'" />'."\n";

if (exists($env{'form.gradingMenu'}) && exists($env{'form.Status'})) {	if (exists($env{'form.gradingMenu'}) && exists($env{'form.Status'})) {
$gradeTable.='<input type="hidden" name="Status" value="'.$env{'form.Status'}.'" />'."\n";	$gradeTable.='<input type="hidden" name="Status" value="'.$stu_status.'" />'."\n";
} else {	} else {
$gradeTable.='<b>Student Status:</b> '.	$gradeTable.='<b>Student Status:</b> '.
&Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,1,'javascript:reLoadList(this.form);').'<br />';	&Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,1,'javascript:reLoadList(this.form);').'<br />';
Line 786 LISTJAVASCRIPT	Line 895 LISTJAVASCRIPT
'value="Next->" /> <br />'."\n";	'value="Next->" /> <br />'."\n";
$gradeTable.=&check_buttons();	$gradeTable.=&check_buttons();
$gradeTable.='<label><input type="checkbox" name="checkPlag" checked="checked" />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',$getgroup);
$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">';
my $loop = 0;	my $loop = 0;
Line 1701 sub build_section_inputs {	Line 1810 sub build_section_inputs {
# --------------------------- 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) = @_;

my ($uname,$udom) = ($env{'form.student'},$env{'form.userdom'});	my ($uname,$udom) = ($env{'form.student'},$env{'form.userdom'});
$udom = ($udom eq '' ? $env{'user.domain'} : $udom); #has form.userdom changed for a student?	$udom = ($udom eq '' ? $env{'user.domain'} : $udom); #has form.userdom changed for a student?
my $usec = &Apache::lonnet::getsection($udom,$uname,$env{'request.course.id'});	my $usec = &Apache::lonnet::getsection($udom,$uname,$env{'request.course.id'});
$env{'form.fullname'} = &Apache::loncommon::plainname($uname,$udom,'lastname') if $env{'form.fullname'} eq '';	$env{'form.fullname'} = &Apache::loncommon::plainname($uname,$udom,'lastname') if $env{'form.fullname'} eq '';

my $symb = &get_symb($request);	my $symb = &get_symb($request);
if ($symb eq '') { $request->print("Unable to handle ambiguous references:."); return ''; }	if ($symb eq '') { $request->print("Unable to handle ambiguous references:."); return ''; }

Line 1759 sub submission {	Line 1866 sub submission {
&Apache::lonxml::clear_problem_counter();	&Apache::lonxml::clear_problem_counter();
$request->print(&show_problem($request,$symb,$uname,$udom,0,1,$mode));	$request->print(&show_problem($request,$symb,$uname,$udom,0,1,$mode));
}	}

# kwclr is the only variable that is guaranteed to be non blank	# kwclr is the only variable that is guaranteed to be non blank
# if this subroutine has been called once.	# if this subroutine has been called once.
my %keyhash = ();	my %keyhash = ();
Line 1778 sub submission {	Line 1885 sub submission {
$env{'form.savemsgN'} = $keyhash{$symb.'_savemsgN'} ne '' ? $keyhash{$symb.'_savemsgN'} : '0';	$env{'form.savemsgN'} = $keyhash{$symb.'_savemsgN'} ne '' ? $keyhash{$symb.'_savemsgN'} : '0';
}	}
my $overRideScore = $env{'form.overRideScore'} eq '' ? 'no' : $env{'form.overRideScore'};	my $overRideScore = $env{'form.overRideScore'} eq '' ? 'no' : $env{'form.overRideScore'};
	my $stu_status = join(':',&Apache::loncommon::get_env_multiple('form.Status'));
$request->print('<form action="/adm/grades" method="post" name="SCORE" enctype="multipart/form-data">'."\n".	$request->print('<form action="/adm/grades" method="post" name="SCORE" enctype="multipart/form-data">'."\n".
'<input type="hidden" name="command" value="handgrade" />'."\n".	'<input type="hidden" name="command" value="handgrade" />'."\n".
'<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."\n".	'<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."\n".
'<input type="hidden" name="Status" value="'.$env{'form.Status'}.'" />'."\n".	'<input type="hidden" name="Status" value="'.$stu_status.'" />'."\n".
'<input type="hidden" name="overRideScore" value="'.$overRideScore.'" />'."\n".	'<input type="hidden" name="overRideScore" value="'.$overRideScore.'" />'."\n".
'<input type="hidden" name="probTitle" value="'.$env{'form.probTitle'}.'" />'."\n".	'<input type="hidden" name="probTitle" value="'.$env{'form.probTitle'}.'" />'."\n".
'<input type="hidden" name="refresh" value="off" />'."\n".	'<input type="hidden" name="refresh" value="off" />'."\n".
Line 1844 KEYWORDS	Line 1952 KEYWORDS
}	}
}	}

	# This is where output for one specific student would start
	my $bgcolor='#DDEEDD';
	if (int($counter/2) eq $counter) { $bgcolor='#DDDDEE'; }
	$request->print("\n\n".
	'<p><table border="2"><tr><th bgcolor="'.$bgcolor.'">'.$env{'form.fullname'}.'</th></tr><tr><td bgcolor="'.$bgcolor.'">');

if ($env{'form.vProb'} eq 'all' or $env{'form.vAns'} eq 'all') {	if ($env{'form.vProb'} eq 'all' or $env{'form.vAns'} eq 'all') {
$request->print('<br /><br /><br />') if ($counter > 0);
my $mode;	my $mode;
if ($env{'form.vProb'} eq 'all' && $env{'form.vAns'} eq 'all') {	if ($env{'form.vProb'} eq 'all' && $env{'form.vAns'} eq 'all') {
$mode='both';	$mode='both';
Line 2115 KEYWORDS	Line 2228 KEYWORDS
}	}
$request->print($result.'</td></tr></table></td></tr></table>'."\n");	$request->print($result.'</td></tr></table></td></tr></table>'."\n");

	# Done with printing info for one student

	$request->print('</td></tr></table></p>');


# print end of form	# print end of form
if ($counter == $total) {	if ($counter == $total) {
my $endform='<table border="0"><tr><td>'."\n";	my $endform='<table border="0"><tr><td>'."\n";
Line 2777 sub version_selected_portfile {	Line 2895 sub version_selected_portfile {
my $new_answer;	my $new_answer;
$env{'form.copy'} = &Apache::lonnet::getfile("/uploaded/$domain/$stu_name/portfolio$directory$file_name");	$env{'form.copy'} = &Apache::lonnet::getfile("/uploaded/$domain/$stu_name/portfolio$directory$file_name");
if($env{'form.copy'} eq '-1') {	if($env{'form.copy'} eq '-1') {
&Apache::lonnet::logthis('problem getting file '.$file_name);
$new_answer = 'problem getting file';	$new_answer = 'problem getting file';
} else {	} else {
$new_answer = $answer_name.'.'.$version.'.'.$answer_ext;	$new_answer = $answer_name.'.'.$version.'.'.$answer_ext;
Line 2998 sub viewgrades {	Line 3115 sub viewgrades {
$result.=&jscriptNform($symb);	$result.=&jscriptNform($symb);

#beginning of class grading form	#beginning of class grading form
	my $stu_status = join(':',&Apache::loncommon::get_env_multiple('form.Status'));
$result.= '<form action="/adm/grades" method="post" name="classgrade">'."\n".	$result.= '<form action="/adm/grades" method="post" name="classgrade">'."\n".
'<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".	'<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".
'<input type="hidden" name="command" value="editgrades" />'."\n".	'<input type="hidden" name="command" value="editgrades" />'."\n".
&build_section_inputs().	&build_section_inputs().
'<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."\n".	'<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."\n".
'<input type="hidden" name="Status" value="'.$env{'form.Status'}.'" />'."\n".	'<input type="hidden" name="Status" value="'.$env{'stu_status'}.'" />'."\n".
'<input type="hidden" name="probTitle" value="'.$env{'form.probTitle'}.'" />'."\n";	'<input type="hidden" name="probTitle" value="'.$env{'form.probTitle'}.'" />'."\n";

my $sectionClass;	my $sectionClass;
Line 3122 sub viewgrades {	Line 3240 sub viewgrades {
if (scalar(%$fullname) eq 0) {	if (scalar(%$fullname) eq 0) {
my $colspan=3+scalar(@parts);	my $colspan=3+scalar(@parts);
my $section_display = join (", ",&Apache::loncommon::get_env_multiple('form.section'));	my $section_display = join (", ",&Apache::loncommon::get_env_multiple('form.section'));
	my $stu_status = join(' or ',&Apache::loncommon::get_env_multiple('form.Status'));
$result='<span class="LC_warning">'.	$result='<span class="LC_warning">'.
&mt('There are no students in section(s) [_1] with enrollment status [_2] to modify or grade',	&mt('There are no students in section(s) [_1] with enrollment status [_2] to modify or grade',
$section_display, $env{'form.Status'}).	$section_display, $stu_status).
'</span>';	'</span>';
}	}
$result.=&show_grading_menu_form($symb);	$result.=&show_grading_menu_form($symb);
Line 3809 sub csvuploadassign {	Line 3928 sub csvuploadassign {
}	}
if (! %grades) { push(@skipped,"$username:$domain no data to save"); }	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)));
my $result=&Apache::lonnet::cstore(\%grades,$symb,	my $result=&Apache::lonnet::cstore(\%grades,$symb,
$env{'request.course.id'},	$env{'request.course.id'},
$domain,$username);	$domain,$username);
Line 3908 LISTJAVASCRIPT	Line 4026 LISTJAVASCRIPT
'<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.=&build_section_inputs();	$result.=&build_section_inputs();
$result.='<input type="hidden" name="Status" value="'.$env{'form.Status'}.'" />'."\n".	my $stu_status = join(':',&Apache::loncommon::get_env_multiple('form.Status'));
	$result.='<input type="hidden" name="Status" value="'.$stu_status.'" />'."\n".
'<input type="hidden" name="command" value="displayPage" />'."\n".	'<input type="hidden" name="command" value="displayPage" />'."\n".
'<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".	'<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".
'<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."<br />\n";	'<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."<br />\n";
Line 4161 sub displaySubByDates {	Line 4280 sub displaySubByDates {

my $where = ($isTask ? "$version:resource.$interaction"	my $where = ($isTask ? "$version:resource.$interaction"
: "$version:resource");	: "$version:resource");
#&Apache::lonnet::logthis(" got $where");
$studentTable.='<tr bgcolor="#ffffff" valign="top"><td>'.$timestamp.'</td>';	$studentTable.='<tr bgcolor="#ffffff" valign="top"><td>'.$timestamp.'</td>';
if ($isCODE) {	if ($isCODE) {
$studentTable.='<td>'.$record->{$version.':resource.CODE'}.'</td>';	$studentTable.='<td>'.$record->{$version.':resource.CODE'}.'</td>';
Line 4181 sub displaySubByDates {	Line 4299 sub displaySubByDates {

my ($responseId)= ($isTask ? ($matchKey=~ /^resource\.(.*?)\.\Q$partid\E\.award$/)	my ($responseId)= ($isTask ? ($matchKey=~ /^resource\.(.*?)\.\Q$partid\E\.award$/)
: ($matchKey=~ /^resource\.\Q$partid\E\.(.*?)\.submission$/));	: ($matchKey=~ /^resource\.\Q$partid\E\.(.*?)\.submission$/));
#&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].='<span class="LC_internal_info">(ID '.	$displaySub[0].='<span class="LC_internal_info">(ID '.
$responseId.')</span> <b>';	$responseId.')</span> <b>';
Line 4450 the homework problem.	Line 4567 the homework problem.

=over 4	=over 4

=cut


=pod

=item defaultFormData	=item defaultFormData

Line 4466 the homework problem.	Line 4580 the homework problem.

sub defaultFormData {	sub defaultFormData {
my ($symb)=@_;	my ($symb)=@_;
return '	return '<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".
<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".
'<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."\n".	'<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."\n".
'<input type="hidden" name="probTitle" value="'.$env{'form.probTitle'}.'" />'."\n";	'<input type="hidden" name="probTitle" value="'.$env{'form.probTitle'}.'" />'."\n";
}	}


=pod	=pod

=item getSequenceDropDown	=item getSequenceDropDown
Line 5061 sub scan_data {	Line 5175 sub scan_data {

if just_header was not true these key may also exist	if just_header was not true these key may also exist

missingerror - a list of bubbled line numbers that had a blank bubble	missingerror - a list of bubble ranges that are considered to be answers
that is considered an error (if the operator had already	to a single question that don't have any bubbles filled in.
okayed a blank bubble line as really being blank then	Of the form questionnumber:firstbubblenumber:count.
that bubble line number won't appear here.	doubleerror - a list of bubble ranges that are considered to be answers
doubleerror - a list of bubbled line numbers that had more than one	to a single question that have more than one bubble filled in.
bubble filled in and has not been corrected by the	Of the form questionnumber::firstbubblenumber:count
operator
	In the above, count is the number of bubble responses in the
	input line needed to represent the possible answers to the question.
	e.g. a radioresponse with 15 choices in an answer sheet with 10 choices
	per line would have count = 2.

maxquest - the number of the last bubble line that was parsed	maxquest - the number of the last bubble line that was parsed

(<number> starts at 1)	(<number> starts at 1)
Line 5118 sub scantron_parse_scanline {	Line 5237 sub scantron_parse_scanline {

my @alphabet=('A'..'Z');	my @alphabet=('A'..'Z');
my $questnum=0;	my $questnum=0;
	my $ansnum =1; # Multiple 'answer lines'/question.

while ($questions) {	while ($questions) {
	my $answers_needed = $bubble_lines_per_response{$questnum};
	my $answer_length = $$scantron_config{'Qlength'} * $answers_needed;



$questnum++;	$questnum++;
my $currentquest=substr($questions,0,$$scantron_config{'Qlength'});	my $currentquest = substr($questions,0,$answer_length);
substr($questions,0,$$scantron_config{'Qlength'})='';	$questions = substr($questions,0,$answer_length)='';
if (length($currentquest) < $$scantron_config{'Qlength'}) { next; }	if (length($currentquest) < $answer_length) { next; }

	# Qon letter implies for each slot in currentquest we have:
	# ? or * for doubles a letter in A-Z for a bubble and
	# about anything else (esp. a value of Qoff for missing
	# bubbles.


if ($$scantron_config{'Qon'} eq 'letter') {	if ($$scantron_config{'Qon'} eq 'letter') {
if ($currentquest eq '?'
\|\| $currentquest eq '*') {	if ($currentquest =~ /\?/
	\|\| $currentquest =~ /\*/
	\|\| (&occurence_count($currentquest, "[A-Z]") > 1)) {
push(@{$record{'scantron.doubleerror'}},$questnum);	push(@{$record{'scantron.doubleerror'}},$questnum);
$record{"scantron.$questnum.answer"}='';	for (my $ans = 0; $ans < $answers_needed; $ans++) {
	$record{"scantron.$ansnum.answer"}='';
	$ansnum++;
	}

} elsif (!defined($currentquest)	} elsif (!defined($currentquest)
\|\| $currentquest eq $$scantron_config{'Qoff'}	\|\| (&occurence_count($currentquest, $$scantron_config{'Qoff'}) == length($currentquest))
\|\| $currentquest !~ /^[A-Z]$/) {	\|\| (&occurence_count($currentquest, "[A-Z]") == 0)) {
$record{"scantron.$questnum.answer"}='';	for (my $ans = 0; $ans < $answers_needed; $ans++ ) {
	$record{"scantron.$ansnum.answer"}='';
	$ansnum++;

	}
if (!&scan_data($scan_data,"$whichline.no_bubble.$questnum")) {	if (!&scan_data($scan_data,"$whichline.no_bubble.$questnum")) {
push(@{$record{"scantron.missingerror"}},$questnum);	push(@{$record{"scantron.missingerror"}},$questnum);
	$ansnum += $answers_needed;
}	}

} else {	} else {
$record{"scantron.$questnum.answer"}=$currentquest;	for (my $ans = 0; $ans < $answers_needed; $ans++) {
	$record{"scantron.$ansnum.answer"} = substr($currentquest, $ans, 1);
	$ansnum++;
	}
}	}

	# Qon 'number' implies each slot gives a digit that indexes the
	# the bubbles filled or Qoff or a non number for unbubbled lines.
	# and *? for double bubbles on a line.
	# these answers are also stored as letters.

} elsif ($$scantron_config{'Qon'} eq 'number') {	} elsif ($$scantron_config{'Qon'} eq 'number') {
if ($currentquest eq '?'	if ($currentquest =~ /\?/
\|\| $currentquest eq '*') {	\|\| $currentquest =~ /\*/
	\|\| (&occurence_count($currentquest, '\d') > 1)) {
push(@{$record{'scantron.doubleerror'}},$questnum);	push(@{$record{'scantron.doubleerror'}},$questnum);
$record{"scantron.$questnum.answer"}='';	for (my $ans = 0; $ans < $answers_needed; $ans++) {
	$record{"scantron.$ansnum.answer"}='';
	$ansnum++;
	}

} elsif (!defined($currentquest)	} elsif (!defined($currentquest)
\|\| $currentquest eq $$scantron_config{'Qoff'}	\|\| (&occurence_count($currentquest,$$scantron_config{'Qoff'}) == length($currentquest))
\|\| $currentquest !~ /^\d$/) {	\|\| (&occurence_count($currentquest, '\d') == 0)) {
$record{"scantron.$questnum.answer"}='';	for (my $ans = 0; $ans < $answers_needed; $ans++ ) {
	$record{"scantron.$ansnum.answer"}='';
	$ansnum++;

	}
if (!&scan_data($scan_data,"$whichline.no_bubble.$questnum")) {	if (!&scan_data($scan_data,"$whichline.no_bubble.$questnum")) {
push(@{$record{"scantron.missingerror"}},$questnum);	push(@{$record{"scantron.missingerror"}},$questnum);
	$ansnum += $answers_needed;
}	}

} else {	} else {
# wrap zero back to J	$currentquest = &digits_to_letters($currentquest);
if ($currentquest eq '0') {	for (my $ans =0; $ans < $answers_needed; $ans++) {
$record{"scantron.$questnum.answer"}=	$record{"scantron.$ansnum.answer"} = substr($currentquest, $ans, 1);
$alphabet[9];	$ansnum++;
} else {
$record{"scantron.$questnum.answer"}=
$alphabet[$currentquest-1];
}	}
}	}
} else {	} else {

	# Otherwise there's a positional notation;
	# each bubble line requires Qlength items, and there are filled in
	# bubbles for each case where there 'Qon' characters.
	#

my @array=split($$scantron_config{'Qon'},$currentquest,-1);	my @array=split($$scantron_config{'Qon'},$currentquest,-1);
if (length($array[0]) eq $$scantron_config{'Qlength'}) {
$record{"scantron.$questnum.answer"}='';	# If the split only giveas us one element.. the full length of the
	# answser string, no bubbles are filled in:

	if (length($array[0]) eq $$scantron_config{'Qlength'}*$answers_needed) {
	for (my $ans = 0; $ans < $answers_needed; $ans++ ) {
	$record{"scantron.$ansnum.answer"}='';
	$ansnum++;

	}
if (!&scan_data($scan_data,"$whichline.no_bubble.$questnum")) {	if (!&scan_data($scan_data,"$whichline.no_bubble.$questnum")) {
push(@{$record{"scantron.missingerror"}},$questnum);	push(@{$record{"scantron.missingerror"}},$questnum);
}	}
} else {	} elsif (scalar(@array) lt 2) {
$record{"scantron.$questnum.answer"}=
$alphabet[length($array[0])];	my $location = [length($array[0])];
	my $line_num = $location / $$scantron_config{'Qlength'};
	my $bubble = $alphabet[$location % $$scantron_config{'Qlength'}];

	for (my $ans = 0; $ans < $answers_needed; $ans++) {
	if ($ans eq $line_num) {
	$record{"scantron.$ansnum.answer"} = $bubble;
	} else {
	$record{"scantron.$ansnum.answer"} = ' ';
	}
	$ansnum++;
	}
}	}
if (scalar(@array) gt 2) {	# If there's more than one instance of a bubble character
	# That's a double bubble; with positional notation we can
	# record all the bubbles filled in as well as the
	# fact this response consists of multiple bubbles.
	#
	else {
push(@{$record{'scantron.doubleerror'}},$questnum);	push(@{$record{'scantron.doubleerror'}},$questnum);

	my $first_answer = $ansnum;
	for (my $ans =0; $ans < $answers_needed; $ans++) {
	$record{"scantron.$ansnum.answer"} = '';
	$ans++;
	}

my @ans=@array;	my @ans=@array;
my $i=length($ans[0]);shift(@ans);	my $i=length($ans[0]);shift(@ans);
while ($#ans) {	while ($#ans) {
$i+=length($ans[0])+1;	$i+=length($ans[0])+1;
$record{"scantron.$questnum.answer"}.=$alphabet[$i];	my $line = $i/$$scantron_config{'Qlength'} + $first_answer;
	my $bubble = $i%$$scantron_config{'Qlength'};

	$record{"scantron.$line.answer"}.=$alphabet[$bubble];
shift(@ans);	shift(@ans);
}	}
}	}
Line 5536 sub scantron_form_start {	Line 5738 sub scantron_form_start {
<input type="hidden" name="scantron_options_ignore" value="$env{'form.scantron_options_ignore'}" />	<input type="hidden" name="scantron_options_ignore" value="$env{'form.scantron_options_ignore'}" />
<input type="hidden" name="scantron_options_hidden" value="$env{'form.scantron_options_hidden'}" />	<input type="hidden" name="scantron_options_hidden" value="$env{'form.scantron_options_hidden'}" />
SCANTRONFORM	SCANTRONFORM

	my $line = 0;
	while (defined($env{"form.scantron.bubblelines.$line"})) {
	&Apache::lonnet::logthis("Saving chunk for $line");
	my $chunk =
	'<input type="hidden" name="scantron.bubblelines.'.$line.'" value="'.$env{"form.scantron.bubblelines.$line"}.'" />'."\n";
	$chunk .=
	'<input type="hidden" name="scantron.first_bubble_line.'.$line.'" value="'.$env{"form.scantron.first_bubble_line.$line"}.'" />'."\n";
	$result .= $chunk;
	$line++;
	}
return $result;	return $result;
}	}

Line 5594 sub scantron_validate_file {	Line 5807 sub scantron_validate_file {
}	}
my $currentphase=$env{'form.validatepass'};	my $currentphase=$env{'form.validatepass'};

	&Apache::lonnet::logthis("Phase: $currentphase");

my $stop=0;	my $stop=0;
while (!$stop && $currentphase < scalar(@validate_phases)) {	while (!$stop && $currentphase < scalar(@validate_phases)) {
$r->print("<p> Validating ".$validate_phases[$currentphase]."</p>");	$r->print("<p> Validating ".$validate_phases[$currentphase]."</p>");
Line 6017 sub scantron_validate_ID {	Line 6232 sub scantron_validate_ID {
#get scantron line setup	#get scantron line setup
my %scantron_config=&get_scantron_config($env{'form.scantron_format'});	my %scantron_config=&get_scantron_config($env{'form.scantron_format'});
my ($scanlines,$scan_data)=&scantron_getfile();	my ($scanlines,$scan_data)=&scantron_getfile();

	&scantron_get_maxbubble(); # parse needs the bubble_lines.. array.

my %found=('ids'=>{},'usernames'=>{});	my %found=('ids'=>{},'usernames'=>{});
for (my $i=0;$i<=$scanlines->{'count'};$i++) {	for (my $i=0;$i<=$scanlines->{'count'};$i++) {
Line 6201 ENDSCRIPT	Line 6418 ENDSCRIPT
$r->print($message);	$r->print($message);
$r->print("<p>Please indicate which bubble should be used for grading</p>");	$r->print("<p>Please indicate which bubble should be used for grading</p>");
foreach my $question (@{$arg}) {	foreach my $question (@{$arg}) {
my $selected=$$scan_record{"scantron.$question.answer"};
	my $selected = &get_response_bubbles($scan_record, $question);
&scantron_bubble_selector($r,$scan_config,$question,	&scantron_bubble_selector($r,$scan_config,$question,
split('',$selected));	split('',$selected));
}	}
Line 6213 ENDSCRIPT	Line 6431 ENDSCRIPT
$r->print('<input type="hidden" name="scantron_questions" value="'.	$r->print('<input type="hidden" name="scantron_questions" value="'.
join(',',@{$arg}).'" />');	join(',',@{$arg}).'" />');
foreach my $question (@{$arg}) {	foreach my $question (@{$arg}) {
my $selected=$$scan_record{"scantron.$question.answer"};	my $selected = &get_response_bubbles($scan_record, $question);
&scantron_bubble_selector($r,$scan_config,$question);	&scantron_bubble_selector($r,$scan_config,$question);
}	}
} else {	} else {
Line 6235 ENDSCRIPT	Line 6453 ENDSCRIPT
$scan_config - hash from &get_scantron_config()	$scan_config - hash from &get_scantron_config()
$quest - number of the bubble line to make a corrector for	$quest - number of the bubble line to make a corrector for
$selected - array of letters of previously selected bubbles	$selected - array of letters of previously selected bubbles
$lines - if present, number of bubble lines to show

=cut	=cut

sub scantron_bubble_selector {	sub scantron_bubble_selector {
my ($r,$scan_config,$quest,@selected, $lines)=@_;	my ($r,$scan_config,$quest,@selected)=@_;
my $max=$$scan_config{'Qlength'};	my $max=$$scan_config{'Qlength'};

my $scmode=$$scan_config{'Qon'};	my $scmode=$$scan_config{'Qon'};


if ($scmode eq 'number' \|\| $scmode eq 'letter') { $max=10; }	if ($scmode eq 'number' \|\| $scmode eq 'letter') { $max=10; }

	my $response = $quest-1;
	my $lines = $bubble_lines_per_response{$response};
	&Apache::lonnet::logthis("Question $quest, lines: $lines");

if (!defined($lines)) {
$lines = 1;
}
my $total_lines = $lines*2;	my $total_lines = $lines*2;
my @alphabet=('A'..'Z');	my @alphabet=('A'..'Z');
$r->print("<table border='1'><tr><td rowspan='".$total_lines."'>$quest</td>");	$r->print("<table border='1'><tr><td rowspan='".$total_lines."'>$quest</td>");
Line 6423 sub scantron_validate_CODE {	Line 6642 sub scantron_validate_CODE {

my %allcodes=&get_codes();	my %allcodes=&get_codes();

	&scantron_get_maxbubble(); # parse needs the lines per response array.

my ($scanlines,$scan_data)=&scantron_getfile();	my ($scanlines,$scan_data)=&scantron_getfile();
for (my $i=0;$i<=$scanlines->{'count'};$i++) {	for (my $i=0;$i<=$scanlines->{'count'};$i++) {
my $line=&scantron_get_line($scanlines,$scan_data,$i);	my $line=&scantron_get_line($scanlines,$scan_data,$i);
Line 6475 sub scantron_validate_doublebubble {	Line 6696 sub scantron_validate_doublebubble {
#get scantron line setup	#get scantron line setup
my %scantron_config=&get_scantron_config($env{'form.scantron_format'});	my %scantron_config=&get_scantron_config($env{'form.scantron_format'});
my ($scanlines,$scan_data)=&scantron_getfile();	my ($scanlines,$scan_data)=&scantron_getfile();

	&scantron_get_maxbubble(); # parse needs the bubble line array.

for (my $i=0;$i<=$scanlines->{'count'};$i++) {	for (my $i=0;$i<=$scanlines->{'count'};$i++) {
my $line=&scantron_get_line($scanlines,$scan_data,$i);	my $line=&scantron_get_line($scanlines,$scan_data,$i);
if ($line=~/^[\s\cz]*$/) { next; }	if ($line=~/^[\s\cz]*$/) { next; }
Line 6498 sub scantron_validate_doublebubble {	Line 6722 sub scantron_validate_doublebubble {
resource and then checking &Apache::lonxml::get_problem_counter()	resource and then checking &Apache::lonxml::get_problem_counter()
for what the current value of the problem counter is.	for what the current value of the problem counter is.

Caches the result to $env{'form.scantron_maxbubble'}	Caches the results to $env{'form.scantron_maxbubble'},
	$env{'form.scantron.bubble_lines.n'} and
	$env{'form.scantron.first_bubble_line.n'}
	which are the total number of bubble, lines, the number of bubble
	lines for reponse n and number of the first bubble line for response n.

=cut	=cut

sub scantron_get_maxbubble {	sub scantron_get_maxbubble {
	&Apache::lonnet::logthis("get_max_bubble");
if (defined($env{'form.scantron_maxbubble'}) &&	if (defined($env{'form.scantron_maxbubble'}) &&
$env{'form.scantron_maxbubble'}) {	$env{'form.scantron_maxbubble'}) {
	&Apache::lonnet::logthis("cached");
	&restore_bubble_lines();
return $env{'form.scantron_maxbubble'};	return $env{'form.scantron_maxbubble'};
}	}
	&Apache::lonnet::logthis("computing");

my $navmap=Apache::lonnavmaps::navmap->new();	my (undef, undef, $sequence) =
my (undef,undef,$sequence)=
&Apache::lonnet::decode_symb($env{'form.selectpage'});	&Apache::lonnet::decode_symb($env{'form.selectpage'});

	my $navmap=Apache::lonnavmaps::navmap->new();
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);

Line 6523 sub scantron_get_maxbubble {	Line 6754 sub scantron_get_maxbubble {
my $cid = $env{'request.course.id'};	my $cid = $env{'request.course.id'};
my $total_lines = 0;	my $total_lines = 0;
%bubble_lines_per_response = ();	%bubble_lines_per_response = ();
	%first_bubble_line = ();


	my $response_number = 0;
	my $bubble_line = 0;
foreach my $resource (@resources) {	foreach my $resource (@resources) {
my $symb = $resource->symb();	my $symb = $resource->symb();
	&Apache::lonxml::clear_bubble_lines_for_part();
my $result=&Apache::lonnet::ssi($resource->src(),	my $result=&Apache::lonnet::ssi($resource->src(),
('symb' => $resource->symb()),	('symb' => $resource->symb()),
('grade_target' => 'analyze'),	('grade_target' => 'analyze'),
Line 6540 sub scantron_get_maxbubble {	Line 6776 sub scantron_get_maxbubble {


foreach my $part_id (@{$analysis{'parts'}}) {	foreach my $part_id (@{$analysis{'parts'}}) {
my $bubble_lines = $analysis{"$part_id.bubble_lines"}[0];	my ($trash, $part) = split(/\./, $part_id);
if (!$bubble_lines) {
$bubble_lines = 1;	my $lines = $analysis{"$part_id.bubble_lines"}[0];
}
$bubble_lines_per_response{"$symb.$part_id"} = $bubble_lines;	# TODO - make this a persistent hash not an array.
$total_lines = $total_lines + $bubble_lines;

	$first_bubble_line{$response_number} = $bubble_line;
	$bubble_lines_per_response{$response_number} = $lines;
	$response_number++;

	$bubble_line += $lines;
	$total_lines += $lines;
}	}

}	}
&Apache::lonnet::delenv('scantron\.');	&Apache::lonnet::delenv('scantron\.');

	&save_bubble_lines();
$env{'form.scantron_maxbubble'} =	$env{'form.scantron_maxbubble'} =
$total_lines;	$total_lines;
return $env{'form.scantron_maxbubble'};	return $env{'form.scantron_maxbubble'};
Line 6560 sub scantron_get_maxbubble {	Line 6805 sub scantron_get_maxbubble {
=item scantron_validate_missingbubbles	=item scantron_validate_missingbubbles

Validates all scanlines in the selected file to not have any	Validates all scanlines in the selected file to not have any
bubble lines with missing bubbles that haven't been verified as missing.	answers that don't have bubbles that have not been verified
	to be bubble free.

=cut	=cut

Line 6654 SCANTRONFORM	Line 6900 SCANTRONFORM
my $start=&Time::HiRes::time();	my $start=&Time::HiRes::time();
my $i=-1;	my $i=-1;
my ($uname,$udom,$started);	my ($uname,$udom,$started);

	&scantron_get_maxbubble(); # Need the bubble lines array to parse.

while ($i<$scanlines->{'count'}) {	while ($i<$scanlines->{'count'}) {
($uname,$udom)=('','');	($uname,$udom)=('','');
$i++;	$i++;
Line 6704 SCANTRONFORM	Line 6953 SCANTRONFORM
}	}
my $result=&Apache::lonnet::ssi($resource->src(),%form);	my $result=&Apache::lonnet::ssi($resource->src(),%form);
if ($result ne '') {	if ($result ne '') {
&Apache::lonnet::logthis("scantron grading error -> $result");
&Apache::lonnet::logthis("scantron grading error info name $uname domain $udom course $env{'request.course.id'} url ".$resource->src());
}	}
if (&Apache::loncommon::connection_aborted($r)) { last; }	if (&Apache::loncommon::connection_aborted($r)) { last; }
}	}
Line 6930 sub savedState {	Line 7177 sub savedState {
return \%savedState;	return \%savedState;
}	}

#--- Displays the main menu page -------	sub grading_menu {
sub gradingmenu {
my ($request) = @_;	my ($request) = @_;
my ($symb)=&get_symb($request);	my ($symb)=&get_symb($request);
if (!$symb) {return '';}	if (!$symb) {return '';}
my $probTitle = &Apache::lonnet::gettitle($symb);	my $probTitle = &Apache::lonnet::gettitle($symb);
	my ($table,undef,$hdgrade) = &showResourceInfo($symb,$probTitle);

	#
	# Define menu data
	$env{'form.probTitle'} = &Apache::lonnet::gettitle($symb);
	my ($table) = &showResourceInfo($symb,$env{'form.probTitle'});
	$request->print($table);
	my %fields = ('symb'=>&Apache::lonenc::check_encrypt($symb),
	'handgrade'=>$hdgrade,
	'probTitle'=>$probTitle,
	'command'=>'submit_options',
	'saveState'=>"",
	'gradingMenu'=>1,
	'showgrading'=>"yes");
	my $url = &Apache::lonhtmlcommon::build_url('grades/',\%fields);
	my @menu = ({ url => $url,
	name => &mt('Manual Grading/View Submissions'),
	short_description =>
	&mt('Start the process of hand grading submissions.'),
	});
	$fields{'command'} = 'csvform';
	$url = &Apache::lonhtmlcommon::build_url('grades/',\%fields);
	push (@menu, { url => $url,
	name => &mt('Upload Scores'),
	short_description =>
	&mt('Specify a file containing the class scores for current resource.')});
	$fields{'command'} = 'processclicker';
	$url = &Apache::lonhtmlcommon::build_url('grades/',\%fields);
	push (@menu, { url => $url,
	name => &mt('Process Clicker'),
	short_description =>
	&mt('Specify a file containing the clicker information for this resource.')});
	$fields{'command'} = 'scantron_selectphase';
	$url = &Apache::lonhtmlcommon::build_url('grades/',\%fields);
	push (@menu, { url => $url,
	name => &mt('Grade Scantron Forms'),
	short_description =>
	&mt('')});
	$fields{'command'} = 'verify';
	$url = &Apache::lonhtmlcommon::build_url('grades/',\%fields);
	push (@menu, { url => "",
	jscript => ' onClick="javascript:checkChoice2(document.forms.gradingMenu,\'5\',\'verify\')" ',
	name => &mt('Verify Receipt'),
	short_description =>
	&mt('')});
	$fields{'command'} = 'manage';
	$url = &Apache::lonhtmlcommon::build_url('/adm/helper/resettimes.helper',\%fields);
	push (@menu, { url => $url,
	name => &mt('Manage Access Times'),
	short_description =>
	&mt('')});
	$fields{'command'} = 'view';
	$url = &Apache::lonhtmlcommon::build_url('/adm/pickcode',\%fields);
	push (@menu, { url => $url,
	name => &mt('View Saved CODEs'),
	short_description =>
	&mt('')});

	#
	# Create the menu
	my $Str;
	# $Str .= '<h2>'.&mt('Please select a grading task').'</h2>';
	$Str .= '<form method="post" action="" name="gradingMenu">';
	$Str .= '<input type="hidden" name="command" value="" />'.
	'<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".
	'<input type="hidden" name="handgrade" value="'.$hdgrade.'" />'."\n".
	'<input type="hidden" name="probTitle" value="'.$probTitle.'" ue="" />'."\n".
	'<input type="hidden" name="saveState" value="" />'."\n".
	'<input type="hidden" name="gradingMenu" value="1" />'."\n".
	'<input type="hidden" name="showgrading" value="yes" />'."\n";

	foreach my $menudata (@menu) {
	if ($menudata->{'name'} ne &mt('Verify Receipt')) {
	$Str .=' <h3><a '.
	$menudata->{'jscript'}.
	' href="'.
	$menudata->{'url'}.'" >'.
	$menudata->{'name'}."</a></h3>\n";
	} else {
	$Str .=' <h3><a '.
	$menudata->{'jscript'}.
	' href="javascript:checkChoice2(document.forms.gradingMenu,\'5\',\'verify\')" >'.
	$menudata->{'name'}."</a></h3>\n";
	$Str .= (' 'x8).
	' receipt: '.&Apache::lonnet::recprefix($env{'request.course.id'}).
	'-<input type="text" name="receipt" size="4" onChange="javascript:checkReceiptNo(this.form,\'OK\')" />';
	}
	$Str .= ' '.(' 'x8).$menudata->{'short_description'}.
	"\n";
	}
	$Str .="</dl>\n";
	$Str .="</form>\n";
$request->print(<<GRADINGMENUJS);	$request->print(<<GRADINGMENUJS);
<script type="text/javascript" language="javascript">	<script type="text/javascript" language="javascript">
function checkChoice(formname,val,cmdx) {	function checkChoice(formname,val,cmdx) {
Line 6957 sub gradingmenu {	Line 7294 sub gradingmenu {
}	}
if (val < 7) formname.submit();	if (val < 7) formname.submit();
}	}
	function checkChoice2(formname,val,cmdx) {
	if (val <= 2) {
	var cmd = radioSelection(formname.radioChoice);
	var cmdsave = cmd;
	} else {
	cmd = cmdx;
	cmdsave = 'submission';
	}
	formname.command.value = cmd;
	if (val < 5) formname.submit();
	if (val == 5) {
	if (!checkReceiptNo(formname,'notOK')) { return false;}
	formname.submit();
	}
	if (val < 7) formname.submit();
	}

function checkReceiptNo(formname,nospace) {	function checkReceiptNo(formname,nospace) {
var receiptNo = formname.receipt.value;	var receiptNo = formname.receipt.value;
Line 6975 sub gradingmenu {	Line 7328 sub gradingmenu {
GRADINGMENUJS	GRADINGMENUJS
&commonJSfunctions($request);	&commonJSfunctions($request);
my $result='<h3> <span class="LC_info">Manual Grading/View Submission</span></h3>';	my $result='<h3> <span class="LC_info">Manual Grading/View Submission</span></h3>';
my ($table,undef,$hdgrade) = &showResourceInfo($symb,$probTitle);
$result.=$table;	$result.=$table;
my (undef,$sections) = &getclasslist('all','0');	my (undef,$sections) = &getclasslist('all','0');
my $savedState = &savedState();	my $savedState = &savedState();
Line 6987 GRADINGMENUJS	Line 7339 GRADINGMENUJS
$result.='<form action="/adm/grades" method="post" name="gradingMenu">'."\n".	$result.='<form action="/adm/grades" method="post" name="gradingMenu">'."\n".
'<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".	'<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".
'<input type="hidden" name="handgrade" value="'.$hdgrade.'" />'."\n".	'<input type="hidden" name="handgrade" value="'.$hdgrade.'" />'."\n".
'<input type="hidden" name="probTitle" value="'.$probTitle.'" />'."\n".	'<input type="hidden" name="probTitle" value="'.$probTitle.'" ue="" />'."\n".
'<input type="hidden" name="command" value="" />'."\n".
'<input type="hidden" name="saveState" value="" />'."\n".	'<input type="hidden" name="saveState" value="" />'."\n".
'<input type="hidden" name="gradingMenu" value="1" />'."\n".	'<input type="hidden" name="gradingMenu" value="1" />'."\n".
'<input type="hidden" name="showgrading" value="yes" />'."\n";	'<input type="hidden" name="showgrading" value="yes" />'."\n";
Line 6999 GRADINGMENUJS	Line 7350 GRADINGMENUJS
'<tr bgcolor="#ffffe6" valign="top"><td>'."\n";	'<tr bgcolor="#ffffe6" valign="top"><td>'."\n";

$result.='<table width="100%" border="0">';	$result.='<table width="100%" border="0">';
	$result.='<tr bgcolor="#ffffe6" valign="top">'."\n";
	$result.='<td><b>'.&mt('Sections').'</b></td>';
	# $result.='<td>Groups</td>';
	$result.='<td><b>'.&mt('Access Status').'</td>'."\n";
	$result.='</tr>';
$result.='<tr bgcolor="#ffffe6" valign="top"><td>'."\n".	$result.='<tr bgcolor="#ffffe6" valign="top"><td>'."\n".
' '.&mt('Select Section').': <select name="section" multiple="multiple" size="3">'."\n";	' <select name="section" multiple="multiple" size="3">'."\n";
if (ref($sections)) {	if (ref($sections)) {
foreach (sort (@$sections)) {	foreach (sort (@$sections)) {
$result.='<option value="'.$_.'" '.	$result.='<option value="'.$_.'" '.
Line 7008 GRADINGMENUJS	Line 7364 GRADINGMENUJS
}	}
}	}
$result.= '<option value="all" '.($saveSec eq 'all' ? 'selected="selected"' : ''). '>all</option></select>   ';	$result.= '<option value="all" '.($saveSec eq 'all' ? 'selected="selected"' : ''). '>all</option></select>   ';
	return $Str;
	}

$result.=&mt('Student Status').':'.&Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,1,undef);
	#--- Displays the submissions first page -------
	sub submit_options {
	my ($request) = @_;
	my ($symb)=&get_symb($request);
	if (!$symb) {return '';}
	my $probTitle = &Apache::lonnet::gettitle($symb);

	$request->print(<<GRADINGMENUJS);
	<script type="text/javascript" language="javascript">
	function checkChoice(formname,val,cmdx) {
	if (val <= 2) {
	var cmd = radioSelection(formname.radioChoice);
	var cmdsave = cmd;
	} else {
	cmd = cmdx;
	cmdsave = 'submission';
	}
	formname.command.value = cmd;
	formname.saveState.value = "saveCmd="+cmdsave+":saveSec="+pullDownSelection(formname.section)+
	":saveSub="+pullDownSelection(formname.submitonly)+":saveStatus="+pullDownSelection(formname.Status);
	if (val < 5) formname.submit();
	if (val == 5) {
	if (!checkReceiptNo(formname,'notOK')) { return false;}
	formname.submit();
	}
	if (val < 7) formname.submit();
	}

	function checkReceiptNo(formname,nospace) {
	var receiptNo = formname.receipt.value;
	var checkOpt = false;
	if (nospace == "OK" && isNaN(receiptNo)) {checkOpt = true;}
	if (nospace == "notOK" && (isNaN(receiptNo) \|\| receiptNo == "")) {checkOpt = true;}
	if (checkOpt) {
	alert("Please enter a receipt number given by a student in the receipt box.");
	formname.receipt.value = "";
	formname.receipt.focus();
	return false;
	}
	return true;
	}
	</script>
	GRADINGMENUJS
	&commonJSfunctions($request);
	my $result='<h3> <span class="LC_info">Manual Grading/View Submission</span></h3>';
	my ($table,undef,$hdgrade) = &showResourceInfo($symb,$probTitle);
	$result.=$table;
	my (undef,$sections) = &getclasslist('all','0');
	my $savedState = &savedState();
	my $saveCmd = ($$savedState{'saveCmd'} eq '' ? 'submission' : $$savedState{'saveCmd'});
	my $saveSec = ($$savedState{'saveSec'} eq '' ? 'all' : $$savedState{'saveSec'});
	my $saveSub = ($$savedState{'saveSub'} eq '' ? 'all' : $$savedState{'saveSub'});
	my $saveStatus = ($$savedState{'saveStatus'} eq '' ? 'Active' : $$savedState{'saveStatus'});

	$result.='<form action="/adm/grades" method="post" name="gradingMenu">'."\n".
	'<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".
	'<input type="hidden" name="handgrade" value="'.$hdgrade.'" />'."\n".
	'<input type="hidden" name="probTitle" value="'.$probTitle.'" />'."\n".
	'<input type="hidden" name="command" value="" />'."\n".
	'<input type="hidden" name="saveState" value="" />'."\n".
	'<input type="hidden" name="gradingMenu" value="1" />'."\n".
	'<input type="hidden" name="showgrading" value="yes" />'."\n";

	$result.='<table border="0"><tr><td bgcolor=#777777>'."\n".
	'<table width="100%" border="0"><tr bgcolor="#e6ffff"><td>'."\n".
	' <b>Select a Grading/Viewing Option</b></td></tr>'."\n".
	'<tr bgcolor="#ffffe6" valign="top"><td>'."\n";

	$result.='<table width="100%" border="0">';
	$result.='<tr bgcolor="#ffffe6" valign="top">'."\n";
	$result.='<td><b>'.&mt('Sections').'</b></td>';
	$result.='<td><b>'.&mt('Groups').'</b></td>';
	$result.='<td><b>'.&mt('Access Status').'</td>'."\n";
	$result.='</tr>';
	$result.='<tr bgcolor="#ffffe6" valign="top"><td>'."\n".
	' <select name="section" multiple="multiple" size="3">'."\n";
	if (ref($sections)) {
	foreach (sort (@$sections)) {
	$result.='<option value="'.$_.'" '.
	($saveSec eq $_ ? 'selected="selected"':'').'>'.$_.'</option>'."\n";
	}
	}
	$result.= '<option value="all" '.($saveSec eq 'all' ? 'selected="selected"' : ''). '>all</option></select>   ';
	$result.= '</td><td>'."\n";
	$result.= &Apache::lonstatistics::GroupSelect('group','multiple',3);
	$result.='</td><td>'."\n";
	$result.=&Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,3,undef,'mult');

$result.='</td></tr>';	$result.='</td></tr>';

$result.='<tr bgcolor="#ffffe6"valign="top"><td><label>'.	$result.='<tr bgcolor="#ffffe6"valign="top"><td colspan="3"><label>'.
'<input type="radio" name="radioChoice" value="submission" '.	'<input type="radio" name="radioChoice" value="submission" '.
($saveCmd eq 'submission' ? 'checked="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">'.
Line 7028 GRADINGMENUJS	Line 7473 GRADINGMENUJS
'<option value="all" '.	'<option value="all" '.
($saveSub eq 'all' ? 'selected="selected"' : '').'>'.&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 colspan="2">'.
'<label><input type="radio" name="radioChoice" value="viewgrades" '.	'<label><input type="radio" name="radioChoice" value="viewgrades" '.
($saveCmd eq 'viewgrades' ? 'checked="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 colspan="2">'.
'<label><input type="radio" name="radioChoice" value="pickStudentPage" '.	'<label><input type="radio" name="radioChoice" value="pickStudentPage" '.
($saveCmd eq 'pickStudentPage' ? 'checked="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 colspan="2"><br />'.
'<input type="button" onClick="javascript:checkChoice(this.form,\'2\');" value="Next->" />'.	'<input type="button" onClick="javascript:checkChoice(this.form,\'2\');" value="Next->" />'.
'</td></tr></table>'."\n";	'</td></tr></table>'."\n";

$result.='</td><td valign="top">';	$result.='</td>'; #<td valign="top">';

$result.='<table width="100%" border="0">';
$result.='<tr bgcolor="#ffffe6"><td>'.
'<input type="button" onClick="javascript:checkChoice(this.form,\'3\',\'csvform\');" value="'.&mt('Upload').'" />'.
' '.&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">'.
'<input type="button" onClick="javascript:checkChoice(this.form,\'4\',\'scantron_selectphase\');'.
'" value="'.&mt('Grade').'" /> scantron forms</td></tr>'."\n";

if ((&Apache::lonnet::allowed('mgr',$env{'request.course.id'})) && ($symb)) {
$result.='<tr bgcolor="#ffffe6"valign="top"><td>'.
'<input type="button" onClick="javascript:checkChoice(this.form,\'5\',\'verify\');" value="'.&mt('Verify').'" />'.
' '.&mt('receipt').': '.
&Apache::lonnet::recprefix($env{'request.course.id'}).
'-<input type="text" name="receipt" size="4" onChange="javascript:checkReceiptNo(this.form,\'OK\')" />'.
'</td></tr>'."\n";
}
$result.='<tr bgcolor="#ffffe6"valign="top"><td colspan="2">'.
'<input type="button" onClick="javascript:this.form.action=\'/adm/helper/resettimes.helper\';this.form.submit();'.
'" value="'.&mt('Manage').'" /> access times.</td></tr>'."\n";
$result.='<tr bgcolor="#ffffe6"valign="top"><td colspan="2">'.
'<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";

$result.='</table>'."\n".	# $result.='<table width="100%" border="0">';
'</td></tr></table>'."\n".	# $result.='<tr bgcolor="#ffffe6"><td>'.
	# '<input type="button" onClick="javascript:checkChoice(this.form,\'3\',\'csvform\');" value="'.&mt('Upload').'" />'.
	# ' '.&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">'.
	# '<input type="button" onClick="javascript:checkChoice(this.form,\'4\',\'scantron_selectphase\');'.
	# '" value="'.&mt('Grade').'" /> scantron forms</td></tr>'."\n";
	#
	# if ((&Apache::lonnet::allowed('mgr',$env{'request.course.id'})) && ($symb)) {
	# $result.='<tr bgcolor="#ffffe6"valign="top"><td>'.
	# '<input type="button" onClick="javascript:checkChoice(this.form,\'5\',\'verify\');" value="'.&mt('Verify').'" />'.
	# ' '.&mt('receipt').': '.
	# &Apache::lonnet::recprefix($env{'request.course.id'}).
	# '-<input type="text" name="receipt" size="4" onChange="javascript:checkReceiptNo(this.form,\'OK\')" />'.
	# '</td></tr>'."\n";
	# }
	# $result.='<tr bgcolor="#ffffe6"valign="top"><td colspan="2">'.
	# '<input type="button" onClick="javascript:this.form.action=\'/adm/helper/resettimes.helper\';this.form.submit();'.
	# '" value="'.&mt('Manage').'" /> access times.</td></tr>'."\n";
	# $result.='<tr bgcolor="#ffffe6"valign="top"><td colspan="2">'.
	# '<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";
	#
	# $result.='</table>'."\n".'</td>';
	$result.= '</tr></table>'."\n".
'</td></tr></table></form>'."\n";	'</td></tr></table></form>'."\n";
return $result;	return $result;
}	}
Line 7353 ENDHEADER	Line 7798 ENDHEADER
}	}
$result.='<br />'.&mt('Found [_1] question(s)',$number).'<br />'.	$result.='<br />'.&mt('Found [_1] question(s)',$number).'<br />'.
'<input type="hidden" name="number" value="'.$number.'" />'.	'<input type="hidden" name="number" value="'.$number.'" />'.
	&mt('Awarding [_1] percent for corrion(s)',$number).'<br />'.
	'<input type="hidden" name="number" value="'.$number.'" />'.
&mt('Awarding [_1] percent for correct and [_2] percent for incorrect responses',	&mt('Awarding [_1] percent for correct and [_2] percent for incorrect responses',
$env{'form.pcorrect'},$env{'form.pincorrect'}).	$env{'form.pcorrect'},$env{'form.pincorrect'}).
'<br />';	'<br />';
Line 7596 sub handler {	Line 8043 sub handler {
my $symb=&get_symb($request,1);	my $symb=&get_symb($request,1);
my @commands=&Apache::loncommon::get_env_multiple('form.command');	my @commands=&Apache::loncommon::get_env_multiple('form.command');
my $command=$commands[0];	my $command=$commands[0];

if ($#commands > 0) {	if ($#commands > 0) {
&Apache::lonnet::logthis("grades got multiple commands ".join(':',@commands));	&Apache::lonnet::logthis("grades got multiple commands ".join(':',@commands));
}	}


$request->print(&Apache::loncommon::start_page('Grading'));	$request->print(&Apache::loncommon::start_page('Grading'));
if ($symb eq '' && $command eq '') {	if ($symb eq '' && $command eq '') {
if ($env{'user.adv'}) {	if ($env{'user.adv'}) {
Line 7639 sub handler {	Line 8089 sub handler {
} elsif ($command eq 'processGroup' && $perm{'vgr'}) {	} elsif ($command eq 'processGroup' && $perm{'vgr'}) {
&processGroup($request);	&processGroup($request);
} elsif ($command eq 'gradingmenu' && $perm{'vgr'}) {	} elsif ($command eq 'gradingmenu' && $perm{'vgr'}) {
$request->print(&gradingmenu($request));	$request->print(&grading_menu($request));
	} elsif ($command eq 'submit_options' && $perm{'vgr'}) {
	$request->print(&submit_options($request));
} elsif ($command eq 'viewgrades' && $perm{'vgr'}) {	} elsif ($command eq 'viewgrades' && $perm{'vgr'}) {
$request->print(&viewgrades($request));	$request->print(&viewgrades($request));
} elsif ($command eq 'handgrade' && $perm{'mgr'}) {	} elsif ($command eq 'handgrade' && $perm{'mgr'}) {
Line 7674 sub handler {	Line 8126 sub handler {
} elsif ($command eq 'csvuploadassign' && $perm{'mgr'} ) {	} elsif ($command eq 'csvuploadassign' && $perm{'mgr'} ) {
$request->print(&csvuploadassign($request));	$request->print(&csvuploadassign($request));
} elsif ($command eq 'scantron_selectphase' && $perm{'mgr'}) {	} elsif ($command eq 'scantron_selectphase' && $perm{'mgr'}) {
	&Apache::lonnet::logthis("Selecting pyhase");
$request->print(&scantron_selectphase($request));	$request->print(&scantron_selectphase($request));
} elsif ($command eq 'scantron_warning' && $perm{'mgr'}) {	} elsif ($command eq 'scantron_warning' && $perm{'mgr'}) {
$request->print(&scantron_do_warning($request));	$request->print(&scantron_do_warning($request));

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.440
changed lines
	Added in v.1.450