--- loncom/interface/statistics/lonstathelpers.pm	2004/09/16 14:28:19	1.22
+++ loncom/interface/statistics/lonstathelpers.pm	2004/09/30 13:44:07	1.27
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonstathelpers.pm,v 1.22 2004/09/16 14:28:19 matthew Exp $
+# $Id: lonstathelpers.pm,v 1.27 2004/09/30 13:44:07 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -118,6 +118,7 @@ sub ProblemSelector {
     my ($AcceptedResponseTypes) = @_;
     my $Str;
     $Str = "\n<table>\n";
+    my $rb_count =0;
     foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess('all')) {
         next if ($seq->{'num_assess'}<1);
         my $seq_str = '';
@@ -141,16 +142,17 @@ sub ProblemSelector {
                         if (! defined($title) || $title eq '') {
                             ($title) = ($res->{'src'} =~ m:/([^/]*)$:);
                         }
-                        $seq_str .= '<tr><td>'.
-  '<input type="radio" name="problemchoice" value="'.$value.'" '.$checked.'/>'.
-  '</td><td>'.          
-  $resptype.'</td><td>'.
-  '<a href="'.$res->{'src'}.'">'.$title.'</a> ';
-#  '<a href="'.$res->{'src'}.'">'.$resptype.' '.$res->{'title'}.'</a> ';
+                        $seq_str .= '<tr>'.
+                            qq{<td><input type="radio" id="$rb_count" name="problemchoice" value="$value" $checked /></td>}.
+                            '<td><label for="'.$rb_count.'">'.$resptype.'</label></td>'.
+                            '<td><label for="'.$rb_count.'">'.$title.'</label>';
                         if (scalar(@{$partdata->{'ResponseIds'}}) > 1) {
                             $seq_str .= &mt('response').' '.$respid;
                         }
+                        $seq_str .= ('&nbsp;'x2).
+                            qq{<a target="preview" href="$res->{'src'}">view</a>};
                         $seq_str .= "</td></tr>\n";
+                        $rb_count++;
                     }
                 }
             }
