--- loncom/interface/statistics/lonstudentsubmissions.pm	2004/03/16 16:30:32	1.9
+++ loncom/interface/statistics/lonstudentsubmissions.pm	2004/09/02 21:02:54	1.16
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonstudentsubmissions.pm,v 1.9 2004/03/16 16:30:32 matthew Exp $
+# $Id: lonstudentsubmissions.pm,v 1.16 2004/09/02 21:02:54 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -43,14 +43,10 @@ my @SubmitButtons = ({ name => 'PrevProb
                      { name => 'NextProblem',
                        text => 'Next Problem' },
                      { name => 'break'},
-                     { name => 'ClearCache',
-                       text => 'Clear Caches' },
-                     { name => 'updatecaches',
-                       text => 'Update Student Data' },
                      { name => 'SelectAnother',
                        text => 'Choose a different Problem' },
                      { name => 'Generate',
-                       text => 'Generate Spreadsheet'},
+                       text => 'Generate Report'},
                      );
 
 sub BuildStudentSubmissionsPage {
@@ -75,18 +71,8 @@ sub BuildStudentSubmissionsPage {
         $r->print('<h2>There are no students in the sections selected</h2>');
     }
     #
-    &Apache::loncoursedata::clear_internal_caches();
-    if (exists($ENV{'form.ClearCache'}) || 
-        exists($ENV{'form.updatecaches'}) ||
-        (exists($ENV{'form.firstanalysis'}) &&
-         $ENV{'form.firstanalysis'} ne 'no')) {
-        &Apache::lonstatistics::Gather_Full_Student_Data($r);
-    }
-    if (! exists($ENV{'form.firstanalysis'})) {
-        $r->print('<input type="hidden" name="firstanalysis" value="yes" />');
-    } else {
-        $r->print('<input type="hidden" name="firstanalysis" value="no" />');
-    }
+    my @CacheButtonHTML = 
+        &Apache::lonstathelpers::manage_caches($r,'Statistics','stats_status');
     $r->rflush();
     #
     if (exists($ENV{'form.problemchoice'}) && 
@@ -100,6 +86,9 @@ sub BuildStudentSubmissionsPage {
                 $r->print('&nbsp;'x5);
             }
         }
+        foreach my $html (@CacheButtonHTML) {
+            $r->print($html.('&nbsp;'x5));
+        }
         #
         $r->print('<hr />');
         $r->rflush();
@@ -133,15 +122,22 @@ sub BuildStudentSubmissionsPage {
             my $resource = $current_problem->{'resource'};
             $r->print('<h1>'.$resource->{'title'}.'</h1>');
             $r->print('<h3>'.$resource->{'src'}.'</h3>');
-            $r->print(&Apache::lonstathelpers::render_resource($resource));
+            if ($ENV{'form.renderprob'} eq 'true') {
+                $r->print(&Apache::lonstathelpers::render_resource($resource));
+            }
             $r->rflush();
             my %Data = &Apache::lonstathelpers::get_problem_data
                 ($resource->{'src'});
             my $ProblemData = $Data{$current_problem->{'part'}.
                                     '.'.
                                     $current_problem->{'respid'}};
-            &prepare_excel_output($r,$current_problem,
-                                  $ProblemData,\@Students);
+            if ($ENV{'form.output'} eq 'excel') {
+                &prepare_excel_output($r,$current_problem,
+                                      $ProblemData,\@Students);
+            } else {
+                &prepare_html_output($r,$current_problem,
+                                     $ProblemData,\@Students);
+            }
         }
         $r->print('<hr />');
     } else {
@@ -153,6 +149,241 @@ sub BuildStudentSubmissionsPage {
     }
 }
 
