version 1.34, 2004/12/07 16:04:06
|
version 1.45, 2005/03/21 19:47:54
|
Line 68 use Storable qw(freeze thaw);
|
Line 68 use Storable qw(freeze thaw);
|
|
|
=item &render_resource($resource) |
=item &render_resource($resource) |
|
|
Input: a resource generated from |
Input: a navmaps resource |
&Apache::loncoursedata::get_sequence_assessment_data(). |
|
|
|
Retunrs: a scalar containing html for a rendering of the problem |
Retunrs: a scalar containing html for a rendering of the problem |
within a table. |
within a table. |
Line 82 sub render_resource {
|
Line 81 sub render_resource {
|
my ($resource) = @_; |
my ($resource) = @_; |
## |
## |
## Render the problem |
## Render the problem |
my $base; |
my ($base) = ($resource->src =~ m|^(.*/)[^/]*$|); |
($base,undef) = ($resource->{'src'} =~ m|(.*/)[^/]*$|); |
$base="http://".$ENV{'SERVER_NAME'}.$base; |
$base = "http://".$ENV{'SERVER_NAME'}.$base; |
my ($src,$symb)=($resource->src,&Apache::lonnet::escape($resource->symb)); |
my $rendered_problem = |
my $rendered_problem = &Apache::lonnet::ssi_body($src.'?symb='.$symb); |
&Apache::lonnet::ssi_body($resource->{'src'}.'?symb='.&Apache::lonnet::escape($resource->{'symb'})); |
|
$rendered_problem =~ s/<\s*form\s*/<nop /g; |
$rendered_problem =~ s/<\s*form\s*/<nop /g; |
$rendered_problem =~ s|(<\s*/form\s*>)|<\/nop>|g; |
$rendered_problem =~ s|(<\s*/form\s*>)|<\/nop>|g; |
return '<table bgcolor="ffffff"><tr><td>'. |
return '<table bgcolor="ffffff"><tr><td>'. |
Line 100 sub render_resource {
|
Line 98 sub render_resource {
|
|
|
=pod |
=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 |
Input: scalar containing regular expression which matches response |
types to show. '.' will yield all, '(option|radiobutton)' will match |
types to show. '.' will yield all, '(option|radiobutton)' will match |
Line 114 Skips 'survey' problems.
|
Line 131 Skips 'survey' problems.
|
|
|
#################################################### |
#################################################### |
#################################################### |
#################################################### |
sub ProblemSelector { |
sub problem_selector { |
my ($AcceptedResponseTypes) = @_; |
my ($AcceptedResponseTypes) = @_; |
my $Str; |
my $Str; |
$Str = "\n<table>\n"; |
$Str = "\n<table>\n"; |
my $rb_count =0; |
my $rb_count =0; |
foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess('all')) { |
my ($navmap,@sequences) = |
next if ($seq->{'num_assess'}<1); |
&Apache::lonstatistics::selected_sequences_with_assessments('all'); |
|
return $navmap if (! ref($navmap)); # error |
|
foreach my $seq (@sequences) { |
my $seq_str = ''; |
my $seq_str = ''; |
foreach my $res (@{$seq->{'contents'}}) { |
foreach my $res (&get_resources($navmap,$seq)) { |
next if ($res->{'type'} ne 'assessment'); |
foreach my $part (@{$res->parts}) { |
foreach my $part (@{$res->{'parts'}}) { |
my @response_ids = $res->responseIds($part); |
my $partdata = $res->{'partdata'}->{$part}; |
my @response_types = $res->responseType($part); |
for (my $i=0;$i<scalar(@{$partdata->{'ResponseTypes'}});$i++){ |
for (my $i=0;$i<scalar(@response_types);$i++){ |
my $respid = $partdata->{'ResponseIds'}->[$i]; |
my $respid = $response_ids[$i]; |
my $resptype = $partdata->{'ResponseTypes'}->[$i]; |
my $resptype = $response_types[$i]; |
if ($resptype =~ m/$AcceptedResponseTypes/) { |
if ($resptype =~ m/$AcceptedResponseTypes/) { |
my $value = &make_target_id({symb=>$res->{'symb'}, |
my $value = &make_target_id({symb=>$res->symb, |
part=>$part, |
part=>$part, |
respid=>$respid, |
respid=>$respid, |
resptype=>$resptype}); |
resptype=>$resptype}); |
Line 138 sub ProblemSelector {
|
Line 157 sub ProblemSelector {
|
if ($ENV{'form.problemchoice'} eq $value) { |
if ($ENV{'form.problemchoice'} eq $value) { |
$checked = 'checked '; |
$checked = 'checked '; |
} |
} |
my $title = $res->{'title'}; |
my $title = $res->compTitle; |
if (! defined($title) || $title eq '') { |
if (! defined($title) || $title eq '') { |
($title) = ($res->{'src'} =~ m:/([^/]*)$:); |
($title) = ($res->src =~ m:/([^/]*)$:); |
} |
} |
$seq_str .= '<tr>'. |
$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.'">'.$resptype.'</label></td>'. |
'<td><label for="'.$rb_count.'">'.$title.'</label>'; |
'<td><label for="'.$rb_count.'">'.$title.'</label>'; |
if (scalar(@{$partdata->{'ResponseIds'}}) > 1) { |
if (scalar(@response_ids) > 1) { |
$seq_str .= &mt('response').' '.$respid; |
$seq_str .= &mt('response').' '.$respid; |
} |
} |
my $link = $res->{'src'}.'?symb='. |
my $link = $res->src.'?symb='. |
&Apache::lonnet::escape($res->{'symb'}); |
&Apache::lonnet::escape($res->symb); |
$seq_str .= (' 'x2). |
$seq_str .= (' 'x2). |
qq{<a target="preview" href="$link">view</a>}; |
qq{<a target="preview" href="$link">view</a>}; |
$seq_str .= "</td></tr>\n"; |
$seq_str .= "</td></tr>\n"; |
Line 160 sub ProblemSelector {
|
Line 179 sub ProblemSelector {
|
} |
} |
} |
} |
if ($seq_str ne '') { |
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; |
"</tr>\n".$seq_str; |
} |
} |
} |
} |
Line 282 END
|
Line 301 END
|
return $Str; |
return $Str; |
} |
} |
|
|
sub get_title { |
|
my ($title,$src) = @_; |
|
if ($title eq '') { |
|
($title) = ($src =~ m|/([^/]+)$|); |
|
} else { |
|
$title =~ s/\:/:/g; |
|
} |
|
return $title; |
|
} |
|
|
|
sub new_accumulator { |
sub new_accumulator { |
my ($title,$src,$symb,$seq_id,$inputname) = @_; |
my ($title,$src,$symb,$seq_id,$inputname) = @_; |
my $target; |
my $target; |
Line 311 sub new_accumulator {
|
Line 320 sub new_accumulator {
|
' '.$res->compTitle.'</label>'. |
' '.$res->compTitle.'</label>'. |
(' 'x2).'<a target="preview" '. |
(' 'x2).'<a target="preview" '. |
'href="'.$res->src.'?symb='. |
'href="'.$res->src.'?symb='. |
&Apache::lonnet::escape($res->{'symb'}).'">view</a>'. |
&Apache::lonnet::escape($res->symb).'">view</a>'. |
'</td></tr>'.$/; |
'</td></tr>'.$/; |
} else { |
} else { |
if (defined($target)) { |
if (defined($target)) { |
Line 443 sub get_prev_curr_next {
|
Line 452 sub get_prev_curr_next {
|
# |
# |
# Build an array with the data we need to search through |
# Build an array with the data we need to search through |
my @Resource; |
my @Resource; |
foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess('all')) { |
my ($navmap,@sequences) = |
foreach my $res (@{$seq->{'contents'}}) { |
&Apache::lonstatistics::selected_sequences_with_assessments('all'); |
next if ($res->{'type'} ne 'assessment'); |
return $navmap if (! ref($navmap)); |
foreach my $part (@{$res->{'parts'}}) { |
foreach my $seq (@sequences) { |
my $partdata = $res->{'partdata'}->{$part}; |
my @resources = &get_resources($navmap,$seq); |
if ($partdata->{'Survey'} && ($granularity eq 'part_survey')){ |
foreach my $res (@resources) { |
|
foreach my $part (@{$res->parts}) { |
|
if ($res->is_survey($part) && ($granularity eq 'part_survey')){ |
push (@Resource, |
push (@Resource, |
{ symb => $res->{symb}, |
{ symb => $res->symb, |
part => $part, |
part => $part, |
resource => $res, |
resource => $res, |
} ); |
} ); |
} elsif ($granularity eq 'part') { |
} elsif ($granularity eq 'part') { |
push (@Resource, |
push (@Resource, |
{ symb => $res->{symb}, |
{ symb => $res->symb, |
part => $part, |
part => $part, |
resource => $res, |
resource => $res, |
} ); |
} ); |
} elsif ($granularity eq 'response') { |
} elsif ($granularity eq 'response') { |
|
my @response_ids = $res->responseIds($part); |
|
my @response_types = $res->responseType($part); |
for (my $i=0; |
for (my $i=0; |
$i<scalar(@{$partdata->{'ResponseTypes'}}); |
$i<scalar(@response_ids); |
$i++){ |
$i++){ |
my $respid = $partdata->{'ResponseIds'}->[$i]; |
my $respid = $response_ids[$i]; |
my $resptype = $partdata->{'ResponseTypes'}->[$i]; |
my $resptype = $response_types[$i]; |
next if ($resptype !~ m/$AcceptableResponseTypes/); |
next if ($resptype !~ m/$AcceptableResponseTypes/); |
push (@Resource, |
push (@Resource, |
{ symb => $res->{symb}, |
{ symb => $res->symb, |
part => $part, |
part => $part, |
respid => $partdata->{'ResponseIds'}->[$i], |
respid => $respid, |
|
resptype => $resptype, |
resource => $res, |
resource => $res, |
resptype => $resptype |
|
} ); |
} ); |
} |
} |
} |
} |
Line 530 sub get_prev_curr_next {
|
Line 543 sub get_prev_curr_next {
|
$curr = $Resource[$curr_idx ]; |
$curr = $Resource[$curr_idx ]; |
$next = $Resource[$curr_idx+1]; |
$next = $Resource[$curr_idx+1]; |
} |
} |
return ($prev,$curr,$next); |
return ($navmap,$prev,$curr,$next); |
} |
} |
|
|
|
|
Line 1268 sub get_time_limits {
|
Line 1281 sub get_time_limits {
|
return ($starttime,$endtime); |
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; |
|
} |
|
|
|
#################################################### |
#################################################### |
#################################################### |
#################################################### |
|
|
Line 1327 sub manage_caches {
|
Line 1303 sub manage_caches {
|
join(',', |
join(',', |
map { |
map { |
&Apache::lonnet::escape($_); |
&Apache::lonnet::escape($_); |
} sort(@Apache::lonstatistics::SelectedSections) |
} sort(&Apache::lonstatistics::get_selected_sections()) |
); |
); |
my $statuskey = $Apache::lonstatistics::enrollment_status; |
my $statuskey = $Apache::lonstatistics::enrollment_status; |
if (exists($ENV{'form.ClearCache'}) || |
if (exists($ENV{'form.ClearCache'}) || |
Line 1341 sub manage_caches {
|
Line 1317 sub manage_caches {
|
if (defined($update_message)) { |
if (defined($update_message)) { |
$r->print($update_message); |
$r->print($update_message); |
} |
} |
&Apache::lonstatistics::Gather_Full_Student_Data($r,$formname, |
if (0) { |
$inputname); |
&Apache::lonnet::logthis('Updating mysql student data caches'); |
|
} |
|
&gather_full_student_data($r,$formname,$inputname); |
} |
} |
# |
# |
my @Buttons = |
my @Buttons = |
Line 1365 sub manage_caches {
|
Line 1342 sub manage_caches {
|
return @Buttons; |
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 = $/. |
|
'<script type="Text/JavaScript">'. |
|
"document.Statistics.reportSelected.value='$original_report';". |
|
'</script>'. |
|
'<input type="hidden" name="correctans" value="true" />'. |
|
'<input type="hidden" name="prob_status" value="true" />'. |
|
'<input type="hidden" name="all_sub" value="true" />'; |
|
my $output_selector = $/.'<select name="output">'.$/; |
|
foreach ('HTML','Excel','CSV') { |
|
$output_selector .= ' <option value="'.lc($_).'"'; |
|
if ($ENV{'form.output'} eq lc($_)) { |
|
$output_selector .= ' selected '; |
|
} |
|
$output_selector .='>'.&mt($_).'</option>'.$/; |
|
} |
|
$output_selector .= '</select>'.$/; |
|
my $link = '<a href="javascript:'. |
|
q{document.Statistics.reportSelected.value='student_submission_reports';}. |
|
'document.Statistics.submit();">'; |
|
$html.= &mt('View data as [_1] [_2]go[_3]',$output_selector, |
|
$link,'</a>').$/; |
|
return $html |
|
} |
|
|
#################################################### |
#################################################### |
#################################################### |
#################################################### |