--- loncom/interface/statistics/lonstathelpers.pm 2005/04/08 13:35:50 1.49 +++ loncom/interface/statistics/lonstathelpers.pm 2010/04/17 22:48:56 1.61 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: lonstathelpers.pm,v 1.49 2005/04/08 13:35:50 albertel Exp $ +# $Id: lonstathelpers.pm,v 1.61 2010/04/17 22:48:56 www 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,7 +86,7 @@ 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; $rendered_problem =~ s|(<\s*/form\s*>)|<\/nop>|g; @@ -132,9 +135,9 @@ Skips 'survey' problems. #################################################### #################################################### sub problem_selector { - my ($AcceptedResponseTypes) = @_; + my ($AcceptedResponseTypes,$sequence_addendum,$symbmode) = @_; my $Str; - $Str = "\n<table>\n"; + $Str = &Apache::loncommon::start_data_table(); my $rb_count =0; my ($navmap,@sequences) = &Apache::lonstatistics::selected_sequences_with_assessments('all'); @@ -155,35 +158,43 @@ sub problem_selector { resptype=>$resptype}); my $checked = ''; if ($env{'form.problemchoice'} eq $value) { - $checked = 'checked '; + $checked = ' checked="checked"'; } my $title = $res->compTitle; if (! defined($title) || $title eq '') { ($title) = ($res->src =~ m:/([^/]*)$:); } - $seq_str .= '<tr>'. - qq{<td><input type="radio" id="$rb_count" name="problemchoice" value="$value" $checked /></td>}. + $seq_str .= &Apache::loncommon::start_data_table_row(). + ($symbmode? + '<td><input type="radio" id="'.$rb_count.'" name="symb" value="'.&HTML::Entities::encode($res->symb,'<>&"').'" '.$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(@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>}; - $seq_str .= "</td></tr>\n"; + '<a target="preview" href="'.$link.'">'.&mt('view').'</a>'; + $seq_str .= "</td>". &Apache::loncommon::end_data_table_row()."\n"; $rb_count++; } } } } if ($seq_str ne '') { - $Str .= '<tr><td> </td><td colspan="2"><b>'.$seq->compTitle.'</b></td>'. - "</tr>\n".$seq_str; + $Str .= &Apache::loncommon::start_data_table_header_row(). + '<th colspan="3">'.$seq->compTitle.'</th>'. + &Apache::loncommon::end_data_table_header_row()."\n".$seq_str; + if (defined($sequence_addendum)) { + $Str .= &Apache::loncommon::start_data_table_header_row(). + ('<td> </td>'x2). + '<td align="right">'.$sequence_addendum.'</td>'. + &Apache::loncommon::end_data_table_header_row()."\n"; + } } } - $Str .= "</table>\n"; + $Str .= &Apache::loncommon::end_data_table()."\n"; return $Str; } @@ -220,15 +231,16 @@ sub MultipleProblemSelector { 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]; @@ -312,15 +324,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)) { @@ -339,7 +351,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; } @@ -366,10 +378,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; } @@ -394,18 +406,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; } @@ -424,7 +436,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 @@ -454,7 +466,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, @@ -492,7 +511,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; @@ -507,7 +526,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 @@ -720,11 +739,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 @@ -782,7 +806,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)) { @@ -834,7 +858,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; @@ -1128,8 +1152,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; @@ -1234,7 +1258,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();'; @@ -1297,7 +1321,7 @@ sub manage_caches { my $sectionkey = join(',', map { - &Apache::lonnet::escape($_); + &escape($_); } sort(&Apache::lonstatistics::get_selected_sections()) ); my $statuskey = $Apache::lonstatistics::enrollment_status; @@ -1399,7 +1423,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" />'.