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.596.2.12.2.4 and 1.596.2.12.2.8

version 1.596.2.12.2.4, 2012/05/02 15:28:09	version 1.596.2.12.2.8, 2012/05/13 01:43:54
Line 124 sub getpartlist {	Line 124 sub getpartlist {
# --- Get the symbolic name of a problem and the url	# --- Get the symbolic name of a problem and the url
sub get_symb {	sub get_symb {
my ($request,$silent) = @_;	my ($request,$silent) = @_;
(my $url=$env{'form.url'}) =~ s-^http://($ENV{'SERVER_NAME'}\|$ENV{'HTTP_HOST'})--;	my $symb=$env{'form.symb'};
my $symb=($env{'form.symb'} ne '' ? $env{'form.symb'} : (&Apache::lonnet::symbread($url)));	unless ($symb) {
if ($symb eq '') {	(my $url=$env{'form.url'}) =~ s-^http://($ENV{'SERVER_NAME'}\|$ENV{'HTTP_HOST'})--;
if (!$silent) {	$symb = &Apache::lonnet::symbread($url);
$request->print(&mt("Unable to handle ambiguous references: [_1].",$url));	if ($symb eq '') {
return ();	if (!$silent) {
}	$request->print(&mt("Unable to handle ambiguous references: [_1].",$url));
	return ();
	}
	}
}	}
&Apache::lonenc::check_decrypt(\$symb);	&Apache::lonenc::check_decrypt(\$symb);
return ($symb);	return ($symb);
Line 1610 INNERJS	Line 1613 INNERJS

function savedMsgHeader(Nmsg,usrctr,fullname) {	function savedMsgHeader(Nmsg,usrctr,fullname) {
var height = 70*Nmsg+250;	var height = 70*Nmsg+250;
var scrollbar = "no";
if (height > 600) {	if (height > 600) {
height = 600;	height = 600;
scrollbar = "yes";
}	}
var xpos = (screen.width-600)/2;	var xpos = (screen.width-600)/2;
xpos = (xpos < 0) ? '0' : xpos;	xpos = (xpos < 0) ? '0' : xpos;
var ypos = (screen.height-height)/2-30;	var ypos = (screen.height-height)/2-30;
ypos = (ypos < 0) ? '0' : ypos;	ypos = (ypos < 0) ? '0' : ypos;

pWin = window.open('', 'MessageCenter', 'resizable=yes,toolbar=no,location=no,scrollbars='+scrollbar+',screenx='+xpos+',screeny='+ypos+',width=700,height='+height);	pWin = window.open('', 'MessageCenter', 'resizable=yes,toolbar=no,location=no,scrollbars=yes,screenx='+xpos+',screeny='+ypos+',width=700,height='+height);
pWin.focus();	pWin.focus();
pDoc = pWin.document;	pDoc = pWin.document;
pDoc.$docopen;	pDoc.$docopen;
Line 1916 sub show_problem {	Line 1917 sub show_problem {
$companswer=~s\|</form>\|\|g;	$companswer=~s\|</form>\|\|g;
$companswer=~s\|name="submit"\|name="would_have_been_submit"\|g;	$companswer=~s\|name="submit"\|name="would_have_been_submit"\|g;
}	}
	my $renderheading = &mt('View of the problem');
	my $answerheading = &mt('Correct answer');
	if (($uname ne $env{'user.name'}) \|\| ($udom ne $env{'user.domain'})) {
	my $stu_fullname = $env{'form.fullname'};
	if ($stu_fullname eq '') {
	$stu_fullname = &Apache::loncommon::plainname($uname,$udom,'lastname');
	}
	my $forwhom = &nameUserString(undef,$stu_fullname,$uname,$udom);
	if ($forwhom ne '') {
	$renderheading = &mt('View of the problem for[_1]',$forwhom);
	$answerheading = &mt('Correct answer for[_1]',$forwhom);
	}
	}
$rendered=	$rendered=
'<div class="LC_Box">'	'<div class="LC_Box">'
.'<h3 class="LC_hcell">'.&mt('View of the problem').'</h3>'	.'<h3 class="LC_hcell">'.$renderheading.'</h3>'
.$rendered	.$rendered
.'</div>';	.'</div>';
$companswer=	$companswer=
'<div class="LC_Box">'	'<div class="LC_Box">'
.'<h3 class="LC_hcell">'.&mt('Correct answer').'</h3>'	.'<h3 class="LC_hcell">'.$answerheading.'</h3>'
.$companswer	.$companswer
.'</div>';	.'</div>';
my $result;	my $result;
Line 1994 sub submission {	Line 2008 sub submission {
$udom = ($udom eq '' ? $env{'user.domain'} : $udom); #has form.userdom changed for a student?	$udom = ($udom eq '' ? $env{'user.domain'} : $udom); #has form.userdom changed for a student?
my $usec = &Apache::lonnet::getsection($udom,$uname,$env{'request.course.id'});	my $usec = &Apache::lonnet::getsection($udom,$uname,$env{'request.course.id'});
$env{'form.fullname'} = &Apache::loncommon::plainname($uname,$udom,'lastname') if $env{'form.fullname'} eq '';	$env{'form.fullname'} = &Apache::loncommon::plainname($uname,$udom,'lastname') if $env{'form.fullname'} eq '';
my $symb = &get_symb($request);	my ($symb) = &get_symb($request);
if ($symb eq '') { $request->print("Unable to handle ambiguous references:."); return ''; }	if ($symb eq '') { $request->print("Unable to handle ambiguous references:."); return ''; }

if (!&canview($usec)) {	if (!&canview($usec)) {
Line 2598 sub keywords_highlight {	Line 2612 sub keywords_highlight {
return $string;	return $string;
}	}

	# For Tasks provide a mechanism to display previous version for one specific student

	sub show_previous_task_version {
	my ($request,$symb) = @_;
	if ($symb eq '') {
	$request->print("Unable to handle ambiguous references.");

	return '';
	}
	my ($uname,$udom) = ($env{'form.student'},$env{'form.userdom'});
	my $usec = &Apache::lonnet::getsection($udom,$uname,$env{'request.course.id'});
	if (!&canview($usec)) {
	$request->print('<span class="LC_warning">Unable to view previous version for requested student.('.
	$uname.':'.$udom.' in section '.$usec.' in course id '.
	$env{'request.course.id'}.')</span>');
	return;
	}
	my $mode = 'both';
	my $isTask = ($symb =~/\.task$/);
	if ($isTask) {
	if ($env{'form.previousversion'} =~ /^\d+$/) {
	if ($env{'form.fullname'} eq '') {
	$env{'form.fullname'} =
	&Apache::loncommon::plainname($uname,$udom,'lastname');
	}
	my $probtitle=&Apache::lonnet::gettitle($symb);
	$request->print("\n\n".
	'<div class="LC_grade_show_user">'.
	'<h2>'.&nameUserString(undef,$env{'form.fullname'},$uname,$udom).
	'</h2>'."\n");
	&Apache::lonxml::clear_problem_counter();
	$request->print(&show_problem($request,$symb,$uname,$udom,1,1,$mode,
	{'previousversion' => $env{'form.previousversion'} }));
	$request->print("\n</div>");
	}
	}
	return;
	}

	sub choose_task_version_form {
	my ($symb,$uname,$udom,$nomenu) = @_;
	my $isTask = ($symb =~/\.task$/);
	my ($current,$version,$result,$js,$displayed,$rowtitle);
	if ($isTask) {
	my %record = &Apache::lonnet::restore($symb,$env{'request.course.id'},
	$udom,$uname);
	if (($record{'resource.0.version'} eq '') \|\|
	($record{'resource.0.version'} < 2)) {
	return ($record{'resource.0.version'},
	$record{'resource.0.version'},$result,$js);
	} else {
	$current = $record{'resource.0.version'};
	}
	if ($env{'form.previousversion'}) {
	$displayed = $env{'form.previousversion'};
	$rowtitle = &mt('Choose another version:')
	} else {
	$displayed = $current;
	$rowtitle = &mt('Show earlier version:');
	}
	$result = '<div class="LC_left_float">';
	my $list;
	my $numversions = 0;
	for (my $i=1; $i<=$record{'resource.0.version'}; $i++) {
	if ($i == $current) {
	if (!$env{'form.previousversion'} \|\| $nomenu) {
	next;
	} else {
	$list .= '<option value="'.$i.'">'.&mt('Current').'</option>'."\n";
	$numversions ++;
	}
	} elsif (defined($record{'resource.'.$i.'.0.status'})) {
	unless ($i == $env{'form.previousversion'}) {
	$numversions ++;
	}
	$list .= '<option value="'.$i.'">'.$i.'</option>'."\n";
	}
	}
	if ($numversions) {
	$symb = &HTML::Entities::encode($symb,'<>"&');
	$result .=
	'<form name="getprev" method="post" action=""'.
	' onsubmit="return previousVersion('."'$uname','$udom','$symb','$displayed'".');">'.
	&Apache::loncommon::start_data_table().
	&Apache::loncommon::start_data_table_row().
	'<th align="left">'.$rowtitle.'</th>'.
	'<td><select name="version">'.
	'<option>'.&mt('Select').'</option>'.
	$list.
	'</select></td>'.
	&Apache::loncommon::end_data_table_row();
	unless ($nomenu) {
	$result .= &Apache::loncommon::start_data_table_row().
	'<th align="left">'.&mt('Open in new window').'</th>'.
	'<td><span class="LC_nobreak">'.
	'<label><input type="radio" name="prevwin" value="1" />'.
	&mt('Yes').'</label>'.
	'<label><input type="radio" name="prevwin" value="0" checked="checked" />'.&mt('No').'</label>'.
	'</span></td>'.
	&Apache::loncommon::end_data_table_row();
	}
	$result .=
	&Apache::loncommon::start_data_table_row().
	'<th align="left"> </th>'.
	'<td>'.
	'<input type="submit" name="prevsub" value="'.&mt('Display').'" />'.
	'</td>'.
	&Apache::loncommon::end_data_table_row().
	&Apache::loncommon::end_data_table().
	'</form>';
	$js = &previous_display_javascript($nomenu,$current);
	} elsif ($displayed && $nomenu) {
	$result .= '<a href="javascript:window.close()">'.&mt('Close window').'</a>';
	} else {
	$result .= &mt('No previous versions to show for this student');
	}
	$result .= '</div>';
	}
	return ($current,$displayed,$result,$js);
	}

	sub previous_display_javascript {
	my ($nomenu,$current) = @_;
	my $js = <<"JSONE";
	<script type="text/javascript">
	// <![CDATA[
	function previousVersion(uname,udom,symb) {
	var current = '$current';
	var version = document.getprev.version.options[document.getprev.version.selectedIndex].value;
	var prevstr = new RegExp("^\\\\d+\$");
	if (!prevstr.test(version)) {
	return false;
	}
	var url = '';
	if (version == current) {
	url = '/adm/grades?student='+uname+'&userdom='+udom+'&symb='+symb+'&command=submission';
	} else {
	url = '/adm/grades?student='+uname+'&userdom='+udom+'&symb='+symb+'&command=versionsub&previousversion='+version;
	}
	JSONE
	if ($nomenu) {
	$js .= <<"JSTWO";
	document.location.href = url;
	JSTWO
	} else {
	$js .= <<"JSTHREE";
	var newwin = 0;
	for (var i=0; i<document.getprev.prevwin.length; i++) {
	if (document.getprev.prevwin[i].checked == true) {
	newwin = document.getprev.prevwin[i].value;
	}
	}
	if (newwin == 1) {
	var options = 'height=600,width=800,resizable=yes,scrollbars=yes,location=no,menubar=no,toolbar=no';
	url = url+'&inhibitmenu=yes';
	if (typeof(previousWin) == 'undefined' \|\| previousWin.closed) {
	previousWin = window.open(url,'',options,1);
	} else {
	previousWin.location.href = url;
	}
	previousWin.focus();
	return false;
	} else {
	document.location.href = url;
	return false;
	}
	JSTHREE
	}
	$js .= <<"ENDJS";
	return false;
	}
	// ]]>
	</script>
	ENDJS

	}

#--- Called from submission routine	#--- Called from submission routine
sub processHandGrade {	sub processHandGrade {
my ($request) = shift;	my ($request) = shift;
my $symb = &get_symb($request);	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 3669 sub viewstudentgrade {	Line 3860 sub viewstudentgrade {
sub editgrades {	sub editgrades {
my ($request) = @_;	my ($request) = @_;

my $symb=&get_symb($request);	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>Current Resource: </b>[_1]',$env{'form.probTitle'}).'</h4>'."\n";
Line 4697 sub displaySubByDates {	Line 4888 sub displaySubByDates {
&Apache::loncommon::start_data_table_header_row().	&Apache::loncommon::start_data_table_header_row().
'<th>'.&mt('Date/Time').'</th>'.	'<th>'.&mt('Date/Time').'</th>'.
($isCODE?'<th>'.&mt('CODE').'</th>':'').	($isCODE?'<th>'.&mt('CODE').'</th>':'').
	($isTask?'<th>'.&mt('Version').'</th>':'').
'<th>'.&mt('Submission').'</th>'.	'<th>'.&mt('Submission').'</th>'.
'<th>'.&mt('Status').'</th>'.	'<th>'.&mt('Status').'</th>'.
&Apache::loncommon::end_data_table_header_row();	&Apache::loncommon::end_data_table_header_row();
Line 4717 sub displaySubByDates {	Line 4909 sub displaySubByDates {
if (exists($$record{$version.':resource.0.version'})) {	if (exists($$record{$version.':resource.0.version'})) {
$interaction = $$record{$version.':resource.0.version'};	$interaction = $$record{$version.':resource.0.version'};
}	}
	if ($isTask && $env{'form.previousversion'}) {
	next unless ($interaction == $env{'form.previousversion'});
	}
my $where = ($isTask ? "$version:resource.$interaction"	my $where = ($isTask ? "$version:resource.$interaction"
: "$version:resource");	: "$version:resource");
$studentTable.=&Apache::loncommon::start_data_table_row().	$studentTable.=&Apache::loncommon::start_data_table_row().
Line 4725 sub displaySubByDates {	Line 4919 sub displaySubByDates {
if ($isCODE) {	if ($isCODE) {
$studentTable.='<td>'.$record->{$version.':resource.CODE'}.'</td>';	$studentTable.='<td>'.$record->{$version.':resource.CODE'}.'</td>';
}	}
	if ($isTask) {
	$studentTable.='<td>'.$interaction.'</td>';
	}
my @versionKeys = split(/\:/,$$record{$version.':keys'});	my @versionKeys = split(/\:/,$$record{$version.':keys'});
my @displaySub = ();	my @displaySub = ();
foreach my $partid (@{$parts}) {	foreach my $partid (@{$parts}) {
Line 4744 sub displaySubByDates {	Line 4941 sub displaySubByDates {

my ($responseId)= ($isTask ? ($matchKey=~ /^resource\.(.*?)\.\Q$partid\E\.award$/)	my ($responseId)= ($isTask ? ($matchKey=~ /^resource\.(.*?)\.\Q$partid\E\.award$/)
: ($matchKey=~ /^resource\.\Q$partid\E\.(.*?)\.submission$/));	: ($matchKey=~ /^resource\.\Q$partid\E\.(.*?)\.submission$/));
$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('Response ID: [_1]',$responseId).')'	.'('.&mt('Response ID: [_1]',$responseId).')'
Line 7872 sub scantron_process_students {	Line 8069 sub scantron_process_students {
my $default_form_data=&defaultFormData($symb);	my $default_form_data=&defaultFormData($symb);

my %scantron_config=&get_scantron_config($env{'form.scantron_format'});	my %scantron_config=&get_scantron_config($env{'form.scantron_format'});
	my $bubbles_per_row =
	&bubblesheet_bubbles_per_row(\%scantron_config);
my ($scanlines,$scan_data)=&scantron_getfile();	my ($scanlines,$scan_data)=&scantron_getfile();
my $classlist=&Apache::loncoursedata::get_classlist();	my $classlist=&Apache::loncoursedata::get_classlist();
my %idmap=&username_to_idmap($classlist);	my %idmap=&username_to_idmap($classlist);
Line 7884 sub scantron_process_students {	Line 8083 sub scantron_process_students {
my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0);	my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0);
my (%grader_partids_by_symb,%grader_randomlists_by_symb);	my (%grader_partids_by_symb,%grader_randomlists_by_symb);
&graders_resources_pass(\@resources,\%grader_partids_by_symb,	&graders_resources_pass(\@resources,\%grader_partids_by_symb,
\%grader_randomlists_by_symb);	\%grader_randomlists_by_symb,$bubbles_per_row);
my $resource_error;	my $resource_error;
foreach my $resource (@resources) {	foreach my $resource (@resources) {
my $ressymb;	my $ressymb;
Line 7924 SCANTRONFORM	Line 8123 SCANTRONFORM

my $lock=&Apache::lonnet::set_lock(&mt('Grading bubblesheet exam'));	my $lock=&Apache::lonnet::set_lock(&mt('Grading bubblesheet exam'));
my $count=&get_todo_count($scanlines,$scan_data);	my $count=&get_todo_count($scanlines,$scan_data);
my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Bubblesheet Status',	my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,$count);
'Bubblesheet Progress',$count,
'inline',undef,'scantronupload');
&Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,	&Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,
'Processing first student');	'Processing first student');
$r->print('<br />');	$r->print('<br />');
Line 8117 SCANTRONFORM	Line 8314 SCANTRONFORM
}	}

sub graders_resources_pass {	sub graders_resources_pass {
my ($resources,$grader_partids_by_symb,$grader_randomlists_by_symb) = @_;	my ($resources,$grader_partids_by_symb,$grader_randomlists_by_symb,
	$bubbles_per_row) = @_;
if ((ref($resources) eq 'ARRAY') && (ref($grader_partids_by_symb)) &&	if ((ref($resources) eq 'ARRAY') && (ref($grader_partids_by_symb)) &&
(ref($grader_randomlists_by_symb) eq 'HASH')) {	(ref($grader_randomlists_by_symb) eq 'HASH')) {
foreach my $resource (@{$resources}) {	foreach my $resource (@{$resources}) {
Line 8184 sub scantron_upload_scantron_data {	Line 8382 sub scantron_upload_scantron_data {
'domainid',	'domainid',
'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 ($symb) = &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('	$r->print('
Line 8390 sub valid_file {	Line 8589 sub valid_file {

sub scantron_download_scantron_data {	sub scantron_download_scantron_data {
my ($r)=@_;	my ($r)=@_;
my $default_form_data=&defaultFormData(&get_symb($r,1));	my ($symb) = &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 8400 sub scantron_download_scantron_data {	Line 8600 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 8423 sub scantron_download_scantron_data {	Line 8623 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 '';
}	}

Line 8441 sub checkscantron_results {	Line 8641 sub checkscantron_results {
my %record;	my %record;
my %scantron_config =	my %scantron_config =
&Apache::grades::get_scantron_config($env{'form.scantron_format'});	&Apache::grades::get_scantron_config($env{'form.scantron_format'});
	my $bubbles_per_row = &bubblesheet_bubbles_per_row(\%scantron_config);
my ($scanlines,$scan_data)=&Apache::grades::scantron_getfile();	my ($scanlines,$scan_data)=&Apache::grades::scantron_getfile();
my $classlist=&Apache::loncoursedata::get_classlist();	my $classlist=&Apache::loncoursedata::get_classlist();
my %idmap=&Apache::grades::username_to_idmap($classlist);	my %idmap=&Apache::grades::username_to_idmap($classlist);
Line 8452 sub checkscantron_results {	Line 8653 sub checkscantron_results {
my $map=$navmap->getResourceByUrl($sequence);	my $map=$navmap->getResourceByUrl($sequence);
my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0);	my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0);
my (%grader_partids_by_symb,%grader_randomlists_by_symb);	my (%grader_partids_by_symb,%grader_randomlists_by_symb);
&graders_resources_pass(\@resources,\%grader_partids_by_symb, \%grader_randomlists_by_symb);	&graders_resources_pass(\@resources,\%grader_partids_by_symb,
	\%grader_randomlists_by_symb,$bubbles_per_row);

my ($uname,$udom);	my ($uname,$udom);
my (%scandata,%lastname,%bylast);	my (%scandata,%lastname,%bylast);
Line 8463 sub checkscantron_results {	Line 8665 sub checkscantron_results {
my %completedstudents;	my %completedstudents;

my $count=&Apache::grades::get_todo_count($scanlines,$scan_data);	my $count=&Apache::grades::get_todo_count($scanlines,$scan_data);
my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Bubblesheet/Submissions Comparison Status',	my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,$count);
'Progress of Bubblesheet Data/Submission Records Comparison',$count,
'inline',undef,'checkscantron');
my ($username,$domain,$started);	my ($username,$domain,$started);
my $nav_error;	my $nav_error;
&scantron_get_maxbubble(\$nav_error,\%scantron_config); # Need the bubble lines array to parse.	&scantron_get_maxbubble(\$nav_error,\%scantron_config); # Need the bubble lines array to parse.
Line 8759 sub savedState {	Line 8959 sub savedState {
return \%savedState;	return \%savedState;
}	}

	#--- Href with symb and command ---

	sub href_symb_cmd {
	my ($symb,$cmd)=@_;
	return '/adm/grades?symb='.&HTML::Entities::encode(&Apache::lonenc::check_encrypt($symb),'<>&"').'&command='.$cmd;
	}

sub grading_menu {	sub grading_menu {
my ($request) = @_;	my ($request) = @_;
my ($symb)=&get_symb($request);	my ($symb)=&get_symb($request);
Line 9641 sub navmap_errormsg {	Line 9848 sub navmap_errormsg {
'</div>';	'</div>';
}	}

	sub startpage {
	my ($r,$symb,$crumbs,$onlyfolderflag,$nodisplayflag,$stuvcurrent,$stuvdisp,$nomenu,$js) = @_;
	if ($nomenu) {
	$r->print(&Apache::loncommon::start_page("Student's Version",$js,{'only_body' => '1'}));
	} else {
	$r->print(&Apache::loncommon::start_page('Grading',$js,
	{'bread_crumbs' => $crumbs}));
	}
	unless ($nodisplayflag) {
	$r->print(&Apache::lonhtmlcommon::resource_info_box($symb,$onlyfolderflag,$stuvcurrent,$stuvdisp));
	}
	}

sub handler {	sub handler {
my $request=$_[0];	my $request=$_[0];
&reset_caches();	&reset_caches();
Line 9662 sub handler {	Line 9882 sub handler {
$ssi_error = 0;	$ssi_error = 0;
my $brcrum = [{href=>"/adm/grades",text=>"Grading"}];	my $brcrum = [{href=>"/adm/grades",text=>"Grading"}];
my $start_page = &Apache::loncommon::start_page('Grading',undef,	my $start_page = &Apache::loncommon::start_page('Grading',undef,
{'bread_crumbs' => $brcrum});	{'bread_crumbs' => $brcrum});
if ($symb eq '' && $command eq '') {	if ($symb eq '' && $command eq '') {
if ($env{'user.adv'}) {	if ($env{'user.adv'}) {
&Apache::loncommon::content_type($request,'text/html');	&Apache::loncommon::content_type($request,'text/html');
Line 9715 sub handler {	Line 9935 sub handler {
}	}
&Apache::loncommon::content_type($request,'text/html');	&Apache::loncommon::content_type($request,'text/html');
$request->send_http_header;	$request->send_http_header;
$request->print($start_page);	unless ((($command eq 'submission' \|\| $command eq 'versionsub')) && ($perm{'vgr'})) {
	$request->print($start_page);
	}
if ($command eq 'submission' && $perm{'vgr'}) {	if ($command eq 'submission' && $perm{'vgr'}) {
	my ($stuvcurrent,$stuvdisp,$versionform,$js);
	if (($env{'form.student'} ne '') && ($env{'form.userdom'} ne '')) {
	($stuvcurrent,$stuvdisp,$versionform,$js) =
	&choose_task_version_form($symb,$env{'form.student'},
	$env{'form.userdom'});
	}
	&startpage($request,$symb,[{href=>"", text=>"Student Submissions"}],undef,undef,$stuvcurrent,$stuvdisp,undef,$js);
	if ($versionform) {
	$request->print($versionform);
	}
	$request->print('<br clear="all" />');
($env{'form.student'} eq '' ? &listStudents($request) : &submission($request,0,0));	($env{'form.student'} eq '' ? &listStudents($request) : &submission($request,0,0));
	} elsif ($command eq 'versionsub' && $perm{'vgr'}) {
	my ($stuvcurrent,$stuvdisp,$versionform,$js) =
	&choose_task_version_form($symb,$env{'form.student'},
	$env{'form.userdom'},
	$env{'form.inhibitmenu'});
	&startpage($request,$symb,[{href=>"", text=>"Previous Student Version"}],undef,undef,$stuvcurrent,$stuvdisp,$env{'form.inhibitmenu'},$js);
	if ($versionform) {
	$request->print($versionform);
	}
	$request->print('<br clear="all" />');
	$request->print(&show_previous_task_version($request,$symb));
} elsif ($command eq 'pickStudentPage' && $perm{'vgr'}) {	} elsif ($command eq 'pickStudentPage' && $perm{'vgr'}) {
&pickStudentPage($request);	&pickStudentPage($request);
} elsif ($command eq 'displayPage' && $perm{'vgr'}) {	} elsif ($command eq 'displayPage' && $perm{'vgr'}) {

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

Removed from v.1.596.2.12.2.4
changed lines
	Added in v.1.596.2.12.2.8