--- loncom/homework/structuretags.pm 2024/03/03 22:51:31 1.512.2.24.2.15 +++ loncom/homework/structuretags.pm 2019/10/31 15:01:22 1.564 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: structuretags.pm,v 1.512.2.24.2.15 2024/03/03 22:51:31 raeburn Exp $ +# $Id: structuretags.pm,v 1.564 2019/10/31 15:01:22 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -62,9 +62,7 @@ use Apache::lonxml; use Apache::londefdef; use Apache::lonenc(); use Apache::loncommon(); -use Apache::lonnavmaps; use Time::HiRes qw( gettimeofday tv_interval ); -use HTML::Entities(); use lib '/home/httpd/lib/perl/'; use LONCAPA; @@ -250,9 +248,11 @@ sub end_tex { sub homework_js { my ($postsubmit,$timeout); if (($env{'request.course.id'}) && ($env{'request.state'} ne 'construct')) { - my $crstype; - if (&Apache::loncommon::course_type() eq 'Community') { + my $crstype = &Apache::loncommon::course_type(); + if ($crstype eq 'Community') { $crstype = 'community'; + } elsif ($crstype eq 'Placement') { + $crstype = 'placement'; } else { if ($env{'course.'.$env{'request.course.id'}.'.internal.coursecode'}) { $crstype = 'official'; @@ -294,8 +294,8 @@ sub homework_js { $jstimeout = 1000 * $timeout; } return &Apache::loncommon::resize_textarea_js(). - &Apache::loncommon::colorfuleditor_js(). - &Apache::lonxml::setmode_javascript(). + &Apache::loncommon::colorfuleditor_js(). + &setmode_javascript(). <<"JS"; +ENDSCRIPT +} + sub page_start { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$name, $extra_head)=@_; @@ -428,7 +443,7 @@ sub page_start { if (&Apache::lonhtmlcommon::htmlareabrowser()) { my %textarea_args; if (($env{'request.state'} ne 'construct') || - (&Apache::loncommon::nocodemirror())) { + ($env{'environment.nocodemirror'})) { %textarea_args = ( dragmath => 'math', ); @@ -503,9 +518,9 @@ sub page_start { } } if ($needs_upload) { - $extra_head .= &Apache::lonhtmlcommon::file_submissionchk_js(). - ''; + $extra_head .= &Apache::lonhtmlcommon::file_submissionchk_js() + .''; } } @@ -609,9 +624,7 @@ sub page_start { my ($symb,$courseid,$udom,$uname)=&Apache::lonnet::whichuser(); my ($path,$multiresp) = &Apache::loncommon::get_turnedin_filepath($symb,$uname,$udom); - if ($env{'request.user_in_effect'}) { - $form_tag_start .= ' onsubmit="preventDefault();"'; - } elsif (($is_task) || ($needs_upload)) { + if (($is_task) || ($needs_upload)) { $form_tag_start .= ' onsubmit="return file_submission_check(this,'."'$path','$multiresp'".');"'; } $form_tag_start.='>'."\n"; @@ -665,28 +678,13 @@ sub setup_rndseed { } if ($Apache::lonhomework::type eq 'randomizetry') { my $partfortries = $Apache::inputtags::part; -# -# Where question type is "randomizetry" for a problem containing -# a single part (and unless type is explicitly set to not be -# "randomizetry" for that part), the number of tries used to -# determine randomization will be for that part, and randomization -# from calls to &random() in a perl script block before the part tag, -# will change based on the number of tries, and value of the -# "randomizeontries" parameter in effect for the single part. -# if (ref($probpartlist) eq 'ARRAY') { - if ((@{$probpartlist} == 1) && ($probpartlist->[0] ne $partfortries)) { - if (&Apache::lonnet::EXT('resource.'.$probpartlist->[0].'.type') eq 'randomizetry') { - $partfortries = $probpartlist->[0]; - } else { - $partfortries = ''; - } + if ((@{$probpartlist} == 1) && ($probpartlist->[0] ne $Apache::inputtags::part)) { + $partfortries = $probpartlist->[0]; } } - if ($partfortries ne '') { - $numtries = $Apache::lonhomework::history{"resource.$partfortries.tries"}; - $reqtries = &Apache::lonnet::EXT("resource.$partfortries.randomizeontries"); - } + $numtries = $Apache::lonhomework::history{"resource.$partfortries.tries"}; + $reqtries = &Apache::lonnet::EXT("resource.$partfortries.randomizeontries"); } if (($env{'request.state'} eq "construct") || ($symb eq '') @@ -705,7 +703,7 @@ sub setup_rndseed { $env{'form.rndseed'}=$rndseed; } } - if ((($env{'request.state'} eq "construct") || ($symb eq '')) && + if (($env{'request.state'} eq "construct") && ($Apache::lonhomework::type eq 'randomizetry')) { if ($numtries) { if (($reqtries =~ /^\d+$/) && ($reqtries > 1)) { @@ -800,18 +798,13 @@ sub problem_edit_action_button { sub problem_edit_buttons { my ($mode)=@_; - my %editors = &Apache::loncommon::permitted_editors(); # Buttons that save my $result = '