--- loncom/interface/statistics/lonstathelpers.pm 2020/08/26 21:50:16 1.76.2.1 +++ loncom/interface/statistics/lonstathelpers.pm 2020/09/12 20:36:11 1.76.2.4 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: lonstathelpers.pm,v 1.76.2.1 2020/08/26 21:50:16 raeburn Exp $ +# $Id: lonstathelpers.pm,v 1.76.2.4 2020/09/12 20:36:11 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -159,6 +159,9 @@ sub problem_selector { foreach my $seq (@sequences) { my $seq_str = ''; foreach my $res (&get_resources($navmap,$seq)) { + 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:/([^/]*)$:); @@ -173,8 +176,12 @@ sub problem_selector { 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(). - ''. + ''. ''; my $link = $res->link.'?symb='.&escape($res->shown_symb); @@ -190,7 +197,9 @@ sub problem_selector { my $resptype = $response_types[$i]; if ($resptype =~ m/$AcceptedResponseTypes/) { if ($byres) { - unless (exists($partsseen{$part})) { + if (exists($partsseen{$part})) { + $seq_str .= &Apache::loncommon::continue_data_table_row(); + } else { my $parttitle = $part; if ($part eq '0') { $parttitle = ''; @@ -202,7 +211,11 @@ sub problem_selector { $seq_str .= &Apache::loncommon::continue_data_table_row(); } unless ($partsseen{$part}) { - $seq_str .= ''. + my $resprowspan; + if (scalar(@response_ids) > 1) { + $resprowspan = ' rowspan="'.scalar(@response_ids).'"'; + } + $seq_str .= ''. $parttitle.''; $partsseen{$part} = scalar(@response_ids); } @@ -236,8 +249,8 @@ sub problem_selector { $seq_str .= (' 'x2). ''.&mt('view').''; $seq_str .= "". &Apache::loncommon::end_data_table_row()."\n"; - $rb_count++; } + $rb_count++; } } } @@ -264,6 +277,15 @@ sub problem_selector { } } $Str .= &Apache::loncommon::end_data_table().&Apache::loncommon::end_scrollbox()."\n"; + if (!$rb_count) { + if ($byres) { + $Str = '

'.&mt('No gradable problems found').'

'; + } elsif ($AcceptedResponseTypes eq '.') { + $Str = '

'.&mt('No problems found').'

'; + } else { + $Str = '

'.&mt('No analyzable problems found').'

'; + } + } return $Str; }