--- loncom/interface/spreadsheet/studentcalc.pm 2005/05/17 17:48:19 1.33
+++ loncom/interface/spreadsheet/studentcalc.pm 2017/12/31 15:27:03 1.47
@@ -1,5 +1,5 @@
#
-# $Id: studentcalc.pm,v 1.33 2005/05/17 17:48:19 albertel Exp $
+# $Id: studentcalc.pm,v 1.47 2017/12/31 15:27:03 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -59,6 +59,8 @@ use Apache::assesscalc();
use HTML::Entities();
use Time::HiRes;
use Apache::lonlocal;
+use LONCAPA;
+
@Apache::studentcalc::ISA = ('Apache::Spreadsheet');
@@ -98,11 +100,15 @@ sub initialize_sequence_cache {
}
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);
- }
+ my $toplevelseq = $navmap->getById('0.0');
+ if (!grep(/^\Q$toplevelseq\E$/,@all_sequences)) {
+ unshift(@all_sequences,$toplevelseq);
+ }
+ foreach my $sequence (@all_sequences) {
+ if ($navmap->hasResource($sequence,sub { shift->is_gradable(); }, 0,1)){
+ push(@Sequences,$sequence);
+ &get_resources($sequence);
+ }
}
}
@@ -114,8 +120,8 @@ sub get_resources {
}
return () if (! defined($navmap) || ! ref($navmap));
my @resources = $navmap->retrieveResources($seq,
- sub { shift->is_problem(); },
- 0,0,0);
+ sub { shift->is_gradable(); },
+ 0,0,1);
$res_memoize{$seq->symb()}=\@resources;
return @resources;
}
@@ -221,16 +227,16 @@ END
}
$tableheader .="</tr>\n";
if ($self->blackout()) {
- $r->print('<font color="red" size="+2"><p>'.
+ $r->print('<p class="LC_warning">'.
&mt('Some computations are not available at this time.').'<br />'.
&mt('There are problems whose status you are not allowed to view.').
- '</font></p>'."\n");
+ '</p>'."\n");
} else {
$r->print($tableheader);
#
# Print out template row
if (exists($env{'request.role.adv'}) && $env{'request.role.adv'}) {
- $r->print('<tr><td>Template</td><td> </td>'.
+ $r->print('<tr><td>'.&mt('Template').'</td><td> </td>'.
$self->html_template_row($num_uneditable,
$importcolor)."</tr>\n");
}
@@ -271,8 +277,17 @@ END
}
foreach my $Sequence (@Sequences) {
$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 (&get_resources($Sequence)) {
+ 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>';
@@ -283,7 +298,7 @@ END
'<a href="/adm/assesscalc?sname='.$self->{'name'}.
'&sdomain='.$self->{'domain'}.
'&filename='.$assess_filename.
- '&usymb='.&Apache::lonnet::escape($resource->symb).
+ '&usymb='.&escape($resource->symb).
'">'.$resource->compTitle.'</a><br />';
$row_output .= &assess_file_selector($rownum,
$assess_filename,
@@ -291,8 +306,8 @@ END
'</td>';
} else {
$row_output .= '<td><a href="'.$resource->src.'?symb='.
- &Apache::lonnet::escape($resource->symb).
- '">Go To</a>';
+ &escape($resource->symb).
+ '"><span class="LC_nobreak">'.&mt('Go To').'</span></a>';
$row_output .= '</td><td>'.$resource->compTitle.'</td>';
}
if ($self->blackout() && $self->{'blackout_rows'}->{$rownum}>0) {
@@ -328,12 +343,25 @@ sub assess_file_selector {
return '';
}
return '' if (! &Apache::lonnet::allowed('mgr',$env{'request.course.id'}));
- my $element_name = 'FileSelect_'.$row;
+ 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);
@@ -346,22 +374,38 @@ 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;
+ } else {
+ $self->set_formula($cell,$formula);
}
- $self->set_formula($cell,$formula);
$self->rebuild_stats();
return;
}
@@ -458,7 +502,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).'"}},'.
@@ -513,7 +557,7 @@ sub compute {
}
$self->initialize_safe_space();
&Apache::assesscalc::initialize_package($self->{'name'},$self->{'domain'},
- $navmap);
+ $navmap,$self);
my %f = $self->formulas();
#
# Process the formulas list -
@@ -534,7 +578,9 @@ sub compute {
$assessSheet = Apache::assesscalc->new($self->{'name'},
$self->{'domain'},
$assess_filename,
- $resource->symb);
+ $resource->symb,
+ $self->{'section'},
+ $self->{'groups'});
my @exportdata = $assessSheet->export_data($r);
#
if ($assessSheet->badcalc()) {
@@ -585,6 +631,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;
@@ -597,6 +644,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;