--- loncom/interface/statistics/lonstathelpers.pm 2005/02/23 02:03:42 1.38 +++ loncom/interface/statistics/lonstathelpers.pm 2010/09/11 19:08:23 1.59.12.1 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: lonstathelpers.pm,v 1.38 2005/02/23 02:03:42 matthew Exp $ +# $Id: lonstathelpers.pm,v 1.59.12.1 2010/09/11 19:08:23 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -49,7 +49,7 @@ routines that are needed across multiple package Apache::lonstathelpers; use strict; -use Apache::lonnet(); +use Apache::lonnet; use Apache::loncommon(); use Apache::lonhtmlcommon(); use Apache::loncoursedata(); @@ -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; + #################################################### #################################################### @@ -68,8 +71,7 @@ use Storable qw(freeze thaw); =item &render_resource($resource) -Input: a resource generated from -&Apache::loncoursedata::get_sequence_assessment_data(). +Input: a navmaps resource Retunrs: a scalar containing html for a rendering of the problem within a table. @@ -82,11 +84,10 @@ sub render_resource { my ($resource) = @_; ## ## Render the problem - my $base; - ($base,undef) = ($resource->{'src'} =~ m|(.*/)[^/]*$|); - $base = "http://".$ENV{'SERVER_NAME'}.$base; - my $rendered_problem = - &Apache::lonnet::ssi_body($resource->{'src'}.'?symb='.&Apache::lonnet::escape($resource->{'symb'})); + my ($base) = ($resource->src =~ m|^(.*/)[^/]*$|); + $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*/<nop /g; $rendered_problem =~ s|(<\s*/form\s*>)|<\/nop>|g; return '<table bgcolor="ffffff"><tr><td>'. @@ -100,7 +101,26 @@ sub render_resource { =pod -=item &ProblemSelector($AcceptedResponseTypes) +=item &get_resources + +=cut + +#################################################### +#################################################### +sub get_resources { + my ($navmap,$sequence) = @_; + my @resources = $navmap->retrieveResources($sequence, + sub { shift->is_problem(); }, + 0,0,0); + return @resources; +} + +#################################################### +#################################################### + +=pod + +=item &problem_selector($AcceptedResponseTypes) Input: scalar containing regular expression which matches response types to show. '.' will yield all, '(option|radiobutton)' will match @@ -114,45 +134,46 @@ Skips 'survey' problems. #################################################### #################################################### -sub ProblemSelector { - my ($AcceptedResponseTypes) = @_; +sub problem_selector { + my ($AcceptedResponseTypes,$sequence_addendum) = @_; my $Str; $Str = "\n<table>\n"; my $rb_count =0; - foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess('all')) { - next if ($seq->{'num_assess'}<1); + 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 (@{$seq->{'contents'}}) { - next if ($res->{'type'} ne 'assessment'); - foreach my $part (@{$res->{'parts'}}) { - my $partdata = $res->{'partdata'}->{$part}; - for (my $i=0;$i<scalar(@{$partdata->{'ResponseTypes'}});$i++){ - my $respid = $partdata->{'ResponseIds'}->[$i]; - my $resptype = $partdata->{'ResponseTypes'}->[$i]; + foreach my $res (&get_resources($navmap,$seq)) { + 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'}, + my $value = &make_target_id({symb=>$res->symb, part=>$part, respid=>$respid, resptype=>$resptype}); my $checked = ''; - if ($ENV{'form.problemchoice'} eq $value) { - $checked = 'checked '; + if ($env{'form.problemchoice'} eq $value) { + $checked = ' checked="checked"'; } - my $title = $res->{'title'}; + my $title = $res->compTitle; if (! defined($title) || $title eq '') { - ($title) = ($res->{'src'} =~ m:/([^/]*)$:); + ($title) = ($res->src =~ m:/([^/]*)$:); } $seq_str .= '<tr>'. - qq{<td><input type="radio" id="$rb_count" name="problemchoice" value="$value" $checked /></td>}. + qq{<td><input type="radio" id="$rb_count" name="problemchoice" value="$value"$checked /></td>}. '<td><label for="'.$rb_count.'">'.$resptype.'</label></td>'. '<td><label for="'.$rb_count.'">'.$title.'</label>'; - if (scalar(@{$partdata->{'ResponseIds'}}) > 1) { + if (scalar(@response_ids) > 1) { $seq_str .= &mt('response').' '.$respid; } - my $link = $res->{'src'}.'?symb='. - &Apache::lonnet::escape($res->{'symb'}); + my $link = $res->link.'?symb='.&escape($res->shown_symb); $seq_str .= (' 'x2). - qq{<a target="preview" href="$link">view</a>}; + '<a target="preview" href="'.$link.'">'.&mt('view').'</a>'; $seq_str .= "</td></tr>\n"; $rb_count++; } @@ -160,8 +181,15 @@ sub ProblemSelector { } } if ($seq_str ne '') { - $Str .= '<tr><td> </td><td colspan="2"><b>'.$seq->{'title'}.'</b></td>'. + $Str .= '<tr><td> </td>'. + '<td colspan="2"><b>'.$seq->compTitle.'</b></td>'. "</tr>\n".$seq_str; + if (defined($sequence_addendum)) { + $Str .= '<tr>'. + ('<td> </td>'x2). + '<td align="right">'.$sequence_addendum.'</td>'. + "</tr>\n"; + } } } $Str .= "</table>\n"; @@ -195,21 +223,22 @@ and their contents. A checkbox is provi #################################################### sub MultipleProblemSelector { my ($navmap,$inputname,$formname)=@_; - my $cid = $ENV{'request.course.id'}; + 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 .= - '<h1>'.&mt('Error: cannot process course structure').'</h1>'; + $Str .= '<div class="LC_error">' + .&mt('Error: cannot process course structure') + .'</div>'; return $Str; } } my $selected = {map { ($_,1) } (&get_selected_symbs($inputname))}; # Header $Str .= <<"END"; -<script language="JavaScript" type="text/javascript"> +<script type="text/javascript" language="JavaScript"> function checkall(value,seqid) { for (i=0; i<document.forms.$formname.elements.length; i++) { ele = document.forms.$formname.elements[i]; @@ -233,14 +262,29 @@ END (' 'x4). '<a href="javascript:checkall(false)">'.&mt('Unselect All').'</a>'; $Str .= $/.'<table>'.$/; - my $iterator = $navmap->getIterator(undef, undef, undef, 1); - my $sequence_string; + my ($iterator,$sequence_string,@Accumulator); my $seq_id = 0; - my @Accumulator = (&new_accumulator($ENV{'course.'.$cid.'.description'}, - '', - '', - $seq_id++, - $inputname)); + if (&Apache::loncommon::needs_gci_custom()) { + my $cdom = $env{'course.'.$cid.'.domain'}; + my $cnum = $env{'course.'.$cid.'.num'}; + my $mapurl = "/uploaded/$cdom/$cnum/default_1261144274.sequence"; + my $map = $navmap->getResourceByUrl($mapurl); + my $firstResource = $map->map_start(); + my $lastResource = $map->map_finish(); + $iterator = $navmap->getIterator($firstResource,$lastResource,undef,1); + @Accumulator = (&new_accumulator($map->compTitle, + $map->src, + $map->symb, + $seq_id++, + $inputname)); + } else { + $iterator = $navmap->getIterator(undef, undef, undef, 1); + @Accumulator = (&new_accumulator($env{'course.'.$cid.'.description'}, + '', + '', + $seq_id++, + $inputname)); + } my @Sequence_Data; while (my $curRes = $iterator->next()) { if ($curRes == $iterator->END_MAP) { @@ -293,15 +337,15 @@ sub new_accumulator { $target.='<tr><td><label>'. '<input type="checkbox" name="'.$inputname.'" '; if ($checked) { - $target .= 'checked '; + $target .= 'checked="checked" '; } $target .= 'id="'.$seq_id.':'.$item_id++.'" '; $target.= - 'value="'.&Apache::lonnet::escape($res->symb).'" />'. + 'value="'.&escape($res->symb).'" />'. ' '.$res->compTitle.'</label>'. (' 'x2).'<a target="preview" '. - 'href="'.$res->src.'?symb='. - &Apache::lonnet::escape($res->{'symb'}).'">view</a>'. + 'href="'.$res->link.'?symb='. + &escape($res->shown_symb).'">'.&mt('view').'</a>'. '</td></tr>'.$/; } else { if (defined($target)) { @@ -319,15 +363,10 @@ sub new_accumulator { sub get_selected_symbs { my ($inputfield) = @_; my $field = 'form.'.$inputfield; - my @Symbs; - if (exists($ENV{$field})) { - if (! ref($ENV{$field})) { - @Symbs = (&Apache::lonnet::unescape($ENV{$field})); - } else { - @Symbs = (map {&Apache::lonnet::unescape($_);} @{$ENV{$field}}); - } - } - return @Symbs; + my @symbs = (map { + &unescape($_); + } &Apache::loncommon::get_env_multiple($field)); + return @symbs; } #################################################### @@ -352,10 +391,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; } @@ -380,18 +419,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; } @@ -410,7 +449,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 @@ -433,36 +472,46 @@ sub get_prev_curr_next { # # Build an array with the data we need to search through my @Resource; - foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess('all')) { - foreach my $res (@{$seq->{'contents'}}) { - next if ($res->{'type'} ne 'assessment'); - foreach my $part (@{$res->{'parts'}}) { - my $partdata = $res->{'partdata'}->{$part}; - if ($partdata->{'Survey'} && ($granularity eq 'part_survey')){ + my ($navmap,@sequences) = + &Apache::lonstatistics::selected_sequences_with_assessments('all'); + return $navmap if (! ref($navmap)); + foreach my $seq (@sequences) { + my @resources = &get_resources($navmap,$seq); + foreach my $res (@resources) { + foreach my $part (@{$res->parts}) { + if ($res->is_survey($part) && ($granularity eq 'part_survey')){ push (@Resource, - { symb => $res->{symb}, + { symb => $res->symb, + part => $part, + resource => $res, + } ); + } elsif ($res->is_task($part) && ($granularity eq 'part_task')){ + push (@Resource, + { symb => $res->symb, part => $part, resource => $res, } ); } elsif ($granularity eq 'part') { push (@Resource, - { symb => $res->{symb}, + { symb => $res->symb, part => $part, resource => $res, } ); } elsif ($granularity eq 'response') { + my @response_ids = $res->responseIds($part); + my @response_types = $res->responseType($part); for (my $i=0; - $i<scalar(@{$partdata->{'ResponseTypes'}}); + $i<scalar(@response_ids); $i++){ - my $respid = $partdata->{'ResponseIds'}->[$i]; - my $resptype = $partdata->{'ResponseTypes'}->[$i]; + my $respid = $response_ids[$i]; + my $resptype = $response_types[$i]; next if ($resptype !~ m/$AcceptableResponseTypes/); push (@Resource, - { symb => $res->{symb}, + { symb => $res->symb, part => $part, - respid => $partdata->{'ResponseIds'}->[$i], + respid => $respid, + resptype => $resptype, resource => $res, - resptype => $resptype } ); } } @@ -474,7 +523,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; @@ -489,7 +538,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 @@ -520,7 +569,7 @@ sub get_prev_curr_next { $curr = $Resource[$curr_idx ]; $next = $Resource[$curr_idx+1]; } - return ($prev,$curr,$next); + return ($navmap,$prev,$curr,$next); } @@ -621,7 +670,7 @@ sub analyze_problem_as_student { my $symb = $resource->{'symb'}; my $analysis = &get_from_analysis_cache($sname,$sdom,$symb); if (! defined($analysis)) { - my $courseid = $ENV{'request.course.id'}; + my $courseid = $env{'request.course.id'}; my $Answ=&Apache::lonnet::ssi($url,('grade_target' => 'analyze', 'grade_domain' => $sdom, 'grade_username' => $sname, @@ -702,11 +751,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 @@ -764,7 +818,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)) { @@ -816,7 +870,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; @@ -845,7 +899,7 @@ prior to every analysis lookup. ##################################################### sub ensure_proper_cache { my ($symb) = @_; - my $cid = $ENV{'request.course.id'}; + my $cid = $env{'request.course.id'}; my $new_filename = '/home/httpd/perl/tmp/'. 'problemanalysis_'.$cid.'_analysis_cache.db'; if (! defined($cache_filename) || @@ -1110,8 +1164,8 @@ sub get_problem_data { } } # End of logging code - next if ($key !~ /^$part/); - $key =~ s/^$part\.//; + next if ($key !~ /^\Q$part\E/); + $key =~ s/^\Q$part\E\.//; if (ref($value) eq 'ARRAY') { if ($key eq 'options') { $Partdata{$part}->{'_Options'}=$value; @@ -1216,7 +1270,7 @@ sub limit_by_time_form { my $enddateform = &Apache::lonhtmlcommon::date_setter ('Statistics','limitby_enddate',$endtime,undef,undef,$state); my $Str; - $Str .= '<script language="Javascript" >'; + $Str .= '<script type="text/javascript" language="JavaScript">'; $Str .= 'function toggle_limitby_activity(state) {'; $Str .= ' if (state) {'; $Str .= ' limitby_startdate_enable();'; @@ -1234,7 +1288,7 @@ sub limit_by_time_form { } $timecheckbox .= 'OnChange="javascript:toggle_limitby_activity(this.checked);" '; $timecheckbox .= ' />'; - $Str .= '<legend>'.&mt('[_1] Limit by time',$timecheckbox).'</legend>'; + $Str .= '<legend><label>'.&mt('[_1] Limit by time',$timecheckbox).'</label></legend>'; $Str .= &mt('Start Time: [_1]',$startdateform).'<br />'; $Str .= &mt(' End Time: [_1]',$enddateform).'<br />'; $Str .= '</fieldset>'; @@ -1242,8 +1296,8 @@ sub limit_by_time_form { } sub limit_by_time { - if (exists($ENV{'form.limit_by_time'}) && - $ENV{'form.limit_by_time'} ne '' ) { + if (exists($env{'form.limit_by_time'}) && + $env{'form.limit_by_time'} ne '' ) { return 1; } else { return 0; @@ -1258,43 +1312,6 @@ sub get_time_limits { return ($starttime,$endtime); } - - -#################################################### -#################################################### - -=pod - -=item sections_description - -Inputs: @Sections, an array of sections - -Returns: A text description of the sections selected. - -=cut - -#################################################### -#################################################### -sub sections_description { - my @Sections = @_; - my $sectionstring = ''; - if (scalar(@Sections) > 1) { - if (scalar(@Sections) > 2) { - my $last = pop(@Sections); - $sectionstring = "Sections ".join(', ',@Sections).', and '.$last; - } else { - $sectionstring = "Sections ".join(' and ',@Sections); - } - } else { - if ($Sections[0] eq 'all') { - $sectionstring = "All sections"; - } else { - $sectionstring = "Section ".$Sections[0]; - } - } - return $sectionstring; -} - #################################################### #################################################### @@ -1316,21 +1333,24 @@ sub manage_caches { my $sectionkey = join(',', map { - &Apache::lonnet::escape($_); - } sort(@Apache::lonstatistics::SelectedSections) + &escape($_); + } sort(&Apache::lonstatistics::get_selected_sections()) ); my $statuskey = $Apache::lonstatistics::enrollment_status; - if (exists($ENV{'form.ClearCache'}) || - exists($ENV{'form.updatecaches'}) || - (exists($ENV{'form.firstrun'}) && $ENV{'form.firstrun'} ne 'no') || - (exists($ENV{'form.prevsection'}) && - $ENV{'form.prevsection'} ne $sectionkey) || - (exists($ENV{'form.prevenrollstatus'}) && - $ENV{'form.prevenrollstatus'} ne $statuskey) + if (exists($env{'form.ClearCache'}) || + exists($env{'form.updatecaches'}) || + (exists($env{'form.firstrun'}) && $env{'form.firstrun'} ne 'no') || + (exists($env{'form.prevsection'}) && + $env{'form.prevsection'} ne $sectionkey) || + (exists($env{'form.prevenrollstatus'}) && + $env{'form.prevenrollstatus'} ne $statuskey) ) { if (defined($update_message)) { $r->print($update_message); } + if (0) { + &Apache::lonnet::logthis('Updating mysql student data caches'); + } &gather_full_student_data($r,$formname,$inputname); } # @@ -1344,7 +1364,7 @@ sub manage_caches { '<input type="hidden" name="prevenrollstatus" value="'.$statuskey.'" />' ); # - if (! exists($ENV{'form.firstrun'})) { + if (! exists($env{'form.firstrun'})) { $r->print('<input type="hidden" name="firstrun" value="yes" />'); } else { $r->print('<input type="hidden" name="firstrun" value="no" />'); @@ -1377,7 +1397,7 @@ sub gather_full_student_data { return if ($c->aborted()); my $status = &Apache::loncoursedata::ensure_current_full_data ($student->{'username'},$student->{'domain'}, - $ENV{'request.course.id'}); + $env{'request.course.id'}); &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state, &mt('last student')); } @@ -1415,7 +1435,7 @@ sub submission_report_form { ' enough input.'); } my $html = $/. - '<script type="Text/JavaScript">'. + '<script type="text/javascript" language="JavaScript">'. "document.Statistics.reportSelected.value='$original_report';". '</script>'. '<input type="hidden" name="correctans" value="true" />'. @@ -1424,7 +1444,7 @@ sub submission_report_form { my $output_selector = $/.'<select name="output">'.$/; foreach ('HTML','Excel','CSV') { $output_selector .= ' <option value="'.lc($_).'"'; - if ($ENV{'form.output'} eq lc($_)) { + if ($env{'form.output'} eq lc($_)) { $output_selector .= ' selected '; } $output_selector .='>'.&mt($_).'</option>'.$/;