--- loncom/homework/grades.pm 2002/08/05 20:49:54 1.45
+++ loncom/homework/grades.pm 2002/09/06 21:01:09 1.46.2.1
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# The LON-CAPA Grading handler
#
-# $Id: grades.pm,v 1.45 2002/08/05 20:49:54 ng Exp $
+# $Id: grades.pm,v 1.46.2.1 2002/09/06 21:01:09 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -45,17 +45,6 @@ use Apache::Constants qw(:common);
# ----- These first few routines are general use routines.-----
#
-
-sub print_hash {
- my ($request, $hash) = @_;
- $request->print('
Key
Value
');
- for (sort keys (%$hash)) {
- $request->print('
'.$_.'
'.$$hash{$_}.'
');
- }
- $request->print('
');
- return '';
-}
-
# --- Retrieve the parts that matches stores_\d+ from the metadata file.---
sub getpartlist {
my ($url) = @_;
@@ -114,17 +103,6 @@ sub response_type {
return \@partlist,\%handgrade;
}
-#--- Prints a message on screen if a user did something wrong
-#--- Operator error ---
-sub userError {
- my ($request, $reason, $step) = @_;
- $request->print('
LON-CAPA User Error
'."\n");
- $request->print('Reason: '.$reason.'
'."\n");
- $request->print('Step: '.($step ne '' ? $step : 'Use your browser back button to correct')
- .'
'."\n");
- return '';
-}
-
#--- Dumps the class list with usernames,list of sections,
#--- section, ids and fullnames for each user.
sub getclasslist {
@@ -323,19 +301,22 @@ sub listStudents {
LISTJAVASCRIPT
+ my ($symb,$url) = &get_symb_and_url();
my $cdom = $ENV{"course.$ENV{'request.course.id'}.domain"};
my $cnum = $ENV{"course.$ENV{'request.course.id'}.num"};
my $getsec = $ENV{'form.section'} eq '' ? 'all' : $ENV{'form.section'};
@@ -352,8 +334,8 @@ LISTJAVASCRIPT
'View/Grade Submissions for a Student or a Group of Students';
$result.='
';
$result.='
'.
- 'Resource: '.$ENV{'form.url'}.'
';
- my ($partlist,$handgrade) = &response_type($ENV{'form.url'});
+ 'Resource: '.$url.'';
+ my ($partlist,$handgrade) = &response_type($url);
for (sort keys(%$handgrade)) {
my ($responsetype,$handgrade)=split(/:/,$$handgrade{$_});
$ENV{'form.handgrade'} = 'yes' if ($handgrade eq 'yes');
@@ -380,8 +362,8 @@ LISTJAVASCRIPT
''."\n".
' '."\n".
' '."\n".
- ''."\n".
- ''."\n".
+ ''."\n".
+ ''."\n".
'To view/grade a submission, click on the check box next to the student\'s name. Then '."\n".
'click on the View/Grade button. To view the submissions for a group of students, click'."\n".
' on the check boxes for the group of students. '."\n".
@@ -404,8 +386,7 @@ LISTJAVASCRIPT
my $ctr = 0;
foreach my $student (sort {$$fullname{$a} cmp $$fullname{$b} } keys %$fullname) {
my ($uname,$udom) = split(/:/,$student);
- my (%status) = &student_gradeStatus($ENV{'form.url'},
- $ENV{'form.symb'},$udom,$uname,$partlist);
+ my (%status) =&student_gradeStatus($url,$symb,$udom,$uname,$partlist);
my $statusflg = '';
foreach (keys(%status)) {
$statusflg = 1 if ($status{$_} ne 'nothing');
@@ -442,7 +423,9 @@ LISTJAVASCRIPT
if ($ctr == 0) {
$gradeTable=' '.
'No submission found for this resource. ';
- $gradeTable.=&show_grading_menu_form ($ENV{'form.symb'},$ENV{'form.url'});
+ $gradeTable.=&show_grading_menu_form($symb,$url);
+ } elsif ($ctr == 1) {
+ $gradeTable =~ s/type=checkbox/type=checkbox checked/;
}
$request->print($gradeTable);
return '';
@@ -552,7 +535,7 @@ sub sub_page_js {
var points = eval("document.SCORE.GD_BOX"+i+"_"+partid+".value");
if (points == "") {
var name = eval("document.SCORE.name"+i+".value");
- alert("You did not assign any point for "+name+", part "+partid+".");
+ alert("Please assign a score for "+name+", part "+partid+".");
return false;
}
}
@@ -594,7 +577,7 @@ sub sub_page_js {
else return;
var cleantxt = txt.replace(new RegExp('([\\f\\n\\r\\t\\v ])+', 'g')," ");
if (cleantxt=="") {
- alert("Select a word or group of words from document and then click this link.");
+ alert("Please select a word or group of words from document and then click this link.");
return;
}
var nret = prompt("Add selection to keyword list? Edit if desired.",cleantxt);
@@ -929,7 +912,6 @@ KEYWORDS
my $result='
'."\n".
'
'."\n";
-# $result.='
Fullname: '.$ENV{'form.fullname'}.
$result.='Fullname: '.$ENV{'form.fullname'}.
' Username: '.$uname.''.
' Domain: '.$udom.' '."\n";
@@ -1002,7 +984,7 @@ KEYWORDS
$request->print($submitby);
} else {
my ($string,$timestamp)=
- &get_last_submission ($symb,$uname,$udom,$ENV{'request.course.id'});
+ &get_last_submission (%record);
my $lastsubonly.=''.
($$timestamp eq '' ? '' : 'Date Submitted: '.
$$timestamp).'';
@@ -1153,31 +1135,30 @@ KEYWORDS
#--- Retrieve the last submission for all the parts
sub get_last_submission {
- my ($symb,$username,$domain,$course)=@_;
- if ($symb) {
- my (@string,$timestamp);
- my (%returnhash)=&Apache::lonnet::restore($symb,$course,$domain,$username);
- if ($returnhash{'version'}) {
- my %lasthash=();
- my ($version);
- for ($version=1;$version<=$returnhash{'version'};$version++) {
- foreach (sort(split(/\:/,$returnhash{$version.':keys'}))) {
- $lasthash{$_}=$returnhash{$version.':'.$_};
- }
- }
- foreach ((keys %lasthash)) {
- if ($_ =~ /\.submission$/) {
- my ($partid,$foo) = split(/submission$/,$_);
- my $draft = $lasthash{$partid.'awarddetail'} eq 'DRAFT' ?
- 'Draft Copy ' : '';
- push @string, (join(':',$_,$draft.$lasthash{$_}));
- }
- if ($_ =~ /timestamp/) {$timestamp = scalar(localtime($lasthash{$_}))};
+ my (%returnhash)=@_;
+ my (@string,$timestamp);
+ if ($returnhash{'version'}) {
+ my %lasthash=();
+ my ($version);
+ for ($version=1;$version<=$returnhash{'version'};$version++) {
+ foreach (sort(split(/\:/,$returnhash{$version.':keys'}))) {
+ $lasthash{$_}=$returnhash{$version.':'.$_};
+ if ($returnhash{$version.':'.$_} =~ /(SUBMITTED|DRAFT)$/) {
+ $timestamp = scalar(localtime($returnhash{$version.':timestamp'}));
+ }
+ }
+ }
+ foreach ((keys %lasthash)) {
+ if ($_ =~ /\.submission$/) {
+ my ($partid,$foo) = split(/submission$/,$_);
+ my $draft = $lasthash{$partid.'awarddetail'} eq 'DRAFT' ?
+ 'Draft Copy ' : '';
+ push @string, (join(':',$_,$draft.$lasthash{$_}));
}
}
- @string = $string[0] eq '' ? 'Nothing submitted - no attempts.' : @string;
- return \@string,\$timestamp;
}
+ @string = $string[0] eq '' ? 'Nothing submitted - no attempts.' : @string;
+ return \@string,\$timestamp;
}
#--- High light keywords, with style choosen by user.
@@ -2029,8 +2010,6 @@ sub csvuploadassign {
}
$request->print('
Assigning Grades
');
my $courseid=$ENV{'request.course.id'};
-# my $cdom=$ENV{"course.$courseid.domain"};
-# my $cnum=$ENV{"course.$courseid.num"};
my ($classlist) = &getclasslist('all','1');
my @skipped;
my $countdone=0;
@@ -2130,7 +2109,7 @@ sub view_edit_entire_class_form {
$result.= ''."\n";
}
$result.='
'."\n";
$result.='
'."\n";
return $result;
@@ -2140,7 +2119,17 @@ sub view_edit_entire_class_form {
sub upcsvScores_form {
my ($symb,$url) = @_;
if (!$symb) {return '';}
- my $result.='
'."\n";
+ my $result = ''."\n";
+
+ $result.='
'."\n";
$result.='
'."\n";
$result.=' Specify a file containing the class scores for above resource
'."\n";
@@ -2185,8 +2174,8 @@ sub viewGradeaStu_form {
' everybody ';
$result.=' (Section "no" implies the students were not assigned a section.) '
if (grep /no/,@$sections);
-
- $result.=' '."\n".
+
+ $result.=' '."\n".
''."\n";
$result.='
'."\n";
$result.='
'."\n";
@@ -2196,17 +2185,27 @@ sub viewGradeaStu_form {
#--- Form to input a receipt number ---
sub verifyReceipt_form {
my ($symb,$url) = @_;
- my $cdom=$ENV{"course.$ENV{'request.course.id'}.domain"};
- my $cnum=$ENV{"course.$ENV{'request.course.id'}.num"};
+ my $result = ''."\n";
+
my $hostver=unpack("%32C*",$Apache::lonnet::perlvar{'lonHostID'});
- my $result.='
'."\n";
+ $result.='
'."\n";
$result.='
'."\n";
$result.=' Verify a Submission Receipt Issued by this Server