--- loncom/interface/Attic/lonspreadsheet.pm 2002/08/30 20:56:08 1.105 +++ loncom/interface/Attic/lonspreadsheet.pm 2002/09/27 20:40:19 1.112 @@ -1,5 +1,5 @@ # -# $Id: lonspreadsheet.pm,v 1.105 2002/08/30 20:56:08 matthew Exp $ +# $Id: lonspreadsheet.pm,v 1.112 2002/09/27 20:40:19 matthew Exp $ # # Copyright Michigan State University Board of Trustees # @@ -26,16 +26,6 @@ # 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,12/12,12/15,12/16,12/18,12/19,12/30, -# 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,9/11,9/12,9/13,9/14,9/17, -# 10/16,10/17,10/20,11/05,11/28,12/27 Gerd Kortemeyer -# 01/14/02 Matthew -# 02/04/02 Matthew - # POD required stuff: =head1 NAME @@ -54,7 +44,6 @@ not the grades of their peers. The spre offering the ability to use Perl code to manipulate data, as well as many built-in functions. - =head2 Functions available to user of lonspreadsheet =over 4 @@ -167,7 +156,7 @@ $chome= ''; $cnum = ''; $cdom = ''; $cid = ''; -$cfn = ''; +$coursefilename = ''; # symb @@ -863,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{$_}=~/^\!/) { @@ -1111,9 +1100,9 @@ sub getcid { # --------------------------------------------------------- Get course filename -sub getcfn { +sub getcoursefilename { my $safeeval=shift; - return $safeeval->reval('$cfn'); + return $safeeval->reval('$coursefilename'); } # ----------------------------------------------------------- Get course number @@ -1194,14 +1183,14 @@ sub rown { my $rowdata=''; my $dataflag=0; unless ($n eq '-') { - $defaultbg=((($n-1)/5)==int(($n-1)/5))?'#E0E0':'#FFFF'; + $defaultbg=((($n-1)/5)==int(($n-1)/5))?'#E0E0':'#FFFF'; } else { - $defaultbg='#E0FF'; + $defaultbg='#E0FF'; } unless ($ENV{'form.showcsv'}) { - $rowdata.="\n$n"; + $rowdata.="\n$n"; } else { - $rowdata.="\n".'"'.$n.'"'; + $rowdata.="\n".'"'.$n.'"'; } my $showf=0; my $proc; @@ -1225,97 +1214,108 @@ sub rown { $dataflag=1; } foreach ($safeeval->reval($proc.'('.$n.')')) { - my $bgcolor=$defaultbg.((($showf-1)/5==int(($showf-1)/5))?'99':'DD'); - my ($fm,$vl)=split(/\_\_\_eq\_\_\_/,$_); - if ((($vl ne '') || ($vl eq '0')) && - (($showf==1) || ($sheettype ne 'studentcalc'))) { $dataflag=1; } - if ($showf==0) { $vl=$_; } - unless ($ENV{'form.showcsv'}) { - if ($showf<=$maxred) { $bgcolor='#FFDDDD'; } - if (($n==0) && ($showf<=26)) { $bgcolor='#CCCCFF'; } - if (($showf>$maxred) || ((!$n) && ($showf>0))) { - if ($vl eq '') { - $vl='#'; - } - $rowdata.= - ''.$vl. - ''; - } else { - $rowdata.=' '.$vl.' '; - } - } else { - $rowdata.=',"'.$vl.'"'; - } - $showf++; + my $bgcolor=$defaultbg.((($showf-1)/5==int(($showf-1)/5))?'99':'DD'); + my ($fm,$vl)=split(/\_\_\_eq\_\_\_/,$_); + if ((($vl ne '') || ($vl eq '0')) && + (($showf==1) || ($sheettype ne 'studentcalc'))) { $dataflag=1; } + if ($showf==0) { $vl=$_; } + unless ($ENV{'form.showcsv'}) { + if ($showf<=$maxred) { $bgcolor='#FFDDDD'; } + if (($n==0) && ($showf<=26)) { $bgcolor='#CCCCFF'; } + if (($showf>$maxred) || ((!$n) && ($showf>0))) { + if ($vl eq '') { + $vl='#'; + } + $rowdata.=''; + if ($ENV{'request.role'} =~ /^st\./) { + $rowdata.=$vl; + } else { + $rowdata.=''. + $vl.''; + } + $rowdata.=''; + } else { + $rowdata.=' '.$vl.' '; + } + } else { + $rowdata.=',"'.$vl.'"'; + } + $showf++; } # End of foreach($safeval...) if ($ENV{'form.showall'} || ($dataflag)) { - return $rowdata.($ENV{'form.showcsv'}?'':''); + return $rowdata.($ENV{'form.showcsv'}?'':''); } else { - return ''; + return ''; } } # ------------------------------------------------------------- Print out sheet sub outsheet { - my ($r,$safeeval)=@_; - my $maxred; - my $realm; - if (&gettype($safeeval) eq 'assesscalc') { + my ($r,$safeeval,$sheetdata)=@_; + my $maxred = 26; # The maximum number of cells to show as + # red (uneditable) + # To make student sheets uneditable could we + # set $maxred = 52? + # + my $realm='Course'; # 'assessment', 'user', or 'course' sheet + if ($sheetdata->{'sheettype'} eq 'assesscalc') { $maxred=1; $realm='Assessment'; - } elsif (&gettype($safeeval) eq 'studentcalc') { + } elsif ($sheetdata->{'sheettype'} eq 'studentcalc') { $maxred=26; $realm='User'; - } else { - $maxred=26; - $realm='Course'; } - my $maxyellow=52-$maxred; + # + # Column label my $tabledata; - unless ($ENV{'form.showcsv'}) { - $tabledata= - ''. + if ($ENV{'form.showcsv'}) { + $tabledata='
';
+    } else { 
+        $tabledata='
'. - $realm.'
'. ''. - ''; - my $showf=0; - foreach ('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') { - $showf++; - if ($showf<=$maxred) { - $tabledata.='"; - } - $tabledata.=''.&rown($safeeval,'-').&rown($safeeval,0); - } else { $tabledata='
'; }
-
+        my $showf=0;
+        foreach ('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') {
+            $showf++;
+            if ($showf<=$maxred) { 
+                $tabledata.='
"; + } + $tabledata.=''.&rown($safeeval,'-').&rown($safeeval,0); + } $r->print($tabledata); - + # + # Prepare to output rows my $row; my $maxrow=&getmaxrow($safeeval); - + # my @sortby=(); my @sortidx=(); for ($row=1;$row<=$maxrow;$row++) { - $sortby[$row-1]=$safeeval->reval('$f{"A'.$row.'"}'); - $sortidx[$row-1]=$row-1; + push (@sortby, $safeeval->reval('$f{"A'.$row.'"}')); + push (@sortidx, $row-1); } - @sortidx=sort { $sortby[$a] cmp $sortby[$b]; } @sortidx; - my $what='Student'; - if (&gettype($safeeval) eq 'assesscalc') { - $what='Item'; - } elsif (&gettype($safeeval) eq 'studentcalc') { - $what='Assessment'; - } - + @sortidx=sort { lc($sortby[$a]) cmp lc($sortby[$b]); } @sortidx; + # + # Determine the type of child spreadsheets + my $what='Student'; + if ($sheetdata->{'sheettype'} eq 'assesscalc') { + $what='Item'; + } elsif ($sheetdata->{'sheettype'} eq 'studentcalc') { + $what='Assessment'; + } + # + # Loop through the rows and output them one at a time my $n=0; for ($row=0;$row<$maxrow;$row++) { my $thisrow=&rown($safeeval,$sortidx[$row]+1); @@ -1324,9 +1324,10 @@ sub outsheet { $r->print("
'. + ''.$realm.'ImportCalculations
'; - } else { - $tabledata.=''; - } - $tabledata.="$_
'; + } else { + $tabledata.=''; + } + $tabledata.="$_
\n
\n"); $r->rflush(); $r->print(''); - $r->print('\n"); } $n++; @@ -1387,14 +1388,14 @@ sub parse_sheet { # # -------------------------------------- Read spreadsheet formulas for a course # - sub readsheet { - my ($safeeval,$fn)=@_; - my $stype = &gettype($safeeval); - my $cnum = &getcnum($safeeval); - my $cdom = &getcdom($safeeval); - my $chome = &getchome($safeeval); - + my ($safeeval,$sheetdata,$fn)=@_; + # + my $stype = $sheetdata->{'sheettype'}; + my $cnum = $sheetdata->{'cnum'}; + my $cdom = $sheetdata->{'cdom'}; + my $chome = $sheetdata->{'chome'}; + # if (! defined($fn)) { # There is no filename. Look for defaults in course and global, cache unless ($fn=$defaultsheets{$cnum.'_'.$cdom.'_'.$stype}) { @@ -1458,7 +1459,6 @@ sub readsheet { } # -------------------------------------------------------- Make new spreadsheet - sub makenewsheet { my ($uname,$udom,$stype,$usymb)=@_; my %sheetdata=(); @@ -1469,7 +1469,7 @@ sub makenewsheet { $sheetdata{'cid'} = $ENV{'request.course.id'}; $sheetdata{'csec'} = &Apache::lonnet::usection ($udom,$uname,$ENV{'request.course.id'}); - $sheetdata{'cfn'} = $ENV{'request.course.fn'}; + $sheetdata{'coursefilename'} = $ENV{'request.course.fn'}; $sheetdata{'cnum'} = $ENV{'course.'.$ENV{'request.course.id'}.'.num'}; $sheetdata{'cdom'} = $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}; $sheetdata{'chome'} = $ENV{'course.'.$ENV{'request.course.id'}.'.home'}; @@ -1485,7 +1485,6 @@ sub makenewsheet { } # ------------------------------------------------------------ Save spreadsheet - sub writesheet { my ($safeeval,$makedef)=@_; my $cid=&getcid($safeeval); @@ -1537,7 +1536,6 @@ sub writesheet { # ----------------------------------------------- Make a temp copy of the sheet # "Modified workcopy" - interactive only # - sub tmpwrite { my $safeeval=shift; my $fn=$ENV{'user.name'}.'_'. @@ -1552,7 +1550,6 @@ sub tmpwrite { } # ---------------------------------------------------------- Read the temp copy - sub tmpread { my ($safeeval,$nfield,$nform)=@_; my $fn=$ENV{'user.name'}.'_'. @@ -1673,11 +1670,11 @@ sub parmval { # ---------------------------------------------- Update rows for course listing sub updateclasssheet { - my $safeeval=shift; - my $cnum=&getcnum($safeeval); - my $cdom=&getcdom($safeeval); - my $cid=&getcid($safeeval); - my $chome=&getchome($safeeval); + my ($safeeval,$sheetdata) = @_; + my $cnum =$sheetdata->{'cnum'}; + my $cdom =$sheetdata->{'cdom'}; + my $cid =$sheetdata->{'cid'}; + my $chome =$sheetdata->{'chome'}; # # Read class list and row labels my %classlist; @@ -1702,15 +1699,15 @@ sub updateclasssheet { my ($studentName,$studentDomain)=split(/\:/,$student); my $studentSection=&Apache::lonnet::usection($studentDomain, $studentName,$cid); - if ($studentSection==-1) { - unless ($ENV{'form.showcsv'}) { - $rowlabel='Data not available: '. - $studentName.''; - } else { - $rowlabel='ERROR","'.$studentName. - '","Data not available","","","'; - } - } else { +# if ($studentSection==-1) { +# unless ($ENV{'form.showcsv'}) { +# $rowlabel='Data not available: '. +# $studentName.''; +# } else { +# $rowlabel='ERROR","'.$studentName. +# '","Data not available","","","'; +# } +# } else { my %reply=&Apache::lonnet::idrget($studentDomain,$studentName); my %studentInformation=&Apache::lonnet::get ('environment', @@ -1735,7 +1732,7 @@ sub updateclasssheet { $studentInformation{'generation'}) ).'"'; } - } + # } $currentlist{$student}=$rowlabel; } # end of if ($active) } # end of foreach my $student (keys(%classlist)) @@ -1777,13 +1774,17 @@ sub updateclasssheet { # ----------------------------------- Update rows for student and assess sheets sub updatestudentassesssheet { - my $safeeval=shift; + my ($safeeval,$sheetdata) = @_; my %bighash; - my $stype=&gettype($safeeval); + my $stype=$sheetdata->{'sheettype'}; + my $uname=$sheetdata->{'uname'}; + my $udom =$sheetdata->{'udom'}; my %current=(); - if ($updatedata{$ENV{'request.course.fn'}.'_'.$stype}) { + if ($updatedata + {$ENV{'request.course.fn'}.'_'.$stype.'_'.$uname.'_'.$udom}) { %current=split(/\_\_\_\;\_\_\_/, - $updatedata{$ENV{'request.course.fn'}.'_'.$stype}); + $updatedata{$ENV{'request.course.fn'}. + '_'.$stype.'_'.$uname.'_'.$udom}); } else { # Tie hash tie(%bighash,'GDBM_File',$ENV{'request.course.fn'}.'.db', @@ -1801,10 +1802,8 @@ sub updatestudentassesssheet { 'totalpoints' => 'Total Points Granted
totalpoints'); my $adduserstr=''; - if ((&getuname($safeeval) ne $ENV{'user.name'}) || - (&getudom($safeeval) ne $ENV{'user.domain'})) { - $adduserstr='&uname='.&getuname($safeeval). - '&udom='.&getudom($safeeval); + if (($uname ne $ENV{'user.name'}) || ($udom ne $ENV{'user.domain'})){ + $adduserstr='&uname='.$uname.'&udom='.$udom; } my %allassess = ('_feedback' =>'Discussion' ); - foreach (keys(%bighash)) { + while (($_,undef) = each(%bighash)) { next if ($_!~/^src\_(\d+)\.(\d+)$/); my $mapid=$1; my $resid=$2; @@ -1855,7 +1854,7 @@ sub updatestudentassesssheet { } elsif ($stype eq 'studentcalc') { %current=%allassess; } - $updatedata{$ENV{'request.course.fn'}.'_'.$stype}= + $updatedata{$ENV{'request.course.fn'}.'_'.$stype.'_'.$uname.'_'.$udom}= join('___;___',%current); # Get current from cache } @@ -1947,7 +1946,7 @@ sub loadstudent { } # --------------------------------------------------- Load data for one student - +# sub loadcourse { my ($safeeval,$sheetdata,$r)=@_; my %c=(); @@ -2009,7 +2008,7 @@ ENDPOP } # ------------------------------------------------ Load data for one assessment - +# sub loadassessment { my ($safeeval,$sheetdata)=@_; @@ -2041,26 +2040,20 @@ sub loadassessment { # # restore individual # - my $answer=&Apache::lonnet::reply( - "restore:$udom:$uname:". - &Apache::lonnet::escape($namespace).":". - &Apache::lonnet::escape($symb),$uhome); - foreach (split(/\&/,$answer)) { - my ($name,$value)=split(/\=/,$_); - $returnhash{&Apache::lonnet::unescape($name)}= - &Apache::lonnet::unescape($value); - } - my $version; - for ($version=1;$version<=$returnhash{'version'};$version++) { + %returnhash = &Apache::lonnet::restore($symb,$namespace,$udom,$uname); + for (my $version=1;$version<=$returnhash{'version'};$version++) { foreach (split(/\:/,$returnhash{$version.':keys'})) { $returnhash{$_}=$returnhash{$version.':'.$_}; } } } + # # returnhash now has all stores for this resource # convert all "_" to "." to be able to use libraries, multiparts, etc + # + # This is dumb. It is also necessary :( my @oldkeys=keys %returnhash; - + # foreach (@oldkeys) { my $name=$_; my $value=$returnhash{$_}; @@ -2090,15 +2083,14 @@ sub loadassessment { &Apache::lonnet::unescape($value); } # Get userdata (if present) - unless - ((time-$userrdatas{$uname.'___'.$udom.'.last_cache'})<240) { - my $reply= - &Apache::lonnet::reply('dump:'.$udom.':'.$uname.':resourcedata',$uhome); - if ($reply!~/^error\:/) { - $userrdatas{$uname.'___'.$udom}=$reply; - $userrdatas{$uname.'___'.$udom.'.last_cache'}=time; - } + unless ((time-$userrdatas{$uname.'___'.$udom.'.last_cache'})<240) { + my $reply= + &Apache::lonnet::reply('dump:'.$udom.':'.$uname.':resourcedata',$uhome); + if ($reply!~/^error\:/) { + $userrdatas{$uname.'___'.$udom}=$reply; + $userrdatas{$uname.'___'.$udom.'.last_cache'}=time; } + } foreach (split(/\&/,$userrdatas{$uname.'___'.$udom})) { my ($name,$value)=split(/\=/,$_); $useropt{$userprefix.&Apache::lonnet::unescape($name)}= @@ -2120,7 +2112,7 @@ sub loadassessment { # my %c=(); if (tie(%parmhash,'GDBM_File', - &getcfn($safeeval).'_parms.db',&GDBM_READER(),0640)) { + &getcoursefilename($safeeval).'_parms.db',&GDBM_READER(),0640)) { my %f=&getformulas($safeeval); foreach (keys(%f)) { next if ($_!~/^A/); @@ -2178,9 +2170,9 @@ sub updatesheet { my ($safeeval,$sheetdata)=@_; my $stype=$sheetdata->{'sheettype'}; if ($stype eq 'classcalc') { - return &updateclasssheet($safeeval); + return &updateclasssheet($safeeval,$sheetdata); } else { - return &updatestudentassesssheet($safeeval); + return &updatestudentassesssheet($safeeval,$sheetdata); } } @@ -2286,7 +2278,7 @@ sub exportsheet { # Not cached # my ($thissheet,$sheetdata)=&makenewsheet($uname,$udom,$stype,$usymb); - &readsheet($thissheet,$fn); + &readsheet($thissheet,$sheetdata,$fn); &updatesheet($thissheet,$sheetdata); &loadrows($thissheet,$sheetdata); &calcsheet($thissheet,$sheetdata); @@ -2426,48 +2418,64 @@ 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; return OK; } # Global directory configs - $includedir=$r->dir_config('lonIncludes'); - $tmpdir=$r->dir_config('lonDaemons').'/tmp/'; + $includedir = $r->dir_config('lonIncludes'); + $tmpdir = $r->dir_config('lonDaemons').'/tmp/'; # Needs to be in a course - if ($ENV{'request.course.fn'}) { - # Get query string for limited number of parameters - &Apache::loncommon::get_unprocessed_cgi - ($ENV{'QUERY_STRING'},['uname','udom','usymb','ufn']); - if (($ENV{'form.usymb'}=~/^\_(\w+)/) && (!$ENV{'form.ufn'})) { - $ENV{'form.ufn'}='default_'.$1; - } - # Interactive loading of specific sheet? - if (($ENV{'form.load'}) && ($ENV{'form.loadthissheet'} ne 'Default')) { - $ENV{'form.ufn'}=$ENV{'form.loadthissheet'}; - } - # Nothing there? Must be login user - my $aname; - my $adom; - - unless ($ENV{'form.uname'}) { - $aname=$ENV{'user.name'}; - $adom=$ENV{'user.domain'}; - } else { - $aname=$ENV{'form.uname'}; - $adom=$ENV{'form.udom'}; - } - # Open page - $r->content_type('text/html'); - $r->header_out('Cache-control','no-cache'); - $r->header_out('Pragma','no-cache'); - $r->send_http_header; - # Screen output - $r->print('LON-CAPA Spreadsheet'); + if (! $ENV{'request.course.fn'}) { + # Not in a course, or not allowed to modify parms + $ENV{'user.error.msg'}= + $r->uri.":opa:0:0:Cannot modify spreadsheet"; + return HTTP_NOT_ACCEPTABLE; + } + # 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; + } + # Interactive loading of specific sheet? + if (($ENV{'form.load'}) && ($ENV{'form.loadthissheet'} ne 'Default')) { + $ENV{'form.ufn'}=$ENV{'form.loadthissheet'}; + } + # + # Determine the user name and domain for the sheet. + my $aname; + my $adom; + unless ($ENV{'form.uname'}) { + $aname=$ENV{'user.name'}; + $adom=$ENV{'user.domain'}; + } else { + $aname=$ENV{'form.uname'}; + $adom=$ENV{'form.udom'}; + } + # + # Open page + $r->content_type('text/html'); + $r->header_out('Cache-control','no-cache'); + $r->header_out('Pragma','no-cache'); + $r->send_http_header; + # Screen output + $r->print('LON-CAPA Spreadsheet'); + if ($ENV{'request.role'} !~ /^st\./) { $r->print(< @@ -2494,219 +2502,203 @@ sub handler { ENDSCRIPT - $r->print(''.&Apache::loncommon::bodytag('Grades Spreadsheet'). - '
'. - &hiddenfield('uname',$ENV{'form.uname'}). - &hiddenfield('udom',$ENV{'form.udom'}). - &hiddenfield('usymb',$ENV{'form.usymb'}). - &hiddenfield('unewfield',''). - &hiddenfield('unewformula','')); - # Send this out right away - $r->rflush(); - # Full recalc? - if ($ENV{'form.forcerecalc'}) { - $r->print('

Completely Recalculating Sheet ...

'); - undef %spreadsheets; - undef %courserdatas; - undef %userrdatas; - undef %defaultsheets; - undef %updatedata; - } - # Read new sheet or modified worksheet - $r->uri=~/\/(\w+)$/; - my ($asheet,$asheetdata)=&makenewsheet - ($aname,$adom,$1,$ENV{'form.usymb'}); - # If a new formula had been entered, go from work copy - if ($ENV{'form.unewfield'}) { - $r->print('

Modified Workcopy

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

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

'); - &setfilename($asheet,$ENV{'form.ufn'}); - &tmpread($asheet, - $ENV{'form.unewfield'},$ENV{'form.unewformula'}); - - } elsif ($ENV{'form.saveas'}) { - &setfilename($asheet,$ENV{'form.ufn'}); - &tmpread($asheet); - } else { - &readsheet($asheet,$ENV{'form.ufn'}); - } - # Print out user information - unless ($asheetdata->{'sheettype'} eq 'classcalc') { - $r->print('

User: '.$asheetdata->{'uname'}. - '
Domain: '.$asheetdata->{'udom'}); - if (&getcsec($asheet) eq '-1') { - $r->print('

'. - 'Not a student in this course

'); - } else { - $r->print('
Section/Group: '.$asheetdata->{'csec'}); + } + $r->print(''.&Apache::loncommon::bodytag('Grades Spreadsheet'). + ''); + $r->print(&hiddenfield('uname',$ENV{'form.uname'}). + &hiddenfield('udom',$ENV{'form.udom'}). + &hiddenfield('usymb',$ENV{'form.usymb'}). + &hiddenfield('unewfield',''). + &hiddenfield('unewformula','')); + $r->rflush(); + # + # Full recalc? + if ($ENV{'form.forcerecalc'}) { + $r->print('

Completely Recalculating Sheet ...

'); + undef %spreadsheets; + undef %courserdatas; + undef %userrdatas; + undef %defaultsheets; + undef %updatedata; + } + # Read new sheet or modified worksheet + $r->uri=~/\/(\w+)$/; + my ($asheet,$asheetdata)=&makenewsheet($aname,$adom,$1,$ENV{'form.usymb'}); + # + # If a new formula had been entered, go from work copy + if ($ENV{'form.unewfield'}) { + $r->print('

Modified Workcopy

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

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

'); + &setfilename($asheet,$ENV{'form.ufn'}); + &tmpread($asheet,$ENV{'form.unewfield'},$ENV{'form.unewformula'}); + } elsif ($ENV{'form.saveas'}) { + &setfilename($asheet,$ENV{'form.ufn'}); + &tmpread($asheet); + } else { + &readsheet($asheet,$asheetdata,$ENV{'form.ufn'}); + } + # Print out user information + unless ($asheetdata->{'sheettype'} eq 'classcalc') { + $r->print('

User: '.$asheetdata->{'uname'}. + '
Domain: '.$asheetdata->{'udom'}); +# if (&getcsec($asheet) eq '-1') { +# $r->print('

'. +# 'Not a student in this course

'); +# } else { + $r->print('
Section/Group: '.$asheetdata->{'csec'}); +# } + if ($ENV{'form.usymb'}) { + $r->print('
Assessment: '. + $ENV{'form.usymb'}.''); + } + } + # + # Check user permissions + if (($asheetdata->{'sheettype'} eq 'classcalc' ) || + ($asheetdata->{'uname'} ne $ENV{'user.name'} ) || + ($asheetdata->{'udom'} ne $ENV{'user.domain'})) { + unless (&Apache::lonnet::allowed('vgr',$asheetdata->{'cid'})) { + $r->print('

Access Permission Denied

'. + ''); + return OK; + } + } + # Additional options + $r->print('
'. + '

'); + if ($asheetdata->{'sheettype'} eq 'assesscalc') { + $r->print('

'. + ''. + 'Level up: Student Sheet

'); + } + if (($asheetdata->{'sheettype'} eq 'studentcalc') && + (&Apache::lonnet::allowed('vgr',$asheetdata->{'cid'}))) { + $r->print ('

'. + 'Level up: Course Sheet

'); + } + # Save dialog + 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',&getfilename($asheet))); + # Load dialog + if (&Apache::lonnet::allowed('opa',$ENV{'request.course.id'})) { + $r->print('