+#########################################################
+#########################################################
+
+my @DefaultColumns = 
+    (
+     {name=>'username',
+      display=>'Student'},
+     {name=>'domain',
+      display=>'Domain'},
+     {name => 'id',
+      display => 'Id'},
+     {name => 'time',
+      display =>'Time'},
+     {name => 'attempt',
+      display =>'Attempt'},
+     {name => 'awarddetail',
+      display =>'Awarddetail'},
+     {name => 'grading',
+      display =>'Score'},
+    );
+
+#########################################################
+#########################################################
+##
+##    prepare_html_output
+##
+#########################################################
+#########################################################
+sub prepare_html_output {
+    my ($r,$problem,$ProblemData,$Students) = @_;
+    my $c = $r->connection();
+    my ($resource,$respid,$partid) = ($problem->{'resource'},
+                                      $problem->{'respid'},
+                                      $problem->{'part'});
+    #
+    if ($ENV{'form.correctans'} eq 'true') {
+        $r->print('<h2>'.&mt('Generating Correct Answers').'</h2>');
+        &Apache::lonstathelpers::GetStudentAnswers($r,$problem,$Students,
+                                                   'Statistics',
+                                                   'stats_status');
+    }
+    #
+    $r->print('<h2>'.&mt('Student Responses').'</h2>');
+    #
+    $r->rflush();
+    my $response_type;
+    for (my $i=0;
+         $i<scalar(@{$resource->{'partdata'}->{$partid}->{'ResponseIds'}});
+         $i++) {
+        if($resource->{'partdata'}->{$partid}->{'ResponseIds'}->[$i] eq $respid){
+            $response_type = 
+                $resource->{'partdata'}->{$partid}->{'ResponseTypes'}->[$i];
+            last;
+        }
+    }
+    if (! defined($response_type)) {
+        $r->print('<h2>'.&mt('Unable to determine response type').'</h2>');
+    } else {
+        my $count = 0;
+        my @Columns;
+        if (exists($ENV{'form.concise'}) && $ENV{'form.concise'} eq 'true') {
+            foreach (@DefaultColumns) {
+                if ($_->{'name'} =~ /^(username|domain|id)$/){
+                    push(@Columns,$_);
+                }
+            }
+        } else {
+            @Columns = @DefaultColumns;
+        }
+        my $header = '<table>'.$/.&html_headers(\@Columns);
+        if ($response_type eq 'essay') {
+            $header .= &html_essay_headers();
+        } elsif ($response_type eq 'option') {
+            $header .= &html_option_headers();
+        } else {
+            $header .= &html_generic_headers();
+        }
+        $header = '<tr>'.$header.'</tr>';
+        #
+        $r->print($/.$header.$/);
+        foreach my $student (@$Students) {
+            if ($count >= 50) {
+                $r->print('</table>'.$/.$header.$/);
+                $count = 0;
+            }
+            last if ($c->aborted());
+            my $results = &Apache::loncoursedata::get_response_data_by_student
+                ($student,$resource->{'symb'},$respid);
+            next if (! defined($results) || ref($results) ne 'ARRAY');
+            for (my $i=0;$i<scalar(@$results);$i++) {
+                my $response = $results->[$i];
+                if ($ENV{'form.last_sub_only'} eq 'true' && 
+                    $i < (scalar(@$results)-1)) {
+                    next;
+                }
+                my $data;
+                $data->{'username'} = $student->{'username'};
+                $data->{'domain'}   = $student->{'domain'};
+                $data->{'id'} = $student->{'id'};
+                $data->{'fullname'} = $student->{'fullanem'};
+                $data->{'status'} = $student->{'status'};
+                $data->{'time'} = &Apache::lonlocal::locallocaltime
+                    ($response->[&Apache::loncoursedata::RDs_timestamp()]);
+                $data->{'attempt'} = 
+                    $response->[&Apache::loncoursedata::RDs_tries()];
+                $data->{'awarded'} = 
+                    $response->[&Apache::loncoursedata::RDs_awarded()];
+                $data->{'awarddetail'} = 
+                    $response->[&Apache::loncoursedata::RDs_awarddetail()];
+                my $rowextra = 'bgcolor="#CCCCCC"';
+                if ($count % 2 == 1) {
+                    $rowextra = 'bgcolor="#EEEEEE"';
+                }
+                my $row = '<tr '.$rowextra.'>';
+                foreach my $col (@Columns) {
+                    $row .= '<td valign="top">'.
+                        $data->{$col->{'name'}}.'</td>';
+                }
+                if ($response_type eq 'essay') {
+                    $row .= &html_essay
+                        ($response->[&Apache::loncoursedata::RDs_submission()],
+                         $student->{'answer'},
+                         scalar(@Columns),$rowextra);
+                } elsif ($response_type eq 'option') {
+                    $row .= &html_option
+                        ($response->[&Apache::loncoursedata::RDs_submission()],
+                         $student->{'answer'},
+                         scalar(@Columns),$rowextra);
+                } else {
+                    $row .= &html_generic
+                        ($response->[&Apache::loncoursedata::RDs_submission()],
+                         $student->{'answer'},
+                         scalar(@Columns),$rowextra);
+                }
+                $row .= '</tr>';
+                $r->print($row.$/);
+                $count++;
+            }
+        }
+        $r->print('</table>'.$/);
+    }
+    return;
+}
+
+#####################################################
+##
+##     HTML helper routines
+##
+#####################################################
+sub html_headers {
+    my ($Columns) = @_;
+    my $Str;
+    foreach my $column (@$Columns) {
+        $Str .= '<th align="left">'.$column->{'display'}.'</th>';
+    }
+    return $Str;
+}
+
+sub html_essay {
+    my ($submission,$correct,$tablewidth,$rowextra)=@_;
+    #
+    $submission =~ s|\\r\\n|$/|g;
+    $submission = &HTML::Entities::encode($submission,'<>&"');
+    $submission =~ s|$/\s*$/|$/</p><p>$/|g;
+    $submission =~ s|\\||g;
+    $submission = '<p>'.$submission.'</p>';
+    #
+    my $Str  = '</tr><tr '.$rowextra.'>'.
+        '<td colspan="'.$tablewidth.'">'.$submission.'</td>';
+    if ($ENV{'form.correctans'} eq 'true') {
+        $Str .= '</tr>';
+        if (defined($correct) && $correct !~ /^\s*$/) {
+            $Str .= '<tr '.$rowextra.'><td colspan="'.$tablewidth.'">'.
+                '<b>'.&mt('Correct Answer:').'</b>'.$correct.'</td>';
+        }
+    }
+    $Str .= '</tr>';
+    #
+    return $Str;
+}
+
+sub html_essay_headers {
+    return '';
+}
+
+sub html_generic_headers {
+    my $header ='<th>'.&mt('Submission').'</th>';
+    if ($ENV{'form.correctans'} eq 'true') {
+        $header .= '<th>'.&mt('Correct').'</th>';
+    }
+    return $header;
+}
+
+sub html_radiobutton {
+    my ($submission,$correct,$tablewidth,$rowclass)=@_;
+    $submission =~ s/=([^=])$//;
+    return &html_generic_results($submission,$correct,$tablewidth,$rowclass);
+}
+
+sub html_generic {
+    my ($submission,$correct,$tablewidth,$rowclass)=@_;
+    my $Str .= '<td>'.$submission.'</td>';
+    if ($ENV{'form.correctans'} eq 'true') {
+        $Str .= '<td>'.$correct.'</td>';
+    }
+    $Str .= '</tr>';
+    return $Str;
+}
+
+sub html_option_headers {
+    return &html_generic_headers();
+}
+
+sub html_option {
+    my ($submission,$correct,$tablewidth,$rowclass)=@_;
+    $submission = 
+        '<ul class="sub_studentans">'.
+        '<li>'.join('</li><li>',
+                    map { 
+                        &Apache::lonnet::unescape($_) ;
+                    } sort split('&',$submission)
+                    ).
+                    '</li><ul>';
+    if (defined($correct) && $correct !~ /^\s*$/) {
+        $correct = '<ul class="sub_correctans">'.
+            '<li>'.join('</li><li>',
+                        map { 
+                            &Apache::lonnet::unescape($_) ;
+                        } sort split('&',$correct)
+                        ).
+                        '</li></ul>';
+    }
+    #
+    return &html_generic($submission,$correct,$tablewidth,$rowclass);
+}
 
 #########################################################
 #########################################################
