--- loncom/interface/statistics/lonstudentassessment.pm	2009/08/14 12:37:44	1.150.2.3
+++ loncom/interface/statistics/lonstudentassessment.pm	2009/05/17 22:55:42	1.154
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonstudentassessment.pm,v 1.150.2.3 2009/08/14 12:37:44 raeburn Exp $
+# $Id: lonstudentassessment.pm,v 1.154 2009/05/17 22:55:42 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -248,14 +248,14 @@ sub next_and_previous_buttons {
     if (defined($previous)) {
         my $sname = $previous->{'username'}.':'.$previous->{'domain'};
         $previousbutton .= '<input type="button" value="'.
-            &mt('Previous Student ([_1])',
-            $previous->{'username'}.':'.$previous->{'domain'}).
+            'Previous Student ('.
+            $previous->{'username'}.'@'.$previous->{'domain'}.')'.
             '" onclick="document.Statistics.SelectedStudent.value='.
             "'".$sname."'".';'.
             'document.Statistics.submit();" />';
     } else {
         $previousbutton .= '<input type="button" value="'.
-            &mt('Previous student').'" disabled="disabled" />';
+            'Previous student (none)'.'" />';
     }
     #
     # Build the next student link
@@ -264,19 +264,19 @@ sub next_and_previous_buttons {
     if (defined($next)) {
         my $sname = $next->{'username'}.':'.$next->{'domain'};
         $nextbutton .= '<input type="button" value="'.
-            &mt('Next Student ([_1])',
-            $next->{'username'}.':'.$next->{'domain'}).
+            'Next Student ('.
+            $next->{'username'}.'@'.$next->{'domain'}.')'.
             '" onclick="document.Statistics.SelectedStudent.value='.
-            "'$sname'".';'.
+            "'".$sname."'".';'.
             'document.Statistics.submit();" />';
     } else {
         $nextbutton .= '<input type="button" value="'.
-            &mt('Next student').'" disabled="disabled" />';
+            'Next student (none)'.'" />';
     }
     #
     # Build the 'all students' button
     my $all = '';
-    $all .= '<input type="button" value="'.&mt('All Students').'" '.
+    $all .= '<input type="button" value="All Students" '.
             '" onclick="document.Statistics.SelectedStudent.value='.
             "''".';'.'document.Statistics.submit();" />';
     $Str .= $previousbutton.('&nbsp;'x5).$all.('&nbsp;'x5).$nextbutton;
@@ -361,20 +361,19 @@ sub CreateInterface {
     $Str .= &CreateAndParseOutputDataSelector();
     $Str .= '</td></tr>'."\n";
     $Str .= '</table>'."\n";
-    $Str .= '<p>'.
-            &mt('Status:').' '.
-            '<input type="text" name="stats_status" size="60" value="" readonly="readonly" />'.
-            '</p>';
+    $Str .= '<input type="submit" name="Generate Chart" value="'.
+        &mt('Generate Chart').'" />';
+    $Str .= '&nbsp;'x5;
     $Str .= '<input type="submit" name="selectstudent" value="'.
         &mt('Select One Student').'" />';
     $Str .= '&nbsp;'x5;
     $Str .= '<input type="submit" name="ClearCache" value="'.
         &mt('Clear Caches').'" />';
-    $Str .= '<p>'.
-            '<input type="submit" name="Generate Chart"'.
-            ' value="'.&mt('Generate Chart').'" />'.
-            '</p>';
-
+    $Str .= '<p>';
+    $Str .= 
+        &mt('Status [_1]',
+            '<input type="text" name="stats_status" size="60" value="" readonly="readonly" />');
+    $Str .= '</p>';
     return $Str;
 }
 
@@ -664,9 +663,9 @@ sub html_initialize {
         &Apache::lonstatistics::selected_sequences_with_assessments();
     if (! ref($navmap)) {
         # Unable to get data, so bail out
-        $r->print('<p class="LC_error">'.
+        $r->print("<h3>".
                   &mt('Unable to retrieve course information.').
-                  '</p>');
+                  '</h3>');
     }
 
     # If we're showing links, show a checkbox to open in new
@@ -683,7 +682,7 @@ NEW_WINDOW_CHECKBOX
 
     #
     $r->print("<h3>".$env{'course.'.$env{'request.course.id'}.'.description'}.
-              "&nbsp;&nbsp;".&Apache::lonlocal::locallocaltime(time)."</h3>");
+              "&nbsp;&nbsp;".localtime(time)."</h3>");
     #
     if ($chosen_output->{'base'} !~ /^final table/) {
         $r->print("<h3>".&mt($chosen_output->{'shortdesc'})."</h3>");        
@@ -714,8 +713,8 @@ NEW_WINDOW_CHECKBOX
                 $width{$symb}->{'width_sum'} += 1;            
             }
 	    $total_count += &count_parts($navmap,$seq);
-            # Use 3 digits for the sum
-            $width{$symb}->{'width_sum'} += 3;
+            # Use 6 digits for the sum
+            $width{$symb}->{'width_sum'} += 6;
         }
         # Compute width of maximum
         if ($chosen_output->{'sequence_max'}) {
@@ -723,8 +722,8 @@ NEW_WINDOW_CHECKBOX
                 # One digit for the '/'
                 $width{$symb}->{'width_sum'} +=1;
             }
-            # Use 3 digits for the total
-            $width{$symb}->{'width_sum'}+=3;
+            # Use 6 digits for the total
+            $width{$symb}->{'width_sum'}+=6;
         }
 	#
         if ($chosen_output->{'every_problem'}) {
@@ -886,16 +885,17 @@ sub html_outputstudent {
             $ratio .= ' ';
         }
         if ($chosen_output->{'sequence_sum'} && $score ne ' ') {
-            my $score .= sprintf("%3.0f",$score);
-            $ratio .= (' 'x(3-length($score))).$score;
+            my $score .= sprintf("%3.2f",$score);
+            $ratio .= (' 'x(6-length($score))).$score;
         } elsif($chosen_output->{'sequence_sum'}) {
-            $ratio .= ' 'x3;
+            $ratio .= ' 'x6;
         }
         if ($chosen_output->{'sequence_max'}) {
             if ($chosen_output->{'sequence_sum'}) {
                 $ratio .= '/';
             }
-            $ratio .= sprintf("%3.0f",$seq_max);
+            my $sequence_total=sprintf("%3.2f",$seq_max);
+            $ratio .= $sequence_total.(' 'x(6-length($sequence_total)));
         }
         #
         if (! $chosen_output->{'every_problem'}) {
@@ -929,8 +929,8 @@ sub html_outputstudent {
     if (! defined($score)) {
         $score = ' ' x $total_sum_width;
     } else {
-        $score = sprintf("%.0f",$score);
-        $score = (' 'x(3-length($score))).$score;
+        $score = sprintf("%.2f",$score);
+        $score = (' 'x(6-length($score))).$score;
     }
     $Str .= ' '.' 'x($total_sum_width-length($score)).$score.' / '.$max;
     $Str .= " \n";