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.607 and 1.613

version 1.607, 2010/04/07 21:08:35	version 1.613, 2010/04/12 22:19:53
Line 123 sub getpartlist {	Line 123 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 636 sub jscriptNform {	Line 617 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="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 728 sub most_similar {	Line 708 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 Number.').'" />'.
&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" />'.
Line 741 sub initialverifyreceipt {	Line 720 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">'.
Line 830 sub verifyreceipt {	Line 808 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) = @_;

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 942 LISTJAVASCRIPT	Line 919 LISTJAVASCRIPT
'<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="handgrade" value="'.$env{'form.handgrade'}.'" /><br />'."\n".
'<input type="hidden" name="showgrading" value="'.$env{'form.showgrading'}.'" /><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="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";

Line 1907 sub build_section_inputs {	Line 1883 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);	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 ''; }

Line 1978 sub submission {	Line 1954 sub submission {
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="refresh" value="off" />'."\n".	'<input type="hidden" name="refresh" value="off" />'."\n".
Line 2487 sub keywords_highlight {	Line 2462 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 3291 VIEWJAVASCRIPT	Line 3265 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 3313 sub viewgrades {	Line 3286 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".

my ($common_header,$specific_header);	my ($common_header,$specific_header);
Line 3532 sub viewstudentgrade {	Line 3504 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>Section: </b>[_1]',$section_display).'</h4>'."\n";	$title.='<h4>'.&mt('<b>Section: </b>[_1]',$section_display).'</h4>'."\n";
Line 3881 to this page if the data selected is ins	Line 3852 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="command" value="csvuploadoptions" />	<input type="hidden" name="command" value="csvuploadoptions" />
<hr />	<hr />
ENDPICK	ENDPICK
Line 3943 CSVFORMJS	Line 3913 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();
$result.='<br /><table width="100%" border="0"><tr><td bgcolor="#777777">'."\n";	$result.='<br /><table width="100%" border="0"><tr><td bgcolor="#777777">'."\n";
Line 3960 sub upcsvScores_form {	Line 3929 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="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>	<label><input type="checkbox" name="noFirstLine" />$ignore</label>
Line 3976 ENDUPFORM	Line 3944 ENDUPFORM


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 4024 sub csvuploadmap {	Line 3991 sub csvuploadmap {
}	}

sub csvuploadoptions {	sub csvuploadoptions {
my ($request)= @_;	my ($request,$symb)= @_;
my ($symb)=&get_symb($request);
my $checked=(($env{'form.noFirstLine'})?'1':'0');	my $checked=(($env{'form.noFirstLine'})?'1':'0');
my $ignore=&mt('Ignore First Line');	my $ignore=&mt('Ignore First Line');
$request->print(<<ENDPICK);	$request->print(<<ENDPICK);
Line 4085 sub get_fields {	Line 4051 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);
Line 4204 sub csvuploadassign {	Line 4169 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 4222 function checkPickOne(formname) {	Line 4187 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 4277 LISTJAVASCRIPT	Line 4242 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 4361 sub getSymbMap {	Line 4325 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 4419 sub displayPage {	Line 4381 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 4649 sub displaySubByDates {	Line 4610 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 4679 sub updateGradeByPage {	Line 4640 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));	$request->print(&show_grading_menu_form($symb));
return;	return;
}	}
Line 4884 the homework problem.	Line 4844 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'}.'" />';
}	}


Line 5171 sub scantron_CODEunique {	Line 5130 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 5206 sub scantron_selectphase {	Line 5164 sub scantron_selectphase {
'.&Apache::loncommon::start_data_table_row().'	'.&Apache::loncommon::start_data_table_row().'
<td>	<td>
');	');
my $default_form_data=&defaultFormData(&get_symb($r,1));	my $default_form_data=&defaultFormData($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'};
$r->print(&Apache::lonhtmlcommon::scripttag('	$r->print(&Apache::lonhtmlcommon::scripttag('
Line 6243 sub scantron_warning_screen {	Line 6201 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 6325 SCANTRONFORM	Line 6282 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 7598 sub scantron_validate_missingbubbles {	Line 7554 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 7901 sub grade_student_bubbles {	Line 7856 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 7910 sub scantron_upload_scantron_data {	Line 7865 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 7970 sub scantron_upload_scantron_data {	Line 7925 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 8011 sub scantron_upload_scantron_data_save {	Line 7965 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 8113 sub valid_file {	Line 8067 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 8124 sub scantron_download_scantron_data {	Line 8078 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)));	$r->print(&show_grading_menu_form($symb));
return;	return;
}	}
my $orig='/uploaded/'.$cdom.'/'.$cname.'/scantron_orig_'.$file;	my $orig='/uploaded/'.$cdom.'/'.$cname.'/scantron_orig_'.$file;
Line 8147 sub scantron_download_scantron_data {	Line 8101 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)));	$r->print(&show_grading_menu_form($symb));
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 $grading_menu_button=&show_grading_menu_form($symb);
my $cid = $env{'request.course.id'};	my $cid = $env{'request.course.id'};
Line 8455 sub show_grading_menu_form {	Line 8408 sub show_grading_menu_form {
my ($symb)=@_;	my ($symb)=@_;
my $result.='<br /><form action="/adm/grades" method="post">'."\n".	my $result.='<br /><form action="/adm/grades" method="post">'."\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="command" value="gradingmenu" />'."\n".	'<input type="hidden" name="command" value="gradingmenu" />'."\n".
'<input type="submit" name="submit" value="'.&mt('Grading Menu').'" />'."\n".	'<input type="submit" name="submit" value="'.&mt('Grading Menu').'" />'."\n".
'</form>'."\n";	'</form>'."\n";
Line 8463 sub show_grading_menu_form {	Line 8415 sub show_grading_menu_form {
}	}

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

my %fields = ('symb'=>&Apache::lonenc::check_encrypt($symb),	my %fields = ('symb'=>&Apache::lonenc::check_encrypt($symb),
Line 8572 sub ungraded {	Line 8523 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;
Line 8599 sub submit_options_sequence {	Line 8549 sub submit_options_sequence {
}	}

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;
Line 8629 sub submit_options_table {	Line 8578 sub submit_options_table {

#--- 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 '';}

&commonJSfunctions($request);	&commonJSfunctions($request);
Line 8784 sub clicker_grading_parameters {	Line 8732 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();
$result.='<br /><table width="100%" border="0"><tr><td bgcolor="#777777">'."\n";	$result.='<br /><table width="100%" border="0"><tr><td bgcolor="#777777">'."\n";
Line 8865 ENDUPFORM	Line 8812 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="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 8888 ENDUPFORM	Line 8834 ENDUPFORM
}	}

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();
Line 8972 sub process_clicker_file {	Line 8917 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="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 9121 sub interwrite_eval {	Line 9065 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 9239 sub navmap_errormsg {	Line 9182 sub navmap_errormsg {
&mt('It is recommended that you [_1]re-initialize the course[_2] and then return to this grading page.','<a href="/adm/roles?selectrole=1&newrole='.$env{'request.role'}.'">','</a>').	&mt('It is recommended that you [_1]re-initialize the course[_2] and then return to this grading page.','<a href="/adm/roles?selectrole=1&newrole='.$env{'request.role'}.'">','</a>').
'</div>';	'</div>';
}	}
sub startpage{
my ($r,$crumbs) = @_;

unshift(@$crumbs, {href=>"/adm/grades",text=>"Grading"});	sub startpage {
	my ($r,$symb,$crumbs,$onlyfolderflag,$nodisplayflag) = @_;
	unshift(@$crumbs,{href=>"/adm/grades?command=gradingmenu&symb=".&HTML::Entities::encode($symb,'<>&"'),text=>"Grading"});
$r->print(&Apache::loncommon::start_page('Grading',undef,	$r->print(&Apache::loncommon::start_page('Grading',undef,
{'bread_crumbs' => $crumbs}));	{'bread_crumbs' => $crumbs}));
	unless ($nodisplayflag) {
	$r->print(&Apache::lonhtmlcommon::resource_info_box($symb,$onlyfolderflag));
	}
}	}

sub handler {	sub handler {
Line 9258 sub handler {	Line 9204 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];

if ($#commands > 0) {	if ($#commands > 0) {
&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;
if ($symb eq '' && $command eq '') {	if ($symb eq '' && $command eq '') {
#	#
Line 9275 sub handler {	Line 9232 sub handler {
} else {	} else {
&init_perm();	&init_perm();
if ($command eq 'submission' && $perm{'vgr'}) {	if ($command eq 'submission' && $perm{'vgr'}) {
&startpage($request, [{href=>"", text=>"Student Submissions"}]);	&startpage($request,$symb,[{href=>"", text=>"Student Submissions"}]);
($env{'form.student'} eq '' ? &listStudents($request) : &submission($request,0,0));	($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);
	&pickStudentPage($request,$symb);
} elsif ($command eq 'displayPage' && $perm{'vgr'}) {	} elsif ($command eq 'displayPage' && $perm{'vgr'}) {
&displayPage($request);	&startpage($request,$symb);
	&displayPage($request,$symb);
} elsif ($command eq 'gradeByPage' && $perm{'mgr'}) {	} elsif ($command eq 'gradeByPage' && $perm{'mgr'}) {
&updateGradeByPage($request);	&startpage($request,$symb);
	&updateGradeByPage($request,$symb);
} elsif ($command eq 'processGroup' && $perm{'vgr'}) {	} elsif ($command eq 'processGroup' && $perm{'vgr'}) {
&processGroup($request);	&startpage($request,$symb);
	&processGroup($request,$symb);
} elsif ($command eq 'gradingmenu' && $perm{'vgr'}) {	} elsif ($command eq 'gradingmenu' && $perm{'vgr'}) {
&startpage($request);	&startpage($request,$symb);
$request->print(&grading_menu($request));	$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);
	$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);
	$request->print(&submit_options($request,$symb));
} 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"}],1);
	$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);
	$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=>"/adm/grades?symb=".&HTML::Entities::encode($symb,'<>&"')."&command=table", text=>"Grading table"},{href=>'', text=>"Modify grades"}],1);
	$request->print(&viewgrades($request,$symb));
} elsif ($command eq 'handgrade' && $perm{'mgr'}) {	} elsif ($command eq 'handgrade' && $perm{'mgr'}) {
$request->print(&processHandGrade($request));	&startpage($request,$symb);
	$request->print(&processHandGrade($request,$symb));
} elsif ($command eq 'editgrades' && $perm{'mgr'}) {	} elsif ($command eq 'editgrades' && $perm{'mgr'}) {
$request->print(&editgrades($request));	&startpage($request,$symb);
	$request->print(&editgrades($request,$symb));
} elsif ($command eq 'initialverifyreceipt' && $perm{'vgr'}) {	} elsif ($command eq 'initialverifyreceipt' && $perm{'vgr'}) {
$request->print(&initialverifyreceipt($request));	&startpage($request,$symb);
	$request->print(&initialverifyreceipt($request,$symb));
} elsif ($command eq 'verify' && $perm{'vgr'}) {	} elsif ($command eq 'verify' && $perm{'vgr'}) {
$request->print(&verifyreceipt($request));	&startpage($request,$symb);
	$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);
	$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);
	$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);
	$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);
	$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);
	$request->print(&csvupload($request,$symb));
} elsif ($command eq 'csvuploadmap' && $perm{'mgr'} ) {	} elsif ($command eq 'csvuploadmap' && $perm{'mgr'} ) {
$request->print(&csvuploadmap($request));	&startpage($request,$symb);
	$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);
	$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);
	$request->print(&csvuploadmap($request,$symb));
}	}
} elsif ($command eq 'csvuploadassign' && $perm{'mgr'} ) {	} elsif ($command eq 'csvuploadassign' && $perm{'mgr'} ) {
$request->print(&csvuploadassign($request));	&startpage($request,$symb);
	$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);
	$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);
	$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);
	$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);
	$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);
	$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);
	$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);
	$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);
	$request->print(&checkscantron_results($request,$symb));
} elsif ($command) {	} elsif ($command) {
	&startpage($request,$symb);
$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.607
changed lines
	Added in v.1.613