--- loncom/interface/Attic/lonspreadsheet.pm 2000/12/30 21:33:11 1.22 +++ loncom/interface/Attic/lonspreadsheet.pm 2001/01/02 12:12:43 1.27 @@ -2,7 +2,8 @@ # Spreadsheet/Grades Display Handler # # 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 Gerd Kortemeyer +# 12/08,12/09,12/11,12/12,12/15,12/16,12/18,12/19,12/30, +# 01/01/01,02/01 Gerd Kortemeyer package Apache::lonspreadsheet; @@ -17,9 +18,10 @@ use HTML::TokeParser; # # These cache hashes need to be independent of user, resource and course -# (user and course are in the keys) +# (user and course can/should be in the keys) # -use vars qw(%spreadsheets %courserdatas %userrdatas); +use vars qw(%spreadsheets %courserdatas %userrdatas %defaultsheets); + # # These global hashes are dependent on user, course and resource, # and need to be initialized every time when a sheet is calculated @@ -27,9 +29,6 @@ use vars qw(%spreadsheets %courserdatas my %courseopt; my %useropt; my %parmhash; -my $csec; -my $uname; -my $udom; # ============================================================================= # ===================================== Implements an instance of a spreadsheet @@ -60,8 +59,27 @@ sub initsheet { $maxrow=0; $sheettype=''; + +# filename/reference of the sheet + $filename=''; +# user data +$uname=''; +$uhome=''; +$udom=''; + +# course data + +$csec=''; +$chome=''; +$cnum=''; +$cdom=''; + +# symb + +$usymb=''; + sub mask { my ($lower,$upper)=@_; @@ -451,6 +469,7 @@ sub gettype { my $safeeval=shift; return $safeeval->reval('$sheettype'); } + # ------------------------------------------------------------------ Set maxrow sub setmaxrow { @@ -479,6 +498,62 @@ sub getfilename { return $safeeval->reval('$filename'); } +# ----------------------------------------------------------- Get course number + +sub getcnum { + my $safeeval=shift; + return $safeeval->reval('$cnum'); +} + +# ------------------------------------------------------------- Get course home + +sub getchome { + my $safeeval=shift; + return $safeeval->reval('$chome'); +} + +# ----------------------------------------------------------- Get course domain + +sub getcdom { + my $safeeval=shift; + return $safeeval->reval('$cdom'); +} + +# ---------------------------------------------------------- Get course section + +sub getcsec { + my $safeeval=shift; + return $safeeval->reval('$csec'); +} + +# --------------------------------------------------------------- Get user name + +sub getuname { + my $safeeval=shift; + return $safeeval->reval('$uname'); +} + +# ------------------------------------------------------------- Get user domain + +sub getudom { + my $safeeval=shift; + return $safeeval->reval('$udom'); +} + +# --------------------------------------------------------------- Get user home + +sub getuhome { + my $safeeval=shift; + return $safeeval->reval('$uhome'); +} + +# -------------------------------------------------------------------- Get symb + +sub getusymb { + my $safeeval=shift; + return $safeeval->reval('$usymb'); +} + # ------------------------------------------------------------- Export of A-row sub exportrow { @@ -489,18 +564,38 @@ sub exportrow { # ========================================================== End of Spreadsheet # ============================================================================= - +# +# Procedures for screen output +# # --------------------------------------------- Produce output row n from sheet sub rown { my ($safeeval,$n)=@_; my $defaultbg; + my $rowdata=''; unless ($n eq '-') { $defaultbg=((($n-1)/5)==int(($n-1)/5))?'#E0E0':'#FFFF'; } else { $defaultbg='#E0FF'; } - my $rowdata="\n$n"; + 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; @@ -536,7 +631,7 @@ sub rown { # ------------------------------------------------------------- Print out sheet sub outsheet { - my $safeeval=shift; + my ($r,$safeeval)=@_; my $maxred; my $realm; if (&gettype($safeeval) eq 'assesscalc') { @@ -550,7 +645,8 @@ sub outsheet { $realm='Course'; } my $maxyellow=52-$maxred; - my $tabledata='
 '.$what.''.$_.'
