--- loncom/homework/structuretags.pm 2024/03/03 22:51:31 1.512.2.24.2.15
+++ loncom/homework/structuretags.pm 2016/09/14 02:42:43 1.550
@@ -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.550 2016/09/14 02:42:43 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -62,14 +62,12 @@ 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;
BEGIN {
- &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'));
+ &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'));
}
@@ -194,28 +192,6 @@ sub end_web {
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 {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';
@@ -250,9 +226,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 +272,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 +421,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 +496,9 @@ sub page_start {
}
}
if ($needs_upload) {
- $extra_head .= &Apache::lonhtmlcommon::file_submissionchk_js().
- '';
+ $extra_head .= &Apache::lonhtmlcommon::file_submissionchk_js()
+ .'';
}
}
@@ -609,9 +602,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";
@@ -656,43 +647,17 @@ sub get_resource_name {
sub setup_rndseed {
my ($safeeval,$target,$probpartlist)=@_;
my ($symb)=&Apache::lonnet::whichuser();
- my ($questiontype,$set_safespace,$rndseed,$numtries,$reqtries);
+ my ($questiontype,$set_safespace,$rndseed);
if ($target eq 'analyze') {
$questiontype = $env{'form.grade_questiontype'};
}
unless (defined($questiontype)) {
$questiontype = $Apache::lonhomework::type;
}
- 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 ($partfortries ne '') {
- $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'))) {
+ if ($env{'request.state'} eq "construct"
+ || $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'};
@@ -701,23 +666,17 @@ sub setup_rndseed {
if (!$rndseed) {
$rndseed=time;
}
- unless ($env{'form.code_for_randomlist'}) {
- $env{'form.rndseed'}=$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)) {
- my $inc = int($numtries/$reqtries);
- $rndseed += $inc;
- } else {
- $rndseed += $numtries;
- }
+ my $tries = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.tries"};
+ if ($tries) {
+ $rndseed += $tries;
}
$env{'form.'.$Apache::inputtags::part.'.rndseed'}=$rndseed;
}
- if ( ($env{'form.resetdata'} eq 'new_problem_variation'
+ if ( ($env{'form.resetdata'} eq &mt('New Problem Variation')
&& $env{'form.submitted'} eq 'yes') ||
$env{'form.newrandomization'} eq &mt('New Randomization')) {
srand(time);
@@ -735,11 +694,7 @@ sub setup_rndseed {
$rndseed=join(':',&Apache::lonnet::digest($rndseed));
}
}
- 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'}) {
+ if ($Apache::lonhomework::history{'resource.CODE'}) {
$rndseed=&Apache::lonnet::rndseed();
}
$set_safespace = 1;
@@ -751,7 +706,13 @@ sub setup_rndseed {
}
unless (($target eq 'analyze') && (defined($rndseed))) {
$rndseed=&Apache::lonnet::rndseed();
- my $curr_try = $numtries;
+ my $partfortries = $Apache::inputtags::part;
+ 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') {
$curr_try ++;
}
@@ -759,6 +720,7 @@ sub setup_rndseed {
$rndseed = $1;
}
if ($curr_try) {
+ my $reqtries = &Apache::lonnet::EXT("resource.$partfortries.randomizeontries");
if (($reqtries =~ /^\d+$/) && ($reqtries > 1)) {
my $inc = int(($curr_try-1)/$reqtries);
$rndseed += $inc;
@@ -800,18 +762,13 @@ sub problem_edit_action_button {
sub problem_edit_buttons {
my ($mode)=@_;
- my %editors = &Apache::loncommon::permitted_editors();
# Buttons that save
my $result = '
';
if ($mode eq 'editxml') {
- if ($editors{'xml'}) {
- $result.=&problem_edit_action_button('subsaveedit','saveeditxml','s','Save and EditXML');
- }
+ $result.=&problem_edit_action_button('subsaveedit','saveeditxml','s','Save and EditXML');
$result.=&problem_edit_action_button('subsaveview','saveviewxml','v','Save and View');
} else {
- if ($editors{'edit'}) {
- $result.=&problem_edit_action_button('subsaveedit','saveedit','s','Save and Edit');
- }
+ $result.=&problem_edit_action_button('subsaveedit','saveedit','s','Save and Edit');
$result.=&problem_edit_action_button('subsaveview','saveview','v','Save and View');
}
$result.="\n
'.
&problem_edit_action_button('subdiscview','discard','d','Discard Edits and View',1);
if ($mode eq 'editxml') {
- if ($editors{'edit'}) {
- $result.=&problem_edit_action_button('subedit','edit','e','Edit',1);
- }
- if ($editors{'daxe'}) {
- $result.=&problem_edit_action_button('subdaxe','daxe','w','Edit with Daxe',1);
- }
+ $result.=&problem_edit_action_button('subedit','edit','e','Edit',1);
$result.=&problem_edit_action_button('subundo','undoxml','u','Undo',1);
- if (&Apache::loncommon::nocodemirror()) {
+ if ($env{'environment.nocodemirror'}) {
$result.=&Apache::lonhtmlcommon::dragmath_button("LC_editxmltext",1);
}
} else {
- if ($editors{'xml'}) {
- $result.=&problem_edit_action_button('subeditxml','editxml','x','EditXML',1);
- }
- if ($editors{'daxe'}) {
- $result.=&problem_edit_action_button('subdaxe','daxe','w','Edit with Daxe',1);
- }
+ $result.=&problem_edit_action_button('subeditxml','editxml','x','EditXML',1);
$result.=&problem_edit_action_button('subundo','undo','u','Undo',1);
}
$result.="\n
";
@@ -879,7 +826,6 @@ sub problem_edit_header {
return $return;
}
-
sub problem_edit_footer {
my $resource = $env{'request.ambiguous'};
return '
@@ -908,7 +854,6 @@ sub option {
sub problem_web_to_edit_header {
my ($rndseed)=@_;
- my %editors = &Apache::loncommon::permitted_editors();
my $result .= '
';
if (!$Apache::lonhomework::parsing_a_task) {
@@ -956,7 +901,7 @@ sub problem_web_to_edit_header {
".&mt("Problem Type:")."
-
+
@@ -1038,20 +982,15 @@ $show_all
';
$result.='';
- if ($editors{'edit'}) {
- $result .= '';
- }
- if ($editors{'xml'}) {
- $result .= '';
- }
- if (($editors{'daxe'}) &&
- ($env{'browser.type'} ne 'explorer' || $env{'browser.version'} > 9)) {
+ $result .= '';
+ $result .= '';
+ if ($env{'browser.type'} ne 'explorer' || $env{'browser.version'} > 9) {
my $uri = $env{'request.uri'};
my $daxeurl = '/daxepage'.$uri;
- $result .= '';
+ $result .= '';
}
$result.='
@@ -1079,8 +1018,8 @@ sub initialize_storage {
|| $Apache::lonhomework::type eq 'practice') {
my $namespace = $symb || $env{'request.uri'};
- if ($env{'form.resetdata'} eq 'reset_submissions' ||
- ($env{'form.resetdata'} eq 'new_problem_variation'
+ if ($env{'form.resetdata'} eq &mt('Reset Submissions') ||
+ ($env{'form.resetdata'} eq &mt('New Problem Variation')
&& $env{'form.submitted'} eq 'yes') ||
$env{'form.newrandomization'} eq &mt('New Randomization')) {
&Apache::lonnet::tmpreset($namespace,'',$domain,$name);
@@ -1088,7 +1027,7 @@ sub initialize_storage {
}
%Apache::lonhomework::history=
&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");
} else {
%Apache::lonhomework::history=
@@ -1111,13 +1050,13 @@ sub initialize_storage {
&check_correctness_changes() is called in two circumstances
in which the results hash is to be stored permanently, for
grading triggered by a student's submission, where feedback on
- correctness is to be provided to the student.
+ correctness is to be provided to the student.
1. Immediately prior to storing the results hash
- To handle the case where a student's submission (and award) were
+ To handle the case where a student's submission (and award) were
stored after history was retrieved in &initialize_storage(), e.g.,
- if a student submitted answers in quick succession (e.g., from
+ if a student submitted answers in quick succession (e.g., from
multiple tabs). &Apache::inputtags::hidealldata() is called for
any parts with out-of-order storage (i.e., correct then incorrect,
where awarded >= 1 when correct).
@@ -1127,13 +1066,13 @@ sub initialize_storage {
To handle the case where lond on the student's homeserver returns
delay:N -- where N is the number of transactions between the last
retrieved in &initialize_storage() and the last stored immediately
- before permanent storage of the current transaction via
- lond::store_handler(). &Apache::grades::makehidden() is called
+ before permanent storage of the current transaction via
+ lond::store_handler(). &Apache::grades::makehidden() is called
for any parts with out-of-order storage (i.e., correct then incorrect,
where awarded >= 1 when correct).
- Will call &store_aggregates() to increment totals for attempts,
- students, and corrects, if running user has student role.
+ Will call &store_aggregates() to increment totals for attempts,
+ students, and corrects, if running user has student role.
=cut
@@ -1146,8 +1085,6 @@ sub finalize_storage {
delete(@Apache::lonhomework::results{@remove});
my ($symb,$courseid,$domain,$name) =
&Apache::lonnet::whichuser($given_symb);
- my ($passback,$pbscope,$pbmap,$pbsymb,$pbtype,$crsdef,$ltinum,
- $ltiref,$total,$possible,$dopassback);
if ($env{'request.state'} eq 'construct'
|| $symb eq ''
|| $Apache::lonhomework::type eq 'practice') {
@@ -1157,28 +1094,17 @@ sub finalize_storage {
$namespace,'',$domain,$name);
&Apache::lonxml::debug('Construct Store return message:'.$result);
} else {
- my ($laststore,$checkedparts,@parts,%postcorrect,%record);
+ my ($laststore,$checkedparts,@parts,%postcorrect);
if (($env{'user.name'} eq $name) && ($env{'user.domain'} eq $domain) &&
(!$Apache::lonhomework::scantronmode) && (!defined($env{'form.grade_symb'})) &&
(!defined($env{'form.grade_courseid'}))) {
- if (($env{'request.lti.login'}) || ($env{'request.deeplink.login'})) {
- my ($map)=&Apache::lonnet::decode_symb($symb);
- $map = &Apache::lonnet::clutter($map);
- if ($env{'request.lti.login'}) {
- ($passback,$pbscope,$pbmap,$pbsymb,$ltinum,$ltiref) =
- &needs_lti_passback($courseid,$symb,$map);
- } elsif ($env{'request.deeplink.login'}) {
- ($passback,$pbscope,$pbmap,$pbsymb,$crsdef,$ltinum,$ltiref) =
- &needs_linkprot_passback($courseid,$symb,$map);
- }
- }
if ($Apache::lonhomework::history{'version'}) {
$laststore = $Apache::lonhomework::history{'version'}.'='.
$Apache::lonhomework::history{'timestamp'};
} else {
$laststore = '0=0';
}
- %record = &Apache::lonnet::restore($symb,$courseid,$domain,$name);
+ my %record = &Apache::lonnet::restore($symb,$courseid,$domain,$name);
if ($record{'version'}) {
my ($newversion,$oldversion,$oldtimestamp);
if ($Apache::lonhomework::history{'version'}) {
@@ -1254,98 +1180,8 @@ 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) && ($pbscope eq 'resource') && ($pbsymb 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);
&store_aggregates($symb,$courseid);
- if ($dopassback) {
- my $scoreformat = 'decimal';
- if (($env{'request.lti.login'}) || ($env{'request.deeplink.login'})) {
- if (ref($ltiref) eq 'HASH') {
- if ($ltiref->{'scoreformat'} =~ /^(decimal|ratio|percentage)$/) {
- $scoreformat = $1;
- }
- }
- }
- my ($pbid,$pburl,$pbtype);
- if ($env{'request.lti.login'}) {
- $pbid = $env{'request.lti.passbackid'};
- $pburl = $env{'request.lti.passbackurl'};
- $pbtype = 'lti';
- } elsif ($env{'request.deeplink.login'}) {
- $pbid = $env{'request.linkprotpbid'};
- $pburl = $env{'request.linkprotpburl'};
- $pbtype = 'linkprot';
- }
- my $ltigrade = {
- 'ltinum' => $ltinum,
- 'lti' => $ltiref,
- 'crsdef' => $crsdef,
- 'cid' => $courseid,
- 'uname' => $env{'user.name'},
- 'udom' => $env{'user.domain'},
- 'pbid' => $pbid,
- 'pburl' => $pburl,
- 'pbtype' => $pbtype,
- 'scope' => $pbscope,
- 'pbmap' => $pbmap,
- 'pbsymb' => $pbsymb,
- 'format' => $scoreformat,
- };
- if ($pbscope eq 'resource') {
- $ltigrade->{'total'} = $total;
- $ltigrade->{'possible'} = $possible;
- }
- push(@Apache::lonhomework::ltipassback,$ltigrade);
- }
}
} else {
&Apache::lonxml::debug('Nothing to store');
@@ -1353,116 +1189,18 @@ sub finalize_storage {
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 $itemnum = $env{'request.lti.login'};
- 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,$itemnum,$lti{$itemnum});
- }
- }
- }
- }
- return;
-}
-
-sub needs_linkprot_passback {
- my ($courseid,$symb,$map) = @_;
- if (($env{'request.linkprotpbid'}) && ($env{'request.linkprotpburl'})) {
- if ($courseid =~ /^($LONCAPA::match_domain)_($LONCAPA::match_courseid)$/) {
- my ($cdom,$cnum) = ($1,$2);
- my ($deeplink_symb,$deeplink_map,$deeplink,$passback);
- $deeplink_symb = &Apache::loncommon::deeplink_login_symb($cnum,$cdom);
- if ($deeplink_symb) {
- if ($deeplink_symb =~ /\.(page|sequence)$/) {
- $deeplink_map = &Apache::lonnet::deversion((&Apache::lonnet::decode_symb($deeplink_symb))[2]);
- my $navmap = Apache::lonnavmaps::navmap->new();
- if (ref($navmap)) {
- $deeplink = $navmap->get_mapparam(undef,$deeplink_map,'0.deeplink');
- }
- } else {
- $deeplink = &Apache::lonnet::EXT('resource.0.deeplink',$deeplink_symb);
- $deeplink_map = &Apache::lonnet::deversion((&Apache::lonnet::decode_symb($deeplink_symb))[0]);
- }
- if (($deeplink ne '') && ($env{'request.linkprot'} ne '')) {
- my ($itemid,$tinyurl) = split(/:/,$env{'request.linkprot'});
- if ($itemid =~ /^(\d+)(c|d)$/) {
- my ($itemnum,$itemtype) = ($1,$2);
- my ($crsdef,$lti_in_use);
- if ($itemtype eq 'c') {
- $crsdef = 1;
- my %crslti = &Apache::lonnet::get_course_lti($cnum,$cdom,'provider');
- $lti_in_use = $crslti{$itemnum};
- } else {
- my %domlti = &Apache::lonnet::get_domain_lti($cdom,'linkprot');
- $lti_in_use = $domlti{$itemnum};
- }
- my ($state,$others,$listed,$scope,$protect,$display,$target,$exit) = split(/,/,$deeplink);
- my ($passback,$pbscope);
- if ($scope eq 'res') {
- if ($deeplink_symb eq $symb) {
- $passback = 1;
- $pbscope = 'resource';
- }
- } elsif ($scope eq 'map') {
- if (&Apache::lonnet::clutter($deeplink_map) eq $map) {
- $passback = 1;
- $pbscope = 'nonrec';
- }
- } elsif ($scope eq 'rec') {
- if (&Apache::lonnet::clutter($deeplink_map) eq $map) {
- $passback = 1;
- $pbscope = 'map';
- } else {
- my @recurseup = &Apache::lonnet::get_map_hierarchy($map,$env{'request.course.id'});
- if (grep(/^\Q$deeplink_map\E$/,@recurseup)) {
- $passback = 1;
- $pbscope = 'map';
- }
- }
- }
- return ($passback,$pbscope,$deeplink_map,$deeplink_symb,$crsdef,$itemnum,$lti_in_use);
- }
- }
- }
- }
- }
-}
-
=pod
=item check_correctness_changes()
For all parts for which current results contain a solved status
- of "incorrect_attempted", check if there was a transaction in which
- solved was set to "correct_by_student" in the time since the last
- transaction (retrieved when &initialize_storage() was called i.e.,
+ of "incorrect_attempted", check if there was a transaction in which
+ solved was set to "correct_by_student" in the time since the last
+ transaction (retrieved when &initialize_storage() was called i.e.,
when &start_problem() was called), unless:
(a) questiontype parameter is set to survey or anonymous survey (+/- credit)
(b) problemstatus is set to no or no_feedback_ever
- If such a transaction exists, and did not occur after "reset status"
+ If such a transaction exists, and did not occur after "reset status"
by a user with grading privileges, then the current transaction is an
example of an out-of-order transaction (i.e., incorrect occurring after
correct). Accordingly, the current transaction should be hidden.
@@ -1556,8 +1294,8 @@ sub store_aggregates {
} else {
$anoncounter{$symb."\0".$part} = 1;
}
- my $needsrelease = $Apache::lonnet::needsrelease{'parameter:type:'.$Apache::lonhomework::results{'resource.'.$part.'.type'}};
- if ($needsrelease) {
+ my $needsrelease = $Apache::lonnet::needsrelease{'parameter:type:'.$Apache::lonhomework::results{'resource.'.$part.'.type'}.'::'};
+ if ($needsrelease) {
my $curr_required = $env{'course.'.$env{'request.course.id'}.'.internal.releaserequired'};
if ($curr_required eq '') {
&Apache::lonnet::update_released_required($needsrelease);
@@ -1585,106 +1323,13 @@ 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.='
'.&mt('Unable to determine if this resource is open due to network problems. Please try again later.').'
'.&mt('Access requires reservation to work at specific time/place.').'
';
+ } elsif ($status ne 'NOT_YET_VIEWED') {
+ $msg.='
'.&mt('Not open to be viewed').'
';
+ }
+ 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')).
+ ' '.
+ &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.').' '.
+ &mt('Somebody else has already used this particular computer for that purpose.');
+ }
+ }
+ $result.=$msg.' ';
+ } 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') {
my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser,
$style);
- $result .= &checkin_prompt($target,$slot_name,$slot,'problem');
+ if ($target eq 'web') {
+ $result .=
+ &Apache::bridgetask::proctor_validation_screen($slot);
+ } elsif ($target eq 'grade') {
+ my $checkinresult = &Apache::bridgetask::proctor_check_auth($slot_name,$slot,
+ 'problem');
+ if ($checkinresult = /^error:/) {
+ $result .= 'error';
+ }
+ }
} elsif ($target eq 'web') {
if ($status eq 'CAN_ANSWER') {
$resource_due = &Apache::lonhomework::due_date(0, $env{'request.symb'});
if ($slot_name ne '') {
- $resource_due = &selfcheckin_resource($resource_due,$slot_name,$slot,
- $env{'request.symb'});
+ 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: $env{'request.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'};
+ }
+ }
+ }
}
if ($resource_due) {
my $time_left = $resource_due - time();
@@ -2058,13 +1749,9 @@ sub start_problem {
$result.= &problem_web_to_edit_header($env{'form.rndseed'});
}
if ($Apache::lonhomework::type eq 'practice') {
- $result.= ''.
+ $result.= ''.
&practice_problem_header().'';
- } 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
@@ -2086,6 +1773,8 @@ sub start_problem {
} elsif ($target eq 'tex') {
$result .= 'INSERTTEXFRONTMATTERHERE';
$result .= &select_metadata_hyphenation();
+
+
}
} elsif ($target eq 'edit') {
$result .= $form_tag_start.&problem_edit_header();
@@ -2205,12 +1894,6 @@ sub end_problem {
}
}
$result =~ s/INSERTTEXFRONTMATTERHERE/$frontmatter/;
- } elsif ($target eq 'web') {
- if ($env{'request.user_in_effect'}) {
- &reset_problem_globals('problem');
- $result .= &Apache::lonhtmlcommon::set_compute_end_time();
- return $result;
- }
}
my $status=$Apache::inputtags::status['-1'];
@@ -2250,7 +1933,39 @@ sub end_problem {
# Added separately at end of this routine, after added
# 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});
} elsif ($target eq 'tex') {
my $endminipage = '';
@@ -2270,24 +1985,7 @@ sub end_problem {
}
}
if ($target eq 'web') {
- $result.=&Apache::functionplotresponse::init_script();
- if ($Apache::lonhomework::default_type eq 'randomizetry') {
- my ($symb) = &Apache::lonnet::whichuser();
- if ((($env{'request.state'} eq 'construct') || ($symb eq '')) &&
- ($status eq 'CAN_ANSWER')) {
- unless (@Apache::inputtags::partlist > 1) {
- $result.= <<"ENDJS";
-
-ENDJS
- }
- }
- }
+ $result.=&Apache::functionplotresponse::init_script();
}
if ($target eq 'grade') {
&Apache::lonhomework::showhash(%Apache::lonhomework::results);
@@ -2325,8 +2023,7 @@ ENDJS
# computation:
#
if ($target eq 'web') {
- $result .= &Apache::lonhtmlcommon::dash_to_minus_js().
- &Apache::lonhtmlcommon::set_compute_end_time();
+ $result .= &Apache::lonhtmlcommon::set_compute_end_time();
#
# Closing tags delayed so any tags
# not in head can appear inside body, for valid xhtml.
@@ -2365,8 +2062,8 @@ sub start_library {
'';
$result.=&problem_web_to_edit_header($rndseed);
if ($Apache::lonhomework::type eq 'practice') {
- $result.= ''.
+ $result.= ''.
&practice_problem_header().'';
}
}
@@ -2382,8 +2079,6 @@ sub end_library {
&& ($#$tagstack eq 0 && $$tagstack[0] eq 'library')
&& $env{'request.state'} eq "construct") {
$result.=''.&Apache::loncommon::end_page({'discussion' => 1});
- } elsif ($target eq 'meta') {
- $result.=&Apache::response::meta_response_order();
}
if ( $#$tagstack eq 0 && $$tagstack[0] eq 'library') {
&reset_problem_globals('library');
@@ -2866,12 +2561,7 @@ sub start_randomlist {
}
if (@randomlist) {
my @idx_arr = (0 .. $#randomlist);
- if ($env{'form.code_for_randomlist'}) {
- &Apache::structuretags::shuffle(\@idx_arr,$target);
- undef($env{'form.code_for_randomlist'});
- } else {
- &Apache::structuretags::shuffle(\@idx_arr);
- }
+ &Apache::structuretags::shuffle(\@idx_arr);
my $bodytext = '';
my $show=$#randomlist;
my $showarg=&Apache::lonxml::get_param('show',$parstack,$safeeval);
@@ -2910,10 +2600,10 @@ sub start_randomlist {
}
sub shuffle {
- my ($a,$target) = @_;
+ my $a=shift;
my $i;
if (ref($a) eq 'ARRAY' && @$a) {
- &Apache::response::pushrandomnumber(undef,$target);
+ &Apache::response::pushrandomnumber();
for($i=@$a;--$i;) {
my $j=int(&Math::Random::random_uniform() * ($i+1));
next if $i == $j;
@@ -3087,14 +2777,20 @@ sub start_part {
} elsif ($target eq 'web') {
if ($status eq 'CAN_ANSWER') {
my $problemstatus = &get_problem_status($Apache::inputtags::part);
+ my $probrandomize = &Apache::lonnet::EXT("resource.$Apache::inputtags::partlist[0].type");
+ my $probrandtries = &Apache::lonnet::EXT("resource.$Apache::inputtags::partlist[0].randomizeontries");
my $num = scalar(@Apache::inputtags::partlist)-1;
- if ((($Apache::lonhomework::default_type eq 'randomizetry') ||
- ($Apache::lonhomework::randomizetrypart)) &&
- ($Apache::lonhomework::type ne 'randomizetry')) {
- $result .= &randomizetry_part_header($problemstatus,'none',$num);
- } elsif ($Apache::lonhomework::type eq 'randomizetry') {
- $Apache::lonhomework::randomizetrypart = 1;
- my $reqtries = &Apache::lonnet::EXT("resource.$id.randomizeontries");
+ if ($probrandomize eq 'randomizetry') {
+ if (&Apache::lonnet::EXT("resource.$Apache::inputtags::part.type") ne 'randomizetry') {
+ $result .= &randomizetry_part_header($problemstatus,'none',$num);
+ } else {
+ my $reqtries = &Apache::lonnet::EXT("resource.$Apache::inputtags::part.randomizeontries");
+ if ($probrandtries ne $reqtries) {
+ $result .= &randomizetry_part_header($problemstatus,$reqtries,$num);
+ }
+ }
+ } elsif (&Apache::lonnet::EXT("resource.$Apache::inputtags::part.type") eq 'randomizetry') {
+ my $reqtries = &Apache::lonnet::EXT("resource.$Apache::inputtags::part.randomizeontries");
$result .= &randomizetry_part_header($problemstatus,$reqtries,$num);
}
}
@@ -3149,11 +2845,7 @@ sub end_part {
$gradestatus='';
}
$result.=$gradestatus;
- if ($$tagstack[-2] eq 'td' and $target eq 'tex') {
- if (not $env{'form.problem_split'}=~/yes/) {
- $result.='\end{minipage}';
- }
- }
+ if ($$tagstack[-2] eq 'td' and $target eq 'tex') {$result.='\end{minipage}';}
} elsif ($target eq 'edit') {
$result.=&Apache::edit::end_table();
} elsif ($target eq 'modified') {
@@ -3269,7 +2961,7 @@ sub start_problemtype {
['hide','Hide']]
,$token);
$result .=&Apache::edit::checked_arg('When used as type(s):','for',
- [ ['exam','Exam/Quiz Problem'],
+ [ ['exam','Bubblesheet Exam/Quiz Problem'],
['survey','Survey'],
['surveycred','Survey (with credit)'],
['anonsurvey','Anonymous Survey'],
@@ -3318,7 +3010,7 @@ sub end_startouttext {
.&Apache::edit::deletelist($target,$token)
.''
.'
';
- if (&Apache::loncommon::nocodemirror()) {
+ if ($env{'environment.nocodemirror'}) {
$result.=&Apache::lonhtmlcommon::dragmath_button($areaid,1);
} else {
$result.=' ';
@@ -3418,7 +3110,7 @@ sub practice_problem_header {
}
sub randomizetry_problem_header {
- my ($problemstatus,$reqtries,$symb) = @_;
+ my ($problemstatus,$reqtries) = @_;
my ($header,$text);
if ($reqtries > 1) {
$header = &mt('New Problem Variation After Every [quant,_1,Try,Tries]',$reqtries);
@@ -3438,13 +3130,8 @@ sub randomizetry_problem_header {
$text = &mt('A new variation will be generated after each try until correct or tries limit is reached.');
}
}
- if (($env{'request.state'} eq "construct") || ($symb eq '')) {
- return '
'.
- '
'.$header.'
'.$text.'
';
- } else {
- return '
'.$header.'
'.
- ''.$text.'';
- }
+ return '
'.$header.'
'.
+ ''.$text.'';
}
sub randomizetry_part_header {
@@ -3452,7 +3139,7 @@ sub randomizetry_part_header {
my ($header,$text);
if ($reqtries eq 'none') {
$header = &mt('No Question Variation');
- $text = &mt('For this question there will be no new variation after a try.');
+ $text = &mt('For this question there will no new variation after a try.');
} elsif ($reqtries > 1) {
$header = &mt('New Question Variation After Every [quant,_1,Try,Tries]',$reqtries);
if (($problemstatus eq 'no') ||