version 1.63, 2010/08/04 01:56:07
|
version 1.69, 2012/05/03 11:21:33
|
Line 90 sub render_resource {
|
Line 90 sub render_resource {
|
my $rendered_problem = &Apache::lonnet::ssi_body($src.'?symb='.$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; |
$rendered_problem =~ s|(<\s*/form\s*>)|<\/nop>|g; |
$rendered_problem =~ s|(<\s*/form\s*>)|<\/nop>|g; |
return '<table bgcolor="ffffff"><tr><td>'. |
return &Apache::loncommon::start_data_table(). |
'<base href="'.$base.'" />'. |
&Apache::loncommon::start_data_table_row(). |
$rendered_problem. |
'<td>'.'<base href="'.$base.'" />'.$rendered_problem. |
'</td></tr></table>'; |
'</td>'.&Apache::loncommon::end_data_table_row().&Apache::loncommon::end_data_table(); |
} |
} |
|
|
#################################################### |
#################################################### |
Line 135 Skips 'survey' problems.
|
Line 135 Skips 'survey' problems.
|
#################################################### |
#################################################### |
#################################################### |
#################################################### |
sub problem_selector { |
sub problem_selector { |
my ($AcceptedResponseTypes,$sequence_addendum,$symbmode) = @_; |
my ($AcceptedResponseTypes,$sequence_addendum,$symbmode,$all,$prefix,$smallbox,$onclick) = @_; |
|
# all: also make sequences selectable |
|
# prefix: prefix for all form names |
|
# smallbox: use smaller box |
|
# onclick: javascript to execute when clicked |
my $Str; |
my $Str; |
$Str = &Apache::loncommon::start_data_table(); |
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 $rb_count =0; |
my ($navmap,@sequences) = |
my ($navmap,@sequences) = |
&Apache::lonstatistics::selected_sequences_with_assessments('all'); |
&Apache::lonstatistics::selected_sequences_with_assessments('all'); |
Line 166 sub problem_selector {
|
Line 177 sub problem_selector {
|
} |
} |
$seq_str .= &Apache::loncommon::start_data_table_row(). |
$seq_str .= &Apache::loncommon::start_data_table_row(). |
($symbmode? |
($symbmode? |
'<td><input type="radio" id="'.$rb_count.'" name="symb" value="'.&HTML::Entities::encode($res->symb,'<>&"').'" '.$checked.' /></td>' |
'<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>}). |
: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="'.$prefix.$rb_count.'">'.$resptype.'</label></td>'. |
'<td><label for="'.$rb_count.'">'.$title.'</label>'; |
'<td><label for="'.$prefix.$rb_count.'">'.$title.'</label>'; |
if (scalar(@response_ids) > 1) { |
if (scalar(@response_ids) > 1) { |
$seq_str .= &mt('response').' '.$respid; |
$seq_str .= &mt('response').' '.$respid; |
} |
} |
Line 184 sub problem_selector {
|
Line 197 sub problem_selector {
|
} |
} |
if ($seq_str ne '') { |
if ($seq_str ne '') { |
$Str .= &Apache::loncommon::start_data_table_header_row(). |
$Str .= &Apache::loncommon::start_data_table_header_row(). |
'<th colspan="3">'.$seq->compTitle.'</th>'. |
'<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; |
&Apache::loncommon::end_data_table_header_row()."\n".$seq_str; |
if (defined($sequence_addendum)) { |
if (defined($sequence_addendum)) { |
$Str .= &Apache::loncommon::start_data_table_header_row(). |
$Str .= &Apache::loncommon::start_data_table_header_row(). |
Line 193 sub problem_selector {
|
Line 208 sub problem_selector {
|
&Apache::loncommon::end_data_table_header_row()."\n"; |
&Apache::loncommon::end_data_table_header_row()."\n"; |
} |
} |
} |
} |
|
|
} |
} |
$Str .= &Apache::loncommon::end_data_table()."\n"; |
$Str .= &Apache::loncommon::end_data_table().&Apache::loncommon::end_scrollbox()."\n"; |
return $Str; |
return $Str; |
} |
} |
|
|
Line 700 sub GetStudentAnswers {
|
Line 716 sub GetStudentAnswers {
|
# Read in the cache (if it exists) before we start timing things. |
# Read in the cache (if it exists) before we start timing things. |
&Apache::lonstathelpers::ensure_proper_cache($resource->{'symb'}); |
&Apache::lonstathelpers::ensure_proper_cache($resource->{'symb'}); |
# Open progress window |
# Open progress window |
my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin |
my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,scalar(@$Students)); |
($r,'Student Answer Compilation Status', |
|
'Student Answer Compilation Progress', scalar(@$Students), |
|
$status_type,undef,$formname,$inputname); |
|
$r->rflush(); |
$r->rflush(); |
foreach my $student (@$Students) { |
foreach my $student (@$Students) { |
last if ($c->aborted()); |
last if ($c->aborted()); |
Line 988 prior to every analysis lookup.
|
Line 1001 prior to every analysis lookup.
|
sub ensure_proper_cache { |
sub ensure_proper_cache { |
my ($symb) = @_; |
my ($symb) = @_; |
my $cid = $env{'request.course.id'}; |
my $cid = $env{'request.course.id'}; |
my $new_filename = '/home/httpd/perl/tmp/'. |
my $new_filename = LONCAPA::tempdir() . |
'problemanalysis_'.$cid.'_analysis_cache.db'; |
'problemanalysis_'.$cid.'_analysis_cache.db'; |
if (! defined($cache_filename) || |
if (! defined($cache_filename) || |
$cache_filename ne $new_filename || |
$cache_filename ne $new_filename || |
Line 1476 sub gather_full_student_data {
|
Line 1489 sub gather_full_student_data {
|
my @Students = @Apache::lonstatistics::Students; |
my @Students = @Apache::lonstatistics::Students; |
# |
# |
# Open the progress window |
# Open the progress window |
my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin |
my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,scalar(@Students)); |
($r,&mt('Student Data Compilation Status'), |
|
&mt('Student Data Compilation Progress'), scalar(@Students), |
|
$status_type,undef,$formname,$inputname); |
|
# |
# |
while (my $student = shift @Students) { |
while (my $student = shift @Students) { |
return if ($c->aborted()); |
return if ($c->aborted()); |