--- loncom/interface/Attic/lonspreadsheet.pm 2000/12/11 16:51:12 1.12 +++ loncom/interface/Attic/lonspreadsheet.pm 2001/01/01 20:52:10 1.26 @@ -1,7 +1,9 @@ # The LearningOnline Network with CAPA # Spreadsheet/Grades Display Handler # -# 11/11,11/15,11/27,12/04,12/05,12/06,12/07,12/08,12/09,12/11 Gerd Kortemeyer +# 11/11,11/15,11/27,12/04,12/05,12/06,12/07, +# 12/08,12/09,12/11,12/12,12/15,12/16,12/18,12/19,12/30, +# 01/01/01 Gerd Kortemeyer package Apache::lonspreadsheet; @@ -11,8 +13,8 @@ use Safe::Hole; use Opcode; use Apache::lonnet; use Apache::Constants qw(:common :http); -use HTML::TokeParser; use GDBM_File; +use HTML::TokeParser; # # These cache hashes need to be independent of user, resource and course @@ -259,9 +261,34 @@ sub SUMMIN { sub sett { %t=(); + my $pattern=''; + if ($sheettype eq 'assesscalc') { + $pattern='A'; + } else { + $pattern='[A-Z]'; + } + map { + if ($_=~/template\_(\w)/) { + my $col=$1; + unless ($col=~/^$pattern/) { + map { + if ($_=~/A(\d+)/) { + my $trow=$1; + if ($trow) { + my $lb=$col.$trow; + $t{$lb}=$f{'template_'.$col}; + $t{$lb}=~s/\#/$trow/g; + $t{$lb}=~s/\.\.+/\,/g; + $t{$lb}=~s/(^|[^\"\'])([A-Za-z]\d+)/$1\$v\{\'$2\'\}/g; + } + } + } keys %f; + } + } + } keys %f; map { - if ($f{$_}) { - if ($_=~/^A/) { + if (($f{$_}) && ($_!~/template\_/)) { + if ($_=~/^$pattern/) { unless ($f{$_}=~/^\!/) { $t{$_}=$c{$_}; } @@ -272,6 +299,9 @@ sub sett { } } } keys %f; + $t{'A0'}=$f{'A0'}; + $t{'A0'}=~s/\.\.+/\,/g; + $t{'A0'}=~s/(^|[^\"\'])([A-Za-z]\d+)/$1\$v\{\'$2\'\}/g; } sub calc { @@ -299,6 +329,39 @@ sub calc { return ''; } +sub templaterow { + my @cols=(); + $cols[0]='Template'; + map { + my $fm=$f{'template_'.$_}; + $fm=~s/[\'\"]/\&\#34;/g; + $cols[$#cols+1]="'template_$_','$fm'".'___eq___'.$fm; + } ('A','B','C','D','E','F','G','H','I','J','K','L','M', + 'N','O','P','Q','R','S','T','U','V','W','X','Y','Z', + 'a','b','c','d','e','f','g','h','i','j','k','l','m', + 'n','o','p','q','r','s','t','u','v','w','x','y','z'); + return @cols; +} + +sub outrowassess { + my $n=shift; + my @cols=(); + if ($n) { + $cols[0]=$rl{$f{'A'.$n}}; + } else { + $cols[0]='Export'; + } + map { + my $fm=$f{$_.$n}; + $fm=~s/[\'\"]/\&\#34;/g; + $cols[$#cols+1]="'$_$n','$fm'".'___eq___'.$v{$_.$n}; + } ('A','B','C','D','E','F','G','H','I','J','K','L','M', + 'N','O','P','Q','R','S','T','U','V','W','X','Y','Z', + 'a','b','c','d','e','f','g','h','i','j','k','l','m', + 'n','o','p','q','r','s','t','u','v','w','x','y','z'); + return @cols; +} + sub outrow { my $n=shift; my @cols=(); @@ -318,6 +381,16 @@ sub outrow { return @cols; } +sub exportrowa { + my $rowa=''; + map { + $rowa.=$v{$_.'0'}."___;___"; + } ('A','B','C','D','E','F','G','H','I','J','K','L','M', + 'N','O','P','Q','R','S','T','U','V','W','X','Y','Z'); + $rowa=~s/\_\_\_\;\_\_\_$//; + return $rowa; +} + # ------------------------------------------- End of "Inside of the safe space" ENDDEFS $safeeval->reval($code); @@ -406,7 +479,14 @@ sub getfilename { my $safeeval=shift; return $safeeval->reval('$filename'); } - + +# ------------------------------------------------------------- Export of A-row + +sub exportrow { + my $safeeval=shift; + return $safeeval->reval('&exportrowa()'); +} + # ========================================================== End of Spreadsheet # ============================================================================= @@ -415,16 +495,49 @@ sub getfilename { sub rown { my ($safeeval,$n)=@_; - my $defaultbg=((($n-1)/5)==int(($n-1)/5))?'#E0E0':'#FFFF'; - my $rowdata="\n$n"; + my $defaultbg; + my $rowdata=''; + unless ($n eq '-') { + $defaultbg=((($n-1)/5)==int(($n-1)/5))?'#E0E0':'#FFFF'; + } else { + $defaultbg='#E0FF'; + } + if ((($n-1)/25)==int(($n-1)/25)) { + my $what='Student'; + if (&gettype($safeeval) eq 'assesscalc') { + $what='Item'; + } elsif (&gettype($safeeval) eq 'studentcalc') { + $what='Assessment'; + } + $rowdata.="\n
". + ''; + map { + $rowdata.=''; + } ('A','B','C','D','E','F','G','H','I','J','K','L','M', + 'N','O','P','Q','R','S','T','U','V','W','X','Y','Z', + 'a','b','c','d','e','f','g','h','i','j','k','l','m', + 'n','o','p','q','r','s','t','u','v','w','x','y','z'); + $rowdata.=''; + } + $rowdata.="\n"; my $showf=0; + my $proc; + my $maxred; + if (&gettype($safeeval) eq 'assesscalc') { + $proc='&outrowassess'; + $maxred=1; + } else { + $proc='&outrow'; + $maxred=26; + } + if ($n eq '-') { $proc='&templaterow'; $n=-1; } map { my $bgcolor=$defaultbg.((($showf-1)/5==int(($showf-1)/5))?'99':'DD'); my ($fm,$vl)=split(/\_\_\_eq\_\_\_/,$_); if ($showf==0) { $vl=$_; } - if ($showf<=1) { $bgcolor='#FFDDDD'; } + if ($showf<=$maxred) { $bgcolor='#FFDDDD'; } if (($n==0) && ($showf<=26)) { $bgcolor='#CCCCFF'; } - if ($showf>1) { + if (($showf>$maxred) || ((!$n) && ($showf>0))) { if ($vl eq '') { $vl='#'; } @@ -435,70 +548,149 @@ sub rown { $rowdata.=''; } $showf++; - } $safeeval->reval('&outrow('.$n.')'); + } $safeeval->reval($proc.'('.$n.')'); return $rowdata.''; } # ------------------------------------------------------------- Print out sheet sub outsheet { - my $safeeval=shift; - my $tabledata='
 '.$what.''.$_.'
