--- loncom/homework/grades.pm 2003/07/25 20:35:40 1.125
+++ loncom/homework/grades.pm 2003/07/28 18:04:39 1.126
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# The LON-CAPA Grading handler
#
-# $Id: grades.pm,v 1.125 2003/07/25 20:35:40 ng Exp $
+# $Id: grades.pm,v 1.126 2003/07/28 18:04:39 ng Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -127,7 +127,7 @@ sub showResourceInfo {
my $result ='
'.
'
Current Resource: '.$probTitle.'
'."\n";
my ($partlist,$handgrade) = &response_type($url);
- my %resptype = (); #,$hdgrade)=('','no');
+ my %resptype = ();
my $hdgrade='no';
for (sort keys(%$handgrade)) {
my ($responsetype,$handgrade)=split(/:/,$$handgrade{$_});
@@ -154,12 +154,12 @@ sub cleanRecord {
push @ans,$ans;
}
my $grayFont = '';
- return '
'.
+ return '
'.
'
Answer
'.
(join '
',@ans).'
'.
'
'.$grayFont.'Option ID
'.$grayFont.
(join '
'.$grayFont,@IDs).'
'.
- '
';
+ '
';
}
if ($response eq 'essay') {
if (! exists ($ENV{'form.'.$symb})) {
@@ -174,7 +174,7 @@ sub cleanRecord {
$ENV{'form.kwstyle'} = $keyhash{$loginuser.'_kwstyle'} ne '' ? $keyhash{$loginuser.'_kwstyle'} : '';
$ENV{'form.'.$symb} = 1; # so that we don't have to read it from disk for multiple sub of the same prob.
}
- return &keywords_highlight($answer);
+ return '
'.&keywords_highlight($answer).'
';
}
return $answer;
}
@@ -475,7 +475,7 @@ sub listStudents {
sense = "the student";
}
if (ctr == 0) {
- alert("Please select "+sense+" before clicking on the $viewgrade button.");
+ alert("Please select "+sense+" before clicking on the Next button.");
return false;
}
document.gradesub.submit();
@@ -527,20 +527,20 @@ LISTJAVASCRIPT
&Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,1,'javascript:reLoadList(this.form);').' ';
}
- $gradeTable.='To '.lc($viewgrade).' a submission, click on the check box next to the student\'s name. Then '."\n".
- 'click on the '.$viewgrade.' button. To view the submissions for a group of students, click'."\n".
- ' on the check boxes for the group of students. '."\n".
+ $gradeTable.='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".
''."\n";
$gradeTable.=''."\n";
+ 'value="Next->" />'."\n";
my (undef, undef, $fullname) = &getclasslist($getsec,'1');
$gradeTable.='
'.
'
';
my $loop = 0;
while ($loop < 2) {
- $gradeTable.='
Assign Common Grade To ';
+ my $sectionClass;
if ($ENV{'form.section'} eq 'all') {
- $result.='Class
';
+ $sectionClass='Class ';
} elsif ($ENV{'form.section'} eq 'no') {
- $result.='Students in no Section ';
+ $sectionClass='Students in no Section ';
} else {
- $result.='Students in Section '.$ENV{'form.section'}.'';
+ $sectionClass='Students in Section '.$ENV{'form.section'}.'';
}
+ $result.='
Assign Common Grade To '.$sectionClass;
$result.= '
'."\n".
'
';
#radio buttons/text box for assigning points for a section or class.
@@ -2107,7 +2107,6 @@ sub viewgrades {
'onChange="javascript:writeRadText(\''.$partid.'\','.
$weight{$partid}.')"> '.
''.
-# '
'."\n";
''.
''."\n";
$ctsparts++;
@@ -2119,21 +2118,14 @@ sub viewgrades {
#table listing all the students in a section/class
#header of table
- $result.= '
Assign Grade to Specific Students in ';
- if ($ENV{'form.section'} eq 'all') {
- $result.='the Class
Assign Grade to Specific Students in '.$sectionClass;
$result.= '
'."\n".
- '
'.
- '
Fullname (Username)
'."\n";
+ '
No.
'.
+ '
Fullname (Username)
'."\n";
my (@parts) = sort(&getpartlist($url));
foreach my $part (@parts) {
my $display=&Apache::lonnet::metadata($url,$part.'.display');
- $display =~ s/^Number of Attempts/Tries/; # makes the column narrower
+ $display =~ s|^Number of Attempts|Tries |; # makes the column narrower
if (!$display) { $display = &Apache::lonnet::metadata($url,$part.'.name'); }
if ($display =~ /^Partial Credit Factor/) {
my ($partid) = &split_part_type($part);
@@ -2154,13 +2146,13 @@ sub viewgrades {
my $uname = $_;
$uname=~s/:/_/;
$result.=''."\n";
- $result.=&viewstudentgrade($url,$symb,$ENV{'request.course.id'},
- $_,$$fullname{$_},\@parts,\%weight);
$ctr++;
+ $result.=&viewstudentgrade($url,$symb,$ENV{'request.course.id'},
+ $_,$$fullname{$_},\@parts,\%weight,$ctr);
}
$result.='
';
$result.=''."\n";
- $result.=''."\n";
if (scalar(%$fullname) eq 0) {
my $colspan=3+scalar(@parts);
@@ -2173,11 +2165,11 @@ sub viewgrades {
#--- call by previous routine to display each student
sub viewstudentgrade {
- my ($url,$symb,$courseid,$student,$fullname,$parts,$weight) = @_;
+ my ($$url,$symb,$courseid,$student,$fullname,$parts,$weight,$ctr) = @_;
my ($uname,$udom) = split(/:/,$student);
$student=~s/:/_/;
my %record=&Apache::lonnet::restore($symb,$courseid,$udom,$uname);
- my $result='
'."\n";
my %scoreptr = (
'correct' =>'correct_by_override',
@@ -2283,6 +2272,7 @@ sub editgrades {
$result .= $header;
$result .= '
'."\n";
my $noupdate;
+ my ($updateCtr,$noupdateCtr) = (1,1);
for ($i=0; $i<$ENV{'form.total'}; $i++) {
my $line;
my $user = $ENV{'form.ctr'.$i};
@@ -2291,12 +2281,11 @@ sub editgrades {
my ($uname,$udom)=split(/_/,$user);
my %newrecord;
my $updateflag = 0;
- $line .= '
';
my $usec=$classlist->{"$uname:$udom"}[5];
if (!&canmodify($usec)) {
- my $numcols=scalar(@partid)*(scalar(@parts)-1)*2;
+ my $numcols=scalar(@partid)*4+2;
$noupdate.=$line."
Not allowed to modify student
";
next;
}
@@ -2322,7 +2311,6 @@ sub editgrades {
if ($dropMenu eq 'reset status' &&
$old_score ne '') { # ignore if no previous attempts => nothing to reset
- print "reset status ";
$newrecord{'resource.'.$_.'.tries'} = 0;
$newrecord{'resource.'.$_.'.solved'} = '';
$newrecord{'resource.'.$_.'.award'} = '';
@@ -2363,14 +2351,17 @@ sub editgrades {
$count++;
&Apache::lonnet::cstore(\%newrecord,$symb,$ENV{'request.course.id'},
$udom,$uname);
- $result.=$line;
+ $result.='
'.$line;
+ $noupdateCtr++;
}
}
if ($noupdate) {
- my $numcols=(scalar(@partid)*(scalar(@parts)-1)*2)+3;
- $result .= '
No Changes Occured For the Students Below
'.$noupdate;
+# my $numcols=(scalar(@partid)*(scalar(@parts)-1)*2)+3;
+ my $numcols=scalar(@partid)*4+2;
+ $result .= '
No Changes Occurred For the Students Below
'.$noupdate;
}
$result .= '
'."\n".
&show_grading_menu_form ($symb,$url);
@@ -2762,34 +2753,33 @@ LISTJAVASCRIPT
''." \n";
$result.=' '."\n";
+ 'onClick="javascript:checkPickOne(this.form);"value="Next->" /> '."\n";
$request->print($result);
- my $studentTable.=' Select a student you wish to grade '.
+ my $studentTable.=' Select a student you wish to grade and then click on the Next button. '.
'
'.
'
'.
+ '
No.
'.
'
Fullname (username)
'.
- '
Fullname (username)
'.
- '
Fullname (username)
'.
+ '
No.
'.
'
Fullname (username)
';
my (undef,undef,$fullname) = &getclasslist($getsec,'1');
my $ptr = 1;
foreach my $student (sort {lc($$fullname{$a}) cmp lc($$fullname{$b}) } keys %$fullname) {
my ($uname,$udom) = split(/:/,$student);
- $studentTable.=($ptr%4 == 1 ? '
File uploaded by student '.
'Like all files provided by users, '.
'this file may contain virusses