version 1.539, 2015/09/14 13:45:19
|
version 1.565, 2019/11/04 13:21:25
|
Line 67 use lib '/home/httpd/lib/perl/';
|
Line 67 use lib '/home/httpd/lib/perl/';
|
use LONCAPA; |
use LONCAPA; |
|
|
BEGIN { |
BEGIN { |
&Apache::lonxml::register('Apache::structuretags',('block','languageblock','translated','instructorcomment','while','randomlist','problem','library','web','tex','part','preduedate','postanswerdate','solved','notsolved','problemtype','startpartmarker','startouttext','endpartmarker','endouttext','simpleeditbutton','definetag')); |
&Apache::lonxml::register('Apache::structuretags',('block','languageblock','translated','instructorcomment','while','randomlist','problem','library','web','print','tex','part','preduedate','postanswerdate','solved','notsolved','problemtype','startpartmarker','startouttext','endpartmarker','endouttext','simpleeditbutton','definetag')); |
} |
} |
|
|
|
|
Line 192 sub end_web {
|
Line 192 sub end_web {
|
return ''; |
return ''; |
} |
} |
|
|
|
sub start_print { |
|
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
|
if ($target ne 'edit' && $target ne 'modified') { |
|
if ($target ne 'tex') { |
|
my $skip = &Apache::lonxml::get_all_text("/print",$parser,$style); |
|
&Apache::lonxml::debug("skipping ahead :$skip: $$parser[-1]"); |
|
} |
|
} elsif ($target eq "edit") { |
|
my $bodytext = &Apache::lonxml::get_all_text_unbalanced("/print",$parser); |
|
my $result = &Apache::edit::tag_start($target,$token); |
|
$result .= &Apache::edit::editfield($token->[1],$bodytext,'',80,1); |
|
return $result; |
|
} elsif ($target eq "modified") { |
|
return $token->[4].&Apache::edit::modifiedfield("/print",$parser); |
|
} |
|
return ''; |
|
} |
|
|
|
sub end_print { |
|
return ''; |
|
} |
|
|
sub start_tex { |
sub start_tex { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my $result=''; |
my $result=''; |
Line 226 sub end_tex {
|
Line 248 sub end_tex {
|
sub homework_js { |
sub homework_js { |
my ($postsubmit,$timeout); |
my ($postsubmit,$timeout); |
if (($env{'request.course.id'}) && ($env{'request.state'} ne 'construct')) { |
if (($env{'request.course.id'}) && ($env{'request.state'} ne 'construct')) { |
my $crstype; |
my $crstype = &Apache::loncommon::course_type(); |
if (&Apache::loncommon::course_type() eq 'Community') { |
if ($crstype eq 'Community') { |
$crstype = 'community'; |
$crstype = 'community'; |
|
} elsif ($crstype eq 'Placement') { |
|
$crstype = 'placement'; |
} else { |
} else { |
if ($env{'course.'.$env{'request.course.id'}.'.internal.coursecode'}) { |
if ($env{'course.'.$env{'request.course.id'}.'.internal.coursecode'}) { |
$crstype = 'official'; |
$crstype = 'official'; |
Line 342 var postsubmit = '$postsubmit';
|
Line 366 var postsubmit = '$postsubmit';
|
submithandled = 1; |
submithandled = 1; |
\$( "#msg_"+buttonId ).css({"display": "inline","background-color": "#87cefa", |
\$( "#msg_"+buttonId ).css({"display": "inline","background-color": "#87cefa", |
"color": "black","padding": "2px"}) ; |
"color": "black","padding": "2px"}) ; |
if (( \$(this.form).id == "LC_page" ) && (\$('input[name="all_submit"]').length )) { |
if (( \$(this.form).attr("id") == "LC_page" ) && (\$('input[name="all_submit"]').length )) { |
if (buttonId != "all_submit") { |
if (buttonId != "all_submit") { |
\$( ".LC_status_"+buttonId ).hide(); |
\$( ".LC_status_"+buttonId ).hide(); |
if (( "#"+buttonId+"_pressed" ).length) { |
} |
\$( "#"+buttonId+"_pressed" ).val( "1" ); |
if (( "#"+buttonId+"_pressed" ).length) { |
} |
\$( "#"+buttonId+"_pressed" ).val( "1" ); |
} |
} |
} else { |
} else { |
\$( ".LC_status_"+buttonId ).hide(); |
\$( ".LC_status_"+buttonId ).hide(); |
Line 360 var postsubmit = '$postsubmit';
|
Line 384 var postsubmit = '$postsubmit';
|
if (timeout > 0) { |
if (timeout > 0) { |
setTimeout(function(){ |
setTimeout(function(){ |
\$( "#msg_"+buttonId ).css({"display": "none"}); |
\$( "#msg_"+buttonId ).css({"display": "none"}); |
if (( \$(this.form).id == "LC_page" ) && (\$('input[name="all_submit"]').length )) { |
if (( \$(this.form).attr("id") == "LC_page" ) && (\$('input[name="all_submit"]').length )) { |
if (buttonId != "all_submit") { |
if (( "#"+buttonId+"_pressed" ).length) { |
if (( "#"+buttonId+"_pressed" ).length) { |
\$( "#"+buttonId+"_pressed" ).val( "" ); |
\$( "#"+buttonId+"_pressed" ).val( "" ); |
|
} |
|
} |
} |
} |
} |
\$( ".LC_hwk_submit" ).prop( "disabled", false); |
\$( ".LC_hwk_submit" ).prop( "disabled", false); |
Line 390 sub setmode_javascript {
|
Line 412 sub setmode_javascript {
|
<script type="text/javascript"> |
<script type="text/javascript"> |
// <![CDATA[ |
// <![CDATA[ |
function setmode(form,probmode) { |
function setmode(form,probmode) { |
|
var initial = form.problemmode.value; |
form.problemmode.value = probmode; |
form.problemmode.value = probmode; |
form.submit(); |
form.submit(); |
|
form.problemmode.value = initial; |
} |
} |
// ]]> |
// ]]> |
</script> |
</script> |
Line 417 sub page_start {
|
Line 441 sub page_start {
|
$extra_head .= &homework_js(). |
$extra_head .= &homework_js(). |
&Apache::lonhtmlcommon::dragmath_js("EditMathPopup"); |
&Apache::lonhtmlcommon::dragmath_js("EditMathPopup"); |
if (&Apache::lonhtmlcommon::htmlareabrowser()) { |
if (&Apache::lonhtmlcommon::htmlareabrowser()) { |
my %textarea_args = ( |
my %textarea_args; |
|
if (($env{'request.state'} ne 'construct') || |
|
($env{'environment.nocodemirror'})) { |
|
%textarea_args = ( |
dragmath => 'math', |
dragmath => 'math', |
); |
); |
|
} |
$extra_head .= &Apache::lonhtmlcommon::htmlareaselectactive(\%textarea_args); |
$extra_head .= &Apache::lonhtmlcommon::htmlareaselectactive(\%textarea_args); |
} |
} |
my $is_task = ($env{'request.uri'} =~ /\.task$/); |
my $is_task = ($env{'request.uri'} =~ /\.task$/); |
Line 523 sub page_start {
|
Line 551 sub page_start {
|
} elsif (!defined($found{'body'}) |
} elsif (!defined($found{'body'}) |
&& $env{'request.state'} eq 'construct') { |
&& $env{'request.state'} eq 'construct') { |
if ($target eq 'web' || $target eq 'edit') { |
if ($target eq 'web' || $target eq 'edit') { |
# Breadcrumbs for Authoring Space |
unless ($env{'form.inhibitmenu'} eq 'yes') { |
&Apache::lonhtmlcommon::clear_breadcrumbs(); |
# Breadcrumbs for Authoring Space |
&Apache::lonhtmlcommon::add_breadcrumb({ |
&Apache::lonhtmlcommon::clear_breadcrumbs(); |
'text' => 'Authoring Space', |
&Apache::lonhtmlcommon::add_breadcrumb({ |
'href' => &Apache::loncommon::authorspace($env{'request.uri'}), |
'text' => 'Authoring Space', |
}); |
'href' => &Apache::loncommon::authorspace($env{'request.uri'}), |
# breadcrumbs (and tools) will be created |
}); |
# in start_page->bodytag->innerregister |
# breadcrumbs (and tools) will be created |
|
# in start_page->bodytag->innerregister |
|
|
# FIXME Where are we? |
# FIXME Where are we? |
# &Apache::lonhtmlcommon::add_breadcrumb({ |
# &Apache::lonhtmlcommon::add_breadcrumb({ |
# 'text' => 'Problem Editing', # 'Problem Testing' |
# 'text' => 'Problem Editing', # 'Problem Testing' |
# 'href' => '', |
# 'href' => '', |
# }); |
# }); |
$pageheader =&Apache::loncommon::head_subbox( |
$pageheader = &Apache::loncommon::head_subbox( |
&Apache::loncommon::CSTR_pageheader()); |
&Apache::loncommon::CSTR_pageheader()); |
} |
} |
|
} |
} elsif (!defined($found{'body'})) { |
} elsif (!defined($found{'body'})) { |
my %add_entries; |
my %add_entries; |
my $background=&Apache::lonxml::get_param('background',$parstack, |
my $background=&Apache::lonxml::get_param('background',$parstack, |
Line 639 sub get_resource_name {
|
Line 669 sub get_resource_name {
|
sub setup_rndseed { |
sub setup_rndseed { |
my ($safeeval,$target,$probpartlist)=@_; |
my ($safeeval,$target,$probpartlist)=@_; |
my ($symb)=&Apache::lonnet::whichuser(); |
my ($symb)=&Apache::lonnet::whichuser(); |
my ($questiontype,$set_safespace,$rndseed); |
my ($questiontype,$set_safespace,$rndseed,$numtries,$reqtries); |
if ($target eq 'analyze') { |
if ($target eq 'analyze') { |
$questiontype = $env{'form.grade_questiontype'}; |
$questiontype = $env{'form.grade_questiontype'}; |
} |
} |
unless (defined($questiontype)) { |
unless (defined($questiontype)) { |
$questiontype = $Apache::lonhomework::type; |
$questiontype = $Apache::lonhomework::type; |
} |
} |
if ($env{'request.state'} eq "construct" |
if ($Apache::lonhomework::type eq 'randomizetry') { |
|| $symb eq '' |
my $partfortries = $Apache::inputtags::part; |
|| $Apache::lonhomework::type eq 'practice' |
if (ref($probpartlist) eq 'ARRAY') { |
|| $Apache::lonhomework::history{'resource.CODE'}) { |
if ((@{$probpartlist} == 1) && ($probpartlist->[0] ne $Apache::inputtags::part)) { |
|
$partfortries = $probpartlist->[0]; |
|
} |
|
} |
|
$numtries = $Apache::lonhomework::history{"resource.$partfortries.tries"}; |
|
$reqtries = &Apache::lonnet::EXT("resource.$partfortries.randomizeontries"); |
|
} |
|
if (($env{'request.state'} eq "construct") |
|
|| ($symb eq '') |
|
|| ($Apache::lonhomework::type eq 'practice') |
|
|| ($Apache::lonhomework::history{'resource.CODE'}) |
|
|| (($env{'form.code_for_randomlist'}) && ($target eq 'analyze'))) { |
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, |
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, |
['rndseed']); |
['rndseed']); |
$rndseed=$env{'form.rndseed'}; |
$rndseed=$env{'form.rndseed'}; |
Line 658 sub setup_rndseed {
|
Line 699 sub setup_rndseed {
|
if (!$rndseed) { |
if (!$rndseed) { |
$rndseed=time; |
$rndseed=time; |
} |
} |
$env{'form.rndseed'}=$rndseed; |
unless ($env{'form.code_for_randomlist'}) { |
|
$env{'form.rndseed'}=$rndseed; |
|
} |
} |
} |
if (($env{'request.state'} eq "construct") && |
if ((($env{'request.state'} eq "construct") || ($symb eq '')) && |
($Apache::lonhomework::type eq 'randomizetry')) { |
($Apache::lonhomework::type eq 'randomizetry')) { |
my $tries = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.tries"}; |
if ($numtries) { |
if ($tries) { |
if (($reqtries =~ /^\d+$/) && ($reqtries > 1)) { |
$rndseed += $tries; |
my $inc = int($numtries/$reqtries); |
|
$rndseed += $inc; |
|
} else { |
|
$rndseed += $numtries; |
|
} |
} |
} |
$env{'form.'.$Apache::inputtags::part.'.rndseed'}=$rndseed; |
$env{'form.'.$Apache::inputtags::part.'.rndseed'}=$rndseed; |
} |
} |
if ( ($env{'form.resetdata'} eq &mt('New Problem Variation') |
if ( ($env{'form.resetdata'} eq 'new_problem_variation' |
&& $env{'form.submitted'} eq 'yes') || |
&& $env{'form.submitted'} eq 'yes') || |
$env{'form.newrandomization'} eq &mt('New Randomization')) { |
$env{'form.newrandomization'} eq &mt('New Randomization')) { |
srand(time); |
srand(time); |
Line 686 sub setup_rndseed {
|
Line 733 sub setup_rndseed {
|
$rndseed=join(':',&Apache::lonnet::digest($rndseed)); |
$rndseed=join(':',&Apache::lonnet::digest($rndseed)); |
} |
} |
} |
} |
if ($Apache::lonhomework::history{'resource.CODE'}) { |
if (($env{'form.code_for_randomlist'}) && ($target eq 'analyze')) { |
|
$env{'form.CODE'} = $env{'form.code_for_randomlist'}; |
|
$rndseed=&Apache::lonnet::rndseed(); |
|
undef($env{'form.CODE'}); |
|
} elsif ($Apache::lonhomework::history{'resource.CODE'}) { |
$rndseed=&Apache::lonnet::rndseed(); |
$rndseed=&Apache::lonnet::rndseed(); |
} |
} |
$set_safespace = 1; |
$set_safespace = 1; |
Line 698 sub setup_rndseed {
|
Line 749 sub setup_rndseed {
|
} |
} |
unless (($target eq 'analyze') && (defined($rndseed))) { |
unless (($target eq 'analyze') && (defined($rndseed))) { |
$rndseed=&Apache::lonnet::rndseed(); |
$rndseed=&Apache::lonnet::rndseed(); |
my $partfortries = $Apache::inputtags::part; |
my $curr_try = $numtries; |
if (ref($probpartlist) eq 'ARRAY') { |
|
if ((@{$probpartlist} == 1) && ($probpartlist->[0] ne $Apache::inputtags::part)) { |
|
$partfortries = $probpartlist->[0]; |
|
} |
|
} |
|
my $curr_try = $Apache::lonhomework::history{"resource.$partfortries.tries"}; |
|
if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') { |
if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') { |
$curr_try ++; |
$curr_try ++; |
} |
} |
Line 712 sub setup_rndseed {
|
Line 757 sub setup_rndseed {
|
$rndseed = $1; |
$rndseed = $1; |
} |
} |
if ($curr_try) { |
if ($curr_try) { |
my $reqtries = &Apache::lonnet::EXT("resource.$partfortries.randomizeontries"); |
|
if (($reqtries =~ /^\d+$/) && ($reqtries > 1)) { |
if (($reqtries =~ /^\d+$/) && ($reqtries > 1)) { |
my $inc = int(($curr_try-1)/$reqtries); |
my $inc = int(($curr_try-1)/$reqtries); |
$rndseed += $inc; |
$rndseed += $inc; |
Line 770 sub problem_edit_buttons {
|
Line 814 sub problem_edit_buttons {
|
if ($mode eq 'editxml') { |
if ($mode eq 'editxml') { |
$result.=&problem_edit_action_button('subedit','edit','e','Edit',1); |
$result.=&problem_edit_action_button('subedit','edit','e','Edit',1); |
$result.=&problem_edit_action_button('subundo','undoxml','u','Undo',1); |
$result.=&problem_edit_action_button('subundo','undoxml','u','Undo',1); |
$result.=&Apache::lonhtmlcommon::dragmath_button("LC_editxmltext",1); |
if ($env{'environment.nocodemirror'}) { |
|
$result.=&Apache::lonhtmlcommon::dragmath_button("LC_editxmltext",1); |
|
} |
} else { |
} else { |
$result.=&problem_edit_action_button('subeditxml','editxml','x','EditXML',1); |
$result.=&problem_edit_action_button('subeditxml','editxml','x','EditXML',1); |
$result.=&problem_edit_action_button('subundo','undo','u','Undo',1); |
$result.=&problem_edit_action_button('subundo','undo','u','Undo',1); |
Line 943 $show_all
|
Line 989 $show_all
|
</div> |
</div> |
<input type="submit" name="changeproblemmode" value="'.&mt("Change View").'" /> |
<input type="submit" name="changeproblemmode" value="'.&mt("Change View").'" /> |
<input type="submit" name="clear_style_file" accesskey="d" value="'.&mt('Show Default View').'" /> |
<input type="submit" name="clear_style_file" accesskey="d" value="'.&mt('Show Default View').'" /> |
<input type="submit" name="resetdata" accesskey="r" value="'.&mt('Reset Submissions').'" /> |
<button type="submit" name="resetdata" accesskey="r" value="reset_submissions"> |
|
'.&mt('Reset Submissions').'</button> |
</div> |
</div> |
<hr /> |
<hr /> |
<div class="LC_edit_problem_header_randomize_row"> |
<div class="LC_edit_problem_header_randomize_row"> |
Line 976 $show_all
|
Line 1023 $show_all
|
'onclick="javascript:setmode(this.form,'."'edit'".')" />'; |
'onclick="javascript:setmode(this.form,'."'edit'".')" />'; |
$result .= '<input type="button" name="submitmode" accesskey="x" value="'.&mt('EditXML').'" '. |
$result .= '<input type="button" name="submitmode" accesskey="x" value="'.&mt('EditXML').'" '. |
'onclick="javascript:setmode(this.form,'."'editxml'".')" />'; |
'onclick="javascript:setmode(this.form,'."'editxml'".')" />'; |
|
if ($env{'browser.type'} ne 'explorer' || $env{'browser.version'} > 9) { |
|
my $uri = $env{'request.uri'}; |
|
my $daxeurl = '/daxepage'.$uri; |
|
$result .= '<input type="button" value="'.&mt('Edit with Daxe').'" '. |
|
'onclick="window.open(\''.$daxeurl.'\',\'_blank\');" />'; |
|
} |
$result.=' |
$result.=' |
</div> |
</div> |
<hr /> |
<hr /> |
Line 1002 sub initialize_storage {
|
Line 1055 sub initialize_storage {
|
|| $Apache::lonhomework::type eq 'practice') { |
|| $Apache::lonhomework::type eq 'practice') { |
|
|
my $namespace = $symb || $env{'request.uri'}; |
my $namespace = $symb || $env{'request.uri'}; |
if ($env{'form.resetdata'} eq &mt('Reset Submissions') || |
if ($env{'form.resetdata'} eq 'reset_submissions' || |
($env{'form.resetdata'} eq &mt('New Problem Variation') |
($env{'form.resetdata'} eq 'new_problem_variation' |
&& $env{'form.submitted'} eq 'yes') || |
&& $env{'form.submitted'} eq 'yes') || |
$env{'form.newrandomization'} eq &mt('New Randomization')) { |
$env{'form.newrandomization'} eq &mt('New Randomization')) { |
&Apache::lonnet::tmpreset($namespace,'',$domain,$name); |
&Apache::lonnet::tmpreset($namespace,'',$domain,$name); |
Line 1069 sub finalize_storage {
|
Line 1122 sub finalize_storage {
|
delete(@Apache::lonhomework::results{@remove}); |
delete(@Apache::lonhomework::results{@remove}); |
my ($symb,$courseid,$domain,$name) = |
my ($symb,$courseid,$domain,$name) = |
&Apache::lonnet::whichuser($given_symb); |
&Apache::lonnet::whichuser($given_symb); |
|
my ($passback,$ltiscope,$ltimap,$ltisymb,$ltiref,$total,$possible,$dopassback); |
if ($env{'request.state'} eq 'construct' |
if ($env{'request.state'} eq 'construct' |
|| $symb eq '' |
|| $symb eq '' |
|| $Apache::lonhomework::type eq 'practice') { |
|| $Apache::lonhomework::type eq 'practice') { |
Line 1078 sub finalize_storage {
|
Line 1132 sub finalize_storage {
|
$namespace,'',$domain,$name); |
$namespace,'',$domain,$name); |
&Apache::lonxml::debug('Construct Store return message:'.$result); |
&Apache::lonxml::debug('Construct Store return message:'.$result); |
} else { |
} else { |
my ($laststore,$checkedparts,@parts,%postcorrect); |
my ($laststore,$checkedparts,@parts,%postcorrect,%record); |
if (($env{'user.name'} eq $name) && ($env{'user.domain'} eq $domain) && |
if (($env{'user.name'} eq $name) && ($env{'user.domain'} eq $domain) && |
(!$Apache::lonhomework::scantronmode) && (!defined($env{'form.grade_symb'})) && |
(!$Apache::lonhomework::scantronmode) && (!defined($env{'form.grade_symb'})) && |
(!defined($env{'form.grade_courseid'}))) { |
(!defined($env{'form.grade_courseid'}))) { |
|
if ($env{'request.lti.login'}) { |
|
my ($map)=&Apache::lonnet::decode_symb($symb); |
|
$map = &Apache::lonnet::clutter($map); |
|
($passback,$ltiscope,$ltimap,$ltisymb,$ltiref) = |
|
&needs_lti_passback($courseid,$symb,$map); |
|
} |
if ($Apache::lonhomework::history{'version'}) { |
if ($Apache::lonhomework::history{'version'}) { |
$laststore = $Apache::lonhomework::history{'version'}.'='. |
$laststore = $Apache::lonhomework::history{'version'}.'='. |
$Apache::lonhomework::history{'timestamp'}; |
$Apache::lonhomework::history{'timestamp'}; |
} else { |
} else { |
$laststore = '0=0'; |
$laststore = '0=0'; |
} |
} |
my %record = &Apache::lonnet::restore($symb,$courseid,$domain,$name); |
%record = &Apache::lonnet::restore($symb,$courseid,$domain,$name); |
if ($record{'version'}) { |
if ($record{'version'}) { |
my ($newversion,$oldversion,$oldtimestamp); |
my ($newversion,$oldversion,$oldtimestamp); |
if ($Apache::lonhomework::history{'version'}) { |
if ($Apache::lonhomework::history{'version'}) { |
Line 1164 sub finalize_storage {
|
Line 1224 sub finalize_storage {
|
} |
} |
} |
} |
} |
} |
|
if ($passback) { |
|
foreach my $key (keys(%Apache::lonhomework::results)) { |
|
if ($key =~ /^resource\.([^\.]+)\.solved$/) { |
|
my $part = $1; |
|
if ((($Apache::lonhomework::results{$key} =~ /^correct_/) || |
|
($Apache::lonhomework::results{$key} eq 'incorrect_attempted')) && |
|
($Apache::lonhomework::results{"resource.$part.tries"})) { |
|
$dopassback = 1; |
|
last; |
|
} |
|
} |
|
} |
|
} |
|
if (($dopassback) && ($ltiscope eq 'resource') && ($ltisymb eq $symb)) { |
|
$total = 0; |
|
$possible = 0; |
|
my $navmap = Apache::lonnavmaps::navmap->new(); |
|
if (ref($navmap)) { |
|
my $res = $navmap->getBySymb($symb); |
|
if (ref($res)) { |
|
my $partlist = $res->parts(); |
|
if (ref($partlist) eq 'ARRAY') { |
|
foreach my $part (@{$partlist}) { |
|
unless (exists($Apache::lonhomework::results{"resource.$part.solved"})) { |
|
next if ($Apache::lonhomework::record{"resource.$part.solved"} =~/^excused/); |
|
my $weight = &Apache::lonnet::EXT("resource.$part.weight",$symb); |
|
$possible += $weight; |
|
if (($record{'version'}) && (exists($record{"resource.$part.awarded"}))) { |
|
my $awarded = $record{"resource.$part.awarded"}; |
|
if ($awarded) { |
|
$total += $weight * $awarded; |
|
} |
|
} |
|
} |
|
} |
|
} |
|
} |
|
} |
|
foreach my $key (keys(%Apache::lonhomework::results)) { |
|
if ($key =~ /^resource\.([^\.]+)\.awarded$/) { |
|
my $part = $1; |
|
my $weight = &Apache::lonnet::EXT("resource.$part.weight",$symb); |
|
$possible += $weight; |
|
my $awarded = $Apache::lonhomework::results{$key}; |
|
if ($awarded) { |
|
$total += $weight * $awarded; |
|
} |
|
} |
|
} |
|
} |
&Apache::lonxml::debug('Store return message:'.$result); |
&Apache::lonxml::debug('Store return message:'.$result); |
&store_aggregates($symb,$courseid); |
&store_aggregates($symb,$courseid); |
|
if ($dopassback) { |
|
my $scoreformat = 'decimal'; |
|
if (ref($ltiref) eq 'HASH') { |
|
if ($ltiref->{'scoreformat'} =~ /^(decimal|ratio|percentage)$/) { |
|
$scoreformat = $1; |
|
} |
|
} |
|
my $ltigrade = { |
|
'lti' => $ltiref, |
|
'cid' => $courseid, |
|
'uname' => $env{'user.name'}, |
|
'udom' => $env{'user.domain'}, |
|
'pbid' => $env{'request.lti.passbackid'}, |
|
'pburl' => $env{'request.lti.passbackurl'}, |
|
'scope' => $ltiscope, |
|
'ltimap' => $ltimap, |
|
'ltisymb' => $ltisymb, |
|
'format' => $scoreformat, |
|
}; |
|
if ($ltiscope eq 'resource') { |
|
$ltigrade->{'total'} = $total; |
|
$ltigrade->{'possible'} = $possible; |
|
} |
|
push(@Apache::lonhomework::ltipassback,$ltigrade); |
|
} |
} |
} |
} else { |
} else { |
&Apache::lonxml::debug('Nothing to store'); |
&Apache::lonxml::debug('Nothing to store'); |
Line 1173 sub finalize_storage {
|
Line 1308 sub finalize_storage {
|
return $result; |
return $result; |
} |
} |
|
|
|
sub needs_lti_passback { |
|
my ($courseid,$symb,$map) = @_; |
|
if (($env{'request.lti.passbackid'}) && ($env{'request.lti.passbackurl'})) { |
|
if ($courseid =~ /^($LONCAPA::match_domain)_($LONCAPA::match_courseid)$/) { |
|
my ($cdom,$cnum) = ($1,$2); |
|
my %lti = &Apache::lonnet::get_domain_lti($cdom,'provider'); |
|
if (ref($lti{$env{'request.lti.login'}}) eq 'HASH') { |
|
if ($lti{$env{'request.lti.login'}}{'passback'}) { |
|
my ($ltiscope,$ltiuri,$ltisymb) = |
|
&LONCAPA::ltiutils::lti_provider_scope($env{'request.lti.uri'}, |
|
$cdom,$cnum,1); |
|
my ($passback,$ltimap); |
|
if ($ltiscope eq 'resource') { |
|
if ($ltisymb eq $symb) { |
|
$passback = 1; |
|
} |
|
} elsif ($ltiscope eq 'map') { |
|
if ($ltiuri eq $map) { |
|
$passback = 1; |
|
$ltimap = $map; |
|
} |
|
} elsif ($ltiscope eq 'course') { |
|
if (($env{'request.lti.uri'} eq "/$cdom/$cnum") || ($env{'request.lti.uri'} eq '')) { |
|
$passback = 1; |
|
} |
|
} |
|
return ($passback,$ltiscope,$ltimap,$ltisymb,$lti{$env{'request.lti.login'}}); |
|
} |
|
} |
|
} |
|
} |
|
return; |
|
} |
|
|
=pod |
=pod |
|
|
=item check_correctness_changes() |
=item check_correctness_changes() |
Line 1278 sub store_aggregates {
|
Line 1447 sub store_aggregates {
|
} else { |
} else { |
$anoncounter{$symb."\0".$part} = 1; |
$anoncounter{$symb."\0".$part} = 1; |
} |
} |
my $needsrelease = $Apache::lonnet::needsrelease{'parameter:type:'.$Apache::lonhomework::results{'resource.'.$part.'.type'}.':'}; |
my $needsrelease = $Apache::lonnet::needsrelease{'parameter:type:'.$Apache::lonhomework::results{'resource.'.$part.'.type'}.'::'}; |
if ($needsrelease) { |
if ($needsrelease) { |
my $curr_required = $env{'course.'.$env{'request.course.id'}.'.internal.releaserequired'}; |
my $curr_required = $env{'course.'.$env{'request.course.id'}.'.internal.releaserequired'}; |
if ($curr_required eq '') { |
if ($curr_required eq '') { |
Line 1307 sub store_aggregates {
|
Line 1476 sub store_aggregates {
|
} |
} |
} |
} |
|
|
|
sub access_status_msg { |
|
my ($mode,$status,$symb,$target,$ipused,$accessmsg) = @_; |
|
my $msg; |
|
if ($target eq 'web') { |
|
if ($status eq 'UNAVAILABLE') { |
|
$msg.='<p class="LC_error">'.&mt('Unable to determine if this resource is open due to network problems. Please try again later.').'</p>'; |
|
} elsif ($status eq 'NOT_IN_A_SLOT') { |
|
$msg.='<p class="LC_warning">'.&mt('You are not currently signed up to work at this time and/or place.').'</p>'; |
|
} elsif (($status eq 'RESERVABLE') || ($status eq 'RESERVABLE_LATER') || |
|
($status eq 'NOTRESERVABLE')) { |
|
$msg.='<p class="LC_warning">'.&mt('Access requires reservation to work at specific time/place.').'</p>'; |
|
} elsif ($status ne 'NOT_YET_VIEWED') { |
|
$msg.='<p class="LC_warning">'.&mt('Not open to be viewed').'</p>'; |
|
} |
|
if ($status eq 'CLOSED' || $status eq 'INVALID_ACCESS') { |
|
$msg.=&mt('The problem ').$accessmsg; |
|
} elsif ($status eq 'UNCHECKEDOUT') { |
|
$msg.=&checkout_msg(); |
|
} elsif ($status eq 'NOT_YET_VIEWED') { |
|
$msg.=&firstaccess_msg($accessmsg,$symb); |
|
} elsif ($status eq 'NOT_IN_A_SLOT') { |
|
$msg.=&Apache::bridgetask::add_request_another_attempt_button("Sign up for time to work"); |
|
} elsif ($status eq 'RESERVABLE') { |
|
$msg.=&mt('Available to make a reservation.').' '.&mt('Reservation window closes [_1].', |
|
&Apache::lonnavmaps::timeToHumanString($accessmsg,'end')). |
|
'<br />'. |
|
&Apache::bridgetask::add_request_another_attempt_button("Sign up for time to work"); |
|
} elsif ($status eq 'RESERVABLE_LATER') { |
|
$msg.=&mt('Window to make a reservation will open [_1].', |
|
&Apache::lonnavmaps::timeToHumanString($accessmsg,'start')); |
|
} elsif ($status eq 'NOTRESERVABLE') { |
|
$msg.=&mt('Not available to make a reservation.'); |
|
} elsif ($status eq 'NEED_DIFFERENT_IP') { |
|
if ($ipused) { |
|
$msg.=&mt('You must use the same computer ([_1]) you used when you first accessed this resource using your time/place-based reservation.',"IP: $ipused"); |
|
} else { |
|
$msg.=&mt('Each student must use a different computer to access this resource at this time and/or place.').'<br />'. |
|
&mt('Somebody else has already used this particular computer for that purpose.'); |
|
} |
|
} |
|
$msg.='<br />'; |
|
} elsif ($target eq 'tex') { |
|
my $startminipage = ($env{'form.problem_split'}=~/yes/i)? '' |
|
: '\begin{minipage}{\textwidth}'; |
|
|
|
$msg ='\noindent \vskip 1 mm '. |
|
$startminipage.'\vskip 0 mm'; |
|
if ($status eq 'UNAVAILABLE') { |
|
$msg.=&mt('Unable to determine if this resource is open due to network problems. Please try again later.').'\vskip 0 mm '; |
|
} else { |
|
$msg.=&mt('Problem is not open to be viewed. It')." $accessmsg \\vskip 0 mm "; |
|
} |
|
} |
|
return $msg; |
|
} |
|
|
|
sub checkin_prompt { |
|
my ($target,$slot_name,$slot,$type) = @_; |
|
my $result; |
|
if ($target eq 'web') { |
|
$result = &Apache::bridgetask::proctor_validation_screen($slot); |
|
} elsif ($target eq 'grade') { |
|
if (!&Apache::bridgetask::proctor_check_auth($slot_name,$slot,$type)) { |
|
$result = &mt('An error occurred during check-in'); |
|
} |
|
} |
|
return $result; |
|
} |
|
|
|
sub selfcheckin_resource { |
|
my ($resource_due,$slot_name,$slot,$symb) = @_; |
|
if ($slot_name ne '') { |
|
my $checked_in = |
|
$Apache::lonhomework::history{'resource.0.checkedin'}; |
|
if ($checked_in eq '') { |
|
# unproctored slot access, self checkin |
|
my $needsiptied; |
|
if (ref($slot)) { |
|
$needsiptied = $slot->{'iptied'}; |
|
} |
|
my $check = &Apache::bridgetask::check_in('problem',undef,undef, |
|
$slot_name,$needsiptied); |
|
if ($check =~ /^error: /) { |
|
&Apache::lonnet::logthis("Error during self-checkin of problem (symb: $symb) using slot: $slot_name"); |
|
} else { |
|
$checked_in = $Apache::lonhomework::results{"resource.0.checkedin"}; |
|
} |
|
} |
|
if ((ref($slot) eq 'HASH') && ($checked_in ne '')) { |
|
if ($slot->{'starttime'} < time()) { |
|
if (!$resource_due) { |
|
$resource_due = $slot->{'endtime'}; |
|
} elsif ($slot->{'endtime'} < $resource_due) { |
|
$resource_due = $slot->{'endtime'}; |
|
} |
|
} |
|
} |
|
} |
|
return $resource_due; |
|
} |
|
|
sub checkout_msg { |
sub checkout_msg { |
my %lt=&Apache::lonlocal::texthash( |
my %lt=&Apache::lonlocal::texthash( |
'resource'=>'The resource needs to be checked out', |
'resource'=>'The resource needs to be checked out', |
Line 1510 sub start_problem {
|
Line 1780 sub start_problem {
|
my $status; |
my $status; |
my $accessmsg; |
my $accessmsg; |
my $resource_due; |
my $resource_due; |
|
my $ipused; |
|
|
my $name= &get_resource_name($parstack,$safeeval); |
my $name= &get_resource_name($parstack,$safeeval); |
my ($result,$form_tag_start,$slot_name,$slot,$probpartlist); |
my ($result,$form_tag_start,$slot_name,$slot,$probpartlist,$firstaccres); |
|
|
if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || |
if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || |
$target eq 'tex') { |
$target eq 'tex') { |
if ($env{'form.markaccess'}) { |
if ($env{'form.markaccess'}) { |
my @interval=&Apache::lonnet::EXT("resource.0.interval"); |
my @interval=&Apache::lonnet::EXT("resource.0.interval"); |
my ($timelimit) = split(/_/,$interval[0]); |
my ($timelimit) = split(/_/,$interval[0]); |
&Apache::lonnet::set_first_access($interval[1],$timelimit); |
my $is_set = &Apache::lonnet::set_first_access($interval[1],$timelimit); |
|
unless (($is_set eq 'ok') || ($is_set eq 'already_set')) { |
|
$firstaccres = $is_set; |
|
} |
} |
} |
|
|
($status,$accessmsg,$slot_name,$slot) = |
|
&Apache::lonhomework::check_slot_access('0','problem'); |
|
push (@Apache::inputtags::status,$status); |
|
} |
} |
|
|
if ($target eq 'web' || $target eq 'webgrade' || $target eq 'tex' |
if ($target eq 'web' || $target eq 'webgrade' || $target eq 'tex' |
Line 1532 sub start_problem {
|
Line 1802 sub start_problem {
|
($result,$form_tag_start,$probpartlist) = |
($result,$form_tag_start,$probpartlist) = |
&page_start($target,$token,$tagstack,$parstack,$parser,$safeeval, |
&page_start($target,$token,$tagstack,$parstack,$parser,$safeeval, |
$name); |
$name); |
} elsif (($target eq 'grade') && ($Apache::lonhomework::type eq 'randomizetry')) { |
} elsif ((($target eq 'grade') && ($Apache::lonhomework::type eq 'randomizetry')) || |
|
($target eq 'answer')) { |
my ($symb)= &Apache::lonnet::whichuser(); |
my ($symb)= &Apache::lonnet::whichuser(); |
my $navmap = Apache::lonnavmaps::navmap->new(); |
my $navmap = Apache::lonnavmaps::navmap->new(); |
if (ref($navmap)) { |
if (ref($navmap)) { |
Line 1543 sub start_problem {
|
Line 1814 sub start_problem {
|
} |
} |
} |
} |
|
|
|
if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || |
|
$target eq 'tex') { |
|
|
|
my ($symb)= &Apache::lonnet::whichuser(); |
|
($status,$accessmsg,$slot_name,$slot,$ipused) = |
|
&Apache::lonhomework::check_slot_access('0','problem',$symb,$probpartlist); |
|
push (@Apache::inputtags::status,$status); |
|
} |
|
|
if ($target eq 'tex' and $env{'request.symb'} =~ m/\.page_/) {$result='';} |
if ($target eq 'tex' and $env{'request.symb'} =~ m/\.page_/) {$result='';} |
|
|
if ($target eq 'analyze') { my $rndseed=&setup_rndseed($safeeval,$target); } |
if ($target eq 'analyze') { my $rndseed=&setup_rndseed($safeeval,$target); } |
Line 1568 sub start_problem {
|
Line 1848 sub start_problem {
|
|
|
if ($env{'request.state'} ne "construct" && |
if ($env{'request.state'} ne "construct" && |
($symb eq '' || $Apache::lonhomework::type eq 'practice')) { |
($symb eq '' || $Apache::lonhomework::type eq 'practice')) { |
|
my $rndseedval = $rndseed; |
|
if (($symb eq '') && ($Apache::lonhomework::type eq 'randomizetry')) { |
|
$rndseedval = $env{'form.rndseed'}; |
|
} |
$form_tag_start.='<input type="hidden" name="rndseed" value="'. |
$form_tag_start.='<input type="hidden" name="rndseed" value="'. |
$rndseed.'" />'. |
$rndseedval.'" />'. |
'<input type="submit" name="resetdata" |
'<button type="submit" name="resetdata" |
value="'.&mt('New Problem Variation').'" />'; |
value="new_problem_variation">'.&mt('New Problem Variation').'</button>'; |
if (exists($env{'form.username'})) { |
if (exists($env{'form.username'})) { |
$form_tag_start.= |
$form_tag_start.= |
'<input type="hidden" name="username" |
'<input type="hidden" name="username" |
Line 1591 sub start_problem {
|
Line 1875 sub start_problem {
|
$form_tag_start.=&practice_problem_header(); |
$form_tag_start.=&practice_problem_header(); |
} |
} |
$form_tag_start.='<hr />'; |
$form_tag_start.='<hr />'; |
} elsif (($env{'request.state'} ne "construct") && |
} |
($Apache::lonhomework::type eq 'randomizetry') && |
if (($env{'request.state'} ne "construct") && |
($status eq 'CAN_ANSWER')) { |
($Apache::lonhomework::type eq 'randomizetry') && |
|
($status eq 'CAN_ANSWER') && |
|
($env{'course.'.$env{'request.course.id'}.'.type'} ne 'Placement') && |
|
(!$env{'request.role.adv'})) { |
|
# "New Problem Variation Each Try" header suppressed for Placement Tests, unless course personnel. |
my $reqtries = &Apache::lonnet::EXT("resource.$Apache::inputtags::part.randomizeontries"); |
my $reqtries = &Apache::lonnet::EXT("resource.$Apache::inputtags::part.randomizeontries"); |
my $problemstatus = &get_problem_status($Apache::inputtags::part); |
my $problemstatus = &get_problem_status($Apache::inputtags::part); |
$form_tag_start.=&randomizetry_problem_header($problemstatus,$reqtries); |
$form_tag_start.=&randomizetry_problem_header($problemstatus,$reqtries); |
Line 1613 sub start_problem {
|
Line 1901 sub start_problem {
|
( $status eq 'NOTRESERVABLE') || |
( $status eq 'NOTRESERVABLE') || |
( $status eq 'RESERVABLE') || |
( $status eq 'RESERVABLE') || |
( $status eq 'RESERVABLE_LATER') || |
( $status eq 'RESERVABLE_LATER') || |
( $status eq 'INVALID_ACCESS')) { |
( $status eq 'INVALID_ACCESS') || |
|
( $status eq 'NEED_DIFFERENT_IP')) { |
my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser, |
my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser, |
$style); |
$style); |
if ( $target eq "web" ) { |
if (($status eq 'NOT_YET_VIEWED') && ($firstaccres)) { |
my $msg; |
$result .= '<p class="LC_error">'. |
if ($status eq 'UNAVAILABLE') { |
&mt('A problem occurred when trying to start the timer.').'</p>'; |
$msg.='<p class="LC_error">'.&mt('Unable to determine if this resource is open due to network problems. Please try again later.').'</p>'; |
} |
} elsif ($status eq 'NOT_IN_A_SLOT') { |
$result .= &access_status_msg('problem',$status,$symb,$target,$ipused,$accessmsg); |
$msg.='<p class="LC_warning">'.&mt('You are not currently signed up to work at this time and/or place.').'</p>'; |
|
} elsif (($status eq 'RESERVABLE') || ($status eq 'RESERVABLE_LATER') || |
|
($status eq 'NOTRESERVABLE')) { |
|
$msg.='<p class="LC_warning">'.&mt('Access requires reservation to work at specific time/place.').'</p>'; |
|
} elsif ($status ne 'NOT_YET_VIEWED') { |
|
$msg.='<p class="LC_warning">'.&mt('Not open to be viewed').'</p>'; |
|
} |
|
if ($status eq 'CLOSED' || $status eq 'INVALID_ACCESS') { |
|
$msg.=&mt('The problem ').$accessmsg; |
|
} elsif ($status eq 'UNCHECKEDOUT') { |
|
$msg.=&checkout_msg(); |
|
} elsif ($status eq 'NOT_YET_VIEWED') { |
|
$msg.=&firstaccess_msg($accessmsg,$symb); |
|
} elsif ($status eq 'NOT_IN_A_SLOT') { |
|
$msg.=&Apache::bridgetask::add_request_another_attempt_button("Sign up for time to work"); |
|
} elsif ($status eq 'RESERVABLE') { |
|
$msg.=&mt('Available to make a reservation.').' '.&mt('Reservation window closes [_1].', |
|
&Apache::lonnavmaps::timeToHumanString($accessmsg,'end')). |
|
'<br />'. |
|
&Apache::bridgetask::add_request_another_attempt_button("Sign up for time to work"); |
|
} elsif ($status eq 'RESERVABLE_LATER') { |
|
$msg.=&mt('Window to make a reservation will open [_1].', |
|
&Apache::lonnavmaps::timeToHumanString($accessmsg,'start')); |
|
} elsif ($status eq 'NOTRESERVABLE') { |
|
$msg.=&mt('Not available to make a reservation.'); |
|
} |
|
$result.=$msg.'<br />'; |
|
} elsif ($target eq 'tex') { |
|
my $startminipage = ($env{'form.problem_split'}=~/yes/i)? '' |
|
: '\begin{minipage}{\textwidth}'; |
|
$result.='\noindent \vskip 1 mm '. |
|
$startminipage.'\vskip 0 mm'; |
|
if ($status eq 'UNAVAILABLE') { |
|
$result.=&mt('Unable to determine if this resource is open due to network problems. Please try again later.').'\vskip 0 mm '; |
|
} else { |
|
$result.=&mt('Problem is not open to be viewed. It')." $accessmsg \\vskip 0 mm "; |
|
} |
|
} |
|
} elsif ($status eq 'NEEDS_CHECKIN') { |
} elsif ($status eq 'NEEDS_CHECKIN') { |
my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser, |
my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser, |
$style); |
$style); |
if ($target eq 'web') { |
$result .= &checkin_prompt($target,$slot_name,$slot,'problem'); |
$result .= |
|
&Apache::bridgetask::proctor_validation_screen($slot); |
|
} elsif ($target eq 'grade') { |
|
&Apache::bridgetask::proctor_check_auth($slot_name,$slot, |
|
'problem'); |
|
} |
|
} elsif ($target eq 'web') { |
} elsif ($target eq 'web') { |
if ($status eq 'CAN_ANSWER') { |
if ($status eq 'CAN_ANSWER') { |
$resource_due = &Apache::lonhomework::due_date(0, $env{'request.symb'}); |
$resource_due = &Apache::lonhomework::due_date(0, $env{'request.symb'}); |
if ($slot_name ne '') { |
if ($slot_name ne '') { |
my $checked_in = |
$resource_due = &selfcheckin_resource($resource_due,$slot_name,$slot, |
$Apache::lonhomework::history{'resource.0.checkedin'}; |
$env{'request.symb'}); |
if ($checked_in eq '') { |
|
# unproctored slot access, self checkin |
|
&Apache::bridgetask::check_in('problem',undef,undef, |
|
$slot_name); |
|
$checked_in = |
|
$Apache::lonhomework::results{"resource.0.checkedin"}; |
|
} |
|
if ((ref($slot) eq 'HASH') && ($checked_in ne '')) { |
|
if ($slot->{'starttime'} < time()) { |
|
if (!$resource_due) { |
|
$resource_due = $slot->{'endtime'}; |
|
} elsif ($slot->{'endtime'} < $resource_due) { |
|
$resource_due = $slot->{'endtime'}; |
|
} |
|
} |
|
} |
|
} |
} |
if ($resource_due) { |
if ($resource_due) { |
my $time_left = $resource_due - time(); |
my $time_left = $resource_due - time(); |
Line 1703 sub start_problem {
|
Line 1932 sub start_problem {
|
'<input type="hidden" name="submitted" value="yes" />'; |
'<input type="hidden" name="submitted" value="yes" />'; |
# create a page header and exit |
# create a page header and exit |
if ($env{'request.state'} eq "construct") { |
if ($env{'request.state'} eq "construct") { |
$result.= &problem_web_to_edit_header($env{'form.rndseed'}); |
if ($env{'form.inhibitmenu'} eq 'yes') { |
|
# error messages can be useful in any case |
|
$result.= &Apache::lonxml::message_location(); |
|
} else { |
|
$result.= &problem_web_to_edit_header($env{'form.rndseed'}); |
|
} |
if ($Apache::lonhomework::type eq 'practice') { |
if ($Apache::lonhomework::type eq 'practice') { |
$result.= '<input type="submit" name="resetdata" '. |
$result.= '<button type="submit" name="resetdata" '. |
'value="'.&mt('New Problem Variation').'" />'. |
'value="new_problem_variation">'.&mt('New Problem Variation').'</button>'. |
&practice_problem_header().'<hr />'; |
&practice_problem_header().'<hr />'; |
|
} elsif ($Apache::lonhomework::type eq 'randomizetry') { |
|
my $reqtries = &Apache::lonnet::EXT("resource.$Apache::inputtags::part.randomizeontries"); |
|
my $problemstatus = &get_problem_status($Apache::inputtags::part); |
|
$result.=&randomizetry_problem_header($problemstatus,$reqtries); |
} |
} |
} |
} |
# if we are viewing someone else preserve that info |
# if we are viewing someone else preserve that info |
Line 1729 sub start_problem {
|
Line 1967 sub start_problem {
|
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
$result .= 'INSERTTEXFRONTMATTERHERE'; |
$result .= 'INSERTTEXFRONTMATTERHERE'; |
$result .= &select_metadata_hyphenation(); |
$result .= &select_metadata_hyphenation(); |
|
|
|
|
} |
} |
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
$result .= $form_tag_start.&problem_edit_header(); |
$result .= $form_tag_start.&problem_edit_header(); |
Line 1889 sub end_problem {
|
Line 2125 sub end_problem {
|
# Added separately at end of this routine, after added |
# Added separately at end of this routine, after added |
# <script></script> so document will be valid xhtml. |
# <script></script> so document will be valid xhtml. |
# |
# |
$result.= &Apache::loncommon::end_page({'discussion' => 1, |
my $showdisc = 1; |
|
if (($env{'course.'.$env{'request.course.id'}.'.type'} eq 'Placement') && |
|
(!$env{'request.role.adv'})) { |
|
# For Placement Tests footer with "Post Discussion" and "Send Feedback" links is suppressed. |
|
$showdisc = 0; |
|
my ($symb)= &Apache::lonnet::whichuser(); |
|
if ($symb) { |
|
my $navmap = Apache::lonnavmaps::navmap->new(); |
|
if (ref($navmap)) { |
|
my $hastries = &Apache::lonplacementtest::has_tries($symb,$navmap); |
|
# For Placement Tests test status is displayed if this is the last resource in the course |
|
# and there are no tries left |
|
unless ($hastries) { |
|
if (&Apache::lonplacementtest::is_lastres($symb,$navmap)) { |
|
my ($score,$incomplete) = |
|
&Apache::lonplacementtest::check_completion(undef,undef,1); |
|
if (!$incomplete) { |
|
$result .= &Apache::lonplacementtest::showresult(1,1); |
|
} elsif ($incomplete < 100) { |
|
$result.= &Apache::lonplacementtest::showincomplete($incomplete,1); |
|
} |
|
} else { |
|
# For Placement Tests score is displayed if test has just been completed |
|
my ($score,$incomplete) = &Apache::lonplacementtest::check_completion(undef,undef,1); |
|
if (!$incomplete) { |
|
$result.= &Apache::lonplacementtest::showresult(1,1); |
|
} |
|
} |
|
} |
|
} |
|
} |
|
} |
|
$result.= &Apache::loncommon::end_page({'discussion' => $showdisc, |
'notbody' => 1}); |
'notbody' => 1}); |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
my $endminipage = ''; |
my $endminipage = ''; |
Line 1926 sub end_problem {
|
Line 2194 sub end_problem {
|
@Apache::inputtags::response=(); |
@Apache::inputtags::response=(); |
$result=&Apache::response::mandatory_part_meta; |
$result=&Apache::response::mandatory_part_meta; |
} |
} |
$result.=&Apache::response::meta_part_order(); |
$result.=&Apache::response::meta_part_order('problem'); |
$result.=&Apache::response::meta_response_order(); |
$result.=&Apache::response::meta_response_order(); |
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
&Apache::lonxml::debug("in end_problem with $target, edit"); |
&Apache::lonxml::debug("in end_problem with $target, edit"); |
Line 1986 sub start_library {
|
Line 2254 sub start_library {
|
'<input type="hidden" name="submitted" value="yes" />'; |
'<input type="hidden" name="submitted" value="yes" />'; |
$result.=&problem_web_to_edit_header($rndseed); |
$result.=&problem_web_to_edit_header($rndseed); |
if ($Apache::lonhomework::type eq 'practice') { |
if ($Apache::lonhomework::type eq 'practice') { |
$result.= '<input type="submit" name="resetdata" '. |
$result.= '<button type="submit" name="resetdata" '. |
'value="'.&mt('New Problem Variation').'" />'. |
'value="new_problem_variation">'.&mt('New Problem Variation').'</button>'. |
&practice_problem_header().'<hr />'; |
&practice_problem_header().'<hr />'; |
} |
} |
} |
} |
return $result; |
return $result; |
Line 2003 sub end_library {
|
Line 2271 sub end_library {
|
&& ($#$tagstack eq 0 && $$tagstack[0] eq 'library') |
&& ($#$tagstack eq 0 && $$tagstack[0] eq 'library') |
&& $env{'request.state'} eq "construct") { |
&& $env{'request.state'} eq "construct") { |
$result.='</form>'.&Apache::loncommon::end_page({'discussion' => 1}); |
$result.='</form>'.&Apache::loncommon::end_page({'discussion' => 1}); |
|
} elsif ($target eq 'meta') { |
|
$result.=&Apache::response::meta_part_order('library'); |
|
$result.=&Apache::response::meta_response_order(); |
} |
} |
if ( $#$tagstack eq 0 && $$tagstack[0] eq 'library') { |
if ( $#$tagstack eq 0 && $$tagstack[0] eq 'library') { |
&reset_problem_globals('library'); |
&reset_problem_globals('library'); |
Line 2485 sub start_randomlist {
|
Line 2756 sub start_randomlist {
|
} |
} |
if (@randomlist) { |
if (@randomlist) { |
my @idx_arr = (0 .. $#randomlist); |
my @idx_arr = (0 .. $#randomlist); |
&Apache::structuretags::shuffle(\@idx_arr); |
if ($env{'form.code_for_randomlist'}) { |
|
&Apache::structuretags::shuffle(\@idx_arr,$target); |
|
undef($env{'form.code_for_randomlist'}); |
|
} else { |
|
&Apache::structuretags::shuffle(\@idx_arr); |
|
} |
my $bodytext = ''; |
my $bodytext = ''; |
my $show=$#randomlist; |
my $show=$#randomlist; |
my $showarg=&Apache::lonxml::get_param('show',$parstack,$safeeval); |
my $showarg=&Apache::lonxml::get_param('show',$parstack,$safeeval); |
Line 2524 sub start_randomlist {
|
Line 2800 sub start_randomlist {
|
} |
} |
|
|
sub shuffle { |
sub shuffle { |
my $a=shift; |
my ($a,$target) = @_; |
my $i; |
my $i; |
if (ref($a) eq 'ARRAY' && @$a) { |
if (ref($a) eq 'ARRAY' && @$a) { |
&Apache::response::pushrandomnumber(); |
&Apache::response::pushrandomnumber(undef,$target); |
for($i=@$a;--$i;) { |
for($i=@$a;--$i;) { |
my $j=int(&Math::Random::random_uniform() * ($i+1)); |
my $j=int(&Math::Random::random_uniform() * ($i+1)); |
next if $i == $j; |
next if $i == $j; |
Line 2933 sub end_startouttext {
|
Line 3209 sub end_startouttext {
|
.'<td><span class="LC_nobreak">'.&mt('Delete?').' ' |
.'<td><span class="LC_nobreak">'.&mt('Delete?').' ' |
.&Apache::edit::deletelist($target,$token) |
.&Apache::edit::deletelist($target,$token) |
.'</span></td>' |
.'</span></td>' |
.'<td><span id="math_'.$areaid.'">' |
.'<td><span id="math_'.$areaid.'">'; |
.&Apache::lonhtmlcommon::dragmath_button($areaid,1) |
if ($env{'environment.nocodemirror'}) { |
.'</span></td>' |
$result.=&Apache::lonhtmlcommon::dragmath_button($areaid,1); |
|
} else { |
|
$result.=' '; |
|
} |
|
$result.='</span></td>' |
.'<td>' |
.'<td>' |
.&Apache::edit::insertlist($target,$token) |
.&Apache::edit::insertlist($target,$token) |
.'</td>' |
.'</td>' |
Line 3024 sub end_simpleeditbutton {
|
Line 3304 sub end_simpleeditbutton {
|
} |
} |
|
|
sub practice_problem_header { |
sub practice_problem_header { |
return '<span class="LC_info"><h3>'.&mt('Practice Problem').'</h3></span>'. |
return '<h3 class="LC_info">'.&mt('Practice Problem').'</h3>'. |
'<span class="LC_info">'.&mt('Submissions are not permanently recorded'). |
'<span class="LC_info">'.&mt('Submissions are not permanently recorded'). |
'</span>'; |
'</span>'; |
} |
} |
Line 3050 sub randomizetry_problem_header {
|
Line 3330 sub randomizetry_problem_header {
|
$text = &mt('A new variation will be generated after each try until correct or tries limit is reached.'); |
$text = &mt('A new variation will be generated after each try until correct or tries limit is reached.'); |
} |
} |
} |
} |
return '<span class="LC_info"><h3>'.$header.'</h3></span>'. |
return '<h3 class="LC_info">'.$header.'</h3>'. |
'<span class="LC_info">'.$text.'</span><hr />'; |
'<span class="LC_info">'.$text.'</span><hr />'; |
} |
} |
|
|
Line 3081 sub randomizetry_part_header {
|
Line 3361 sub randomizetry_part_header {
|
if ($num > 1) { |
if ($num > 1) { |
$output .= '<hr />'; |
$output .= '<hr />'; |
} |
} |
$output .= '<span class="LC_info"><h4>'.$header.'</h4></span>'. |
$output .= '<h4 class="LC_info">'.$header.'</h4>'. |
'<span class="LC_info">'.$text.'</span><br /><br />'; |
'<span class="LC_info">'.$text.'</span><br /><br />'; |
return $output; |
return $output; |
} |
} |