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.603 and 1.628

version 1.603, 2010/03/26 15:40:55	version 1.628, 2010/04/20 23:29:22
Line 43 use Apache::lonmsg();	Line 43 use Apache::lonmsg();
use Apache::Constants qw(:common);	use Apache::Constants qw(:common);
use Apache::lonlocal;	use Apache::lonlocal;
use Apache::lonenc;	use Apache::lonenc;
	use Apache::lonstathelpers;
use String::Similarity;	use String::Similarity;
use LONCAPA;	use LONCAPA;

Line 123 sub getpartlist {	Line 124 sub getpartlist {
return @stores;	return @stores;
}	}

# --- Get the symbolic name of a problem and the url
# Generate an error message if symb could not be found unless silent flag is set
# Takes $env{'form.symb'} by default; if not present, takes $env{'form.url'} and tries to get symb from that
#

sub get_symb {
my ($request,$silent) = @_;
(my $url=$env{'form.url'}) =~ s-^http://($ENV{'SERVER_NAME'}\|$ENV{'HTTP_HOST'})--;
my $symb=($env{'form.symb'} ne '' ? $env{'form.symb'} : (&Apache::lonnet::symbread($url)));
if ($symb eq '') {
if (!$silent) {
$request->print(&mt("Unable to handle ambiguous references: [_1].",$url));
return ();
}
}
&Apache::lonenc::check_decrypt(\$symb);
return ($symb);
}

