--- loncom/interface/statistics/lonstudentassessment.pm 2006/07/03 03:54:32 1.142 +++ loncom/interface/statistics/lonstudentassessment.pm 2008/09/16 13:10:19 1.150 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: lonstudentassessment.pm,v 1.142 2006/07/03 03:54:32 albertel Exp $ +# $Id: lonstudentassessment.pm,v 1.150 2008/09/16 13:10:19 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -330,7 +330,7 @@ sub CreateInterface { $Str .= ''.&mt('Student Data'). &Apache::loncommon::help_open_topic("Chart_Student_Data"). ''; - $Str .= ''.&mt('Enrollment Status').''. + $Str .= ''.&mt('Access Status').''. &Apache::loncommon::help_open_topic("Chart_Enrollment_Status"). ''; $Str .= ''.&mt('Sequences and Folders').''. @@ -372,7 +372,7 @@ sub CreateInterface { $Str .= ' 'x5; $Str .= &mt('Status [_1]', - ''); + ''); $Str .= '
'; return $Str; } @@ -671,9 +671,10 @@ sub html_initialize { # If we're showing links, show a checkbox to open in new # windows. if ($show_links ne 'no') { + my $labeltext = &mt('Show links in new window:'); $r->print(<new_window = true; -

NEW_WINDOW_CHECKBOX @@ -684,7 +685,7 @@ NEW_WINDOW_CHECKBOX "  ".localtime(time).""); # if ($chosen_output->{'base'} !~ /^final table/) { - $r->print("

".$chosen_output->{'shortdesc'}."

"); + $r->print("

".&mt($chosen_output->{'shortdesc'})."

"); } my $Str = "
\n";
     # First, the @StudentData fields need to be listed
@@ -843,12 +844,20 @@ sub html_outputstudent {
     my @tmp = &Apache::loncoursedata::get_current_state
         ($student->{'username'},$student->{'domain'},undef,
          $env{'request.course.id'});
-    if ((scalar @tmp > 0) && ($tmp[0] !~ /^error:/)) {
+    if ((scalar @tmp > 0) && ($tmp[0] !~ /^error:(.*)/)) {
         %StudentsData = @tmp;
-    }
-    if (scalar(@tmp) < 1) {
+    } else {
+	my $error = $1;
+	if (scalar(@tmp) < 1) {
+	    $Str .= ''
+                   .&mt('No Course Data')
+                   .''."\n";
+	} else {
+            $Str .= ''
+                   .&mt('Error getting student data ([_1])',$error)
+                   .''."\n";
+	}
         $nodata_count++;
-        $Str .= 'No Course Data'."\n";
         $r->print($Str);
         $r->rflush();
         return;
@@ -953,12 +962,12 @@ sub html_finish {
 
 sub StudentAverageTotal {
     my $Str = '
'.&mt('Summary Tables').'
'.$/;
-    $Str .= ''."\n";
-    $Str .= ''.
+    $Str .= &Apache::loncommon::start_data_table();
+    $Str .= &Apache::loncommon::start_data_table_header_row().
         ''.
         ''.
         ''.
-        ''.$/;
+        &Apache::loncommon::end_data_table_header_row().$/;
     foreach my $seq (@sequences) {
         my $symb = $seq->symb;
         my $ave;
@@ -972,11 +981,13 @@ sub StudentAverageTotal {
         }
         my $max = $Statistics->{$symb}->{'max'};
         $ave = sprintf("%.2f",$ave);
-        $Str .= ''.
+        $Str .= &Apache::loncommon::start_data_table_row().
+            ''.
             ''.
-            ''."\n";
+            ''.
+            &Apache::loncommon::end_data_table_row()."\n";
     }
-    $Str .= "
'.&mt('Title').''.&mt('Average').''.&mt('Maximum').'
'.$seq->compTitle.''.$seq->compTitle.''.$ave.' '.$max.' '.'
'.$max.' '.'
\n";
+    $Str .= &Apache::loncommon::end_data_table()."\n";
     return $Str;
 }
 
@@ -987,31 +998,36 @@ sub SingleStudentTotal {
                          $student->{'fullname'},
                          $student->{'username'},$student->{'domain'}).'';
     $Str .= $/;
-    $Str .= ''."\n";
+    $Str .= &Apache::loncommon::start_data_table()."\n";
     $Str .= 
-        ''.
+        &Apache::loncommon::start_data_table_header_row().
         '';
     if ($chosen_output->{'base'} eq 'tries') {
         $Str .= '';
     } else {
         $Str .= '';
     }
-    $Str .= ''."\n";
+    $Str .= ''.
+            &Apache::loncommon::end_data_table_header_row()."\n";
     my $total = 0;
     my $total_max = 0;
     foreach my $seq (@sequences) {
         my $value = $Statistics->{$seq->symb}->{'score'};
         my $max = $Statistics->{$seq->symb}->{'max'};
-        $Str .= ''.
+        $Str .= &Apache::loncommon::start_data_table_row().
+            ''.
             ''.
-                ''."\n";
+            ''.
+            &Apache::loncommon::end_data_table_row()."\n";
         $total += $value;
         $total_max +=$max;
     }
-    $Str .= ''.
+    $Str .= &Apache::loncommon::start_data_table_row().
+        ''.
         ''.
-        '\n";
-    $Str .= "
'.&mt('Sequence or Folder').''.&mt('Parts Correct').''.&mt('Score').''.&mt('Maximum').'
'.&mt('Maximum').'
'.&HTML::Entities::encode($seq->compTitle).''.&HTML::Entities::encode($seq->compTitle).''.$value.''.$max.'
'.$max.'
'.&mt('Total').''.&mt('Total').''.$total.''.$total_max."
\n";
+        ''.$total_max.''.
+        &Apache::loncommon::end_data_table_row()."\n";
+    $Str .= &Apache::loncommon::end_data_table()."\n";
     return $Str;
 }
 
@@ -1820,7 +1836,7 @@ sub csv_finish {
     #
     # Tell the user where to get their csv file
     $r->print('
'.
-              ''.&mt('Your csv file.').''."\n");
+              ''.&mt('Your CSV file.').''."\n");
     $r->rflush();
     &csv_cleanup();
     return;
@@ -1951,11 +1967,8 @@ sub student_tries_on_sequence {
             #
             if ( ($links eq 'yes' && $symbol ne ' ') ||
                  ($links eq 'all')) {
-                if (length($symbol) > 1) {
-                    &Apache::lonnet::logthis('length of symbol "'.$symbol.'" > 1');
-                }
                 my $link = '/adm/grades'.
-                    '?symb='.&escape($resource->symb).
+                    '?symb='.&escape($resource->shown_symb).
                         '&student='.$student->{'username'}.
                             '&userdom='.$student->{'domain'}.
                                 '&command=submission';
@@ -2110,7 +2123,7 @@ sub student_performance_on_sequence {
             #
             if ( ($links eq 'yes' && $symbol ne ' ') || ($links eq 'all')) {
                 my $link = '/adm/grades' .
-                    '?symb='.&escape($symb).
+                    '?symb='.&escape($resource->shown_symb).
                     '&student='.$student->{'username'}.
                     '&userdom='.$student->{'domain'}.
                     '&command=submission';