--- loncom/interface/statistics/lonstathelpers.pm 2004/08/03 19:53:12 1.18 +++ loncom/interface/statistics/lonstathelpers.pm 2005/11/12 03:58:55 1.51 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: lonstathelpers.pm,v 1.18 2004/08/03 19:53:12 matthew Exp $ +# $Id: lonstathelpers.pm,v 1.51 2005/11/12 03:58:55 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -40,7 +40,6 @@ routines that are needed across multiple =head1 OVERVIEW - =over 4 =cut @@ -50,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(); @@ -69,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. @@ -83,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 ''.$/; + } else { + if (defined($target)) { + return { title => $title, + symb => $symb, + src => $src, + id => $seq_id, + html => $target, }; + } + return undef; + } + }; +} + +sub get_selected_symbs { + my ($inputfield) = @_; + my $field = 'form.'.$inputfield; + my @symbs = (map { + &Apache::lonnet::unescape($_); + } &Apache::loncommon::get_env_multiple($field)); + return @symbs; +} + +#################################################### +#################################################### + +=pod + =item &make_target_id($target) Inputs: Hash ref with the following entries: @@ -214,11 +399,23 @@ Returns: A hash reference, $target, cont #################################################### sub get_target_from_id { my ($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)}); + 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)}); + } 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)}); + } + return \@Return; + } } #################################################### @@ -257,38 +454,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'}) { - if ($granularity eq 'part_survey'){ - push (@Resource, - { symb => $res->{symb}, - part => $part, - resource => $res, - } ); - } + 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, + 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 } ); } } @@ -346,7 +545,7 @@ sub get_prev_curr_next { $curr = $Resource[$curr_idx ]; $next = $Resource[$curr_idx+1]; } - return ($prev,$curr,$next); + return ($navmap,$prev,$curr,$next); } @@ -374,6 +573,7 @@ Returns: nothing ##################################################### sub GetStudentAnswers { my ($r,$problem,$Students,$formname,$inputname) = @_; + my %answers; my $status_type; if (defined($formname)) { $status_type = 'inline'; @@ -397,18 +597,19 @@ 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_answer_cache(); + &Apache::lonstathelpers::write_analysis_cache(); return if ($c->aborted()); $r->rflush(); # close progress window &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state); - return; + return \%answers; } ##################################################### @@ -418,13 +619,61 @@ 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: the problem analysis hash + +=cut + +##################################################### +##################################################### +sub analyze_problem_as_student { + my ($resource,$sname,$sdom) = @_; + 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 $url = $resource->{'src'}; + my $symb = $resource->{'symb'}; + my $analysis = &get_from_analysis_cache($sname,$sdom,$symb); + if (! defined($analysis)) { + my $courseid = $env{'request.course.id'}; + my $Answ=&Apache::lonnet::ssi($url,('grade_target' => 'analyze', + 'grade_domain' => $sdom, + 'grade_username' => $sname, + 'grade_symb' => $symb, + 'grade_courseid' => $courseid)); + (my $garbage,$analysis)=split(/_HASH_REF__/,$Answ,2); + &store_analysis($sname,$sdom,$symb,$analysis); + } + 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 @@ -437,34 +686,33 @@ keys $partid.'.'.$respid.'.answer'. ##################################################### ##################################################### -sub analyze_problem_as_student { +sub get_student_answer { my ($resource,$sname,$sdom,$partid,$respid) = @_; - my $returnvalue; - my $url = $resource->{'src'}; - my $symb = $resource->{'symb'}; - my $answer = &get_from_answer_cache($sname,$sdom,$symb,$partid,$respid); - if (defined($answer)) { - return($answer); - } - my $courseid = $ENV{'request.course.id'}; - my $Answ=&Apache::lonnet::ssi($url,('grade_target' => 'analyze', - 'grade_domain' => $sdom, - 'grade_username' => $sname, - 'grade_symb' => $symb, - 'grade_courseid' => $courseid)); - (my $garbage,$Answ)=split(/_HASH_REF__/,$Answ,2); - my %Answer=&Apache::lonnet::str2hash($Answ); # - undef($answer); + 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); } } - &store_answer($sname,$sdom,$symb,undef,undef,$answer); + my $returnvalue; if (! defined($partid)) { $returnvalue = $answer; } elsif (! defined($respid)) { @@ -509,7 +757,6 @@ sub get_answer { return $returnvalue; } - ##################################################### ##################################################### @@ -519,7 +766,7 @@ sub get_answer { =over 4 -=item &load_answer_cache($symb) +=item &load_analysis_cache($symb) Loads the cache for the given symb into memory from disk. Requires the cache filename be set. @@ -534,7 +781,7 @@ Only should be called by &ensure_proper_ my $current_symb = undef; my %cache; -sub load_answer_cache { +sub load_analysis_cache { my ($symb) = @_; return if (! defined($cache_filename)); if (! defined($current_symb) || $current_symb ne $symb) { @@ -557,34 +804,20 @@ sub load_answer_cache { =pod -=item &get_from_answer_cache($sname,$sdom,$symb,$partid,$respid) +=item &get_from_analysis_cache($sname,$sdom,$symb,$partid,$respid) Returns the appropriate data from the cache, or undef if no data exists. -If $respid is undefined, a hash ref containing the answers for the given -$partid is returned. If $partid is undefined, a hash ref containing answers -for all of the parts is returned. =cut ##################################################### ##################################################### -sub get_from_answer_cache { - my ($sname,$sdom,$symb,$partid,$respid) = @_; +sub get_from_analysis_cache { + my ($sname,$sdom,$symb) = @_; &ensure_proper_cache($symb); my $returnvalue; - if (exists($cache{$sname.':'.$sdom}) && - ref($cache{$sname.':'.$sdom}) eq 'HASH') { - if (defined($partid) && - exists($cache{$sname.':'.$sdom}->{$partid})) { - if (defined($respid) && - exists($cache{$sname.':'.$sdom}->{$partid}->{$respid})) { - $returnvalue = $cache{$sname.':'.$sdom}->{$partid}->{$respid}; - } else { - $returnvalue = $cache{$sname.':'.$sdom}->{$partid}; - } - } else { - $returnvalue = $cache{$sname.':'.$sdom}; - } + if (exists($cache{$sname.':'.$sdom})) { + $returnvalue = $cache{$sname.':'.$sdom}; } else { $returnvalue = undef; } @@ -596,16 +829,16 @@ sub get_from_answer_cache { =pod -=item &write_answer_cache($symb) +=item &write_analysis_cache($symb) Writes the in memory cache to disk so that it can be read in with -&load_answer_cache($symb). +&load_analysis_cache($symb). =cut ##################################################### ##################################################### -sub write_answer_cache { +sub write_analysis_cache { return if (! defined($current_symb) || ! defined($cache_filename)); my %cache_db; my $key = &Apache::lonnet::escape($current_symb); @@ -629,7 +862,7 @@ sub write_answer_cache { =item &ensure_proper_cache($symb) Called to make sure we have the proper cache set up. This is called -prior to every answer lookup. +prior to every analysis lookup. =cut @@ -637,18 +870,18 @@ prior to every answer 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.'_answer_cache.db'; + 'problemanalysis_'.$cid.'_analysis_cache.db'; if (! defined($cache_filename) || $cache_filename ne $new_filename || ! defined($current_symb) || $current_symb ne $symb) { $cache_filename = $new_filename; # Notice: $current_symb is not set to $symb until after the cache is - # loaded. This is what tells &load_answer_cache to load in a new + # loaded. This is what tells &load_analysis_cache to load in a new # symb cache. - &load_answer_cache($symb); + &load_analysis_cache($symb); $current_symb = $symb; } } @@ -658,26 +891,18 @@ sub ensure_proper_cache { =pod -=item &store_answer($sname,$sdom,$symb,$partid,$respid,$dataset) +=item &store_analysis($sname,$sdom,$symb,$partid,$respid,$dataset) -Stores the answer data in the in memory cache. +Stores the analysis data in the in memory cache. =cut ##################################################### ##################################################### -sub store_answer { - my ($sname,$sdom,$symb,$partid,$respid,$dataset) = @_; +sub store_analysis { + my ($sname,$sdom,$symb,$dataset) = @_; return if ($symb ne $current_symb); - if (defined($partid)) { - if (defined($respid)) { - $cache{$sname.':'.$sdom}->{$partid}->{$respid} = $dataset; - } else { - $cache{$sname.':'.$sdom}->{$partid} = $dataset; - } - } else { - $cache{$sname.':'.$sdom}=$dataset; - } + $cache{$sname.':'.$sdom}=$dataset; return; } @@ -910,20 +1135,22 @@ 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; } elsif ($key eq 'concepts') { $Partdata{$part}->{'_Concepts'}=$value; + } elsif ($key eq 'items') { + $Partdata{$part}->{'_Items'}=$value; } elsif ($key =~ /^concept\.(.*)$/) { my $concept = $1; foreach my $foil (@$value) { $Partdata{$part}->{'_Foils'}->{$foil}->{'_Concept'}= $concept; } - } elsif ($key =~ /^(incorrect|answer|ans_low|ans_high)$/) { + } elsif ($key =~ /^(unit|incorrect|answer|ans_low|ans_high|str_type)$/) { $Partdata{$part}->{$key}=$value; } } else { @@ -935,13 +1162,51 @@ sub get_problem_data { } elsif ($key =~ /^foil\.value\.(.*)$/) { my $foil = $1; $Partdata{$part}->{'_Foils'}->{$foil}->{'value'}=$value; + } elsif ($key eq 'answercomputed') { + $Partdata{$part}->{'answercomputed'} = $value; } } } } + # Further debugging code + if (0) { + &Apache::lonnet::logthis('lonstathelpers::get_problem_data'); + &log_hash_ref(\%Partdata); + } return %Partdata; } +sub log_array_ref { + my ($arrayref,$prefix) = @_; + return if (ref($arrayref) ne 'ARRAY'); + if (! defined($prefix)) { $prefix = ''; }; + foreach my $v (@$arrayref) { + if (ref($v) eq 'ARRAY') { + &log_array_ref($v,$prefix.' '); + } elsif (ref($v) eq 'HASH') { + &log_hash_ref($v,$prefix.' '); + } else { + &Apache::lonnet::logthis($prefix.'"'.$v.'"'); + } + } +} + +sub log_hash_ref { + my ($hashref,$prefix) = @_; + return if (ref($hashref) ne 'HASH'); + if (! defined($prefix)) { $prefix = ''; }; + while (my ($k,$v) = each(%$hashref)) { + if (ref($v) eq 'ARRAY') { + &Apache::lonnet::logthis($prefix.'"'.$k.'" = array'); + &log_array_ref($v,$prefix.' '); + } elsif (ref($v) eq 'HASH') { + &Apache::lonnet::logthis($prefix.'"'.$k.'" = hash'); + &log_hash_ref($v,$prefix.' '); + } else { + &Apache::lonnet::logthis($prefix.'"'.$k.'" => "'.$v.'"'); + } + } +} #################################################### #################################################### @@ -994,7 +1259,7 @@ sub limit_by_time_form { } $timecheckbox .= 'OnChange="javascript:toggle_limitby_activity(this.checked);" '; $timecheckbox .= ' />'; - $Str .= ''.&mt('[_1] Limit by time',$timecheckbox).''; + $Str .= ''; $Str .= &mt('Start Time: [_1]',$startdateform).'
'; $Str .= &mt(' End Time: [_1]',$enddateform).'
'; $Str .= ''; @@ -1002,8 +1267,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; @@ -1018,43 +1283,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; -} - #################################################### #################################################### @@ -1071,25 +1299,30 @@ Returns: An array of scalars containing #################################################### #################################################### sub manage_caches { - my ($r,$formname,$inputname) = @_; + my ($r,$formname,$inputname,$update_message) = @_; &Apache::loncoursedata::clear_internal_caches(); my $sectionkey = join(',', map { &Apache::lonnet::escape($_); - } sort(@Apache::lonstatistics::SelectedSections) + } 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) ) { - &Apache::lonstatistics::Gather_Full_Student_Data($r,$formname, - $inputname); + 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); } # my @Buttons = @@ -1102,7 +1335,7 @@ sub manage_caches { '' ); # - if (! exists($ENV{'form.firstrun'})) { + if (! exists($env{'form.firstrun'})) { $r->print(''); } else { $r->print(''); @@ -1111,8 +1344,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 +} #################################################### ####################################################
'. @@ -101,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 @@ -115,51 +131,63 @@ Skips 'survey' problems. #################################################### #################################################### -sub ProblemSelector { - my ($AcceptedResponseTypes) = @_; +sub problem_selector { + my ($AcceptedResponseTypes,$sequence_addendum) = @_; my $Str; $Str = "\n\n"; - foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess('all')) { - next if ($seq->{'num_assess'}<1); + 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 (@{$seq->{'contents'}}) { - next if ($res->{'type'} ne 'assessment'); - foreach my $part (@{$res->{'parts'}}) { - my $partdata = $res->{'partdata'}->{$part}; - next if ($partdata->{'Survey'}); - 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}); my $checked = ''; - if ($ENV{'form.problemchoice'} eq $value) { + 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++; } } } } if ($seq_str ne '') { - $Str .= ''. + $Str .= ''. + ''. "\n".$seq_str; + if (defined($sequence_addendum)) { + $Str .= ''. + (''x2). + ''. + "\n"; + } } } $Str .= "
'. - ''. - ''. - $resptype.''. - ''.$title.' '; -# ''.$resptype.' '.$res->{'title'}.' '; - if (scalar(@{$partdata->{'ResponseIds'}}) > 1) { + $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->{'title'}.'
 '.$seq->compTitle.'
 '.$sequence_addendum.'