@@ -169,15 +400,35 @@ sub prepare_excel_output {
                                       $problem->{'part'});
     $r->print('<h2>'.
               &mt('Preparing Excel spreadsheet of student responses').
-              '</h2>');
-    #
-    &GetStudentAnswers($r,$problem,$Students);
+              '</h2>'.
+              '<p>'.
+              &mt('See the status bar above for student answer computation progress').
+              '</p>');
+    #
+    if ($ENV{'form.correctans'} eq 'true') {
+        &Apache::lonstathelpers::GetStudentAnswers($r,$problem,$Students,
+                                                   'Statistics',
+                                                   'stats_status');
+        $r->print('<script>'.
+                  'window.document.Statistics.stats_status.value="'.
+                  'Done computing student answers.  Compiling spreadsheet.'.
+                  '";</script>');
+    }
     #
-    my @Columns = ( 'username','domain','attempt','time',
-                    'submission','correct', 'grading','awarded','weight',
-                    'score');
-    my $awarded_col = 7;
-    my $weight_col  = 8;
+    $r->rflush();
+    my @Columns;
+    push(@Columns,'username');
+    push(@Columns,'domain');
+    push(@Columns,'attempt');
+    push(@Columns,'time');
+    push(@Columns,'submission');
+    if ($ENV{'form.correctans'} eq 'true') { push(@Columns,'correct'); }
+    push(@Columns,'grading');
+    push(@Columns,'awarded');
+    my $awarded_col = $#Columns;
+    push(@Columns,'weight');
+    my $weight_col  = $#Columns;
+    push(@Columns,'score');
     #
     # Create excel worksheet
     my $filename = '/prtspool/'.
