--- loncom/interface/Attic/lonspreadsheet.pm 2000/12/11 16:51:12 1.12
+++ loncom/interface/Attic/lonspreadsheet.pm 2000/12/16 21:34:47 1.16
@@ -1,7 +1,8 @@
# 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 Gerd Kortemeyer
package Apache::lonspreadsheet;
@@ -259,9 +260,15 @@ sub SUMMIN {
sub sett {
%t=();
+ my $pattern='';
+ if ($sheettype eq 'assesscalc') {
+ $pattern='A';
+ } else {
+ $pattern='[A-Z]';
+ }
map {
if ($f{$_}) {
- if ($_=~/^A/) {
+ if ($_=~/^$pattern/) {
unless ($f{$_}=~/^\!/) {
$t{$_}=$c{$_};
}
@@ -299,7 +306,7 @@ sub calc {
return '';
}
-sub outrow {
+sub outrowassess {
my $n=shift;
my @cols=();
if ($n) {
@@ -318,6 +325,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 +423,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
# =============================================================================
@@ -418,6 +442,12 @@ sub rown {
my $defaultbg=((($n-1)/5)==int(($n-1)/5))?'#E0E0':'#FFFF';
my $rowdata="\n| $n | ";
my $showf=0;
+ my $proc;
+ if (&gettype($safeeval) eq 'assesscalc') {
+ $proc='&outrowassess';
+ } else {
+ $proc='&outrow';
+ }
map {
my $bgcolor=$defaultbg.((($showf-1)/5==int(($showf-1)/5))?'99':'DD');
my ($fm,$vl)=split(/\_\_\_eq\_\_\_/,$_);
@@ -435,7 +465,7 @@ sub rown {
$rowdata.=' '.$vl.' | ';
}
$showf++;
- } $safeeval->reval('&outrow('.$n.')');
+ } $safeeval->reval($proc.'('.$n.')');
return $rowdata.'
';
}
@@ -731,6 +761,28 @@ sub updaterows {
}
}
+# --------------------------------------------------- Load data for one student
+
+sub rowazstudent {
+ my $safeeval=shift;
+ my %c=();
+ my %f=&getformulas($safeeval);
+ map {
+ if ($_=~/^A/) {
+ unless ($f{$_}=~/^\!/) {
+ print &Apache::lonnet::ssi(
+ '/res/msu/korte/junk.assesscalc',('utarget' => 'export',
+ 'uname' => $uname,
+ 'udom' => $udom,
+ 'usymb' => $f{$_})).
+ '
'.$f{$_}.'
';
+ }
+ }
+ } keys %f;
+
+ &setconstants($safeeval,%c);
+}
+
# ------------------------------------------------ Load data for one assessment
sub rowaassess {
@@ -741,7 +793,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 +816,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 +833,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 +858,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 +894,6 @@ sub selectbox {
return $selout.'';
}
-# ==================================== Sub handler to get export of assessments
-
# ================================================================ Main handler
sub handler {
@@ -876,6 +935,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 +946,9 @@ sub handler {
$r->header_out('Pragma','no-cache');
$r->send_http_header;
+# --------------------------------------------------------------- Screen output
+
+ unless ($reroute) {
$r->print('LON-CAPA Spreadsheet');
$r->print(<
@@ -905,6 +971,10 @@ ENDSCRIPT
&hiddenfield('usymb',$ENV{'form.usymb'}).
&hiddenfield('unewfield','').
&hiddenfield('unewformula',''));
+ }
+
+# ---------------------------------------- Read new sheet or modified worksheet
+
my $sheetone=initsheet();
if ($ENV{'form.unewfield'}) {
$r->print('Modified Workcopy
');
@@ -920,6 +990,9 @@ ENDSCRIPT
} else {
&readsheet($sheetone,$r->filename);
}
+
+# --------------------------------------------- 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 +1006,39 @@ ENDSCRIPT
$r->print(''.
'Could not initialize import fields (not in a course)
');
}
+
+# ------------------------------------------------ Write the modified worksheet
+
&tmpwrite($sheetone,$r->dir_config('lonDaemons').'/tmp/',
$ENV{'form.usymb'});
+
+# ----------------------------------------------------- Print user, course, etc
+ unless ($reroute) {
$r->print("User '$uname' at domain '$udom' for '".
$ENV{'course.'.$ENV{'request.course.id'}.'.description'}."'");
if ($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);
}
&calcsheet($sheetone);
+
+# ------------------------------------------------------- Print or export sheet
+ unless ($reroute) {
$r->print(&outsheet($sheetone));
$r->print('');
-
+ } else {
+ $r->print(&exportrow($sheetone));
+ }
+# ------------------------------------------------------------------------ Done
} else {
# ----------------------------- Not in a course, or not allowed to modify parms
$ENV{'user.error.msg'}=