version 1.326, 2005/12/01 18:46:31
|
version 1.333, 2006/02/10 23:44:53
|
Line 113 sub page_start {
|
Line 113 sub page_start {
|
&Apache::lonhtmlcommon::htmlareaheaders(). |
&Apache::lonhtmlcommon::htmlareaheaders(). |
&Apache::lonhtmlcommon::spellheader(). |
&Apache::lonhtmlcommon::spellheader(). |
&Apache::lonxml::fontsettings(); |
&Apache::lonxml::fontsettings(); |
|
if ($target eq 'edit') { |
|
$head_tag_start.=&Apache::edit::js_change_detection(); |
|
} |
} |
} |
my $body_tag_start; |
my $body_tag_start; |
if (!defined($found{'body'}) && $env{'request.state'} eq 'construct') { |
if (!defined($found{'body'}) && $env{'request.state'} eq 'construct') { |
Line 150 sub page_start {
|
Line 153 sub page_start {
|
$form_tag_start='<form name="lonhomework" enctype="multipart/form-data" method="POST" action="'; |
$form_tag_start='<form name="lonhomework" enctype="multipart/form-data" method="POST" action="'; |
my $uri=$env{'request.uri'}; |
my $uri=$env{'request.uri'}; |
if ($env{'request.enc'}) { $uri=&Apache::lonenc::encrypted($uri); } |
if ($env{'request.enc'}) { $uri=&Apache::lonenc::encrypted($uri); } |
$form_tag_start.=$uri.'">'; |
$form_tag_start.=$uri.'" '; |
|
if ($target eq 'edit') { |
|
$form_tag_start.=&Apache::edit::form_change_detection(); |
|
} |
|
$form_tag_start.='>'; |
} |
} |
return ($result,$head_tag_start,$body_tag_start,$form_tag_start); |
return ($result,$head_tag_start,$body_tag_start,$form_tag_start); |
} |
} |
Line 179 sub setup_rndseed {
|
Line 186 sub setup_rndseed {
|
my ($safeeval)=@_; |
my ($safeeval)=@_; |
my $rndseed; |
my $rndseed; |
my ($symb)=&Apache::lonxml::whichuser(); |
my ($symb)=&Apache::lonxml::whichuser(); |
if ($env{'request.state'} eq "construct" || $symb eq '' || |
if ($env{'request.state'} eq "construct" |
$Apache::lonhomework::history{'resource.CODE'}) { |
|| $symb eq '' |
|
|| $Apache::lonhomework::type eq 'practice' |
|
|| $Apache::lonhomework::history{'resource.CODE'}) { |
&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 225 sub problem_edit_header {
|
Line 234 sub problem_edit_header {
|
&Apache::structuretags::remember_problem_state().' |
&Apache::structuretags::remember_problem_state().' |
<input type="hidden" name="problemmode" value="'.&mt('Edit').'" /> |
<input type="hidden" name="problemmode" value="'.&mt('Edit').'" /> |
<input type="submit" name="problemmode" accesskey="d" value="'.&mt('Discard Edits and View').'" /> |
<input type="submit" name="problemmode" accesskey="d" value="'.&mt('Discard Edits and View').'" /> |
<input type="submit" name="problemmode" accesskey="x" value="'.&mt('EditXML').'" /> |
<input '.&Apache::edit::submit_ask_anyway().' type="submit" name="problemmode" accesskey="x" value="'.&mt('EditXML').'" /> |
<input type="submit" name="Undo" accesskey="u" value="'.&mt('undo').'" /> <hr /> |
<input type="submit" name="Undo" accesskey="u" value="'.&mt('undo').'" /> <hr /> |
<input type="submit" name="submit" accesskey="s" value="'.&mt('Submit Changes and Edit').'" /> |
<input type="submit" name="submit" accesskey="s" value="'.&mt('Submit Changes and Edit').'" /> |
<input type="submit" name="submit" accesskey="v" value="'.&mt('Submit Changes and View').'" /><table><tr><td>'. |
<input type="submit" name="submit" accesskey="v" value="'.&mt('Submit Changes and View').'" /><table><tr><td>'. |
Line 323 sub initialize_storage {
|
Line 332 sub initialize_storage {
|
%Apache::lonhomework::results=(); |
%Apache::lonhomework::results=(); |
%Apache::lonhomework::history=(); |
%Apache::lonhomework::history=(); |
my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser(); |
my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser(); |
if ($env{'request.state'} eq 'construct' || $symb eq '') { |
if ($env{'request.state'} eq 'construct' |
|
|| $symb eq '' |
|
|| $Apache::lonhomework::type eq 'practice') { |
|
|
|
my $namespace = $symb || $env{'request.uri'}; |
|
if ($env{'form.resetdata'} eq &mt('Reset Submissions') || |
|
$env{'form.resetdata'} eq &mt('New Problem Variation') || |
|
$env{'form.newrandomization'} eq &mt('New Randomization')) { |
|
&Apache::lonnet::tmpreset($namespace,'',$domain,$name); |
|
&Apache::lonxml::debug("Attempt reset"); |
|
} |
%Apache::lonhomework::history= |
%Apache::lonhomework::history= |
&Apache::lonnet::tmprestore($env{'request.uri'},'',$domain,$name); |
&Apache::lonnet::tmprestore($namespace,'',$domain,$name); |
my ($temp)=keys %Apache::lonhomework::history ; |
my ($temp)=keys %Apache::lonhomework::history ; |
&Apache::lonxml::debug("Return message of $temp"); |
&Apache::lonxml::debug("Return message of $temp"); |
} else { |
} else { |
Line 349 sub finalize_storage {
|
Line 368 sub finalize_storage {
|
my @remove = grep(/^INTERNAL_/,keys(%Apache::lonhomework::results)); |
my @remove = grep(/^INTERNAL_/,keys(%Apache::lonhomework::results)); |
delete(@Apache::lonhomework::results{@remove}); |
delete(@Apache::lonhomework::results{@remove}); |
my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser(); |
my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser(); |
if ($env{'request.state'} eq 'construct' || $symb eq '') { |
if ($env{'request.state'} eq 'construct' |
|
|| $symb eq '' |
|
|| $Apache::lonhomework::type eq 'practice') { |
|
my $namespace = $symb || $env{'request.uri'}; |
$Apache::lonhomework::results{'rndseed'}=$env{'form.rndseed'}; |
$Apache::lonhomework::results{'rndseed'}=$env{'form.rndseed'}; |
$result=&Apache::lonnet::tmpstore(\%Apache::lonhomework::results, |
$result=&Apache::lonnet::tmpstore(\%Apache::lonhomework::results, |
$env{'request.uri'},'',$domain,$name); |
$namespace,'',$domain,$name); |
&Apache::lonxml::debug('Construct Store return message:'.$result); |
&Apache::lonxml::debug('Construct Store return message:'.$result); |
} else { |
} else { |
$result=&Apache::lonnet::cstore(\%Apache::lonhomework::results, |
$result=&Apache::lonnet::cstore(\%Apache::lonhomework::results, |
Line 549 sub start_problem {
|
Line 571 sub start_problem {
|
defined($env{'form.problemtype'})) { |
defined($env{'form.problemtype'})) { |
$Apache::lonhomework::type=$env{'form.problemtype'}; |
$Apache::lonhomework::type=$env{'form.problemtype'}; |
} |
} |
&Apache::lonxml::debug("Found this to be of type :$Apache::ltonhomework::type:"); |
&Apache::lonxml::debug("Found this to be of type :$Apache::lonhomework::type:"); |
} |
} |
if ($Apache::lonhomework::type eq '' ) { |
if ($Apache::lonhomework::type eq '' ) { |
my $uri=$env{'request.uri'}; |
my $uri=$env{'request.uri'}; |
Line 595 sub start_problem {
|
Line 617 sub start_problem {
|
#handle rand seed in construction space |
#handle rand seed in construction space |
my $rndseed=&setup_rndseed($safeeval); |
my $rndseed=&setup_rndseed($safeeval); |
my ($symb)=&Apache::lonxml::whichuser(); |
my ($symb)=&Apache::lonxml::whichuser(); |
if ($env{'request.state'} ne "construct" && $symb eq '') { |
if ($env{'request.state'} ne "construct" && |
|
($symb eq '' || $Apache::lonhomework::type eq 'practice')) { |
$form_tag_start.='<input type="hidden" name="rndseed" value="'. |
$form_tag_start.='<input type="hidden" name="rndseed" value="'. |
$rndseed.'" />'. |
$rndseed.'" />'. |
'<input type="submit" name="resetdata" |
'<input type="submit" name="resetdata" |
value="'.&mt('New Problem Variation').'" />'. |
value="'.&mt('New Problem Variation').'" />'. |
'<input type="hidden" name="username" |
'<input type="hidden" name="username" |
value="'.$env{'form.username'}.'" />'; |
value="'.$env{'form.username'}.'" />'; |
if ($env{'user.adv'}) { |
if ($env{'request.role.adv'}) { |
$form_tag_start.= |
$form_tag_start.= |
' <label><input type="checkbox" name="showallfoils" '; |
' <label><input type="checkbox" name="showallfoils" '; |
if (defined($env{'form.showallfoils'})) { |
if (defined($env{'form.showallfoils'})) { |
Line 651 sub start_problem {
|
Line 674 sub start_problem {
|
} |
} |
$result.=$msg.'<br />'; |
$result.=$msg.'<br />'; |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
$result.='\begin{document}\noindent \vskip 1 mm \begin{minipage}{\textwidth}\vskip 0 mm'; |
my $startminipage = ($env{'form.problem_split'}=~/yes/i)? '' |
|
: '\begin{minipage}{\textwidth}'; |
|
$result.='\begin{document}\noindent \vskip 1 mm '. |
|
$startminipage.'\vskip 0 mm'; |
if ($status eq 'UNAVAILABLE') { |
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 '; |
$result.=&mt('Unable to determine if this resource is open due to network problems. Please try again later.').'\vskip 0 mm '; |
} else { |
} else { |
Line 712 sub end_problem {
|
Line 738 sub end_problem {
|
|
|
if (!$Apache::lonxml::metamode) { |
if (!$Apache::lonxml::metamode) { |
$result = &Apache::lonxml::endredirection(); #started in &start_problem |
$result = &Apache::lonxml::endredirection(); #started in &start_problem |
|
$Apache::lonxml::post_evaluate=0; |
} |
} |
|
|
if ($target eq 'tex') { |
if ($target eq 'tex') { |
Line 1158 sub start_randomlist {
|
Line 1185 sub start_randomlist {
|
my $result; |
my $result; |
if ($target eq 'answer' || $target eq 'grade' || $target eq 'web' || |
if ($target eq 'answer' || $target eq 'grade' || $target eq 'web' || |
$target eq 'tex' || $target eq 'analyze') { |
$target eq 'tex' || $target eq 'analyze') { |
my $body= &Apache::lonxml::get_all_text("/randomlist",$parser,$style); |
my $body= &Apache::lonxml::get_all_text("/randomlist",$parser); |
my $b_parser= HTML::LCParser->new(\$body); |
my $b_parser= HTML::LCParser->new(\$body); |
$b_parser->xml_mode(1); |
$b_parser->xml_mode(1); |
$b_parser->marked_sections(1); |
$b_parser->marked_sections(1); |
Line 1364 sub end_part {
|
Line 1391 sub end_part {
|
my $result; |
my $result; |
if (!$Apache::lonxml::metamode) { |
if (!$Apache::lonxml::metamode) { |
$result = &Apache::lonxml::endredirection(); # started in &start_part |
$result = &Apache::lonxml::endredirection(); # started in &start_part |
|
$Apache::lonxml::post_evaluate=0; |
} |
} |
if ($target eq 'grade') { |
if ($target eq 'grade') { |
if (($status eq 'CAN_ANSWER' || $Apache::lonhomework::scantronmode) && |
if (($status eq 'CAN_ANSWER' || $Apache::lonhomework::scantronmode) && |
Line 1577 sub start_simpleeditbutton {
|
Line 1605 sub start_simpleeditbutton {
|
my $result=''; |
my $result=''; |
if (($env{'form.simple_edit_button'} ne 'off') && |
if (($env{'form.simple_edit_button'} ne 'off') && |
($target eq 'web') && |
($target eq 'web') && |
(&Apache::lonnet::allowed('srm',$env{'request.course.id'}))) { |
(&Apache::lonnet::allowed('mdc',$env{'request.course.id'}))) { |
my $url=$env{'request.noversionuri'}; |
my $url=$env{'request.noversionuri'}; |
$url=~s/\?.*$//; |
$url=~s/\?.*$//; |
my ($symb) = &Apache::lonxml::whichuser(); |
my ($symb) = &Apache::lonxml::whichuser(); |