'. + '

' - ); - if ($asheetdata->{'sheettype'} eq 'assesscalc') { - $r->print('

'. - ''. - 'Level up: Student Sheet

'); - } - if (($asheetdata->{'sheettype'} eq 'studentcalc') && - (&Apache::lonnet::allowed('vgr',$asheetdata->{'cid'}))) { - $r->print ( - '

'. - 'Level up: Course Sheet

'); - } - # Save dialog - 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',&getfilename($asheet))); - # Load dialog - if (&Apache::lonnet::allowed('opa',$ENV{'request.course.id'})) { - $r->print('

'. - '

'); - if (&gettype($asheet) eq 'studentcalc') { - &setothersheets($asheet,&othersheets($asheet,'assesscalc')); - } - } - # Cached sheets - &expirationdates(); - undef %oldsheets; - undef %loadedcaches; - if ($asheetdata->{'sheettype'} eq 'classcalc') { - $r->print - ("Loading previously calculated student sheets ...
\n"); - $r->rflush(); - &cachedcsheets(); - } elsif ($asheetdata->{'sheettype'} eq 'studentcalc') { - $r->print - ("Loading previously calculated assessment sheets ...
\n"); - $r->rflush(); - &cachedssheets($asheetdata->{'uname'},$asheetdata->{'udom'}, - $asheetdata->{'uhome'}); + $r->print('>'.$_.''); + } + $r->print('

