--- loncom/interface/statistics/lonstudentassessment.pm	2009/05/14 19:01:28	1.150.2.1
+++ loncom/interface/statistics/lonstudentassessment.pm	2013/07/22 18:06:58	1.173
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonstudentassessment.pm,v 1.150.2.1 2009/05/14 19:01:28 raeburn Exp $
+# $Id: lonstudentassessment.pm,v 1.173 2013/07/22 18:06:58 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -51,6 +51,7 @@ package Apache::lonstudentassessment;
 
 use strict;
 use Apache::lonstatistics();
+use Apache::lonquickgrades();
 use Apache::lonhtmlcommon();
 use Apache::loncommon();
 use Apache::loncoursedata;
@@ -166,6 +167,9 @@ sub BuildStudentAssessmentPage {
         &Apache::lonstatistics::DisplayClasslist($r);
         return;
     }
+    $r->print(&Apache::lonhtmlcommon::breadcrumbs('Chart','Chart_Description:Chart_Sections:Chart_Student_Data:Chart_Enrollment_Status:Chart_Sequences:Chart_Output_Formats:Chart_Output_Data'));
+    &Apache::lonquickgrades::startGradeScreen($r,'chart');
+
     #
     # Print out the HTML headers for the interface
     #    This also parses the output mode selector
@@ -230,6 +234,7 @@ sub BuildStudentAssessmentPage {
         $output_student->($r,$student);
     }
     # Call the "finish" routine selected above
+    &Apache::lonquickgrades::endGradeScreen($r);
     $finish->($r);
     #
     return;