$n '.$vl.' 
'. - ''; + my ($r,$safeeval)=@_; + my $maxred; + my $realm; + if (&gettype($safeeval) eq 'assesscalc') { + $maxred=1; + $realm='Assessment'; + } elsif (&gettype($safeeval) eq 'studentcalc') { + $maxred=26; + $realm='User'; + } else { + $maxred=26; + $realm='Course'; + } + my $maxyellow=52-$maxred; + my $tabledata= + '
 A Import
'. + ''. + ''; + my $showf=0; map { - $tabledata.=""; - } ('B','C','D','E','F','G','H','I','J','K','L','M', + $showf++; + if ($showf<=$maxred) { + $tabledata.='"; + } ('A','B','C','D','E','F','G','H','I','J','K','L','M', 'N','O','P','Q','R','S','T','U','V','W','X','Y','Z', 'a','b','c','d','e','f','g','h','i','j','k','l','m', 'n','o','p','q','r','s','t','u','v','w','x','y','z'); $tabledata.=''; my $row; my $maxrow=&getmaxrow($safeeval); + $tabledata.=&rown($safeeval,'-'); + $r->print($tabledata); for ($row=0;$row<=$maxrow;$row++) { - $tabledata.=&rown($safeeval,$row); + $r->print(&rown($safeeval,$row)); } - $tabledata.='
'. + $realm.'ImportCalculations
$_'; + } else { + $tabledata.=''; + } + $tabledata.="$_
'; + $r->print(''); } -# --------------------------------------- Read spreadsheet formulas from a file +# ------------------------------------- Read spreadsheet formulas from a course sub readsheet { - my ($safeeval,$fn)=@_; - &setfilename($safeeval,$fn); - $fn=~/\.(\w+)/; - &settype($safeeval,$1); + my ($safeeval,$fn,$r)=@_; my %f=(); - unless ($spreadsheets{$fn}) { - $spreadsheets{$fn}=''; + if (($fn eq '') || ($fn=~/^default\_/)) { + my $sheetxml=''; { my $fh; - if ($fh=Apache::File->new($fn)) { - $spreadsheets{$fn}=join('',<$fh>); - } + if ($fh=Apache::File->new($r->dir_config('lonIncludes'). + '/default.'.&gettype($safeeval))) { + $sheetxml=join('',<$fh>); + } } + my $parser=HTML::TokeParser->new(\$sheetxml); + my $token; + while ($token=$parser->get_token) { + if ($token->[0] eq 'S') { + if ($token->[1] eq 'field') { + $f{$token->[2]->{'col'}.$token->[2]->{'row'}}= + $parser->get_text('/field'); + } + if ($token->[1] eq 'template') { + $f{'template_'.$token->[2]->{'col'}}= + $parser->get_text('/template'); + } + } + } + &setfilename($safeeval,'default_'.&gettype($safeeval)); + } else { + &setfilename($safeeval,$fn); + unless ($spreadsheets{$fn}) { + $spreadsheets{$fn}=''; + my $reply=&Apache::lonnet::reply('dump:'. + $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}.':'. + $ENV{'course.'.$ENV{'request.course.id'}.'.num'}.':'.$fn, + $ENV{'course.'.$ENV{'request.course.id'}.'.home'}); + unless ($reply=~/^error\:/) { + $spreadsheets{$fn}=$reply; + } + } + map { + my ($name,$value)=split(/\=/,$_); + $f{&Apache::lonnet::unescape($name)}= + &Apache::lonnet::unescape($value); + } split(/\&/,$spreadsheets{$fn}); } - { - my $parser=HTML::TokeParser->new(\$spreadsheets{$fn}); - my $token; - while ($token=$parser->get_token) { - if ($token->[0] eq 'S') { - if ($token->[1] eq 'field') { - $f{$token->[2]->{'col'}.$token->[2]->{'row'}}= - $parser->get_text('/field'); - } - } - } - } + &setformulas($safeeval,%f); } +# ------------------------------------------------------------ Save spreadsheet + +sub writesheet { + my $safeeval=shift; + if (&Apache::lonnet::allowed('opa',$ENV{'request.course.id'})) { + my %f=&getformulas($safeeval); + my $sheetdata=''; + map { + $sheetdata.=&Apache::lonnet::escape($_).'='. + &Apache::lonnet::escape($f{$_}).'&'; + } keys %f; + $sheetdata=~s/\&$//; + my $reply=&Apache::lonnet::reply('put:'. + $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}.':'. + $ENV{'course.'.$ENV{'request.course.id'}.'.num'}.':'. + &getfilename($safeeval).':'. + $sheetdata, + $ENV{'course.'.$ENV{'request.course.id'}.'.home'}); + if ($reply eq 'ok') { + return &Apache::lonnet::reply('put:'. + $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}.':'. + $ENV{'course.'.$ENV{'request.course.id'}.'.num'}.':'. + &gettype($safeeval).'_spreadsheets:'. + &Apache::lonnet::escape(&getfilename($safeeval)).'='. + $ENV{'user.name'}, + $ENV{'course.'.$ENV{'request.course.id'}.'.home'}); + } else { + return $reply; + } + } + return 'unauthorized'; +} + # ----------------------------------------------- Make a temp copy of the sheet sub tmpwrite { my ($safeeval,$tmpdir,$symb)=@_; - my $fn=$uname.'_'.$udom.'_spreadsheet_'.&getfilename($safeeval); + my $fn=$uname.'_'.$udom.'_spreadsheet_'.$symb.'_'.&getfilename($safeeval); $fn=~s/\W/\_/g; $fn=$tmpdir.$fn.'.tmp'; my $fh; @@ -511,7 +703,7 @@ sub tmpwrite { sub tmpread { my ($safeeval,$tmpdir,$symb,$nfield,$nform)=@_; - my $fn=$uname.'_'.$udom.'_spreadsheet_'.&getfilename($safeeval); + my $fn=$uname.'_'.$udom.'_spreadsheet_'.$symb.'_'.&getfilename($safeeval); $fn=~s/\W/\_/g; $fn=$tmpdir.$fn.'.tmp'; my $fh; @@ -525,7 +717,7 @@ sub tmpread { $fo{$name}=$value; } } - $fo{$nfield}=$nform; + if ($nfield) { $fo{$nfield}=$nform; } &setformulas($safeeval,%fo); } @@ -632,7 +824,86 @@ sub parmval { } +# ---------------------------------------------- Update rows for course listing + +sub updatestudentrows { + my $safeeval=shift; + my $cid=$ENV{'request.course.id'}; + my $classlst=&Apache::lonnet::reply + ('dump:'.$ENV{'course.'.$cid.'.domain'}.':'. + $ENV{'course.'.$cid.'.num'}.':classlist', + $ENV{'course.'.$cid.'.home'}); + my %currentlist=(); + my $now=time; + unless ($classlst=~/^error\:/) { + map { + my ($name,$value)=split(/\=/,$_); + my ($end,$start)=split(/\:/,&Apache::lonnet::unescape($value)); + my $active=1; + if (($end) && ($now>$end)) { $active=0; } + if ($active) { + my $rowlabel=''; + $name=&Apache::lonnet::unescape($name); + my ($cname,$cdom)=split(/\:/,$name); + my $csec= + &Apache::lonnet::usection($cdom,$cname,$ENV{'request.course.id'}); + if ($csec==-1) { + $rowlabel='Data not available: '.$name. + ''; + } else { + my %reply=&Apache::lonnet::idrget($cdom,$cname); + my $reply=&Apache::lonnet::reply('get:'.$cdom.':'.$cname. + ':environment:firstname&middlename&lastname&generation', + &Apache::lonnet::homeserver($cname,$cdom)); + $rowlabel=$csec.' '.$reply{$cname}.'
'; + map { + $rowlabel.=&Apache::lonnet::unescape($_).' '; + } split(/\&/,$reply); + } + + $currentlist{&Apache::lonnet::unescape($name)}=$rowlabel; + } + } split(/\&/,$classlst); +# +# -------------------- Find discrepancies between the course row table and this +# + my %f=&getformulas($safeeval); + my $changed=0; + + my $maxrow=0; + my %existing=(); + +# ----------------------------------------------------------- Now obsolete rows + map { + if ($_=~/^A(\d+)/) { + $maxrow=($1>$maxrow)?$1:$maxrow; + $existing{$f{$_}}=1; + unless ((defined($currentlist{$f{$_}})) || (!$1)) { + $f{$_}='!!! Obsolete'; + $changed=1; + } + } + } keys %f; + +# -------------------------------------------------------- New and unknown keys + + map { + unless ($existing{$_}) { + $changed=1; + $maxrow++; + $f{'A'.$maxrow}=$_; + } + } sort keys %currentlist; + + if ($changed) { &setformulas($safeeval,%f); } + + &setmaxrow($safeeval,$maxrow); + &setrowlabels($safeeval,%currentlist); + } else { + return 'Could not access course data'; + } +} # ----------------------------------------------------------------- Update rows sub updaterows { @@ -704,7 +975,7 @@ sub updaterows { if ($_=~/^A(\d+)/) { $maxrow=($1>$maxrow)?$1:$maxrow; $existing{$f{$_}}=1; - unless (defined($current{$f{$_}})) { + unless ((defined($current{$f{$_}})) || (!$1)) { $f{$_}='!!! Obsolete'; $changed=1; } @@ -733,6 +1004,74 @@ sub updaterows { # ------------------------------------------------ Load data for one assessment +sub rowazstudent { + my $safeeval=shift; + my %c=(); + my %f=&getformulas($safeeval); + map { + if ($_=~/^A(\d+)/) { + my $row=$1; + unless ($f{$_}=~/^\!/) { + my @assessdata=split(/\_\_\_\;\_\_\_/, + &Apache::lonnet::ssi( + '/adm/assesscalc',('utarget' => 'export', + 'uname' => $uname, + 'udom' => $udom, + 'usymb' => $f{$_}))); + my $index=0; + map { + if ($assessdata[$index]) { + $c{$_.$row}=$assessdata[$index]; + unless ($_ eq 'A') { + $f{$_.$row}='import'; + } + } + $index++; + } ('A','B','C','D','E','F','G','H','I','J','K','L','M', + 'N','O','P','Q','R','S','T','U','V','W','X','Y','Z'); + } + } + } keys %f; + &setformulas($safeeval,%f); + &setconstants($safeeval,%c); +} + +# --------------------------------------------------- Load data for one student + +sub rowazclass { + my $safeeval=shift; + my %c=(); + my %f=&getformulas($safeeval); + map { + if ($_=~/^A(\d+)/) { + my $row=$1; + unless ($f{$_}=~/^\!/) { + my ($tname,$tdom)=split(/\:/,$_); + my @assessdata=split(/\_\_\_\;\_\_\_/, + &Apache::lonnet::ssi( + '/adm/studentcalc',('utarget' => 'export', + 'uname' => $tname, + 'udom' => $tdom))); + my $index=0; + map { + if ($assessdata[$index]) { + $c{$_.$row}=$assessdata[$index]; + unless ($_ eq 'A') { + $f{$_.$row}='import'; + } + } + $index++; + } ('A','B','C','D','E','F','G','H','I','J','K','L','M', + 'N','O','P','Q','R','S','T','U','V','W','X','Y','Z'); + } + } + } keys %f; + &setformulas($safeeval,%f); + &setconstants($safeeval,%c); +} + +# ------------------------------------------------ Load data for one assessment + sub rowaassess { my ($safeeval,$symb)=@_; my $uhome=&Apache::lonnet::homeserver($uname,$udom); @@ -741,7 +1080,9 @@ sub rowaassess { # ----------------------------------------------------------- Get stored values my $answer=&Apache::lonnet::reply( - "restore:$udom:$uname:$namespace:$symb",$uhome); + "restore:$udom:$uname:". + &Apache::lonnet::escape($namespace).":". + &Apache::lonnet::escape($symb),$uhome); my %returnhash=(); map { my ($name,$value)=split(/\=/,$_); @@ -762,13 +1103,15 @@ sub rowaassess { my $uhome=&Apache::lonnet::homeserver($uname,$udom); unless ($uhome eq 'no_host') { # -------------------------------------------------------------- Get coursedata - unless ($courserdatas{$ENV{'request.course.id'}}) { + unless + ((time-$courserdatas{$ENV{'request.course.id'}.'.last_cache'})<120) { my $reply=&Apache::lonnet::reply('dump:'. $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}.':'. $ENV{'course.'.$ENV{'request.course.id'}.'.num'}.':resourcedata', $ENV{'course.'.$ENV{'request.course.id'}.'.home'}); if ($reply!~/^error\:/) { $courserdatas{$ENV{'request.course.id'}}=$reply; + $courserdatas{$ENV{'request.course.id'}.'.last_cache'}=time; } } map { @@ -777,17 +1120,19 @@ sub rowaassess { &Apache::lonnet::unescape($value); } split(/\&/,$courserdatas{$ENV{'request.course.id'}}); # --------------------------------------------------- Get userdata (if present) - unless ($userrdatas{$uname.'___'.$udom}) { + unless + ((time-$userrdatas{$uname.'___'.$udom.'.last_cache'})<120) { my $reply= &Apache::lonnet::reply('dump:'.$udom.':'.$uname.':resourcedata',$uhome); if ($reply!~/^error\:/) { $userrdatas{$uname.'___'.$udom}=$reply; + $userrdatas{$uname.'___'.$udom.'.last_cache'}=time; } } map { my ($name,$value)=split(/\=/,$_); $useropt{&Apache::lonnet::unescape($name)}= - &Apache::lonnet::unescape($value); + &Apache::lonnet::unescape($value); } split(/\&/,$userrdatas{$uname.'___'.$udom}); } # -- now courseopt, useropt initialized for this user and course (used parmval) @@ -800,7 +1145,10 @@ sub rowaassess { if ($f{$_}=~/^parameter/) { $c{$_}=&parmval($f{$_},$symb); } else { - $c{$_}=$returnhash{$f{$_}}; + my $key=$f{$_}; + $key=~s/^stores\_/resource\./; + $key=~s/\_/\./; + $c{$_}=$returnhash{$key}; } } } @@ -833,8 +1181,6 @@ sub selectbox { return $selout.''; } -# ==================================== Sub handler to get export of assessments - # ================================================================ Main handler sub handler { @@ -856,11 +1202,13 @@ sub handler { ($ENV{'request.state'} eq 'construct')) { # --------------------------- Get query string for limited number of parameters + map { my ($name, $value) = split(/=/,$_); $value =~ tr/+/ /; $value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg; - if (($name eq 'uname') || ($name eq 'udom') || ($name eq 'usymb')) { + if (($name eq 'uname') || ($name eq 'udom') || + ($name eq 'usymb') || ($name eq 'ufn')) { unless ($ENV{'form.'.$name}) { $ENV{'form.'.$name}=$value; } @@ -868,7 +1216,6 @@ sub handler { } (split(/&/,$ENV{'QUERY_STRING'})); # ------------------------------------------- Nothing there? Must be login user - unless ($ENV{'form.uname'}) { $uname=$ENV{'user.name'}; $udom=$ENV{'user.domain'}; @@ -876,6 +1223,10 @@ sub handler { $uname=$ENV{'form.uname'}; $udom=$ENV{'form.udom'}; } +# ----------------------------------------------------------- Change of target? + + my $reroute=($ENV{'form.utarget'} eq 'export'); + # ------------------------------------------------------------------- Open page $r->content_type('text/html'); @@ -883,6 +1234,9 @@ sub handler { $r->header_out('Pragma','no-cache'); $r->send_http_header; +# --------------------------------------------------------------- Screen output + + unless ($reroute) { $r->print('LON-CAPA Spreadsheet'); $r->print(< @@ -899,27 +1253,59 @@ sub handler { ENDSCRIPT $r->print(''. + ''. + '