'); + if ($asheetdata->{'sheettype'} eq 'studentcalc') { + &setothersheets($asheet,&othersheets($asheet,'assesscalc')); } - # Update sheet, load rows - $r->print("Loaded sheet(s), updating rows ...
\n"); - $r->rflush(); - # - &updatesheet($asheet,$asheetdata); - $r->print("Updated rows, loading row data ...
\n"); + } + # Cached sheets + &expirationdates(); + undef %oldsheets; + undef %loadedcaches; + if ($asheetdata->{'sheettype'} eq 'classcalc') { + $r->print("Loading previously calculated student sheets ...\n"); $r->rflush(); - # - &loadrows($asheet,$asheetdata,$r); - $r->print("Loaded row data, calculating sheet ...
\n"); + &cachedcsheets(); + } elsif ($asheetdata->{'sheettype'} eq 'studentcalc') { + $r->print("Loading previously calculated assessment sheets ...\n"); $r->rflush(); - # - my $calcoutput=&calcsheet($asheet); - $r->print('

'.$calcoutput.'

'); - # 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.='_'.$asheetdata->{'sheettype'}; - &setfilename($asheet,$fname); - $ENV{'form.ufn'}=$fname; - $r->print('

Saving spreadsheet: '. - &writesheet($asheet,$ENV{'form.makedefufn'}).'

