--- loncom/homework/inputtags.pm 2010/11/03 17:06:28 1.273
+++ loncom/homework/inputtags.pm 2011/10/08 19:19:58 1.295
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# input definitons
#
-# $Id: inputtags.pm,v 1.273 2010/11/03 17:06:28 raeburn Exp $
+# $Id: inputtags.pm,v 1.295 2011/10/08 19:19:58 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -60,7 +60,7 @@ use LONCAPA;
BEGIN {
- &Apache::lonxml::register('Apache::inputtags',('hiddenline','textfield','textline'));
+ &Apache::lonxml::register('Apache::inputtags',('hiddensubmission','hiddenline','textfield','textline'));
}
=pod
@@ -175,7 +175,18 @@ sub start_textfield {
if ($target eq 'web') {
$Apache::lonxml::evaluate--;
my $partid=$Apache::inputtags::part;
- my $oldresponse = &HTML::Entities::encode($Apache::lonhomework::history{"resource.$partid.$resid.submission"},'<>&"');
+ my ($oldresponse,$newvariation);
+ if ((($Apache::lonhomework::history{"resource.$partid.type"} eq 'randomizetry') ||
+ ($Apache::lonhomework::type eq 'randomizetry')) &&
+ ($Apache::inputtags::status[-1] eq 'CAN_ANSWER')) {
+ if ($env{'form.'.$partid.'.rndseed'} ne
+ $Apache::lonhomework::history{"resource.$partid.rndseed"}) {
+ $newvariation = 1;
+ }
+ }
+ unless ($newvariation) {
+ $oldresponse = &HTML::Entities::encode($Apache::lonhomework::history{"resource.$partid.$resid.submission"},'<>&"');
+ }
if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
my $cols = &Apache::lonxml::get_param('cols',$parstack,$safeeval);
if ( $cols eq '') { $cols = 80; }
@@ -331,16 +342,26 @@ sub start_textline {
$maxlength = ' maxlength="'.$size.'"';
}
}
- my $oldresponse = $Apache::lonhomework::history{"resource.$partid.$id.submission"};
- &Apache::lonxml::debug("oldresponse $oldresponse is ".ref($oldresponse));
-
- if (ref($oldresponse) eq 'ARRAY') {
- $oldresponse = $oldresponse->[$#Apache::inputtags::inputlist];
- }
- $oldresponse = &HTML::Entities::encode($oldresponse,'<>&"');
- $oldresponse =~ s/^\s+//;
- $oldresponse =~ s/\s+$//;
- $oldresponse =~ s/\s+/ /g;
+ my ($oldresponse,$newvariation);
+ if ((($Apache::lonhomework::history{"resource.$partid.type"} eq 'randomizetry') ||
+ ($Apache::lonhomework::type eq 'randomizetry')) &&
+ ($Apache::inputtags::status[-1] eq 'CAN_ANSWER')) {
+ if ($env{'form.'.$partid.'.rndseed'} ne
+ $Apache::lonhomework::history{"resource.$partid.rndseed"}) {
+ $newvariation = 1;
+ }
+ }
+ unless ($newvariation) {
+ $oldresponse = $Apache::lonhomework::history{"resource.$partid.$id.submission"};
+ &Apache::lonxml::debug("oldresponse $oldresponse is ".ref($oldresponse));
+ if (ref($oldresponse) eq 'ARRAY') {
+ $oldresponse = $oldresponse->[$#Apache::inputtags::inputlist];
+ }
+ $oldresponse = &HTML::Entities::encode($oldresponse,'<>&"');
+ $oldresponse =~ s/^\s+//;
+ $oldresponse =~ s/\s+$//;
+ $oldresponse =~ s/\s+/ /g;
+ }
if ($Apache::lonhomework::type ne 'exam') {
my $addchars=&Apache::lonxml::get_param('addchars',$parstack,$safeeval);
$result='';
@@ -457,6 +478,49 @@ sub end_hiddenline {
return "";
}
+
+sub start_hiddensubmission {
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+ my $result = "";
+ my $input_id = &start_input($parstack,$safeeval);
+ if ($target eq 'web') {
+ $Apache::lonxml::evaluate--;
+ if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
+ my $partid=$Apache::inputtags::part;
+ my $id=$Apache::inputtags::response[-1];
+ if ($Apache::lonhomework::type ne 'exam') {
+ my $value = &Apache::lonxml::get_param('value',$parstack,$safeeval);
+ $value = &HTML::Entities::encode($value,'<>&"');
+ $result= '';
+ }
+ }
+ } elsif ($target eq 'edit') {
+ $result=&Apache::edit::tag_start($target,$token);
+ $result.=&Apache::edit::text_arg('Value:','value',$token,'15');
+ $result.=&Apache::edit::end_row();
+ $result.=&Apache::edit::end_table();
+ } elsif ($target eq 'modified') {
+ my $constructtag=&Apache::edit::get_new_args($token,$parstack,
+ $safeeval,'value');
+ if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
+ }
+
+ if ( ($target eq 'web' || $target eq 'tex')
+ && $Apache::lonhomework::type eq 'exam'
+ && &needs_exam_box($tagstack)) {
+ $result.=&exam_box($target);
+ }
+ return $result;
+}
+
+sub end_hiddensubmission {
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+ if ($target eq 'web') { $Apache::lonxml::evaluate++; }
+ elsif ($target eq 'edit') { return ('','no'); }
+ &end_input();
+ return "";
+}
+
=pod
=item file_selector()
@@ -507,7 +571,7 @@ sub file_selector {
if ($which eq 'uploadonly' || $which eq 'both') {
$result.=&mt('Submit a file: (only one file per submission)').
'
';
+ $jspart.'_'.$id.'" id="HWFILE'.$jspart.'_'.$id.'" />
';
}
if ( $which eq 'both') {
$result.='
'.''.&mt('OR:').'
';
@@ -574,9 +638,9 @@ sub current_file_submissions {
}
}
}
+ my $num = 0;
foreach my $name (sort(keys(%okfiles))) {
if (ref($okfiles{$name}) eq 'ARRAY') {
- my $num = 0;
foreach my $url (@{$okfiles{$name}}) {
if (ref($rows{$url}) eq 'HASH') {
my $link = $rows{$url}{link};
@@ -602,7 +666,7 @@ sub current_file_submissions {
}
$result .=
'