| row | Item |
-END
+ $tableheader =
+ ''.
+ '| '.&mt('Row').' | '.
+ ''.&mt('Item').' | ';
foreach (split(//,'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz')){
if ($label_num<$num_uneditable) {
$tableheader.='';
@@ -474,6 +558,11 @@ END
#
my $num_output = 0;
foreach my $rownum (sort {$a <=> $b} ($self->rows())) {
+ if (! $self->parameter_part_is_valid(
+ $self->{'formulas'}->{'A'.$rownum}
+ )) {
+ next;
+ }
if ($num_output++ % 50 == 0) {
$r->print(" |
|---|
\n".$tableheader);
}
@@ -491,8 +580,8 @@ sub assess_html_row {
my @rowdata = $self->get_row($row);
my $num_cols_output = 0;
my $row_html;
- if (exists($nice_parameter_name{$parameter_name})) {
- my $name = $nice_parameter_name{$parameter_name};
+ my $name=$self->get_parm_name($parameter_name);
+ if ($name ne '') {
$name =~ s/ /\ /g;
$row_html .= ''.$name.'
'.$parameter_name.' | ';
} else {
@@ -504,7 +593,7 @@ sub assess_html_row {
$row_html .= &Apache::Spreadsheet::html_uneditable_cell($cell,
'#FFDDDD');
} else {
- $row_html .= '';
+ $row_html .= ' | ';
$row_html .= &Apache::Spreadsheet::html_editable_cell($cell,
'#E0FFDD',1);
}
@@ -518,7 +607,7 @@ sub csv_rows {
# writes the meat of the spreadsheet to an excel worksheet. Called
# by Spreadsheet::outsheet_excel;
my $self = shift;
- my ($filehandle) = @_;
+ my ($connection,$filehandle) = @_;
#
# Write a header row
$self->csv_output_row($filehandle,undef,
@@ -527,10 +616,7 @@ sub csv_rows {
# Write each row
foreach my $rownum (sort {$a <=> $b} ($self->rows())) {
my $parameter_name = $self->{'formulas'}->{'A'.$rownum};
- my $description = '';
- if (exists($nice_parameter_name{$parameter_name})) {
- $description = $nice_parameter_name{$parameter_name};
- }
+ my $description = $self->get_parm_name($parameter_name);
$self->csv_output_row($filehandle,$rownum,
$parameter_name,$description);
}
@@ -541,22 +627,20 @@ sub excel_rows {
# writes the meat of the spreadsheet to an excel worksheet. Called
# by Spreadsheet::outsheet_excel;
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
$cols_output = 0;
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
foreach my $rownum (sort {$a <=> $b} ($self->rows())) {
my $parameter_name = $self->{'formulas'}->{'A'.$rownum};
- my $description = '';
- if (exists($nice_parameter_name{$parameter_name})) {
- $description = $nice_parameter_name{$parameter_name};
- }
+ my $description = $self->get_parm_name($parameter_name);
$self->excel_output_row($worksheet,$rownum,$rows_output++,
$parameter_name,$description);
}
@@ -566,10 +650,10 @@ sub excel_rows {
##
## Routines to support assesscalc::compute
##
-sub get_parm_names {
+sub get_parm {
my $self = shift;
my @Mandatory_parameters = @_;
- my %parameters_and_names;
+ my %parameters;
#
my ($symap,$syid,$srcf) = &Apache::lonnet::decode_symb($self->{'symb'});
my @Metadata = split(/\,/,&Apache::lonnet::metadata($srcf,'keys'));
@@ -578,14 +662,20 @@ sub get_parm_names {
my $cleaned_name = $parm;
$cleaned_name =~ s/^resource\./stores_/;
$cleaned_name =~ s/\./_/g;
- my $display = &Apache::lonnet::metadata($srcf,
- $cleaned_name.'.display');
- if (! $display) {
- $display .= &Apache::lonnet::metadata($srcf,$cleaned_name.'.name');
- }
- $parameters_and_names{$cleaned_name}=$display;
+ $parameters{$cleaned_name}=1;
}
- return (%parameters_and_names);
+ return (keys(%parameters));
+}
+
+sub get_parm_name {
+ my $self = shift;
+ my $parm = shift;
+ my ($symap,$syid,$srcf) = &Apache::lonnet::decode_symb($self->{'symb'});
+ my $display = &Apache::lonnet::metadata($srcf,$parm.'.display');
+ if (! $display) {
+ $display .= &Apache::lonnet::metadata($srcf,$parm.'.name');
+ }
+ return $display;
}
sub get_parameter_values {
@@ -605,8 +695,13 @@ sub get_parameter_values {
my $filename = $self->{'coursefilename'}.'_parms.db';
if (tie(%parmhash,'GDBM_File',
$self->{'coursefilename'}.'_parms.db',&GDBM_READER(),0640)) {
+ my ($mapname,$id,$fn)=&Apache::lonnet::decode_symb($self->{'symb'});
+ $mapname = &Apache::lonnet::deversion($mapname);
foreach my $parmname (@Parameters) {
- my $value = $self->parmval($parmname);
+ my $value = $self->parmval($parmname,$self->{'symb'},
+ $self->{'name'},$self->{'domain'},
+ $self->{'section'},undef,
+ $mapname,$id,$fn,$self->{'groups'});
$parameters{$parmname} =$value;
}
untie(%parmhash);
@@ -637,11 +732,59 @@ sub get_problem_state {
return %student_parameters;
}
+sub determine_parts {
+ my $self = shift;
+ my $check_hidden = shift;
+ if (exists($self->{'Parts'}) && ref($self->{'Parts'}) eq 'HASH') {
+ return;
+ }
+ my (undef,undef,$url) = &Apache::lonnet::decode_symb($self->{'symb'});
+ my $src = &Apache::lonnet::clutter($url);
+ return if (! defined($src));
+ my %Parts;
+ my $metadata = &Apache::lonnet::metadata($src,'packages');
+ foreach (split(',',$metadata)) {
+ my ($part) = (/^part_(.*)$/);
+ if (!defined($part)) { next; }
+ if (!$check_hidden) { $Parts{$part}++; next; }
+ if (!&Apache::loncommon::check_if_partid_hidden
+ ($part,$self->{'symb'},$self->{'name'},$self->{'domain'})
+ ) {
+ $Parts{$part}++;
+ }
+ }
+ # Make sure part 0 is defined.
+ $Parts{'0'}++;
+ $self->{'Parts'} = \%Parts;
+ return;
+}
+
+sub parameter_part_is_valid {
+ my $self = shift;
+ my ($parameter) = @_;
+ return 1 if ($parameter eq 'timestamp');
+ if (! defined($self->{'Parts'}) ||
+ ! ref ($self->{'Parts'}) ||
+ ref($self->{'Parts'}) ne 'HASH') {
+ return 1;
+ }
+ #
+ my ($start,@pieces)=split('_',$parameter);
+ if ( $start !~ m/^(resource|stores|parameter)$/) { return 0; }
+ while (@pieces) {
+ pop(@pieces);
+ my $testpart=join('_',@pieces);
+ if (exists($self->{'Parts'}->{$testpart}) &&
+ $self->{'Parts'}->{$testpart} ) {
+ return 1;
+ }
+ }
+ return 0;
+}
+
sub compute {
my $self = shift;
my ($r) = @_;
- my $connection = $r->connection();
- if ($connection->aborted()) { $self->cleanup(); return; }
$self->initialize_safe_space();
#########################################
#########################################
@@ -662,18 +805,11 @@ sub compute {
my %parameters; # holds underscored parameters by name
#
# Get the metadata fields and determine their proper names
- my %nice_parm_names = $self->get_parm_names(@Mandatory_parameters);
- while (my($cleaned_name,$display) = each(%nice_parm_names)) {
- $parameters{$cleaned_name}++;
- $nice_parameter_name{$cleaned_name} = $display;
- }
+ my @parameters=$self->get_parm(@Mandatory_parameters);
#
# Get the values of the metadata fields
- if ($connection->aborted()) { $self->cleanup(); return; }
$self->ensure_current_caches();
- if ($connection->aborted()) { $self->cleanup(); return; }
- %parameters = $self->get_parameter_values(keys(%parameters));
- if ($connection->aborted()) { $self->cleanup(); return; }
+ %parameters = $self->get_parameter_values(@parameters);
#
# Clean out unnecessary parameters
foreach (keys(%parameters)) {
@@ -681,11 +817,14 @@ sub compute {
}
#
# Get the students performance data
+ $self->determine_parts(($parameters{'parameter_0_hiddenparts'} ne ''));
my %student_parameters = $self->get_problem_state();
while (my ($parm,$value) = each(%student_parameters)) {
$parm =~ s/^resource\./stores_/;
$parm =~ s/\./_/g;
- $parameters{$parm} = $value;
+ # Clean out any bad parameters
+ next if (! $self->parameter_part_is_valid($parm));
+ $parameters{$parm} = $value;
}
#
# Set up the formulas and parameter values
@@ -693,7 +832,7 @@ sub compute {
my %c;
#
# 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)) {
last if ($self->blackout());
next if ($parm !~ /^(parameter_.*)_problemstatus$/);
@@ -707,25 +846,31 @@ sub compute {
}
}
}
- if ($connection->aborted()) { $self->cleanup(); return; }
#
# Move the parameters into the spreadsheet
while (my ($parm,$value) = each(%parameters)) {
my $cell = 'A'.$self->get_row_number_from_key($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;
}
+ foreach my $cell (grep(/^A/,keys(%f))) {
+ # Clean out any bad formulas
+ next if (exists($c{$f{$cell}}));
+ next if ($cell eq 'A0');
+ delete($f{$cell});
+ }
$self->formulas(\%f);
$self->constants(\%c);
- if ($connection->aborted()) { $self->cleanup(); return; }
$self->calcsheet();
#
# Store export row in cache
my @exportarray = $self->exportrow();
$self->deal_with_export_row(@exportarray);
$self->save() if ($self->need_to_save());
- if ($connection->aborted()) { $self->cleanup(); return; }
return;
}
@@ -735,6 +880,7 @@ sub compute {
sub sett {
my $self = shift;
my %t=();
+ undef(%Apache::Spreadsheet::sheet_values);
#
# Deal with the template row by copying the template formulas into each
# row.
@@ -752,7 +898,7 @@ sub sett {
# Replace 'A0' with the value from 'A0'
$t{$cell}=~s/(^|[^\"\'])([A-Za-z]\d+)/$1\$sheet_values\{\'$2\'\}/g;
# Replace parameters
- $t{$cell}=~s/(^|[^\"\'])\[([^\]]+)\]/$1.$self->expandnamed($2)/ge;
+ $t{$cell}=~s/(^|[^\"\'])\[([^\]]+)\]/$1.$self->expandnamed($2)/sge;
}
}
#
@@ -760,14 +906,18 @@ sub sett {
while (my ($cell,$formula) = each(%{$self->{'formulas'}})) {
next if ($cell =~ /template_/);
if ($cell =~ /^A/ && $cell ne 'A0') {
- if ($formula !~ /^\!/) {
- $t{$cell}=$self->{'constants'}->{$formula};
+ if ($formula !~ /^\!/
+ && exists($self->{'constants'}->{$formula})
+ && $self->{'constants'}->{$formula} ne ''
+ ) {
+ $Apache::Spreadsheet::sheet_values{$cell}=
+ eval($self->{'constants'}->{$formula});
}
} else {
$t{$cell}=$formula;
$t{$cell}=~s/\.\.+/\,/g;
$t{$cell}=~s/(^|[^\"\'])([A-Za-z]\d+)/$1\$sheet_values\{\'$2\'\}/g;
- $t{$cell}=~s/(^|[^\"\'])\[([^\]]+)\]/$1.$self->expandnamed($2)/ge;
+ $t{$cell}=~s/(^|[^\"\'])\[([^\]]+)\]/$1.$self->expandnamed($2)/sge;
}
}
# Put %t into the safe space
@@ -796,15 +946,19 @@ These rows are saved in the students dir
sub load_cached_export_rows {
undef(%Exportrows);
my @tmp = &Apache::lonnet::dump('nohist_calculatedsheets_'.
- $ENV{'request.course.id'},
+ $env{'request.course.id'},
$current_domain,$current_name,undef);
if ($tmp[0]!~/^error/) {
my %tmp = @tmp;
- my $default_filename = $ENV{'course.'.$ENV{'request.course.id'}.
+ my $default_filename = $env{'course.'.$env{'request.course.id'}.
'.spreadsheet_default_assesscalc'};
# We only got one key, so we will access it directly.
while (my ($key,$sheetdata) = each(%tmp)) {
my ($sname,$sdom,$sheettype,$symb) = split(':',$key);
+ if (! defined($sname) || $sname eq '' ||
+ ! defined($sdom) || $sdom eq '' ) {
+ next;
+ }
if ($symb =~ /\.time$/) {
$symb =~ s/\.time$//;
$Exportrows{$symb}->{'time'} = $sheetdata;
@@ -836,9 +990,8 @@ spreadsheet only if necessary.
sub export_data {
my $self = shift;
my ($r) = @_;
- my $connection = $r->connection();
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}) ||
! $self->check_expiration_time($Exportrows{$symb}->{'time'}) ||
! exists($Exportrows{$symb}->{$self->{'filename'}}) ||
@@ -847,14 +1000,20 @@ sub export_data {
) {
$self->compute($r);
}
- if ($connection->aborted()) { $self->cleanup(); return; }
- my @Data = @{$Exportrows{$symb}->{$self->{'filename'}}};
- if ($Data[0] =~ /^(.*)___=___/) {
- $self->{'sheetname'} = $1;
- $Data[0] =~ s/^(.*)___=___//;
- }
- for (my $i=0;$i<$#Data;$i++) {
- $Data[$i]="'".$Data[$i]."'" if ($Data[$i]=~/\D/ && defined($Data[$i]));
+ my @Data;
+ if ($self->badcalc()) {
+ @Data = ();
+ } else {
+ @Data = @{$Exportrows{$symb}->{$self->{'filename'}}};
+ if ($Data[0] =~ /^(.*)___=___/) {
+ $self->{'sheetname'} = $1;
+ $Data[0] =~ s/^(.*)___=___//;
+ }
+ for (my $i=0;$i<$#Data;$i++) {
+ if ($Data[$i]=~/\D/ && defined($Data[$i])) {
+ $Data[$i]="'".$Data[$i]."'";
+ }
+ }
}
return @Data;
}
@@ -877,6 +1036,11 @@ sub save_export_data {
return if ($self->temporary());
my $student = $self->{'name'}.':'.$self->{'domain'};
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}) ||
! exists($Exportrows{$symb}->{$self->{'filename'}})) {
return;
|
|---|