@@ -209,14 +460,19 @@ sub prepare_excel_output {
     $worksheet->write_row($rows_output++,0,\@Columns,$format->{'bold'});
     #
     # Populate the worksheet with the student data
+    my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin
+        ($r,'Excel File Compilation Status',
+         'Excel File Compilation Progress', 
+         scalar(@$Students),'inline',undef,'Statistics','stats_status');
     foreach my $student (@$Students) {
         last if ($c->aborted());
+        
         my $results = &Apache::loncoursedata::get_response_data_by_student
             ($student,$resource->{'symb'},$respid);
         my %row;
         $row{'username'} = $student->{'username'};
         $row{'domain'}   = $student->{'domain'};
-        $row{'correct'} = $student->{'answer'};
+        $row{'correct'}  = $student->{'answer'};
         $row{'weight'} = &Apache::lonnet::EXT
             ('resource.'.$partid.'.weight',$resource->{'symb'},
              undef,undef,undef);
@@ -237,7 +493,12 @@ sub prepare_excel_output {
             }
             $rows_output++;
         } else {
-            foreach my $response (@$results) {
+            for (my $i=0;$i<scalar(@$results);$i++) {
+                my $response = $results->[$i];
+                if ($ENV{'form.last_sub_only'} eq 'true' && 
+                    $i < (scalar(@$results)-1)) {
+                    next;
+                }
                 delete($row{'time'});
                 delete($row{'attempt'});
                 delete($row{'submission'});
@@ -277,7 +538,10 @@ sub prepare_excel_output {
                 $rows_output++;
             }
         } # End of else clause on if (! defined($results) ....
+        &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,
+                                                 'last student');
     }
+    &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
     #
     # Close the excel file
     $workbook->close();
@@ -286,37 +550,11 @@ sub prepare_excel_output {
     $r->print('<p><a href="'.$filename.'">'.
               &mt('Your Excel spreadsheet.').
               '</a></p>'."\n");
-}
-
-sub GetStudentAnswers {
-    my ($r,$problem,$Students) = @_;
-    my $c = $r->connection();
-    my %Answers;
-    my ($resource,$partid,$respid) = ($problem->{'resource'},
-                                      $problem->{'part'},
-                                      $problem->{'respid'});
-    # Read in the cache (if it exists) before we start timing things.
-    &Apache::lonstathelpers::ensure_proper_cache($resource->{'symb'});
-    # Open progress window
-    my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin
-        ($r,'Student Answer Compilation Status',
-         'Student Answer Compilation Progress', scalar(@$Students));
+    $r->print('<script>'.
+              'window.document.Statistics.stats_status.value="'.
+              'Done compiling spreadsheet.  See link below to download.'.
+              '";</script>');
     $r->rflush();
-    foreach my $student (@$Students) {
-        last if ($c->aborted());
-        my $sname = $student->{'username'};
-        my $sdom = $student->{'domain'};
-        my $answer = &Apache::lonstathelpers::analyze_problem_as_student
-            ($resource,$sname,$sdom,$partid,$respid);
-        &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,
-                                                 &mt('last student'));
-        $student->{'answer'} = $answer;
-    }
-    &Apache::lonstathelpers::write_answer_cache();
-    return if ($c->aborted());
-    $r->rflush();
-    # close progress window
-    &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
     return;
 }
 
