--- loncom/interface/Attic/lonspreadsheet.pm 2001/09/11 00:05:13 1.60 +++ loncom/interface/Attic/lonspreadsheet.pm 2001/09/11 20:50:04 1.61 @@ -6,7 +6,7 @@ # 01/01/01,02/01,03/01,19/01,20/01,22/01, # 03/05,03/08,03/10,03/12,03/13,03/15,03/17, # 03/19,03/20,03/21,03/27,04/05,04/09, -# 07/09,07/14,07/21,09/01,09/10 Gerd Kortemeyer +# 07/09,07/14,07/21,09/01,09/10,9/11 Gerd Kortemeyer package Apache::lonspreadsheet; @@ -670,6 +670,7 @@ sub rown { my ($safeeval,$n)=@_; my $defaultbg; my $rowdata=''; + my $dataflag=0; unless ($n eq '-') { $defaultbg=((($n-1)/5)==int(($n-1)/5))?'#E0E0':'#FFFF'; } else { @@ -707,10 +708,11 @@ sub rown { } else { $maxred=26; } - if ($n eq '-') { $proc='&templaterow'; $n=-1; } + if ($n eq '-') { $proc='&templaterow'; $n=-1; $dataflag=1; } map { my $bgcolor=$defaultbg.((($showf-1)/5==int(($showf-1)/5))?'99':'DD'); my ($fm,$vl)=split(/\_\_\_eq\_\_\_/,$_); + if ($vl ne '') { $dataflag=1; } if ($showf==0) { $vl=$_; } if ($showf<=$maxred) { $bgcolor='#FFDDDD'; } if (($n==0) && ($showf<=26)) { $bgcolor='#CCCCFF'; } @@ -726,7 +728,11 @@ sub rown { } $showf++; } $safeeval->reval($proc.'('.$n.')'); - return $rowdata.''; + if ($ENV{'form.showall'} || ($dataflag)) { + return $rowdata.''; + } else { + return ''; + } } # ------------------------------------------------------------- Print out sheet @@ -1987,7 +1993,8 @@ ENDSCRIPT # ---------------------------------------------------------------- Course title $r->print('

'. - $ENV{'course.'.$ENV{'request.course.id'}.'.description'}.'

'); + $ENV{'course.'.$ENV{'request.course.id'}.'.description'}. + '

'.localtime().'

'); # ---------------------------------------------------- See if user can see this @@ -2110,6 +2117,11 @@ ENDSCRIPT &tmpwrite($asheet); + $r->print( + '
Show empty rows: print(' checked'); } + $r->print('>'); + # ------------------------------------------------------------- Print out sheet &outsheet($r,$asheet);