--- loncom/interface/statistics/lonstathelpers.pm	2014/02/28 19:20:17	1.73
+++ loncom/interface/statistics/lonstathelpers.pm	2020/09/12 20:21:30	1.79
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonstathelpers.pm,v 1.73 2014/02/28 19:20:17 bisitz Exp $
+# $Id: lonstathelpers.pm,v 1.79 2020/09/12 20:21:30 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -108,10 +108,17 @@ sub render_resource {
 ####################################################
 ####################################################
 sub get_resources {
-    my ($navmap,$sequence) = @_;
-    my @resources = $navmap->retrieveResources($sequence,
-                                               sub { shift->is_problem(); },
-                                               0,0,0);
+    my ($navmap,$sequence,$include_tools) = @_;
+    my @resources;
+    if ($include_tools) {
+        @resources = $navmap->retrieveResources($sequence,
+                                                sub { shift->is_gradable(); },
+                                                0,0,0);
+    } else {
+        @resources = $navmap->retrieveResources($sequence,
+                                                sub { shift->is_problem(); },
+                                                0,0,0);
+    }
     return @resources;
 }
 
@@ -135,9 +142,12 @@ Skips 'survey' problems.
 ####################################################
 ####################################################
 sub problem_selector {
-    my ($AcceptedResponseTypes,$sequence_addendum,$symbmode,$all,$prefix,$smallbox,$onclick) = @_;
+    my ($AcceptedResponseTypes,$sequence_addendum,$symbmode,$all,$prefix,
+        $byres,$include_tools,$smallbox,$onclick) = @_;
 # all: also make sequences selectable
 # prefix: prefix for all form names
+# byres: radiobutton shown per resource
+# include_tools: external tools included 
 # smallbox: use smaller box
 # onclick: javascript to execute when clicked
     my $Str;
@@ -155,62 +165,140 @@ sub problem_selector {
     return $navmap if (! ref($navmap)); # error
     foreach my $seq (@sequences) {
         my $seq_str = '';
-        foreach my $res (&get_resources($navmap,$seq)) {
+        foreach my $res (&get_resources($navmap,$seq,$include_tools)) {
+            if ($res->src() eq '/res/lib/templates/simpleproblem.problem') {
+                next if (grep(/^placeholder$/,@{$res->parts}));
+            }
+            my $title = $res->compTitle;
+            if (! defined($title) || $title eq '') {
+                ($title) = ($res->src =~ m:/([^/]*)$:);
+            }
+            my $totalresps = 0;
+            if ($byres) {
+                foreach my $part (@{$res->parts}) {
+                    $totalresps += scalar($res->responseIds($part));
+                }
+                my $value = &HTML::Entities::encode($res->symb(),'<>&"');
+                my $checked;
+                if ($env{'form.problemchoice'} eq $res->symb()) {
+                    $checked = ' checked="checked"';
+                }
+                my $rowspan;
+                if ($totalresps > 1) {
+                    $rowspan = ' rowspan="'.$totalresps.'"';
+                }
+                $seq_str .= &Apache::loncommon::start_data_table_row().
+                            '<td'.$rowspan.' style="vertical-align:top">'.
+                            '<label><input type="radio" name="symb" value="'.$value.'"'.$checked.' />'.
+                            $title.'</label>';
+                my $link = $res->link.'?symb='.&escape($res->shown_symb);
+                $seq_str .= ('&nbsp;'x2).
+                            '<a target="preview" href="'.$link.'">'.&mt('view').'</a></td>';
+            }
+            my %partsseen;
             foreach my $part (@{$res->parts}) {
-                my @response_ids   = $res->responseIds($part);
-                my @response_types = $res->responseType($part);
+                my (@response_ids,@response_types);
+                if ($res->is_tool) {
+                    @response_ids = ();
+                    @response_types = ('tool');
+                } else {
+                    @response_ids   = $res->responseIds($part);
+                    @response_types = $res->responseType($part);
+                }
                 for (my $i=0;$i<scalar(@response_types);$i++){
                     my $respid = $response_ids[$i];
                     my $resptype = $response_types[$i];
                     if ($resptype =~ m/$AcceptedResponseTypes/) {
-                        my $value = &make_target_id({symb=>$res->symb,
-                                                     part=>$part,
-                                                     respid=>$respid,
-                                                     resptype=>$resptype});
-                        my $checked = '';
-                        if ($env{'form.problemchoice'} eq $value) {
-                            $checked = ' checked="checked"';
-                        }
-                        my $title = $res->compTitle;
-                        if (! defined($title) || $title eq '') {
-                            ($title) = ($res->src =~ m:/([^/]*)$:);
+                        if ($byres) {
+                            if (exists($partsseen{$part})) {
+                                $seq_str .= &Apache::loncommon::continue_data_table_row();
+                            } else {
+                                my $parttitle = $part;
+                                if ($part eq '0') {
+                                    $parttitle = '';
+                                }
+                                if ($parttitle ne '') {
+                                    $parttitle = ('&nbsp;'x2).&mt('part').':&nbsp;'.$parttitle;
+                                }
+                                if (keys(%partsseen)) {
+                                    $seq_str .= &Apache::loncommon::continue_data_table_row();
+                                }
+                                unless ($partsseen{$part}) {
+                                    my $resprowspan;
+                                    if (scalar(@response_ids) > 1) {
+                                        $resprowspan = ' rowspan="'.scalar(@response_ids).'"';
+                                    }
+                                    $seq_str .= '<td'.$resprowspan.' style="vertical-align:top">'.
+                                                $parttitle.'</td>';
+                                    $partsseen{$part} = scalar(@response_ids);
+                                }
+                            }
+                            $seq_str .= '<td>'.$resptype;
+                            if (scalar(@response_ids) > 1) {
+                                $seq_str .= '&nbsp;'.&mt('id').':&nbsp;'.$respid;
+                            }
+                            $seq_str .= '</td>'. &Apache::loncommon::end_data_table_row()."\n";
+                        } else {
+                            my $value = &make_target_id({symb=>$res->symb,
+                                                         part=>$part,
+                                                         respid=>$respid,
+                                                         resptype=>$resptype});
+                            my $checked = '';
+                            if ($env{'form.problemchoice'} eq $value) {
+                                $checked = ' checked="checked"';
+                            }
+                            $seq_str .= &Apache::loncommon::start_data_table_row().
+                                ($symbmode?
+                                 '<td><input type="radio" id="'.$prefix.$rb_count.'" name="'.$prefix.'symb" value="'.&HTML::Entities::encode($res->symb,'<>&"').'" '.$checked.' '.
+                                 $jsadd.
+                                 ' /></td>'
+                                 :qq{<td><input type="radio" id="$rb_count" name="problemchoice" value="$value"$checked /></td>}).
+                                '<td><label for="'.$prefix.$rb_count.'">'.$resptype.'</label></td>'.
+                                '<td><label for="'.$prefix.$rb_count.'">'.$title.'</label>';
+                            if (scalar(@response_ids) > 1) {
+                                $seq_str .= &mt('response').' '.$respid;
+                            }
+                            my $link = $res->link.'?symb='.&escape($res->shown_symb);
+                            $seq_str .= ('&nbsp;'x2).
+                                        '<a target="preview" href="'.$link.'">'.&mt('view').'</a>';
+                            $seq_str .= "</td>". &Apache::loncommon::end_data_table_row()."\n";
                         }
-                        $seq_str .=  &Apache::loncommon::start_data_table_row().
-                            ($symbmode?
-                             '<td><input type="radio" id="'.$prefix.$rb_count.'" name="'.$prefix.'symb" value="'.&HTML::Entities::encode($res->symb,'<>&"').'" '.$checked.' '.
-                             $jsadd.
-                             ' /></td>'
-                            :qq{<td><input type="radio" id="$rb_count" name="problemchoice" value="$value"$checked /></td>}).
-                            '<td><label for="'.$prefix.$rb_count.'">'.$resptype.'</label></td>'.
-                            '<td><label for="'.$prefix.$rb_count.'">'.$title.'</label>';
-                        if (scalar(@response_ids) > 1) {
-                            $seq_str .= &mt('response').' '.$respid;
-                        }
-                        my $link = $res->link.'?symb='.&escape($res->shown_symb);
-                        $seq_str .= ('&nbsp;'x2).
-                            '<a target="preview" href="'.$link.'">'.&mt('view').'</a>';
-                        $seq_str .= "</td>". &Apache::loncommon::end_data_table_row()."\n";
                         $rb_count++;
                     }
                 }
             }
         }
         if ($seq_str ne '') {
-            $Str .= &Apache::loncommon::start_data_table_header_row().
-                '<th colspan="3">'.
-                ($all?'<input type="radio" id="'.$prefix.'s'.$rb_count.'" name="'.$prefix.'symb" value="'.&HTML::Entities::encode($seq->symb,'<>&').'" '.$jsadd.' />':'').
-                $seq->compTitle.'</th>'.
-                &Apache::loncommon::end_data_table_header_row()."\n".$seq_str;
-            if (defined($sequence_addendum)) {
+            if ($byres) {
+                $Str .= &Apache::loncommon::start_data_table_header_row().
+                        '<th colspan="3">'.$seq->compTitle.'</th>'.
+                        &Apache::loncommon::end_data_table_header_row().
+                        $seq_str;
+            } else {
                 $Str .= &Apache::loncommon::start_data_table_header_row().
-                    ('<td>&nbsp;</td>'x2).
-                    '<td align="right">'.$sequence_addendum.'</td>'.
-                    &Apache::loncommon::end_data_table_header_row()."\n";
+                    '<th colspan="3">'.
+                    ($all?'<input type="radio" id="'.$prefix.'s'.$rb_count.'" name="'.$prefix.'symb" value="'.&HTML::Entities::encode($seq->symb,'<>&').'" '.$jsadd.' />':'').
+                    $seq->compTitle.'</th>'.
+                    &Apache::loncommon::end_data_table_header_row()."\n".$seq_str;
+                if (defined($sequence_addendum)) {
+                    $Str .= &Apache::loncommon::start_data_table_header_row().
+                        ('<td>&nbsp;</td>'x2).
+                        '<td align="right">'.$sequence_addendum.'</td>'.
+                        &Apache::loncommon::end_data_table_header_row()."\n";
+                }
             }
         }
-
     }
     $Str .= &Apache::loncommon::end_data_table().&Apache::loncommon::end_scrollbox()."\n";
+    if (!$rb_count) {
+        if ($byres) {
+            $Str = '<p class="LC_info">'.&mt('No gradable problems found').'</p>';
+        } elsif ($AcceptedResponseTypes eq '.') {
+            $Str = '<p class="LC_info">'.&mt('No problems found').'</p>';
+        } else {
+            $Str = '<p class="LC_info">'.&mt('No analyzable problems found').'</p>';
+        }
+    }
     return $Str;
 }
 
@@ -286,7 +374,8 @@ END
 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 Anonymous/Named buttons to ensure selections will be either all anonymous[_1]or all named.','\n');
+            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 Anonymous/Named buttons to ensure selections will be either all anonymous[_1]or all named.',"\n");
+            &js_escape(\$anonwarning);
             $checkanonjs = <<"END";
 
 <script type="text/javascript" language="JavaScript">