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.478 and 1.484

version 1.478, 2007/11/03 00:18:37	version 1.484, 2007/11/06 19:19:54
Line 4099 LISTJAVASCRIPT	Line 4099 LISTJAVASCRIPT
$request->print($result);	$request->print($result);

my $studentTable.=' <b>Select a student you wish to grade and then click on the Next button.</b><br />'.	my $studentTable.=' <b>Select a student you wish to grade and then click on the Next button.</b><br />'.
'<table border="0"><tr><td bgcolor="#777777">'.	&Apache::loncommon::start_data_table().
'<table border="0"><tr bgcolor="#e6ffff">'.	&Apache::loncommon::start_data_table_header_row().
'<td align="right"> <b>No.</b></td>'.	'<th align="right"> No.</th>'.
'<td>'.&nameUserString('header').'</td>'.	'<th>'.&nameUserString('header').'</th>'.
'<td align="right"> <b>No.</b></td>'.	'<th align="right"> No.</th>'.
'<td>'.&nameUserString('header').'</td></tr>';	'<th>'.&nameUserString('header').'</th>'.
	&Apache::loncommon::end_data_table_header_row();

my (undef,undef,$fullname) = &getclasslist($getsec,'1');	my (undef,undef,$fullname) = &getclasslist($getsec,'1');
my $ptr = 1;	my $ptr = 1;
Line 4116 LISTJAVASCRIPT	Line 4117 LISTJAVASCRIPT
return $a cmp $b;	return $a cmp $b;
} (keys(%$fullname))) {	} (keys(%$fullname))) {
my ($uname,$udom) = split(/:/,$student);	my ($uname,$udom) = split(/:/,$student);
$studentTable.=($ptr%2 == 1 ? '<tr bgcolor="#ffffe6">' : '</td>');	$studentTable.=($ptr%2==1 ? &Apache::loncommon::start_data_table_row()
	: '</td>');
$studentTable.='<td align="right">'.$ptr.' </td>';	$studentTable.='<td align="right">'.$ptr.' </td>';
$studentTable.='<td> <label><input type="radio" name="student" value="'.$student.'" /> '	$studentTable.='<td> <label><input type="radio" name="student" value="'.$student.'" /> '
.&nameUserString(undef,$$fullname{$student},$uname,$udom)."</label>\n";	.&nameUserString(undef,$$fullname{$student},$uname,$udom)."</label>\n";
$studentTable.=($ptr%2 == 0 ? '</td></tr>' : '');	$studentTable.=
	($ptr%2 == 0 ? '</td>'.&Apache::loncommon::end_data_table_row()
	: '');
$ptr++;	$ptr++;
}	}
$studentTable.='</td><td> </td><td> </td></tr>' if ($ptr%2 == 0);	if ($ptr%2 == 0) {
$studentTable.='</table></td></tr></table>'."\n";	$studentTable.='</td><td> </td><td> </td>'.
	&Apache::loncommon::end_data_table_row();
	}
	$studentTable.=&Apache::loncommon::end_data_table()."\n";
$studentTable.='<input type="button" '.	$studentTable.='<input type="button" '.
'onClick="javascript:checkPickOne(this.form);"value="Next->" /></form>'."\n";	'onClick="javascript:checkPickOne(this.form);"value="Next->" /></form>'."\n";

