version 1.119, 2002/10/21 17:59:36
|
version 1.127, 2002/10/24 15:34:10
|
Line 122 my $tmpdir;
|
Line 122 my $tmpdir;
|
## |
## |
sub mask { |
sub mask { |
my ($lower,$upper)=@_; |
my ($lower,$upper)=@_; |
|
# |
$lower=~/([A-Za-z]|\*)(\d+|\*)/; |
my ($la,$ld) = ($lower=~/([A-Za-z]|\*)(\d+|\*)/); |
my $la=$1; |
my ($ua,$ud) = ($upper=~/([A-Za-z]|\*)(\d+|\*)/); |
my $ld=$2; |
# |
|
|
$upper=~/([A-Za-z]|\*)(\d+|\*)/; |
|
my $ua=$1; |
|
my $ud=$2; |
|
my $alpha=''; |
my $alpha=''; |
my $num=''; |
my $num=''; |
|
# |
if (($la eq '*') || ($ua eq '*')) { |
if (($la eq '*') || ($ua eq '*')) { |
$alpha='[A-Za-z]'; |
$alpha='[A-Za-z]'; |
} else { |
} else { |
|
|
if (($la=~/[A-Z]/) && ($ua=~/[A-Z]/) || |
if (($la=~/[A-Z]/) && ($ua=~/[A-Z]/) || |
($la=~/[a-z]/) && ($ua=~/[a-z]/)) { |
($la=~/[a-z]/) && ($ua=~/[a-z]/)) { |
$alpha='['.$la.'-'.$ua.']'; |
$alpha='['.$la.'-'.$ua.']'; |
Line 188 sub mask {
|
Line 185 sub mask {
|
} |
} |
$num.=')'; |
$num.=')'; |
} else { |
} else { |
if ($lda[$#lda]!=$uda[$#uda]) { |
if ($lda[-1]!=$uda[-1]) { |
$num.='['.$lda[$#lda].'-'.$uda[$#uda].']'; |
$num.='['.$lda[-1].'-'.$uda[-1].']'; |
} |
} |
} |
} |
} |
} |
Line 208 sub initsheet {
|
Line 205 sub initsheet {
|
$safeeval->deny(":base_io"); |
$safeeval->deny(":base_io"); |
$safehole->wrap(\&Apache::lonnet::EXT,$safeeval,'&EXT'); |
$safehole->wrap(\&Apache::lonnet::EXT,$safeeval,'&EXT'); |
$safehole->wrap(\&Apache::lonspreadsheet::mask,$safeeval,'&mask'); |
$safehole->wrap(\&Apache::lonspreadsheet::mask,$safeeval,'&mask'); |
$safehole->wrap(\&Apache::lonspreadsheet::templaterow,$safeeval,'&templaterow'); |
|
$safeeval->share('$@'); |
$safeeval->share('$@'); |
my $code=<<'ENDDEFS'; |
my $code=<<'ENDDEFS'; |
# ---------------------------------------------------- Inside of the safe space |
# ---------------------------------------------------- Inside of the safe space |
Line 238 undef %c; # Holds the constants for a sh
|
Line 234 undef %c; # Holds the constants for a sh
|
# sheets, this is the A column. Used in &MINPARM, &MAXPARM, &expandnamed, |
# sheets, this is the A column. Used in &MINPARM, &MAXPARM, &expandnamed, |
# &sett, and &setconstants. There is no &getconstants. |
# &sett, and &setconstants. There is no &getconstants. |
# &setconstants is called by &loadstudent, &loadcourse, &load assessment, |
# &setconstants is called by &loadstudent, &loadcourse, &load assessment, |
undef %rowlabel; # Holds the 'prefix' for each row. Set by &setrowlabels. |
|
# &setrowlabels is called by &updateclasssheet, &updatestudentassesssheet, |
|
undef @os; # Holds the names of other spreadsheets - this is used to specify |
undef @os; # Holds the names of other spreadsheets - this is used to specify |
# the spreadsheets that are available for the assessment sheet. |
# the spreadsheets that are available for the assessment sheet. |
# Set by &setothersheets. &setothersheets is called by &handler. A |
# Set by &setothersheets. &setothersheets is called by &handler. A |
Line 945 sub calc {
|
Line 939 sub calc {
|
return ''; |
return ''; |
} |
} |
|
|
|
# ------------------------------------------- End of "Inside of the safe space" |
|
ENDDEFS |
|
$safeeval->reval($code); |
|
return $safeeval; |
|
} |
|
|
# |
# |
# This is actually used for the student spreadsheet, not the assessment sheet |
# This is actually used for the student spreadsheet, not the assessment sheet |
# Do not be fooled by the name! |
# Do not be fooled by the name! |
# |
# |
|
sub templaterow { |
|
my $sheet = shift; |
|
my @cols=(); |
|
$cols[0]='<b><font size=+1>Template</font></b>'; |
|
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') { |
|
my $fm=$sheet->{'f'}->{'template_'.$_}; |
|
$fm=~s/[\'\"]/\&\#34;/g; |
|
push(@cols,"'template_$_','$fm'".'___eq___'.$fm); |
|
} |
|
return @cols; |
|
} |
|
|
|
|
sub outrowassess { |
sub outrowassess { |
# $n is the current row number |
# $n is the current row number |
my $n=shift; |
my $sheet = shift; |
|
my $n=shift; |
|
my $csv = $ENV{'form.showcsv'}; |
my @cols=(); |
my @cols=(); |
if ($n) { |
if ($n) { |
my ($usy,$ufn)=split(/__&&&\__/,$f{'A'.$n}); |
my ($usy,$ufn)=split(/__&&&\__/,$sheet->{'f'}->{'A'.$n}); |
if ($rowlabel{$usy}) { |
if ($sheet->{'rowlabel'}->{$usy}) { |
$cols[0]=$rowlabel{$usy}.'<br>'. |
$cols[0]=&format_rowlabel($sheet->{'rowlabel'}->{$usy}); |
|
if (! $csv) { |
|
$cols[0].='<br>'. |
'<select name="sel_'.$n.'" onChange="changesheet('.$n.')">'. |
'<select name="sel_'.$n.'" onChange="changesheet('.$n.')">'. |
'<option name="default">Default</option>'; |
'<option name="default">Default</option>'; |
|
} |
} else { |
} else { |
$cols[0]=''; |
$cols[0]=''; |
} |
} |
foreach (@os) { |
if (! $csv) { |
$cols[0].='<option name="'.$_.'"'; |
foreach (@{$sheet->{'othersheets'}}) { |
if ($ufn eq $_) { |
$cols[0].='<option name="'.$_.'"'; |
$cols[0].=' selected'; |
if ($ufn eq $_) { |
|
$cols[0].=' selected'; |
|
} |
|
$cols[0].='>'.$_.'</option>'; |
} |
} |
$cols[0].='>'.$_.'</option>'; |
$cols[0].='</select>'; |
} |
} |
$cols[0].='</select>'; |
|
} else { |
} else { |
$cols[0]='<b><font size=+1>Export</font></b>'; |
$cols[0]='<b><font size=+1>Export</font></b>'; |
} |
} |
Line 977 sub outrowassess {
|
Line 1000 sub outrowassess {
|
'N','O','P','Q','R','S','T','U','V','W','X','Y','Z', |
'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', |
'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') { |
'n','o','p','q','r','s','t','u','v','w','x','y','z') { |
my $fm=$f{$_.$n}; |
my $fm=$sheet->{'f'}->{$_.$n}; |
$fm=~s/[\'\"]/\&\#34;/g; |
$fm=~s/[\'\"]/\&\#34;/g; |
push(@cols,"'$_$n','$fm'".'___eq___'.$sheet_values{$_.$n}); |
push(@cols,"'$_$n','$fm'".'___eq___'.$sheet->{'values'}->{$_.$n}); |
} |
} |
return @cols; |
return @cols; |
} |
} |
|
|
sub outrow { |
sub outrow { |
|
my $sheet=shift; |
my $n=shift; |
my $n=shift; |
my @cols=(); |
my @cols=(); |
if ($n) { |
if ($n) { |
$cols[0]=$rowlabel{$f{'A'.$n}}; |
$cols[0]=&format_rowlabel($sheet->{'rowlabel'}->{$sheet->{'f'}->{'A'.$n}}); |
} else { |
} else { |
$cols[0]='<b><font size=+1>Export</font></b>'; |
$cols[0]='<b><font size=+1>Export</font></b>'; |
} |
} |
Line 996 sub outrow {
|
Line 1020 sub outrow {
|
'N','O','P','Q','R','S','T','U','V','W','X','Y','Z', |
'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', |
'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') { |
'n','o','p','q','r','s','t','u','v','w','x','y','z') { |
my $fm=$f{$_.$n}; |
my $fm=$sheet->{'f'}->{$_.$n}; |
$fm=~s/[\'\"]/\&\#34;/g; |
|
push(@cols,"'$_$n','$fm'".'___eq___'.$sheet_values{$_.$n}); |
|
} |
|
return @cols; |
|
} |
|
|
|
sub exportrowa { |
|
my @exportarray=(); |
|
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') { |
|
push(@exportarray,$sheet_values{$_.'0'}); |
|
} |
|
return @exportarray; |
|
} |
|
|
|
sub templaterow { |
|
my @cols=(); |
|
$cols[0]='<b><font size=+1>Template</font></b>'; |
|
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') { |
|
my $fm=$f{'template_'.$_}; |
|
$fm=~s/[\'\"]/\&\#34;/g; |
$fm=~s/[\'\"]/\&\#34;/g; |
push(@cols,"'template_$_','$fm'".'___eq___'.$fm); |
push(@cols,"'$_$n','$fm'".'___eq___'.$sheet->{'values'}->{$_.$n}); |
} |
} |
return @cols; |
return @cols; |
} |
} |
|
|
|
|
# ------------------------------------------- End of "Inside of the safe space" |
|
ENDDEFS |
|
$safeeval->reval($code); |
|
return $safeeval; |
|
} |
|
|
|
|
|
# ------------------------------------------------ Add or change formula values |
# ------------------------------------------------ Add or change formula values |
sub setformulas { |
sub setformulas { |
my ($sheet)=shift; |
my ($sheet)=shift; |
Line 1043 sub setformulas {
|
Line 1036 sub setformulas {
|
# ------------------------------------------------ Add or change formula values |
# ------------------------------------------------ Add or change formula values |
sub setconstants { |
sub setconstants { |
my ($sheet)=shift; |
my ($sheet)=shift; |
|
my ($constants) = @_; |
|
if (! ref($constants)) { |
|
my %tmp = @_; |
|
$constants = \%tmp; |
|
} |
|
$sheet->{'constants'} = $constants; |
return %{$sheet->{'safe'}->varglob('c')}=%{$sheet->{'constants'}}; |
return %{$sheet->{'safe'}->varglob('c')}=%{$sheet->{'constants'}}; |
} |
} |
|
|
Line 1058 sub setothersheets {
|
Line 1057 sub setothersheets {
|
# ------------------------------------------------ Add or change formula values |
# ------------------------------------------------ Add or change formula values |
sub setrowlabels { |
sub setrowlabels { |
my $sheet=shift; |
my $sheet=shift; |
%{$sheet->{'safe'}->varglob('rowlabel')}=%{$sheet->{'rowlabel'}}; |
my ($rowlabel) = @_; |
|
if (! ref($rowlabel)) { |
|
my %tmp = @_; |
|
$rowlabel = \%tmp; |
|
} |
|
$sheet->{'rowlabel'}=$rowlabel; |
} |
} |
|
|
# ------------------------------------------------------- Calculate spreadsheet |
# ------------------------------------------------------- Calculate spreadsheet |
sub calcsheet { |
sub calcsheet { |
my $sheet=shift; |
my $sheet=shift; |
return $sheet->{'safe'}->reval('&calc();'); |
my $result = $sheet->{'safe'}->reval('&calc();'); |
|
%{$sheet->{'values'}} = %{$sheet->{'safe'}->varglob('sheet_values')}; |
|
return $result; |
} |
} |
|
|
# ---------------------------------------------------------------- Get formulas |
# ---------------------------------------------------------------- Get formulas |
Line 1083 sub getfa {
|
Line 1089 sub getfa {
|
# ------------------------------------------------------------- Export of A-row |
# ------------------------------------------------------------- Export of A-row |
sub exportdata { |
sub exportdata { |
my $sheet=shift; |
my $sheet=shift; |
return $sheet->{'safe'}->reval('&exportrowa()'); |
my @exportarray=(); |
|
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') { |
|
push(@exportarray,$sheet->{'values'}->{$_.'0'}); |
|
} |
|
return @exportarray; |
} |
} |
|
|
|
|
# ========================================================== End of Spreadsheet |
# ========================================================== End of Spreadsheet |
# ============================================================================= |
# ============================================================================= |
|
|
Line 1111 sub rown {
|
Line 1121 sub rown {
|
$rowdata.="\n".'"'.$n.'"'; |
$rowdata.="\n".'"'.$n.'"'; |
} |
} |
my $showf=0; |
my $showf=0; |
my $proc; |
# |
|
# Determine how many pink (uneditable) cells there are in this sheet. |
my $maxred=1; |
my $maxred=1; |
my $sheettype=$sheet->{'sheettype'}; |
my $sheettype=$sheet->{'sheettype'}; |
if ($sheettype eq 'studentcalc') { |
if ($sheettype eq 'studentcalc') { |
$proc='&outrowassess'; |
|
$maxred=26; |
$maxred=26; |
} else { |
} elsif ($sheettype eq 'assesscalc') { |
$proc='&outrow'; |
|
} |
|
if ($sheettype eq 'assesscalc') { |
|
$maxred=1; |
$maxred=1; |
} else { |
} else { |
$maxred=26; |
$maxred=26; |
} |
} |
if (&getfa($sheet,$n)=~/^[\~\-]/) { $maxred=1; } |
$maxred=1 if (&getfa($sheet,$n)=~/^[\~\-]/); |
|
# |
|
# Get the proper row |
|
my @rowdata; |
if ($n eq '-') { |
if ($n eq '-') { |
$proc='&templaterow'; |
@rowdata = &templaterow($sheet); |
$n=-1; |
$n=-1; |
$dataflag=1; |
$dataflag=1; |
|
} elsif ($sheettype eq 'studentcalc') { |
|
@rowdata = &outrowassess($sheet,$n); |
|
} else { |
|
@rowdata = &outrow($sheet,$n); |
} |
} |
foreach ($sheet->{'safe'}->reval($proc.'('.$n.')')) { |
# |
|
foreach (@rowdata) { |
my $bgcolor=$defaultbg.((($showf-1)/5==int(($showf-1)/5))?'99':'DD'); |
my $bgcolor=$defaultbg.((($showf-1)/5==int(($showf-1)/5))?'99':'DD'); |
my ($fm,$vl)=split(/\_\_\_eq\_\_\_/,$_); |
my ($fm,$vl)=split(/\_\_\_eq\_\_\_/,$_); |
if ((($vl ne '') || ($vl eq '0')) && |
if ((($vl ne '') || ($vl eq '0')) && |
Line 1601 sub parmval {
|
Line 1616 sub parmval {
|
return &Apache::lonnet::metadata($fn,$rwhat.'.default'); |
return &Apache::lonnet::metadata($fn,$rwhat.'.default'); |
} |
} |
|
|
|
sub format_rowlabel { |
|
my $rowlabel = shift; |
|
my ($type,$labeldata) = split(':',$rowlabel,2); |
|
my $result = ''; |
|
if ($type eq 'symb') { |
|
my ($symb,$uname,$udom,$title) = split(':',$labeldata); |
|
$symb = &Apache::lonnet::unescape($symb); |
|
if ($ENV{'form.showcsv'}) { |
|
$result = $title; |
|
} else { |
|
$result = '<a href="/adm/assesscalc?usymb='.$symb. |
|
'&uname='.$uname.'&udom='.$udom.'">'.$title.'</a>'; |
|
} |
|
} elsif ($type eq 'student') { |
|
my ($sname,$sdom,$fullname,$section,$id) = split(':',$labeldata); |
|
if ($ENV{'form.showcsv'}) { |
|
$result = '"'. |
|
join('","',($sname,$sdom,$fullname,$section,$id).'"'); |
|
} else { |
|
$result ='<a href="/adm/studentcalc?uname='.$sname. |
|
'&udom='.$sdom.'">'; |
|
$result.=$section.' '.$id." ".$fullname.'</a>'; |
|
} |
|
} elsif ($type eq 'parameter') { |
|
if ($ENV{'form.showcsv'}) { |
|
$labeldata =~ s/<br>/ /g; |
|
} |
|
$result = $labeldata; |
|
} else { |
|
&Apache::lonnet::logthis("lonspreadsheet:bogus rowlabel type: $type"); |
|
} |
|
return $result; |
|
} |
|
|
# ---------------------------------------------- Update rows for course listing |
# ---------------------------------------------- Update rows for course listing |
sub updateclasssheet { |
sub updateclasssheet { |
my ($sheet) = @_; |
my ($sheet) = @_; |
Line 1623 sub updateclasssheet {
|
Line 1672 sub updateclasssheet {
|
my ($studentDomain,$studentName,$end,$start,$id,$studentSection, |
my ($studentDomain,$studentName,$end,$start,$id,$studentSection, |
$fullname,$status) = @{$classlist->{$student}}; |
$fullname,$status) = @{$classlist->{$student}}; |
if ($ENV{'form.Status'} eq $status || $ENV{'form.Status'} eq 'Any') { |
if ($ENV{'form.Status'} eq $status || $ENV{'form.Status'} eq 'Any') { |
my $rowlabel=''; |
$currentlist{$student}=join(':',('student',$studentName, |
if ($ENV{'form.showcsv'}) { |
$studentDomain,$fullname, |
$rowlabel= '"'.join('","',($studentName,$studentDomain, |
$studentSection,$id)); |
$fullname,$studentSection,$id).'"'); |
|
} else { |
|
$rowlabel='<a href="/adm/studentcalc?uname='.$studentName. |
|
'&udom='.$studentDomain.'">'; |
|
$rowlabel.=$studentSection.' '.$id." ".$fullname; |
|
$rowlabel.='</a>'; |
|
} |
|
$currentlist{$student}=$rowlabel; |
|
} |
} |
} |
} |
# |
# |
Line 1653 sub updateclasssheet {
|
Line 1694 sub updateclasssheet {
|
} |
} |
$existing{$f{$_}}=1; |
$existing{$f{$_}}=1; |
unless ((defined($currentlist{$f{$_}})) || (!$1) || |
unless ((defined($currentlist{$f{$_}})) || (!$1) || |
($f{$_}=~/^(\~\~\~|\-\-\-)/)) { |
($f{$_}=~/^(~~~|---)/)) { |
$f{$_}='!!! Obsolete'; |
$f{$_}='!!! Obsolete'; |
$changed=1; |
$changed=1; |
} |
} |
Line 1673 sub updateclasssheet {
|
Line 1714 sub updateclasssheet {
|
&setformulas($sheet,%f); |
&setformulas($sheet,%f); |
} |
} |
# |
# |
$sheet->{'rowlabel'} = \%currentlist; |
&setrowlabels($sheet,\%currentlist); |
&setrowlabels($sheet); |
|
} |
} |
|
|
# ----------------------------------- Update rows for student and assess sheets |
# ----------------------------------- Update rows for student and assess sheets |
Line 1698 sub updatestudentassesssheet {
|
Line 1738 sub updatestudentassesssheet {
|
return 'Could not access course data'; |
return 'Could not access course data'; |
} |
} |
# Get all assessments |
# Get all assessments |
|
# |
|
# allkeys is used in the assessment sheets to provide labels |
|
# for the parameters. |
my %allkeys=('timestamp' => |
my %allkeys=('timestamp' => |
'Timestamp of Last Transaction<br>timestamp', |
'parameter:Timestamp of Last Transaction<br>timestamp', |
'subnumber' => |
'subnumber' => |
'Number of Submissions<br>subnumber', |
'parameter:Number of Submissions<br>subnumber', |
'tutornumber' => |
'tutornumber' => |
'Number of Tutor Responses<br>tutornumber', |
'parameter:Number of Tutor Responses<br>tutornumber', |
'totalpoints' => |
'totalpoints' => |
'Total Points Granted<br>totalpoints'); |
'parameter:Total Points Granted<br>totalpoints'); |
my $adduserstr=''; |
my $adduserstr=''; |
if (($uname ne $ENV{'user.name'}) || ($udom ne $ENV{'user.domain'})){ |
if (($uname ne $ENV{'user.name'}) || ($udom ne $ENV{'user.domain'})){ |
$adduserstr='&uname='.$uname.'&udom='.$udom; |
$adduserstr='&uname='.$uname.'&udom='.$udom; |
} |
} |
my %allassess = |
# |
('_feedback' =>'<a href="/adm/assesscalc?usymb=_feedback'. |
# allassess holds the descriptions of all assessments |
$adduserstr.'">Feedback</a>', |
my %allassess; |
'_evaluation' =>'<a href="/adm/assesscalc?usymb=_evaluation'. |
foreach ('Feedback','Evaluation','Tutoring','Discussion') { |
$adduserstr.'">Evaluation</a>', |
my $symb = '_'.lc($_); |
'_tutoring' =>'<a href="/adm/assesscalc?usymb=_tutoring'. |
$allassess{$symb} = join(':',('symb',$symb,$uname,$udom,$_)); |
$adduserstr.'">Tutoring</a>', |
} |
'_discussion' =>'<a href="/adm/assesscalc?usymb=_discussion'. |
|
$adduserstr.'">Discussion</a>' |
|
); |
|
while (($_,undef) = each(%bighash)) { |
while (($_,undef) = each(%bighash)) { |
next if ($_!~/^src\_(\d+)\.(\d+)$/); |
next if ($_!~/^src\_(\d+)\.(\d+)$/); |
my $mapid=$1; |
my $mapid=$1; |
Line 1730 sub updatestudentassesssheet {
|
Line 1770 sub updatestudentassesssheet {
|
my $symb= |
my $symb= |
&Apache::lonnet::declutter($bighash{'map_id_'.$mapid}). |
&Apache::lonnet::declutter($bighash{'map_id_'.$mapid}). |
'___'.$resid.'___'.&Apache::lonnet::declutter($srcf); |
'___'.$resid.'___'.&Apache::lonnet::declutter($srcf); |
$allassess{$symb}= |
$allassess{$symb}='symb:'.&Apache::lonnet::escape($symb).':' |
'<a href="/adm/assesscalc?usymb='.$symb.$adduserstr.'">'. |
.$uname.':'.$udom.':'.$bighash{'title_'.$id}; |
$bighash{'title_'.$id}.'</a>'; |
|
next if ($stype ne 'assesscalc'); |
next if ($stype ne 'assesscalc'); |
foreach my $key (split(/\,/, |
foreach my $key (split(/\,/, |
&Apache::lonnet::metadata($srcf,'keys') |
&Apache::lonnet::metadata($srcf,'keys') |
Line 1745 sub updatestudentassesssheet {
|
Line 1784 sub updatestudentassesssheet {
|
&Apache::lonnet::metadata($srcf,$key.'.name'); |
&Apache::lonnet::metadata($srcf,$key.'.name'); |
} |
} |
$display.='<br>'.$key; |
$display.='<br>'.$key; |
$allkeys{$key}=$display; |
$allkeys{$key}='parameter:'.$display; |
} # end of foreach |
} # end of foreach |
} |
} |
} # end of foreach (keys(%bighash)) |
} # end of foreach (keys(%bighash)) |
Line 1780 sub updatestudentassesssheet {
|
Line 1819 sub updatestudentassesssheet {
|
$existing{$usy}=1; |
$existing{$usy}=1; |
unless ((exists($sheet->{'rowlabel'}->{$usy}) && |
unless ((exists($sheet->{'rowlabel'}->{$usy}) && |
(defined($sheet->{'rowlabel'}->{$usy})) || (!$1) || |
(defined($sheet->{'rowlabel'}->{$usy})) || (!$1) || |
($f{$_}=~/^(\~\~\~|\-\-\-)/))){ |
($f{$_}=~/^(~~~|---)/))){ |
$f{$_}='!!! Obsolete'; |
$f{$_}='!!! Obsolete'; |
$changed=1; |
$changed=1; |
} elsif ($ufn) { |
} elsif ($ufn) { |
Line 1800 sub updatestudentassesssheet {
|
Line 1839 sub updatestudentassesssheet {
|
$sheet->{'f'} = \%f; |
$sheet->{'f'} = \%f; |
&setformulas($sheet); |
&setformulas($sheet); |
} |
} |
&setrowlabels($sheet); |
|
# |
# |
undef %existing; |
undef %existing; |
} |
} |
Line 1851 sub loadstudent {
|
Line 1889 sub loadstudent {
|
$cachedassess=''; |
$cachedassess=''; |
undef %cachedstores; |
undef %cachedstores; |
$sheet->{'f'} = \%f; |
$sheet->{'f'} = \%f; |
$sheet->{'constants'} = \%c; |
|
&setformulas($sheet); |
&setformulas($sheet); |
&setconstants($sheet); |
&setconstants($sheet,\%c); |
} |
} |
|
|
# --------------------------------------------------- Load data for one student |
# --------------------------------------------------- Load data for one student |
Line 1913 ENDPOP
|
Line 1950 ENDPOP
|
} |
} |
} |
} |
$sheet->{'f'}=\%f; |
$sheet->{'f'}=\%f; |
$sheet->{'constants'}=\%c; |
|
&setformulas($sheet); |
&setformulas($sheet); |
&setconstants($sheet); |
&setconstants($sheet,\%c); |
$r->print('<script>popwin.close()</script>'); |
$r->print('<script>popwin.close()</script>'); |
$r->rflush(); |
$r->rflush(); |
} |
} |
Line 2019 sub loadassessment {
|
Line 2055 sub loadassessment {
|
if (tie(%parmhash,'GDBM_File', |
if (tie(%parmhash,'GDBM_File', |
$sheet->{'coursefilename'}.'_parms.db',&GDBM_READER(),0640)) { |
$sheet->{'coursefilename'}.'_parms.db',&GDBM_READER(),0640)) { |
my %f=&getformulas($sheet); |
my %f=&getformulas($sheet); |
foreach (keys(%f)) { |
foreach my $cell (keys(%f)) { |
next if ($_!~/^A/); |
next if ($cell !~ /^A/); |
next if ($f{$_}=~/^[\!\~\-]/); |
next if ($f{$cell} =~/^[\!\~\-]/); |
if ($f{$_}=~/^parameter/) { |
if ($f{$cell}=~/^parameter/) { |
if ($thisassess{$f{$_}}) { |
if (defined($thisassess{$f{$cell}})) { |
my $val=&parmval($f{$_},$sheet); |
my $val = &parmval($f{$cell},$sheet); |
$c{$_}=$val; |
$c{$cell} = $val; |
$c{$f{$_}}=$val; |
$c{$f{$cell}} = $val; |
} |
} |
} else { |
} else { |
my $key=$f{$_}; |
my $key=$f{$cell}; |
my $ckey=$key; |
my $ckey=$key; |
$key=~s/^stores\_/resource\./; |
$key=~s/^stores\_/resource\./; |
$key=~s/\_/\./g; |
$key=~s/\_/\./g; |
$c{$_}=$returnhash{$key}; |
$c{$cell}=$returnhash{$key}; |
$c{$ckey}=$returnhash{$key}; |
$c{$ckey}=$returnhash{$key}; |
} |
} |
} |
} |
untie(%parmhash); |
untie(%parmhash); |
} |
} |
$sheet->{'constants'}=\%c; |
&setconstants($sheet,\%c); |
&setconstants($sheet); |
|
} |
} |
|
|
# --------------------------------------------------------- Various form fields |
# --------------------------------------------------------- Various form fields |
Line 2113 sub forcedrecalc {
|
Line 2148 sub forcedrecalc {
|
if ($ENV{'form.forcerecalc'}) { return 1; } |
if ($ENV{'form.forcerecalc'}) { return 1; } |
unless ($time) { return 1; } |
unless ($time) { return 1; } |
if ($stype eq 'assesscalc') { |
if ($stype eq 'assesscalc') { |
my $map=(split(/\_\_\_/,$usymb))[0]; |
my $map=(split(/___/,$usymb))[0]; |
if (&checkthis('::assesscalc:',$time) || |
if (&checkthis('::assesscalc:',$time) || |
&checkthis('::assesscalc:'.$map,$time) || |
&checkthis('::assesscalc:'.$map,$time) || |
&checkthis('::assesscalc:'.$usymb,$time) || |
&checkthis('::assesscalc:'.$usymb,$time) || |
Line 2132 sub forcedrecalc {
|
Line 2167 sub forcedrecalc {
|
} |
} |
|
|
# ============================================================== Export handler |
# ============================================================== Export handler |
# |
|
# Non-interactive call from with program |
|
# |
|
|
|
sub exportsheet { |
sub exportsheet { |
my ($uname,$udom,$stype,$usymb,$fn)=@_; |
my ($uname,$udom,$stype,$usymb,$fn)=@_; |
my @exportarr=(); |
my @exportarr=(); |
if (($usymb=~/^\_(\w+)/) && (!$fn)) { |
if (defined($usymb) && ($usymb=~/^\_(\w+)/) && (!$fn)) { |
$fn='default_'.$1; |
$fn='default_'.$1; |
} |
} |
# |
# |
Line 2148 sub exportsheet {
|
Line 2179 sub exportsheet {
|
my $key=$uname.':'.$udom.':'.$stype.':'.$usymb; |
my $key=$uname.':'.$udom.':'.$stype.':'.$usymb; |
my $found=''; |
my $found=''; |
if ($oldsheets{$key}) { |
if ($oldsheets{$key}) { |
foreach (split(/\_\_\_\&\_\_\_/,$oldsheets{$key})) { |
foreach (split(/___&\___/,$oldsheets{$key})) { |
my ($name,$value)=split(/\_\_\_\=\_\_\_/,$_); |
my ($name,$value)=split(/___=___/,$_); |
if ($name eq $fn) { |
if ($name eq $fn) { |
$found=$value; |
$found=$value; |
} |
} |
Line 2158 sub exportsheet {
|
Line 2189 sub exportsheet {
|
unless ($found) { |
unless ($found) { |
&cachedssheets($uname,$udom,&Apache::lonnet::homeserver($uname,$udom)); |
&cachedssheets($uname,$udom,&Apache::lonnet::homeserver($uname,$udom)); |
if ($oldsheets{$key}) { |
if ($oldsheets{$key}) { |
foreach (split(/\_\_\_\&\_\_\_/,$oldsheets{$key})) { |
foreach (split(/___&\___/,$oldsheets{$key})) { |
my ($name,$value)=split(/\_\_\_\=\_\_\_/,$_); |
my ($name,$value)=split(/___=___/,$_); |
if ($name eq $fn) { |
if ($name eq $fn) { |
$found=$value; |
$found=$value; |
} |
} |
Line 2178 sub exportsheet {
|
Line 2209 sub exportsheet {
|
# |
# |
# Return what was cached |
# Return what was cached |
# |
# |
@exportarr=split(/\_\_\_\;\_\_\_/,$found); |
@exportarr=split(/___;___/,$found); |
} else { |
return @exportarr; |
# |
} |
# Not cached |
# |
# |
# Not cached |
my ($sheet)=&makenewsheet($uname,$udom,$stype,$usymb); |
# |
&readsheet($sheet,$fn); |
my ($sheet)=&makenewsheet($uname,$udom,$stype,$usymb); |
&updatesheet($sheet); |
&readsheet($sheet,$fn); |
&loadrows($sheet); |
&updatesheet($sheet); |
&calcsheet($sheet); |
&loadrows($sheet); |
@exportarr=&exportdata($sheet); |
&calcsheet($sheet); |
# |
@exportarr=&exportdata($sheet); |
# Store now |
# |
# |
# Store now |
my $cid=$ENV{'request.course.id'}; |
# |
my $current=''; |
my $cid=$ENV{'request.course.id'}; |
if ($stype eq 'studentcalc') { |
my $current=''; |
$current=&Apache::lonnet::reply('get:'. |
if ($stype eq 'studentcalc') { |
$ENV{'course.'.$cid.'.domain'}.':'. |
$current=&Apache::lonnet::reply('get:'. |
$ENV{'course.'.$cid.'.num'}. |
$ENV{'course.'.$cid.'.domain'}.':'. |
':nohist_calculatedsheets:'. |
$ENV{'course.'.$cid.'.num'}. |
&Apache::lonnet::escape($key), |
':nohist_calculatedsheets:'. |
$ENV{'course.'.$cid.'.home'}); |
&Apache::lonnet::escape($key), |
} else { |
$ENV{'course.'.$cid.'.home'}); |
$current=&Apache::lonnet::reply('get:'.$sheet->{'udom'}.':'. |
} else { |
$sheet->{'uname'}. |
$current=&Apache::lonnet::reply('get:'.$sheet->{'udom'}.':'. |
':nohist_calculatedsheets_'. |
$sheet->{'uname'}. |
$ENV{'request.course.id'}.':'. |
':nohist_calculatedsheets_'. |
&Apache::lonnet::escape($key), |
$ENV{'request.course.id'}.':'. |
$sheet->{'uhome'}); |
&Apache::lonnet::escape($key), |
} |
$sheet->{'uhome'}); |
my %currentlystored=(); |
} |
unless ($current=~/^error\:/) { |
my %currentlystored=(); |
foreach (split(/___&\___/,&Apache::lonnet::unescape($current))) { |
unless ($current=~/^error\:/) { |
my ($name,$value)=split(/___=___/,$_); |
foreach (split(/___&\___/,&Apache::lonnet::unescape($current))) { |
$currentlystored{$name}=$value; |
my ($name,$value)=split(/___=___/,$_); |
} |
$currentlystored{$name}=$value; |
} |
} |
$currentlystored{$fn}=join('___;___',@exportarr); |
} |
# |
$currentlystored{$fn}=join('___;___',@exportarr); |
my $newstore=''; |
# |
foreach (keys(%currentlystored)) { |
my $newstore=''; |
if ($newstore) { $newstore.='___&___'; } |
foreach (keys(%currentlystored)) { |
$newstore.=$_.'___=___'.$currentlystored{$_}; |
if ($newstore) { $newstore.='___&___'; } |
} |
$newstore.=$_.'___=___'.$currentlystored{$_}; |
my $now=time; |
} |
if ($stype eq 'studentcalc') { |
my $now=time; |
&Apache::lonnet::reply('put:'. |
if ($stype eq 'studentcalc') { |
$ENV{'course.'.$cid.'.domain'}.':'. |
&Apache::lonnet::put('nohist_calculatedsheets', |
$ENV{'course.'.$cid.'.num'}. |
{ $key => $newstore, |
':nohist_calculatedsheets:'. |
$key.time => $now }, |
&Apache::lonnet::escape($key).'='. |
$ENV{'course.'.$cid.'.domain'}, |
&Apache::lonnet::escape($newstore).'&'. |
$ENV{'course.'.$cid.'.num'}) |
&Apache::lonnet::escape($key).'.time='.$now, |
} else { |
$ENV{'course.'.$cid.'.home'}); |
&Apache::lonnet::put('nohist_calculatedsheets_'.$sheet->{'cid'}, |
} else { |
{ $key => $newstore, |
&Apache::lonnet::reply('put:'. |
$key.time => $now }, |
$sheet->{'udom'}.':'. |
$sheet->{'udom'}, |
$sheet->{'uname'}. |
$sheet->{'uname'}) |
':nohist_calculatedsheets_'. |
|
$ENV{'request.course.id'}.':'. |
|
&Apache::lonnet::escape($key).'='. |
|
&Apache::lonnet::escape($newstore).'&'. |
|
&Apache::lonnet::escape($key).'.time='.$now, |
|
$sheet->{'uhome'}); |
|
} |
|
} |
} |
return @exportarr; |
return @exportarr; |
} |
} |
Line 2451 ENDSCRIPT
|
Line 2475 ENDSCRIPT
|
&readsheet($sheet,$ENV{'form.ufn'}); |
&readsheet($sheet,$ENV{'form.ufn'}); |
} |
} |
# Print out user information |
# Print out user information |
unless ($sheet->{'sheettype'} eq 'classcalc') { |
if ($sheet->{'sheettype'} ne 'classcalc') { |
$r->print('<p><b>User:</b> '.$sheet->{'uname'}. |
$r->print('<p><b>User:</b> '.$sheet->{'uname'}. |
'<br><b>Domain:</b> '.$sheet->{'udom'}); |
'<br><b>Domain:</b> '.$sheet->{'udom'}); |
$r->print('<br><b>Section/Group:</b> '.$sheet->{'csec'}); |
$r->print('<br><b>Section/Group:</b> '.$sheet->{'csec'}); |
Line 2564 ENDSCRIPT
|
Line 2588 ENDSCRIPT
|
$r->print('<br>Show rows with empty A column: '); |
$r->print('<br>Show rows with empty A column: '); |
} else { |
} else { |
$r->print('<br>Show empty rows: '); |
$r->print('<br>Show empty rows: '); |
} |
} |
# |
# |
$r->print(&hiddenfield('userselhidden','true'). |
$r->print(&hiddenfield('userselhidden','true'). |
'<input type="checkbox" name="showall" onClick="submit()"'); |
'<input type="checkbox" name="showall" onClick="submit()"'); |
Line 2581 ENDSCRIPT
|
Line 2605 ENDSCRIPT
|
} |
} |
} |
} |
$r->print('>'); |
$r->print('>'); |
|
# |
|
# CSV format checkbox (classcalc sheets only) |
|
$r->print(' Output CSV format: <input type="checkbox" '. |
|
'name="showcsv" onClick="submit()"'); |
|
$r->print(' checked') if ($ENV{'form.showcsv'}); |
|
$r->print('>'); |
if ($sheet->{'sheettype'} eq 'classcalc') { |
if ($sheet->{'sheettype'} eq 'classcalc') { |
# |
|
# CSV format checkbox (classcalc sheets only) |
|
$r->print(' Output CSV format: <input type="checkbox" '. |
|
'name="showcsv" onClick="submit()"'); |
|
if ($ENV{'form.showcsv'}) { $r->print(' checked'); } |
|
$r->print('>'); |
|
# |
|
# Buttons to insert rows |
|
$r->print(' Student Status: '. |
$r->print(' Student Status: '. |
&Apache::lonhtmlcommon::StatusOptions |
&Apache::lonhtmlcommon::StatusOptions |
($ENV{'form.Status'},'sheet')); |
($ENV{'form.Status'},'sheet')); |
} |
} |
|
# |
|
# Buttons to insert rows |
$r->print(<<ENDINSERTBUTTONS); |
$r->print(<<ENDINSERTBUTTONS); |
<br> |
<br> |
<input type='button' onClick='insertrow("top");' |
<input type='button' onClick='insertrow("top");' |