$n
'. + my $tabledata= + ''. ''. @@ -573,20 +669,53 @@ sub outsheet { 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.'Import
'; + $r->print('
'); } +# +# -------------------------------------- Read spreadsheet formulas for a course +# +sub readsheet { + my ($safeeval,$fn)=@_; + my $stype=&gettype($safeeval); + my $cnum=&getcnum($safeeval); + +# --------- There is no filename. Look for defaults in course and global, cache + + unless($fn) { + unless ($fn=$defaultsheets{$cnum.'_'.$stype}) { + $fn=&Apache::lonnet::reply('get:'. + $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}.':'. + $ENV{'course.'.$ENV{'request.course.id'}.'.num'}. + ':environment:spreadsheet_default_'.&gettype($safeeval), + $ENV{'course.'.$ENV{'request.course.id'}.'.home'}); + unless (($fn) && ($fn!~/^error\:/)) { + $fn='default_'.$stype; + } + $defaultsheets{$cnum.'_'.$stype}=$fn; + } + } -# ------------------------------------- Read spreadsheet formulas from a course +# ---------------------------------------------------------- fn now has a value -sub readsheet { - my ($safeeval,$fn,$r)=@_; - my %f=(); - if (($fn eq '') || ($fn=~/^default\_/)) { + &setfilename($safeeval,$fn); + +# ------------------------------------------------------ see if sheet is cached + my $fstring=''; + if ($fstring=$spreadsheets{$cnum.'_'.$stype.'_'.$fn}) { + &setformulas($sheetone,split(/\_\_\_\;\_\_\_/,$fstring)); + } else { + +# ---------------------------------------------------- Not cached, need to read + + my %f=(); + + if ($fn=~/^default\_/) { my $sheetxml=''; { my $fh; @@ -595,9 +724,9 @@ sub readsheet { $sheetxml=join('',<$fh>); } } - my $parser=HTML::TokeParser->new(\$sheetxml); - my $token; - while ($token=$parser->get_token) { + 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'}}= @@ -608,28 +737,26 @@ sub readsheet { $parser->get_text('/template'); } } - } - &setfilename($safeeval,'default_'.&gettype($safeeval)); - } else { - &setfilename($safeeval,$fn); - unless ($spreadsheets{$fn}) { - $spreadsheets{$fn}=''; - my $reply=&Apache::lonnet::reply('dump:'. + } + } else { + my $sheet=''; + 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; - } + $sheet=$reply; + } + map { + my ($name,$value)=split(/\=/,$_); + $f{&Apache::lonnet::unescape($name)}= + &Apache::lonnet::unescape($value); + } split(/\&/,$sheet); } - map { - my ($name,$value)=split(/\=/,$_); - $f{&Apache::lonnet::unescape($name)}= - &Apache::lonnet::unescape($value); - } split(/\&/,$spreadsheets{$fn}); +# --------------------------------------------------------------- Cache and set + $spreadsheets{$cnum.'_'.$stype.'_'.$fn}=join('___;___',%f); + &setformulas($safeeval,%f); } - - &setformulas($safeeval,%f); } # ------------------------------------------------------------ Save spreadsheet @@ -803,7 +930,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 { @@ -902,7 +1108,7 @@ sub updaterows { } } -# --------------------------------------------------- Load data for one student +# ------------------------------------------------ Load data for one assessment sub rowazstudent { my $safeeval=shift; @@ -914,7 +1120,7 @@ sub rowazstudent { unless ($f{$_}=~/^\!/) { my @assessdata=split(/\_\_\_\;\_\_\_/, &Apache::lonnet::ssi( - '/res/msu/korte/junk.assesscalc',('utarget' => 'export', + '/adm/assesscalc',('utarget' => 'export', 'uname' => $uname, 'udom' => $udom, 'usymb' => $f{$_}))); @@ -936,6 +1142,40 @@ sub rowazstudent { &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 { @@ -1128,7 +1368,7 @@ ENDSCRIPT &hiddenfield('unewfield',''). &hiddenfield('unewformula','')); } - + $r->rflush(); # ---------------------------------------- Read new sheet or modified worksheet my $sheetone=initsheet(); @@ -1148,11 +1388,14 @@ ENDSCRIPT &tmpread($sheetone,$r->dir_config('lonDaemons').'/tmp/', $ENV{'form.usymb'}); } else { - &readsheet($sheetone,$ENV{'form.ufn'},$r); - $ENV{'form.ufn'}=&getfilename($sheetone); + unless ($ENV{'form.ufn'}) { } -# --------------------------------------------- See if all import rows uptodate + 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)) { @@ -1167,6 +1410,7 @@ 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=''; @@ -1180,6 +1424,18 @@ ENDSCRIPT 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 @@ -1194,15 +1450,18 @@ ENDSCRIPT $fname=~s/\_[^\_]+$//; if ($fname eq 'default') { $fname='course_default'; } $r->print(''. - '

'); + ' (make default: )

'); } - $r->print(&hiddenfield('ufn',$ENV{'form.ufn'}). - "User '$uname' at domain '$udom' for '". - $ENV{'course.'.$ENV{'request.course.id'}.'.description'}."'"); + $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 @@ -1210,6 +1469,8 @@ ENDSCRIPT &rowaassess($sheetone,$ENV{'form.usymb'}); } elsif (&gettype($sheetone) eq 'studentcalc') { &rowazstudent($sheetone); + } else { + &rowazclass($sheetone); } my $calcoutput=&calcsheet($sheetone); unless ($reroute) { @@ -1218,7 +1479,7 @@ ENDSCRIPT # ------------------------------------------------------- Print or export sheet unless ($reroute) { - $r->print(&outsheet($sheetone)); + &outsheet($r,$sheetone); $r->print(''); } else {