--- loncom/interface/statistics/lonstathelpers.pm 2005/11/12 03:58:55 1.51 +++ loncom/interface/statistics/lonstathelpers.pm 2020/08/26 18:13:39 1.76 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: lonstathelpers.pm,v 1.51 2005/11/12 03:58:55 albertel Exp $ +# $Id: lonstathelpers.pm,v 1.76 2020/08/26 18:13:39 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -60,6 +60,9 @@ use Time::Local(); use Spreadsheet::WriteExcel(); use GDBM_File; use Storable qw(freeze thaw); +use lib '/home/httpd/lib/perl/'; +use LONCAPA; + #################################################### #################################################### @@ -83,14 +86,14 @@ sub render_resource { ## Render the problem my ($base) = ($resource->src =~ m|^(.*/)[^/]*$|); $base="http://".$ENV{'SERVER_NAME'}.$base; - my ($src,$symb)=($resource->src,&Apache::lonnet::escape($resource->symb)); + 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*/)|<\/nop>|g; - return '
'. - ''. - $rendered_problem. - '
'; + return '
'. + '

'.&mt('Problem').'

'. + ''.$rendered_problem. + '
'; } #################################################### @@ -105,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; } @@ -132,65 +142,141 @@ Skips 'survey' problems. #################################################### #################################################### sub problem_selector { - my ($AcceptedResponseTypes,$sequence_addendum) = @_; + 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; - $Str = "\n\n"; + my $jsadd=''; + if ($onclick) { + $jsadd="onclick='$onclick'"; + } + $Str = &Apache::loncommon::start_scrollbox(($smallbox?'420px':'620px'), + ($smallbox?'400px':'600px'), + ($smallbox?'60px':'300px')). + &Apache::loncommon::start_data_table(); my $rb_count =0; my ($navmap,@sequences) = &Apache::lonstatistics::selected_sequences_with_assessments('all'); 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)) { + 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(). + ''; + } + 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$res->symb, - part=>$part, - respid=>$respid, - resptype=>$resptype}); - my $checked = ''; - if ($env{'form.problemchoice'} eq $value) { - $checked = 'checked '; - } - my $title = $res->compTitle; - if (! defined($title) || $title eq '') { - ($title) = ($res->src =~ m:/([^/]*)$:); + if ($byres) { + unless (exists($partsseen{$part})) { + my $parttitle = $part; + if ($part eq '0') { + $parttitle = ''; + } + if ($parttitle ne '') { + $parttitle = (' 'x2).&mt('part').': '.$parttitle; + } + if (keys(%partsseen)) { + $seq_str .= &Apache::loncommon::continue_data_table_row(); + } + unless ($partsseen{$part}) { + $seq_str .= ''; + $partsseen{$part} = scalar(@response_ids); + } + } + $seq_str .= ''. &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? + '' + :qq{}). + ''. + '". &Apache::loncommon::end_data_table_row()."\n"; + $rb_count++; } - $seq_str .= ''. - qq{}. - ''. - '\n"; - $rb_count++; } } } } if ($seq_str ne '') { - $Str .= ''. - ''. - "\n".$seq_str; - if (defined($sequence_addendum)) { - $Str .= ''. - (''x2). - ''. - "\n"; + if ($byres) { + $Str .= &Apache::loncommon::start_data_table_header_row(). + ''. + &Apache::loncommon::end_data_table_header_row(). + $seq_str; + } else { + $Str .= &Apache::loncommon::start_data_table_header_row(). + ''. + &Apache::loncommon::end_data_table_header_row()."\n".$seq_str; + if (defined($sequence_addendum)) { + $Str .= &Apache::loncommon::start_data_table_header_row(). + (''x2). + ''. + &Apache::loncommon::end_data_table_header_row()."\n"; + } } } } - $Str .= "
'. + ''; + my $link = $res->link.'?symb='.&escape($res->shown_symb); + $seq_str .= (' 'x2). + ''.&mt('view').''. + $parttitle.''.$resptype; + if (scalar(@response_ids) > 1) { + $seq_str .= ' '.&mt('id').': '.$respid; + } + $seq_str .= ''; + if (scalar(@response_ids) > 1) { + $seq_str .= &mt('response').' '.$respid; + } + my $link = $res->link.'?symb='.&escape($res->shown_symb); + $seq_str .= (' 'x2). + ''.&mt('view').''; + $seq_str .= "
'; - if (scalar(@response_ids) > 1) { - $seq_str .= &mt('response').' '.$respid; - } - my $link = $res->src.'?symb='. - &Apache::lonnet::escape($res->symb); - $seq_str .= (' 'x2). - qq{view}; - $seq_str .= "
 '.$seq->compTitle.'
 '.$sequence_addendum.'