Line 4224 sub displayPage {	Line 4231 sub displayPage {

$studentTable.=' <b>Note:</b> Problems graded correct by the computer are marked with a '.$checkIcon.	$studentTable.=' <b>Note:</b> Problems graded correct by the computer are marked with a '.$checkIcon.
' symbol.'."\n".	' symbol.'."\n".
'<table border="0"><tr><td bgcolor="#777777">'.	&Apache::loncommon::start_data_table().
'<table border="0"><tr bgcolor="#e6ffff">'.	&Apache::loncommon::start_data_table_header_row().
'<td align="center"><b> Prob. </b></td>'.	'<th align="center"> Prob. </th>'.
'<td><b> '.($env{'form.vProb'} eq 'no' ? 'Title' : 'Problem Text').'/Grade</b></td></tr>';	'<th> '.($env{'form.vProb'} eq 'no' ? 'Title' : 'Problem Text').'/Grade</th>'.
	&Apache::loncommon::end_data_table_header_row();

&Apache::lonxml::clear_problem_counter();	&Apache::lonxml::clear_problem_counter();
my ($depth,$question,$prob) = (1,1,1);	my ($depth,$question,$prob) = (1,1,1);
Line 4241 sub displayPage {	Line 4249 sub displayPage {
my $parts = $curRes->parts();	my $parts = $curRes->parts();
my $title = $curRes->compTitle();	my $title = $curRes->compTitle();
my $symbx = $curRes->symb();	my $symbx = $curRes->symb();
$studentTable.='<tr bgcolor="#ffffe6"><td align="center" valign="top" >'.$prob.	$studentTable.=
	&Apache::loncommon::start_data_table_row().
	'<td align="center" valign="top" >'.$prob.
(scalar(@{$parts}) == 1 ? '' : '<br />('.scalar(@{$parts}).' parts)').'</td>';	(scalar(@{$parts}) == 1 ? '' : '<br />('.scalar(@{$parts}).' parts)').'</td>';
$studentTable.='<td valign="top">';	$studentTable.='<td valign="top">';
my %form = ('CODE' => $env{'form.CODE'},);	my %form = ('CODE' => $env{'form.CODE'},);
Line 4449 sub updateGradeByPage {	Line 4459 sub updateGradeByPage {
my $iterator = $navmap->getIterator($map->map_start(),	my $iterator = $navmap->getIterator($map->map_start(),
$map->map_finish());	$map->map_finish());

my $studentTable='<table border="0"><tr><td bgcolor="#777777">'.	my $studentTable=
'<table border="0"><tr bgcolor="#e6ffff">'.	&Apache::loncommon::start_data_table().
'<td align="center"><b> Prob. </b></td>'.	&Apache::loncommon::start_data_table_header_row().
'<td><b> Title </b></td>'.	'<th align="center"> Prob. </th>'.
'<td><b> Previous Score </b></td>'.	'<th> Title </th>'.
'<td><b> New Score </b></td></tr>';	'<th> Previous Score </th>'.
	'<th> New Score </th>'.
	&Apache::loncommon::end_data_table_header_row();

$iterator->next(); # skip the first BEGIN_MAP	$iterator->next(); # skip the first BEGIN_MAP
my $curRes = $iterator->next(); # for "current resource"	my $curRes = $iterator->next(); # for "current resource"
Line 4467 sub updateGradeByPage {	Line 4479 sub updateGradeByPage {
my $parts = $curRes->parts();	my $parts = $curRes->parts();
my $title = $curRes->compTitle();	my $title = $curRes->compTitle();
my $symbx = $curRes->symb();	my $symbx = $curRes->symb();
$studentTable.='<tr bgcolor="#ffffe6"><td align="center" valign="top" >'.$prob.	$studentTable.=
	&Apache::loncommon::start_data_table_row().
	'<td align="center" valign="top" >'.$prob.
(scalar(@{$parts}) == 1 ? '' : '<br />('.scalar(@{$parts}).' parts)').'</td>';	(scalar(@{$parts}) == 1 ? '' : '<br />('.scalar(@{$parts}).' parts)').'</td>';
$studentTable.='<td valign="top"> <b>'.$title.'</b> </td>';	$studentTable.='<td valign="top"> <b>'.$title.'</b> </td>';

Line 4555 sub updateGradeByPage {	Line 4569 sub updateGradeByPage {

$studentTable.='<td valign="top">'.$displayPts[0].'</td>'.	$studentTable.='<td valign="top">'.$displayPts[0].'</td>'.
'<td valign="top">'.$displayPts[1].'</td>'.	'<td valign="top">'.$displayPts[1].'</td>'.
'</tr>';	&Apache::loncommon::end_data_table_row();

$prob++;	$prob++;
}	}
$curRes = $iterator->next();	$curRes = $iterator->next();
}	}

$studentTable.='</td></tr></table></td></tr></table>';	$studentTable.=&Apache::loncommon::end_data_table();
$studentTable.=&show_grading_menu_form($env{'form.symb'});	$studentTable.=&show_grading_menu_form($env{'form.symb'});
my $grademsg=($changeflag == 0 ? 'No score was changed or updated.' :	my $grademsg=($changeflag == 0 ? 'No score was changed or updated.' :
'The scores were changed for '.	'The scores were changed for '.
Line 5116 sub username_to_idmap {	Line 5130 sub username_to_idmap {

sub scantron_fixup_scanline {	sub scantron_fixup_scanline {
my ($scantron_config,$scan_data,$line,$whichline,$field,$args)=@_;	my ($scantron_config,$scan_data,$line,$whichline,$field,$args)=@_;


if ($field eq 'ID') {	if ($field eq 'ID') {
if (length($args->{'newid'}) > $$scantron_config{'IDlength'}) {	if (length($args->{'newid'}) > $$scantron_config{'IDlength'}) {
return ($line,1,'New value too large');	return ($line,1,'New value too large');
Line 5147 sub scantron_fixup_scanline {	Line 5162 sub scantron_fixup_scanline {
$$scantron_config{'CODElength'})=$args->{'CODE'};	$$scantron_config{'CODElength'})=$args->{'CODE'};
}	}
} elsif ($field eq 'answer') {	} elsif ($field eq 'answer') {
my $length=$scantron_config->{'Qlength'};	&scantron_get_maxbubble(); # Need the bubble counter info.
	my $length =$scantron_config->{'Qlength'};
my $off=$scantron_config->{'Qoff'};	my $off=$scantron_config->{'Qoff'};
my $on=$scantron_config->{'Qon'};	my $on=$scantron_config->{'Qon'};
my $answer=${off}x$length;	my $question_number = $args->{'question'} -1;
if ($args->{'response'} eq 'none') {	my $first_position = $first_bubble_line{$question_number};
&scan_data($scan_data,	my $bubble_count = $bubble_lines_per_response{$question_number};
"$whichline.no_bubble.".$args->{'question'},'1');	my $bubbles_per_line= $$scantron_config{'Qlength'};
} else {	my $answer=${off}x($bubbles_per_line*$bubble_count);
if ($on eq 'letter') {	my $final_answer;
my @alphabet=('A'..'Z');	if ($$scantron_config{'Qon'} eq 'letter' \|\|
$answer=$alphabet[$args->{'response'}];	$$scantron_config{'Qon'} eq 'number') {
} elsif ($on eq 'number') {	$bubbles_per_line = 10;
$answer=$args->{'response'}+1;	}
if ($answer == 10) { $answer = '0'; }	if (defined $args->{'response'}) {

	if ($args->{'response'} eq 'none') {
	&scan_data($scan_data,
	"$whichline.no_bubble.".$args->{'question'},'1');
} else {	} else {
substr($answer,$args->{'response'},1)=$on;	my ($bubble_line, $bubble_number) = split(/:/,$args->{'response'});
	if ($on eq 'letter') {
	my @alphabet=('A'..'Z');
	$answer=$alphabet[$bubble_number];
	} elsif ($on eq 'number') {
	$answer= $bubble_number+1;
	if ($answer == 10) { $answer = '0'; }
	} else {
	substr($answer,$bubble_number+$bubble_line*$bubbles_per_line,1)=$on;
	$final_answer = $answer;
	}
	&scan_data($scan_data,
	"$whichline.no_bubble.".$args->{'question'},undef,'1');

	# Positional notation already has the right final answer length..

	if (($on eq 'letter') \|\| ($on eq 'number')) {
	for (my $l = 0; $l < $bubble_count; $l++) {
	if ($l eq $bubble_line) {
	$final_answer .= $answer;
	} else {
	$final_answer .= ' ';
	}
	}
	}
}	}
&scan_data($scan_data,	# $where=$length*($args->{'question'}-1)+$scantron_config->{'Qstart'};
"$whichline.no_bubble.".$args->{'question'},undef,'1');	#substr($line,$where-1,$length)=$answer;
	substr($line,
	$scantron_config->{'Qstart'}+$first_position-1,
	$bubbles_per_line*$length) = $final_answer;
}	}
my $where=$length*($args->{'question'}-1)+$scantron_config->{'Qstart'};
substr($line,$where-1,$length)=$answer;
}	}
return $line;	return $line;
}	}
Line 5415 sub scantron_parse_scanline {	Line 5460 sub scantron_parse_scanline {
if (!&scan_data($scan_data,"$whichline.no_bubble.$questnum")) {	if (!&scan_data($scan_data,"$whichline.no_bubble.$questnum")) {
push(@{$record{"scantron.missingerror"}},$questnum);	push(@{$record{"scantron.missingerror"}},$questnum);
}	}
} elsif (scalar(@array) lt 2) {
	# If the bubble is not the last position, there will be
	# 2 elements. If it is the last position, there will be 1 element.

	} elsif (scalar(@array) le 2) {

my $location = length($array[0]);	my $location = length($array[0]);
my $line_num = $location / $$scantron_config{'Qlength'};	my $line_num = int($location / $$scantron_config{'Qlength'});
my $bubble = $alphabet[$location % $$scantron_config{'Qlength'}];	my $bubble = $alphabet[$location % $$scantron_config{'Qlength'}];


for (my $ans = 0; $ans < $answers_needed; $ans++) {	for (my $ans = 0; $ans < $answers_needed; $ans++) {
if ($ans eq $line_num) {	if ($ans eq $line_num) {
Line 6546 sub scantron_bubble_selector {	Line 6596 sub scantron_bubble_selector {

my $total_lines = $lines*2;	my $total_lines = $lines*2;
my @alphabet=('A'..'Z');	my @alphabet=('A'..'Z');

$r->print("<table border='1'><tr><td rowspan='".$total_lines."'>$quest</td>");	$r->print("<table border='1'><tr><td rowspan='".$total_lines."'>$quest</td>");

for (my $l = 0; $l < $lines; $l++) {	for (my $l = 0; $l < $lines; $l++) {
Line 6579 sub scantron_bubble_selector {	Line 6630 sub scantron_bubble_selector {
# multiline questions (different values e.g..).	# multiline questions (different values e.g..).

for (my $i=0;$i<$max;$i++) {	for (my $i=0;$i<$max;$i++) {
	my $value = "$l:$i"; # Relative bubble line #: Bubble in line.
$r->print("\n".	$r->print("\n".
'<td><label><input type="radio" name="scantron_correct_Q_'.	'<td><label><input type="radio" name="scantron_correct_Q_'.
$quest.'" value="'.$i.'" />'.$alphabet[$i]."</label></td>");	$quest.'" value="'.$value.'" />'.$alphabet[$i]."</label></td>");
}	}
$r->print('</tr>');	$r->print('</tr>');

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

Removed from v.1.478
changed lines
	Added in v.1.484