\n"; @@ -171,6 +199,163 @@ sub ProblemSelector { =pod +=item &MultipleProblemSelector($navmap,$selected,$inputname) + +Generate HTML with checkboxes for problem selection. + +Input: + +$navmap: a navmap object. If undef, navmaps will be called to create a +new object. + +$selected: Scalar, Array, or hash reference of currently selected items. + +$inputname: The name of the form elements to use for the checkboxs. + +Returns: A string containing html for a table which lists the sequences +and their contents. A checkbox is provided for each problem. + +=cut + +#################################################### +#################################################### +sub MultipleProblemSelector { + my ($navmap,$inputname,$formname)=@_; + 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').'

'; + return $Str; + } + } + my $selected = {map { ($_,1) } (&get_selected_symbs($inputname))}; + # Header + $Str .= <<"END"; + +END + $Str .= + ''.&mt('Select All').''. + (' 'x4). + ''.&mt('Unselect All').''; + $Str .= $/.''.$/; + my $iterator = $navmap->getIterator(undef, undef, undef, 1); + my $sequence_string; + my $seq_id = 0; + my @Accumulator = (&new_accumulator($env{'course.'.$cid.'.description'}, + '', + '', + $seq_id++, + $inputname)); + my @Sequence_Data; + while (my $curRes = $iterator->next()) { + if ($curRes == $iterator->END_MAP) { + if (ref($Accumulator[-1]) eq 'CODE') { + my $old_accumulator = pop(@Accumulator); + push(@Sequence_Data,&{$old_accumulator}()); + } + } elsif ($curRes == $iterator->BEGIN_MAP) { + # Not much to do here. + } + next if (! ref($curRes)); + if ($curRes->is_map) { + push(@Accumulator,&new_accumulator($curRes->compTitle, + $curRes->src, + $curRes->symb, + $seq_id++, + $inputname)); + } elsif ($curRes->is_problem) { + if (@Accumulator && $Accumulator[-1] ne '') { + &{$Accumulator[-1]}($curRes, + exists($selected->{$curRes->symb})); + } + } + } + my $course_seq = pop(@Sequence_Data); + foreach my $seq ($course_seq,@Sequence_Data) { + #my $seq = pop(@Sequence_Data); + next if (! defined($seq) || ref($seq) ne 'HASH'); + $Str.= ''.$/; + $Str.= $seq->{'html'}; + } + $Str .= '
'. + ''.$seq->{'title'}.''.(' 'x2). + ''. + &mt('Select').''.(' 'x2). + ''. + &mt('Unselect').''.(' 'x2). + '
'.$/; + return $Str; +} + +sub new_accumulator { + my ($title,$src,$symb,$seq_id,$inputname) = @_; + my $target; + my $item_id=0; + return + sub { + if (@_) { + my ($res,$checked) = @_; + $target.='
'. + (' 'x2).'view'. + '