--- loncom/homework/inputtags.pm 2013/04/11 14:59:40 1.315
+++ loncom/homework/inputtags.pm 2013/07/24 18:21:42 1.319
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# input definitons
#
-# $Id: inputtags.pm,v 1.315 2013/04/11 14:59:40 bisitz Exp $
+# $Id: inputtags.pm,v 1.319 2013/07/24 18:21:42 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -216,7 +216,16 @@ sub start_textfield {
}
}
unless ($newvariation) {
- $oldresponse = $Apache::lonhomework::history{"resource.$partid.$resid.submission"};
+ if ((($env{'form.grade_username'} eq '') && ($env{'form.grade_domain'} eq '')) ||
+ (($env{'form.grade_username'} eq $env{'user.name'}) &&
+ ($env{'form.grade_domain'} eq $env{'user.domain'}))) {
+ $oldresponse = $Apache::lonhomework::history{"resource.$partid.$resid.submission"};
+ } elsif (($Apache::lonhomework::history{"resource.$partid.type"} eq 'anonsurvey') ||
+ ($Apache::lonhomework::history{"resource.$partid.type"} eq 'anonsurveycred')) {
+ $oldresponse = '* '.&mt('only shown to submitter').' *';
+ } else {
+ $oldresponse = $Apache::lonhomework::history{"resource.$partid.$resid.submission"};
+ }
}
if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
my $cols = &Apache::lonxml::get_param('cols',$parstack,$safeeval);
@@ -407,7 +416,18 @@ sub start_textline {
}
}
unless ($newvariation) {
- $oldresponse = $Apache::lonhomework::history{"resource.$partid.$id.submission"};
+ if ((($env{'form.grade_username'} eq '') && ($env{'form.grade_domain'} eq '')) ||
+ (($env{'form.grade_username'} eq $env{'user.name'}) &&
+ ($env{'form.grade_domain'} eq $env{'user.domain'}))) {
+ $oldresponse = $Apache::lonhomework::history{"resource.$partid.$id.submission"};
+ } elsif (($Apache::lonhomework::history{"resource.$partid.type"} eq 'anonsurvey') ||
+ ($Apache::lonhomework::history{"resource.$partid.type"} eq 'anonsurveycred') ||
+ ($Apache::lonhomework::type eq 'anonsurvey') ||
+ ($Apache::lonhomework::type eq 'anonsurveycred')) {
+ $oldresponse = '* '.&mt('only shown to submitter').' *';
+ } else {
+ $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];
@@ -463,7 +483,7 @@ sub start_textline {
$result.=&Apache::edit::select_arg('Readonly:','readonly',
['no','yes'],$token);
my $spell_langs = &spelling_languages();
- $result.=&Apache::edit::select_arg("Spellcheck for: ", 'spellcheck',
+ $result.=&Apache::edit::select_arg('Spellcheck for:', 'spellcheck',
$spell_langs, $token);
$result.=&Apache::edit::end_row();
$result.=&Apache::edit::end_table();
@@ -627,7 +647,7 @@ sub file_selector {
&mt('Allowed filetypes: [_1]',''.$uploadedfiletypes.'').'
';
}
if ($maxfilesize) {
- $constraints .= &mt('Combined size of all files not to exceed: [_1] MB[_2].',
+ $constraints .= &mt('Combined size of all files not to exceed: [_1] MB.',
''.$maxfilesize.'').'
';
}
if ($constraints) {
@@ -1638,6 +1658,7 @@ sub previous_tries {
my $count;
my %count_lookup;
my $lastrndseed;
+ my $numstamps = 0;
foreach my $i (1..$Apache::lonhomework::history{'version'}) {
my $prefix = $i.":resource.$id";
@@ -1694,10 +1715,17 @@ sub previous_tries {
$message =~ s{(