--- loncom/interface/statistics/lonstathelpers.pm 2004/11/03 16:13:08 1.29 +++ loncom/interface/statistics/lonstathelpers.pm 2005/03/10 16:58:52 1.43 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: lonstathelpers.pm,v 1.29 2004/11/03 16:13:08 matthew Exp $ +# $Id: lonstathelpers.pm,v 1.43 2005/03/10 16:58:52 matthew Exp $ # # Copyright Michigan State University Board of Trustees # @@ -68,8 +68,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 +81,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'}); + my ($base) = ($resource->src =~ m|^(.*/)[^/]*$|); + $base="http://".$ENV{'SERVER_NAME'}.$base; + my ($src,$symb)=($resource->src,&Apache::lonnet::escape($resource->symb)); + my $rendered_problem = &Apache::lonnet::ssi_body($src.'?symb='.$symb); $rendered_problem =~ s/<\s*form\s*/)|<\/nop>|g; return '
'. @@ -100,7 +98,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,23 +131,25 @@ Skips 'survey' problems. #################################################### #################################################### -sub ProblemSelector { +sub problem_selector { my ($AcceptedResponseTypes) = @_; my $Str; $Str = "\n\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{'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$res->{'symb'}, + my $value = &make_target_id({symb=>$res->symb, part=>$part, respid=>$respid, resptype=>$resptype}); @@ -138,19 +157,21 @@ sub ProblemSelector { if ($ENV{'form.problemchoice'} eq $value) { $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 .= ''. qq{}. ''. '\n"; $rb_count++; } @@ -158,7 +179,7 @@ sub ProblemSelector { } } if ($seq_str ne '') { - $Str .= ''. + $Str .= ''. "\n".$seq_str; } } @@ -280,16 +301,6 @@ END return $Str; } -sub get_title { - my ($title,$src) = @_; - if ($title eq '') { - ($title) = ($src =~ m|/([^/]+)$|); - } else { - $title =~ s/\:/:/g; - } - return $title; -} - sub new_accumulator { my ($title,$src,$symb,$seq_id,$inputname) = @_; my $target; @@ -308,7 +319,8 @@ sub new_accumulator { 'value="'.&Apache::lonnet::escape($res->symb).'" />'. ' '.$res->compTitle.''. (' 'x2).'view'. + 'href="'.$res->src.'?symb='. + &Apache::lonnet::escape($res->symb).'">view'. ''.$/; } else { if (defined($target)) { @@ -440,36 +452,40 @@ 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 ($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{'ResponseTypes'}}); + $i{'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 } ); } } @@ -527,7 +543,7 @@ sub get_prev_curr_next { $curr = $Resource[$curr_idx ]; $next = $Resource[$curr_idx+1]; } - return ($prev,$curr,$next); + return ($navmap,$prev,$curr,$next); } @@ -555,6 +571,7 @@ Returns: nothing ##################################################### sub GetStudentAnswers { my ($r,$problem,$Students,$formname,$inputname) = @_; + my %answers; my $status_type; if (defined($formname)) { $status_type = 'inline'; @@ -578,10 +595,11 @@ sub GetStudentAnswers { last if ($c->aborted()); my $sname = $student->{'username'}; my $sdom = $student->{'domain'}; - my $answer = &Apache::lonstathelpers::analyze_problem_as_student + my $answer = &Apache::lonstathelpers::get_student_answer ($resource,$sname,$sdom,$partid,$respid); &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state, &mt('last student')); + $answers{$answer}++; $student->{'answer'} = $answer; } &Apache::lonstathelpers::write_analysis_cache(); @@ -589,7 +607,7 @@ sub GetStudentAnswers { $r->rflush(); # close progress window &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state); - return; + return \%answers; } ##################################################### @@ -599,27 +617,19 @@ sub GetStudentAnswers { =item analyze_problem_as_student -Analyzes a homework problem for a student and returns the correct answer -for the student. Attempts to put together an answer for problem types -that do not natively support it. +Analyzes a homework problem for a student Inputs: $resource: a resource object $sname, $sdom, $partid, $respid -Returns: $answer - -If $partid and $respid are specified, $answer is simply a scalar containing -the correct answer for the response. - -If $partid or $respid are undefined, $answer will be a hash reference with -keys $partid.'.'.$respid.'.answer'. +Returns: the problem analysis hash =cut ##################################################### ##################################################### sub analyze_problem_as_student { - my ($resource,$sname,$sdom,$partid,$respid) = @_; + my ($resource,$sname,$sdom) = @_; if (ref($resource) ne 'HASH') { my $res = $resource; $resource = { 'src' => $res->src, @@ -630,12 +640,10 @@ sub analyze_problem_as_student { [$res->responseIds($part)]; } } - my $returnvalue; my $url = $resource->{'src'}; my $symb = $resource->{'symb'}; my $analysis = &get_from_analysis_cache($sname,$sdom,$symb); if (! defined($analysis)) { - &Apache::lonnet::logthis('uncached analysis'); my $courseid = $ENV{'request.course.id'}; my $Answ=&Apache::lonnet::ssi($url,('grade_target' => 'analyze', 'grade_domain' => $sdom, @@ -647,15 +655,62 @@ sub analyze_problem_as_student { } my %Answer=&Apache::lonnet::str2hash($analysis); # + return \%Answer; +} + +##################################################### +##################################################### + +=pod + +=item get_student_answer + +Analyzes a homework problem for a particular student and returns the correct +answer. Attempts to put together an answer for problem types +that do not natively support it. + +Inputs: $resource: a resource object (from navmaps or hash from loncoursedata) + $sname, $sdom, $partid, $respid + +Returns: $answer + +If $partid and $respid are specified, $answer is simply a scalar containing +the correct answer for the response. + +If $partid or $respid are undefined, $answer will be a hash reference with +keys $partid.'.'.$respid.'.answer'. + +=cut + +##################################################### +##################################################### +sub get_student_answer { + my ($resource,$sname,$sdom,$partid,$respid) = @_; + # + if (ref($resource) ne 'HASH') { + my $res = $resource; + $resource = { 'src' => $res->src, + 'symb' => $res->symb, + 'parts' => $res->parts }; + foreach my $part (@{$resource->{'parts'}}) { + $resource->{'partdata'}->{$part}->{'ResponseIds'}= + [$res->responseIds($part)]; + } + } + # + my $analysis = + &analyze_problem_as_student($resource,$sname,$sdom); my $answer; foreach my $partid (@{$resource->{'parts'}}) { my $partdata = $resource->{'partdata'}->{$partid}; foreach my $respid (@{$partdata->{'ResponseIds'}}) { my $prefix = $partid.'.'.$respid; my $key = $prefix.'.answer'; - $answer->{$partid}->{$respid} = &get_answer($prefix,$key,%Answer); + $answer->{$partid}->{$respid} = + &get_answer($prefix,$key,%$analysis); } } + my $returnvalue; if (! defined($partid)) { $returnvalue = $answer; } elsif (! defined($respid)) { @@ -1093,7 +1148,7 @@ sub get_problem_data { $Partdata{$part}->{'_Foils'}->{$foil}->{'_Concept'}= $concept; } - } elsif ($key =~ /^(incorrect|answer|ans_low|ans_high|str_type)$/) { + } elsif ($key =~ /^(unit|incorrect|answer|ans_low|ans_high|str_type)$/) { $Partdata{$part}->{$key}=$value; } } else { @@ -1299,9 +1354,10 @@ sub manage_caches { if (defined($update_message)) { $r->print($update_message); } - &Apache::lonstatistics::Gather_Full_Student_Data($r,$formname, - $inputname); - + if (0) { + &Apache::lonnet::logthis('Updating mysql student data caches'); + } + &gather_full_student_data($r,$formname,$inputname); } # my @Buttons = @@ -1323,8 +1379,90 @@ sub manage_caches { return @Buttons; } +sub gather_full_student_data { + my ($r,$formname,$inputname) = @_; + my $status_type; + if (defined($formname)) { + $status_type = 'inline'; + } else { + $status_type = 'popup'; + } + my $c = $r->connection(); + # + &Apache::loncoursedata::clear_internal_caches(); + # + my @Students = @Apache::lonstatistics::Students; + # + # Open the progress window + my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin + ($r,&mt('Student Data Compilation Status'), + &mt('Student Data Compilation Progress'), scalar(@Students), + $status_type,undef,$formname,$inputname); + # + while (my $student = shift @Students) { + return if ($c->aborted()); + my $status = &Apache::loncoursedata::ensure_current_full_data + ($student->{'username'},$student->{'domain'}, + $ENV{'request.course.id'}); + &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state, + &mt('last student')); + } + &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state); + $r->rflush(); + return; +} + +#################################################### +#################################################### + +=pod + +=item &submission_report_form + +Input: The originating reportSelected value for the current stats page. + +Output: Scalar containing HTML with needed form elements and a link to +the student submission reports page. +=cut +#################################################### +#################################################### +sub submission_report_form { + my ($original_report) = @_; + # Note: In the link below we change the reportSelected value. If + # the user hits the 'back' button on the browser after getting their + # student submissions report, this value may still be around. So we + # output a script block to set it properly. If the $original_report + # value is unset, you are just asking for trouble. + if (! defined($original_report)) { + &Apache::lonnet::logthis + ('someone called lonstathelpers::submission_report_form without '. + ' enough input.'); + } + my $html = $/. + ''. + ''. + ''. + ''; + my $output_selector = $/.''.$/; + my $link = ''; + $html.= &mt('View data as [_1] [_2]go[_3]',$output_selector, + $link,'').$/; + return $html +} #################################################### ####################################################
'; - 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); $seq_str .= (' 'x2). - qq{view}; + qq{view}; $seq_str .= "
 '.$seq->{'title'}.'
 '.$seq->compTitle.'