--- loncom/interface/statistics/lonstathelpers.pm	2017/12/18 23:51:19	1.75
+++ loncom/interface/statistics/lonstathelpers.pm	2020/08/26 21:50:16	1.76.2.1
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonstathelpers.pm,v 1.75 2017/12/18 23:51:19 raeburn Exp $
+# $Id: lonstathelpers.pm,v 1.76.2.1 2020/08/26 21:50:16 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -108,17 +108,10 @@ sub render_resource {
 ####################################################
 ####################################################
 sub get_resources {
-    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);
-    }
+    my ($navmap,$sequence) = @_;
+    my @resources = $navmap->retrieveResources($sequence,
+                                               sub { shift->is_problem(); },
+                                               0,0,0);
     return @resources;
 }
 
@@ -142,10 +135,12 @@ Skips 'survey' problems.
 ####################################################
 ####################################################
 sub problem_selector {
-    my ($AcceptedResponseTypes,$sequence_addendum,$symbmode,$all,$prefix,$smallbox,$onclick,
-        $include_tools) = @_;
+    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;
@@ -163,66 +158,110 @@ sub problem_selector {
     return $navmap if (! ref($navmap)); # error
     foreach my $seq (@sequences) {
         my $seq_str = '';
-        foreach my $res (&get_resources($navmap,$seq,$include_tools)) {
-            foreach my $part (@{$res->parts}) {
-                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);
+        foreach my $res (&get_resources($navmap,$seq)) {
+            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"';
+                }
+                $seq_str .= &Apache::loncommon::start_data_table_row().
+                            '<td rowspan="'.$totalresps.'" style="vertical-align:middle">'.
+                            '<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);
                 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"';
+                        if ($byres) {
+                            unless (exists($partsseen{$part})) {
+                                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}) {
+                                    $seq_str .= '<td rowspan="'.scalar(@response_ids).'" style="vertical-align:middle">'.
+                                                $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";
+                            $rb_count++;
                         }
-                        my $title = $res->compTitle;
-                        if (! defined($title) || $title eq '') {
-                            ($title) = ($res->src =~ m:/([^/]*)$:);
-                        }
-                        $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";
     return $Str;