--- loncom/interface/statistics/lonstathelpers.pm	2011/11/18 22:35:33	1.59.12.2
+++ loncom/interface/statistics/lonstathelpers.pm	2010/08/04 01:56:07	1.63
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonstathelpers.pm,v 1.59.12.2 2011/11/18 22:35:33 raeburn Exp $
+# $Id: lonstathelpers.pm,v 1.63 2010/08/04 01:56:07 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -135,9 +135,9 @@ Skips 'survey' problems.
 ####################################################
 ####################################################
 sub problem_selector {
-    my ($AcceptedResponseTypes,$sequence_addendum) = @_;
+    my ($AcceptedResponseTypes,$sequence_addendum,$symbmode) = @_;
     my $Str;
-    $Str = "\n<table>\n";
+    $Str = &Apache::loncommon::start_data_table();
     my $rb_count =0;
     my ($navmap,@sequences) = 
         &Apache::lonstatistics::selected_sequences_with_assessments('all');
@@ -164,8 +164,10 @@ sub problem_selector {
                         if (! defined($title) || $title eq '') {
                             ($title) = ($res->src =~ m:/([^/]*)$:);
                         }
-                        $seq_str .= '<tr>'.
-                            qq{<td><input type="radio" id="$rb_count" name="problemchoice" value="$value"$checked /></td>}.
+                        $seq_str .=  &Apache::loncommon::start_data_table_row().
+                            ($symbmode?
+                             '<td><input type="radio" id="'.$rb_count.'" name="symb" value="'.&HTML::Entities::encode($res->symb,'<>&"').'" '.$checked.' /></td>'
+                            :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(@response_ids) > 1) {
@@ -174,25 +176,25 @@ sub problem_selector {
                         my $link = $res->link.'?symb='.&escape($res->shown_symb);
                         $seq_str .= ('&nbsp;'x2).
                             '<a target="preview" href="'.$link.'">'.&mt('view').'</a>';
-                        $seq_str .= "</td></tr>\n";
+                        $seq_str .= "</td>". &Apache::loncommon::end_data_table_row()."\n";
                         $rb_count++;
                     }
                 }
             }
         }
         if ($seq_str ne '') {
-            $Str .= '<tr><td>&nbsp;</td>'.
-                '<td colspan="2"><b>'.$seq->compTitle.'</b></td>'.
-                "</tr>\n".$seq_str;
+            $Str .= &Apache::loncommon::start_data_table_header_row().
+                '<th colspan="3">'.$seq->compTitle.'</th>'.
+                &Apache::loncommon::end_data_table_header_row()."\n".$seq_str;
             if (defined($sequence_addendum)) {
-                $Str .= '<tr>'.
+                $Str .= &Apache::loncommon::start_data_table_header_row().
                     ('<td>&nbsp;</td>'x2).
                     '<td align="right">'.$sequence_addendum.'</td>'.
-                    "</tr>\n";
+                    &Apache::loncommon::end_data_table_header_row()."\n";
             }
         }
     }
-    $Str .= "</table>\n";
+    $Str .= &Apache::loncommon::end_data_table()."\n";
     return $Str;
 }
 