@@ -169,7 +171,7 @@ sub ProblemSelector {
 
 =pod
 
-=item &MultpleProblemSelector($navmap,$ResponseTypes,$selected,$inputname)
+=item &MultipleProblemSelector($navmap,$selected,$inputname)
 
 Generate HTML with checkboxes for problem selection.
 
@@ -178,10 +180,6 @@ Input:
 $navmap: a navmap object.  If undef, navmaps will be called to create a
 new object.
 
-$ResponseTypes: scalar containing regular expression which matches response 
-types.  Only those problems which contain the given response type will be 
-shown.
-
 $selected: Scalar, Array, or hash reference of currently selected items.
 
 $inputname: The name of the form elements to use for the checkboxs.
@@ -194,7 +192,7 @@ and their contents.  A checkbox is provi
 ####################################################
 ####################################################
 sub MultipleProblemSelector {
-    my ($navmap,$ReponseTypes,$inputname,$formname)=@_;
+    my ($navmap,$inputname,$formname)=@_;
     my $cid = $ENV{'request.course.id'};
     my $Str;
     # Massage the input as needed.
@@ -209,12 +207,20 @@ sub MultipleProblemSelector {
     my $selected = {map { ($_,1) } (&get_selected_symbs($inputname))};
     # Header
     $Str .= <<"END";
-<script>
-    function checkall(value, checkName) {
+<script language="JavaScript" type="text/javascript">
+    function checkall(value,seqid) {
         for (i=0; i<document.forms.$formname.elements.length; i++) {
             ele = document.forms.$formname.elements[i];
             if (ele.name == '$inputname') {
-                document.forms.$formname.elements[i].checked=value;
+                if (seqid != null) {
+                    itemid = document.forms.$formname.elements[i].id;
+                    thing = itemid.split(':');
+                    if (thing[0] == seqid) {
+                        document.forms.$formname.elements[i].checked=value;
+                    }
+                } else {
+                    document.forms.$formname.elements[i].checked=value;
+                }
             }
         }
     }
@@ -227,25 +233,28 @@ END
     $Str .= $/.'<table>'.$/;
     my $iterator = $navmap->getIterator(undef, undef, undef, 1);
     my $sequence_string;
+    my $seq_id = 0;
     my @Accumulator = (&new_accumulator($ENV{'course.'.$cid.'.description'},
                                         '',
                                         '',
+                                        $seq_id++,
                                         $inputname));
     my @Sequence_Data;
     while (my $curRes = $iterator->next()) {
         if ($curRes == $iterator->END_MAP) {
             if (ref($Accumulator[-1]) eq 'CODE') {
-                push(@Sequence_Data,&{$Accumulator[-1]}());
-                pop(@Accumulator);
+                my $old_accumulator = pop(@Accumulator);
+                push(@Sequence_Data,&{$old_accumulator}());
             }
         } elsif ($curRes == $iterator->BEGIN_MAP) {
             # Not much to do here.
         }
         next if (! ref($curRes));
         if ($curRes->is_map) {
-            push(@Accumulator,&new_accumulator($curRes->title,
+            push(@Accumulator,&new_accumulator($curRes->compTitle,
                                                $curRes->src,
                                                $curRes->symb,
+                                               $seq_id++,
                                                $inputname));
         } elsif ($curRes->is_problem) {
             if (@Accumulator && $Accumulator[-1] ne '') {
@@ -259,7 +268,11 @@ END
         #my $seq = pop(@Sequence_Data);
         next if (! defined($seq) || ref($seq) ne 'HASH');
         $Str.= '<tr><td colspan="2">'.
-            '<b>'.&get_title($seq->{'title'},$seq->{'src'}).'</b>'.
+            '<b>'.$seq->{'title'}.'</b>'.('&nbsp;'x2).
+            '<a href="javascript:checkall(true,'.$seq->{'id'}.')">'.
+                                  &mt('Select').'</a>'.('&nbsp;'x2).
+            '<a href="javascript:checkall(false,'.$seq->{'id'}.')">'.
+                                  &mt('Unselect').'</a>'.('&nbsp;'x2).
             '</td></tr>'.$/;
         $Str.= $seq->{'html'};
     }
@@ -278,26 +291,31 @@ sub get_title {
 }
 
 sub new_accumulator {
-    my ($title,$src,$symb,$inputname) = @_;
+    my ($title,$src,$symb,$seq_id,$inputname) = @_;
     my $target;
+    my $item_id=0;
     return 
         sub {
             if (@_) { 
                 my ($res,$checked) = @_;
-                $target.='<tr><td>'.
+                $target.='<tr><td><label>'.
                     '<input type="checkbox" name="'.$inputname.'" ';
                 if ($checked) {
                     $target .= 'checked ';
                 }
+                $target .= 'id="'.$seq_id.':'.$item_id++.'" ';
                 $target.= 
                     'value="'.&Apache::lonnet::escape($res->symb).'" />'.
-                    '</td><td>'.&get_title($res->title,$res->symb).'</td>'.
-                    '</tr>'.$/;
+                    '&nbsp;'.$res->compTitle.'</label>'.
+                    ('&nbsp;'x2).'<a target="preview" '.
+                    'href="'.$res->src.'">view</a>'.
+                    '</td></tr>'.$/;
             } else { 
                 if (defined($target)) {
                     return { title => $title,
                              symb  => $symb,
                              src   => $src,
+                             id    => $seq_id,
                              html  => $target, }; 
                 }
                 return undef;
@@ -1244,7 +1262,7 @@ Returns: An array of scalars containing
 ####################################################
 ####################################################
 sub manage_caches {
-    my ($r,$formname,$inputname) = @_;
+    my ($r,$formname,$inputname,$update_message) = @_;
     &Apache::loncoursedata::clear_internal_caches();
     my $sectionkey = 
         join(',',
@@ -1261,8 +1279,12 @@ sub manage_caches {
         (exists($ENV{'form.prevenrollstatus'}) &&
             $ENV{'form.prevenrollstatus'} ne $statuskey)
         ) {
+        if (defined($update_message)) {
+            $r->print($update_message);
+        }
         &Apache::lonstatistics::Gather_Full_Student_Data($r,$formname,
                                                          $inputname);
+            
     }
     #
     my @Buttons =