--- loncom/interface/statistics/lonstathelpers.pm 2006/12/29 21:47:11 1.54 +++ loncom/interface/statistics/lonstathelpers.pm 2020/09/12 20:36:11 1.76.2.4 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: lonstathelpers.pm,v 1.54 2006/12/29 21:47:11 albertel Exp $ +# $Id: lonstathelpers.pm,v 1.76.2.4 2020/09/12 20:36:11 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -86,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,&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; - return '<table bgcolor="ffffff"><tr><td>'. - '<base href="'.$base.'" />'. - $rendered_problem. - '</td></tr></table>'; + return '<div class="LC_Box">'. + '<h4 class="LC_hcell">'.&mt('Problem').'</h4>'. + '<base href="'.$base.'" />'.$rendered_problem. + '</div>'; } #################################################### @@ -135,9 +135,23 @@ 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<table>\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'); @@ -145,6 +159,36 @@ sub problem_selector { foreach my $seq (@sequences) { my $seq_str = ''; foreach my $res (&get_resources($navmap,$seq)) { + if ($res->src() eq '/res/lib/templates/simpleproblem.problem') { + next if (grep(/^placeholder$/,@{$res->parts})); + } + 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"'; + } + my $rowspan; + if ($totalresps > 1) { + $rowspan = ' rowspan="'.$totalresps.'"'; + } + $seq_str .= &Apache::loncommon::start_data_table_row(). + '<td'.$rowspan.' style="vertical-align:top">'. + '<label><input type="radio" name="symb" value="'.$value.'"'.$checked.' />'. + $title.'</label>'; + my $link = $res->link.'?symb='.&escape($res->shown_symb); + $seq_str .= (' 'x2). + '<a target="preview" href="'.$link.'">'.&mt('view').'</a></td>'; + } + my %partsseen; foreach my $part (@{$res->parts}) { my @response_ids = $res->responseIds($part); my @response_types = $res->responseType($part); @@ -152,48 +196,96 @@ sub problem_selector { my $respid = $response_ids[$i]; my $resptype = $response_types[$i]; if ($resptype =~ m/$AcceptedResponseTypes/) { - my $value = &make_target_id({symb=>$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:/([^/]*)$:); - } - $seq_str .= '<tr>'. - 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; + if ($byres) { + if (exists($partsseen{$part})) { + $seq_str .= &Apache::loncommon::continue_data_table_row(); + } else { + 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}) { + my $resprowspan; + if (scalar(@response_ids) > 1) { + $resprowspan = ' rowspan="'.scalar(@response_ids).'"'; + } + $seq_str .= '<td'.$resprowspan.' style="vertical-align:top">'. + $parttitle.'</td>'; + $partsseen{$part} = scalar(@response_ids); + } + } + $seq_str .= '<td>'.$resptype; + if (scalar(@response_ids) > 1) { + $seq_str .= ' '.&mt('id').': '.$respid; + } + $seq_str .= '</td>'. &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? + '<td><input type="radio" id="'.$prefix.$rb_count.'" name="'.$prefix.'symb" value="'.&HTML::Entities::encode($res->symb,'<>&"').'" '.$checked.' '. + $jsadd. + ' /></td>' + :qq{<td><input type="radio" id="$rb_count" name="problemchoice" value="$value"$checked /></td>}). + '<td><label for="'.$prefix.$rb_count.'">'.$resptype.'</label></td>'. + '<td><label for="'.$prefix.$rb_count.'">'.$title.'</label>'; + if (scalar(@response_ids) > 1) { + $seq_str .= &mt('response').' '.$respid; + } + my $link = $res->link.'?symb='.&escape($res->shown_symb); + $seq_str .= (' 'x2). + '<a target="preview" href="'.$link.'">'.&mt('view').'</a>'; + $seq_str .= "</td>". &Apache::loncommon::end_data_table_row()."\n"; } - my $link = $res->src.'?symb='. - &escape($res->symb); - $seq_str .= (' 'x2). - qq{<a target="preview" href="$link">view</a>}; - $seq_str .= "</td></tr>\n"; $rb_count++; } } } } if ($seq_str ne '') { - $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"; + if ($byres) { + $Str .= &Apache::loncommon::start_data_table_header_row(). + '<th colspan="3">'.$seq->compTitle.'</th>'. + &Apache::loncommon::end_data_table_header_row(). + $seq_str; + } else { + $Str .= &Apache::loncommon::start_data_table_header_row(). + '<th colspan="3">'. + ($all?'<input type="radio" id="'.$prefix.'s'.$rb_count.'" name="'.$prefix.'symb" value="'.&HTML::Entities::encode($seq->symb,'<>&').'" '.$jsadd.' />':''). + $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().&Apache::loncommon::end_scrollbox()."\n"; + if (!$rb_count) { + if ($byres) { + $Str = '<p class="LC_info">'.&mt('No gradable problems found').'</p>'; + } elsif ($AcceptedResponseTypes eq '.') { + $Str = '<p class="LC_info">'.&mt('No problems found').'</p>'; + } else { + $Str = '<p class="LC_info">'.&mt('No analyzable problems found').'</p>'; + } + } return $Str; } @@ -223,22 +315,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 .= - '<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]; @@ -257,7 +350,65 @@ sub MultipleProblemSelector { } </script> END - $Str .= + my $checkanonjs = <<"END"; + +<script type="text/javascript" language="JavaScript"> + function checkanon() { + return true; + } +</script> + +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"; + +<script type="text/javascript" language="JavaScript"> + function checkanon() { + anoncount = 0; + namedcount = 0; + for (i=0; i<document.forms.$formname.elements.length; i++) { + ele = document.forms.$formname.elements[i]; + if (ele.name == '$inputname') { + itemid = document.forms.$formname.elements[i].id; + if (document.forms.$formname.elements[i].checked) { + anonid = 'anonymous_'+itemid; + mixid = 'mixed_'+itemid; + anonele = document.getElementById(anonid); + mixele = document.getElementById(mixid); + if (anonele.value > 0) { + if (mixele.value == 'none') { + anoncount ++; + } else { + if (mixele.value == '0') { + if (mixele.checked) { + anoncount ++; + } else { + namedcount ++; + } + } else { + namedcount ++; + } + } + } else { + namedcount ++; + } + } + } + } + if (anoncount > 0 && namedcount > 0) { + alert("$anonwarning"); + return false; + } + } +</script> + +END + } + } + $Str .= $checkanonjs. '<a href="javascript:checkall(true)">'.&mt('Select All').'</a>'. (' 'x4). '<a href="javascript:checkall(false)">'.&mt('Unselect All').'</a>'; @@ -288,9 +439,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); } } } @@ -318,20 +487,45 @@ sub new_accumulator { return sub { if (@_) { - my ($res,$checked) = @_; + my ($res,$checked,$anonpart,$namedpart) = @_; $target.='<tr><td><label>'. '<input type="checkbox" name="'.$inputname.'" '; if ($checked) { - $target .= 'checked '; + $target .= 'checked="checked" '; } + my $anon_id = $item_id; $target .= 'id="'.$seq_id.':'.$item_id++.'" '; + my $esc_symb = &escape($res->symb); $target.= - 'value="'.&escape($res->symb).'" />'. + 'value="'.$esc_symb.'" />'. ' '.$res->compTitle.'</label>'. (' 'x2).'<a target="preview" '. - 'href="'.$res->src.'?symb='. - &escape($res->symb).'">view</a>'. - '</td></tr>'.$/; + 'href="'.$res->link.'?symb='. + &escape($res->shown_symb).'">'.&mt('view').'</a>'. + '<input type="hidden" id="anonymous_'.$seq_id.':'.$anon_id.'" name="hidden_'.$seq_id.':'.$anon_id.'" value="'.$anonpart.'" />'; + my $mixed = '<input type="hidden" id="mixed_'.$seq_id.':'.$anon_id.'" value="none" name="mixed_'.$seq_id.':'.$anon_id.'" />'; + 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]', + '<span class="LC_nobreak"><label>'. + '<input type="radio" name="mixed_'.$seq_id.':'.$anon_id. + '" value="0" id="mixed_'.$seq_id.':'.$anon_id.'"'.$checkedanon.' />', + '</label></span>'.(' 'x2).' <span class="LC_nobreak">'. + '<label><input type="radio" name="mixed_'.$seq_id.':'.$anon_id. + '" value="symb_'.$esc_symb.'" id="named_'.$seq_id.':'.$anon_id.'"'.$checknamed.' />', + '</label></span>').')'; + } else { + $target .= ' '.&mt('(Anonymous Survey)'); + } + } + $target.= $mixed.'</td></tr>'.$/; } else { if (defined($target)) { return { title => $title, @@ -464,7 +658,8 @@ 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, @@ -597,10 +792,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()); @@ -609,7 +801,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; } @@ -885,7 +1077,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 || @@ -1255,7 +1447,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();'; @@ -1269,9 +1461,9 @@ sub limit_by_time_form { $Str .= '<fieldset>'; my $timecheckbox = '<input type="checkbox" name="limit_by_time" '; if (&limit_by_time()) { - $timecheckbox .= ' checked '; + $timecheckbox .= 'checked="checked" '; } - $timecheckbox .= 'OnChange="javascript:toggle_limitby_activity(this.checked);" '; + $timecheckbox .= 'onchange="javascript:toggle_limitby_activity(this.checked);" '; $timecheckbox .= ' />'; $Str .= '<legend><label>'.&mt('[_1] Limit by time',$timecheckbox).'</label></legend>'; $Str .= &mt('Start Time: [_1]',$startdateform).'<br />'; @@ -1373,10 +1565,7 @@ sub gather_full_student_data { 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); + my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,scalar(@Students)); # while (my $student = shift @Students) { return if ($c->aborted()); @@ -1420,7 +1609,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" />'.