LON-CAPA Spreadsheet

'. '
'. &hiddenfield('uname',$ENV{'form.uname'}). &hiddenfield('udom',$ENV{'form.udom'}). &hiddenfield('usymb',$ENV{'form.usymb'}). &hiddenfield('unewfield',''). &hiddenfield('unewformula','')); + } + $r->rflush(); +# ---------------------------------------- Read new sheet or modified worksheet + my $sheetone=initsheet(); + $r->uri=~/\/(\w+)$/; + &settype($sheetone,$1); if ($ENV{'form.unewfield'}) { $r->print('

Modified Workcopy

'); $ENV{'form.unewformula'}=~s/\'/\"/g; - $r->print('New formula: '.$ENV{'form.unewfield'}.'='. - $ENV{'form.unewformula'}.'
'); + $r->print('

New formula: '.$ENV{'form.unewfield'}.'='. + $ENV{'form.unewformula'}.'

'); + &setfilename($sheetone,$ENV{'form.ufn'}); &tmpread($sheetone,$r->dir_config('lonDaemons').'/tmp/', $ENV{'form.usymb'}, $ENV{'form.unewfield'},$ENV{'form.unewformula'}); - &setfilename($sheetone,$r->filename); - $r->filename=~/\.(\w+)/; - &settype($sheetone,$1); + } elsif ($ENV{'form.saveas'}) { + &setfilename($sheetone,$ENV{'form.ufn'}); + &tmpread($sheetone,$r->dir_config('lonDaemons').'/tmp/', + $ENV{'form.usymb'}); } else { - &readsheet($sheetone,$r->filename); + unless ($ENV{'form.ufn'}) { + my $reply=&Apache::lonnet::reply('get:'. + $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}.':'. + $ENV{'course.'.$ENV{'request.course.id'}.'.num'}. + ':environment:spreadsheet_default_'. + &gettype($sheetone), + $ENV{'course.'.$ENV{'request.course.id'}.'.home'}); + unless (($reply=~/^error\:/) || ($reply eq '')) { + $ENV{'form.ufn'}=$reply; + unless ($reroute) { + $r->print('

