--- loncom/interface/spreadsheet/studentcalc.pm	2003/06/23 20:47:00	1.13
+++ loncom/interface/spreadsheet/studentcalc.pm	2003/09/16 15:39:36	1.21
@@ -1,5 +1,5 @@
 #
-# $Id: studentcalc.pm,v 1.13 2003/06/23 20:47:00 matthew Exp $
+# $Id: studentcalc.pm,v 1.21 2003/09/16 15:39:36 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -45,6 +45,9 @@ studentcalc
 ###################################################
 package Apache::studentcalc;
 
+use warnings FATAL=>'all';
+no warnings 'uninitialized';
+
 use strict;
 use Apache::Constants qw(:common :http);
 use Apache::lonnet;
@@ -98,8 +101,9 @@ sub initialize_sequence_cache {
 }
 
 sub clear_package {
-    @Sequences = undef;
-    %Exportrows = undef;
+    undef(@Sequences);
+    undef(%Exportrows);
+    &Apache::assesscalc::clear_package();
 }
 
 sub get_title {
@@ -125,7 +129,7 @@ sub get_html_title {
     my $title = '<h1>'.$name;
     if ($ENV{'user.name'} ne $self->{'name'} && 
         $ENV{'user.domain'} ne $self->{'domain'}) {
-        $title .= &Apache::loncommon::aboutmewrapper
+        $title .= ' '.&Apache::loncommon::aboutmewrapper
                                     ($self->{'name'}.'@'.$self->{'domain'},
                                      $self->{'name'},$self->{'domain'});
     }
@@ -137,11 +141,25 @@ sub get_html_title {
 
 sub parent_link {
     my $self = shift;
-    my $link .= '<p><a href="/adm/classcalc?'.
-        'sname='.$self->{'name'}.
-            '&sdomain='.$self->{'domain'}.'">'.
-                'Course level sheet</a></p>'."\n";
-    return $link;
+    return '<p><a href="/adm/classcalc">Course level sheet</a></p>'."\n";
+}
+
+sub convenience_links {
+    my $self = shift;
+    my ($resource) = @_;
+    my $symb = &Apache::lonnet::escape($resource->{'symb'});
+    my $result = <<"END";
+<a href="/adm/grades?symb=$symb&command=submission" target="LONcatInfo">
+    <img src="/adm/lonMisc/subm_button.gif" border=0 />
+    </a>
+<a href="/adm/grades?symb=$symb&command=gradingmenu" target="LONcatInfo">
+    <img src="/adm/lonMisc/pgrd_button.gif" border=0 />
+    </a>
+<a href="/adm/parmset?symb=$symb" target="LONcatInfo">
+    <img src="/adm/lonMisc/pprm_button.gif" border=0 />
+    </a>
+END
+    return $result;
 }
 
 sub outsheet_html {
@@ -208,7 +226,7 @@ END
         $tableheader =<<"END";
 </p><p>
 <table border="2">
-<tr><th>Row</th><th>Assessment</th>
+<tr><th>Row</th><th>&nbsp;</th><th>Assessment</th>
 END
     } else {
         $tableheader =<<"END";
@@ -242,6 +260,7 @@ END
             my $row_output = '<tr>';
             if ($editing_is_allowed) {
                 $row_output .= '<td>'.$rownum.'</td>';
+                $row_output .= '<td>'.$self->convenience_links($resource).'</td>';
                 $row_output .= '<td>'.
                     '<a href="/adm/assesscalc?sname='.$self->{'name'}.
                     '&sdomain='.$self->{'domain'}.
@@ -392,7 +411,9 @@ sub outsheet_recursive_excel {
 
 sub compute {
     my $self = shift;
-    $self->logthis('computing');
+    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 = $ENV{'request.course.id'};
@@ -419,6 +440,7 @@ sub compute {
     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'});
             my $cell = 'A'.$rownum;
@@ -429,11 +451,13 @@ sub compute {
                 $self->{'row_source'}->{$rownum} = $assess_filename;
             }
             $f{$cell} = $resource->{'symb'}.'__&&&__'.$assess_filename;
+            if ($connection->aborted()) { $self->cleanup(); return; }
             my $assessSheet = Apache::assesscalc->new($self->{'name'},
                                                       $self->{'domain'},
                                                       $assess_filename,
                                                       $resource->{'symb'});
-            my @exportdata = $assessSheet->export_data();
+            my @exportdata = $assessSheet->export_data($r);
+            if ($connection->aborted()) { $self->cleanup(); return; }
             if ($assessSheet->blackout()) {
                 $self->blackout(1);
                 $self->{'blackout_rows'}->{$rownum} = 1;
@@ -475,7 +499,7 @@ sub compute {
 sub set_row_sources {
     my $self = shift;
     while (my ($cell,$value) = each(%{$self->{'formulas'}})) {
-        next if ($cell !~ /^A(\d+)/ && $1 > 0);
+        next if ($cell !~ /^A(\d+)$/ || $1 < 1);
         my $row = $1;
         (undef,$value) = split('__&&&__',$value);
         $value = 'Default' if (! defined($value));
@@ -492,7 +516,7 @@ sub set_row_numbers {
         next if ($row == 0);
         my ($symb,undef) = split('__&&&__',$formula);
         $self->{'row_numbers'}->{$symb} = $row;
-        $self->{'maxrow'} = $1 if ($1 > $self->{'maxrow'});
+        $self->{'maxrow'} = $row if ($row > $self->{'maxrow'});
     }
 }
 
@@ -522,7 +546,7 @@ These rows are saved in the courses dire
 #############################################
 #############################################
 sub load_cached_export_rows {
-    %Exportrows = undef;
+    undef(%Exportrows);
     my @tmp = &Apache::lonnet::dump('nohist_calculatedsheets',
 		     $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
 		     $ENV{'course.'.$ENV{'request.course.id'}.'.num'},undef);
@@ -561,6 +585,8 @@ Writes the export data for this student
 #############################################
 sub save_export_data {
     my $self = shift;
+    &Apache::assesscalc::save_cached_export_rows($self->{'name'},
+                                                 $self->{'domain'});
     return if ($self->temporary());
     my $student = $self->{'name'}.':'.$self->{'domain'};
     return if (! exists($Exportrows{$student}));
@@ -570,7 +596,7 @@ sub save_export_data {
     my $newstore = join('___;___',
                         @{$Exportrows{$student}->{'data'}});
     $newstore = '___=___'.$newstore;
-    &Apache::lonnet::put('nohist_calculatedsheets',
+    my $result= &Apache::lonnet::put('nohist_calculatedsheets',
                          { $key     => $newstore,
                            $timekey => $Exportrows{$student}->{'time'} },
                          $self->{'cdom'},
@@ -594,11 +620,19 @@ spreadsheet only if necessary.
 #############################################
 sub export_data {
     my $self = shift;
+    my ($r) = @_;
+    my $connection = $r->connection();
     my $student = $self->{'name'}.':'.$self->{'domain'};
     if (! exists($Exportrows{$student}) ||
+        ! defined($Exportrows{$student}) ||
+        ! exists($Exportrows{$student}->{'data'}) ||
+        ! defined($Exportrows{$student}->{'data'}) ||
+        ! exists($Exportrows{$student}->{'time'}) ||
+        ! defined($Exportrows{$student}->{'time'}) ||
         ! $self->check_expiration_time($Exportrows{$student}->{'time'})) {
-        $self->compute();
+        $self->compute($r);
     }
+    if ($connection->aborted()) { $self->cleanup(); return; }
     my @Data = @{$Exportrows{$student}->{'data'}};
     for (my $i=0; $i<=$#Data;$i++) {
         $Data[$i]="'".$Data[$i]."'" if ($Data[$i]=~/\D/ && defined($Data[$i]));