#--- Format fullname, username:domain if different for display	#--- Format fullname, username:domain if different for display
#--- Use anywhere where the student names are listed	#--- Use anywhere where the student names are listed
sub nameUserString {	sub nameUserString {
Line 156 sub nameUserString {	Line 138 sub nameUserString {

#--- 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. ---
	#--- Sets response_error pointer to "1" if navmaps object broken ---
sub response_type {	sub response_type {
my ($symb,$response_error) = @_;	my ($symb,$response_error) = @_;

Line 636 sub jscriptNform {	Line 619 sub jscriptNform {
"\n");	"\n");
$jscript.= '<form action="/adm/grades" method="post" name="onestudent">'."\n".	$jscript.= '<form action="/adm/grades" method="post" name="onestudent">'."\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'}.'" />'."\n".
'<input type="hidden" name="probTitle" value="'.$env{'form.probTitle'}.'" />'."\n".
'<input type="hidden" name="Status" value="'.$stu_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".
Line 729 sub most_similar {	Line 710 sub most_similar {
#	#

sub initialverifyreceipt {	sub initialverifyreceipt {
my $request = shift;	my ($request,$symb) = @_;
&commonJSfunctions($request);	&commonJSfunctions($request);
my ($symb) = &get_symb($request);	return '<form name="gradingMenu"><input type="submit" value="'.&mt('Verify Receipt Number.').'" />'.
return '<form name="gradingMenu"><input type="submit" value="'.&mt('Verify Receipt No.').'" />'.
&Apache::lonnet::recprefix($env{'request.course.id'}).	&Apache::lonnet::recprefix($env{'request.course.id'}).
'-<input type="text" name="receipt" size="4" />'.	'-<input type="text" name="receipt" size="4" />'.
'<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".	'<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".
Line 742 sub initialverifyreceipt {	Line 722 sub initialverifyreceipt {

#--- Check whether a receipt number is valid.---	#--- Check whether a receipt number is valid.---
sub verifyreceipt {	sub verifyreceipt {
my $request = shift;	my ($request,$symb) = @_;

my $courseid = $env{'request.course.id'};	my $courseid = $env{'request.course.id'};
my $receipt = &Apache::lonnet::recprefix($courseid).'-'.	my $receipt = &Apache::lonnet::recprefix($courseid).'-'.
$env{'form.receipt'};	$env{'form.receipt'};
$receipt =~ s/[^\-\d]//g;	$receipt =~ s/[^\-\d]//g;
my ($symb) = &get_symb($request);

my $title.=	my $title.=
'<h3><span class="LC_info">'.	'<h3><span class="LC_info">'.
&mt('Verifying Receipt No. [_1]',$receipt).	&mt('Verifying Receipt Number [_1]',$receipt).
'</span></h3>'."\n".	'</span></h3>'."\n";
'<h4>'.&mt('<b>Resource: </b>[_1]',$env{'form.probTitle'}).
'</h4>'."\n";

my ($string,$contents,$matches) = ('','',0);	my ($string,$contents,$matches) = ('','',0);
my (undef,undef,$fullname) = &getclasslist('all','0');	my (undef,undef,$fullname) = &getclasslist('all','0');
Line 825 sub verifyreceipt {	Line 802 sub verifyreceipt {
$contents.	$contents.
&Apache::loncommon::end_data_table()."\n";	&Apache::loncommon::end_data_table()."\n";
}	}
return $string.&show_grading_menu_form($symb);	return $string;
}	}

#--- This is called by a number of programs.	#--- This is called by a number of programs.
Line 833 sub verifyreceipt {	Line 810 sub verifyreceipt {
#--- Also called directly when one clicks on the subm button	#--- Also called directly when one clicks on the subm button
# on the problem page.	# on the problem page.
sub listStudents {	sub listStudents {
my ($request) = shift;	my ($request,$symb,$submitonly) = @_;

my ($symb) = &get_symb($request);
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 $getgroup = $env{'form.group'} eq '' ? 'all' : $env{'form.group'};
my $submitonly= $env{'form.submitonly'} eq '' ? 'all' : $env{'form.submitonly'};	unless ($submitonly) {
my $viewgrade = $env{'form.showgrading'} eq 'yes' ? 'View/Grade/Regrade' : 'View';	$submitonly= $env{'form.submitonly'} eq '' ? 'all' : $env{'form.submitonly'};
$env{'form.probTitle'} = $env{'form.probTitle'} eq '' ?	}
&Apache::lonnet::gettitle($symb) : $env{'form.probTitle'};

my $result='<h3><span class="LC_info"> '	my $result='<h3><span class="LC_info"> '
.&mt("$viewgrade Submissions for a Student or a Group of Students")	.&mt("View/Grade/Regrade Submissions for a Student or a Group of Students")
.'</span></h3>';	.'</span></h3>';
	my $res_error;
my ($partlist,$handgrade,$responseType) = &response_type($symb	my ($partlist,$handgrade,$responseType) = &response_type($symb,\$res_error);
#,$res_error
);

my %lt = &Apache::lonlocal::texthash (	my %lt = &Apache::lonlocal::texthash (
'multiple' => 'Please select a student or group of students before clicking on the Next button.',	'multiple' => 'Please select a student or group of students before clicking on the Next button.',
Line 891 LISTJAVASCRIPT	Line 864 LISTJAVASCRIPT
&commonJSfunctions($request);	&commonJSfunctions($request);
$request->print($result);	$request->print($result);

my $checkhdgrade = ($env{'form.handgrade'} eq 'yes' && scalar(@$partlist) > 1 ) ? 'checked="checked"' : '';
my $checklastsub = $checkhdgrade eq '' ? 'checked="checked"' : '';
my $gradeTable='<form action="/adm/grades" method="post" name="gradesub">'.	my $gradeTable='<form action="/adm/grades" method="post" name="gradesub">'.
"\n";	"\n";

Line 909 LISTJAVASCRIPT	Line 880 LISTJAVASCRIPT
.&Apache::lonhtmlcommon::row_closure();	.&Apache::lonhtmlcommon::row_closure();

my $submission_options;	my $submission_options;
if ($env{'form.handgrade'} eq 'yes' && scalar(@$partlist) > 1) {
$submission_options.=
'<label><input type="radio" name="lastSub" value="hdgrade" '.$checkhdgrade.' /> '.&mt('essay part only').' </label>'."\n";
}
my $stu_status = join(':',&Apache::loncommon::get_env_multiple('form.Status'));	my $stu_status = join(':',&Apache::loncommon::get_env_multiple('form.Status'));
my $saveStatus = $stu_status eq '' ? 'Active' : $stu_status;	my $saveStatus = $stu_status eq '' ? 'Active' : $stu_status;
$env{'form.Status'} = $saveStatus;	$env{'form.Status'} = $saveStatus;
$submission_options.=	$submission_options.=
'<span class="LC_nobreak">'.	'<span class="LC_nobreak">'.
'<label><input type="radio" name="lastSub" value="lastonly" '.$checklastsub.' /> '.	'<label><input type="radio" name="lastSub" value="lastonly" /> '.
&mt('last submission only').' </label></span>'."\n".	&mt('last submission only').' </label></span>'."\n".
'<span class="LC_nobreak">'.	'<span class="LC_nobreak">'.
'<label><input type="radio" name="lastSub" value="last" /> '.	'<label><input type="radio" name="lastSub" value="last" /> '.
&mt('last submission & parts info').' </label></span>'."\n".	&mt('last submission & parts info').' </label></span>'."\n".
'<span class="LC_nobreak">'.	'<span class="LC_nobreak">'.
'<label><input type="radio" name="lastSub" value="datesub" /> '.	'<label><input type="radio" name="lastSub" value="datesub" checked="checked" /> '.
&mt('by dates and submissions').'</label></span>'."\n".	&mt('by dates and submissions').'</label></span>'."\n".
'<span class="LC_nobreak">'.	'<span class="LC_nobreak">'.
'<label><input type="radio" name="lastSub" value="all" /> '.	'<label><input type="radio" name="lastSub" value="all" /> '.
Line 945 LISTJAVASCRIPT	Line 912 LISTJAVASCRIPT
$gradeTable .=	$gradeTable .=
&build_section_inputs().	&build_section_inputs().
'<input type="hidden" name="submitonly" value="'.$submitonly.'" />'."\n".	'<input type="hidden" name="submitonly" value="'.$submitonly.'" />'."\n".
'<input type="hidden" name="handgrade" value="'.$env{'form.handgrade'}.'" /><br />'."\n".
'<input type="hidden" name="showgrading" value="'.$env{'form.showgrading'}.'" /><br />'."\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="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".	'<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".
'<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.Status'})) {
$gradeTable .= '<input type="hidden" name="Status" value="'.$stu_status.'" />'."\n";	$gradeTable .= '<input type="hidden" name="Status" value="'.$stu_status.'" />'."\n";
} else {	} else {
$gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('Student Status'))	$gradeTable .= &Apache::lonhtmlcommon::row_title(&mt('Student Status'))
Line 967 LISTJAVASCRIPT	Line 930 LISTJAVASCRIPT
.&Apache::lonhtmlcommon::end_pick_box();	.&Apache::lonhtmlcommon::end_pick_box();

$gradeTable .= '<p>'	$gradeTable .= '<p>'
.&mt('To '.lc($viewgrade)." a submission or a group of submissions, click on the check box(es) next to the student's name(s). Then click on the Next button.")."\n"	.&mt("To view/grade/regrade a submission or a group of submissions, click on the check box(es) next to the student's name(s). Then click on the Next button.")."\n"
.'<input type="hidden" name="command" value="processGroup" />'	.'<input type="hidden" name="command" value="processGroup" />'
.'</p>';	.'</p>';

Line 984 LISTJAVASCRIPT	Line 947 LISTJAVASCRIPT
while ($loop < 2) {	while ($loop < 2) {
$gradeTable.='<th>'.&mt('No.').'</th><th>'.&mt('Select').'</th>'.	$gradeTable.='<th>'.&mt('No.').'</th><th>'.&mt('Select').'</th>'.
'<th>'.&nameUserString('header').' '.&mt('Section/Group').'</th>';	'<th>'.&nameUserString('header').' '.&mt('Section/Group').'</th>';
if ($env{'form.showgrading'} eq 'yes'	if (($submitonly ne 'queued') && ($submitonly ne 'all')) {
&& $submitonly ne 'queued'
&& $submitonly ne 'all') {
foreach my $part (sort(@$partlist)) {	foreach my $part (sort(@$partlist)) {
my $display_part=	my $display_part=
&get_display_part((split(/_/,$part))[0],$symb);	&get_display_part((split(/_/,$part))[0],$symb);
Line 1022 LISTJAVASCRIPT	Line 983 LISTJAVASCRIPT
$status{'gradingqueue'} = $queue_status{'gradingqueue'};	$status{'gradingqueue'} = $queue_status{'gradingqueue'};
}	}

if ($env{'form.showgrading'} eq 'yes'	if (($submitonly ne 'queued') && ($submitonly ne 'all')) {
&& $submitonly ne 'queued'
&& $submitonly ne 'all') {
(%status) =&student_gradeStatus($symb,$udom,$uname,$partlist);	(%status) =&student_gradeStatus($symb,$udom,$uname,$partlist);
my $submitted = 0;	my $submitted = 0;
my $graded = 0;	my $graded = 0;
Line 1065 LISTJAVASCRIPT	Line 1024 LISTJAVASCRIPT
&nameUserString(undef,$$fullname{$student},$uname,$udom).	&nameUserString(undef,$$fullname{$student},$uname,$udom).
' '.$section.($group ne '' ?'/'.$group:'').'</td>'."\n";	' '.$section.($group ne '' ?'/'.$group:'').'</td>'."\n";

if ($env{'form.showgrading'} eq 'yes' && $submitonly ne 'all') {	if ($submitonly ne 'all') {
foreach (sort(keys(%status))) {	foreach (sort(keys(%status))) {
next if ($_ =~ /^resource.*?submitted_by$/);	next if ($_ =~ /^resource.*?submitted_by$/);
$gradeTable.='<td align="center"> '.&mt($status{$_}).' </td>'."\n";	$gradeTable.='<td align="center"> '.&mt($status{$_}).' </td>'."\n";
Line 1079 LISTJAVASCRIPT	Line 1038 LISTJAVASCRIPT
}	}
if ($ctr%2 ==1) {	if ($ctr%2 ==1) {
$gradeTable.='<td> </td><td> </td><td> </td>';	$gradeTable.='<td> </td><td> </td><td> </td>';
if ($env{'form.showgrading'} eq 'yes'	if (($submitonly ne 'queued') && ($submitonly ne 'all')) {
&& $submitonly ne 'queued'
&& $submitonly ne 'all') {
foreach (@$partlist) {	foreach (@$partlist) {
$gradeTable.='<td> </td>';	$gradeTable.='<td> </td>';
}	}
Line 1112 LISTJAVASCRIPT	Line 1069 LISTJAVASCRIPT
} elsif ($ctr == 1) {	} elsif ($ctr == 1) {
$gradeTable =~ s/type="checkbox"/type="checkbox" checked="checked"/;	$gradeTable =~ s/type="checkbox"/type="checkbox" checked="checked"/;
}	}
$gradeTable.=&show_grading_menu_form($symb);
$request->print($gradeTable);	$request->print($gradeTable);
return '';	return '';
}	}
Line 1166 sub check_buttons {	Line 1122 sub check_buttons {

# Displays the submissions for one student or a group of students	# Displays the submissions for one student or a group of students
sub processGroup {	sub processGroup {
my ($request) = shift;	my ($request,$symb) = @_;
my $ctr = 0;	my $ctr = 0;
my @stuchecked = &Apache::loncommon::get_env_multiple('form.stuinfo');	my @stuchecked = &Apache::loncommon::get_env_multiple('form.stuinfo');
my $total = scalar(@stuchecked)-1;	my $total = scalar(@stuchecked)-1;
Line 1176 sub processGroup {	Line 1132 sub processGroup {
$env{'form.student'} = $uname;	$env{'form.student'} = $uname;
$env{'form.userdom'} = $udom;	$env{'form.userdom'} = $udom;
$env{'form.fullname'} = $fullname;	$env{'form.fullname'} = $fullname;
&submission($request,$ctr,$total);	&submission($request,$ctr,$total,$symb);
$ctr++;	$ctr++;
}	}
return '';	return '';
Line 1314 sub sub_page_js {	Line 1270 sub sub_page_js {

}	}
if (val == "Grade Student") {	if (val == "Grade Student") {
formname.showgrading.value = "yes";
if (formname.Status.value == "") {	if (formname.Status.value == "") {
formname.Status.value = "Active";	formname.Status.value = "Active";
}	}
Line 1758 sub gradeBox {	Line 1713 sub gradeBox {
$line.='<option value="reset status">'.&mt('reset status').'</option></select>'."\n";	$line.='<option value="reset status">'.&mt('reset status').'</option></select>'."\n";


#&mt('<td><b>Part:</b></td><td>[_1]</td><td><b>Points:</b></td><td>[_2]</td><td>or</td><td>[_3]</td>',$display_part,$radio,$line);
$result .=	$result .=
'<td>'.$display_part.'</td><td>'.$radio.'</td><td>'.&mt('or').'</td><td>'.$line.'</td>';	'<td>'.$display_part.'</td><td>'.$radio.'</td><td>'.&mt('or').'</td><td>'.$line.'</td>';
$result.=&Apache::loncommon::end_data_table_row();	$result.=&Apache::loncommon::end_data_table_row();
Line 1779 sub gradeBox {	Line 1733 sub gradeBox {
}	}

sub handback_box {	sub handback_box {
my ($symb,$uname,$udom,$counter,$partid,$record,$res_error) = @_;	my ($symb,$uname,$udom,$counter,$partid,$record,$res_error_pointer) = @_;
my ($partlist,$handgrade,$responseType) = &response_type($symb,$res_error);	my ($partlist,$handgrade,$responseType) = &response_type($symb,$res_error_pointer);
my (@respids);	my (@respids);
my @part_response_id = &flatten_responseType($responseType);	my @part_response_id = &flatten_responseType($responseType);
foreach my $part_response_id (@part_response_id) {	foreach my $part_response_id (@part_response_id) {
Line 1884 sub files_exist {	Line 1838 sub files_exist {

sub download_all_link {	sub download_all_link {
my ($r,$symb) = @_;	my ($r,$symb) = @_;
	unless (&files_exist($r, $symb)) {
	$r->print(&mt('There are currently no submitted documents.'));
	return;
	}

my $all_students =	my $all_students =
join("\n", &Apache::loncommon::get_env_multiple('form.stuinfo'));	join("\n", &Apache::loncommon::get_env_multiple('form.stuinfo'));

Line 1896 sub download_all_link {	Line 1855 sub download_all_link {
'cgi.'.$identifier.'.parts' => $parts,});	'cgi.'.$identifier.'.parts' => $parts,});
$r->print('<a href="/cgi-bin/multidownload.pl?'.$identifier.'">'.	$r->print('<a href="/cgi-bin/multidownload.pl?'.$identifier.'">'.
&mt('Download All Submitted Documents').'</a>');	&mt('Download All Submitted Documents').'</a>');
return	return;
	}

	sub submit_download_link {
	my ($request,$symb) = @_;
	if (!$symb) { return ''; }
	#FIXME: Figure out which type of problem this is and provide appropriate download
	&download_all_link($request,$symb);
}	}

sub build_section_inputs {	sub build_section_inputs {
Line 1914 sub build_section_inputs {	Line 1880 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,$symb) = @_;
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 $probtitle=&Apache::lonnet::gettitle($symb);
if ($symb eq '') { $request->print("Unable to handle ambiguous references:."); return ''; }	if ($symb eq '') { $request->print("Unable to handle ambiguous references:."); return ''; }

if (!&canview($usec)) {	if (!&canview($usec)) {
$request->print('<span class="LC_warning">Unable to view requested student.('.	$request->print('<span class="LC_warning">Unable to view requested student.('.
$uname.':'.$udom.' in section '.$usec.' in course id '.	$uname.':'.$udom.' in section '.$usec.' in course id '.
$env{'request.course.id'}.')</span>');	$env{'request.course.id'}.')</span>');
$request->print(&show_grading_menu_form($symb));
return;	return;
}	}

Line 1942 sub submission {	Line 1908 sub submission {
# header info	# header info
if ($counter == 0) {	if ($counter == 0) {
&sub_page_js($request);	&sub_page_js($request);
&sub_page_kw_js($request) if ($env{'form.handgrade'} eq 'yes');	&sub_page_kw_js($request);
$env{'form.probTitle'} = $env{'form.probTitle'} eq '' ?	$request->print('<h3> <span class="LC_info">'.&mt('Submission Record').'</span></h3>');
&Apache::lonnet::gettitle($symb) : $env{'form.probTitle'};
if ($env{'form.handgrade'} eq 'yes' && &files_exist($request, $symb)) {
&download_all_link($request, $symb);
}
$request->print('<h3> <span class="LC_info">'.&mt('Submission Record').'</span></h3>'."\n".
'<h4> '.&mt('<b>Resource: </b> [_1]',$env{'form.probTitle'}).'</h4>'."\n");

# option to display problem, only once else it cause problems	# option to display problem, only once else it cause problems
# with the form later since the problem has a form.	# with the form later since the problem has a form.
Line 1969 sub submission {	Line 1929 sub submission {
# 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 = ();
if ($env{'form.kwclr'} eq '' && $env{'form.handgrade'} eq 'yes') {	# if ($env{'form.kwclr'} eq '' && $env{'form.handgrade'} eq 'yes') {
	if (1) {
%keyhash = &Apache::lonnet::dump('nohist_handgrade',	%keyhash = &Apache::lonnet::dump('nohist_handgrade',
$env{'course.'.$env{'request.course.id'}.'.domain'},	$env{'course.'.$env{'request.course.id'}.'.domain'},
$env{'course.'.$env{'request.course.id'}.'.num'});	$env{'course.'.$env{'request.course.id'}.'.num'});
Line 1980 sub submission {	Line 1941 sub submission {
$env{'form.kwsize'} = $keyhash{$loginuser.'_kwsize'} ne '' ? $keyhash{$loginuser.'_kwsize'} : '0';	$env{'form.kwsize'} = $keyhash{$loginuser.'_kwsize'} ne '' ? $keyhash{$loginuser.'_kwsize'} : '0';
$env{'form.kwstyle'} = $keyhash{$loginuser.'_kwstyle'} ne '' ? $keyhash{$loginuser.'_kwstyle'} : '';	$env{'form.kwstyle'} = $keyhash{$loginuser.'_kwstyle'} ne '' ? $keyhash{$loginuser.'_kwstyle'} : '';
$env{'form.msgsub'} = $keyhash{$symb.'_subject'} ne '' ?	$env{'form.msgsub'} = $keyhash{$symb.'_subject'} ne '' ?
$keyhash{$symb.'_subject'} : $env{'form.probTitle'};	$keyhash{$symb.'_subject'} : $probtitle;
$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'));	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="Status" value="'.$stu_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="refresh" value="off" />'."\n".	'<input type="hidden" name="refresh" value="off" />'."\n".
'<input type="hidden" name="studentNo" value="" />'."\n".	'<input type="hidden" name="studentNo" value="" />'."\n".
'<input type="hidden" name="gradeOpt" value="" />'."\n".	'<input type="hidden" name="gradeOpt" value="" />'."\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="showgrading" value="'.$env{'form.showgrading'}.'" />'."\n".
'<input type="hidden" name="vProb" value="'.$env{'form.vProb'}.'" />'."\n".	'<input type="hidden" name="vProb" value="'.$env{'form.vProb'}.'" />'."\n".
'<input type="hidden" name="vAns" value="'.$env{'form.vAns'}.'" />'."\n".	'<input type="hidden" name="vAns" value="'.$env{'form.vAns'}.'" />'."\n".
'<input type="hidden" name="lastSub" value="'.$env{'form.lastSub'}.'" />'."\n".	'<input type="hidden" name="lastSub" value="'.$env{'form.lastSub'}.'" />'."\n".
&build_section_inputs().	&build_section_inputs().
'<input type="hidden" name="submitonly" value="'.$env{'form.submitonly'}.'" />'."\n".	'<input type="hidden" name="submitonly" value="'.$env{'form.submitonly'}.'" />'."\n".
'<input type="hidden" name="handgrade" value="'.$env{'form.handgrade'}.'" />'."\n".
'<input type="hidden" name="NCT"'.	'<input type="hidden" name="NCT"'.
' value="'.($env{'form.NTSTU'} ne '' ? $env{'form.NTSTU'} : $total+1).'" />'."\n");	' value="'.($env{'form.NTSTU'} ne '' ? $env{'form.NTSTU'} : $total+1).'" />'."\n");
if ($env{'form.handgrade'} eq 'yes') {	# if ($env{'form.handgrade'} eq 'yes') {
	if (1) {
$request->print('<input type="hidden" name="keywords" value="'.$env{'form.keywords'}.'" />'."\n".	$request->print('<input type="hidden" name="keywords" value="'.$env{'form.keywords'}.'" />'."\n".
'<input type="hidden" name="kwclr" value="'.$env{'form.kwclr'}.'" />'."\n".	'<input type="hidden" name="kwclr" value="'.$env{'form.kwclr'}.'" />'."\n".
'<input type="hidden" name="kwsize" value="'.$env{'form.kwsize'}.'" />'."\n".	'<input type="hidden" name="kwsize" value="'.$env{'form.kwsize'}.'" />'."\n".
Line 2029 sub submission {	Line 1987 sub submission {
}	}
$request->print($prnmsg);	$request->print($prnmsg);

if ($env{'form.handgrade'} eq 'yes' && $env{'form.showgrading'} eq 'yes') {	# if ($env{'form.handgrade'} eq 'yes') {
	if (1) {
#	#
# Print out the keyword options line	# Print out the keyword options line
#	#
Line 2105 KEYWORDS	Line 2064 KEYWORDS
.'<h3 class="LC_hcell">'.&mt('Submissions').'</h3>';	.'<h3 class="LC_hcell">'.&mt('Submissions').'</h3>';
$result.='<input type="hidden" name="name'.$counter.	$result.='<input type="hidden" name="name'.$counter.
'" value="'.$env{'form.fullname'}.'" />'."\n";	'" value="'.$env{'form.fullname'}.'" />'."\n";
if ($env{'form.handgrade'} eq 'no') {	# if ($env{'form.handgrade'} eq 'no') {
	if (1) {
$result.='<p class="LC_info">'	$result.='<p class="LC_info">'
.&mt('Part(s) graded correct by the computer is marked with a [_1] symbol.',$checkIcon)	.&mt('Part(s) graded correct by the computer is marked with a [_1] symbol.',$checkIcon)
."</p>\n";	."</p>\n";
Line 2114 KEYWORDS	Line 2074 KEYWORDS
# If any part of the problem is an essay-response (handgraded), then check for collaborators	# If any part of the problem is an essay-response (handgraded), then check for collaborators
my $fullname;	my $fullname;
my $col_fullnames = [];	my $col_fullnames = [];
if ($env{'form.handgrade'} eq 'yes') {	# if ($env{'form.handgrade'} eq 'yes') {
	if (1) {
(my $sub_result,$fullname,$col_fullnames)=	(my $sub_result,$fullname,$col_fullnames)=
&check_collaborators($symb,$uname,$udom,\%record,$handgrade,	&check_collaborators($symb,$uname,$udom,\%record,$handgrade,
$counter);	$counter);
Line 2165 KEYWORDS	Line 2126 KEYWORDS
$lastsubonly.="\n".'<div class="LC_grade_submission_part">'.	$lastsubonly.="\n".'<div class="LC_grade_submission_part">'.
'<b>'.&mt('Part: [_1]',$display_part).'</b>'.	'<b>'.&mt('Part: [_1]',$display_part).'</b>'.
' <span class="LC_internal_info">'.	' <span class="LC_internal_info">'.
'('.&mt('Part ID: [_1]',$respid).')'.	'('.&mt('Response ID: [_1]',$respid).')'.
'</span>   '.	'</span>   '.
'<span class="LC_warning">'.&mt('Nothing submitted - no attempts.').'</span><br /><br /></div>';	'<span class="LC_warning">'.&mt('Nothing submitted - no attempts.').'</span><br /><br /></div>';
next;	next;
Line 2210 KEYWORDS	Line 2171 KEYWORDS
$lastsubonly.='<div class="LC_grade_submission_part">'.	$lastsubonly.='<div class="LC_grade_submission_part">'.
'<b>'.&mt('Part: [_1]',$display_part).'</b>'.	'<b>'.&mt('Part: [_1]',$display_part).'</b>'.
' <span class="LC_internal_info">'.	' <span class="LC_internal_info">'.
'('.&mt('Part ID: [_1]',$respid).')'.	'('.&mt('Response ID: [_1]',$respid).')'.
'</span>   ';	'</span>   ';
my $files=&get_submitted_files($udom,$uname,$partid,$respid,\%record);	my $files=&get_submitted_files($udom,$uname,$partid,$respid,\%record);
if (@$files) {	if (@$files) {
Line 2241 KEYWORDS	Line 2202 KEYWORDS
}	}
$request->print($lastsubonly);	$request->print($lastsubonly);
} elsif ($env{'form.lastSub'} eq 'datesub') {	} elsif ($env{'form.lastSub'} eq 'datesub') {
# my (undef,$responseType,undef,$parts) = &showResourceInfo($symb);	my ($parts,$handgrade,$responseType) = &response_type($symb,\$res_error);
my ($parts,$handgrade,$responseType) = &response_type($symb);

$request->print(&displaySubByDates($symb,\%record,$parts,$responseType,$checkIcon,$uname,$udom));	$request->print(&displaySubByDates($symb,\%record,$parts,$responseType,$checkIcon,$uname,$udom));
} elsif ($env{'form.lastSub'} =~ /^(last\|all)$/) {	} elsif ($env{'form.lastSub'} =~ /^(last\|all)$/) {
$request->print(&Apache::loncommon::get_previous_attempt($symb,$uname,$udom,	$request->print(&Apache::loncommon::get_previous_attempt($symb,$uname,$udom,
Line 2251 KEYWORDS	Line 2210 KEYWORDS
$last,'.submission',	$last,'.submission',
'Apache::grades::keywords_highlight'));	'Apache::grades::keywords_highlight'));
}	}

$request->print('<input type="hidden" name="unamedom'.$counter.'" value="'.$uname.':'	$request->print('<input type="hidden" name="unamedom'.$counter.'" value="'.$uname.':'
.$udom.'" />'."\n");	.$udom.'" />'."\n");
# return if view submission with no grading option	# return if view submission with no grading option
if ($env{'form.showgrading'} eq '' \|\| (!&canmodify($usec))) {	# FIXME: the logic seems off here. Why show the grade button if you cannot grade?
	if (!&canmodify($usec)) {
my $toGrade.='<input type="button" value="Grade Student" '.	my $toGrade.='<input type="button" value="Grade Student" '.
'onclick="javascript:checksubmit(this.form,\'Grade Student\',\''	'onclick="javascript:checksubmit(this.form,\'Grade Student\',\''
.$counter.'\');" target="_self" />  '."\n" if (&canmodify($usec));	.$counter.'\');" target="_self" />  '."\n" if (&canmodify($usec));
$toGrade.='</div>'."\n";	$toGrade.='</div>'."\n";
if (($env{'form.command'} eq 'submission') \|\|
($env{'form.command'} eq 'processGroup' && $counter == $total)) {
$toGrade.='</form>'.&show_grading_menu_form($symb);
}
$request->print($toGrade);	$request->print($toGrade);
return;	return;
} else {	} else {
Line 2271 KEYWORDS	Line 2226 KEYWORDS
}	}

# essay grading message center	# essay grading message center
if ($env{'form.handgrade'} eq 'yes') {	# if ($env{'form.handgrade'} eq 'yes') {
	if (1) {
my $result='<div class="LC_grade_message_center">';	my $result='<div class="LC_grade_message_center">';

$result.='<div class="LC_grade_message_center_header">'.	$result.='<div class="LC_grade_message_center_header">'.
Line 2363 KEYWORDS	Line 2319 KEYWORDS
$endform.="<input type='hidden' value='".&get_increment().	$endform.="<input type='hidden' value='".&get_increment().
"' name='increment' />";	"' name='increment' />";
$endform.='</td></tr></table></form>';	$endform.='</td></tr></table></form>';
$endform.=&show_grading_menu_form($symb);
$request->print($endform);	$request->print($endform);
}	}
return '';	return '';
Line 2497 sub keywords_highlight {	Line 2452 sub keywords_highlight {

#--- Called from submission routine	#--- Called from submission routine
sub processHandGrade {	sub processHandGrade {
my ($request) = shift;	my ($request,$symb) = @_;
my $symb = &get_symb($request);
my (undef,undef,$url) = &Apache::lonnet::decode_symb($symb);	my (undef,undef,$url) = &Apache::lonnet::decode_symb($symb);
my $button = $env{'form.gradeOpt'};	my $button = $env{'form.gradeOpt'};
my $ngrade = $env{'form.NCT'};	my $ngrade = $env{'form.NCT'};
Line 2538 sub processHandGrade {	Line 2492 sub processHandGrade {
if ($env{'form.withgrades'.$ctr}) {	if ($env{'form.withgrades'.$ctr}) {
$message.="\n\nPoint".($pts > 1 ? 's':'').' awarded = '.$pts.' out of '.$wgt;	$message.="\n\nPoint".($pts > 1 ? 's':'').' awarded = '.$pts.' out of '.$wgt;
$messagetail = " for <a href=\"".	$messagetail = " for <a href=\"".
$feedurl."?symb=$showsymb\">$env{'form.probTitle'}</a>";	$feedurl."?symb=$showsymb\">$restitle</a>";
}	}
$msgstatus =	$msgstatus =
&Apache::lonmsg::user_normal_msg($uname,$udom,$subject,	&Apache::lonmsg::user_normal_msg($uname,$udom,$subject,
Line 2566 sub processHandGrade {	Line 2520 sub processHandGrade {
$udom);	$udom);
if ($env{'form.withgrades'.$ctr}) {	if ($env{'form.withgrades'.$ctr}) {
$messagetail = " for <a href=\"".	$messagetail = " for <a href=\"".
$baseurl."?symb=$showsymb\">$env{'form.probTitle'}</a>";	$baseurl."?symb=$showsymb\">$restitle</a>";
}	}
$msgstatus =	$msgstatus =
&Apache::lonmsg::user_normal_msg($collaborator,$udom,$subject,$message.$messagetail,undef,$baseurl,undef,undef,undef,$showsymb,$restitle);	&Apache::lonmsg::user_normal_msg($collaborator,$udom,$subject,$message.$messagetail,undef,$baseurl,undef,undef,undef,$showsymb,$restitle);
Line 2578 sub processHandGrade {	Line 2532 sub processHandGrade {
}	}
}	}

if ($env{'form.handgrade'} eq 'yes') {	# if ($env{'form.handgrade'} eq 'yes') {
	if (1) {
# Keywords sorted in alphabatical order	# Keywords sorted in alphabatical order
my $loginuser = $env{'user.name'}.':'.$env{'user.domain'};	my $loginuser = $env{'user.name'}.':'.$env{'user.domain'};
my %keyhash = ();	my %keyhash = ();
Line 2631 sub processHandGrade {	Line 2586 sub processHandGrade {
my $processUser = $env{'form.unamedom'.$ctr};	my $processUser = $env{'form.unamedom'.$ctr};
($env{'form.student'},$env{'form.userdom'}) = split(/:/,$processUser);	($env{'form.student'},$env{'form.userdom'}) = split(/:/,$processUser);
$env{'form.fullname'} = $$fullname{$processUser};	$env{'form.fullname'} = $$fullname{$processUser};
&submission($request,$ctr,$total-1);	&submission($request,$ctr,$total-1,$symb);
$ctr++;	$ctr++;
}	}
return '';	return '';
}	}

# Go directly to grade student - from submission or link from chart page	# Go directly to grade student - from submission or link from chart page
	# FIXME: looks like reading off the button label!
if ($button eq 'Grade Student') {	if ($button eq 'Grade Student') {
# (undef,undef,$env{'form.handgrade'},undef,undef) = &showResourceInfo($symb);
my $processUser = $env{'form.unamedom'.$env{'form.studentNo'}};	my $processUser = $env{'form.unamedom'.$env{'form.studentNo'}};
($env{'form.student'},$env{'form.userdom'}) = split(/:/,$processUser);	($env{'form.student'},$env{'form.userdom'}) = split(/:/,$processUser);
$env{'form.fullname'} = $$fullname{$processUser};	$env{'form.fullname'} = $$fullname{$processUser};
&submission($request,0,0);	&submission($request,0,0,$symb);
return '';	return '';
}	}

Line 2666 sub processHandGrade {	Line 2621 sub processHandGrade {
}	}
return $a cmp $b;	return $a cmp $b;
} (keys(%$fullname))) {	} (keys(%$fullname))) {
	# FIXME: this is fishy, looks like the button label
if ($nextflg == 1 && $button =~ /Next$/) {	if ($nextflg == 1 && $button =~ /Next$/) {
push(@parsedlist,$item);	push(@parsedlist,$item);
}	}
Line 2676 sub processHandGrade {	Line 2632 sub processHandGrade {
}	}
}	}
$ctr = 0;	$ctr = 0;
	# FIXME: this is fishy, looks like the button label
@parsedlist = reverse @parsedlist if ($button eq 'Previous');	@parsedlist = reverse @parsedlist if ($button eq 'Previous');
my $res_error;	my $res_error;
my ($partlist) = &response_type($symb,\$res_error);	my ($partlist) = &response_type($symb,\$res_error);
Line 2728 sub processHandGrade {	Line 2685 sub processHandGrade {
$env{'form.student'} = $uname;	$env{'form.student'} = $uname;
$env{'form.userdom'} = $udom;	$env{'form.userdom'} = $udom;
$env{'form.fullname'} = $$fullname{$_};	$env{'form.fullname'} = $$fullname{$_};
&submission($request,$ctr,$total);	&submission($request,$ctr,$total,$symb);
$ctr++;	$ctr++;
}	}
if ($total < 0) {	if ($total < 0) {
my $the_end = '<h3><span class="LC_info">'.&mt('LON-CAPA User Message').'</span></h3><br />'."\n";	my $the_end = '<h3><span class="LC_info">'.&mt('LON-CAPA User Message').'</span></h3><br />'."\n";
$the_end.=&mt('<b>Message: </b> No more students for this section or class.').'<br /><br />'."\n";	$the_end.=&mt('<b>Message: </b> No more students for this section or class.').'<br /><br />'."\n";
$the_end.=&mt('Click on the button below to return to the grading menu.').'<br /><br />'."\n";	$the_end.=&mt('Click on the button below to return to the grading menu.').'<br /><br />'."\n";
$the_end.=&show_grading_menu_form($symb);
$request->print($the_end);	$request->print($the_end);
}	}
return '';	return '';
Line 3299 VIEWJAVASCRIPT	Line 3255 VIEWJAVASCRIPT

#--- show scores for a section or whole class w/ option to change/update a score	#--- show scores for a section or whole class w/ option to change/update a score
sub viewgrades {	sub viewgrades {
my ($request) = shift;	my ($request,$symb) = @_;
&viewgrades_js($request);	&viewgrades_js($request);

my ($symb) = &get_symb($request);
#need to make sure we have the correct data for later EXT calls,	#need to make sure we have the correct data for later EXT calls,
#thus invalidate the cache	#thus invalidate the cache
&Apache::lonnet::devalidatecourseresdata(	&Apache::lonnet::devalidatecourseresdata(
Line 3311 sub viewgrades {	Line 3266 sub viewgrades {
&Apache::lonnet::clear_EXT_cache_status();	&Apache::lonnet::clear_EXT_cache_status();

my $result='<h3><span class="LC_info">'.&mt('Manual Grading').'</span></h3>';	my $result='<h3><span class="LC_info">'.&mt('Manual Grading').'</span></h3>';
$result.='<h4>'.&mt('<b>Current Resource: </b>[_1]',$env{'form.probTitle'}).'</h4>'."\n";

#view individual student submission form - called using Javascript viewOneStudent	#view individual student submission form - called using Javascript viewOneStudent
$result.=&jscriptNform($symb);	$result.=&jscriptNform($symb);
Line 3322 sub viewgrades {	Line 3276 sub viewgrades {
'<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="Status" value="'.$env{'stu_status'}.'" />'."\n".	'<input type="hidden" name="Status" value="'.$env{'stu_status'}.'" />'."\n".
'<input type="hidden" name="probTitle" value="'.$env{'form.probTitle'}.'" />'."\n";

my ($common_header,$specific_header);	my ($common_header,$specific_header);
if ($env{'form.section'} eq 'all') {	if ($env{'form.section'} eq 'all') {
Line 3419 sub viewgrades {	Line 3371 sub viewgrades {
if (!$display) { $display = &Apache::lonnet::metadata($url,$part.'.name'); }	if (!$display) { $display = &Apache::lonnet::metadata($url,$part.'.name'); }
my ($partid) = &split_part_type($part);	my ($partid) = &split_part_type($part);
push(@partids,$partid);	push(@partids,$partid);
	#
	# FIXME: Looks like $display looks at English text
	#
my $display_part=&get_display_part($partid,$symb);	my $display_part=&get_display_part($partid,$symb);
if ($display =~ /^Partial Credit Factor/) {	if ($display =~ /^Partial Credit Factor/) {
$result.='<th>'.	$result.='<th>'.
Line 3470 sub viewgrades {	Line 3425 sub viewgrades {
$section_display, $stu_status).	$section_display, $stu_status).
'</span>';	'</span>';
}	}
$result.=&show_grading_menu_form($symb);
return $result;	return $result;
}	}

Line 3542 sub viewstudentgrade {	Line 3496 sub viewstudentgrade {
#--- change scores for all the students in a section/class	#--- change scores for all the students in a section/class
# record does not get update if unchanged	# record does not get update if unchanged
sub editgrades {	sub editgrades {
my ($request) = @_;	my ($request,$symb) = @_;

my $symb=&get_symb($request);
my $section_display = join (", ",&Apache::loncommon::get_env_multiple('form.section'));	my $section_display = join (", ",&Apache::loncommon::get_env_multiple('form.section'));
my $title='<h2>'.&mt('Current Grade Status').'</h2>';	my $title='<h2>'.&mt('Current Grade Status').'</h2>';
$title.='<h4>'.&mt('<b>Current Resource: </b>[_1]',$env{'form.probTitle'}).'</h4>'."\n";
$title.='<h4>'.&mt('<b>Section: </b>[_1]',$section_display).'</h4>'."\n";	$title.='<h4>'.&mt('<b>Section: </b>[_1]',$section_display).'</h4>'."\n";

my $result= &Apache::loncommon::start_data_table().	my $result= &Apache::loncommon::start_data_table().
Line 3755 sub editgrades {	Line 3707 sub editgrades {
&Apache::loncommon::end_data_table_row();	&Apache::loncommon::end_data_table_row();
}	}
}	}
$result .= &Apache::loncommon::end_data_table().	$result .= &Apache::loncommon::end_data_table();
&show_grading_menu_form($symb);
my $msg = '<p><b>'.	my $msg = '<p><b>'.
&mt('Number of records updated = [_1] for [quant,_2,student].',	&mt('Number of records updated = [_1] for [quant,_2,student].',
$rec_update,$count).'</b><br />'.	$rec_update,$count).'</b><br />'.
Line 3869 sub csvuploadmap_header {	Line 3820 sub csvuploadmap_header {
$javascript=&csvupload_javascript_forward_associate();	$javascript=&csvupload_javascript_forward_associate();
}	}

# my ($result) = &showResourceInfo($symb,$env{'form.probTitle'});
my $result='';	my $result='';
my $checked=(($env{'form.noFirstLine'})?' checked="checked"':'');
my $ignore=&mt('Ignore First Line');
$symb = &Apache::lonenc::check_encrypt($symb);	$symb = &Apache::lonenc::check_encrypt($symb);
$request->print(<<ENDPICK);	$request->print(<<ENDPICK);
<form method="post" enctype="multipart/form-data" action="/adm/grades" name="gradesupload">	<form method="post" enctype="multipart/form-data" action="/adm/grades" name="gradesupload">
Line 3884 Total number of records found in file: $	Line 3832 Total number of records found in file: $
Enter as many fields as you can. The system will inform you and bring you back	Enter as many fields as you can. The system will inform you and bring you back
to this page if the data selected is insufficient to run your class.<hr />	to this page if the data selected is insufficient to run your class.<hr />
<input type="button" value="Reverse Association" onclick="javascript:this.form.associate.value='Reverse Association';submit(this.form);" />	<input type="button" value="Reverse Association" onclick="javascript:this.form.associate.value='Reverse Association';submit(this.form);" />
<label><input type="checkbox" name="noFirstLine" $checked />$ignore</label>
<input type="hidden" name="associate" value="" />	<input type="hidden" name="associate" value="" />
<input type="hidden" name="phase" value="three" />	<input type="hidden" name="phase" value="three" />
<input type="hidden" name="datatoken" value="$datatoken" />	<input type="hidden" name="datatoken" value="$datatoken" />
Line 3893 to this page if the data selected is ins	Line 3840 to this page if the data selected is ins
<input type="hidden" name="upfile_associate"	<input type="hidden" name="upfile_associate"
value="$env{'form.upfile_associate'}" />	value="$env{'form.upfile_associate'}" />
<input type="hidden" name="symb" value="$symb" />	<input type="hidden" name="symb" value="$symb" />
<input type="hidden" name="saveState" value="$env{'form.saveState'}" />
<input type="hidden" name="probTitle" value="$env{'form.probTitle'}" />
<input type="hidden" name="command" value="csvuploadoptions" />	<input type="hidden" name="command" value="csvuploadoptions" />
<hr />	<hr />
ENDPICK	ENDPICK
Line 3956 CSVFORMJS	Line 3901 CSVFORMJS
}	}

sub upcsvScores_form {	sub upcsvScores_form {
my ($request) = shift;	my ($request,$symb) = @_;
my ($symb)=&get_symb($request);
if (!$symb) {return '';}	if (!$symb) {return '';}
my $result=&checkforfile_js();	my $result=&checkforfile_js();
$env{'form.probTitle'} = &Apache::lonnet::gettitle($symb);
# my ($table) = &showResourceInfo($symb,$env{'form.probTitle'});
# $result.=$table;
$result.='<br /><table width="100%" border="0"><tr><td bgcolor="#777777">'."\n";	$result.='<br /><table width="100%" border="0"><tr><td bgcolor="#777777">'."\n";
$result.='<table width="100%" border="0"><tr bgcolor="#e6ffff"><td>'."\n";	$result.='<table width="100%" border="0"><tr bgcolor="#e6ffff"><td>'."\n";
$result.=' <b>'.&mt('Specify a file containing the class scores for current resource.').	$result.=' <b>'.&mt('Specify a file containing the class scores for current resource.').
Line 3976 sub upcsvScores_form {	Line 3917 sub upcsvScores_form {
<form method="post" enctype="multipart/form-data" action="/adm/grades" name="gradesupload">	<form method="post" enctype="multipart/form-data" action="/adm/grades" name="gradesupload">
<input type="hidden" name="symb" value="$symb" />	<input type="hidden" name="symb" value="$symb" />
<input type="hidden" name="command" value="csvuploadmap" />	<input type="hidden" name="command" value="csvuploadmap" />
<input type="hidden" name="probTitle" value="$env{'form.probTitle'}" />
<input type="hidden" name="saveState" value="$env{'form.saveState'}" />
$upfile_select	$upfile_select
<br /><input type="button" onclick="javascript:checkUpload(this.form);" value="$upload" />	<br /><input type="button" onclick="javascript:checkUpload(this.form);" value="$upload" />
<label><input type="checkbox" name="noFirstLine" />$ignore</label>
</form>	</form>
ENDUPFORM	ENDUPFORM
$result.=&Apache::loncommon::help_open_topic("Course_Convert_To_CSV",	$result.=&Apache::loncommon::help_open_topic("Course_Convert_To_CSV",
&mt("How do I create a CSV file from a spreadsheet"))	&mt("How do I create a CSV file from a spreadsheet"))
.'</td></tr></table>'."\n";	.'</td></tr></table>'."\n";
$result.='</td></tr></table><br /><br />'."\n";	$result.='</td></tr></table><br /><br />'."\n";
$result.=&show_grading_menu_form($symb);
return $result;	return $result;
}	}


sub csvuploadmap {	sub csvuploadmap {
my ($request)= @_;	my ($request,$symb)= @_;
my ($symb)=&get_symb($request);
if (!$symb) {return '';}	if (!$symb) {return '';}

my $datatoken;	my $datatoken;
Line 4005 sub csvuploadmap {	Line 3941 sub csvuploadmap {
&Apache::loncommon::load_tmp_file($request);	&Apache::loncommon::load_tmp_file($request);
}	}
my @records=&Apache::loncommon::upfile_record_sep();	my @records=&Apache::loncommon::upfile_record_sep();
if ($env{'form.noFirstLine'}) { shift(@records); }
&csvuploadmap_header($request,$symb,$datatoken,$#records+1);	&csvuploadmap_header($request,$symb,$datatoken,$#records+1);
my ($i,$keyfields);	my ($i,$keyfields);
if (@records) {	if (@records) {
Line 4035 sub csvuploadmap {	Line 3970 sub csvuploadmap {
}	}
}	}
&csvuploadmap_footer($request,$i,$keyfields);	&csvuploadmap_footer($request,$i,$keyfields);
$request->print(&show_grading_menu_form($symb));

return '';	return '';
}	}

sub csvuploadoptions {	sub csvuploadoptions {
my ($request)= @_;	my ($request,$symb)= @_;
my ($symb)=&get_symb($request);
my $checked=(($env{'form.noFirstLine'})?'1':'0');
my $ignore=&mt('Ignore First Line');
$request->print(<<ENDPICK);	$request->print(<<ENDPICK);
<form method="post" enctype="multipart/form-data" action="/adm/grades" name="gradesupload">	<form method="post" enctype="multipart/form-data" action="/adm/grades" name="gradesupload">
<h3><span class="LC_info">Uploading Class Grade Options</span></h3>	<h3><span class="LC_info">Uploading Class Grade Options</span></h3>
Line 4080 ENDPICK	Line 4011 ENDPICK
# FIXME do a check for any invalid user ids?...	# FIXME do a check for any invalid user ids?...
$request->print('<input type="submit" value="Assign Grades" /><br />	$request->print('<input type="submit" value="Assign Grades" /><br />
<hr /></form>'."\n");	<hr /></form>'."\n");
$request->print(&show_grading_menu_form($symb));
return '';	return '';
}	}

Line 4102 sub get_fields {	Line 4032 sub get_fields {
}	}

sub csvuploadassign {	sub csvuploadassign {
my ($request)= @_;	my ($request,$symb)= @_;
my ($symb)=&get_symb($request);
if (!$symb) {return '';}	if (!$symb) {return '';}
my $error_msg = '';	my $error_msg = '';
&Apache::loncommon::load_tmp_file($request);	&Apache::loncommon::load_tmp_file($request);
my @gradedata = &Apache::loncommon::upfile_record_sep();	my @gradedata = &Apache::loncommon::upfile_record_sep();
if ($env{'form.noFirstLine'}) { shift(@gradedata); }
my %fields=&get_fields();	my %fields=&get_fields();
$request->print('<h3>Assigning Grades</h3>');	$request->print('<h3>Assigning Grades</h3>');
my $courseid=$env{'request.course.id'};	my $courseid=$env{'request.course.id'};
Line 4190 sub csvuploadassign {	Line 4118 sub csvuploadassign {
$env{'request.course.id'},	$env{'request.course.id'},
$domain,$username);	$domain,$username);
if ($result eq 'ok') {	if ($result eq 'ok') {
	# Successfully stored
$request->print('.');	$request->print('.');
} else {	# Remove from grading queue
	&Apache::bridgetask::remove_from_queue('gradingqueue',$symb,
	$env{'course.'.$env{'request.course.id'}.'.domain'},
	$env{'course.'.$env{'request.course.id'}.'.num'},
	$domain,$username);
	$countdone++;
	} else {
$request->print("<p><span class=\"LC_error\">".	$request->print("<p><span class=\"LC_error\">".
&mt("Failed to save data for student [_1]. Message when trying to save was: [_2]",	&mt("Failed to save data for student [_1]. Message when trying to save was: [_2]",
"$username:$domain",$result)."</span></p>");	"$username:$domain",$result)."</span></p>");
}	}
$request->rflush();	$request->rflush();
$countdone++;
}	}
}	}
$request->print('<br />'.&Apache::lonhtmlcommon::confirm_success(&mt("Saved scores for [quant,_1,student]",$countdone),$countdone==0));	$request->print('<br />'.&Apache::lonhtmlcommon::confirm_success(&mt("Saved scores for [quant,_1,student]",$countdone),$countdone==0));
Line 4210 sub csvuploadassign {	Line 4144 sub csvuploadassign {
$request->print(join(', ',@notallowed));	$request->print(join(', ',@notallowed));
}	}
$request->print("<br />\n");	$request->print("<br />\n");
$request->print(&show_grading_menu_form($symb));
return $error_msg;	return $error_msg;
}	}
#------------- end of section for handling csv file upload ---------	#------------- end of section for handling csv file upload ---------
Line 4221 sub csvuploadassign {	Line 4154 sub csvuploadassign {
#	#
#--- Select a page/sequence and a student to grade	#--- Select a page/sequence and a student to grade
sub pickStudentPage {	sub pickStudentPage {
my ($request) = shift;	my ($request,$symb) = @_;

my $alertmsg = &mt('Please select the student you wish to grade.');	my $alertmsg = &mt('Please select the student you wish to grade.');
$request->print(&Apache::lonhtmlcommon::scripttag(<<LISTJAVASCRIPT));	$request->print(&Apache::lonhtmlcommon::scripttag(<<LISTJAVASCRIPT));
Line 4239 function checkPickOne(formname) {	Line 4172 function checkPickOne(formname) {

LISTJAVASCRIPT	LISTJAVASCRIPT
&commonJSfunctions($request);	&commonJSfunctions($request);
my ($symb) = &get_symb($request);
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'};
Line 4294 LISTJAVASCRIPT	Line 4227 LISTJAVASCRIPT
my $stu_status = join(':',&Apache::loncommon::get_env_multiple('form.Status'));	my $stu_status = join(':',&Apache::loncommon::get_env_multiple('form.Status'));
$result.='<input type="hidden" name="Status" value="'.$stu_status.'" />'."\n".	$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).'" />'."<br />\n";
'<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."<br />\n";

$result.=' <b>'.&mt('Use CODE').': </b> <input type="text" name="CODE" value="" /> <br />'."\n";	$result.=' <b>'.&mt('Use CODE').': </b> <input type="text" name="CODE" value="" /> <br />'."\n";

Line 4341 LISTJAVASCRIPT	Line 4273 LISTJAVASCRIPT
$studentTable.='<input type="button" '.	$studentTable.='<input type="button" '.
'onclick="javascript:checkPickOne(this.form);" value="'.&mt('Next').' →" /></form>'."\n";	'onclick="javascript:checkPickOne(this.form);" value="'.&mt('Next').' →" /></form>'."\n";

$studentTable.=&show_grading_menu_form($symb);
$request->print($studentTable);	$request->print($studentTable);

return '';	return '';
Line 4378 sub getSymbMap {	Line 4309 sub getSymbMap {
#	#
#--- Displays a page/sequence w/wo problems, w/wo submissions	#--- Displays a page/sequence w/wo problems, w/wo submissions
sub displayPage {	sub displayPage {
my ($request) = shift;	my ($request,$symb) = @_;

my ($symb) = &get_symb($request);
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'};
Line 4398 sub displayPage {	Line 4327 sub displayPage {

if (!&canview($usec)) {	if (!&canview($usec)) {
$request->print('<span class="LC_warning">'.&mt('Unable to view requested student. ([_1])',$env{'form.student'}).'</span>');	$request->print('<span class="LC_warning">'.&mt('Unable to view requested student. ([_1])',$env{'form.student'}).'</span>');
$request->print(&show_grading_menu_form($symb));
return;	return;
}	}
my $result='<h3><span class="LC_info"> '.$env{'form.title'}.'</span></h3>';	my $result='<h3><span class="LC_info"> '.$env{'form.title'}.'</span></h3>';
Line 4416 sub displayPage {	Line 4344 sub displayPage {
my $navmap = Apache::lonnavmaps::navmap->new();	my $navmap = Apache::lonnavmaps::navmap->new();
unless (ref($navmap)) {	unless (ref($navmap)) {
$request->print(&navmap_errormsg());	$request->print(&navmap_errormsg());
$request->print(&show_grading_menu_form($symb));
return;	return;
}	}
my ($mapUrl, $id, $resUrl)=&Apache::lonnet::decode_symb($env{'form.page'});	my ($mapUrl, $id, $resUrl)=&Apache::lonnet::decode_symb($env{'form.page'});
my $map = $navmap->getResourceByUrl($resUrl); # add to navmaps	my $map = $navmap->getResourceByUrl($resUrl); # add to navmaps
if (!$map) {	if (!$map) {
$request->print('<span class="LC_warning">'.&mt('Unable to view requested sequence. ([_1])',$resUrl).'</span>');	$request->print('<span class="LC_warning">'.&mt('Unable to view requested sequence. ([_1])',$resUrl).'</span>');
$request->print(&show_grading_menu_form($symb));
return;	return;
}	}
my $iterator = $navmap->getIterator($map->map_start(),	my $iterator = $navmap->getIterator($map->map_start(),
Line 4436 sub displayPage {	Line 4362 sub displayPage {
'<input type="hidden" name="page" value="'.$pageTitle.'" />'."\n".	'<input type="hidden" name="page" value="'.$pageTitle.'" />'."\n".
'<input type="hidden" name="title" value="'.$env{'form.title'}.'" />'."\n".	'<input type="hidden" name="title" value="'.$env{'form.title'}.'" />'."\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="overRideScore" value="no" />'."\n".	'<input type="hidden" name="overRideScore" value="no" />'."\n";
'<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."\n";

if (defined($env{'form.CODE'})) {	if (defined($env{'form.CODE'})) {
$studentTable.=	$studentTable.=
Line 4539 sub displayPage {	Line 4464 sub displayPage {
'<input type="button" value="'.&mt('Save').'" '.	'<input type="button" value="'.&mt('Save').'" '.
'onclick="javascript:checkSubmitPage(this.form,'.$question.');" />'.	'onclick="javascript:checkSubmitPage(this.form,'.$question.');" />'.
'</form>'."\n";	'</form>'."\n";
$studentTable.=&show_grading_menu_form($symb);
$request->print($studentTable);	$request->print($studentTable);

return '';	return '';
Line 4603 sub displaySubByDates {	Line 4527 sub displaySubByDates {
$displaySub[0].='<span class="LC_nobreak"';	$displaySub[0].='<span class="LC_nobreak"';
$displaySub[0].='<b>'.&mt('Part: [_1]',$display_part).'</b>'	$displaySub[0].='<b>'.&mt('Part: [_1]',$display_part).'</b>'
.' <span class="LC_internal_info">'	.' <span class="LC_internal_info">'
.'('.&mt('Part ID: [_1]',$responseId).')'	.'('.&mt('Response ID: [_1]',$responseId).')'
.'</span>'	.'</span>'
.' <b>';	.' <b>';
if ($hidden) {	if ($hidden) {
Line 4666 sub displaySubByDates {	Line 4590 sub displaySubByDates {
}	}

sub updateGradeByPage {	sub updateGradeByPage {
my ($request) = shift;	my ($request,$symb) = @_;

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"};
Line 4677 sub updateGradeByPage {	Line 4601 sub updateGradeByPage {
my $usec=$classlist->{$env{'form.student'}}[5];	my $usec=$classlist->{$env{'form.student'}}[5];
if (!&canmodify($usec)) {	if (!&canmodify($usec)) {
$request->print('<span class="LC_warning">'.&mt('Unable to modify requested student ([_1])',$env{'form.student'}).'</span>');	$request->print('<span class="LC_warning">'.&mt('Unable to modify requested student ([_1])',$env{'form.student'}).'</span>');
$request->print(&show_grading_menu_form($env{'form.symb'}));
return;	return;
}	}
my $result='<h3><span class="LC_info"> '.$env{'form.title'}.'</span></h3>';	my $result='<h3><span class="LC_info"> '.$env{'form.title'}.'</span></h3>';
Line 4696 sub updateGradeByPage {	Line 4619 sub updateGradeByPage {
my $map = $navmap->getResourceByUrl($resUrl); # add to navmaps	my $map = $navmap->getResourceByUrl($resUrl); # add to navmaps
if (!$map) {	if (!$map) {
$request->print('<span class="LC_warning">'.&mt('Unable to grade requested sequence ([_1]).',$resUrl).'</span>');	$request->print('<span class="LC_warning">'.&mt('Unable to grade requested sequence ([_1]).',$resUrl).'</span>');
my ($symb)=&get_symb($request);
$request->print(&show_grading_menu_form($symb));
return;	return;
}	}
my $iterator = $navmap->getIterator($map->map_start(),	my $iterator = $navmap->getIterator($map->map_start(),
Line 4823 sub updateGradeByPage {	Line 4744 sub updateGradeByPage {
}	}

$studentTable.=&Apache::loncommon::end_data_table();	$studentTable.=&Apache::loncommon::end_data_table();
$studentTable.=&show_grading_menu_form($env{'form.symb'});
my $grademsg=($changeflag == 0 ? &mt('No score was changed or updated.') :	my $grademsg=($changeflag == 0 ? &mt('No score was changed or updated.') :
&mt('The scores were changed for [quant,_1,problem].',	&mt('The scores were changed for [quant,_1,problem].',
$changeflag));	$changeflag));
Line 4901 the homework problem.	Line 4821 the homework problem.

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


Line 5189 sub scantron_CODEunique {	Line 5107 sub scantron_CODEunique {
=cut	=cut

sub scantron_selectphase {	sub scantron_selectphase {
my ($r,$file2grade) = @_;	my ($r,$file2grade,$symb) = @_;
my ($symb)=&get_symb($r);
if (!$symb) {return '';}	if (!$symb) {return '';}
my $map_error;	my $map_error;
my $sequence_selector=&getSequenceDropDown($symb,\$map_error);	my $sequence_selector=&getSequenceDropDown($symb,\$map_error);
Line 5199 sub scantron_selectphase {	Line 5116 sub scantron_selectphase {
return;	return;
}	}
my $default_form_data=&defaultFormData($symb);	my $default_form_data=&defaultFormData($symb);
my $grading_menu_button=&show_grading_menu_form($symb);
my $file_selector=&scantron_uploads($file2grade);	my $file_selector=&scantron_uploads($file2grade);
my $format_selector=&scantron_scantab();	my $format_selector=&scantron_scantab();
my $CODE_selector=&scantron_CODElist();	my $CODE_selector=&scantron_CODElist();
Line 5208 sub scantron_selectphase {	Line 5124 sub scantron_selectphase {

$ssi_error = 0;	$ssi_error = 0;

	if (&Apache::lonnet::allowed('usc',$env{'request.role.domain'}) \|\|
	&Apache::lonnet::allowed('usc',$env{'request.course.id'})) {

	# Chunk of form to prompt for a scantron file upload.

	$r->print('
	<br />
	'.&Apache::loncommon::start_data_table('LC_scantron_action').'
	'.&Apache::loncommon::start_data_table_header_row().'
	<th>
	'.&mt('Specify a bubblesheet data file to upload.').'
	</th>
	'.&Apache::loncommon::end_data_table_header_row().'
	'.&Apache::loncommon::start_data_table_row().'
	<td>
	');
	my $default_form_data=&defaultFormData($symb);
	my $cdom= $env{'course.'.$env{'request.course.id'}.'.domain'};
	my $cnum= $env{'course.'.$env{'request.course.id'}.'.num'};
	$r->print(&Apache::lonhtmlcommon::scripttag('
	function checkUpload(formname) {
	if (formname.upfile.value == "") {
	alert("'.&mt('Please use the browse button to select a file from your local directory.').'");
	return false;
	}
	formname.submit();
	}'));
	$r->print('
	<form enctype="multipart/form-data" action="/adm/grades" name="rules" method="post">
	'.$default_form_data.'
	<input name="courseid" type="hidden" value="'.$cnum.'" />
	<input name="domainid" type="hidden" value="'.$cdom.'" />
	<input name="command" value="scantronupload_save" type="hidden" />
	'.&mt('File to upload: [_1]','<input type="file" name="upfile" size="50" />').'
	<br />
	<input type="button" onclick="javascript:checkUpload(this.form);" value="'.&mt('Upload Bubblesheet Data').'" />
	</form>
	');

	$r->print('
	</td>
	'.&Apache::loncommon::end_data_table_row().'
	'.&Apache::loncommon::end_data_table().'
	');
	}

# Chunk of form to prompt for a file to grade and how:	# Chunk of form to prompt for a file to grade and how:

$result.= '	$result.= '
Line 5255 sub scantron_selectphase {	Line 5217 sub scantron_selectphase {

$r->print($result);	$r->print($result);

if (&Apache::lonnet::allowed('usc',$env{'request.role.domain'}) \|\|
&Apache::lonnet::allowed('usc',$env{'request.course.id'})) {

# Chunk of form to prompt for a scantron file upload.

$r->print('
<br />
'.&Apache::loncommon::start_data_table('LC_scantron_action').'
'.&Apache::loncommon::start_data_table_header_row().'
<th>
'.&mt('Specify a bubblesheet data file to upload.').'
</th>
'.&Apache::loncommon::end_data_table_header_row().'
'.&Apache::loncommon::start_data_table_row().'
<td>
');
my $default_form_data=&defaultFormData(&get_symb($r,1));
my $cdom= $env{'course.'.$env{'request.course.id'}.'.domain'};
my $cnum= $env{'course.'.$env{'request.course.id'}.'.num'};
$r->print(&Apache::lonhtmlcommon::scripttag('
function checkUpload(formname) {
if (formname.upfile.value == "") {
alert("'.&mt('Please use the browse button to select a file from your local directory.').'");
return false;
}
formname.submit();
}'));
$r->print('
<form enctype="multipart/form-data" action="/adm/grades" name="rules" method="post">
'.$default_form_data.'
<input name="courseid" type="hidden" value="'.$cnum.'" />
<input name="domainid" type="hidden" value="'.$cdom.'" />
<input name="command" value="scantronupload_save" type="hidden" />
'.&mt('File to upload: [_1]','<input type="file" name="upfile" size="50" />').'
<br />
<input type="button" onclick="javascript:checkUpload(this.form);" value="'.&mt('Upload Bubblesheet Data').'" />
</form>
');

$r->print('
</td>
'.&Apache::loncommon::end_data_table_row().'
'.&Apache::loncommon::end_data_table().'
');
}

# Chunk of the form that prompts to view a scoring office file,	# Chunk of the form that prompts to view a scoring office file,
# corrected file, skipped records in a file.	# corrected file, skipped records in a file.
Line 5359 sub scantron_selectphase {	Line 5277 sub scantron_selectphase {
&Apache::loncommon::end_data_table_row()."\n".	&Apache::loncommon::end_data_table_row()."\n".
&Apache::loncommon::end_data_table()."\n".	&Apache::loncommon::end_data_table()."\n".
'</form><br />');	'</form><br />');
$r->print($grading_menu_button);
return;	return;
}	}

Line 6259 sub scantron_warning_screen {	Line 6176 sub scantron_warning_screen {
=cut	=cut

sub scantron_do_warning {	sub scantron_do_warning {
my ($r)=@_;	my ($r,$symb)=@_;
my ($symb)=&get_symb($r);
if (!$symb) {return '';}	if (!$symb) {return '';}
my $default_form_data=&defaultFormData($symb);	my $default_form_data=&defaultFormData($symb);
$r->print(&scantron_form_start().$default_form_data);	$r->print(&scantron_form_start().$default_form_data);
Line 6285 sub scantron_do_warning {	Line 6201 sub scantron_do_warning {
<input type="hidden" name="command" value="scantron_validate" />	<input type="hidden" name="command" value="scantron_validate" />
');	');
}	}
$r->print("</form><br />".&show_grading_menu_form($symb));	$r->print("</form><br />");
return '';	return '';
}	}

Line 6341 SCANTRONFORM	Line 6257 SCANTRONFORM
=cut	=cut

sub scantron_validate_file {	sub scantron_validate_file {
my ($r) = @_;	my ($r,$symb) = @_;
my ($symb)=&get_symb($r);
if (!$symb) {return '';}	if (!$symb) {return '';}
my $default_form_data=&defaultFormData($symb);	my $default_form_data=&defaultFormData($symb);

Line 6434 sub scantron_validate_file {	Line 6349 sub scantron_validate_file {
$r->print(" ".&mt("this scanline saving it for later."));	$r->print(" ".&mt("this scanline saving it for later."));
}	}
}	}
$r->print(" </form><br />".&show_grading_menu_form($symb));	$r->print(" </form><br />");
return '';	return '';
}	}

Line 7614 sub scantron_validate_missingbubbles {	Line 7529 sub scantron_validate_missingbubbles {


sub scantron_process_students {	sub scantron_process_students {
my ($r) = @_;	my ($r,$symb) = @_;

my (undef,undef,$sequence)=&Apache::lonnet::decode_symb($env{'form.selectpage'});	my (undef,undef,$sequence)=&Apache::lonnet::decode_symb($env{'form.selectpage'});
my ($symb)=&get_symb($r);
if (!$symb) {	if (!$symb) {
return '';	return '';
}	}
Line 7698 SCANTRONFORM	Line 7612 SCANTRONFORM
if ($ssi_error) {	if ($ssi_error) {
$r->print("</form>");	$r->print("</form>");
&ssi_print_error($r);	&ssi_print_error($r);
$r->print(&show_grading_menu_form($symb));
&Apache::lonnet::remove_lock($lock);	&Apache::lonnet::remove_lock($lock);
return ''; # Dunno why the other returns return '' rather than just returning.	return ''; # Dunno why the other returns return '' rather than just returning.
}	}
Line 7776 SCANTRONFORM	Line 7689 SCANTRONFORM
$ssi_error = 0; # So end of handler error message does not trigger.	$ssi_error = 0; # So end of handler error message does not trigger.
$r->print("</form>");	$r->print("</form>");
&ssi_print_error($r);	&ssi_print_error($r);
$r->print(&show_grading_menu_form($symb));
&Apache::lonnet::remove_lock($lock);	&Apache::lonnet::remove_lock($lock);
return ''; # Why return ''? Beats me.	return ''; # Why return ''? Beats me.
}	}
Line 7804 SCANTRONFORM	Line 7716 SCANTRONFORM
$ssi_error = 0; # So end of handler error message does not trigger.	$ssi_error = 0; # So end of handler error message does not trigger.
$r->print("</form>");	$r->print("</form>");
&ssi_print_error($r);	&ssi_print_error($r);
$r->print(&show_grading_menu_form($symb));
&Apache::lonnet::remove_lock($lock);	&Apache::lonnet::remove_lock($lock);
delete($completedstudents{$uname});	delete($completedstudents{$uname});
return '';	return '';
Line 7860 SCANTRONFORM	Line 7771 SCANTRONFORM
# $r->print("<p>took $lasttime</p>");	# $r->print("<p>took $lasttime</p>");

$r->print("</form>");	$r->print("</form>");
$r->print(&show_grading_menu_form($symb));
return '';	return '';
}	}

Line 7917 sub grade_student_bubbles {	Line 7827 sub grade_student_bubbles {
}	}

sub scantron_upload_scantron_data {	sub scantron_upload_scantron_data {
my ($r)=@_;	my ($r,$symb)=@_;
my $dom = $env{'request.role.domain'};	my $dom = $env{'request.role.domain'};
my $domdesc = &Apache::lonnet::domain($dom,'description');	my $domdesc = &Apache::lonnet::domain($dom,'description');
$r->print(&Apache::loncommon::coursebrowser_javascript($dom));	$r->print(&Apache::loncommon::coursebrowser_javascript($dom));
Line 7926 sub scantron_upload_scantron_data {	Line 7836 sub scantron_upload_scantron_data {
'coursename',$dom);	'coursename',$dom);
my $syllabuslink = '<a href="javascript:ToSyllabus();">'.&mt('Syllabus').'</a>'.	my $syllabuslink = '<a href="javascript:ToSyllabus();">'.&mt('Syllabus').'</a>'.
('&nbsp'x2).&mt('(shows course personnel)');	('&nbsp'x2).&mt('(shows course personnel)');
my $default_form_data=&defaultFormData(&get_symb($r,1));	my $default_form_data=&defaultFormData($symb);
my $nofile_alert = &mt('Please use the browse button to select a file from your local directory.');	my $nofile_alert = &mt('Please use the browse button to select a file from your local directory.');
my $nocourseid_alert = &mt("Please use the 'Select Course' link to open a separate window where you can search for a course to which a file can be uploaded.");	my $nocourseid_alert = &mt("Please use the 'Select Course' link to open a separate window where you can search for a course to which a file can be uploaded.");
$r->print(&Apache::lonhtmlcommon::scripttag('	$r->print(&Apache::lonhtmlcommon::scripttag('
Line 7986 sub scantron_upload_scantron_data {	Line 7896 sub scantron_upload_scantron_data {


sub scantron_upload_scantron_data_save {	sub scantron_upload_scantron_data_save {
my($r)=@_;	my($r,$symb)=@_;
my ($symb)=&get_symb($r,1);
my $doanotherupload=	my $doanotherupload=
'<br /><form action="/adm/grades" method="post">'."\n".	'<br /><form action="/adm/grades" method="post">'."\n".
'<input type="hidden" name="command" value="scantronupload" />'."\n".	'<input type="hidden" name="command" value="scantronupload" />'."\n".
Line 7997 sub scantron_upload_scantron_data_save {	Line 7906 sub scantron_upload_scantron_data_save {
!&Apache::lonnet::allowed('usc',	!&Apache::lonnet::allowed('usc',
$env{'form.domainid'}.'_'.$env{'form.courseid'})) {	$env{'form.domainid'}.'_'.$env{'form.courseid'})) {
$r->print(&mt("You are not allowed to upload bubblesheet data to the requested course.")."<br />");	$r->print(&mt("You are not allowed to upload bubblesheet data to the requested course.")."<br />");
if ($symb) {	unless ($symb) {
$r->print(&show_grading_menu_form($symb));
} else {
$r->print($doanotherupload);	$r->print($doanotherupload);
}	}
return '';	return '';
Line 8027 sub scantron_upload_scantron_data_save {	Line 7934 sub scantron_upload_scantron_data_save {
}	}
}	}
if ($symb) {	if ($symb) {
$r->print(&scantron_selectphase($r,$uploadedfile));	$r->print(&scantron_selectphase($r,$uploadedfile,$symb));
} else {	} else {
$r->print($doanotherupload);	$r->print($doanotherupload);
}	}
Line 8129 sub valid_file {	Line 8036 sub valid_file {
}	}

sub scantron_download_scantron_data {	sub scantron_download_scantron_data {
my ($r)=@_;	my ($r,$symb)=@_;
my $default_form_data=&defaultFormData(&get_symb($r,1));	my $default_form_data=&defaultFormData($symb);
my $cname=$env{'course.'.$env{'request.course.id'}.'.num'};	my $cname=$env{'course.'.$env{'request.course.id'}.'.num'};
my $cdom=$env{'course.'.$env{'request.course.id'}.'.domain'};	my $cdom=$env{'course.'.$env{'request.course.id'}.'.domain'};
my $file=$env{'form.scantron_selectfile'};	my $file=$env{'form.scantron_selectfile'};
Line 8140 sub scantron_download_scantron_data {	Line 8047 sub scantron_download_scantron_data {
'.&mt('The requested file name was invalid.').'	'.&mt('The requested file name was invalid.').'
</p>	</p>
');	');
$r->print(&show_grading_menu_form(&get_symb($r,1)));
return;	return;
}	}
my $orig='/uploaded/'.$cdom.'/'.$cname.'/scantron_orig_'.$file;	my $orig='/uploaded/'.$cdom.'/'.$cname.'/scantron_orig_'.$file;
Line 8163 sub scantron_download_scantron_data {	Line 8069 sub scantron_download_scantron_data {
'<a href="'.$skipped.'">','</a>').'	'<a href="'.$skipped.'">','</a>').'
</p>	</p>
');	');
$r->print(&show_grading_menu_form(&get_symb($r,1)));
return '';	return '';
}	}

sub checkscantron_results {	sub checkscantron_results {
my ($r) = @_;	my ($r,$symb) = @_;
my ($symb)=&get_symb($r);
if (!$symb) {return '';}	if (!$symb) {return '';}
my $grading_menu_button=&show_grading_menu_form($symb);
my $cid = $env{'request.course.id'};	my $cid = $env{'request.course.id'};
my %lettdig = &letter_to_digits();	my %lettdig = &letter_to_digits();
my $numletts = scalar(keys(%lettdig));	my $numletts = scalar(keys(%lettdig));
Line 8324 sub checkscantron_results {	Line 8227 sub checkscantron_results {
&Apache::loncommon::end_data_table()).'<br />'.	&Apache::loncommon::end_data_table()).'<br />'.
&mt('Differences can occur if submissions were modified using manual grading after a bubblesheet grading pass.').'<br />'.&mt('If unexpected discrepancies were detected, it is recommended that you inspect the original bubblesheets.');	&mt('Differences can occur if submissions were modified using manual grading after a bubblesheet grading pass.').'<br />'.&mt('If unexpected discrepancies were detected, it is recommended that you inspect the original bubblesheets.');
}	}
$r->print('</form><br />'.$grading_menu_button);	$r->print('</form><br />');
return;	return;
}	}

Line 8466 sub letter_to_digits {	Line 8369 sub letter_to_digits {

#-------------------------- Menu interface -------------------------	#-------------------------- Menu interface -------------------------
#	#
#--- Show a Grading Menu button - Calls the next routine ---	#--- Href with symb and command ---
sub show_grading_menu_form {
my ($symb)=@_;	sub href_symb_cmd {
my $result.='<br /><form action="/adm/grades" method="post">'."\n".	my ($symb,$cmd)=@_;
'<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".	return '/adm/grades?symb='.&HTML::Entities::encode(&Apache::lonenc::check_encrypt($symb),'<>&"').'&command='.$cmd;
'<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."\n".
'<input type="hidden" name="command" value="gradingmenu" />'."\n".
'<input type="submit" name="submit" value="'.&mt('Grading Menu').'" />'."\n".
'</form>'."\n";
return $result;
}	}

sub grading_menu {	sub grading_menu {
my ($request) = @_;	my ($request,$symb) = @_;
my ($symb)=&get_symb($request);
if (!$symb) {return '';}	if (!$symb) {return '';}
my $probTitle = &Apache::lonnet::gettitle($symb);

my %fields = ('symb'=>&Apache::lonenc::check_encrypt($symb),	my %fields = ('symb'=>&Apache::lonenc::check_encrypt($symb),
'probTitle'=>$probTitle,	'command'=>'individual');
'command'=>'individual',
'gradingMenu'=>1,
'showgrading'=>"yes");

my $url1a = &Apache::lonhtmlcommon::build_url('grades/',\%fields);	my $url1a = &Apache::lonhtmlcommon::build_url('grades/',\%fields);

Line 8501 sub grading_menu {	Line 8394 sub grading_menu {
$fields{'command'}='all_for_one';	$fields{'command'}='all_for_one';
my $url1d=&Apache::lonhtmlcommon::build_url('grades/',\%fields);	my $url1d=&Apache::lonhtmlcommon::build_url('grades/',\%fields);

	$fields{'command'}='downloadfilesselect';
	my $url1e=&Apache::lonhtmlcommon::build_url('grades/',\%fields);

$fields{'command'} = 'csvform';	$fields{'command'} = 'csvform';
my $url2 = &Apache::lonhtmlcommon::build_url('grades/',\%fields);	my $url2 = &Apache::lonhtmlcommon::build_url('grades/',\%fields);

Line 8534 sub grading_menu {	Line 8430 sub grading_menu {
icon => 'edit-find-replace.png',	icon => 'edit-find-replace.png',
linktitle => 'Grade current resource for all students.'	linktitle => 'Grade current resource for all students.'
},	},
{ linktext => 'Grade complete page/sequence/folder for one student',	{ linktext => 'Grade page/folder for one student',
url => $url1d,	url => $url1d,
permission => 'F',	permission => 'F',
icon => 'edit-find-replace.png',	icon => 'edit-find-replace.png',
linktitle => 'Grade all resources in current page/sequence/folder for one student.'	linktitle => 'Grade all resources in current page/sequence/folder for one student.'
	},
	{ linktext => 'Download submissions',
	url => $url1e,
	permission => 'F',
	icon => 'edit-find-replace.png',
	linktitle => 'Download all students submissions.'
}]},	}]},
{ categorytitle=>'Automated Grading',	{ categorytitle=>'Automated Grading',
items =>[	items =>[
Line 8561 sub grading_menu {	Line 8463 sub grading_menu {
icon => 'stat.png',	icon => 'stat.png',
linktitle => 'Grade scantron exams, upload/download scantron data files, and review previously graded scantron exams.'	linktitle => 'Grade scantron exams, upload/download scantron data files, and review previously graded scantron exams.'
},	},
{ linktext => 'Verify Receipt No.',	{ linktext => 'Verify Receipt Number',
url => $url5,	url => $url5,
permission => 'F',	permission => 'F',
icon => 'edit-find-replace.png',	icon => 'edit-find-replace.png',
Line 8575 sub grading_menu {	Line 8477 sub grading_menu {
my $Str;	my $Str;
$Str .= '<form method="post" action="" name="gradingMenu">';	$Str .= '<form method="post" action="" name="gradingMenu">';
$Str .= '<input type="hidden" name="command" value="" />'.	$Str .= '<input type="hidden" name="command" value="" />'.
'<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="probTitle" value="'.$probTitle.'" />'."\n".
'<input type="hidden" name="gradingMenu" value="1" />'."\n".
'<input type="hidden" name="showgrading" value="yes" />'."\n";

$Str .= &Apache::lonhtmlcommon::generate_menu(@menu);	$Str .= &Apache::lonhtmlcommon::generate_menu(@menu);
return $Str;	return $Str;
Line 8591 sub ungraded {	Line 8490 sub ungraded {
}	}

sub submit_options_sequence {	sub submit_options_sequence {
my ($request) = @_;	my ($request,$symb) = @_;
my ($symb)=&get_symb($request);
if (!$symb) {return '';}	if (!$symb) {return '';}
&commonJSfunctions($request);	&commonJSfunctions($request);
my $result;	my $result;

$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="gradingMenu" value="1" />'."\n".
'<input type="hidden" name="showgrading" value="yes" />'."\n";

$result.='	$result.='
<h2>	<h2>
'.&mt('Grade complete page/sequence/folder for one student').'	'.&mt('Grade page/folder for one student').'
</h2>'.	</h2>'.
&selectfield(0).	&selectfield(0).
'<input type="hidden" name="command" value="pickStudentPage" />	'<input type="hidden" name="command" value="pickStudentPage" />
Line 8613 sub submit_options_sequence {	Line 8508 sub submit_options_sequence {
</div>	</div>
</div>	</div>
</form>';	</form>';
$result .= &show_grading_menu_form($symb);
return $result;	return $result;
}	}

sub submit_options_table {	sub submit_options_table {
my ($request) = @_;	my ($request,$symb) = @_;
my ($symb)=&get_symb($request);
if (!$symb) {return '';}	if (!$symb) {return '';}
&commonJSfunctions($request);	&commonJSfunctions($request);
my $result;	my $result;

$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="gradingMenu" value="1" />'."\n".
'<input type="hidden" name="showgrading" value="yes" />'."\n";

$result.='	$result.='
<h2>	<h2>
Line 8640 sub submit_options_table {	Line 8531 sub submit_options_table {
</div>	</div>
</div>	</div>
</form>';	</form>';
$result .= &show_grading_menu_form($symb);
return $result;	return $result;
}	}

	sub submit_options_download {
	my ($request,$symb) = @_;
	if (!$symb) {return '';}

	&commonJSfunctions($request);

	my $result='<form action="/adm/grades" method="post" name="gradingMenu">'."\n".
	'<input type="hidden" name="symb" value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n";
	$result.='
	<h2>
	'.&mt('Select Students for Which to Download Submissions').'
	</h2>'.&selectfield(1).'
	<input type="hidden" name="command" value="downloadfileslink" />
	<input type="submit" value="'.&mt('Next').' →" />
	</div>
	</div>


	</form>';
	return $result;
	}

#--- Displays the submissions first page -------	#--- Displays the submissions first page -------
sub submit_options {	sub submit_options {
my ($request) = @_;	my ($request,$symb) = @_;
my ($symb)=&get_symb($request);
if (!$symb) {return '';}	if (!$symb) {return '';}
my $probTitle = &Apache::lonnet::gettitle($symb);

&commonJSfunctions($request);	&commonJSfunctions($request);
my $result;	my $result;

$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="probTitle" value="'.$probTitle.'" />'."\n".
'<input type="hidden" name="gradingMenu" value="1" />'."\n".
'<input type="hidden" name="showgrading" value="yes" />'."\n";

$result.='	$result.='
<h2>	<h2>
'.&mt('Select individual students to grade').'	'.&mt('Select individual students to grade').'
Line 8673 sub submit_options {	Line 8577 sub submit_options {


</form>';	</form>';
$result .= &show_grading_menu_form($symb);
return $result;	return $result;
}	}

Line 8805 sub clicker_grading_parameters {	Line 8708 sub clicker_grading_parameters {
}	}

sub process_clicker {	sub process_clicker {
my ($r)=@_;	my ($r,$symb)=@_;
my ($symb)=&get_symb($r);
if (!$symb) {return '';}	if (!$symb) {return '';}
my $result=&checkforfile_js();	my $result=&checkforfile_js();
$env{'form.probTitle'} = &Apache::lonnet::gettitle($symb);
$result.='<br /><table width="100%" border="0"><tr><td bgcolor="#777777">'."\n";	$result.='<br /><table width="100%" border="0"><tr><td bgcolor="#777777">'."\n";
$result.='<table width="100%" border="0"><tr bgcolor="#e6ffff"><td>'."\n";	$result.='<table width="100%" border="0"><tr bgcolor="#e6ffff"><td>'."\n";
$result.=' <b>'.&mt('Specify a file containing the clicker information for this resource.').	$result.=' <b>'.&mt('Specify a file containing the clicker information for this resource.').
Line 8887 ENDUPFORM	Line 8788 ENDUPFORM
<form method="post" enctype="multipart/form-data" action="/adm/grades" name="gradesupload">	<form method="post" enctype="multipart/form-data" action="/adm/grades" name="gradesupload">
<input type="hidden" name="symb" value="$symb" />	<input type="hidden" name="symb" value="$symb" />
<input type="hidden" name="command" value="processclickerfile" />	<input type="hidden" name="command" value="processclickerfile" />
<input type="hidden" name="probTitle" value="$env{'form.probTitle'}" />
<input type="hidden" name="saveState" value="$env{'form.saveState'}" />
<input type="file" name="upfile" size="50" />	<input type="file" name="upfile" size="50" />
<br /><label>$type: $selectform</label>	<br /><label>$type: $selectform</label>
<br /><label><input type="radio" name="gradingmechanism" value="attendance"$checked{'attendance'} onclick="sanitycheck()" />$attendance </label>	<br /><label><input type="radio" name="gradingmechanism" value="attendance"$checked{'attendance'} onclick="sanitycheck()" />$attendance </label>
Line 8906 ENDUPFORM	Line 8805 ENDUPFORM
ENDUPFORM	ENDUPFORM
$result.='</td></tr></table>'."\n".	$result.='</td></tr></table>'."\n".
'</td></tr></table><br /><br />'."\n";	'</td></tr></table><br /><br />'."\n";
$result.=&show_grading_menu_form($symb);
return $result;	return $result;
}	}

sub process_clicker_file {	sub process_clicker_file {
my ($r)=@_;	my ($r,$symb)=@_;
my ($symb)=&get_symb($r);
if (!$symb) {return '';}	if (!$symb) {return '';}

my %Saveable_Parameters=&clicker_grading_parameters();	my %Saveable_Parameters=&clicker_grading_parameters();
&Apache::loncommon::store_course_settings('grades_clicker',	&Apache::loncommon::store_course_settings('grades_clicker',
\%Saveable_Parameters);	\%Saveable_Parameters);
my $result='';	my $result='';
# my ($result) = &showResourceInfo($symb,$env{'form.probTitle'});
if (($env{'form.gradingmechanism'} eq 'specific') && ($env{'form.specificid'}!~/\w/)) {	if (($env{'form.gradingmechanism'} eq 'specific') && ($env{'form.specificid'}!~/\w/)) {
$result.='<span class="LC_error">'.&mt('You need to specify a clicker ID for the correct answer').'</span>';	$result.='<span class="LC_error">'.&mt('You need to specify a clicker ID for the correct answer').'</span>';
return $result.&show_grading_menu_form($symb);	return $result;
}	}
if (($env{'form.gradingmechanism'} eq 'given') && ($env{'form.givenanswer'}!~/\S/)) {	if (($env{'form.gradingmechanism'} eq 'given') && ($env{'form.givenanswer'}!~/\S/)) {
$result.='<span class="LC_error">'.&mt('You need to specify the correct answer').'</span>';	$result.='<span class="LC_error">'.&mt('You need to specify the correct answer').'</span>';
return $result.&show_grading_menu_form($symb);	return $result;
}	}
my $foundgiven=0;	my $foundgiven=0;
if ($env{'form.gradingmechanism'} eq 'given') {	if ($env{'form.gradingmechanism'} eq 'given') {
Line 8973 sub process_clicker_file {	Line 8869 sub process_clicker_file {
$result.="</p>\n";	$result.="</p>\n";
if ($number==0) {	if ($number==0) {
$result.='<span class="LC_error">'.&mt('No IDs found to determine correct answer').'</span>';	$result.='<span class="LC_error">'.&mt('No IDs found to determine correct answer').'</span>';
return $result.&show_grading_menu_form($symb);	return $result;
}	}
}	}
if (length($env{'form.upfile'}) < 2) {	if (length($env{'form.upfile'}) < 2) {
Line 8981 sub process_clicker_file {	Line 8877 sub process_clicker_file {
'<span class="LC_error">',	'<span class="LC_error">',
'</span>',	'</span>',
'<span class="LC_filename">'.&HTML::Entities::encode($env{'form.upfile.filename'},'<>&"').'</span>');	'<span class="LC_filename">'.&HTML::Entities::encode($env{'form.upfile.filename'},'<>&"').'</span>');
return $result.&show_grading_menu_form($symb);	return $result;
}	}

# Were able to get all the info needed, now analyze the file	# Were able to get all the info needed, now analyze the file
Line 8996 sub process_clicker_file {	Line 8892 sub process_clicker_file {
<form method="post" action="/adm/grades" name="clickeranalysis">	<form method="post" action="/adm/grades" name="clickeranalysis">
<input type="hidden" name="symb" value="$symb" />	<input type="hidden" name="symb" value="$symb" />
<input type="hidden" name="command" value="assignclickergrades" />	<input type="hidden" name="command" value="assignclickergrades" />
<input type="hidden" name="probTitle" value="$env{'form.probTitle'}" />
<input type="hidden" name="saveState" value="$env{'form.saveState'}" />
<input type="hidden" name="gradingmechanism" value="$env{'form.gradingmechanism'}" />	<input type="hidden" name="gradingmechanism" value="$env{'form.gradingmechanism'}" />
<input type="hidden" name="pcorrect" value="$env{'form.pcorrect'}" />	<input type="hidden" name="pcorrect" value="$env{'form.pcorrect'}" />
<input type="hidden" name="pincorrect" value="$env{'form.pincorrect'}" />	<input type="hidden" name="pincorrect" value="$env{'form.pincorrect'}" />
Line 9022 ENDHEADER	Line 8916 ENDHEADER
'<br />';	'<br />';
if (($env{'form.gradingmechanism'} eq 'given') && ($number!=$foundgiven)) {	if (($env{'form.gradingmechanism'} eq 'given') && ($number!=$foundgiven)) {
$result.='<span class="LC_error">'.&mt('Number of given answers does not agree with number of questions in file.').'</span>';	$result.='<span class="LC_error">'.&mt('Number of given answers does not agree with number of questions in file.').'</span>';
return $result.&show_grading_menu_form($symb);	return $result;
}	}
# Remember Question Titles	# Remember Question Titles
# FIXME: Possibly need delimiter other than ":"	# FIXME: Possibly need delimiter other than ":"
Line 9084 ENDHEADER	Line 8978 ENDHEADER
}	}
$result.='</form></td></tr></table>'."\n".	$result.='</form></td></tr></table>'."\n".
'</td></tr></table><br /><br />'."\n";	'</td></tr></table><br /><br />'."\n";
return $result.&show_grading_menu_form($symb);	return $result;
}	}

sub iclicker_eval {	sub iclicker_eval {
Line 9146 sub interwrite_eval {	Line 9040 sub interwrite_eval {
}	}

sub assign_clicker_grades {	sub assign_clicker_grades {
my ($r)=@_;	my ($r,$symb)=@_;
my ($symb)=&get_symb($r);
if (!$symb) {return '';}	if (!$symb) {return '';}
# See which part we are saving to	# See which part we are saving to
my $res_error;	my $res_error;
Line 9159 sub assign_clicker_grades {	Line 9052 sub assign_clicker_grades {
my $part=$$partlist[0];	my $part=$$partlist[0];
# Start screen output	# Start screen output
my $result='';	my $result='';
# my ($result) = &showResourceInfo($symb,$env{'form.probTitle'});

my $heading=&mt('Assigning grades based on clicker file');	my $heading=&mt('Assigning grades based on clicker file');
$result.=(<<ENDHEADER);	$result.=(<<ENDHEADER);
Line 9256 ENDHEADER	Line 9148 ENDHEADER
$result.='<br />'.&mt('Successfully stored grades for [quant,_1,student].',$storecount).	$result.='<br />'.&mt('Successfully stored grades for [quant,_1,student].',$storecount).
'</td></tr></table>'."\n".	'</td></tr></table>'."\n".
'</td></tr></table><br /><br />'."\n";	'</td></tr></table><br /><br />'."\n";
return $result.&show_grading_menu_form($symb);	return $result;
}	}

sub navmap_errormsg {	sub navmap_errormsg {
Line 9266 sub navmap_errormsg {	Line 9158 sub navmap_errormsg {
'</div>';	'</div>';
}	}

	sub startpage {
	my ($r,$symb,$crumbs,$onlyfolderflag,$nodisplayflag) = @_;
	unshift(@$crumbs,{href=>&href_symb_cmd($symb,'gradingmenu'),text=>"Grading"});
	$r->print(&Apache::loncommon::start_page('Grading',undef,
	{'bread_crumbs' => $crumbs}));
	unless ($nodisplayflag) {
	$r->print(&Apache::lonhtmlcommon::resource_info_box($symb,$onlyfolderflag));
	}
	}

	sub select_problem {
	my ($r)=@_;
	$r->print('<h2>'.&mt('Select the problem or one of the problems you want to grade').'</h2><form action="/adm/grades">');
	$r->print(&Apache::lonstathelpers::problem_selector('.',undef,1));
	$r->print('<input type="hidden" name="command" value="gradingmenu" />');
	$r->print('<input type="submit" value="'.&mt('Next').' →" /></form>');
	}

sub handler {	sub handler {
my $request=$_[0];	my $request=$_[0];
&reset_caches();	&reset_caches();
Line 9277 sub handler {	Line 9187 sub handler {
$request->send_http_header;	$request->send_http_header;
return '' if $request->header_only;	return '' if $request->header_only;
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'});	&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'});
my $symb=&get_symb($request,1);
	# see what command we need to execute

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];

Line 9285 sub handler {	Line 9197 sub handler {
&Apache::lonnet::logthis("grades got multiple commands ".join(':',@commands));	&Apache::lonnet::logthis("grades got multiple commands ".join(':',@commands));
}	}

	# see what the symb is

	my $symb=$env{'form.symb'};
	unless ($symb) {
	(my $url=$env{'form.url'}) =~ s-^https*://($ENV{'SERVER_NAME'}\|$ENV{'HTTP_HOST'})--;
	$symb=&Apache::lonnet::symbread($url);
	}
	&Apache::lonenc::check_decrypt(\$symb);

$ssi_error = 0;	$ssi_error = 0;
my $brcrum = [{href=>"/adm/grades",text=>"Grading"}];	if ($symb eq '' \|\| $command eq '') {
$request->print(&Apache::loncommon::start_page('Grading',undef,
{'bread_crumbs' => $brcrum}));
if ($symb eq '' && $command eq '') {
#	#
# Not called from a resource	# Not called from a resource
#	#
	&startpage($request,undef,[],1,1);
	&select_problem($request);
} else {	} else {
&init_perm();	&init_perm();
if ($command eq 'submission' && $perm{'vgr'}) {	if ($command eq 'submission' && $perm{'vgr'}) {
($env{'form.student'} eq '' ? &listStudents($request) : &submission($request,0,0));	&startpage($request,$symb,[{href=>"", text=>"Student Submissions"}]);
	($env{'form.student'} eq '' ? &listStudents($request,$symb) : &submission($request,0,0,$symb));
} elsif ($command eq 'pickStudentPage' && $perm{'vgr'}) {	} elsif ($command eq 'pickStudentPage' && $perm{'vgr'}) {
&pickStudentPage($request);	&startpage($request,$symb,[{href=>&href_symb_cmd($symb,'all_for_one'),text=>'Grade page/folder for one student'},
	{href=>'',text=>'Select student'}],1,1);
	&pickStudentPage($request,$symb);
} elsif ($command eq 'displayPage' && $perm{'vgr'}) {	} elsif ($command eq 'displayPage' && $perm{'vgr'}) {
&displayPage($request);	&startpage($request,$symb,
	[{href=>&href_symb_cmd($symb,'all_for_one'),text=>'Grade page/folder for one student'},
	{href=>'',text=>'Select student'},
	{href=>'',text=>'Grade student'}],1,1);
	&displayPage($request,$symb);
} elsif ($command eq 'gradeByPage' && $perm{'mgr'}) {	} elsif ($command eq 'gradeByPage' && $perm{'mgr'}) {
&updateGradeByPage($request);	&startpage($request,$symb,[{href=>&href_symb_cmd($symb,'all_for_one'),text=>'Grade page/folder for one student'},
	{href=>'',text=>'Select student'},
	{href=>'',text=>'Grade student'},
	{href=>'',text=>'Store grades'}],1,1);
	&updateGradeByPage($request,$symb);
} elsif ($command eq 'processGroup' && $perm{'vgr'}) {	} elsif ($command eq 'processGroup' && $perm{'vgr'}) {
&processGroup($request);	&startpage($request,$symb,[{href=>'',text=>'...'},
	{href=>'',text=>'Modify grades'}]);
	&processGroup($request,$symb);
} elsif ($command eq 'gradingmenu' && $perm{'vgr'}) {	} elsif ($command eq 'gradingmenu' && $perm{'vgr'}) {
$request->print(&grading_menu($request));	&startpage($request,$symb);
	$request->print(&grading_menu($request,$symb));
} elsif ($command eq 'individual' && $perm{'vgr'}) {	} elsif ($command eq 'individual' && $perm{'vgr'}) {
$request->print(&submit_options($request));	&startpage($request,$symb,[{href=>'',text=>'Select individual students to grade'}]);
	$request->print(&submit_options($request,$symb));
} elsif ($command eq 'ungraded' && $perm{'vgr'}) {	} elsif ($command eq 'ungraded' && $perm{'vgr'}) {
$request->print(&submit_options($request));	&startpage($request,$symb,[{href=>'',text=>'Grade ungraded submissions'}]);
	$request->print(&listStudents($request,$symb,'graded'));
} elsif ($command eq 'table' && $perm{'vgr'}) {	} elsif ($command eq 'table' && $perm{'vgr'}) {
$request->print(&submit_options_table($request));	&startpage($request,$symb,[{href=>"", text=>"Grading table"}]);
	$request->print(&submit_options_table($request,$symb));
} elsif ($command eq 'all_for_one' && $perm{'vgr'}) {	} elsif ($command eq 'all_for_one' && $perm{'vgr'}) {
$request->print(&submit_options_sequence($request));	&startpage($request,$symb,[{href=>'',text=>'Grade page/folder for one student'}],1,1);
	$request->print(&submit_options_sequence($request,$symb));
} elsif ($command eq 'viewgrades' && $perm{'vgr'}) {	} elsif ($command eq 'viewgrades' && $perm{'vgr'}) {
$request->print(&viewgrades($request));	&startpage($request,$symb,[{href=>&href_symb_cmd($symb,"table"), text=>"Grading table"},{href=>'', text=>"Modify grades"}]);
	$request->print(&viewgrades($request,$symb));
} elsif ($command eq 'handgrade' && $perm{'mgr'}) {	} elsif ($command eq 'handgrade' && $perm{'mgr'}) {
$request->print(&processHandGrade($request));	&startpage($request,$symb,[{href=>'',text=>'...'},
	{href=>'',text=>'Store grades'}]);
	$request->print(&processHandGrade($request,$symb));
} elsif ($command eq 'editgrades' && $perm{'mgr'}) {	} elsif ($command eq 'editgrades' && $perm{'mgr'}) {
$request->print(&editgrades($request));	&startpage($request,$symb,[{href=>&href_symb_cmd($symb,"table"), text=>"Grading table"},
	{href=>&href_symb_cmd($symb,'viewgrades').'&group=all&section=all&Status=Active',
	text=>"Modify grades"},
	{href=>'', text=>"Store grades"}]);
	$request->print(&editgrades($request,$symb));
} elsif ($command eq 'initialverifyreceipt' && $perm{'vgr'}) {	} elsif ($command eq 'initialverifyreceipt' && $perm{'vgr'}) {
$request->print(&initialverifyreceipt($request));	&startpage($request,$symb,[{href=>'',text=>'Verify Receipt Number'}]);
	$request->print(&initialverifyreceipt($request,$symb));
} elsif ($command eq 'verify' && $perm{'vgr'}) {	} elsif ($command eq 'verify' && $perm{'vgr'}) {
$request->print(&verifyreceipt($request));	&startpage($request,$symb,[{href=>&href_symb_cmd($symb,"initialverifyreceipt"),text=>'Verify Receipt Number'},
	{href=>'',text=>'Verification Result'}]);
	$request->print(&verifyreceipt($request,$symb));
} elsif ($command eq 'processclicker' && $perm{'mgr'}) {	} elsif ($command eq 'processclicker' && $perm{'mgr'}) {
$request->print(&process_clicker($request));	&startpage($request,$symb,[{href=>'', text=>'Process clicker'}]);
	$request->print(&process_clicker($request,$symb));
} elsif ($command eq 'processclickerfile' && $perm{'mgr'}) {	} elsif ($command eq 'processclickerfile' && $perm{'mgr'}) {
$request->print(&process_clicker_file($request));	&startpage($request,$symb,[{href=>&href_symb_cmd($symb,'processclicker'), text=>'Process clicker'},
	{href=>'', text=>'Process clicker file'}]);
	$request->print(&process_clicker_file($request,$symb));
} elsif ($command eq 'assignclickergrades' && $perm{'mgr'}) {	} elsif ($command eq 'assignclickergrades' && $perm{'mgr'}) {
$request->print(&assign_clicker_grades($request));	&startpage($request,$symb,[{href=>&href_symb_cmd($symb,'processclicker'), text=>'Process clicker'},
	{href=>'', text=>'Process clicker file'},
	{href=>'', text=>'Store grades'}]);
	$request->print(&assign_clicker_grades($request,$symb));
} elsif ($command eq 'csvform' && $perm{'mgr'}) {	} elsif ($command eq 'csvform' && $perm{'mgr'}) {
$request->print(&upcsvScores_form($request));	&startpage($request,$symb,[{href=>'', text=>'Upload Scores'}],1,1);
	$request->print(&upcsvScores_form($request,$symb));
} elsif ($command eq 'csvupload' && $perm{'mgr'}) {	} elsif ($command eq 'csvupload' && $perm{'mgr'}) {
$request->print(&csvupload($request));	&startpage($request,$symb,[{href=>'', text=>'Upload Scores'}],1,1);
	$request->print(&csvupload($request,$symb));
} elsif ($command eq 'csvuploadmap' && $perm{'mgr'} ) {	} elsif ($command eq 'csvuploadmap' && $perm{'mgr'} ) {
$request->print(&csvuploadmap($request));	&startpage($request,$symb,[{href=>'', text=>'Upload Scores'}],1,1);
	$request->print(&csvuploadmap($request,$symb));
} elsif ($command eq 'csvuploadoptions' && $perm{'mgr'}) {	} elsif ($command eq 'csvuploadoptions' && $perm{'mgr'}) {
if ($env{'form.associate'} ne 'Reverse Association') {	if ($env{'form.associate'} ne 'Reverse Association') {
$request->print(&csvuploadoptions($request));	&startpage($request,$symb,[{href=>'', text=>'Upload Scores'}],1,1);
	$request->print(&csvuploadoptions($request,$symb));
} else {	} else {
if ( $env{'form.upfile_associate'} ne 'reverse' ) {	if ( $env{'form.upfile_associate'} ne 'reverse' ) {
$env{'form.upfile_associate'} = 'reverse';	$env{'form.upfile_associate'} = 'reverse';
} else {	} else {
$env{'form.upfile_associate'} = 'forward';	$env{'form.upfile_associate'} = 'forward';
}	}
$request->print(&csvuploadmap($request));	&startpage($request,$symb,[{href=>'', text=>'Upload Scores'}],1,1);
	$request->print(&csvuploadmap($request,$symb));
}	}
} elsif ($command eq 'csvuploadassign' && $perm{'mgr'} ) {	} elsif ($command eq 'csvuploadassign' && $perm{'mgr'} ) {
$request->print(&csvuploadassign($request));	&startpage($request,$symb,[{href=>'', text=>'Upload Scores'}],1,1);
	$request->print(&csvuploadassign($request,$symb));
} elsif ($command eq 'scantron_selectphase' && $perm{'mgr'}) {	} elsif ($command eq 'scantron_selectphase' && $perm{'mgr'}) {
$request->print(&scantron_selectphase($request));	&startpage($request,$symb,[{href=>'', text=>'Grade/Manage/Review Bubblesheets'}],1,1);
	$request->print(&scantron_selectphase($request,undef,$symb));
} elsif ($command eq 'scantron_warning' && $perm{'mgr'}) {	} elsif ($command eq 'scantron_warning' && $perm{'mgr'}) {
$request->print(&scantron_do_warning($request));	&startpage($request,$symb,[{href=>'', text=>'Grade/Manage/Review Bubblesheets'}],1,1);
	$request->print(&scantron_do_warning($request,$symb));
} elsif ($command eq 'scantron_validate' && $perm{'mgr'}) {	} elsif ($command eq 'scantron_validate' && $perm{'mgr'}) {
$request->print(&scantron_validate_file($request));	&startpage($request,$symb,[{href=>'', text=>'Grade/Manage/Review Bubblesheets'}],1,1);
	$request->print(&scantron_validate_file($request,$symb));
} elsif ($command eq 'scantron_process' && $perm{'mgr'}) {	} elsif ($command eq 'scantron_process' && $perm{'mgr'}) {
$request->print(&scantron_process_students($request));	&startpage($request,$symb,[{href=>'', text=>'Grade/Manage/Review Bubblesheets'}],1,1);
	$request->print(&scantron_process_students($request,$symb));
} elsif ($command eq 'scantronupload' &&	} elsif ($command eq 'scantronupload' &&
(&Apache::lonnet::allowed('usc',$env{'request.role.domain'})\|\|	(&Apache::lonnet::allowed('usc',$env{'request.role.domain'})\|\|
&Apache::lonnet::allowed('usc',$env{'request.course.id'}))) {	&Apache::lonnet::allowed('usc',$env{'request.course.id'}))) {
$request->print(&scantron_upload_scantron_data($request));	&startpage($request,$symb,[{href=>'', text=>'Grade/Manage/Review Bubblesheets'}],1,1);
	$request->print(&scantron_upload_scantron_data($request,$symb));
} elsif ($command eq 'scantronupload_save' &&	} elsif ($command eq 'scantronupload_save' &&
(&Apache::lonnet::allowed('usc',$env{'request.role.domain'})\|\|	(&Apache::lonnet::allowed('usc',$env{'request.role.domain'})\|\|
&Apache::lonnet::allowed('usc',$env{'request.course.id'}))) {	&Apache::lonnet::allowed('usc',$env{'request.course.id'}))) {
$request->print(&scantron_upload_scantron_data_save($request));	&startpage($request,$symb,[{href=>'', text=>'Grade/Manage/Review Bubblesheets'}],1,1);
	$request->print(&scantron_upload_scantron_data_save($request,$symb));
} elsif ($command eq 'scantron_download' &&	} elsif ($command eq 'scantron_download' &&
&Apache::lonnet::allowed('usc',$env{'request.course.id'})) {	&Apache::lonnet::allowed('usc',$env{'request.course.id'})) {
$request->print(&scantron_download_scantron_data($request));	&startpage($request,$symb,[{href=>'', text=>'Grade/Manage/Review Bubblesheets'}],1,1);
	$request->print(&scantron_download_scantron_data($request,$symb));
} elsif ($command eq 'checksubmissions' && $perm{'vgr'}) {	} elsif ($command eq 'checksubmissions' && $perm{'vgr'}) {
$request->print(&checkscantron_results($request));	&startpage($request,$symb,[{href=>'', text=>'Grade/Manage/Review Bubblesheets'}],1,1);
	$request->print(&checkscantron_results($request,$symb));
	} elsif ($command eq 'downloadfilesselect' && $perm{'vgr'}) {
	&startpage($request,$symb,[{href=>'', text=>'Select which submissions to download'}]);
	$request->print(&submit_options_download($request,$symb));
	} elsif ($command eq 'downloadfileslink' && $perm{'vgr'}) {
	&startpage($request,$symb,
	[{href=>&href_symb_cmd($symb,'downloadfilesselect'), text=>'Select which submissions to download'},
	{href=>'', text=>'Download submissions'}]);
	&submit_download_link($request,$symb);
} elsif ($command) {	} elsif ($command) {
	&startpage($request,$symb,[{href=>'', text=>'Access denied'}]);
$request->print('<p class="LC_error">'.&mt('Access Denied ([_1])',$command).'</p>');	$request->print('<p class="LC_error">'.&mt('Access Denied ([_1])',$command).'</p>');
}	}
}	}

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

Removed from v.1.603
changed lines
	Added in v.1.628