Using customized default spreadsheet

'); + } + } + } + &readsheet($sheetone,$ENV{'form.ufn'},$r); + $ENV{'form.ufn'}=&getfilename($sheetone); } + + if (&gettype($sheetone) eq 'classcalc') { +# ---------------------------------- For course view: get courselist and update + &updatestudentrows($sheetone); + } else { +# ----------------- For assessment and student: See if all import rows uptodate + if (tie(%parmhash,'GDBM_File', $ENV{'request.course.fn'}.'_parms.db',&GDBM_READER,0640)) { $csec=&Apache::lonnet::usection($udom,$uname,$ENV{'request.course.id'}); @@ -933,22 +1319,82 @@ ENDSCRIPT $r->print('

'. 'Could not initialize import fields (not in a course)

'); } + } +# ---------------------------------------------------- See if something to save + if (&Apache::lonnet::allowed('opa',$ENV{'request.course.id'})) { + my $fname=''; + if ($ENV{'form.saveas'} && ($fname=$ENV{'form.newfn'})) { + $fname=~s/\W/\_/g; + if ($fname eq 'default') { $fname='course_default'; } + $fname.='_'.&gettype($sheetone); + &setfilename($sheetone,$fname); + $ENV{'form.ufn'}=$fname; + my $reply=&writesheet($sheetone); + unless ($reroute) { + $r->print('

