--- loncom/homework/grades.pm 2002/11/27 15:54:24 1.61
+++ loncom/homework/grades.pm 2003/03/17 19:12:56 1.66.2.1
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# The LON-CAPA Grading handler
#
-# $Id: grades.pm,v 1.61 2002/11/27 15:54:24 albertel Exp $
+# $Id: grades.pm,v 1.66.2.1 2003/03/17 19:12:56 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -672,21 +672,21 @@ sub sub_page_js {
pWin.document.write("
");
pWin.document.write("
Subject
");
pWin.document.write("
");
- pWin.document.write("
");
+ pWin.document.write("
");
}
-function displaySavedMsg(ctr,msg,shwsel) {
+ function displaySavedMsg(ctr,msg,shwsel) {
pWin.document.write("
");
pWin.document.write("
"+ctr+"
");
pWin.document.write("
");
- pWin.document.write("
");
+ pWin.document.write("
");
}
function newMsg(newmsg,shwsel) {
pWin.document.write("
");
pWin.document.write("
New
");
pWin.document.write("
");
- pWin.document.write("
");
+ pWin.document.write("
");
}
function msgTail() {
@@ -846,7 +846,7 @@ sub submission {
# option to display problem, only once else it cause problems
# with the form later since the problem has a form.
- if ($ENV{'form.vProb'} eq 'yes') {
+ if ($ENV{'form.vProb'} eq 'yes' or !$ENV{'form.vProb'}) {
&show_problem($request,$symb,$uname,$udom,0);
}
@@ -1226,13 +1226,13 @@ sub processHandGrade {
my $includemsg = $ENV{'form.includemsg'.$ctr};
my ($subject,$message,$msgstatus) = ('','','');
- if ($includemsg =~ /savemsg|new$ctr/) {
+ if ($includemsg =~ /savemsg|newmsg\Q$ctr\E/) {
$subject = $ENV{'form.msgsub'} if ($includemsg =~ /^msgsub/);
my (@msgnum) = split(/,/,$includemsg);
foreach (@msgnum) {
$message.=$ENV{'form.'.$_} if ($_ =~ /savemsg|newmsg/ && $_ ne '');
}
- $message =~ s/\s+/ /g;
+ #$message =~ s/\s+/ /g;
$msgstatus = &Apache::lonmsg::user_normal_msg ($uname,$udom,
$ENV{'form.msgsub'},$message);
}
@@ -1725,8 +1725,8 @@ sub viewstudentgrade {
''.$fullname.''.
'
'.$uname.'
'.$udom.'
'."\n";
- foreach my $part (@$parts) {
- my ($part,$type) = &split_part_type($part);
+ foreach my $apart (@$parts) {
+ my ($part,$type) = &split_part_type($apart);
my $score=$record{"resource.$part.$type"};
if ($type eq 'awarded') {
my $pts = $score eq '' ? '' : $score*$$weight{$part};