[LON-CAPA-cvs] cvs: loncom(version_2_10_X) /homework structuretags.pm
raeburn
raeburn@source.lon-capa.org
Mon, 20 Dec 2010 05:51:36 -0000
This is a MIME encoded message
--raeburn1292824296
Content-Type: text/plain
raeburn Mon Dec 20 05:51:36 2010 EDT
Modified files: (Branch: version_2_10_X)
/loncom/homework structuretags.pm
Log:
- Backport 1.479, 1.480.
--raeburn1292824296
Content-Type: text/plain
Content-Disposition: attachment; filename="raeburn-20101220055136.txt"
Index: loncom/homework/structuretags.pm
diff -u loncom/homework/structuretags.pm:1.465.2.6 loncom/homework/structuretags.pm:1.465.2.7
--- loncom/homework/structuretags.pm:1.465.2.6 Tue Nov 9 17:52:13 2010
+++ loncom/homework/structuretags.pm Mon Dec 20 05:51:35 2010
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
-# $Id: structuretags.pm,v 1.465.2.6 2010/11/09 17:52:13 raeburn Exp $
+# $Id: structuretags.pm,v 1.465.2.7 2010/12/20 05:51:35 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -368,9 +368,15 @@
}
sub setup_rndseed {
- my ($safeeval)=@_;
- my $rndseed;
+ my ($safeeval,$target)=@_;
my ($symb)=&Apache::lonnet::whichuser();
+ my ($questiontype,$set_safespace,$rndseed);
+ if ($target eq 'analyze') {
+ $questiontype = $env{'form.grade_questiontype'};
+ }
+ unless (defined($questiontype)) {
+ $questiontype = $Apache::lonhomework::type;
+ }
if ($env{'request.state'} eq "construct"
|| $symb eq ''
|| $Apache::lonhomework::type eq 'practice'
@@ -385,6 +391,14 @@
}
$env{'form.rndseed'}=$rndseed;
}
+ if (($env{'request.state'} eq "construct") &&
+ ($Apache::lonhomework::type eq 'randomizetry')) {
+ 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 &mt('New Problem Variation')
&& $env{'form.submitted'} eq 'yes') ||
$env{'form.newrandomization'} eq &mt('New Randomization')) {
@@ -400,10 +414,42 @@
if ($Apache::lonhomework::history{'resource.CODE'}) {
$rndseed=&Apache::lonnet::rndseed();
}
- if ($safeeval) {
- &Apache::lonxml::debug("Setting rndseed to $rndseed");
- &Apache::run::run('$external::randomseed="'.$rndseed.'";',$safeeval);
- }
+ $set_safespace = 1;
+ } elsif ($questiontype eq 'randomizetry') {
+ if ($target eq 'analyze') {
+ if (defined($env{'form.grade_rndseed'})) {
+ $rndseed = $env{'form.grade_rndseed'};
+ }
+ }
+ unless (($target eq 'analyze') && (defined($rndseed))) {
+ $rndseed=&Apache::lonnet::rndseed();
+ my $curr_try = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.tries"};
+ if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
+ $curr_try ++;
+ }
+ if ($rndseed =~/^(\d+)[,:](\d+)$/) {
+ $rndseed = $1;
+ }
+ if ($curr_try) {
+ my $reqtries = &Apache::lonnet::EXT("resource.$Apache::inputtags::part.randomizeontries");
+ if (($reqtries =~ /^\d+$/) && ($reqtries > 1)) {
+ my $inc = int(($curr_try-1)/$reqtries);
+ $rndseed += $inc;
+ } else {
+ $rndseed += $curr_try;
+ }
+ }
+ }
+ $set_safespace = 1;
+ }
+ if ($set_safespace) {
+ if ($safeeval) {
+ &Apache::lonxml::debug("Setting rndseed to $rndseed");
+ &Apache::run::run('$external::randomseed="'.$rndseed.'";',$safeeval);
+ }
+ }
+ unless (($env{'request.state'} eq "construct") || ($symb eq '')) {
+ $env{'form.'.$Apache::inputtags::part.'.rndseed'}=$rndseed;
}
return $rndseed;
}
@@ -521,6 +567,7 @@
".&option('anonsurvey' ,'problemtype').&mt("Anonymous Survey Question")."</option>
".&option('anonsurveycred' ,'problemtype').&mt("Anonymous Survey Question (with credit)")."</option>
".&option('practice' ,'problemtype').&mt("Practice Problem")."</option>
+ ".&option('randomizetry' ,'problemtype').&mt("New Randomization Each Try")."</option>
</select>
</span>
$show_all
@@ -698,7 +745,7 @@
sub store_aggregates {
my ($symb,$courseid) = @_;
- my (%aggregate,%anoncounter);
+ my (%aggregate,%anoncounter,%randtrycounter);
my @parts;
my $cdomain = $env{'course.'.$env{'request.course.id'}.'.domain'};
my $cname = $env{'course.'.$env{'request.course.id'}.'.num'};
@@ -728,7 +775,13 @@
$aggregate{$symb."\0".$part."\0attempts"} = 1;
}
if (($Apache::lonhomework::results{'resource.'.$part.'.type'} eq 'anonsurvey') ||
- ($Apache::lonhomework::results{'resource.'.$part.'.type'} eq 'anonsurveycred')) {
+ ($Apache::lonhomework::results{'resource.'.$part.'.type'} eq 'anonsurveycred') ||
+ ($Apache::lonhomework::results{'resource.'.$part.'.type'} eq 'randomizetry')) {
+ if ($Apache::lonhomework::results{'resource.'.$part.'.type'} eq 'randomizetry') {
+ $randtrycounter{$symb."\0".$part} = 1;
+ } else {
+ $anoncounter{$symb."\0".$part} = 1;
+ }
$anoncounter{$symb."\0".$part} = 1;
my $needsrelease = $Apache::lonnet::needsrelease{'parameter:type:'.$Apache::lonhomework::results{'resource.'.$part.'.type'}};
if ($needsrelease) {
@@ -753,6 +806,10 @@
&Apache::lonnet::cinc('nohist_anonsurveys',\%anoncounter,
$cdomain,$cname);
}
+ if (keys(%randtrycounter) > 0) {
+ &Apache::lonnet::cinc('nohist_randomizetry',\%randtrycounter,
+ $cdomain,$cname);
+ }
}
sub checkout_msg {
@@ -960,7 +1017,7 @@
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,$target); }
if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
$target eq 'tex') {
#handle exam checkout
@@ -978,9 +1035,15 @@
my @interval=&Apache::lonnet::EXT("resource.0.interval");
&Apache::lonnet::set_first_access($interval[1]);
}
+
+ ($status,$accessmsg,my $slot_name,my $slot) =
+ &Apache::lonhomework::check_slot_access('0','problem');
+ push (@Apache::inputtags::status,$status);
+
#handle rand seed in construction space
- my $rndseed=&setup_rndseed($safeeval);
+ my $rndseed=&setup_rndseed($safeeval,$target);
my ($symb)=&Apache::lonnet::whichuser();
+
if ($env{'request.state'} ne "construct" &&
($symb eq '' || $Apache::lonhomework::type eq 'practice')) {
$form_tag_start.='<input type="hidden" name="rndseed" value="'.
@@ -1006,11 +1069,13 @@
$form_tag_start.=&practice_problem_header();
}
$form_tag_start.='<hr />';
- }
-
- ($status,$accessmsg,my $slot_name,my $slot) =
- &Apache::lonhomework::check_slot_access('0','problem');
- push (@Apache::inputtags::status,$status);
+ } elsif (($env{'request.state'} ne "construct") &&
+ ($Apache::lonhomework::type eq 'randomizetry') &&
+ ($status eq 'CAN_ANSWER')) {
+ my $reqtries = &Apache::lonnet::EXT("resource.$Apache::inputtags::part.randomizeontries");
+ my $problemstatus = &get_problem_status($Apache::inputtags::part);
+ $form_tag_start.=&randomizetry_problem_header($problemstatus,$reqtries);
+ }
my $expression='$external::datestatus="'.$status.'";';
$expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.0.solved"}.'";';
@@ -1091,6 +1156,13 @@
$result .= '<input type="hidden" name="grade_'.$field.
'" value="'.$env{"form.grade_$field"}.'" />'."\n";
}
+ foreach my $field ('questiontype','rndseed') {
+ if ($env{"form.grade_$field"} ne '') {
+ $result .= '<input type="hidden" name="grade_'.$field.
+ '" value="'.$env{"form.grade_$field"}.'" />'."\n";
+ }
+ }
+
}
} elsif ($target eq 'tex') {
$result .= 'INSERTTEXFRONTMATTERHERE';
@@ -1320,7 +1392,7 @@
($result,$form_tag_start)=
&page_start($target,$token,$tagstack,$parstack,$parser,$safeeval,
$name);
- my $rndseed=&setup_rndseed($safeeval);
+ my $rndseed=&setup_rndseed($safeeval,$target);
$result.=" \n $form_tag_start".
'<input type="hidden" name="submitted" value="yes" />';
$result.=&problem_web_to_edit_header($rndseed);
@@ -1891,6 +1963,25 @@
}
} 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 ($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);
+ }
+ }
$result.='<a name="'.&escape($Apache::inputtags::part).'"></a>';
}
}
@@ -2062,7 +2153,8 @@
['anonsurvey','Anonymous Survey'],
['anonsurveycred','Anonymous Survey (with credit)'],
['problem','Homework Problem'],
- ['practice','Practice Problem'] ]
+ ['practice','Practice Problem'],
+ ['randomizetry','New Randomization Each Try'] ]
,$token);
$result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
} elsif ($target eq 'modified') {
@@ -2197,6 +2289,63 @@
'</span>';
}
+sub randomizetry_problem_header {
+ my ($problemstatus,$reqtries) = @_;
+ my ($header,$text);
+ if ($reqtries > 1) {
+ $header = &mt('New Problem Variation After Every [quant,_1,Try,Tries]',$reqtries);
+ if (($problemstatus eq 'no') ||
+ ($problemstatus eq 'no_feedback_ever')) {
+ $text = &mt('A new variation will be generated after every [quant,_1,try,tries], until the tries limit is reached.',$reqtries);
+ } else {
+ $text = &mt('A new variation will be generated after every [quant,_1,try,tries], until correct or tries limit is reached.',$reqtries);
+ }
+ } else {
+ $header = &mt('New Problem Variation Each Try');
+ if (($problemstatus eq 'no') ||
+ ($problemstatus eq 'no_feedback_ever')) {
+ $text = &mt('A new variation will be generated after each try until the tries limit is reached.');
+
+ } else {
+ $text = &mt('A new variation will be generated after each try until correct or tries limit is reached.');
+ }
+ }
+ return '<span class="LC_info"><h3>'.$header.'</h3></span>'.
+ '<span class="LC_info">'.$text.'</span><hr />';
+}
+
+sub randomizetry_part_header {
+ my ($problemstatus,$reqtries,$num) = @_;
+ my ($header,$text);
+ if ($reqtries eq 'none') {
+ $header = &mt('No Question Variation');
+ $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') ||
+ ($problemstatus eq 'no_feedback_ever')) {
+ $text = &mt('For this question a new variation will be generated after every [quant,_1,try,tries], until the tries limit is reached.',$reqtries);
+ } else {
+ $text = &mt('For this question a new variation will be generated after every [quant,_1,try,tries], until correct or tries limit is reached.',$reqtries);
+ }
+ } else {
+ $header = &mt('New Question Variation For Each Try');
+ if (($problemstatus eq 'no') ||
+ ($problemstatus eq 'no_feedback_ever')) {
+ $text = &mt('For this question a new variation will be generated after each try until the tries limit is reached.');
+ } else {
+ $text = &mt('For this question a new variation will be generated after each try until correct or tries limit is reached.');
+ }
+ }
+ my $output;
+ if ($num > 1) {
+ $output .= '<hr />';
+ }
+ $output .= '<span class="LC_info"><h4>'.$header.'</h4></span>'.
+ '<span class="LC_info">'.$text.'</span><br /><br />';
+ return $output;
+}
+
1;
__END__
--raeburn1292824296--