--- loncom/interface/statistics/lonstudentassessment.pm	2010/01/14 17:20:51	1.159
+++ loncom/interface/statistics/lonstudentassessment.pm	2012/02/17 00:49:46	1.167
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonstudentassessment.pm,v 1.159 2010/01/14 17:20:51 bisitz Exp $
+# $Id: lonstudentassessment.pm,v 1.167 2012/02/17 00:49:46 droeschl 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;
@@ -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>'.
@@ -361,10 +364,6 @@ 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="selectstudent" value="'.
         &mt('Select One Student').'" />';
     $Str .= '&nbsp;'x5;
@@ -554,7 +553,7 @@ my @OutputDataOptions =
 
 sub HTMLifyOutputDataDescriptions {
     my $Str = '';
-    $Str .= "<h2>'.&mt('Output Data').'</h2>\n";
+    $Str .= '<h2>'.&mt('Output Data').'</h2>'."\n";
     $Str .= "<dl>\n";
     foreach my $option (@OutputDataOptions) {
         $Str .= '    <dt>'.$option->{'name'}.'</dt>';
@@ -748,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">
@@ -810,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;
 }
 
@@ -829,7 +826,7 @@ sub html_outputstudent {
 #       $r->print("</pre><pre>");
         $r->print('</pre>');
         &Apache::lonhtmlcommon::Increment_PrgWin(
-            $r,\%prog_state,'last five students');
+            $r,\%prog_state,'last five students',5);
         $r->rflush();
         $r->print('<pre>');
     }
@@ -843,6 +840,7 @@ sub html_outputstudent {
         }
         my $base = length($title);
         my $width=$Apache::lonstatistics::StudentData{$field}->{'width'};
+        utf8::decode($title);
         $Str .= $title.' 'x($width-$base).$padding;
     }
     # Get ALL the students data
@@ -874,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'} && 
@@ -1452,10 +1452,7 @@ sub excel_initialize {
     $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');
@@ -1495,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'}} = 
@@ -1509,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'}) {
@@ -1667,10 +1666,7 @@ END
     #
     # 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');
@@ -1679,7 +1675,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
@@ -1776,16 +1772,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'}) {
@@ -1886,7 +1884,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);
@@ -1981,8 +1979,8 @@ sub student_tries_on_sequence {
         }
         $Str .= $value;
     }
-    if ($seq->randompick()) {
-        $max = $seq->randompick();
+    if ($randompick) {
+        $max = $randompick;
     }
     if (! $hasdata && $sum == 0) {
         $sum = ' ';
@@ -2047,7 +2045,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);
@@ -2056,9 +2054,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;
@@ -2074,6 +2074,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
             #
@@ -2134,6 +2135,17 @@ sub student_performance_on_sequence {
             }
             $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 = ' ';