--- loncom/interface/spreadsheet/studentcalc.pm 2004/12/08 00:56:00 1.27
+++ loncom/interface/spreadsheet/studentcalc.pm 2006/03/26 22:48:34 1.36
@@ -1,5 +1,5 @@
#
-# $Id: studentcalc.pm,v 1.27 2004/12/08 00:56:00 albertel Exp $
+# $Id: studentcalc.pm,v 1.36 2006/03/26 22:48:34 bowersj2 Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -63,25 +63,26 @@ use Apache::lonlocal;
@Apache::studentcalc::ISA = ('Apache::Spreadsheet');
my @Sequences = ();
+my $navmap;
my %Exportrows = ();
my $current_course;
sub initialize {
- &Apache::assesscalc::initialize();
&initialize_sequence_cache();
+ &Apache::assesscalc::initialize($navmap);
}
sub initialize_package {
- $current_course = $ENV{'request.course.id'};
+ $current_course = $env{'request.course.id'};
&initialize_sequence_cache();
&load_cached_export_rows();
}
sub ensure_correct_sequence_data {
- if ($current_course ne $ENV{'request.course.id'}) {
+ if ($current_course ne $env{'request.course.id'}) {
&initialize_sequence_cache();
- $current_course = $ENV{'request.course.id'};
+ $current_course = $env{'request.course.id'};
}
return;
}
@@ -90,19 +91,40 @@ sub initialize_sequence_cache {
#
# Set up the sequences and assessments
undef(@Sequences);
- my ($top,$sequences,$assessments) =
- &Apache::loncoursedata::get_sequence_assessment_data();
- if (! defined($top) || ! ref($top)) {
- # There has been an error, better report it
- &Apache::lonnet::logthis('top is undefined (studentcalc.pm)');
- return;
+ undef($navmap);
+ $navmap = Apache::lonnavmaps::navmap->new();
+ if (!defined($navmap)) {
+ &Apache::lonnet::logthis('student spreadsheet:Can not open Coursemap');
+ }
+ my @all_sequences = $navmap->retrieveResources(undef,
+ sub { shift->is_map(); },1,0,1);
+ for my $sequence ($navmap->getById('0.0'), @all_sequences) {
+ if ($navmap->hasResource($sequence,sub { shift->is_problem(); }, 0)){
+ push(@Sequences,$sequence);
+ &get_resources($sequence);
+ }
}
- @Sequences = @{$sequences} if (ref($sequences) eq 'ARRAY');
+}
+
+my %res_memoize;
+sub get_resources {
+ my ($seq) = @_;
+ if (exists($res_memoize{$seq->symb()})) {
+ return @{$res_memoize{$seq->symb()}};
+ }
+ return () if (! defined($navmap) || ! ref($navmap));
+ my @resources = $navmap->retrieveResources($seq,
+ sub { shift->is_problem(); },
+ 0,0,0);
+ $res_memoize{$seq->symb()}=\@resources;
+ return @resources;
}
sub clear_package {
undef(@Sequences);
undef(%Exportrows);
+ undef(%res_memoize);
+ undef($navmap);
&Apache::assesscalc::clear_package();
}
@@ -123,8 +145,8 @@ sub get_html_title {
my $self = shift;
my ($name,$desc,$time) = $self->get_title();
my $title = '<h1>'.$name;
- if ($ENV{'user.name'} ne $self->{'name'} &&
- $ENV{'user.domain'} ne $self->{'domain'}) {
+ if ($env{'user.name'} ne $self->{'name'} &&
+ $env{'user.domain'} ne $self->{'domain'}) {
$title .= ' '.&Apache::loncommon::aboutmewrapper
($self->{'name'}.'@'.$self->{'domain'},
$self->{'name'},$self->{'domain'});
@@ -143,9 +165,9 @@ sub parent_link {
sub convenience_links {
my $self = shift;
my ($resource) = @_;
- my $result=&Apache::loncommon::submlink('<img src="/adm/lonMisc/subm_button.gif" border="0" />',$self->{'name'},$self->{'domain'},$resource->{'symb'},'LONcatInfo');
- $result .= &Apache::loncommon::pgrdlink('<img src="/adm/lonMisc/pgrd_button.gif" border="0" />',$self->{'name'},$self->{'domain'},$resource->{'symb'},'LONcatInfo');
- $result .= &Apache::loncommon::pprmlink('<img src="/adm/lonMisc/pprm_button.gif" border="0" />',$self->{'name'},$self->{'domain'},$resource->{'symb'},'LONcatInfo');
+ my $result=&Apache::loncommon::submlink('<img src="/adm/lonMisc/subm_button.gif" border="0" />',$self->{'name'},$self->{'domain'},$resource->symb,'LONcatInfo');
+ $result .= &Apache::loncommon::pgrdlink('<img src="/adm/lonMisc/pgrd_button.gif" border="0" />',$self->{'name'},$self->{'domain'},$resource->symb,'LONcatInfo');
+ $result .= &Apache::loncommon::pprmlink('<img src="/adm/lonMisc/pprm_button.gif" border="0" />',$self->{'name'},$self->{'domain'},$resource->symb,'LONcatInfo');
return $result;
}
@@ -159,7 +181,7 @@ sub outsheet_html {
####################################
my @AssessFileNames = $self->othersheets('assesscalc');
my $editing_is_allowed = &Apache::lonnet::allowed('mgr',
- $ENV{'request.course.id'});
+ $env{'request.course.id'});
####################################
# Report any calculation errors #
####################################
@@ -207,7 +229,7 @@ END
$r->print($tableheader);
#
# Print out template row
- if (exists($ENV{'request.role.adv'}) && $ENV{'request.role.adv'}) {
+ if (exists($env{'request.role.adv'}) && $env{'request.role.adv'}) {
$r->print('<tr><td>Template</td><td> </td>'.
$self->html_template_row($num_uneditable,
$importcolor)."</tr>\n");
@@ -220,7 +242,7 @@ END
$r->print("</table>\n");
#
# Prepare to output rows
- if (exists($ENV{'request.role.adv'}) && $ENV{'request.role.adv'}) {
+ if (exists($env{'request.role.adv'}) && $env{'request.role.adv'}) {
$tableheader =<<"END";
</p><p>
<table border="2">
@@ -248,12 +270,19 @@ END
&initialize_sequence_cache();
}
foreach my $Sequence (@Sequences) {
- next if ($Sequence->{'num_assess'} < 1);
- $r->print("<h3>".$Sequence->{'title'}."</h3>\n");
+ $r->print("<h3>".$Sequence->compTitle."</h3>\n");
+
+ my @resources = &get_resources($Sequence);
+ my $first_rownum =
+ $self->get_row_number_from_key($resources[0]->symb);
+ my $last_rownum =
+ $self->get_row_number_from_key($resources[-1]->symb);
+ $r->print(&assess_file_selector([$first_rownum, $last_rownum],
+ undef, \@AssessFileNames));
+
$r->print($tableheader);
- foreach my $resource (@{$Sequence->{'contents'}}) {
- next if ($resource->{'type'} ne 'assessment');
- my $rownum = $self->get_row_number_from_key($resource->{'symb'});
+ foreach my $resource (@resources) {
+ my $rownum = $self->get_row_number_from_key($resource->symb);
my $assess_filename = $self->{'row_source'}->{$rownum};
my $row_output = '<tr>';
if ($editing_is_allowed) {
@@ -263,17 +292,17 @@ END
'<a href="/adm/assesscalc?sname='.$self->{'name'}.
'&sdomain='.$self->{'domain'}.
'&filename='.$assess_filename.
- '&usymb='.&Apache::lonnet::escape($resource->{'symb'}).
- '">'.$resource->{'title'}.'</a><br />';
+ '&usymb='.&Apache::lonnet::escape($resource->symb).
+ '">'.$resource->compTitle.'</a><br />';
$row_output .= &assess_file_selector($rownum,
$assess_filename,
\@AssessFileNames).
'</td>';
} else {
- $row_output .= '<td><a href="'.$resource->{'src'}.'?symb='.
- &Apache::lonnet::escape($resource->{'symb'}).
+ $row_output .= '<td><a href="'.$resource->src.'?symb='.
+ &Apache::lonnet::escape($resource->symb).
'">Go To</a>';
- $row_output .= '</td><td>'.$resource->{'title'}.'</td>';
+ $row_output .= '</td><td>'.$resource->compTitle.'</td>';
}
if ($self->blackout() && $self->{'blackout_rows'}->{$rownum}>0) {
$row_output .=
@@ -307,13 +336,26 @@ sub assess_file_selector {
if (!defined($AssessFiles) || ! @$AssessFiles) {
return '';
}
- return '' if (! &Apache::lonnet::allowed('mgr',$ENV{'request.course.id'}));
- my $element_name = 'FileSelect_'.$row;
+ return '' if (! &Apache::lonnet::allowed('mgr',$env{'request.course.id'}));
+ my $element_name;
+ my $source_row = $row;
+ if (ref($row)) {
+ my ($first_rownum, $last_rownum) = @$row;
+ $element_name = "FileSelect_${first_rownum}_${last_rownum}";
+ $source_row = "${first_rownum}:${last_rownum}";
+ } else {
+ $element_name = 'FileSelect_'.$row;
+ }
my $load_dialog = '<select size="1" name="'.$element_name.'" '.
'onchange="'.
- "document.sheet.cell.value='source_$row';".
+ "document.sheet.cell.value='source_${source_row}';".
"document.sheet.newformula.value=document.sheet.$element_name\.value;".
'document.sheet.submit()" '.'>'."\n";
+ if (ref($row)) {
+ $load_dialog .= ' <option name="" value="">' .
+ &mt("Select spreadsheet for entire sequence")
+ . "</option>\n";
+ }
foreach my $file (@{$AssessFiles}) {
$load_dialog .= ' <option name="'.$file.'"';
$load_dialog .= ' selected' if ($default eq $file);
@@ -326,22 +368,36 @@ sub assess_file_selector {
sub modify_cell {
my $self = shift;
my ($cell,$formula) = @_;
- if ($cell =~ /^source_(\d+)$/) {
- # Need to make sure $formula is a valid filename....
- my $row = $1;
- $cell = 'A'.$row;
+
+ my $set_row = sub {
+ my $row = shift;
+ my $formula = shift;
+ my $cell = 'A' . $row;
$self->{'row_source'}->{$row} = $formula;
my $original_source = $self->formula($cell);
if ($original_source =~ /__&&&__/) {
($original_source,undef) = split('__&&&__',$original_source);
}
$formula = $original_source.'__&&&__'.$formula;
+ $self->set_formula($cell,$formula);
+ };
+
+ if ($cell =~ /^source_(\d+):(\d+)$/) {
+ my $first_row = $1;
+ my $last_row = $2;
+ for my $row ($first_row..$last_row) {
+ $set_row->($row, $formula);
+ }
+ } elsif ($cell =~ /^source_(\d+)$/) {
+ # Need to make sure $formula is a valid filename....
+ my $row = $1;
+ $set_row->($row, $formula);
} elsif ($cell =~ /([A-z])\-/) {
$cell = 'template_'.$1;
+ $self->set_formula($cell,$formula);
} elsif ($cell !~ /^([A-z](\d+)|template_[A-z])$/) {
return;
}
- $self->set_formula($cell,$formula);
$self->rebuild_stats();
return;
}
@@ -361,11 +417,10 @@ sub csv_rows {
&initialize_sequence_cache();
}
foreach my $Sequence (@Sequences) {
- next if ($Sequence->{'num_assess'} < 1);
- foreach my $resource (@{$Sequence->{'contents'}}) {
- my $rownum = $self->get_row_number_from_key($resource->{'symb'});
- my @assessdata = ($Sequence->{'title'},
- $resource->{'title'});
+ foreach my $resource (&get_resources($Sequence)) {
+ my $rownum = $self->get_row_number_from_key($resource->symb);
+ my @assessdata = ($Sequence->compTitle,
+ $resource->compTitle);
$self->csv_output_row($filehandle,$rownum,@assessdata);
}
}
@@ -376,12 +431,12 @@ sub excel_rows {
# writes the meat of the spreadsheet to an excel worksheet. Called
# by Spreadsheet::outsheet_excel;
my $self = shift;
- my ($connection,$worksheet,$cols_output,$rows_output) = @_;
+ my ($connection,$worksheet,$cols_output,$rows_output,$format) = @_;
#
# Write a header row
$cols_output = 0;
foreach my $value ('Container','Assessment title') {
- $worksheet->write($rows_output,$cols_output++,&mt($value));
+ $worksheet->write($rows_output,$cols_output++,&mt($value),$format->{'h4'});
}
$rows_output++;
#
@@ -390,11 +445,10 @@ sub excel_rows {
&initialize_sequence_cache();
}
foreach my $Sequence (@Sequences) {
- next if ($Sequence->{'num_assess'} < 1);
- foreach my $resource (@{$Sequence->{'contents'}}) {
- my $rownum = $self->get_row_number_from_key($resource->{'symb'});
- my @assessdata = ($Sequence->{'title'},
- $resource->{'title'});
+ foreach my $resource (&get_resources($Sequence)) {
+ my $rownum = $self->get_row_number_from_key($resource->symb);
+ my @assessdata = ($Sequence->compTitle,
+ $resource->compTitle);
$self->excel_output_row($worksheet,$rownum,$rows_output++,
@assessdata);
}
@@ -414,11 +468,10 @@ sub get_rows_in_sequence {
my $self = shift();
my ($sequence) = @_;
my @Rows;
- foreach my $resource (@{$sequence->{'contents'}}) {
- if ($resource->{'type'} eq 'assessment') {
- my $rownum = $self->get_row_number_from_key($resource->{'symb'});
- push (@Rows,$rownum);
- }
+ my @resources = &get_resources($sequence);
+ foreach my $resource (@resources) {
+ my $rownum = $self->get_row_number_from_key($resource->symb);
+ push (@Rows,$rownum);
}
return @Rows;
}
@@ -441,7 +494,7 @@ sub put_sequence_data_in_safe_space {
# 1. duplicate titles - they get the total for the titles
# 2. control characters in titles - use q{} around the string to
# deal with it.
- my $title = &HTML::Entities::decode($seq->{'title'});
+ my $title = &HTML::Entities::decode($seq->title());
$title =~ s/&\#058;/:/g;
if (@Rows) {
$data .= 'push(@{$Sequence_Rows{"'.quotemeta($title).'"}},'.
@@ -487,28 +540,24 @@ END
sub compute {
my $self = shift;
my ($r) = @_;
- my $connection = $r->connection();
- if ($connection->aborted()) { $self->cleanup; return; }
if (! defined($current_course) ||
- $current_course ne $ENV{'request.course.id'} ||
+ $current_course ne $env{'request.course.id'} ||
! @Sequences ) {
- $current_course = $ENV{'request.course.id'};
+ $current_course = $env{'request.course.id'};
&clear_package();
&initialize_sequence_cache();
}
$self->initialize_safe_space();
- &Apache::assesscalc::initialize_package($self->{'name'},$self->{'domain'});
+ &Apache::assesscalc::initialize_package($self->{'name'},$self->{'domain'},
+ $navmap);
my %f = $self->formulas();
#
# Process the formulas list -
# the formula for the A column of a row is symb__&&__filename
my %c = $self->constants();
foreach my $seq (@Sequences) {
- next if ($seq->{'num_assess'}<1);
- foreach my $resource (@{$seq->{'contents'}}) {
- if ($connection->aborted()) { $self->cleanup(); return; }
- next if ($resource->{'type'} ne 'assessment');
- my $rownum = $self->get_row_number_from_key($resource->{'symb'});
+ foreach my $resource (&get_resources($seq)) {
+ my $rownum = $self->get_row_number_from_key($resource->symb);
my $cell = 'A'.$rownum;
my $assess_filename = 'Default';
if (exists($self->{'row_source'}->{$rownum})) {
@@ -516,13 +565,12 @@ sub compute {
} else {
$self->{'row_source'}->{$rownum} = $assess_filename;
}
- $f{$cell} = $resource->{'symb'}.'__&&&__'.$assess_filename;
- if ($connection->aborted()) { $self->cleanup(); return; }
+ $f{$cell} = $resource->symb.'__&&&__'.$assess_filename;
my $assessSheet;
$assessSheet = Apache::assesscalc->new($self->{'name'},
$self->{'domain'},
$assess_filename,
- $resource->{'symb'});
+ $resource->symb);
my @exportdata = $assessSheet->export_data($r);
#
if ($assessSheet->badcalc()) {
@@ -531,7 +579,6 @@ sub compute {
$assessSheet->get_title(),$rownum,$assessSheet->calcerror()));
}
#
- if ($connection->aborted()) { $self->cleanup(); return; }
if ($assessSheet->blackout()) {
$self->blackout(1);
$self->{'blackout_rows'}->{$rownum} = 1;
@@ -574,6 +621,7 @@ sub compute {
sub set_row_sources {
my $self = shift;
+ $self->check_formulas_loaded();
while (my ($cell,$value) = each(%{$self->{'formulas'}})) {
next if ($cell !~ /^A(\d+)$/ || $1 < 1);
my $row = $1;
@@ -586,6 +634,7 @@ sub set_row_sources {
sub set_row_numbers {
my $self = shift;
+ $self->check_formulas_loaded();
while (my ($cell,$formula) = each(%{$self->{'formulas'}})) {
next if ($cell !~ /^A(\d+)/);
my $row = $1;
@@ -624,12 +673,12 @@ These rows are saved in the courses dire
sub load_cached_export_rows {
undef(%Exportrows);
my @tmp = &Apache::lonnet::dump('nohist_calculatedsheets',
- $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
- $ENV{'course.'.$ENV{'request.course.id'}.'.num'},undef);
+ $env{'course.'.$env{'request.course.id'}.'.domain'},
+ $env{'course.'.$env{'request.course.id'}.'.num'},undef);
my %Selected_Assess_Sheet;
if ($tmp[0] =~ /^error/) {
&Apache::lonnet::logthis('unable to read cached student export rows '.
- 'for course '.$ENV{'request.course.id'});
+ 'for course '.$env{'request.course.id'});
return;
}
my %tmp = @tmp;