version 1.66, 2011/03/25 01:34:53
|
version 1.75, 2017/12/18 23:51:19
|
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 '<div class="LC_Box">'. |
'<base href="'.$base.'" />'. |
'<h4 class="LC_hcell">'.&mt('Problem').'</h4>'. |
$rendered_problem. |
'<base href="'.$base.'" />'.$rendered_problem. |
'</td></tr></table>'; |
'</div>'; |
} |
} |
|
|
#################################################### |
#################################################### |
Line 108 sub render_resource {
|
Line 108 sub render_resource {
|
#################################################### |
#################################################### |
#################################################### |
#################################################### |
sub get_resources { |
sub get_resources { |
my ($navmap,$sequence) = @_; |
my ($navmap,$sequence,$include_tools) = @_; |
my @resources = $navmap->retrieveResources($sequence, |
my @resources; |
sub { shift->is_problem(); }, |
if ($include_tools) { |
0,0,0); |
@resources = $navmap->retrieveResources($sequence, |
|
sub { shift->is_gradable(); }, |
|
0,0,0); |
|
} else { |
|
@resources = $navmap->retrieveResources($sequence, |
|
sub { shift->is_problem(); }, |
|
0,0,0); |
|
} |
return @resources; |
return @resources; |
} |
} |
|
|
Line 135 Skips 'survey' problems.
|
Line 142 Skips 'survey' problems.
|
#################################################### |
#################################################### |
#################################################### |
#################################################### |
sub problem_selector { |
sub problem_selector { |
my ($AcceptedResponseTypes,$sequence_addendum,$symbmode,$all,$prefix,$smallbox,$onclick) = @_; |
my ($AcceptedResponseTypes,$sequence_addendum,$symbmode,$all,$prefix,$smallbox,$onclick, |
|
$include_tools) = @_; |
# all: also make sequences selectable |
# all: also make sequences selectable |
# prefix: prefix for all form names |
# prefix: prefix for all form names |
# smallbox: use smaller box |
# smallbox: use smaller box |
Line 143 sub problem_selector {
|
Line 151 sub problem_selector {
|
my $Str; |
my $Str; |
my $jsadd=''; |
my $jsadd=''; |
if ($onclick) { |
if ($onclick) { |
$jsadd="onClick='$onclick'"; |
$jsadd="onclick='$onclick'"; |
} |
} |
$Str = &Apache::loncommon::start_scrollbox(($smallbox?'420px':'620px'), |
$Str = &Apache::loncommon::start_scrollbox(($smallbox?'420px':'620px'), |
($smallbox?'400px':'600px'), |
($smallbox?'400px':'600px'), |
Line 155 sub problem_selector {
|
Line 163 sub problem_selector {
|
return $navmap if (! ref($navmap)); # error |
return $navmap if (! ref($navmap)); # error |
foreach my $seq (@sequences) { |
foreach my $seq (@sequences) { |
my $seq_str = ''; |
my $seq_str = ''; |
foreach my $res (&get_resources($navmap,$seq)) { |
foreach my $res (&get_resources($navmap,$seq,$include_tools)) { |
foreach my $part (@{$res->parts}) { |
foreach my $part (@{$res->parts}) { |
my @response_ids = $res->responseIds($part); |
my (@response_ids,@response_types); |
my @response_types = $res->responseType($part); |
if ($res->is_tool) { |
|
@response_ids = (); |
|
@response_types = ('tool'); |
|
} else { |
|
@response_ids = $res->responseIds($part); |
|
@response_types = $res->responseType($part); |
|
} |
for (my $i=0;$i<scalar(@response_types);$i++){ |
for (my $i=0;$i<scalar(@response_types);$i++){ |
my $respid = $response_ids[$i]; |
my $respid = $response_ids[$i]; |
my $resptype = $response_types[$i]; |
my $resptype = $response_types[$i]; |
Line 286 END
|
Line 300 END
|
END |
END |
if (ref($anoncounter) eq 'HASH') { |
if (ref($anoncounter) eq 'HASH') { |
if (keys(%{$anoncounter}) > 0) { |
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 Anoymous/Named buttons to ensure selections will be either all anonymous [_1]or all named.','\n'); |
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"; |
$checkanonjs = <<"END"; |
|
|
<script type="text/javascript" language="JavaScript"> |
<script type="text/javascript" language="JavaScript"> |
Line 716 sub GetStudentAnswers {
|
Line 731 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 1004 prior to every analysis lookup.
|
Line 1016 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 1388 sub limit_by_time_form {
|
Line 1400 sub limit_by_time_form {
|
$Str .= '<fieldset>'; |
$Str .= '<fieldset>'; |
my $timecheckbox = '<input type="checkbox" name="limit_by_time" '; |
my $timecheckbox = '<input type="checkbox" name="limit_by_time" '; |
if (&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 .= ' />'; |
$timecheckbox .= ' />'; |
$Str .= '<legend><label>'.&mt('[_1] Limit by time',$timecheckbox).'</label></legend>'; |
$Str .= '<legend><label>'.&mt('[_1] Limit by time',$timecheckbox).'</label></legend>'; |
$Str .= &mt('Start Time: [_1]',$startdateform).'<br />'; |
$Str .= &mt('Start Time: [_1]',$startdateform).'<br />'; |
Line 1492 sub gather_full_student_data {
|
Line 1504 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()); |