--- loncom/interface/Attic/lonspreadsheet.pm 2002/09/10 19:04:13 1.109
+++ loncom/interface/Attic/lonspreadsheet.pm 2002/09/27 20:40:19 1.112
@@ -1,5 +1,5 @@
#
-# $Id: lonspreadsheet.pm,v 1.109 2002/09/10 19:04:13 matthew Exp $
+# $Id: lonspreadsheet.pm,v 1.112 2002/09/27 20:40:19 matthew Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -852,7 +852,7 @@ sub sett {
}
# Deal with the normal cells
foreach (keys(%f)) {
- if (($f{$_}) && ($_!~/template\_/)) {
+ if (exists($f{$_}) && ($_!~/template\_/)) {
my $matches=($_=~/^$pattern(\d+)/);
if (($matches) && ($1)) {
unless ($f{$_}=~/^\!/) {
@@ -1226,8 +1226,14 @@ sub rown {
if ($vl eq '') {
$vl='#';
}
- $rowdata.='| '.
- ''.$vl.' | ';
+ $rowdata.='';
+ if ($ENV{'request.role'} =~ /^st\./) {
+ $rowdata.=$vl;
+ } else {
+ $rowdata.=''.
+ $vl.'';
+ }
+ $rowdata.=' | ';
} else {
$rowdata.=' '.$vl.' | ';
}
@@ -1299,7 +1305,7 @@ sub outsheet {
push (@sortby, $safeeval->reval('$f{"A'.$row.'"}'));
push (@sortidx, $row-1);
}
- @sortidx=sort { $sortby[$a] cmp $sortby[$b]; } @sortidx;
+ @sortidx=sort { lc($sortby[$a]) cmp lc($sortby[$b]); } @sortidx;
#
# Determine the type of child spreadsheets
my $what='Student';
@@ -2412,10 +2418,15 @@ sub cachedssheets {
# Interactive call to screen
#
#
-
-
sub handler {
my $r=shift;
+
+ my $loaderror=&Apache::lonnet::overloaderror($r);
+ if ($loaderror) { return $loaderror; }
+ $loaderror= &Apache::lonnet::overloaderror($r,
+ $ENV{'course.'.$ENV{'request.course.id'}.'.home'});
+ if ($loaderror) { return $loaderror; }
+
if ($r->header_only) {
$r->content_type('text/html');
$r->send_http_header;
@@ -2434,6 +2445,10 @@ sub handler {
# Get query string for limited number of parameters
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
['uname','udom','usymb','ufn']);
+ if ($ENV{'request.role'} =~ /^st\./) {
+ delete $ENV{'form.unewfield'} if (exists($ENV{'form.unewfield'}));
+ delete $ENV{'form.unewformula'} if (exists($ENV{'form.unewformula'}));
+ }
if (($ENV{'form.usymb'}=~/^\_(\w+)/) && (!$ENV{'form.ufn'})) {
$ENV{'form.ufn'}='default_'.$1;
}
@@ -2460,7 +2475,8 @@ sub handler {
$r->send_http_header;
# Screen output
$r->print('LON-CAPA Spreadsheet');
- $r->print(<print(<
function celledit(cn,cf) {
@@ -2486,6 +2502,7 @@ sub handler {
ENDSCRIPT
+ }
$r->print(''.&Apache::loncommon::bodytag('Grades Spreadsheet').
'