--- loncom/homework/inputtags.pm 2008/12/11 14:52:30 1.253
+++ loncom/homework/inputtags.pm 2009/12/06 21:00:15 1.260.4.1
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# input definitons
#
-# $Id: inputtags.pm,v 1.253 2008/12/11 14:52:30 bisitz Exp $
+# $Id: inputtags.pm,v 1.260.4.1 2009/12/06 21:00:15 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -388,12 +388,13 @@ sub start_textline {
&& $Apache::lonhomework::type ne 'exam') {
my $size = &Apache::lonxml::get_param('size',$parstack,$safeeval);
if ($size != 0) {$size=$size*2; $size.=' mm';} else {$size='40 mm';}
- if ($env{'form.pdfFormFields'} eq 'yes') {
+ if ($env{'form.pdfFormFields'} eq 'yes'
+ && $Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
my $fieldname = $env{'request.symb'}.
'&part_'. $Apache::inputtags::part.
'&textresponse'.
'&HWVAL_' . $Apache::inputtags::response['-1'];
- $result="\n\\\\\n".'\textField{'.$fieldname.'}{'.$size.'}{12 bp}';
+ $result='\textField{'.$fieldname.'}{'.$size.'}{12 bp}';
} else {
$result='\framebox['.$size.'][s]{\tiny\strut}';
}
@@ -735,7 +736,7 @@ sub decideoutput {
'.disable_receipt_display'} ne 'yes') &&
($Apache::lonhomework::type ne 'practice')) {
$message.=(($target eq 'web')?'
':' ').
- &mt('Your receipt is [_1]',
+ &mt('Your receipt no. is [_1]',
(&Apache::lonnet::receipt($Apache::inputtags::part).
(($target eq 'web')?&Apache::loncommon::help_open_topic('Receipt'):'')));
}
@@ -817,7 +818,7 @@ sub decideoutput {
$css_class=$possible_class{'not_charged_try'};
$button=1;
} elsif ($award eq 'INVALID_FILETYPE') {
- $message = &mt('Submission won\'t be graded. The type of file submitted is not allowed.');
+ $message = &mt("Submission won't be graded. The type of file submitted is not allowed.");
$css_class=$possible_class{'not_charged_try'};
$button=1;
} elsif ($award eq 'SIG_FAIL') {
@@ -868,11 +869,17 @@ sub decideoutput {
$css_class=$possible_class{'charged_try'};
$button=1;
} elsif ($award eq 'SUBMITTED') {
- $message = &mt("Your submission has been recorded.");
+ if ($env{'request.uri'} eq '/res/gci/gci/internal/submission.problem') {
+ if ($target eq 'web') {
+ $message .= '
'.&mt('Thank you for making a submission to the Geosciences Concept Inventory via the GCI Web Center.');
+ }
+ } else {
+ $message = &mt("Your submission has been recorded.");
+ }
$css_class=$possible_class{'no_grade'};
$button=1;
} elsif ($award eq 'DRAFT') {
- $message = &mt("A draft copy has been saved.");
+ $message = &mt("Copy saved but not submitted.");
$css_class=$possible_class{'not_charged_try'};
$button=1;
} elsif ($award eq 'ASSIGNED_SCORE') {
@@ -894,21 +901,41 @@ sub decideoutput {
my (undef,undef,$domain,$user)=&Apache::lonnet::whichuser();
foreach my $resid(@Apache::inputtags::response){
if ($Apache::lonhomework::history{"resource.$part.$resid.handback"}) {
- $message.='
';
+ if ($target eq 'tex') {
+ $message.= "\\\\\n";
+ } else {
+ $message.='
';
+ }
my @files = split(/\s*,\s*/,
$Apache::lonhomework::history{"resource.$part.$resid.handback"});
my $file_msg;
foreach my $file (@files) {
- $file_msg.= '
'.$file.'';
+ if ($target eq 'tex') {
+ $file_msg.= "\\\\\n".$file;
+ } else {
+ $file_msg.= '
'.$file.'';
+ }
}
$message .= &mt('Returned file(s): [_1]',$file_msg);
+ if ($target eq 'tex') {
+ $message.= "\\\\\n";
+ } else {
+ $message.='
';
+ }
}
}
if (&Apache::lonhomework::hide_problem_status()
&& $Apache::inputtags::status[-1] ne 'SHOW_ANSWER'
&& &hide_award($award)) {
- $message = &mt("Answer Submitted: Your final submission will be graded after the due date.");
+ if ($env{'request.uri'} eq '/res/gci/gci/internal/submission.problem') {
+ if ($target eq 'web') {
+ $message = &mt("Your submission has been recorded.").'
'.
+ &mt('Thank you for making a submission to the Geosciences Concept Inventory via the GCI Web Center.');
+ }
+ } else {
+ $message = &mt("Answer Submitted: Your final submission will be graded after the due date.");
+ }
$css_class=$possible_class{'no_grade'};
$button=1;
}
@@ -1223,15 +1250,19 @@ sub get_grade_messages {
$trystr = '\vskip 0 mm ';
}
} else {
- $trystr = '