'); - } + &cachedssheets($asheetdata->{'uname'},$asheetdata->{'udom'}, + $asheetdata->{'uhome'}); + } + # Update sheet, load rows + $r->print("Loaded sheet(s), updating rows ...
\n"); + $r->rflush(); + # + &updatesheet($asheet,$asheetdata); + $r->print("Updated rows, loading row data ...\n"); + $r->rflush(); + # + &loadrows($asheet,$asheetdata,$r); + $r->print("Loaded row data, calculating sheet ...
\n"); + $r->rflush(); + # + my $calcoutput=&calcsheet($asheet); + $r->print('

'.$calcoutput.'

'); + # 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.='_'.$asheetdata->{'sheettype'}; + &setfilename($asheet,$fname); + $ENV{'form.ufn'}=$fname; + $r->print('

Saving spreadsheet: '. + &writesheet($asheet,$ENV{'form.makedefufn'}).'

'); } - #Write the modified worksheet - - $r->print('Current sheet: '.&getfilename($asheet).'

'); - - &tmpwrite($asheet); - + } + # + #Write the modified worksheet + $r->print('Current sheet: '.&getfilename($asheet).'

'); + &tmpwrite($asheet); if ($asheetdata->{'sheettype'} eq 'studentcalc') { - $r->print('
Show rows with empty A column: '); + $r->print('
Show rows with empty A column: '); } else { $r->print('
Show empty rows: '); } - + # $r->print(&hiddenfield('userselhidden','true'). - 'print(' checked'); + $r->print(' checked'); } else { - unless ($ENV{'form.userselhidden'}) { - unless - ($ENV{'course.'.$ENV{'request.course.id'}.'.hideemptyrows'} eq 'yes') { - $r->print(' checked'); - $ENV{'form.showall'}=1; - } - } + unless ($ENV{'form.userselhidden'}) { + unless + ($ENV{'course.'.$ENV{'request.course.id'}.'.hideemptyrows'} eq 'yes') { + $r->print(' checked'); + $ENV{'form.showall'}=1; + } + } } $r->print('>'); - + # + # CSV format checkbox (classcalc sheets only) if ($asheetdata->{'sheettype'} eq 'classcalc') { - $r->print( - ' Output CSV format: print(' checked'); } - $r->print('>'); + $r->print(' Output CSV format: print(' checked'); } + $r->print('>'); } - -# ------------------------------------------------------------------ Insertrows + # + # Buttons to insert rows $r->print(' Student Status: '. &Apache::lonhtmlcommon::StatusOptions ($ENV{'form.Status'},'sheet')); - - $r->print(<print(<
ENDINSERTBUTTONS - -# ------------------------------------------------------------- Print out sheet - - &outsheet($r,$asheet); + # Print out sheet + &outsheet($r,$asheet,$asheetdata); $r->print(''); - -# ------------------------------------------------------------------------ Done - } else { -# ----------------------------- Not in a course, or not allowed to modify parms - $ENV{'user.error.msg'}= - $r->uri.":opa:0:0:Cannot modify spreadsheet"; - return HTTP_NOT_ACCEPTABLE; - } + # Done return OK; - } 1;

 '.$what.''.join('', - (split(//,'ABCDEFGHIJKLMNOPQRSTUVWXYZ'. - 'abcdefghijklmnopqrstuvwxyz'))). + $r->print(''. + join('', + (split(//,'ABCDEFGHIJKLMNOPQRSTUVWXYZ'. + 'abcdefghijklmnopqrstuvwxyz'))). "