'.$seq->compTitle.''. + ($all?'':''). + $seq->compTitle.' '.$sequence_addendum.'
\n"; + $Str .= &Apache::loncommon::end_data_table().&Apache::loncommon::end_scrollbox()."\n"; return $Str; } @@ -220,22 +306,23 @@ 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. if (! defined($navmap)) { $navmap = Apache::lonnavmaps::navmap->new(); if (! defined($navmap)) { - $Str .= - '

'.&mt('Error: cannot process course structure').'

'; + $Str .= '
' + .&mt('Error: cannot process course structure') + .'
'; return $Str; } } my $selected = {map { ($_,1) } (&get_selected_symbs($inputname))}; # Header $Str .= <<"END"; - END - $Str .= + my $checkanonjs = <<"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"); + &js_escape(\$anonwarning); + $checkanonjs = <<"END"; + + + +END + } + } + $Str .= $checkanonjs. ''.&mt('Select All').''. (' 'x4). ''.&mt('Unselect All').''; @@ -285,9 +430,27 @@ END $seq_id++, $inputname)); } elsif ($curRes->is_problem) { + 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, - exists($selected->{$curRes->symb})); + exists($selected->{$curRes->symb}), + $anonpart,$namedpart); } } } @@ -315,20 +478,45 @@ sub new_accumulator { return sub { if (@_) { - my ($res,$checked) = @_; + my ($res,$checked,$anonpart,$namedpart) = @_; $target.=''. (' 'x2).'view'. - ''.$/; + 'href="'.$res->link.'?symb='. + &escape($res->shown_symb).'">'.&mt('view').''. + ''; + my $mixed = ''; + 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 = ' ('. + &mt('Both anonymous and named submissions -- display: [_1]Anonymous [_2]Named[_3]', + ''.(' 'x2).' '. + '').')'; + } else { + $target .= ' '.&mt('(Anonymous Survey)'); + } + } + $target.= $mixed.''.$/; } else { if (defined($target)) { return { title => $title, @@ -346,7 +534,7 @@ sub get_selected_symbs { my ($inputfield) = @_; my $field = 'form.'.$inputfield; my @symbs = (map { - &Apache::lonnet::unescape($_); + &unescape($_); } &Apache::loncommon::get_env_multiple($field)); return @symbs; } @@ -373,10 +561,10 @@ Used by Apache::lonstathelpers::ProblemS #################################################### sub make_target_id { my ($target) = @_; - my $id = &Apache::lonnet::escape($target->{'symb'}).':'. - &Apache::lonnet::escape($target->{'part'}).':'. - &Apache::lonnet::escape($target->{'respid'}).':'. - &Apache::lonnet::escape($target->{'resptype'}); + my $id = &escape($target->{'symb'}).':'. + &escape($target->{'part'}).':'. + &escape($target->{'respid'}).':'. + &escape($target->{'resptype'}); return $id; } @@ -401,18 +589,18 @@ sub get_target_from_id { my ($id) = @_; if (! ref($id)) { my ($symb,$part,$respid,$resptype) = split(':',$id); - return ({ symb => &Apache::lonnet::unescape($symb), - part => &Apache::lonnet::unescape($part), - respid => &Apache::lonnet::unescape($respid), - resptype => &Apache::lonnet::unescape($resptype)}); + return ({ symb => &unescape($symb), + part => &unescape($part), + respid => &unescape($respid), + resptype => &unescape($resptype)}); } elsif (ref($id) eq 'ARRAY') { my @Return; foreach my $selected (@$id) { my ($symb,$part,$respid,$resptype) = split(':',$selected); - push(@Return,{ symb => &Apache::lonnet::unescape($symb), - part => &Apache::lonnet::unescape($part), - respid => &Apache::lonnet::unescape($respid), - resptype => &Apache::lonnet::unescape($resptype)}); + push(@Return,{ symb => &unescape($symb), + part => &unescape($part), + respid => &unescape($respid), + resptype => &unescape($resptype)}); } return \@Return; } @@ -431,7 +619,7 @@ current resource. Inputs: $target (see &Apache::lonstathelpers::get_target_from_id()) $AcceptableResponseTypes, regular expression matching acceptable response types, - $granularity, either 'part', 'response', or 'part_survey' + $granularity, either 'part', 'response', 'part_survey', or 'part_task' Returns: three hash references, $prev, $curr, $next, which refer to the preceeding, current, or following problem parts or responses, depending @@ -461,7 +649,14 @@ 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, + resource => $res, + } ); + } elsif ($res->is_task($part) && ($granularity eq 'part_task')){ push (@Resource, { symb => $res->symb, part => $part, @@ -499,7 +694,7 @@ sub get_prev_curr_next { my $curr_idx; for ($curr_idx=0;$curr_idx<$#Resource;$curr_idx++) { my $curr_item = $Resource[$curr_idx]; - if ($granularity eq 'part' || $granularity eq 'part_survey') { + if ($granularity =~ /^(part|part_survey|part_task)$/) { if ($curr_item->{'symb'} eq $target->{'symb'} && $curr_item->{'part'} eq $target->{'part'}) { last; @@ -514,7 +709,7 @@ sub get_prev_curr_next { } } my $curr_item = $Resource[$curr_idx]; - if ($granularity eq 'part' || $granularity eq 'part_survey') { + if ($granularity =~ /^(part|part_survey|part_task)$/) { if ($curr_item->{'symb'} ne $target->{'symb'} || $curr_item->{'part'} ne $target->{'part'}) { # bogus symb - return nothing @@ -588,10 +783,7 @@ sub GetStudentAnswers { # Read in the cache (if it exists) before we start timing things. &Apache::lonstathelpers::ensure_proper_cache($resource->{'symb'}); # Open progress window - my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin - ($r,'Student Answer Compilation Status', - 'Student Answer Compilation Progress', scalar(@$Students), - $status_type,undef,$formname,$inputname); + my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,scalar(@$Students)); $r->rflush(); foreach my $student (@$Students) { last if ($c->aborted()); @@ -600,7 +792,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; } @@ -727,11 +919,16 @@ sub get_answer { my ($prefix,$key,%Answer) = @_; my $returnvalue; if (exists($Answer{$key})) { - my $student_answer = $Answer{$key}->[0]; - if (! defined($student_answer)) { - $student_answer = $Answer{$key}->[1]; - } - $returnvalue = $student_answer; + if (ref($Answer{$key}) eq 'HASH') { + my $which = 'INTERNAL'; + if (!exists($Answer{$key}{$which})) { + $which = (sort(keys(%{ $Answer{$key} })))[0]; + } + my $student_answer = $Answer{$key}{$which}[0][0]; + $returnvalue = $student_answer; + } else { + &Apache::lonnet::logthis("error analyzing problem. got a answer of type ".ref($Answer{$key})); + } } else { if (exists($Answer{$prefix.'.shown'})) { # The response has foils @@ -789,7 +986,7 @@ sub load_analysis_cache { my $storedstring; my %cache_db; if (tie(%cache_db,'GDBM_File',$cache_filename,&GDBM_READER(),0640)) { - $storedstring = $cache_db{&Apache::lonnet::escape($symb)}; + $storedstring = $cache_db{&escape($symb)}; untie(%cache_db); } if (defined($storedstring)) { @@ -841,7 +1038,7 @@ Writes the in memory cache to disk so th sub write_analysis_cache { return if (! defined($current_symb) || ! defined($cache_filename)); my %cache_db; - my $key = &Apache::lonnet::escape($current_symb); + my $key = &escape($current_symb); if (tie(%cache_db,'GDBM_File',$cache_filename,&GDBM_WRCREAT(),0640)) { my $storestring = freeze(\%cache); $cache_db{$key}=$storestring; @@ -871,7 +1068,7 @@ prior to every analysis lookup. sub ensure_proper_cache { my ($symb) = @_; my $cid = $env{'request.course.id'}; - my $new_filename = '/home/httpd/perl/tmp/'. + my $new_filename = LONCAPA::tempdir() . 'problemanalysis_'.$cid.'_analysis_cache.db'; if (! defined($cache_filename) || $cache_filename ne $new_filename || @@ -1241,7 +1438,7 @@ sub limit_by_time_form { my $enddateform = &Apache::lonhtmlcommon::date_setter ('Statistics','limitby_enddate',$endtime,undef,undef,$state); my $Str; - $Str .= ''. ''.