--- loncom/interface/statistics/lonstathelpers.pm 2023/09/08 00:52:36 1.76.2.5.2.1 +++ loncom/interface/statistics/lonstathelpers.pm 2020/08/31 14:36:19 1.77 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: lonstathelpers.pm,v 1.76.2.5.2.1 2023/09/08 00:52:36 raeburn Exp $ +# $Id: lonstathelpers.pm,v 1.77 2020/08/31 14:36:19 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -85,7 +85,7 @@ sub render_resource { ## ## Render the problem my ($base) = ($resource->src =~ m|^(.*/)[^/]*$|); - $base=&Apache::lonnet::absolute_url().$base; + $base="http://".$ENV{'SERVER_NAME'}.$base; my ($src,$symb)=($resource->link,&escape($resource->shown_symb)); my $rendered_problem = &Apache::lonnet::ssi_body($src.'?symb='.$symb); $rendered_problem =~ s/<\s*form\s*/'. + ''. ''; my $link = $res->link.'?symb='.&escape($res->shown_symb); @@ -198,7 +198,7 @@ sub problem_selector { my %partsseen; foreach my $part (@{$res->parts}) { my (@response_ids,@response_types); - if (($include_tools) && ($res->is_tool)) { + if ($res->is_tool) { @response_ids = (); @response_types = ('tool'); } else { @@ -210,9 +210,7 @@ sub problem_selector { my $resptype = $response_types[$i]; if ($resptype =~ m/$AcceptedResponseTypes/) { if ($byres) { - if (exists($partsseen{$part})) { - $seq_str .= &Apache::loncommon::continue_data_table_row(); - } else { + unless (exists($partsseen{$part})) { my $parttitle = $part; if ($part eq '0') { $parttitle = ''; @@ -224,11 +222,7 @@ sub problem_selector { $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 .= ''. + $seq_str .= ''. $parttitle.''; $partsseen{$part} = scalar(@response_ids); } @@ -262,8 +256,8 @@ sub problem_selector { $seq_str .= (' 'x2). ''.&mt('view').''; $seq_str .= "". &Apache::loncommon::end_data_table_row()."\n"; + $rb_count++; } - $rb_count++; } } } @@ -290,15 +284,6 @@ 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; }