@@ -329,18 +567,29 @@ sub GetStudentAnswers {
 #########################################################
 sub CreateInterface {
     ##
+    ## Output Selection
+    my $OutputSelector = $/.'<select name="output">'.$/;
+    foreach ('HTML','Excel') {
+        $OutputSelector .= '    <option value="'.lc($_).'"';
+        if ($ENV{'form.output'} eq lc($_)) {
+            $OutputSelector .= ' selected ';
+        }
+        $OutputSelector .='>'.&mt($_).'</option>'.$/;
+    } 
+    $OutputSelector .= '</select>'.$/;
+    ##
     ## Environment variable initialization
     my $Str = '';
     $Str .= &Apache::lonhtmlcommon::breadcrumbs
         (undef,'Student Submission Reports');
+    $Str .= '<p>';
     $Str .= '<table cellspacing="5">'."\n";
     $Str .= '<tr>';
-    $Str .= '<td align="center"><b>'.&mt('Sections').'</b></td>';
-    $Str .= '<td align="center"><b>'.&mt('Enrollment Status').'</b></td>';
-    $Str .= '<td align="center">&nbsp;</td>';
+    $Str .= '<th>'.&mt('Sections').'</th>';
+    $Str .= '<th>'.&mt('Enrollment Status').'</th>';
+    $Str .= '<th>'.&mt('Output Options').'</th>';
     $Str .= '</tr>'."\n";
-    ##
-    ## 
+    #
     $Str .= '<tr><td align="center">'."\n";
     $Str .= &Apache::lonstatistics::SectionSelect('Section','multiple',5);
     $Str .= '</td>';
@@ -349,31 +598,58 @@ sub CreateInterface {
     $Str .= &Apache::lonhtmlcommon::StatusOptions(undef,undef,5);
     $Str .= '</td>';
     #
-    $Str .= '<td></td>';
+    # Render problem checkbox
+    my $prob_checkbox = '<input type="checkbox" name="renderprob" ';
+    if (exists($ENV{'form.renderprob'}) && $ENV{'form.renderprob'} eq 'true') {
+        $prob_checkbox .= 'checked ';
+    }
+    $prob_checkbox .= 'value="true" />';
+    #
+    # Compute correct answers checkbox
+    my $ans_checkbox = '<input type="checkbox" name="correctans" ';
+    if (exists($ENV{'form.correctans'}) && $ENV{'form.correctans'} eq 'true') {
+        $ans_checkbox .= 'checked ';
+    }
+    $ans_checkbox .= 'value="true" />';
+    #
+    # Only show last submission checkbox
+    my $last_sub_checkbox = '<input type="checkbox" name="last_sub_only" ';
+    if (exists($ENV{'form.last_sub_only'}) && 
+        $ENV{'form.last_sub_only'} eq 'true') {
+        $last_sub_checkbox .= 'checked ';
+    }
+    $last_sub_checkbox.= 'value="true" />';
+    #
+    # Concise view checkbox
+    my $concise_view_checkbox = '<input type="checkbox" name="concise" ';
+    if (exists($ENV{'form.concise'}) && $ENV{'form.concise'} eq 'true') {
+        $concise_view_checkbox .= 'checked ';
+    }
+    $concise_view_checkbox .= 'value="true" />';
+    #
+    $Str .= '<td align="right" halign="top">'.
+        '<b>'.&mt('Output Format: [_1]',$OutputSelector).'</b><br />'.$/.
+        '<label><b>'.
+        &mt('show problem [_1]',$prob_checkbox).'</b></label><br />'.
+        '<label><b>'.
+        &mt('compute correct answers [_1]',$ans_checkbox).'</b></label><br />'.
+        '<label><b>'.
+        &mt('final answer only [_1]',$last_sub_checkbox).'</b></label><br />'.
+        '<label><b>'.
+        &mt('concise view [_1]',$concise_view_checkbox).'</b></label><br />'.
+        '</td>';
     #
-    my $only_seq_with_assessments = sub { 
-        my $s=shift;
-        if ($s->{'num_assess'} < 1) { 
-            return 0;
-        } else { 
-            return 1;
-        }
-    };
-    ##
-    ##
     $Str .= '</tr>'."\n";
     $Str .= '</table>'."\n";
     #
-    # We do this to make sure the sequence information is initialized
-    &Apache::lonstatistics::MapSelect('Maps','multiple,all',5,
-                                              $only_seq_with_assessments);
-    
-    #
+    $Str .= '<nobr>'.&mt('Status: [_1]',
+                         '<input type="text" '.
+                         'name="stats_status" size="60" value="" />').
+            '</nobr>'.'</p>';    
+    ##
     return $Str;
 }
 
-
-
 1;
 
 __END__