@@ -222,7 +224,7 @@ and their contents.  A checkbox is provi
 ####################################################
 ####################################################
 sub MultipleProblemSelector {
-    my ($navmap,$inputname,$formname)=@_;
+    my ($navmap,$inputname,$formname,$anoncounter)=@_;
     my $cid = $env{'request.course.id'};
     my $Str;
     # Massage the input as needed.
@@ -239,31 +241,11 @@ sub MultipleProblemSelector {
     # Header
     $Str .= <<"END";
 <script type="text/javascript" language="JavaScript">
-    function checkall(value,seqid,caller) {
-        if (caller == 'allproblems') {
-            if ((value == null ) || (value == '') || (value == undefined)) {
-                if (document.forms.$formname.allproblems.checked) {
-                    document.forms.$formname.noproblems.checked = false;
-                    value = true;
-                } else {
-                    return;
-                }
-            }
-        }
-        if (caller == 'noproblems') {
-            if ((value == null ) || (value == '') || (value == undefined)) {
-                if (document.forms.$formname.noproblems.checked) {
-                    document.forms.$formname.allproblems.checked = false;
-                    value = false;
-                } else {
-                    return; 
-                }
-            }
-        }
+    function checkall(value,seqid) {
         for (i=0; i<document.forms.$formname.elements.length; i++) {
             ele = document.forms.$formname.elements[i];
             if (ele.name == '$inputname') {
-                if ((seqid != null) && (seqid != '') && (seqid != undefined)) {
+                if (seqid != null) {
                     itemid = document.forms.$formname.elements[i].id;
                     thing = itemid.split(':');
                     if (thing[0] == seqid) {
@@ -277,34 +259,76 @@ sub MultipleProblemSelector {
     }
 </script>
 END
-    $Str .= 
-        '<label><input type="checkbox" name="allproblems" value="true" onclick="javascript:checkall('."'','','allproblems'".')" />'.&mt('Select All').'</label>'.
+    my $checkanonjs = <<"END";
+ 
+<script type="text/javascript" language="JavaScript">
+    function checkanon() {
+        return true;
+    }
+</script>
+
+END
+    if (ref($anoncounter) eq 'HASH') {
+        if (keys(%{$anoncounter}) > 0) {
+            my $anonwarning = &mt('Your selection includes both problems with and without anonymous submissions.').'\n'.&mt('You must select either only anonymous or only named problems.').'\n\n'.&mt('If a selection contains both anonymous and named parts, [_1]use the Anoymous/Named buttons to ensure selections will be either all anonymous [_1]or all named.','\n');
+            $checkanonjs = <<"END";
+
+<script type="text/javascript" language="JavaScript">
+    function checkanon() {
+        anoncount = 0;
+        namedcount = 0;
+        for (i=0; i<document.forms.$formname.elements.length; i++) {
+            ele = document.forms.$formname.elements[i];
+            if (ele.name == '$inputname') {
+                itemid = document.forms.$formname.elements[i].id;
+                if (document.forms.$formname.elements[i].checked) {
+                    anonid = 'anonymous_'+itemid;
+                    mixid = 'mixed_'+itemid;
+                    anonele = document.getElementById(anonid);
+                    mixele = document.getElementById(mixid);
+                    if (anonele.value > 0) {
+                        if (mixele.value == 'none') {
+                            anoncount ++;
+                        } else {
+                            if (mixele.value == '0') {
+                                if (mixele.checked) {
+                                    anoncount ++; 
+                                } else {
+                                    namedcount ++;
+                                } 
+                            } else {
+                                namedcount ++;
+                            }
+                        }
+                    } else {
+                        namedcount ++;
+                    }
+                }
+            }
+        }
+        if (anoncount > 0 && namedcount > 0) {
+            alert("$anonwarning");
+            return false;
+        } 
+    }
+</script>
+
+END
+        }
+    }
+    $Str .= $checkanonjs.
+        '<a href="javascript:checkall(true)">'.&mt('Select All').'</a>'.
         ('&nbsp;'x4).
-        '<label><input type="checkbox" name="noproblems" value="true" onclick="javascript:checkall('."'','','noproblems'".')" />'.&mt('Unselect All').'</label>';
+        '<a href="javascript:checkall(false)">'.&mt('Unselect All').'</a>';
     $Str .= $/.'<table>'.$/;
-    my ($iterator,$sequence_string,@Accumulator);
+    my $iterator = $navmap->getIterator(undef, undef, undef, 1);
+    my $sequence_string;
     my $seq_id = 0;
-    if (&Apache::loncommon::needs_gci_custom()) {
-        my $cdom = $env{'course.'.$cid.'.domain'};
-        my $cnum = $env{'course.'.$cid.'.num'};
-        my $mapurl = "/uploaded/$cdom/$cnum/default_1261144274.sequence";
-        my $map = $navmap->getResourceByUrl($mapurl);
-        my $firstResource = $map->map_start();
-        my $lastResource = $map->map_finish();
-        $iterator = $navmap->getIterator($firstResource,$lastResource,sub { $_[0]->is_problem() },1);
-        @Accumulator = (&new_accumulator($map->compTitle,
-                                         $map->src,
-                                         $map->symb,
-                                         $seq_id++,
-                                         $inputname));
-    } else {
-        $iterator = $navmap->getIterator(undef, undef, undef, 1);
-        @Accumulator = (&new_accumulator($env{'course.'.$cid.'.description'},
-                                         '',
-                                         '',
-                                         $seq_id++,
-                                         $inputname));
-    }
+    my @Accumulator = (&new_accumulator($env{'course.'.$cid.'.description'},
+                                        '',
+                                        '',
+                                        $seq_id++,
+                                        $inputname));
     my @Sequence_Data;
     while (my $curRes = $iterator->next()) {
         if ($curRes == $iterator->END_MAP) {
@@ -323,12 +347,27 @@ END
                                                $seq_id++,
                                                $inputname));
         } elsif ($curRes->is_problem) {
-            my $is_selected;
-            if (($env{'form.allproblems'})  || (exists($selected->{$curRes->symb}))) {
-                $is_selected = 1;
+            my $anonpart = 0;
+            my $namedpart = 0;
+            my @parts = @{$curRes->parts()};
+            if (ref($anoncounter) eq 'HASH') {
+                if (keys(%{$anoncounter}) > 0) {
+                    my @parts = @{$curRes->parts()};
+                    my $symb = $curRes->symb();
+                    foreach my $part (@parts) {
+                        if ((exists($anoncounter->{$symb."\0".$part})) ||
+                            $curRes->is_anonsurvey($part)) {
+                            $anonpart ++;
+                        } else {
+                            $namedpart ++ 
+                        }
+                    }
+                }
             }
             if (@Accumulator && $Accumulator[-1] ne '') {
-                &{$Accumulator[-1]}($curRes,$is_selected);
+                &{$Accumulator[-1]}($curRes,
+                                    exists($selected->{$curRes->symb}),
+                                    $anonpart,$namedpart);
             }
         }
     }
@@ -356,20 +395,45 @@ sub new_accumulator {
     return 
         sub {
             if (@_) { 
-                my ($res,$checked) = @_;
+                my ($res,$checked,$anonpart,$namedpart) = @_;
                 $target.='<tr><td><label>'.
                     '<input type="checkbox" name="'.$inputname.'" ';
                 if ($checked) {
                     $target .= 'checked="checked" ';
                 }
+                my $anon_id = $item_id;
                 $target .= 'id="'.$seq_id.':'.$item_id++.'" ';
+                my $esc_symb = &escape($res->symb);
                 $target.= 
-                    'value="'.&escape($res->symb).'" />'.
+                    'value="'.$esc_symb.'" />'.
                     '&nbsp;'.$res->compTitle.'</label>'.
                     ('&nbsp;'x2).'<a target="preview" '.
                     'href="'.$res->link.'?symb='.
                     &escape($res->shown_symb).'">'.&mt('view').'</a>'.
-                    '</td></tr>'.$/;
+                    '<input type="hidden" id="anonymous_'.$seq_id.':'.$anon_id.'" name="hidden_'.$seq_id.':'.$anon_id.'" value="'.$anonpart.'" />';
+                my $mixed = '<input type="hidden" id="mixed_'.$seq_id.':'.$anon_id.'" value="none" name="mixed_'.$seq_id.':'.$anon_id.'" />';
+                if ($anonpart) {
+                    if ($namedpart) {
+                        my $checknamed = '';
+                        my $checkedanon = ' checked="checked"';
+                        if ($env{'form.mixed_'.$seq_id.':'.$anon_id} eq $esc_symb) {
+                            $checknamed = $checkedanon;
+                            $checkedanon = '';
+                        }
+                        $mixed = '&nbsp;('.
+    &mt('Both anonymous and named submissions -- display: [_1]Anonymous [_2]Named[_3]',
+    '<span class="LC_nobreak"><label>'.
+    '<input type="radio" name="mixed_'.$seq_id.':'.$anon_id.
+    '" value="0" id="mixed_'.$seq_id.':'.$anon_id.'"'.$checkedanon.' />',
+    '</label></span>'.('&nbsp;'x2).' <span class="LC_nobreak">'.
+    '<label><input type="radio" name="mixed_'.$seq_id.':'.$anon_id.
+    '" value="symb_'.$esc_symb.'" id="named_'.$seq_id.':'.$anon_id.'"'.$checknamed.' />',
+    '</label></span>').')';
+                    } else {
+                        $target .= '&nbsp;'.&mt('(Anonymous Survey)');
+                    }
+                }
+                $target.= $mixed.'</td></tr>'.$/;
             } else { 
                 if (defined($target)) {
                     return { title => $title,
@@ -502,7 +566,8 @@ sub get_prev_curr_next {
         my @resources = &get_resources($navmap,$seq);
         foreach my $res (@resources) {
             foreach my $part (@{$res->parts}) {
-                if ($res->is_survey($part) && ($granularity eq 'part_survey')){
+                if (($res->is_survey($part) || ($res->is_anonsurvey($part))) && 
+                    ($granularity eq 'part_survey')) {
                     push (@Resource,
                           { symb     => $res->symb,
                             part     => $part,
@@ -647,7 +712,7 @@ sub GetStudentAnswers {
         my $answer = &Apache::lonstathelpers::get_student_answer
             ($resource,$sname,$sdom,$partid,$respid);
         &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,
-                                                 &mt('last student'));
+                                                     'last student');
         $answers{$answer}++;
         $student->{'answer'} = $answer;
     }