version 1.28, 2003/11/11 15:36:28
|
version 1.43, 2005/05/15 02:28:23
|
Line 104 my %nice_parameter_name;
|
Line 104 my %nice_parameter_name;
|
my %useropt; |
my %useropt; |
my %userdata; |
my %userdata; |
my %courseopt; |
my %courseopt; |
|
my $navmap; |
|
|
######################################################## |
######################################################## |
######################################################## |
######################################################## |
Line 124 sub clear_package {
|
Line 125 sub clear_package {
|
if (defined($current_name) && |
if (defined($current_name) && |
defined($current_domain) && |
defined($current_domain) && |
defined($current_course) && |
defined($current_course) && |
$current_course eq $ENV{'request.course.id'} && |
$current_course eq $env{'request.course.id'} && |
%newExportrows) { |
%newExportrows) { |
&save_cached_export_rows($current_name,$current_domain); |
&save_cached_export_rows($current_name,$current_domain); |
} |
} |
Line 136 sub clear_package {
|
Line 137 sub clear_package {
|
undef(%useropt); |
undef(%useropt); |
undef(%userdata); |
undef(%userdata); |
undef(%courseopt); |
undef(%courseopt); |
|
undef($navmap); |
} |
} |
|
|
sub save_cached_export_rows { |
sub save_cached_export_rows { |
my ($sname,$sdomain) = @_; |
my ($sname,$sdomain) = @_; |
my $start = Time::HiRes::time; |
|
my $result = &Apache::lonnet::put |
my $result = &Apache::lonnet::put |
('nohist_calculatedsheets_'.$ENV{'request.course.id'}, |
('nohist_calculatedsheets_'.$env{'request.course.id'}, |
$newExportrows{$sname.':'.$sdomain}, |
$newExportrows{$sname.':'.$sdomain}, |
$sdomain,$sname); |
$sdomain,$sname); |
delete($newExportrows{$sname.':'.$sdomain}); |
delete($newExportrows{$sname.':'.$sdomain}); |
} |
} |
|
|
sub initialize { |
sub initialize { |
|
my ($in_navmap) = @_; |
&clear_package(); |
&clear_package(); |
|
$navmap = $in_navmap; |
|
if (! defined($navmap)) { |
|
$navmap = Apache::lonnavmaps::navmap->new(); |
|
} |
|
if (!defined($navmap)) { |
|
&Apache::lonnet::logthis('assesscalc:Can not open Coursemap'); |
|
} |
&Apache::loncoursedata::clear_internal_caches(); |
&Apache::loncoursedata::clear_internal_caches(); |
} |
} |
|
|
Line 165 sub initialize {
|
Line 174 sub initialize {
|
######################################################## |
######################################################## |
######################################################## |
######################################################## |
sub initialize_package { |
sub initialize_package { |
my ($sname,$sdomain) = @_; |
my ($sname,$sdomain,$in_navmap) = @_; |
$current_name = $sname; |
$current_name = $sname; |
$current_domain = $sdomain; |
$current_domain = $sdomain; |
|
$navmap = $in_navmap; |
undef(%useropt); |
undef(%useropt); |
undef(%userdata); |
undef(%userdata); |
if ($current_course ne $ENV{'request.course.id'}) { |
if ($current_course ne $env{'request.course.id'}) { |
$current_course = $ENV{'request.course.id'}; |
$current_course = $env{'request.course.id'}; |
undef(%courseopt); |
undef(%courseopt); |
} |
} |
&load_cached_export_rows(); |
&load_cached_export_rows(); |
Line 197 sub load_parameter_caches {
|
Line 207 sub load_parameter_caches {
|
# |
# |
# Course Parameters Cache |
# Course Parameters Cache |
if (! %courseopt) { |
if (! %courseopt) { |
$current_course = $ENV{'request.course.id'}; |
$current_course = $env{'request.course.id'}; |
undef(%courseopt); |
undef(%courseopt); |
if (! defined($current_name) || ! defined($current_domain)) { |
if (! defined($current_name) || ! defined($current_domain)) { |
return; |
return; |
} |
} |
my $dom = $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}; |
my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
my $id = $ENV{'course.'.$ENV{'request.course.id'}.'.num'}; |
my $id = $env{'course.'.$env{'request.course.id'}.'.num'}; |
my %Tmp = &Apache::lonnet::dump('resourcedata',$dom,$id); |
my %Tmp = &Apache::lonnet::dump('resourcedata',$dom,$id); |
while (my ($name,$value) = each(%Tmp)) { |
while (my ($name,$value) = each(%Tmp)) { |
$courseopt{$name}=$value; |
$courseopt{$name}=$value; |
Line 246 sub ensure_current_caches {
|
Line 256 sub ensure_current_caches {
|
## Check for a modified parameters |
## Check for a modified parameters |
## |
## |
if (! defined($current_course) || |
if (! defined($current_course) || |
$current_course ne $ENV{'request.course.id'} ) { |
$current_course ne $env{'request.course.id'} ) { |
$current_course = $ENV{'request.course.id'}; |
$current_course = $env{'request.course.id'}; |
undef(%courseopt); |
undef(%courseopt); |
undef(%useropt); |
undef(%useropt); |
undef(%userdata); |
undef(%userdata); |
Line 337 sub parmval {
|
Line 347 sub parmval {
|
# |
# |
# check course |
# check course |
return $courseopt{$courselevelr} if (defined($courseopt{$courselevelr})); |
return $courseopt{$courselevelr} if (defined($courseopt{$courselevelr})); |
return $courseopt{$courselevelm} if (defined($courseopt{$courselevelm})); |
|
return $courseopt{$courselevel} if (defined($courseopt{$courselevel})); |
|
# check map parms |
# check map parms |
my $thisparm = $parmhash{$symbparm}; |
my $thisparm = $parmhash{$symbparm}; |
return $thisparm if (defined($thisparm)); |
return $thisparm if (defined($thisparm)); |
# check default |
# check default |
$thisparm = &Apache::lonnet::metadata($fn,$rwhat.'.default'); |
$thisparm = &Apache::lonnet::metadata($fn,$rwhat.'.default'); |
return $thisparm if (defined($thisparm)); |
return $thisparm if (defined($thisparm)); |
# |
# check more course |
|
return $courseopt{$courselevelm} if (defined($courseopt{$courselevelm})); |
|
return $courseopt{$courselevel} if (defined($courseopt{$courselevel})); |
|
|
# Cascade Up |
# Cascade Up |
my $space=$what; |
my $space=$what; |
$space=~s/\.\w+$//; |
$space=~s/\.[^._]+$//; |
if ($space ne '0') { |
if ($space ne '0') { |
my @parts=split(/_/,$space); |
my @parts=split(/_/,$space); |
my $id=pop(@parts); |
my $id=pop(@parts); |
Line 368 sub parmval {
|
Line 379 sub parmval {
|
|
|
sub get_html_title { |
sub get_html_title { |
my $self = shift; |
my $self = shift; |
my ($assess_title,$name,$time) = $self->get_title(); |
my ($assess_title,$name,$time) = $self->get_full_title(); |
my $title = '<h1>'.$assess_title.'</h1>'. |
my $title = '<h1>'.$assess_title.'</h1>'. |
'<h2>'.$name.', '. |
'<h2>'.$name.', '. |
&Apache::loncommon::aboutmewrapper |
&Apache::loncommon::aboutmewrapper |
Line 380 sub get_html_title {
|
Line 391 sub get_html_title {
|
|
|
sub get_title { |
sub get_title { |
my $self = shift; |
my $self = shift; |
my @title = (); |
|
if (($self->{'symb'} eq '_feedback') || |
if (($self->{'symb'} eq '_feedback') || |
($self->{'symb'} eq '_evaluation') || |
($self->{'symb'} eq '_evaluation') || |
($self->{'symb'} eq '_discussion') || |
($self->{'symb'} eq '_discussion') || |
($self->{'symb'} eq '_tutoring')) { |
($self->{'symb'} eq '_tutoring')) { |
my $assess_title = ucfirst($self->{'symb'}); |
my $assess_title = ucfirst($self->{'symb'}); |
$assess_title =~ s/^_//; |
$assess_title =~ s/^_//; |
push(@title,$assess_title); |
return $assess_title; |
} else { |
} else { |
push(@title,&Apache::lonnet::gettitle($self->{'symb'})); |
return &Apache::lonnet::gettitle($self->{'symb'}); |
} |
} |
|
} |
|
|
|
sub get_full_title { |
|
my $self = shift; |
|
my @title = ($self->get_title()); |
# Look up the users identifying information |
# Look up the users identifying information |
# Get the users information |
# Get the users information |
my %userenv = &Apache::loncoursedata::GetUserName($self->{'name'}, |
my $name = &Apache::loncommon::plainname($self->{'name'}, |
$self->{'domain'}); |
$self->{'domain'}); |
my $name = |
|
join(' ',@userenv{'firstname','middlename','lastname','generation'}); |
|
$name =~ s/\s+$//; |
|
push (@title,$name); |
push (@title,$name); |
push (@title,&Apache::lonlocal::locallocaltime(time)); |
push (@title,&Apache::lonlocal::locallocaltime(time)); |
return @title; |
return @title; |
Line 415 sub parent_link {
|
Line 427 sub parent_link {
|
sub outsheet_html { |
sub outsheet_html { |
my $self = shift; |
my $self = shift; |
my ($r) = @_; |
my ($r) = @_; |
|
#################################### |
|
# Report any calculation errors # |
|
#################################### |
|
$r->print($self->html_report_error()); |
################################### |
################################### |
# Determine table structure |
# Determine table structure |
################################### |
################################### |
Line 523 sub csv_rows {
|
Line 539 sub csv_rows {
|
# writes the meat of the spreadsheet to an excel worksheet. Called |
# writes the meat of the spreadsheet to an excel worksheet. Called |
# by Spreadsheet::outsheet_excel; |
# by Spreadsheet::outsheet_excel; |
my $self = shift; |
my $self = shift; |
my ($filehandle) = @_; |
my ($connection,$filehandle) = @_; |
# |
# |
# Write a header row |
# Write a header row |
$self->csv_output_row($filehandle,undef, |
$self->csv_output_row($filehandle,undef, |
Line 546 sub excel_rows {
|
Line 562 sub excel_rows {
|
# writes the meat of the spreadsheet to an excel worksheet. Called |
# writes the meat of the spreadsheet to an excel worksheet. Called |
# by Spreadsheet::outsheet_excel; |
# by Spreadsheet::outsheet_excel; |
my $self = shift; |
my $self = shift; |
my ($worksheet,$cols_output,$rows_output) = @_; |
my ($connection,$worksheet,$cols_output,$rows_output,$format) = @_; |
|
return if (! ref($worksheet)); |
# |
# |
# Write a header row |
# Write a header row |
$cols_output = 0; |
$cols_output = 0; |
foreach my $value ('Parameter','Description','Value') { |
foreach my $value ('Parameter','Description','Value') { |
$worksheet->write($rows_output,$cols_output++,&mt($value)); |
$worksheet->write($rows_output,$cols_output++,$value,$format->{'h4'}); |
} |
} |
$rows_output++; |
$rows_output++; |
# |
# |
# Write each row |
# Write each row |
foreach my $rownum (sort {$a <=> $b} ($self->rows())) { |
foreach my $rownum (sort {$a <=> $b} ($self->rows())) { |
Line 644 sub get_problem_state {
|
Line 661 sub get_problem_state {
|
|
|
sub determine_parts { |
sub determine_parts { |
my $self = shift; |
my $self = shift; |
|
my $check_hidden = shift; |
if (exists($self->{'Parts'}) && ref($self->{'Parts'}) eq 'HASH') { |
if (exists($self->{'Parts'}) && ref($self->{'Parts'}) eq 'HASH') { |
return; |
return; |
} |
} |
Line 654 sub determine_parts {
|
Line 672 sub determine_parts {
|
my $metadata = &Apache::lonnet::metadata($src,'packages'); |
my $metadata = &Apache::lonnet::metadata($src,'packages'); |
foreach (split(',',$metadata)) { |
foreach (split(',',$metadata)) { |
my ($part) = (/^part_(.*)$/); |
my ($part) = (/^part_(.*)$/); |
if (defined($part) && |
if (!defined($part)) { next; } |
! &Apache::loncommon::check_if_partid_hidden |
if (!$check_hidden) { $Parts{$part}++; next; } |
($part,$self->{'symb'},$self->{'name'},$self->{'domain'}) |
if (!&Apache::loncommon::check_if_partid_hidden |
|
($part,$self->{'symb'},$self->{'name'},$self->{'domain'}) |
) { |
) { |
$Parts{$part}++; |
$Parts{$part}++; |
} |
} |
Line 691 sub parameter_part_is_valid {
|
Line 710 sub parameter_part_is_valid {
|
sub compute { |
sub compute { |
my $self = shift; |
my $self = shift; |
my ($r) = @_; |
my ($r) = @_; |
my $connection = $r->connection(); |
|
if ($connection->aborted()) { $self->cleanup(); return; } |
|
$self->initialize_safe_space(); |
$self->initialize_safe_space(); |
######################################### |
######################################### |
######################################### |
######################################### |
Line 720 sub compute {
|
Line 737 sub compute {
|
} |
} |
# |
# |
# Get the values of the metadata fields |
# Get the values of the metadata fields |
if ($connection->aborted()) { $self->cleanup(); return; } |
|
$self->ensure_current_caches(); |
$self->ensure_current_caches(); |
if ($connection->aborted()) { $self->cleanup(); return; } |
|
%parameters = $self->get_parameter_values(keys(%parameters)); |
%parameters = $self->get_parameter_values(keys(%parameters)); |
if ($connection->aborted()) { $self->cleanup(); return; } |
|
# |
# |
# Clean out unnecessary parameters |
# Clean out unnecessary parameters |
foreach (keys(%parameters)) { |
foreach (keys(%parameters)) { |
Line 732 sub compute {
|
Line 746 sub compute {
|
} |
} |
# |
# |
# Get the students performance data |
# Get the students performance data |
|
$self->determine_parts(($parameters{'parameter_0_hiddenparts'} ne '')); |
my %student_parameters = $self->get_problem_state(); |
my %student_parameters = $self->get_problem_state(); |
while (my ($parm,$value) = each(%student_parameters)) { |
while (my ($parm,$value) = each(%student_parameters)) { |
$parm =~ s/^resource\./stores_/; |
$parm =~ s/^resource\./stores_/; |
$parm =~ s/\./_/g; |
$parm =~ s/\./_/g; |
$parameters{$parm} = $value; |
# Clean out any bad parameters |
} |
next if (! $self->parameter_part_is_valid($parm)); |
# |
$parameters{$parm} = $value; |
# Clean out any bad parameters |
|
$self->determine_parts(); |
|
foreach my $param (keys(%parameters)) { |
|
if (! $self->parameter_part_is_valid($param)) { |
|
delete ($parameters{$param}); |
|
} |
|
} |
} |
# |
# |
# Set up the formulas and parameter values |
# Set up the formulas and parameter values |
Line 752 sub compute {
|
Line 761 sub compute {
|
my %c; |
my %c; |
# |
# |
# Check for blackout requirements |
# Check for blackout requirements |
if ((!exists($ENV{'request.role.adv'}) || !$ENV{'request.role.adv'})) { |
if ((!exists($env{'request.role.adv'}) || !$env{'request.role.adv'})) { |
while (my ($parm,$value) = each(%parameters)) { |
while (my ($parm,$value) = each(%parameters)) { |
last if ($self->blackout()); |
last if ($self->blackout()); |
next if ($parm !~ /^(parameter_.*)_problemstatus$/); |
next if ($parm !~ /^(parameter_.*)_problemstatus$/); |
Line 766 sub compute {
|
Line 775 sub compute {
|
} |
} |
} |
} |
} |
} |
if ($connection->aborted()) { $self->cleanup(); return; } |
|
# |
# |
# Move the parameters into the spreadsheet |
# Move the parameters into the spreadsheet |
while (my ($parm,$value) = each(%parameters)) { |
while (my ($parm,$value) = each(%parameters)) { |
my $cell = 'A'.$self->get_row_number_from_key($parm); |
my $cell = 'A'.$self->get_row_number_from_key($parm); |
$f{$cell} = $parm; |
$f{$cell} = $parm; |
$value = '"'.$value.'"' if ($value =~/[^0-9.]/); |
if ($parm =~ /_submission$/ && $value =~ /(\{|\})/) { |
|
$value = 'witheld'; |
|
} |
|
$value = 'q{'.$value.'}' if ($value =~/([^\d\.]|\.\.)/); |
$c{$parm} = $value; |
$c{$parm} = $value; |
} |
} |
$self->formulas(\%f); |
$self->formulas(\%f); |
$self->constants(\%c); |
$self->constants(\%c); |
if ($connection->aborted()) { $self->cleanup(); return; } |
|
$self->calcsheet(); |
$self->calcsheet(); |
# |
# |
# Store export row in cache |
# Store export row in cache |
my @exportarray = $self->exportrow(); |
my @exportarray = $self->exportrow(); |
$self->deal_with_export_row(@exportarray); |
$self->deal_with_export_row(@exportarray); |
$self->save() if ($self->need_to_save()); |
$self->save() if ($self->need_to_save()); |
if ($connection->aborted()) { $self->cleanup(); return; } |
|
return; |
return; |
} |
} |
|
|
Line 794 sub compute {
|
Line 803 sub compute {
|
sub sett { |
sub sett { |
my $self = shift; |
my $self = shift; |
my %t=(); |
my %t=(); |
|
undef(%Apache::Spreadsheet::sheet_values); |
# |
# |
# Deal with the template row by copying the template formulas into each |
# Deal with the template row by copying the template formulas into each |
# row. |
# row. |
Line 820 sub sett {
|
Line 830 sub sett {
|
next if ($cell =~ /template_/); |
next if ($cell =~ /template_/); |
if ($cell =~ /^A/ && $cell ne 'A0') { |
if ($cell =~ /^A/ && $cell ne 'A0') { |
if ($formula !~ /^\!/) { |
if ($formula !~ /^\!/) { |
$t{$cell}=$self->{'constants'}->{$formula}; |
$Apache::Spreadsheet::sheet_values{$cell}= |
|
eval($self->{'constants'}->{$formula}); |
} |
} |
} else { |
} else { |
$t{$cell}=$formula; |
$t{$cell}=$formula; |
Line 855 These rows are saved in the students dir
|
Line 866 These rows are saved in the students dir
|
sub load_cached_export_rows { |
sub load_cached_export_rows { |
undef(%Exportrows); |
undef(%Exportrows); |
my @tmp = &Apache::lonnet::dump('nohist_calculatedsheets_'. |
my @tmp = &Apache::lonnet::dump('nohist_calculatedsheets_'. |
$ENV{'request.course.id'}, |
$env{'request.course.id'}, |
$current_domain,$current_name,undef); |
$current_domain,$current_name,undef); |
if ($tmp[0]!~/^error/) { |
if ($tmp[0]!~/^error/) { |
my %tmp = @tmp; |
my %tmp = @tmp; |
my $default_filename = $ENV{'course.'.$ENV{'request.course.id'}. |
my $default_filename = $env{'course.'.$env{'request.course.id'}. |
'.spreadsheet_default_assesscalc'}; |
'.spreadsheet_default_assesscalc'}; |
# We only got one key, so we will access it directly. |
# We only got one key, so we will access it directly. |
while (my ($key,$sheetdata) = each(%tmp)) { |
while (my ($key,$sheetdata) = each(%tmp)) { |
my ($sname,$sdom,$sheettype,$symb) = split(':',$key); |
my ($sname,$sdom,$sheettype,$symb) = split(':',$key); |
|
if (! defined($sname) || $sname eq '' || |
|
! defined($sdom) || $sdom eq '' ) { |
|
next; |
|
} |
if ($symb =~ /\.time$/) { |
if ($symb =~ /\.time$/) { |
$symb =~ s/\.time$//; |
$symb =~ s/\.time$//; |
$Exportrows{$symb}->{'time'} = $sheetdata; |
$Exportrows{$symb}->{'time'} = $sheetdata; |
Line 895 spreadsheet only if necessary.
|
Line 910 spreadsheet only if necessary.
|
sub export_data { |
sub export_data { |
my $self = shift; |
my $self = shift; |
my ($r) = @_; |
my ($r) = @_; |
my $connection = $r->connection(); |
|
my $symb = $self->{'symb'}; |
my $symb = $self->{'symb'}; |
if (! exists($ENV{'request.role.adv'}) || ! $ENV{'request.role.adv'} || |
if (! exists($env{'request.role.adv'}) || ! $env{'request.role.adv'} || |
! exists($Exportrows{$symb}) || ! defined($Exportrows{$symb}) || |
! exists($Exportrows{$symb}) || ! defined($Exportrows{$symb}) || |
! $self->check_expiration_time($Exportrows{$symb}->{'time'}) || |
! $self->check_expiration_time($Exportrows{$symb}->{'time'}) || |
! exists($Exportrows{$symb}->{$self->{'filename'}}) || |
! exists($Exportrows{$symb}->{$self->{'filename'}}) || |
Line 906 sub export_data {
|
Line 920 sub export_data {
|
) { |
) { |
$self->compute($r); |
$self->compute($r); |
} |
} |
if ($connection->aborted()) { $self->cleanup(); return; } |
my @Data; |
my @Data = @{$Exportrows{$symb}->{$self->{'filename'}}}; |
if ($self->badcalc()) { |
if ($Data[0] =~ /^(.*)___=___/) { |
@Data = (); |
$self->{'sheetname'} = $1; |
} else { |
$Data[0] =~ s/^(.*)___=___//; |
@Data = @{$Exportrows{$symb}->{$self->{'filename'}}}; |
} |
if ($Data[0] =~ /^(.*)___=___/) { |
for (my $i=0;$i<$#Data;$i++) { |
$self->{'sheetname'} = $1; |
$Data[$i]="'".$Data[$i]."'" if ($Data[$i]=~/\D/ && defined($Data[$i])); |
$Data[0] =~ s/^(.*)___=___//; |
|
} |
|
for (my $i=0;$i<$#Data;$i++) { |
|
if ($Data[$i]=~/\D/ && defined($Data[$i])) { |
|
$Data[$i]="'".$Data[$i]."'"; |
|
} |
|
} |
} |
} |
return @Data; |
return @Data; |
} |
} |
Line 936 sub save_export_data {
|
Line 956 sub save_export_data {
|
return if ($self->temporary()); |
return if ($self->temporary()); |
my $student = $self->{'name'}.':'.$self->{'domain'}; |
my $student = $self->{'name'}.':'.$self->{'domain'}; |
my $symb = $self->{'symb'}; |
my $symb = $self->{'symb'}; |
|
if ($self->badcalc()){ |
|
# do not save data away when calculations have not been done properly. |
|
delete($Exportrows{$symb}); |
|
return; |
|
} |
if (! exists($Exportrows{$symb}) || |
if (! exists($Exportrows{$symb}) || |
! exists($Exportrows{$symb}->{$self->{'filename'}})) { |
! exists($Exportrows{$symb}->{$self->{'filename'}})) { |
return; |
return; |