@@ -248,14 +253,14 @@ sub next_and_previous_buttons {
     if (defined($previous)) {
         my $sname = $previous->{'username'}.':'.$previous->{'domain'};
         $previousbutton .= '<input type="button" value="'.
-            'Previous Student ('.
-            $previous->{'username'}.'@'.$previous->{'domain'}.')'.
+            &mt('Previous Student ([_1])',
+            $previous->{'username'}.':'.$previous->{'domain'}).
             '" onclick="document.Statistics.SelectedStudent.value='.
             "'".$sname."'".';'.
             'document.Statistics.submit();" />';
     } else {
         $previousbutton .= '<input type="button" value="'.
-            'Previous student (none)'.'" />';
+            &mt('Previous Student').'" disabled="disabled" />';
     }
     #
     # Build the next student link
@@ -264,20 +269,20 @@ sub next_and_previous_buttons {
     if (defined($next)) {
         my $sname = $next->{'username'}.':'.$next->{'domain'};
         $nextbutton .= '<input type="button" value="'.
-            'Next Student ('.
-            $next->{'username'}.'@'.$next->{'domain'}.')'.
+            &mt('Next Student ([_1])',
+            $next->{'username'}.':'.$next->{'domain'}).
             '" onclick="document.Statistics.SelectedStudent.value='.
             "'".$sname."'".';'.
             'document.Statistics.submit();" />';
     } else {
         $nextbutton .= '<input type="button" value="'.
-            'Next student (none)'.'" />';
+            &mt('Next Student').'" disabled="disabled" />';
     }
     #
     # Build the 'all students' button
     my $all = '';
-    $all .= '<input type="button" value="All Students" '.
-            '" onclick="document.Statistics.SelectedStudent.value='.
+    $all .= '<input type="button" value="'.&mt('All Students').'" '.
+            ' onclick="document.Statistics.SelectedStudent.value='.
             "''".';'.'document.Statistics.submit();" />';
     $Str .= $previousbutton.('&nbsp;'x5).$all.('&nbsp;'x5).$nextbutton;
     return $Str;
@@ -318,8 +323,6 @@ the chart page.
 #######################################################
 sub CreateInterface {
     my $Str = '';
-    $Str .= &Apache::lonhtmlcommon::breadcrumbs('Chart','Chart_Description:Chart_Sections:Chart_Student_Data:Chart_Enrollment_Status:Chart_Sequences:Chart_Output_Formats:Chart_Output_Data');
-#    $Str .= &CreateLegend();
     $Str .= '<table cellspacing="5">'."\n";
     $Str .= '<tr>';
     $Str .= '<td align="center"><b>'.&mt('Sections').'</b>'.
@@ -327,7 +330,7 @@ sub CreateInterface {
 	'</td>';
     $Str .= '<td align="center"><b>'.&mt('Groups').'</b>'.
 	'</td>';
-    $Str .= '<td align="center"><b>'.&mt('Student Data</b>').
+    $Str .= '<td align="center"><b>'.&mt('Student Data').'</b>'.
 	&Apache::loncommon::help_open_topic("Chart_Student_Data").
 	'</td>';
     $Str .= '<td align="center"><b>'.&mt('Access Status').'</b>'.
@@ -361,19 +364,15 @@ sub CreateInterface {
     $Str .= &CreateAndParseOutputDataSelector();
     $Str .= '</td></tr>'."\n";
     $Str .= '</table>'."\n";
-    $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 .= '&nbsp;'x5;
-    $Str .= 
-        &mt('Status [_1]',
-            '<input type="text" name="stats_status" size="60" value="" readonly="readonly" />');
-    $Str .= '<br />';
+    $Str .= '<p>'
+           .'<input type="submit" name="Generate Chart"'
+           .' value="'.&mt('Generate Chart').'" />'
+           .'</p>';
     return $Str;
 }
 
@@ -466,7 +465,7 @@ sub CreateAndParseOutputSelector {
     $Str = qq/<select size="5" name="$elementname">/;
     foreach my $option (@OutputOptions) {
         $Str .= "\n".'    <option value="'.$option->{'value'}.'"';
-        $Str .= " selected " if ($option->{'value'} eq $selected);
+        $Str .= ' selected="selected"' if ($option->{'value'} eq $selected);
         $Str .= ">".&mt($option->{'name'})."<\/option>";
     }
     $Str .= "\n</select>";
@@ -546,7 +545,7 @@ my @OutputDataOptions =
        summary_table => 1,
        maximum_row => 0,
        ignore_weight => 1,
-       shortdesc => 'Number of Problem Parts completed successfully.',
+       shortdesc => 'Number of Problem Parts completed successfully',
        longdesc => 'The Number of Problem Parts completed successfully and '.
            'the maximum possible for each student',
        },
@@ -554,7 +553,7 @@ my @OutputDataOptions =
 
 sub HTMLifyOutputDataDescriptions {
     my $Str = '';
-    $Str .= "<h2>Output Data</h2>\n";
+    $Str .= '<h2>'.&mt('Output Data').'</h2>'."\n";
     $Str .= "<dl>\n";
     foreach my $option (@OutputDataOptions) {
         $Str .= '    <dt>'.$option->{'name'}.'</dt>';
@@ -583,7 +582,7 @@ sub CreateAndParseOutputDataSelector {
     $Str = qq/<select size="5" name="$elementname">/;
     foreach my $option (@OutputDataOptions) {
         $Str .= "\n".'    <option value="'.$option->{'value'}.'"';
-        $Str .= " selected " if ($option->{'value'} eq $chosen_output->{'value'});
+        $Str .= ' selected="selected"' if ($option->{'value'} eq $chosen_output->{'value'});
         $Str .= ">".&mt($option->{'name'})."<\/option>";
     }
     $Str .= "\n</select>";
@@ -663,26 +662,27 @@ sub html_initialize {
         &Apache::lonstatistics::selected_sequences_with_assessments();
     if (! ref($navmap)) {
         # Unable to get data, so bail out
-        $r->print("<h3>".
-                  &mt('Unable to retrieve course information.').
-                  '</h3>');
+        $r->print('<p class="LC_error">'
+                 .&mt('Unable to retrieve course information.')
+                 .'</p>');
     }
 
     # 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:');
+        my $labeltext = &mt('Show links in new window');
         $r->print(<<NEW_WINDOW_CHECKBOX);
 <script type="text/javascript">new_window = true;</script>
-<p><label>$labeltext 
+<p><label> 
 <input type="checkbox" checked="checked" onclick="new_window=this.checked" />
+$labeltext
 </label></p>
 NEW_WINDOW_CHECKBOX
     }
 
     #
     $r->print("<h3>".$env{'course.'.$env{'request.course.id'}.'.description'}.
-              "&nbsp;&nbsp;".localtime(time)."</h3>");
+              "&nbsp;&nbsp;".&Apache::lonlocal::locallocaltime(time)."</h3>");
     #
     if ($chosen_output->{'base'} !~ /^final table/) {
         $r->print("<h3>".&mt($chosen_output->{'shortdesc'})."</h3>");        
@@ -713,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'}) {
@@ -722,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'}) {
@@ -747,8 +747,6 @@ NEW_WINDOW_CHECKBOX
     $total_sum_width = length($total_count)+1;
     $Str .= "    total</pre>\n";
     $Str .= "<pre>";
-    $r->print($Str);
-    $r->rflush();
 
     $r->print(<<JS);
 <script type="text/javascript">
@@ -809,13 +807,13 @@ JS
     }
     #
     # Initialize progress window
-    %prog_state=&Apache::lonhtmlcommon::Create_PrgWin
-        ($r,'HTML Chart Status',
-         'HTML Chart Progress', $studentcount,
-         'inline',undef,'Statistics','stats_status');
     #
+    %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,$studentcount);
     &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,
                                           'Processing first student');
+    $r->print($Str);
+    $r->rflush();
+
     return;
 }
 
@@ -825,7 +823,12 @@ sub html_outputstudent {
     return if (! defined($navmap));
     #
     if($count++ % 5 == 0 && $count > 0) {
-        $r->print("</pre><pre>");
+#       $r->print("</pre><pre>");
+        $r->print('</pre>');
+        &Apache::lonhtmlcommon::Increment_PrgWin(
+            $r,\%prog_state,'last five students',5);
+        $r->rflush();
+        $r->print('<pre>');
     }
     # First, the @StudentData fields need to be listed
     my @to_show = &get_student_fields_to_show();
@@ -835,6 +838,7 @@ sub html_outputstudent {
         if ($field eq 'comments') {
             $title = '<a href="/adm/'.$student->{'domain'}.'/'.$student->{'username'}.'/'.'aboutme#coursecomment">'.&mt('Comments').'</a>';
         }
+        utf8::decode($title);
         my $base = length($title);
         my $width=$Apache::lonstatistics::StudentData{$field}->{'width'};
         $Str .= $title.' 'x($width-$base).$padding;
@@ -868,16 +872,18 @@ sub html_outputstudent {
     my $PerformanceStr = '';
     foreach my $seq (@sequences) {
         my $symb = $seq->symb;
+        my $randompick = $seq->randompick();
         my ($performance,$performance_length,$score,$seq_max,$rawdata);
         if ($chosen_output->{'tries'}) {
             ($performance,$performance_length,$score,$seq_max,$rawdata) =
                 &student_tries_on_sequence($student,\%StudentsData,
-                                           $navmap,$seq,$show_links);
+                                           $navmap,$seq,$show_links,$randompick);
         } else {
             ($performance,$performance_length,$score,$seq_max,$rawdata) =
                 &student_performance_on_sequence($student,\%StudentsData,
                                                  $navmap,$seq,$show_links,
-                                                 $chosen_output->{ignore_weight});
+                                                 $chosen_output->{ignore_weight},
+                                                 $randompick);
         }
         my $ratio='';
         if ($chosen_output->{'every_problem'} && 
@@ -885,16 +891,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'}) {
@@ -928,16 +935,16 @@ 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";
     #
     $r->print($Str);
     #
-    $r->rflush();
-    &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,'last student');
+#   $r->rflush();
+#   &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,'last student');
     return;
 }    
 
@@ -994,9 +1001,9 @@ sub StudentAverageTotal {
 sub SingleStudentTotal {
     return if (! defined($navmap));
     my $student = &Apache::lonstatistics::current_student();
-    my $Str = '<h3>'.&mt('Summary table for [_1] ([_2]@[_3])',
+    my $Str = '<h3>'.&mt('Summary table for [_1] ([_2])',
                          $student->{'fullname'},
-                         $student->{'username'},$student->{'domain'}).'</h3>';
+                         $student->{'username'}.':'.$student->{'domain'}).'</h3>';
     $Str .= $/;
     $Str .= &Apache::loncommon::start_data_table()."\n";
     $Str .= 
@@ -1113,9 +1120,9 @@ sub excel_initialize {
     }
     my $too_many_cols_error_message = 
         '<h2>'.&mt('Unable to Complete Request').'</h2>'.$/.
-        '<p>'.&mt('LON-CAPA is unable to produce your Excel spreadsheet because your selections will result in more than 255 columns.  Excel allows only 255 columns in a spreadsheet.').'</p>'.$/.
-        '<p>'.&mt('You may consider reducing the number of <b>Sequences or Folders</b> you have selected.').'</p>'.$/.
-        '<p>'.&mt('LON-CAPA can produce <b>CSV</b> files of this data or Excel files of the <b>Scores Summary</b> data.').'</p>'.$/;
+        '<p class="LC_warning">'.&mt('LON-CAPA is unable to produce your Excel spreadsheet because your selections will result in more than 255 columns.  Excel allows only 255 columns in a spreadsheet.').'</p>'.$/.
+        '<p>'.&mt('You may consider reducing the number of [_1]Sequences or Folders[_2] you have selected.','<b>','</b>').'</p>'.$/.
+        '<p>'.&mt('LON-CAPA can produce [_1]CSV[_2] files of this data or Excel files of the [_1]Scores Summary[_2] data.','<b>','</b>').'</p>'.$/;
     if ($chosen_output->{'base'} eq 'tries' && $total_columns > 255) {
         $r->print($too_many_cols_error_message);
         $request_aborted = 1;
@@ -1172,16 +1179,16 @@ sub excel_initialize {
     my $sectionstring = '';
     my @Sections = &Apache::lonstatistics::get_selected_sections();
     $excel_sheet->write($header_row,$cols_output++,
-                        &Apache::lonstatistics::section_and_enrollment_description('plaintext'),
+                        &Apache::lonstatistics::section_and_enrollment_description('localized'),
                         $format->{'h3'});
     #
     # Put the date in there too
     $excel_sheet->write($header_row,$cols_output++,
-                        'Compiled on '.localtime(time),$format->{'h3'});
+                        &mt('Compiled on [_1]',&Apache::lonlocal::locallocaltime(time)),$format->{'h3'});
     #
     $cols_output = 0;
     $excel_sheet->write($description_row,$cols_output++,
-                        $chosen_output->{'shortdesc'},
+                        &mt($chosen_output->{'shortdesc'}),
                         $format->{'b'});
     #
     $cols_output = 0;
@@ -1196,7 +1203,7 @@ sub excel_initialize {
     # Add the student headers
     $cols_output = 0;
     foreach my $field (&get_student_fields_to_show()) {
-        $excel_sheet->write($resource_name_row,$cols_output++,$field,
+        $excel_sheet->write($resource_name_row,$cols_output++,&mt($field),
                             $format->{'bold'});
     }
     #
@@ -1259,17 +1266,17 @@ sub excel_initialize {
         $formula_data{$symb}->{'Excel:scorecol'}=$cols_output;
         if ($chosen_output->{'base'} eq 'parts correct total') {
             $excel_sheet->write($resource_name_row,$cols_output++,
-                                'parts correct',
+                                &mt('parts correct'),
                                 $format->{'bold'});
         } elsif ($chosen_output->{'sequence_sum'}) {
             if ($chosen_output->{'correct'}) {
                 # Only reporting the number correct, so do not call it score
                 $excel_sheet->write($resource_name_row,$cols_output++,
-                                    'sum',
+                                    &mt('sum'),
                                     $format->{'bold'});
             } else {
                 $excel_sheet->write($resource_name_row,$cols_output++,
-                                    'score',
+                                    &mt('score'),
                                     $format->{'bold'});
             }
         }
@@ -1279,7 +1286,7 @@ sub excel_initialize {
             ($first_data_row,$cols_output-1);
         if ($chosen_output->{'sequence_max'}) {
             $excel_sheet->write($resource_name_row,$cols_output,
-                                'maximum',
+                                &mt('maximum'),
                                 $format->{'bold'});
             $formula_data{$symb}->{'Excel:maxcell'} = 
                 &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell
@@ -1293,11 +1300,11 @@ sub excel_initialize {
         }
     }
     if ($chosen_output->{'grand_total'}) {
-        $excel_sheet->write($resource_name_row,$cols_output++,'Total',
+        $excel_sheet->write($resource_name_row,$cols_output++,&mt('Total'),
                             $format->{'bold'});
     }
     if ($chosen_output->{'grand_maximum'}) {
-        $excel_sheet->write($resource_name_row,$cols_output++,'Max. Total',
+        $excel_sheet->write($resource_name_row,$cols_output++,&mt('Max. Total'),
                             $format->{'bold'});
     }
     $total_formula = $excel_sheet->store_formula($total_formula_string);
@@ -1388,17 +1395,17 @@ sub excel_initialize {
     if ($chosen_output->{'summary_table'}) {
         $cols_output = 0;
         $excel_sheet->write($summary_header_row,$cols_output++,
-                            'Summary Table',$format->{'bold'});
+                            &mt('Summary Table'),$format->{'bold'});
         if ($chosen_output->{'maximum_row'}) {
             $excel_sheet->write($summary_header_row,$cols_output++,
-                                'Maximum',$format->{'bold'});
+                                &mt('Maximum'),$format->{'bold'});
         }
         $excel_sheet->write($summary_header_row,$cols_output++,
-                            'Average',$format->{'bold'});
+                            &mt('Average'),$format->{'bold'});
         $excel_sheet->write($summary_header_row,$cols_output++,
-                            'Median',$format->{'bold'});
+                            &mt('Median'),$format->{'bold'});
         $excel_sheet->write($summary_header_row,$cols_output++,
-                            'Std Dev',$format->{'bold'});
+                            &mt('Std Dev'),$format->{'bold'});
         my $row = $summary_header_row+1;
         foreach my $seq (@sequences) {
             my $symb = $seq->symb;
@@ -1438,21 +1445,14 @@ sub excel_initialize {
     if ($env{'form.SelectedStudent'}) {
         $studentcount = '1';
     }
-    if ($studentcount > 1) {
-        $r->print('<h1>'.&mt('Compiling Excel spreadsheet for [_1] students',
-                             $studentcount)."</h1>\n");
-    } else {
-        $r->print('<h1>'.
-                  &mt('Compiling Excel spreadsheet for 1 student').
-                  "</h1>\n");
-    }
+    $r->print('<p>'
+             .&mt('Compiling Excel spreadsheet for [quant,_1,student]...',$studentcount)
+            ."</p>\n"
+    );
     $r->rflush();
     #
     # Initialize progress window
-    %prog_state=&Apache::lonhtmlcommon::Create_PrgWin
-        ($r,'Excel File Compilation Status',
-         'Excel File Compilation Progress', $studentcount,
-         'inline',undef,'Statistics','stats_status');
+    %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,$studentcount);
     #
     &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,
                                           'Processing first student');
@@ -1492,6 +1492,7 @@ sub excel_outputstudent {
     my %maximum_cell_translation;
     foreach my $seq (@sequences) {
         my $symb = $seq->symb;
+        my $randompick = $seq->randompick();
         $cols_output = $formula_data{$symb}->{'Excel:startcol'};
         # Keep track of cells to translate in total cell
         $total_cell_translation{$formula_data{$symb}->{'Excel:scorecell'}} = 
@@ -1506,12 +1507,13 @@ sub excel_outputstudent {
         if ($chosen_output->{'tries'} || $chosen_output->{'correct'}){
             ($performance,$performance_length,$score,$seq_max,$rawdata) =
                 &student_tries_on_sequence($student,\%StudentsData,
-                                           $navmap,$seq,'no');
+                                           $navmap,$seq,'no',$randompick);
         } else {
             ($performance,$performance_length,$score,$seq_max,$rawdata) =
                 &student_performance_on_sequence($student,\%StudentsData,
                                                  $navmap,$seq,'no',
-                                                 $chosen_output->{ignore_weight});
+                                                 $chosen_output->{ignore_weight},
+                                                 $randompick);
         } 
         if ($chosen_output->{'every_problem'}) {
             if ($chosen_output->{'correct'}) {
@@ -1593,7 +1595,7 @@ sub excel_finish {
     #
     # Tell the user where to get their excel file
     $r->print('<br />'.
-              '<a href="'.$filename.'">Your Excel spreadsheet.</a>'."\n");
+              '<a href="'.$filename.'">'.&mt('Your Excel spreadsheet').'</a>'."\n");
     $r->rflush();
     &excel_cleanup();
     return;
@@ -1652,22 +1654,20 @@ sub csv_initialize{
     # Deal with unimplemented requests
     $request_aborted = undef;
     if ($chosen_output->{'base'} =~ /final table/) {
-        $r->print(<<END);
-<h2>Unable to Complete Request</h2>
-<p>
-The <b>Summary Table (Scores)</b> option is not available for non-HTML output.
-</p>
-END
+        $r->print(
+            '<h2>'.&mt('Unable to Complete Request').'</h2>'
+           .'<p class="LC_warning">'
+           .&mt('The [_1]Summary Table (Scores)[_2] option'
+               .' is not available for non-HTML output.','<b>','</b>')
+           .'</p>'
+        );
        $request_aborted = 1;
     }
     return if ($request_aborted);
     #
     # Initialize progress window
     my $studentcount = scalar(@Apache::lonstatistics::Students);
-    %prog_state=&Apache::lonhtmlcommon::Create_PrgWin
-        ($r,'CSV File Compilation Status',
-         'CSV File Compilation Progress', $studentcount,
-         'inline',undef,'Statistics','stats_status');
+    %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,$studentcount);
     #
     # Open a file
     ($outputfile,$filename) = &Apache::loncommon::create_text_file($r,'csv');
@@ -1676,7 +1676,7 @@ END
     # Datestamp
     my $description = $env{'course.'.$env{'request.course.id'}.'.description'};
     print $outputfile '"'.&Apache::loncommon::csv_translate($description).'",'.
-        '"'.&Apache::loncommon::csv_translate(scalar(localtime(time))).'"'.
+        '"'.&Apache::loncommon::csv_translate(scalar(&Apache::lonlocal::locallocaltime(time))).'"'.
             "\n";
     print $outputfile '"'.
         &Apache::loncommon::csv_translate
@@ -1716,23 +1716,23 @@ END
         $sequence_row.='"",'x$count;
         if ($chosen_output->{'sequence_sum'}) {
             if($chosen_output->{'correct'}) {
-                $resource_row .= '"sum",';
+                $resource_row .= '"'.&mt('sum').'",';
             } else {
-                $resource_row .= '"score",';
+                $resource_row .= '"'.&mt('score').'",';
             }
         }
         if ($chosen_output->{'sequence_max'}) {
             $sequence_row.= '"",';
-            $resource_row .= '"maximum possible",';
+            $resource_row .= '"'.&mt('maximum possible').'",';
         }
     }
     if ($chosen_output->{'grand_total'}) {
         $sequence_row.= '"",';
-        $resource_row.= '"Total",';
+        $resource_row.= '"'.&mt('Total').'",';
     } 
     if ($chosen_output->{'grand_maximum'}) {
         $sequence_row.= '"",';
-        $resource_row.= '"Maximum",';
+        $resource_row.= '"'.&mt('Maximum').'",';
     } 
     chomp($sequence_row);
     chomp($resource_row);
@@ -1773,16 +1773,18 @@ sub csv_outputstudent {
     my $total = 0;
     my $maximum = 0;
     foreach my $seq (@sequences) {
+        my $randompick = $seq->randompick();
         my ($performance,$performance_length,$score,$seq_max,$rawdata);
         if ($chosen_output->{'tries'}){
             ($performance,$performance_length,$score,$seq_max,$rawdata) =
                 &student_tries_on_sequence($student,\%StudentsData,
-                                           $navmap,$seq,'no');
+                                           $navmap,$seq,'no',$randompick);
         } else {
             ($performance,$performance_length,$score,$seq_max,$rawdata) =
                 &student_performance_on_sequence($student,\%StudentsData,
                                                  $navmap,$seq,'no',
-                                                 $chosen_output->{ignore_weight});
+                                                 $chosen_output->{ignore_weight},
+                                                 $randompick);
         }
         if ($chosen_output->{'every_problem'}) {
             if ($chosen_output->{'correct'}) {
@@ -1883,7 +1885,7 @@ Inputs:
 #######################################################
 #######################################################
 sub student_tries_on_sequence {
-    my ($student,$studentdata,$navmap,$seq,$links) = @_;
+    my ($student,$studentdata,$navmap,$seq,$links,$randompick) = @_;
     $links = 'no' if (! defined($links));
     my $Str = '';
     my ($sum,$max) = (0,0);
@@ -1969,17 +1971,17 @@ sub student_tries_on_sequence {
                  ($links eq 'all')) {
                 my $link = '/adm/grades'.
                     '?symb='.&escape($resource->shown_symb).
-                        '&student='.$student->{'username'}.
-                            '&userdom='.$student->{'domain'}.
-                                '&command=submission';
+                        '&amp;student='.$student->{'username'}.
+                            '&amp;userdom='.$student->{'domain'}.
+                                '&amp;command=submission';
                 $symbol = &link($symbol, $link);
             }
             $value .= $symbol;
         }
         $Str .= $value;
     }
-    if ($seq->randompick()) {
-        $max = $seq->randompick();
+    if ($randompick) {
+        $max = $randompick;
     }
     if (! $hasdata && $sum == 0) {
         $sum = ' ';
@@ -2044,7 +2046,7 @@ Inputs:
 #######################################################
 #######################################################
 sub student_performance_on_sequence {
-    my ($student,$studentdata,$navmap,$seq,$links,$awarded_only) = @_;
+    my ($student,$studentdata,$navmap,$seq,$links,$awarded_only,$randompick) = @_;
     $links = 'no' if (! defined($links));
     my $Str = ''; # final result string
     my ($score,$max) = (0,0);
@@ -2053,9 +2055,11 @@ sub student_performance_on_sequence {
     my @ScoreData = ();
     my $partscore;
     my $hasdata = 0; # flag, 0 if there were no submissions on the sequence
+    my %ptsfreq;
     foreach my $resource (&get_resources($navmap,$seq)) {
         my $symb = $resource->symb;
         my $resource_data = $studentdata->{$symb};
+        my $resmax = 0;
         foreach my $part (@{$resource->parts()}) {
             $partscore = undef;
             my $weight;
@@ -2071,6 +2075,7 @@ sub student_performance_on_sequence {
             }
             #
             $max += $weight; # see the 'excused' branch below...
+            $resmax += $weight;
             $performance_length++; # one character per part
             $symbol = ' '; # default to space
             #
@@ -2124,13 +2129,24 @@ sub student_performance_on_sequence {
             if ( ($links eq 'yes' && $symbol ne ' ') || ($links eq 'all')) {
                 my $link = '/adm/grades' .
                     '?symb='.&escape($resource->shown_symb).
-                    '&student='.$student->{'username'}.
-                    '&userdom='.$student->{'domain'}.
-                    '&command=submission';
+                    '&amp;student='.$student->{'username'}.
+                    '&amp;userdom='.$student->{'domain'}.
+                    '&amp;command=submission';
                 $symbol = &link($symbol, $link);
             }
             $Str .= $symbol;
         }
+        if ($ptsfreq{$resmax}) {
+            $ptsfreq{$resmax} ++;
+        } else {
+            $ptsfreq{$resmax} = 1;
+        }
+    }
+    if ($randompick) {
+        my @uniquetotals = keys(%ptsfreq);
+        if ((@uniquetotals = 1) && ($ptsfreq{$uniquetotals[0]} > 0)) {
+            $max = $max * $randompick/$ptsfreq{$uniquetotals[0]};
+        }
     }
     if (! $hasdata && $score == 0) {
         $score = ' ';