--- loncom/homework/grades.pm 2004/02/24 23:22:24 1.177
+++ loncom/homework/grades.pm 2004/03/19 03:58:06 1.182
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# The LON-CAPA Grading handler
#
-# $Id: grades.pm,v 1.177 2004/02/24 23:22:24 albertel Exp $
+# $Id: grades.pm,v 1.182 2004/03/19 03:58:06 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -531,7 +531,6 @@ sub verifyreceipt {
if ($ENV{"course.$courseid.receiptalg"} eq 'receipt2') { $receiptparts=1; }
my $parts=['0'];
if ($receiptparts) { ($parts)=&response_type($url,$symb); }
- $request->print("got Parts ".join(':',@$parts));
foreach (sort {lc($$fullname{$a}) cmp lc($$fullname{$b}) } keys %$fullname) {
my ($uname,$udom)=split(/\:/);
foreach my $part (@$parts) {
@@ -1296,10 +1295,10 @@ sub gradeBox {
my $ctr = 0;
$result.='
'."\n");
}
# essay grading message center
@@ -4203,7 +4204,8 @@ sub scantron_upload_scantron_data {
my ($r)=@_;
$r->print(&Apache::loncommon::coursebrowser_javascript($ENV{'request.role.domain'}));
my $select_link=&Apache::loncommon::selectcourse_link('rules','courseid',
- 'domainid');
+ 'domainid',
+ 'coursename');
my $domsel=&Apache::loncommon::select_dom_form($ENV{'request.role.domain'},
'domainid');
my $default_form_data=&defaultFormData(&get_symb_and_url($r,1));
@@ -4220,12 +4222,14 @@ sub scantron_upload_scantron_data {
UPLOAD
@@ -4234,11 +4238,21 @@ UPLOAD
sub scantron_upload_scantron_data_save {
my($r)=@_;
+ my ($symb,$url)=&get_symb_and_url($r,1);
+ my $doanotherupload=
+ '
'."\n";
if (!&Apache::lonnet::allowed('usc',$ENV{'form.domainid'}) &&
!&Apache::lonnet::allowed('usc',
$ENV{'form.domainid'}.'_'.$ENV{'form.courseid'})) {
$r->print("You are not allowed to upload Scantron data to the requested course.
");
- $r->print(&show_grading_menu_form(&get_symb_and_url($r)));
+ if ($symb) {
+ $r->print(&show_grading_menu_form($symb,$url));
+ } else {
+ $r->print($doanotherupload);
+ }
return '';
}
$r->print("Doing upload to ".$ENV{'form.courseid'}."
");
@@ -4262,14 +4276,10 @@ sub scantron_upload_scantron_data_save {
$r->print(&Apache::lonnet::finishuserfileupload($ENV{'form.courseid'},
$ENV{'form.domainid'},
$home,'upfile',$fname));
- my ($symb,$url)=&get_symb_and_url($r);
if ($symb) {
- $r->print(&show_grading_menu_form(&get_symb_and_url($r)));
+ $r->print(&show_grading_menu_form($symb,$url));
} else {
- $r->print('
'."\n");
+ $r->print($doanotherupload);
}
return '';
}