--- loncom/interface/statistics/lonstathelpers.pm	2004/04/01 22:13:39	1.11
+++ loncom/interface/statistics/lonstathelpers.pm	2004/08/03 19:53:12	1.18
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonstathelpers.pm,v 1.11 2004/04/01 22:13:39 matthew Exp $
+# $Id: lonstathelpers.pm,v 1.18 2004/08/03 19:53:12 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -109,6 +109,7 @@ all option response and radiobutton prob
 
 Returns: A string containing html for a table which lists the sequences
 and their contents.  A radiobutton is provided for each problem.
+Skips 'survey' problems.
 
 =cut
 
@@ -118,13 +119,14 @@ sub ProblemSelector {
     my ($AcceptedResponseTypes) = @_;
     my $Str;
     $Str = "\n<table>\n";
-    foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) {
+    foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess('all')) {
         next if ($seq->{'num_assess'}<1);
         my $seq_str = '';
         foreach my $res (@{$seq->{'contents'}}) {
             next if ($res->{'type'} ne 'assessment');
             foreach my $part (@{$res->{'parts'}}) {
                 my $partdata = $res->{'partdata'}->{$part};
+                next if ($partdata->{'Survey'});
                 for (my $i=0;$i<scalar(@{$partdata->{'ResponseTypes'}});$i++){
                     my $respid = $partdata->{'ResponseIds'}->[$i];
                     my $resptype = $partdata->{'ResponseTypes'}->[$i];
@@ -224,7 +226,7 @@ sub get_target_from_id {
 
 =pod
 
-=item &get_prev_curr_next($target)
+=item &get_prev_curr_next($target,$AcceptableResponseTypes,$granularity)
 
 Determine the problem parts or responses preceeding and following the
 current resource.
@@ -232,7 +234,7 @@ current resource.
 Inputs: $target (see &Apache::lonstathelpers::get_target_from_id())
   $AcceptableResponseTypes, regular expression matching acceptable
                             response types,
-  $granularity, either 'part' or 'response'
+  $granularity, either 'part', 'response', or 'part_survey'
 
 Returns: three hash references, $prev, $curr, $next, which refer to the
 preceeding, current, or following problem parts or responses, depending
@@ -255,12 +257,20 @@ sub get_prev_curr_next {
     #
     # Build an array with the data we need to search through
     my @Resource;
-    foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) {
+    foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess('all')) {
         foreach my $res (@{$seq->{'contents'}}) {
             next if ($res->{'type'} ne 'assessment');
             foreach my $part (@{$res->{'parts'}}) {
                 my $partdata = $res->{'partdata'}->{$part};
-                if ($granularity eq 'part') {
+                if ($partdata->{'Survey'}) {
+                    if ($granularity eq 'part_survey'){
+                        push (@Resource,
+                              { symb     => $res->{symb},
+                                part     => $part,
+                                resource => $res,
+                            } );
+                    }
+                } elsif ($granularity eq 'part') {
                     push (@Resource,
                           { symb     => $res->{symb},
                             part     => $part,
@@ -290,7 +300,7 @@ sub get_prev_curr_next {
     my $curr_idx;
     for ($curr_idx=0;$curr_idx<$#Resource;$curr_idx++) {
         my $curr_item = $Resource[$curr_idx];
-        if ($granularity eq 'part') {
+        if ($granularity eq 'part' || $granularity eq 'part_survey') {
             if ($curr_item->{'symb'} eq $target->{'symb'} &&
                 $curr_item->{'part'} eq $target->{'part'}) {
                 last;
@@ -305,7 +315,7 @@ sub get_prev_curr_next {
         }
     }
     my $curr_item = $Resource[$curr_idx];
-    if ($granularity eq 'part') {
+    if ($granularity eq 'part' || $granularity eq 'part_survey') {
         if ($curr_item->{'symb'}     ne $target->{'symb'} ||
             $curr_item->{'part'}     ne $target->{'part'}) {
             # bogus symb - return nothing
@@ -363,7 +373,13 @@ Returns: nothing
 #####################################################
 #####################################################
 sub GetStudentAnswers {
-    my ($r,$problem,$Students) = @_;
+    my ($r,$problem,$Students,$formname,$inputname) = @_;
+    my $status_type;
+    if (defined($formname)) {
+        $status_type = 'inline';
+    } else {
+        $status_type = 'popup';
+    }    
     my $c = $r->connection();
     my %Answers;
     my ($resource,$partid,$respid) = ($problem->{'resource'},
@@ -374,7 +390,8 @@ sub GetStudentAnswers {
     # Open progress window
     my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin
         ($r,'Student Answer Compilation Status',
-         'Student Answer Compilation Progress', scalar(@$Students));
+         'Student Answer Compilation Progress', scalar(@$Students),
+         $status_type,undef,$formname,$inputname);
     $r->rflush();
     foreach my $student (@$Students) {
         last if ($c->aborted());
@@ -622,7 +639,7 @@ sub ensure_proper_cache {
     my ($symb) = @_;
     my $cid = $ENV{'request.course.id'};
     my $new_filename =  '/home/httpd/perl/tmp/'.
-        'problemanalsysis_'.$cid.'answer_cache.db';
+        'problemanalysis_'.$cid.'_answer_cache.db';
     if (! defined($cache_filename) ||
         $cache_filename ne $new_filename ||
         ! defined($current_symb)   ||
@@ -1040,6 +1057,65 @@ sub sections_description {
 
 ####################################################
 ####################################################
+
+=pod
+
+=item &manage_caches
+
+Inputs: $r, apache request object
+
+Returns: An array of scalars containing html for buttons.
+
+=cut
+
+####################################################
+####################################################
+sub manage_caches {
+    my ($r,$formname,$inputname) = @_;
+    &Apache::loncoursedata::clear_internal_caches();
+    my $sectionkey = 
+        join(',',
+             map {
+                     &Apache::lonnet::escape($_);
+                 } sort(@Apache::lonstatistics::SelectedSections)
+             );
+    my $statuskey = $Apache::lonstatistics::enrollment_status;
+    if (exists($ENV{'form.ClearCache'}) || 
+        exists($ENV{'form.updatecaches'}) || 
+        (exists($ENV{'form.firstrun'}) && $ENV{'form.firstrun'} ne 'no') ||
+        (exists($ENV{'form.prevsection'}) &&
+            $ENV{'form.prevsection'} ne $sectionkey) ||
+        (exists($ENV{'form.prevenrollstatus'}) &&
+            $ENV{'form.prevenrollstatus'} ne $statuskey)
+        ) {
+        &Apache::lonstatistics::Gather_Full_Student_Data($r,$formname,
+                                                         $inputname);
+    }
+    #
+    my @Buttons = 
+        ('<input type="submit" name="ClearCache" '.
+             'value="'.&mt('Clear Caches').'" />',
+         '<input type="submit" name="updatecaches" '.
+             'value="'.&mt('Update Caches').'" />'.
+         &Apache::loncommon::help_open_topic('Statistics_Cache'),
+         '<input type="hidden" name="prevsection" value="'.$sectionkey.'" />',
+         '<input type="hidden" name="prevenrollstatus" value="'.$statuskey.'" />'
+         );
+    #
+    if (! exists($ENV{'form.firstrun'})) {
+        $r->print('<input type="hidden" name="firstrun" value="yes" />');
+    } else {
+        $r->print('<input type="hidden" name="firstrun" value="no" />');
+    }
+    #
+    return @Buttons;
+}
+
+
+
+
+####################################################
+####################################################
 
 =pod