version 1.309, 2005/11/03 11:32:00
|
version 1.360, 2006/07/03 02:52:20
|
Line 36 use Apache::File();
|
Line 36 use Apache::File();
|
use Apache::lonmenu; |
use Apache::lonmenu; |
use Apache::lonlocal; |
use Apache::lonlocal; |
use Apache::lonxml; |
use Apache::lonxml; |
|
use Apache::lonenc(); |
use Time::HiRes qw( gettimeofday tv_interval ); |
use Time::HiRes qw( gettimeofday tv_interval ); |
|
use lib '/home/httpd/lib/perl/'; |
|
use LONCAPA; |
|
|
BEGIN { |
BEGIN { |
&Apache::lonxml::register('Apache::structuretags',('block','languageblock','instructorcomment','while','randomlist','problem','library','web','tex','part','preduedate','postanswerdate','solved','notsolved','problemtype','startouttext','endouttext','simpleeditbutton','definetag')); |
&Apache::lonxml::register('Apache::structuretags',('block','languageblock','instructorcomment','while','randomlist','problem','library','web','tex','part','preduedate','postanswerdate','solved','notsolved','problemtype','startouttext','endouttext','simpleeditbutton','definetag')); |
} |
} |
|
|
sub start_web { |
sub start_web { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my $bodytext=&Apache::lonxml::get_all_text("/web",$parser); |
my $bodytext=&Apache::lonxml::get_all_text("/web",$parser,$style); |
if ($target eq 'web') { |
if ($target eq 'web' || $target eq 'webgrade') { |
return $bodytext; |
return $bodytext; |
} |
} |
return ''; |
return ''; |
Line 55 sub end_web {
|
Line 59 sub end_web {
|
} |
} |
|
|
sub start_tex { |
sub start_tex { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my $result=''; |
my $result=''; |
my $bodytext=&Apache::lonxml::get_all_text("/tex",$parser); |
my $bodytext=&Apache::lonxml::get_all_text("/tex",$parser,$style); |
if ($target eq 'tex') { |
if ($target eq 'tex') { |
return $bodytext.' '; |
return $bodytext.' '; |
} |
} |
Line 68 sub end_tex {
|
Line 72 sub end_tex {
|
return ''; |
return ''; |
} |
} |
|
|
sub body_tag_start { |
|
my ($target,$background,$bgcolor)=@_; |
|
my $body_tag_start='<body onload="'.&Apache::lonmenu::loadevents().'" '. |
|
'onunload="'.&Apache::lonmenu::unloadevents().'" '; |
|
if ($env{'browser.imagesuppress'} eq 'on') { $background=''; } |
|
if ($background) { |
|
&Apache::lonxml::extlink($background); |
|
$body_tag_start.='background="'.$background.'" '; |
|
} else { |
|
if (($bgcolor) && ($env{'browser.blackwhite'} ne 'on')) { |
|
$body_tag_start.='bgcolor="'.$bgcolor.'" '; |
|
} else { |
|
$body_tag_start.='bgcolor="#ffffff"'; |
|
} |
|
} |
|
if ($env{'browser.fontenhance'} eq 'on') { |
|
$body_tag_start.=' style="font-size: x-large;" '; |
|
} |
|
$body_tag_start.='>'.&Apache::lonmenu::menubuttons(undef,$target,1); |
|
|
|
&Apache::lontexconvert::jsMath_reset(); |
|
if ($env{'environment.texengine'} eq 'jsMath') { |
|
$body_tag_start.=&Apache::lontexconvert::jsMath_header(); |
|
} |
|
return $body_tag_start; |
|
} |
|
|
|
sub page_start { |
sub page_start { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$name, |
|
$extra_head)=@_; |
my %found; |
my %found; |
foreach my $taginside (@$tagstack) { |
foreach my $taginside (@$tagstack) { |
foreach my $taglookedfor ('html','body','form') { |
foreach my $taglookedfor ('html','body','form') { |
Line 104 sub page_start {
|
Line 82 sub page_start {
|
} |
} |
} |
} |
|
|
my $result; |
if ($target eq 'tex') { |
my $head_tag_start; |
return |
if (!defined($found{'html'})) { |
&Apache::londefdef::start_html($target,$token,$tagstack, |
$result=&Apache::londefdef::start_html($target,$token,$tagstack, |
$parstack,$parser,$safeeval); |
$parstack,$parser,$safeeval); |
} |
$head_tag_start='<head>'.&Apache::lonmenu::registerurl(undef,$target). |
|
&Apache::lonhtmlcommon::htmlareaheaders(). |
my %body_args; |
&Apache::lonhtmlcommon::spellheader(). |
if (defined($found{'html'})) { |
&Apache::lonxml::fontsettings(); |
$body_args{'skip_phases'}{'head'}=1; |
} |
} else { |
my $body_tag_start; |
|
if (!defined($found{'body'}) && $env{'request.state'} eq 'construct' |
$extra_head .= &Apache::lonhtmlcommon::spellheader(); |
&& $env{'environment.remote'} eq 'off') { |
|
|
my $css_href = &Apache::lonnet::EXT('resource.0.cssfile'); |
|
if ($css_href =~ /\S/) { |
|
&Apache::lonxml::extlink($css_href); |
|
$extra_head .= |
|
'<link rel="stylesheet" type="text/css" href="'.$css_href.'" />'; |
|
} |
|
if ($target eq 'edit') { |
|
$extra_head.=&Apache::edit::js_change_detection(). |
|
"<script type=\"text/javascript\">\n". |
|
"if (typeof swmenu != 'undefined') {swmenu.currentURL=null;}\n". |
|
&Apache::loncommon::browser_and_searcher_javascript(). |
|
"\n</script>\n"; |
|
} |
|
} |
|
|
|
if (defined($found{'body'})) { |
|
$body_args{'skip_phases'}{'body'}=1; |
|
} elsif (!defined($found{'body'}) |
|
&& $env{'request.state'} eq 'construct') { |
if ($target eq 'web' || $target eq 'edit') { |
if ($target eq 'web' || $target eq 'edit') { |
$body_tag_start=&Apache::loncommon::bodytag(); |
# no extra args to bodytag |
$body_tag_start.=&Apache::lonxml::message_location(); |
|
} |
} |
} elsif (!defined($found{'body'})) { |
} elsif (!defined($found{'body'})) { |
|
my %add_entries; |
my $background=&Apache::lonxml::get_param('background',$parstack, |
my $background=&Apache::lonxml::get_param('background',$parstack, |
$safeeval); |
$safeeval); |
|
if ($background ne '' ) { |
|
$add_entries{'background'} = $background; |
|
} |
|
|
my $bgcolor=&Apache::lonxml::get_param('bgcolor',$parstack, |
my $bgcolor=&Apache::lonxml::get_param('bgcolor',$parstack, |
$safeeval); |
$safeeval); |
$body_tag_start=&body_tag_start($target,$background,$bgcolor); |
if ($bgcolor eq '' ) { $bgcolor = '#FFFFFF'; } |
if ( ($target eq 'web' || $target eq 'webgrade') |
|
&& $env{'request.state'} ne 'construct') { |
$body_args{'bgcolor'} = $bgcolor; |
my ($symb,undef,undef,undef,$publicuser)= |
$body_args{'no_title'} = 1; |
&Apache::lonxml::whichuser(); |
$body_args{'force_register'} = 1; |
if ($symb eq '' && !$publicuser) { |
$body_args{'add_entries'} = \%add_entries; |
my $help = &Apache::loncommon::help_open_topic("Ambiguous_Reference"); |
} |
$help=&mt("Browsing resource, all submissions are temporary.")."<br />"; |
|
$body_tag_start.=$help; |
my $page_start = &Apache::loncommon::start_page($name,$extra_head, |
} |
\%body_args); |
|
|
|
if (!defined($found{'body'}) |
|
&& $env{'request.state'} ne 'construct' |
|
&& ($target eq 'web' || $target eq 'webgrade')) { |
|
|
|
my ($symb,undef,undef,undef,$publicuser)= &Apache::lonxml::whichuser(); |
|
if ($symb eq '' && !$publicuser) { |
|
my $help = &Apache::loncommon::help_open_topic("Ambiguous_Reference"); |
|
$help=&mt("Browsing resource, all submissions are temporary.")."<br />"; |
|
$page_start .= $help; |
} |
} |
$body_tag_start.=&Apache::lonxml::message_location(); |
|
} |
} |
|
|
|
if (!defined($found{'body'})) { |
|
$page_start .= &Apache::lonxml::message_location(); |
|
} |
|
|
my $form_tag_start; |
my $form_tag_start; |
if (!defined($found{'form'})) { |
if (!defined($found{'form'})) { |
$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 = &Apache::lonenc::check_encrypt($env{'request.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.='>'; |
|
|
|
my $symb=&Apache::lonnet::symbread(); |
|
if ($symb =~ /\S/) { |
|
$symb= |
|
&HTML::Entities::encode(&Apache::lonenc::check_encrypt($symb)); |
|
$form_tag_start.= |
|
'<input type="hidden" name="symb" value="'.$symb.'" />'; |
|
} |
} |
} |
return ($result,$head_tag_start,$body_tag_start,$form_tag_start); |
return ($page_start,$form_tag_start); |
} |
} |
|
|
#use Time::HiRes(); |
#use Time::HiRes(); |
Line 173 sub setup_rndseed {
|
Line 199 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'}, |
|
['rndseed']); |
$rndseed=$env{'form.rndseed'}; |
$rndseed=$env{'form.rndseed'}; |
if (!$rndseed) { |
if (!$rndseed) { |
$rndseed=$Apache::lonhomework::history{'rndseed'}; |
$rndseed=$Apache::lonhomework::history{'rndseed'}; |
Line 217 sub problem_edit_header {
|
Line 247 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>'. |
&Apache::loncommon::help_open_menu('','Problem Editing Help','Problem_Editor_XML_Index','',5,'Authoring',undef,undef,undef,'Problem Editing Help') |
&Apache::loncommon::help_open_menu('Problem Editing Help','Problem_Editor_XML_Index',5,'Authoring',undef,undef,undef,'Problem Editing Help') |
.'</td></tr></table>'. |
.'</td></tr></table>'. |
'<table border="0" width="100%"><tr><td bgcolor="#DDDDDD">'; |
'<table border="0" width="100%"><tr><td bgcolor="#DDDDDD">'; |
} |
} |
Line 229 sub problem_edit_header {
|
Line 259 sub problem_edit_header {
|
sub problem_edit_footer { |
sub problem_edit_footer { |
return '</td></tr></table><br /><input type="submit" name="submit" value="'.&mt('Submit Changes and Edit').'" /> |
return '</td></tr></table><br /><input type="submit" name="submit" value="'.&mt('Submit Changes and Edit').'" /> |
<input type="submit" name="submit" value="'.&mt('Submit Changes and View').'" />'. |
<input type="submit" name="submit" value="'.&mt('Submit Changes and View').'" />'. |
&Apache::lonhtmlcommon::htmlareaselectactive(@Apache::lonxml::htmlareafields). |
&Apache::lonhtmlcommon::htmlareaselectactive(&Apache::lonhtmlcommon::get_htmlareafields()). |
"\n</form>\n".&Apache::loncommon::endbodytag()."\n</html>"; |
"\n</form>\n".&Apache::loncommon::end_page(); |
} |
} |
|
|
sub option { |
sub option { |
Line 245 sub option {
|
Line 275 sub option {
|
|
|
sub problem_web_to_edit_header { |
sub problem_web_to_edit_header { |
my ($rndseed)=@_; |
my ($rndseed)=@_; |
my $result.='<input type="hidden" name="problemmode" value="'.&mt('View').'" /> |
my $result.='<input type="hidden" name="problemmode" value="'.&mt('View').'" />'; |
<input type="submit" name="problemmode" accesskey="e" value="'.&mt('Edit').'" /> |
if (!$Apache::lonhomework::parsing_a_task) { |
<input type="submit" name="problemmode" accesskey="x" value="'.&mt('EditXML').'" /> |
$result .= '<input type="submit" name="problemmode" accesskey="e" value="'.&mt('Edit').'" />'; |
|
} |
|
$result .= '<input type="submit" name="problemmode" accesskey="x" value="'.&mt('EditXML').'" /> |
<input type="submit" name="newrandomization" accesskey="a" value="'.&mt('New Randomization').'" /> |
<input type="submit" name="newrandomization" accesskey="a" value="'.&mt('New Randomization').'" /> |
<input type="submit" name="resetdata" accesskey="r" value="'.&mt('Reset Submissions').'" /> |
<input type="submit" name="resetdata" accesskey="r" value="'.&mt('Reset Submissions').'" /> |
<nobr><input type="submit" name="changerandseed" value="'.&mt('Change Random Seed To:').'" /> |
<nobr><input type="submit" name="changerandseed" value="'.&mt('Change Random Seed To:').'" /> |
Line 255 sub problem_web_to_edit_header {
|
Line 287 sub problem_web_to_edit_header {
|
$rndseed.'" |
$rndseed.'" |
onchange="javascript:document.lonhomework.changerandseed.click()" /></nobr> |
onchange="javascript:document.lonhomework.changerandseed.click()" /></nobr> |
<label><input type="checkbox" name="showallfoils" '; |
<label><input type="checkbox" name="showallfoils" '; |
|
my $show_all_foils_text = |
|
($Apache::lonhomework::parsing_a_task) ? |
|
&mt(' Show All Instances') |
|
: &mt(' Show All Foils'); |
|
|
if (defined($env{'form.showallfoils'})) { $result.='checked="on"'; } |
if (defined($env{'form.showallfoils'})) { $result.='checked="on"'; } |
$result.= ' />'.&mt(' Show All Foils'). |
$result.= ' />'.$show_all_foils_text. |
&Apache::loncommon::help_open_topic('Problem_Editor_Testing_Area','Testing Problems'). |
&Apache::loncommon::help_open_topic('Problem_Editor_Testing_Area','Testing Problems'). |
'</label><hr />'; |
'</label><hr />'; |
$result.=" |
if (!$Apache::lonhomework::parsing_a_task) { |
|
$result.=" |
<nobr> |
<nobr> |
Problem Status: |
Problem Status: |
<select name='problemstate'> |
<select name='problemstate'> |
Line 290 Feedback Mode:
|
Line 328 Feedback Mode:
|
</nobr> |
</nobr> |
<input type='submit' name='changeproblemmode' value='".&mt("Change")."' /> |
<input type='submit' name='changeproblemmode' value='".&mt("Change")."' /> |
<hr />"; |
<hr />"; |
my $numtoanalyze=$env{'form.numtoanalyze'}; |
my $numtoanalyze=$env{'form.numtoanalyze'}; |
if (!$numtoanalyze) { $numtoanalyze=20; } |
if (!$numtoanalyze) { $numtoanalyze=20; } |
$result.= '<input type="submit" name="problemmode" value='. |
$result.= '<input type="submit" name="problemmode" value='. |
&mt('"Calculate answers').'" /> for |
&mt('"Calculate answers').'" /> for |
<input type="text" name="numtoanalyze" value="'. |
<input type="text" name="numtoanalyze" value="'. |
$numtoanalyze.'" size="5" /> '.&mt('versions of this problem'). |
$numtoanalyze.'" size="5" /> '.&mt('versions of this problem'). |
'.'.&Apache::loncommon::help_open_topic("Analyze_Problem", |
'.'.&Apache::loncommon::help_open_topic("Analyze_Problem", |
'',undef,undef,300). |
'',undef,undef,300). |
'<hr />'; |
'<hr />'; |
|
} |
return $result; |
return $result; |
} |
} |
|
|
sub initialize_storage { |
sub initialize_storage { |
%Apache::lonhomework::results=(); |
my ($given_symb) = @_; |
%Apache::lonhomework::history=(); |
undef(%Apache::lonhomework::results); |
my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser(); |
undef(%Apache::lonhomework::history); |
if ($env{'request.state'} eq 'construct' || $symb eq '') { |
my ($symb,$courseid,$domain,$name) = |
|
&Apache::lonxml::whichuser($given_symb); |
|
|
|
# anonymous users (CODEd exams) have no data |
|
if ($name eq 'anonymous' |
|
&& !defined($domain)) { |
|
return; |
|
} |
|
|
|
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 { |
%Apache::lonhomework::history= |
%Apache::lonhomework::history= |
&Apache::lonnet::restore($symb,$courseid,$domain,$name); |
&Apache::lonnet::restore($symb,$courseid,$domain,$name); |
} |
} |
|
|
#ignore error conditions |
#ignore error conditions |
my ($temp)=keys %Apache::lonhomework::history ; |
my ($temp)=keys %Apache::lonhomework::history ; |
if ($temp =~ m/^error:.*/) { %Apache::lonhomework::history=(); } |
if ($temp =~ m/^error:.*/) { %Apache::lonhomework::history=(); } |
Line 327 sub initialize_storage {
|
Line 386 sub initialize_storage {
|
# Will increment totals for attempts, students, and corrects |
# Will increment totals for attempts, students, and corrects |
# if running user has student role. |
# if running user has student role. |
sub finalize_storage { |
sub finalize_storage { |
|
my ($given_symb) = @_; |
my $result; |
my $result; |
if (%Apache::lonhomework::results) { |
if (%Apache::lonhomework::results) { |
my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser(); |
my @remove = grep(/^INTERNAL_/,keys(%Apache::lonhomework::results)); |
if ($env{'request.state'} eq 'construct' || $symb eq '') { |
delete(@Apache::lonhomework::results{@remove}); |
|
my ($symb,$courseid,$domain,$name) = |
|
&Apache::lonxml::whichuser($given_symb); |
|
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 343 sub finalize_storage {
|
Line 409 sub finalize_storage {
|
&store_aggregates($symb,$courseid); |
&store_aggregates($symb,$courseid); |
} |
} |
} |
} |
|
} else { |
|
&Apache::lonxml::debug('Nothing to store'); |
} |
} |
return $result; |
return $result; |
} |
} |
Line 395 sub checkout_msg {
|
Line 463 sub checkout_msg {
|
'warning'=>'Checking out resources is subject to course policies, and may exclude future credit even if done erroneously.', |
'warning'=>'Checking out resources is subject to course policies, and may exclude future credit even if done erroneously.', |
'checkout'=>'Check out Exam for Viewing', |
'checkout'=>'Check out Exam for Viewing', |
'checkout?'=>'Check out Exam?'); |
'checkout?'=>'Check out Exam?'); |
|
my $uri = &Apache::lonenc::check_encrypt($env{'request.uri'}); |
return (<<ENDCHECKOUT); |
return (<<ENDCHECKOUT); |
<h2>$lt{'resource'}</h2> |
<h2>$lt{'resource'}</h2> |
<p>$lt{'id_expln'}</p> |
<p>$lt{'id_expln'}</p> |
<font color="red"> |
<font color="red"> |
<p>$lt{'warning'}</p> |
<p>$lt{'warning'}</p> |
</font> |
</font> |
<form name="checkout" method="POST" action="$env{'request.uri'}"> |
<form name="checkout" method="POST" action="$uri"> |
<input type="hidden" name="doescheckout" value="yes" /> |
<input type="hidden" name="doescheckout" value="yes" /> |
<input type="button" name="checkoutbutton" value="$lt{'checkout'}" onClick="javascript:if (confirm('$lt{'checkout?'}')) { document.checkout.submit(); }" /> |
<input type="button" name="checkoutbutton" value="$lt{'checkout'}" onClick="javascript:if (confirm('$lt{'checkout?'}')) { document.checkout.submit(); }" /> |
</form> |
</form> |
Line 413 sub firstaccess_msg {
|
Line 482 sub firstaccess_msg {
|
my ($map)=&Apache::lonnet::decode_symb($symb); |
my ($map)=&Apache::lonnet::decode_symb($symb); |
my $foldertitle=&Apache::lonnet::gettitle($map); |
my $foldertitle=&Apache::lonnet::gettitle($map); |
&Apache::lonxml::debug("map is $map title is $foldertitle"); |
&Apache::lonxml::debug("map is $map title is $foldertitle"); |
|
my $uri = &Apache::lonenc::check_encrypt($env{'request.uri'}); |
return (<<ENDCHECKOUT); |
return (<<ENDCHECKOUT); |
<h2>The resources in "$foldertitle" are open for a limited time. Once you click the 'Show Resource' button below you have $time to complete all resources "$foldertitle".</h2> |
<h2>The resources in "$foldertitle" are open for a limited time. Once you click the 'Show Resource' button below you have $time to complete all resources "$foldertitle".</h2> |
<form name="markaccess" method="POST" action="$env{'request.uri'}"> |
<form name="markaccess" method="POST" action="$uri"> |
<input type="hidden" name="markaccess" value="yes" /> |
<input type="hidden" name="markaccess" value="yes" /> |
<input type="button" name="accessbutton" value="Show Resource" onClick="javascript:if (confirm('Start Timer?')) { document.markaccess.submit(); }" /> |
<input type="button" name="accessbutton" value="Show Resource" onClick="javascript:if (confirm('Start Timer?')) { document.markaccess.submit(); }" /> |
</form> |
</form> |
ENDCHECKOUT |
ENDCHECKOUT |
} |
} |
|
|
# initializes the problem globals across the inputtags, lonhomework, and |
|
# structuretags modules. |
|
# |
|
# |
|
sub init_problem_globals { |
sub init_problem_globals { |
my ($type)=@_; |
my ($type)=@_; |
#initialize globals |
#initialize globals |
Line 460 sub init_problem_globals {
|
Line 526 sub init_problem_globals {
|
@Apache::structuretags::whileline=(); |
@Apache::structuretags::whileline=(); |
$Apache::lonhomework::scantronmode=0; |
$Apache::lonhomework::scantronmode=0; |
undef($Apache::lonhomework::name); |
undef($Apache::lonhomework::name); |
|
undef($Apache::lonhomework::default_type); |
|
undef($Apache::lonhomework::type); |
|
undef($Apache::lonhomework::problemstatus); |
} |
} |
|
|
sub reset_problem_globals { |
sub reset_problem_globals { |
Line 472 sub reset_problem_globals {
|
Line 540 sub reset_problem_globals {
|
#detect if we try to do 2 problems in one file |
#detect if we try to do 2 problems in one file |
# undef($Apache::lonhomework::parsing_a_problem); |
# undef($Apache::lonhomework::parsing_a_problem); |
undef($Apache::lonhomework::name); |
undef($Apache::lonhomework::name); |
|
undef($Apache::lonhomework::default_type); |
|
undef($Apache::lonhomework::type); |
|
undef($Apache::lonhomework::scantronmode); |
|
undef($Apache::lonhomework::problemstatus); |
|
undef($Apache::lonhomework::ignore_response_errors); |
} |
} |
|
|
sub set_problem_state { |
sub set_problem_state { |
Line 497 sub get_problem_status {
|
Line 570 sub get_problem_status {
|
} |
} |
|
|
sub start_problem { |
sub start_problem { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
|
|
|
# We'll use the redirection to fix up printing of duedates. |
|
if (!$Apache::lonxml::metamode) { |
|
&Apache::lonxml::startredirection(); |
|
} |
|
|
# Problems don't nest and we don't allow more than one <problem> in |
# Problems don't nest and we don't allow more than one <problem> in |
# a .problem file. |
# a .problem file. |
Line 505 sub start_problem {
|
Line 583 sub start_problem {
|
if ( $Apache::inputtags::part ne '' || |
if ( $Apache::inputtags::part ne '' || |
$Apache::lonhomework::parsing_a_problem) { |
$Apache::lonhomework::parsing_a_problem) { |
&Apache::lonxml::error('Only one <problem> allowed in a .problem file'); |
&Apache::lonxml::error('Only one <problem> allowed in a .problem file'); |
#my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser); |
#my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser,$style); |
return ''; |
return ''; |
} |
} |
|
|
Line 527 sub start_problem {
|
Line 605 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 548 sub start_problem {
|
Line 626 sub start_problem {
|
my $status; |
my $status; |
my $accessmsg; |
my $accessmsg; |
|
|
#should get back a <html> or the neccesary stuff to start XML/MathML |
my $name= &get_resource_name($parstack,$safeeval); |
my ($result,$head_tag_start,$body_tag_start,$form_tag_start)= |
my ($result,$form_tag_start); |
&page_start($target,$token,$tagstack,$parstack,$parser,$safeeval); |
if ($target eq 'web' || $target eq 'webgrade' || $target eq 'tex' |
|
|| $target eq 'edit') { |
|
($result,$form_tag_start) = |
|
&page_start($target,$token,$tagstack,$parstack,$parser,$safeeval, |
|
$name); |
|
} |
|
|
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); } |
if ($target eq 'analyze') { my $rndseed=&setup_rndseed($safeeval); } |
Line 565 sub start_problem {
|
Line 649 sub start_problem {
|
$Apache::lonhomework::history{"resource.0.outtoken"}= |
$Apache::lonhomework::history{"resource.0.outtoken"}= |
$token; |
$token; |
} |
} |
$body_tag_start.=&Apache::lonxml::printtokenheader($target,$token); |
$result.=&Apache::lonxml::printtokenheader($target,$token); |
} |
} |
if ($env{'form.markaccess'}) { |
if ($env{'form.markaccess'}) { |
&Apache::lonnet::set_first_access('map'); |
&Apache::lonnet::set_first_access('map'); |
Line 573 sub start_problem {
|
Line 657 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').'" />'; |
|
if (exists($env{'form.username'})) { |
|
$form_tag_start.= |
'<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 591 sub start_problem {
|
Line 679 sub start_problem {
|
} |
} |
$form_tag_start.='<hr />'; |
$form_tag_start.='<hr />'; |
} |
} |
($status,$accessmsg) = &Apache::lonhomework::check_access('0'); |
|
|
($status,$accessmsg,my $slot_name,my $slot) = |
|
&Apache::lonhomework::check_slot_access('0','problem'); |
push (@Apache::inputtags::status,$status); |
push (@Apache::inputtags::status,$status); |
|
|
my $expression='$external::datestatus="'.$status.'";'; |
my $expression='$external::datestatus="'.$status.'";'; |
$expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.0.solved"}.'";'; |
$expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.0.solved"}.'";'; |
&Apache::run::run($expression,$safeeval); |
&Apache::run::run($expression,$safeeval); |
&Apache::lonxml::debug("Got $status"); |
&Apache::lonxml::debug("Got $status"); |
|
|
if (( $status eq 'CLOSED' ) || |
if (( $status eq 'CLOSED' ) || |
( $status eq 'UNCHECKEDOUT') || |
( $status eq 'UNCHECKEDOUT') || |
( $status eq 'NOT_YET_VIEWED') || |
( $status eq 'NOT_YET_VIEWED') || |
( $status eq 'BANNED') || |
( $status eq 'BANNED') || |
( $status eq 'UNAVAILABLE') || |
( $status eq 'UNAVAILABLE') || |
|
( $status eq 'NOT_IN_A_SLOT') || |
( $status eq 'INVALID_ACCESS')) { |
( $status eq 'INVALID_ACCESS')) { |
my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser); |
my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser, |
|
$style); |
if ( $target eq "web" ) { |
if ( $target eq "web" ) { |
$result.= $head_tag_start.'</head>'; |
my $msg; |
my $msg=$body_tag_start; |
|
if ($status eq 'UNAVAILABLE') { |
if ($status eq 'UNAVAILABLE') { |
$msg.='<h1>'.&mt('Unable to determine if this resource is open due to network problems. Please try again later.').'</h1>'; |
$msg.='<h1>'.&mt('Unable to determine if this resource is open due to network problems. Please try again later.').'</h1>'; |
} elsif ($status ne 'NOT_YET_VIEWED') { |
} elsif ($status ne 'NOT_YET_VIEWED') { |
Line 615 sub start_problem {
|
Line 708 sub start_problem {
|
if ($status eq 'CLOSED' || $status eq 'INVALID_ACCESS') { |
if ($status eq 'CLOSED' || $status eq 'INVALID_ACCESS') { |
$msg.='The problem '.$accessmsg; |
$msg.='The problem '.$accessmsg; |
} elsif ($status eq 'UNCHECKEDOUT') { |
} elsif ($status eq 'UNCHECKEDOUT') { |
$msg.=&checkout_msg; |
$msg.=&checkout_msg(); |
} elsif ($status eq 'NOT_YET_VIEWED') { |
} elsif ($status eq 'NOT_YET_VIEWED') { |
$msg.=&firstaccess_msg($accessmsg,$symb); |
$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."); |
} |
} |
$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 { |
$result.=&mt('Problem is not open to be viewed. It')." $accessmsg \\vskip 0 mm "; |
$result.=&mt('Problem is not open to be viewed. It')." $accessmsg \\vskip 0 mm "; |
} |
} |
} |
} |
|
} elsif ($status eq 'NEEDS_CHECKIN') { |
|
my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser, |
|
$style); |
|
if ($target eq 'web') { |
|
$result .= &Apache::bridgetask::proctor_validation_screen(); |
|
} elsif ($target eq 'grade') { |
|
&Apache::bridgetask::proctor_check_auth($slot_name,$slot, |
|
'problem'); |
|
} |
} elsif ($target eq 'web') { |
} elsif ($target eq 'web') { |
my $name= &get_resource_name($parstack,$safeeval); |
if ($status eq 'CAN_ANSWER' |
$result.="$head_tag_start<title>$name</title></head> |
&& $slot_name ne '' |
$body_tag_start \n $form_tag_start". |
&& $Apache::lonhomework::history{'resource.0.checkedin'} eq '') { |
|
# unproctored slot access, self checkin |
|
&Apache::bridgetask::check_in('problem',undef,undef, |
|
$slot_name); |
|
} |
|
$result.="\n $form_tag_start". |
'<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") { |
Line 645 sub start_problem {
|
Line 757 sub start_problem {
|
} |
} |
} |
} |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
my $startminipage = ''; |
$result .= 'INSERTTEXFRONTMATTERHERE'; |
if (not $env{'form.problem_split'}=~/yes/) { |
|
$startminipage = '\begin{minipage}{\textwidth}'; |
|
} |
|
my $id = $Apache::inputtags::part; |
|
my $weight = &Apache::lonnet::EXT("resource.$id.weight"); |
|
my $packages=&Apache::lonnet::metadata($env{'request.uri'},'packages'); |
|
my @packages = split /,/,$packages; |
|
my $allow_print_points = 0; |
|
foreach my $partial_key (@packages) { |
|
if ($partial_key=~m/^part_0$/) { |
|
$allow_print_points=1; |
|
} |
|
} |
|
my $maxtries = &Apache::lonnet::EXT("resource.$id.maxtries"); |
|
if (defined($maxtries) && $maxtries < 0) { $allow_print_points=0; } |
|
if (lc($env{'course.'.$env{'request.course.id'}. |
|
'.disableexampointprint'}) eq 'yes') { |
|
$allow_print_points=0; |
|
} |
|
my $name_of_resourse= &Apache::lonxml::latex_special_symbols(&get_resource_name($parstack,$safeeval),'header'); |
|
my $begin_doc='\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource <h2>"'.$name_of_resourse.'"</h2> located in <br /><small><b>'.$env{'request.uri'}.'</b></small><br /> STAMPOFPASSEDRESOURCEEND} \noindent '; |
|
my $toc_line='\vskip 1 mm\noindent '.$startminipage. |
|
'\addcontentsline{toc}{subsection}{'.$name_of_resourse.'}'; |
|
|
|
# Figure out what the due date is and if we need to print it in the problem header. |
|
# We have been logging the last due date written to file. |
|
# |
|
|
|
|
|
my $duetime = &Apache::lonnet::EXT("resource.$id.duedate"); |
|
my $duedate = POSIX::strftime("%c",localtime($duetime)); |
|
my $temp_file; |
|
my $filename = "/home/httpd/prtspool/$env{'user.name'}_$env{'user.domain'}_printout.due"; |
|
|
|
# Figure out what the last printed due date is or set it to the epoch if no duedates |
|
# have been printed. |
|
|
|
my $due_file_content = 0; # If the file does not yet exist, time is the epoch. |
|
if (-e $filename) { |
|
$temp_file = Apache::File->new($filename); |
|
my @due_file = <$temp_file>; |
|
$due_file_content = $due_file[$#due_file]; |
|
chomp $due_file_content; |
|
} |
|
# The big change; Due do the comparison on |
|
# the absolute time rather than textual time since that is format independent. |
|
# |
|
if ($due_file_content != $duetime) { |
|
$temp_file = Apache::File->new('>'.$filename); |
|
print $temp_file "$duetime\n"; |
|
if (not $env{'request.symb'} =~ m/\.page_/) { |
|
if(not $duedate=~m/1969/ and $Apache::lonhomework::type ne 'exam') { |
|
$result .= $begin_doc. |
|
'\textit{Due date: '.$duedate.'} '.$toc_line; |
|
} else { |
|
$result .= $begin_doc.$toc_line; |
|
if ($Apache::lonhomework::type eq 'exam' and $allow_print_points==1) { $result .= '\fbox{\textit{'.$weight.' pt}}';} |
|
} |
|
} else { |
|
$result .= '\vskip 1mm\textit{Due date: '.$duedate.'} \\\\\\\\'; |
|
} |
|
} else { |
|
if (not $env{'request.symb'} =~ m/\.page_/) { |
|
$result .= $begin_doc.$toc_line; |
|
if (($Apache::lonhomework::type eq 'exam') and ($allow_print_points==1)) { $result .= '\fbox{\textit{'.$weight.' pt}}';} |
|
} else { |
|
$result .= '\vskip 1mm \\\\\\\\'; |
|
} |
|
} |
|
} |
} |
&Apache::lonxml::startredirection; # We'll do redirection to deal with duedates. |
|
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
$result.=$head_tag_start."</head>".$body_tag_start.$form_tag_start. |
$result .= $form_tag_start.&problem_edit_header(); |
&problem_edit_header(); |
|
$Apache::lonxml::warnings_error_header= |
$Apache::lonxml::warnings_error_header= |
&mt("Editor Errors - these errors might not effect the running of the problem, but they will likely cause problems with further use of the Edit mode. Please use the EditXML mode to fix these errors.")."<br />"; |
&mt("Editor Errors - these errors might not effect the running of the problem, but they will likely cause problems with further use of the Edit mode. Please use the EditXML mode to fix these errors.")."<br />"; |
my $temp=&Apache::edit::insertlist($target,$token); |
my $temp=&Apache::edit::insertlist($target,$token); |
Line 736 sub start_problem {
|
Line 778 sub start_problem {
|
|
|
sub end_problem { |
sub end_problem { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my $result=''; |
my $result; |
|
|
|
if (!$Apache::lonxml::metamode) { |
|
$result = &Apache::lonxml::endredirection(); #started in &start_problem |
|
$Apache::lonxml::post_evaluate=0; |
|
} |
|
|
if ($target eq 'tex') { |
if ($target eq 'tex') { |
$result = &Apache::lonxml::endredirection; |
|
|
# Figure out the front matter and replace the |
|
# INSERTTEXFRONTMATTERHERE in result with it. note that we do |
|
# this in end_problem because whether or not we display due |
|
# dates depends on whether due dates have already been |
|
# displayed in the problem parts. |
|
|
|
my $frontmatter = ''; |
|
my $startminipage = ''; |
|
if (not $env{'form.problem_split'}=~/yes/) { |
|
$startminipage = '\begin{minipage}{\textwidth}'; |
|
} |
|
my $id = $Apache::inputtags::part; |
|
my $weight = &Apache::lonnet::EXT("resource.$id.weight"); |
|
my $packages=&Apache::lonnet::metadata($env{'request.uri'},'packages'); |
|
my @packages = split /,/,$packages; |
|
my $allow_print_points = 0; |
|
foreach my $partial_key (@packages) { |
|
if ($partial_key=~m/^part_0$/) { |
|
$allow_print_points=1; |
|
} |
|
} |
|
my $maxtries = &Apache::lonnet::EXT("resource.$id.maxtries"); |
|
if (defined($maxtries) && $maxtries < 0) { $allow_print_points=0; } |
|
if (lc($env{'course.'.$env{'request.course.id'}. |
|
'.disableexampointprint'}) eq 'yes') { |
|
$allow_print_points=0; |
|
} |
|
my $name_of_resourse= &Apache::lonxml::latex_special_symbols(&get_resource_name($parstack,$safeeval),'header'); |
|
my $begin_doc='\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource <h2>"'.$name_of_resourse.'"</h2> located in <br /><small><b>'.$env{'request.uri'}.'</b></small><br /> STAMPOFPASSEDRESOURCEEND} \noindent '; |
|
my $toc_line='\vskip 1 mm\noindent '.$startminipage. |
|
'\addcontentsline{toc}{subsection}{'.$name_of_resourse.'}'; |
|
|
|
# Figure out what the due date is and if we need to print |
|
# it in the problem header. We have been logging the |
|
# last due date written to file. |
|
|
|
my $duetime = &Apache::lonnet::EXT("resource.$id.duedate"); |
|
my $duedate = POSIX::strftime("%c",localtime($duetime)); |
|
my $temp_file; |
|
my $filename = "/home/httpd/prtspool/$env{'user.name'}_$env{'user.domain'}_printout.due"; |
|
|
|
# Figure out what the last printed due date is or set it |
|
# to the epoch if no duedates have been printed. |
|
|
|
my $due_file_content = 0; # If the file does not yet exist, time is the epoch. |
|
if (-e $filename) { |
|
$temp_file = Apache::File->new($filename); |
|
my @due_file = <$temp_file>; |
|
$due_file_content = $due_file[$#due_file]; |
|
chomp $due_file_content; |
|
} |
|
|
|
# We display the due date iff it is not the same as the last |
|
# duedate in problem header ($due_file_content), and |
|
# none of our parts displayed a duedate. |
|
# |
|
my $parts_with_displayduedate; |
|
if (defined $Apache::outputtags::showonce{'displayduedate'}) { |
|
$parts_with_displayduedate = |
|
scalar(@{$Apache::outputtags::showonce{'displayduedate'}}); |
|
} else { |
|
$parts_with_displayduedate = 0; |
|
} |
|
if (($due_file_content != $duetime) && ($parts_with_displayduedate == 0) ) { |
|
$temp_file = Apache::File->new('>'.$filename); |
|
print $temp_file "$duetime\n"; |
|
if (not $env{'request.symb'} =~ m/\.page_/) { |
|
if(not $duedate=~m/1969/ and $Apache::lonhomework::type ne 'exam') { |
|
$frontmatter .= $begin_doc. |
|
'\textit{Due date: '.$duedate.'} '.$toc_line; |
|
} else { |
|
$frontmatter.= $begin_doc.$toc_line; |
|
if ($Apache::lonhomework::type eq 'exam' and $allow_print_points==1) { $frontmatter .= '\fbox{\textit{'.$weight.' pt}}';} |
|
} |
|
} else { |
|
$frontmatter .= '\vskip 1mm\textit{Due date: '.$duedate.'} \\\\\\\\'; |
|
} |
|
} else { |
|
if (not $env{'request.symb'} =~ m/\.page_/) { |
|
$frontmatter .= $begin_doc.$toc_line; |
|
if (($Apache::lonhomework::type eq 'exam') and ($allow_print_points==1)) { $frontmatter .= '\fbox{\textit{'.$weight.' pt}}';} |
|
} else { |
|
$frontmatter .= '\vskip 1mm \\\\\\\\'; |
|
} |
|
} |
|
$result =~ s/INSERTTEXFRONTMATTERHERE/$frontmatter/; |
} |
} |
|
|
my $status=$Apache::inputtags::status['-1']; |
my $status=$Apache::inputtags::status['-1']; |
if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || |
if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || |
$target eq 'tex') { |
$target eq 'tex') { |
Line 747 sub end_problem {
|
Line 882 sub end_problem {
|
# if part is zero, no <part>s existed, so we need to the grading |
# if part is zero, no <part>s existed, so we need to the grading |
if ($status eq 'CAN_ANSWER' ||$Apache::lonhomework::scantronmode) { |
if ($status eq 'CAN_ANSWER' ||$Apache::lonhomework::scantronmode) { |
&Apache::inputtags::grade; |
&Apache::inputtags::grade; |
|
} elsif ($status eq 'NEEDS_CHECKIN') { |
|
# no need to grade, and don't want to hide data |
} else { |
} else { |
# move any submission data to .hidden |
# move any submission data to .hidden |
&Apache::inputtags::hidealldata($Apache::inputtags::part); |
&Apache::inputtags::hidealldata($Apache::inputtags::part); |
Line 766 sub end_problem {
|
Line 903 sub end_problem {
|
if ($target ne 'tex' && |
if ($target ne 'tex' && |
$env{'form.answer_output_mode'} ne 'tex') { |
$env{'form.answer_output_mode'} ne 'tex') { |
$result.="</form>"; |
$result.="</form>"; |
$result.=&Apache::lonhtmlcommon::htmlareaselectactive(@Apache::lonxml::htmlareafields); |
$result.= &Apache::lonhtmlcommon::htmlareaselectactive(&Apache::lonhtmlcommon::get_htmlareafields()); |
} |
} |
if ($target eq 'web') { |
if ($target eq 'web') { |
$result.=&Apache::lonxml::xmlend().'</html>'; |
$result.= &Apache::loncommon::end_page({'discussion' => 1}); |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
my $endminipage = ''; |
my $endminipage = ''; |
if (not $env{'form.problem_split'}=~/yes/) { |
if (not $env{'form.problem_split'}=~/yes/) { |
Line 777 sub end_problem {
|
Line 914 sub end_problem {
|
} |
} |
if ($env{'form.print_discussions'} eq 'yes') { |
if ($env{'form.print_discussions'} eq 'yes') { |
$result.=&Apache::lonxml::xmlend($target,$parser); |
$result.=&Apache::lonxml::xmlend($target,$parser); |
$result=~s/<\/html>//; |
|
} else { |
} else { |
$result .= '\keephidden{ENDOFPROBLEM}\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}'; |
$result .= '\keephidden{ENDOFPROBLEM}\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}'; |
if (not $env{'request.symb'} =~ m/\.page_/) { |
if (not $env{'request.symb'} =~ m/\.page_/) { |
Line 794 sub end_problem {
|
Line 930 sub end_problem {
|
} |
} |
if ($target eq 'answer' && ($env{'request.state'} eq 'construct') |
if ($target eq 'answer' && ($env{'request.state'} eq 'construct') |
&& $env{'form.answer_output_mode'} ne 'tex') { |
&& $env{'form.answer_output_mode'} ne 'tex') { |
$result.=&Apache::lonxml::xmlend().'</html>'; |
$result.=&Apache::loncommon::end_page({'discussion' => 1}); |
# normally we get it from above, but in CSTR |
# normally we get it from above, but in CSTR |
# we always show answer mode too. |
# we always show answer mode too. |
} |
} |
Line 807 sub end_problem {
|
Line 943 sub end_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"); |
$result = &problem_edit_footer(); |
$result .= &problem_edit_footer(); |
|
} elsif ($target eq 'modified') { |
|
$result .= $token->[2]; |
|
$result.=&Apache::edit::handle_insertafter($token->[1]); |
} |
} |
|
|
if ($env{'request.state'} eq 'construct' && $target eq 'web') { |
if ($env{'request.state'} eq 'construct' && $target eq 'web') { |
Line 822 sub end_problem {
|
Line 961 sub end_problem {
|
|
|
sub start_library { |
sub start_library { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($result,$head_tag_start,$body_tag_start,$form_tag_start); |
my ($result,$form_tag_start); |
if ($$tagstack[0] eq 'library') { |
if ($$tagstack[0] eq 'library') { |
&init_problem_globals('library'); |
&init_problem_globals('library'); |
$Apache::lonhomework::type='problem'; |
$Apache::lonhomework::type='problem'; |
} |
} |
if ($target eq 'edit') { |
if ($target eq 'edit') { |
($result,$head_tag_start,$body_tag_start,$form_tag_start)= |
($result,$form_tag_start)= |
&page_start($target,$token,$tagstack,$parstack,$parser,$safeeval); |
&page_start($target,$token,$tagstack,$parstack,$parser,$safeeval, |
$result.=$head_tag_start."</head>".$body_tag_start.$form_tag_start. |
'Edit'); |
&problem_edit_header(); |
$result.=$form_tag_start.&problem_edit_header(); |
my $temp=&Apache::edit::insertlist($target,$token); |
my $temp=&Apache::edit::insertlist($target,$token); |
$result.=$temp; |
$result.=$temp; |
} elsif ($target eq 'modified') { |
} elsif ($target eq 'modified') { |
$result=$token->[4]; |
$result=$token->[4]; |
$result.=&Apache::edit::handle_insert(); |
$result.=&Apache::edit::handle_insert(); |
} elsif ($target eq 'web' && $$tagstack[0] ne 'problem' && |
} elsif (($target eq 'web' || $target eq 'webgrade') |
$env{'request.state'} eq "construct" ) { |
&& $$tagstack[0] eq 'library' |
($result,$head_tag_start,$body_tag_start,$form_tag_start)= |
&& $env{'request.state'} eq "construct" ) { |
&page_start($target,$token,$tagstack,$parstack,$parser,$safeeval); |
|
my $name=&get_resource_name($parstack,$safeeval); |
my $name=&get_resource_name($parstack,$safeeval); |
|
($result,$form_tag_start)= |
|
&page_start($target,$token,$tagstack,$parstack,$parser,$safeeval, |
|
$name); |
my $rndseed=&setup_rndseed($safeeval); |
my $rndseed=&setup_rndseed($safeeval); |
$result.="$head_tag_start<title>$name</title></head> |
$result.=" \n $form_tag_start". |
$body_tag_start \n $form_tag_start". |
|
'<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); |
} |
} |
Line 858 sub end_library {
|
Line 998 sub end_library {
|
$result=&problem_edit_footer(); |
$result=&problem_edit_footer(); |
} elsif ($target eq 'web' && $$tagstack[0] ne 'problem' && |
} elsif ($target eq 'web' && $$tagstack[0] ne 'problem' && |
$env{'request.state'} eq "construct") { |
$env{'request.state'} eq "construct") { |
$result.='</form>'.&Apache::loncommon::endbodytag(). |
$result.='</form>'.&Apache::loncommon::end_page({'discussion' => 1}); |
&Apache::lonxml::xmlend(); |
|
} |
} |
if ($$tagstack[0] eq 'library') { &reset_problem_globals('library') }; |
if ($$tagstack[0] eq 'library') { &reset_problem_globals('library') }; |
return $result; |
return $result; |
} |
} |
|
|
sub start_definetag { |
sub start_definetag { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
|
|
my $result; |
my $result; |
|
|
my $name = $token->[2]->{'name'}; |
my $name = $token->[2]->{'name'}; |
my $skip=&Apache::lonxml::get_all_text("/definetag",$parser); |
my $skip=&Apache::lonxml::get_all_text("/definetag",$parser,$style); |
if ($name=~/^\//) { |
if ($name=~/^\//) { |
$result= |
$result= |
'<br /><table bgcolor="#FFBBBB"><tr><th>END <tt>'.$name.'</tt></th></tr>'; |
'<br /><table bgcolor="#FFBBBB"><tr><th>END <tt>'.$name.'</tt></th></tr>'; |
Line 894 sub start_block {
|
Line 1033 sub start_block {
|
|
|
my $result; |
my $result; |
|
|
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 'analyze') { |
$target eq 'tex' || $target eq 'analyze' || $target eq 'webgrade') { |
my $code = $token->[2]->{'condition'}; |
my $code = $token->[2]->{'condition'}; |
if (defined($code)) { |
if (defined($code)) { |
if (!$Apache::lonxml::default_homework_loaded) { |
if (!$Apache::lonxml::default_homework_loaded) { |
Line 938 sub start_languageblock {
|
Line 1077 sub start_languageblock {
|
|
|
my $result; |
my $result; |
|
|
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 'analyze') { |
$target eq 'tex' || $target eq 'analyze' || $target eq 'webgrade') { |
my $include = $token->[2]->{'include'}; |
my $include = $token->[2]->{'include'}; |
my $exclude = $token->[2]->{'exclude'}; |
my $exclude = $token->[2]->{'exclude'}; |
my %languages=&Apache::loncommon::display_languages(); |
my %languages=&Apache::loncommon::display_languages(); |
Line 991 sub start_instructorcomment {
|
Line 1130 sub start_instructorcomment {
|
|
|
my $result; |
my $result; |
|
|
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 'analyze') { |
$target eq 'tex' || $target eq 'analyze' || $target eq 'webgrade') { |
$result=($env{'request.role'}=~/^(in|cc|au|ca|li)/); |
$result=($env{'request.role'}=~/^(in|cc|au|ca|li)/); |
if ( (! $result) or ($env{'form.instructor_comments'} eq 'hide')) { |
if ( (! $result) or ($env{'form.instructor_comments'} eq 'hide')) { |
my $skip=&Apache::lonxml::get_all_text("/instructorcomment", |
my $skip=&Apache::lonxml::get_all_text("/instructorcomment", |
Line 1017 sub end_instructorcomment {
|
Line 1156 sub end_instructorcomment {
|
} |
} |
|
|
sub start_while { |
sub start_while { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
|
|
my $result; |
my $result; |
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 'analyze') { |
$target eq 'tex' || $target eq 'analyze' || $target eq 'webgrade') { |
my $code = $token->[2]->{'condition'}; |
my $code = $token->[2]->{'condition'}; |
|
|
push( @Apache::structuretags::whileconds, $code); |
push( @Apache::structuretags::whileconds, $code); |
Line 1029 sub start_while {
|
Line 1168 sub start_while {
|
&Apache::lonxml::default_homework_load($safeeval); |
&Apache::lonxml::default_homework_load($safeeval); |
} |
} |
my $result = &Apache::run::run($code,$safeeval); |
my $result = &Apache::run::run($code,$safeeval); |
my $bodytext=&Apache::lonxml::get_all_text("/while",$parser); |
my $bodytext=&Apache::lonxml::get_all_text("/while",$parser,$style); |
push( @Apache::structuretags::whilebody, $bodytext); |
push( @Apache::structuretags::whilebody, $bodytext); |
push( @Apache::structuretags::whileline, $token->[5]); |
push( @Apache::structuretags::whileline, $token->[5]); |
&Apache::lonxml::debug("s code $code got -$result-"); |
&Apache::lonxml::debug("s code $code got -$result-"); |
Line 1053 sub end_while {
|
Line 1192 sub end_while {
|
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my $result; |
my $result; |
|
|
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 'analyze') { |
$target eq 'tex' || $target eq 'analyze' || $target eq 'webgrade') { |
my $code = pop(@Apache::structuretags::whileconds); |
my $code = pop(@Apache::structuretags::whileconds); |
my $bodytext = pop(@Apache::structuretags::whilebody); |
my $bodytext = pop(@Apache::structuretags::whilebody); |
my $line = pop(@Apache::structuretags::whileline); |
my $line = pop(@Apache::structuretags::whileline); |
Line 1085 sub end_while {
|
Line 1224 sub end_while {
|
# ... |
# ... |
# </randomlist> |
# </randomlist> |
sub start_randomlist { |
sub start_randomlist { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
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' || $target eq 'webgrade') { |
my $body= &Apache::lonxml::get_all_text("/randomlist",$parser); |
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); |
Line 1178 sub ordered_show_check {
|
Line 1317 sub ordered_show_check {
|
} |
} |
|
|
sub start_part { |
sub start_part { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
|
if (!$Apache::lonxml::metamode) { |
|
&Apache::lonxml::startredirection(); # we'll use redirection to fix up |
|
# duedates. |
|
} |
my $result=''; |
my $result=''; |
my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval); |
my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval); |
if ($id =~ /^\s*$/) { $id = $Apache::lonxml::curdepth; } |
if ($id =~ /^\s*$/) { $id = $Apache::lonxml::curdepth; } |
Line 1203 sub start_part {
|
Line 1346 sub start_part {
|
} elsif ($target eq 'web' || $target eq 'grade' || |
} elsif ($target eq 'web' || $target eq 'grade' || |
$target eq 'answer' || $target eq 'tex') { |
$target eq 'answer' || $target eq 'tex') { |
if ($hidden || !$in_order_show) { |
if ($hidden || !$in_order_show) { |
my $bodytext=&Apache::lonxml::get_all_text("/part",$parser); |
my $bodytext=&Apache::lonxml::get_all_text("/part",$parser,$style); |
} else { |
} else { |
my ($status,$accessmsg) = &Apache::lonhomework::check_access($id); |
my ($status,$accessmsg) = &Apache::lonhomework::check_access($id); |
push (@Apache::inputtags::status,$status); |
push (@Apache::inputtags::status,$status); |
Line 1219 sub start_part {
|
Line 1362 sub start_part {
|
( $status eq 'BANNED') || |
( $status eq 'BANNED') || |
( $status eq 'UNAVAILABLE') || |
( $status eq 'UNAVAILABLE') || |
( $status eq 'INVALID_ACCESS')) { |
( $status eq 'INVALID_ACCESS')) { |
my $bodytext=&Apache::lonxml::get_all_text("/part",$parser); |
my $bodytext=&Apache::lonxml::get_all_text("/part",$parser, |
|
$style); |
if ( $target eq "web" ) { |
if ( $target eq "web" ) { |
$result="<br />".&mt('Part is not open to be viewed. It')." $accessmsg<br />"; |
$result="<br />".&mt('Part is not open to be viewed. It')." $accessmsg<br />"; |
} elsif ( $target eq 'tex' ) { |
} elsif ( $target eq 'tex' ) { |
Line 1257 sub start_part {
|
Line 1401 sub start_part {
|
} |
} |
if (($Apache::lonhomework::type eq 'exam') && ($allow_print_points)) { $result .= '\fbox{\textit{'.$weight.' pt}}';} |
if (($Apache::lonhomework::type eq 'exam') && ($allow_print_points)) { $result .= '\fbox{\textit{'.$weight.' pt}}';} |
} elsif ($target eq 'web') { |
} elsif ($target eq 'web') { |
$result.='<a name="'.&Apache::lonnet::escape($Apache::inputtags::part).'" />'; |
$result.='<a name="'.&escape($Apache::inputtags::part).'" />'; |
} |
} |
} |
} |
} |
} |
Line 1287 sub end_part {
|
Line 1431 sub end_part {
|
my $status=$Apache::inputtags::status['-1']; |
my $status=$Apache::inputtags::status['-1']; |
my $hidden=&Apache::loncommon::check_if_partid_hidden($Apache::inputtags::part); |
my $hidden=&Apache::loncommon::check_if_partid_hidden($Apache::inputtags::part); |
my $in_order_show=&ordered_show_check(); |
my $in_order_show=&ordered_show_check(); |
my $result=''; |
my $result; |
if ( $target eq 'meta' ) { |
if (!$Apache::lonxml::metamode) { |
$result=''; |
$result = &Apache::lonxml::endredirection(); # started in &start_part |
} elsif ($target eq 'grade') { |
$Apache::lonxml::post_evaluate=0; |
|
} |
|
if ($target eq 'grade') { |
if (($status eq 'CAN_ANSWER' || $Apache::lonhomework::scantronmode) && |
if (($status eq 'CAN_ANSWER' || $Apache::lonhomework::scantronmode) && |
!$hidden && $in_order_show) { |
!$hidden && $in_order_show) { |
$result=&Apache::inputtags::grade; |
$result.=&Apache::inputtags::grade; |
} else { |
} else { |
# move any submission data to .hidden |
# move any submission data to .hidden |
&Apache::inputtags::hidealldata($Apache::inputtags::part); |
&Apache::inputtags::hidealldata($Apache::inputtags::part); |
Line 1305 sub end_part {
|
Line 1451 sub end_part {
|
if ($Apache::lonhomework::type eq 'exam' && $target eq 'tex') { |
if ($Apache::lonhomework::type eq 'exam' && $target eq 'tex') { |
$gradestatus=''; |
$gradestatus=''; |
} |
} |
$result=$gradestatus; |
$result.=$gradestatus; |
if ($$tagstack[-2] eq 'td' and $target eq 'tex') {$result.='\end{minipage}';} |
if ($$tagstack[-2] eq 'td' and $target eq 'tex') {$result.='\end{minipage}';} |
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
$result=&Apache::edit::end_table(); |
$result.=&Apache::edit::end_table(); |
|
} elsif ($target eq 'modified') { |
|
$result .= $token->[2]; |
|
$result.=&Apache::edit::handle_insertafter($token->[1]); |
} |
} |
pop @Apache::inputtags::status; |
pop @Apache::inputtags::status; |
$Apache::inputtags::part=''; |
$Apache::inputtags::part=''; |
Line 1317 sub end_part {
|
Line 1466 sub end_part {
|
} |
} |
|
|
sub start_preduedate { |
sub start_preduedate { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex') { |
if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || |
|
$target eq 'tex' || $target eq 'webgrade') { |
&Apache::lonxml::debug("State in preduedate is ". $Apache::inputtags::status['-1']); |
&Apache::lonxml::debug("State in preduedate is ". $Apache::inputtags::status['-1']); |
if (!$Apache::lonhomework::scantronmode && |
if (!$Apache::lonhomework::scantronmode && |
$Apache::inputtags::status['-1'] ne 'CAN_ANSWER' && |
$Apache::inputtags::status['-1'] ne 'CAN_ANSWER' && |
$Apache::inputtags::status['-1'] ne 'CANNOT_ANSWER') { |
$Apache::inputtags::status['-1'] ne 'CANNOT_ANSWER') { |
&Apache::lonxml::debug("Wha? ". ($Apache::inputtags::status['-1'] ne 'SHOW_ANSWER')); |
&Apache::lonxml::debug("Wha? ". ($Apache::inputtags::status['-1'] ne 'SHOW_ANSWER')); |
&Apache::lonxml::get_all_text("/preduedate",$parser); |
&Apache::lonxml::get_all_text("/preduedate",$parser,$style); |
} |
} |
} |
} |
return ''; |
return ''; |
Line 1335 sub end_preduedate {
|
Line 1485 sub end_preduedate {
|
} |
} |
|
|
sub start_postanswerdate { |
sub start_postanswerdate { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
if ($target eq 'web' || $target eq 'grade') { |
if ($target eq 'web' || $target eq 'grade' || $target eq 'webgrade') { |
if ($Apache::lonhomework::scantronmode || |
if ($Apache::lonhomework::scantronmode || |
$Apache::inputtags::status['-1'] ne 'SHOW_ANSWER') { |
$Apache::inputtags::status['-1'] ne 'SHOW_ANSWER') { |
&Apache::lonxml::get_all_text("/postanswerdate",$parser); |
&Apache::lonxml::get_all_text("/postanswerdate",$parser,$style); |
} |
} |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
&Apache::lonxml::get_all_text("/postanswerdate",$parser); |
&Apache::lonxml::get_all_text("/postanswerdate",$parser,$style); |
} |
} |
return ''; |
return ''; |
} |
} |
Line 1352 sub end_postanswerdate {
|
Line 1502 sub end_postanswerdate {
|
} |
} |
|
|
sub start_notsolved { |
sub start_notsolved { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
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' || $target eq 'webgrade') { |
my $gradestatus=$Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"}; |
my $gradestatus=$Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"}; |
&Apache::lonxml::debug("not solved has :$gradestatus:"); |
&Apache::lonxml::debug("not solved has :$gradestatus:"); |
if ($gradestatus =~ /^correct/ && |
if ($gradestatus =~ /^correct/ && |
&Apache::response::show_answer()) { |
&Apache::response::show_answer()) { |
&Apache::lonxml::debug("skipping"); |
&Apache::lonxml::debug("skipping"); |
&Apache::lonxml::get_all_text("/notsolved",$parser); |
&Apache::lonxml::get_all_text("/notsolved",$parser,$style); |
} |
} |
} |
} |
return ''; |
return ''; |
Line 1371 sub end_notsolved {
|
Line 1521 sub end_notsolved {
|
} |
} |
|
|
sub start_solved { |
sub start_solved { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
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') { |
my $gradestatus=$Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"}; |
my $gradestatus=$Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"}; |
if ($gradestatus !~ /^correct/ || |
if ($gradestatus !~ /^correct/ || |
!&Apache::response::show_answer()) { |
!&Apache::response::show_answer()) { |
&Apache::lonxml::get_all_text("/solved",$parser); |
&Apache::lonxml::get_all_text("/solved",$parser,$style); |
} |
} |
} |
} |
return ''; |
return ''; |
Line 1388 sub end_solved {
|
Line 1538 sub end_solved {
|
} |
} |
|
|
sub start_problemtype { |
sub start_problemtype { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my $result; |
my $result; |
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 'analyze') { |
$target eq 'tex' || $target eq 'analyze' || $target eq 'webgrade') { |
my $mode=lc(&Apache::lonxml::get_param('mode',$parstack,$safeeval)); |
my $mode=lc(&Apache::lonxml::get_param('mode',$parstack,$safeeval)); |
if (!defined($mode)) { $mode='show'; } |
if (!defined($mode)) { $mode='show'; } |
my $for=&Apache::lonxml::get_param('for',$parstack,$safeeval); |
my $for=&Apache::lonxml::get_param('for',$parstack,$safeeval); |
Line 1400 sub start_problemtype {
|
Line 1550 sub start_problemtype {
|
if ($Apache::lonhomework::type eq lc($type)) { $found=1; } |
if ($Apache::lonhomework::type eq lc($type)) { $found=1; } |
} |
} |
if ($mode eq 'show' && !$found) { |
if ($mode eq 'show' && !$found) { |
&Apache::lonxml::get_all_text("/problemtype",$parser); |
&Apache::lonxml::get_all_text("/problemtype",$parser,$style); |
} |
} |
if ($mode eq 'hide' && $found) { |
if ($mode eq 'hide' && $found) { |
&Apache::lonxml::get_all_text("/problemtype",$parser); |
&Apache::lonxml::get_all_text("/problemtype",$parser,$style); |
} |
} |
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
$result .=&Apache::edit::tag_start($target,$token); |
$result .=&Apache::edit::tag_start($target,$token); |
Line 1437 sub start_startouttext {
|
Line 1587 sub start_startouttext {
|
} |
} |
|
|
sub end_startouttext { |
sub end_startouttext { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my $result=''; |
my $result=''; |
my $text=''; |
my $text=''; |
|
|
if ($target eq 'edit') { |
if ($target eq 'edit') { |
$text=&Apache::lonxml::get_all_text("endouttext",$parser); |
$text=&Apache::lonxml::get_all_text("endouttext",$parser,$style); |
$result.=&Apache::edit::start_table($token)."<tr><td>".&mt('Text Block')."</td> |
$result.=&Apache::edit::start_table($token)."<tr><td>".&mt('Text Block')."</td> |
<td>".&mt('Delete:'). |
<td>".&mt('Delete:'). |
&Apache::edit::deletelist($target,$token) |
&Apache::edit::deletelist($target,$token) |
Line 1481 sub end_endouttext {
|
Line 1631 sub end_endouttext {
|
} |
} |
|
|
sub delete_startouttext { |
sub delete_startouttext { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
# my $text=&Apache::lonxml::get_all_text("endouttext",$parser); |
# my $text=&Apache::lonxml::get_all_text("endouttext",$parser,$style); |
my $text=$$parser['-1']->get_text("/endouttext"); |
my $text=$$parser['-1']->get_text("/endouttext"); |
my $ntoken=$$parser['-1']->get_token(); |
my $ntoken=$$parser['-1']->get_token(); |
&Apache::lonxml::debug("Deleting :$text: and :$ntoken->[0]:$ntoken->[1]:$ntoken->[2]: for startouttext"); |
&Apache::lonxml::debug("Deleting :$text: and :$ntoken->[0]:$ntoken->[1]:$ntoken->[2]: for startouttext"); |
Line 1499 sub start_simpleeditbutton {
|
Line 1649 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(); |
$result='<table width="100%" bgcolor="#FFFFAA" border="2"><tr><td>'. |
$result='<table width="100%" bgcolor="#FFFFAA" border="2"><tr><td>'. |
'<a href="'.$url.'/smpedit?symb='.&Apache::lonnet::escape($symb).'">'.&mt('Edit').'</a> - '.&mt('Note: it can take up to 10 minutes for changes to take effect for all users.'). |
'<a href="'.$url.'/smpedit?symb='.&escape($symb).'">'.&mt('Edit').'</a> - '.&mt('Note: it can take up to 10 minutes for changes to take effect for all users.'). |
&Apache::loncommon::help_open_topic('Caching').'</td></tr></table><br />'; |
&Apache::loncommon::help_open_topic('Caching').'</td></tr></table><br />'; |
} |
} |
return $result; |
return $result; |