Saving spreadsheet: '.$reply.'

'); + } + if ($ENV{'form.makedefufn'}) { + my $reply=&Apache::lonnet::reply('put:'. + $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}.':'. + $ENV{'course.'.$ENV{'request.course.id'}.'.num'}. + ':environment:spreadsheet_default_'. + &gettype($sheetone).'='. + &Apache::lonnet::escape($fname), + $ENV{'course.'.$ENV{'request.course.id'}.'.home'}); + unless ($reroute) { + $r->print('

Making default spreadsheet: '.$reply.'

'); + } + } + } + } +# ------------------------------------------------ Write the modified worksheet + &tmpwrite($sheetone,$r->dir_config('lonDaemons').'/tmp/', $ENV{'form.usymb'}); - $r->print("User '$uname' at domain '$udom' for '". - $ENV{'course.'.$ENV{'request.course.id'}.'.description'}."'"); + +# ----------------------------------------------------- Print user, course, etc + unless ($reroute) { + if (&Apache::lonnet::allowed('opa',$ENV{'request.course.id'})) { + my $fname=$ENV{'form.ufn'}; + $fname=~s/\_[^\_]+$//; + if ($fname eq 'default') { $fname='course_default'; } + $r->print(''. + ' (make default: )

'); + } + $r->print(&hiddenfield('ufn',$ENV{'form.ufn'})); + unless (&gettype($sheetone) eq 'classcalc') { + $r->print('
User: '.$uname.'
Domain: '.$udom); + } + $r->print('

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

'); if ($csec) { - $r->print(", group/section '$csec'"); + $r->print('

Group/Section: '.$csec.'

'); } - $r->print("\n"); + } +# -------------------------------------------------------- Import and calculate + if (&gettype($sheetone) eq 'assesscalc') { &rowaassess($sheetone,$ENV{'form.usymb'}); + } elsif (&gettype($sheetone) eq 'studentcalc') { + &rowazstudent($sheetone); + } else { + &rowazclass($sheetone); + } + my $calcoutput=&calcsheet($sheetone); + unless ($reroute) { + $r->print('

'.$calcoutput.'

'); } - &calcsheet($sheetone); - $r->print(&outsheet($sheetone)); - $r->print('
'); +# ------------------------------------------------------- Print or export sheet + unless ($reroute) { + &outsheet($r,$sheetone); + $r->print(''); + } else { + $r->print(&exportrow($sheetone)); + } +# ------------------------------------------------------------------------ Done } else { # ----------------------------- Not in a course, or not allowed to modify parms $ENV{'user.error.msg'}=