--- loncom/homework/inputtags.pm 2004/06/04 22:06:07 1.144
+++ loncom/homework/inputtags.pm 2005/03/31 21:34:34 1.163
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# input definitons
#
-# $Id: inputtags.pm,v 1.144 2004/06/04 22:06:07 albertel Exp $
+# $Id: inputtags.pm,v 1.163 2005/03/31 21:34:34 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -222,7 +222,14 @@ sub start_textline {
if ($addchars) {
$result.=&addchars('HWVAL_'.$id,$addchars);
}
- $result.= '';
}
} else {
@@ -233,11 +240,16 @@ sub start_textline {
} elsif ($target eq 'edit') {
$result=&Apache::edit::tag_start($target,$token);
$result.=&Apache::edit::text_arg('Size:','size',$token,'5').
- &Apache::edit::text_arg
- ('Click-On Texts (comma sep):','addchars',$token,10)."";
- $result.=&Apache::edit::end_table;
+ &Apache::edit::text_arg('Click-On Texts (comma sep):',
+ 'addchars',$token,10);
+ $result.=&Apache::edit::select_arg('Readonly:','readonly',
+ ['no','yes'],$token);
+ $result.=&Apache::edit::end_row();
+ $result.=&Apache::edit::end_table();
} elsif ($target eq 'modified') {
- my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,'size','addchars');
+ my $constructtag=&Apache::edit::get_new_args($token,$parstack,
+ $safeeval,'size',
+ 'addchars','readonly');
if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
} elsif ($target eq 'tex' and $Apache::lonhomework::type ne 'exam') {
my $size = &Apache::lonxml::get_param('size',$parstack,$safeeval);
@@ -282,6 +294,65 @@ sub end_hiddenline {
return "";
}
+# $part -> partid
+# $id -> responseid
+# $uploadefiletypes -> comma seperated list of extensions allowed or * for any
+# $which -> 'uploadedonly' -> only newly uploaded files
+# 'portfolioonly' -> only allow files from portfolio
+# 'both' -> allow files from either location
+# returns a table row
+sub file_selector {
+ my ($part,$id,$uploadedfiletypes,$which)=@_;
+ if (!$uploadedfiletypes) { return ''; }
+ my $result;
+
+ $result.='
';
+ if ($uploadedfiletypes ne '*') {
+ $result.=
+ &mt('Allowed filetypes: [_1]',$uploadedfiletypes).' ';
+ }
+ if ($which eq 'uploadonly' || $which eq 'both') {
+ $result.=&mt('Submit a file: (only one file can be uploaded)').
+ '
';
+ my $uploadedfile= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.uploadedfile"},'<>&"');
+
+ if ($uploadedfile) {
+ my $url=$Apache::lonhomework::history{"resource.$part.$id.uploadedurl"};
+ push (@Apache::lonxml::extlinks,$url);
+ &Apache::lonnet::allowuploaded('/adm/essayresponse',$url);
+ my $icon=&Apache::loncommon::icon($url);
+ my $curfile=''.$uploadedfile.'';
+ $result.=&mt('Currently submitted: [_1]',$curfile);
+ } else {
+ #$result.=&mt('(Hand in a file you have prepared on your computer)');
+ }
+ }
+ if ( $which eq 'both') {
+ $result.=' '.''.&mt('OR:').' ';
+ }
+ if ($which eq 'portfolioonly' || $which eq 'both') {
+ $result.=''.
+ &mt('Select Portfolio Files').' '.
+ ''.
+ ' ';
+ if ($Apache::lonhomework::history{"resource.$part.$id.portfiles"}=~/[^\s]/){
+ my @filelist;
+ foreach my $file (split(',',&Apache::lonnet::unescape($Apache::lonhomework::history{"resource.$part.$id.portfiles"}))) {
+ my (undef,undef,$domain,$user)=&Apache::lonxml::whichuser();
+ my $url="/uploaded/$domain/$user/portfolio$file";
+ my $icon=&Apache::loncommon::icon($url);
+ push(@filelist,''.$file.'');
+ }
+ $result.=&mt("Portfolio files previously selected: [_1]",join(', ',@filelist));
+ }
+ }
+ $result.=' |
';
+ return $result;
+}
+
sub checkstatus {
my ($value,$awardref,$msgref)=@_;
for (my $i=0;$i<=$#$awardref;$i++) {
@@ -317,7 +388,7 @@ sub finalizeawards {
'BAD_FORMULA', 'SIG_FAIL', 'INCORRECT',
'MISORDERED_RANK', 'INVALID_FILETYPE',
'DRAFT', 'SUBMITTED', 'ASSIGNED_SCORE',
- 'APPROX_ANS', 'EXACT_ANS') {
+ 'APPROX_ANS', 'EXACT_ANS','COMMA_FAIL') {
($result,$msg)=&checkstatus($possibleaward,$awardref,$msgref);
if (defined($result)) { return ($result,$msg); }
}
@@ -330,6 +401,7 @@ sub decideoutput {
my $button=0;
my $previousmsg;
my $bgcolor='orange';
+ my $added_computer_text=0;
my %possiblecolors =
( 'correct' => '#aaffaa',
'charged_try' => '#ffaaaa',
@@ -346,8 +418,9 @@ sub decideoutput {
$message = '\textbf{'.&mt('You are correct.').'}';
} else {
$message = "".&mt('You are correct.')."";
+ $message.=" ".&mt("Computer's answer now shown above.");
}
- $message.= " ".&mt(" Computer's answer now shown.");
+ $added_computer_text=1;
unless ($ENV{'course.'.
$ENV{'request.course.id'}.
'.disable_receipt_display'} eq 'yes') {
@@ -378,8 +451,9 @@ sub decideoutput {
$message = '\textbf{'.&mt('You are correct.').'}';
} else {
$message = "".&mt('You are correct.')."";
+ $message.=" ".&mt("Computer's answer now shown above.");
}
- $message.= " ".&mt(" Computer's answer now shown.");
+ $added_computer_text=1;
unless ($ENV{'course.'.
$ENV{'request.course.id'}.
'.disable_receipt_display'} eq 'yes') {
@@ -414,7 +488,7 @@ sub decideoutput {
} elsif ($award eq 'MISORDERED_RANK') {
$message = &mt('You have provided an invalid ranking');
if ($target ne 'tex') {
- $message.=', '.&mt('please refer to').' '.&Apache::loncommon::help_open_topic('Ranking_Problems','help on ranking problems').'.';
+ $message.=', '.&mt('please refer to').' '.&Apache::loncommon::help_open_topic('Ranking_Problems','help on ranking problems');
}
$bgcolor=$possiblecolors{'not_charged_try'};
$button=1;
@@ -423,7 +497,11 @@ sub decideoutput {
$bgcolor=$possiblecolors{'not_charged_try'};
$button=1;
} elsif ($award eq 'SIG_FAIL') {
- $message = &mt("Significant figures are incorrect, you provided [_1] significant figures while [_2] to [_3] were expected. Submission not graded.",(split(/:/,$awardmsg)));
+ my ($used,$min,$max)=split(':',$awardmsg);
+ my $word;
+ if ($used < $min) { $word=&mt('more'); }
+ if ($used > $max) { $word=&mt('fewer'); }
+ $message = &mt("Submission not graded. Use [_2] digits.",$used,$word);
$bgcolor=$possiblecolors{'not_charged_try'};
$button=1;
} elsif ($award eq 'UNIT_INVALID_INSTRUCTOR') {
@@ -432,17 +510,17 @@ sub decideoutput {
$bgcolor=$possiblecolors{'not_charged_try'};
$button=1;
} elsif ($award eq 'UNIT_INVALID_STUDENT') {
- $message = &mt('Unable to interpret units. Computer reads units as "[_1]"',''.$awardmsg.'.');
+ $message = &mt('Unable to interpret units. Computer reads units as "[_1]".',&markup_unit($awardmsg,$target));
if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Physical_Units');}
$bgcolor=$possiblecolors{'not_charged_try'};
$button=1;
} elsif ($award eq 'UNIT_FAIL' || $award eq 'UNIT_IRRECONCIBLE') {
- $message = &mt('Incompatible units. No conversion found between "[_1]" and the required units ',''.$awardmsg.'.');
+ $message = &mt('Incompatible units. No conversion found between "[_1]" and the required units.',&markup_unit($awardmsg,$target));
if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Physical_Units');}
$bgcolor=$possiblecolors{'not_charged_try'};
$button=1;
} elsif ($award eq 'UNIT_NOTNEEDED') {
- $message = &mt('Only a number required. Computer reads units of "[_1]"',''.$awardmsg.'.');
+ $message = &mt('Only a number required. Computer reads units of "[_1]".',&markup_unit($awardmsg,$target));
$bgcolor=$possiblecolors{'not_charged_try'};
$button=1;
} elsif ($award eq 'NO_UNIT') {
@@ -450,6 +528,10 @@ sub decideoutput {
if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Physical_Units')};
$bgcolor=$possiblecolors{'not_charged_try'};
$button=1;
+ } elsif ($award eq 'COMMA_FAIL') {
+ $message = &mt("Proper comma separation is required").'.';
+ $bgcolor=$possiblecolors{'not_charged_try'};
+ $button=1;
} elsif ($award eq 'BAD_FORMULA') {
$message = &mt("Unable to understand formula");
$bgcolor=$possiblecolors{'not_charged_try'};
@@ -483,12 +565,23 @@ sub decideoutput {
$bgcolor=$possiblecolors{'correct'};
$button=1;
}
- if ($Apache::inputtags::status[-1] eq 'SHOW_ANSWER') {
- $message.=" ".&mt("Computer's answer now shown.");
+ if ($Apache::inputtags::status[-1] eq 'SHOW_ANSWER' &&
+ !$added_computer_text && $target ne 'tex') {
+ $message.=" ".&mt("Computer's answer now shown above.");
+ $added_computer_text=1;
}
return ($button,$bgcolor,$message,$previousmsg);
}
+sub markup_unit {
+ my ($unit,$target)=@_;
+ if ($target eq 'tex') {
+ return '\texttt{'.&Apache::lonxml::latex_special_symbols($unit).'}';
+ } else {
+ return "".$unit."";
+ }
+}
+
sub removealldata {
my ($id)=@_;
foreach my $key (keys(%Apache::lonhomework::results)) {
@@ -515,10 +608,15 @@ sub hidealldata {
sub setgradedata {
my ($award,$msg,$id,$previously_used) = @_;
- # if the student already has it correct, don't modify the status
- if ($Apache::lonhomework::scantronmode && defined($ENV{'form.CODE'})) {
+ if ($Apache::lonhomework::scantronmode &&
+ &Apache::lonnet::validCODE($ENV{'form.CODE'})) {
$Apache::lonhomework::results{"resource.CODE"}=$ENV{'form.CODE'};
+ } elsif ($Apache::lonhomework::scantronmode &&
+ $ENV{'form.CODE'} eq '' &&
+ $Apache::lonhomework::history{"resource.CODE"} ne '') {
+ $Apache::lonhomework::results{"resource.CODE"}='';
}
+
if (!$Apache::lonhomework::scantronmode &&
$Apache::inputtags::status['-1'] ne 'CAN_ANSWER' &&
$Apache::inputtags::status['-1'] ne 'CANNOT_ANSWER') {
@@ -527,7 +625,10 @@ sub setgradedata {
} elsif ( $Apache::lonhomework::history{"resource.$id.solved"} !~
/^correct/ || $Apache::lonhomework::scantronmode ||
lc($Apache::lonhomework::problemstatus) eq 'no') {
- #handle assignment of tries and solved status
+ # the student doesn't already have it correct,
+ # or we are in a mode (scantron orno problem status) where a correct
+ # can become incorrect
+ # handle assignment of tries and solved status
my $solvemsg;
if ($Apache::lonhomework::scantronmode) {
$solvemsg='correct_by_scantron';
@@ -561,7 +662,8 @@ sub setgradedata {
} elsif ( $award eq 'INCORRECT' ) {
$Apache::lonhomework::results{"resource.$id.tries"} =
$Apache::lonhomework::history{"resource.$id.tries"} + 1;
- if (lc($Apache::lonhomework::problemstatus) eq 'no') {
+ if (lc($Apache::lonhomework::problemstatus) eq 'no' ||
+ $Apache::lonhomework::scantronmode) {
$Apache::lonhomework::results{"resource.$id.awarded"} = 0;
}
$Apache::lonhomework::results{"resource.$id.solved"} =
@@ -580,7 +682,8 @@ sub setgradedata {
} else {
$Apache::lonhomework::results{"resource.$id.solved"} =
'incorrect_attempted';
- if (lc($Apache::lonhomework::problemstatus) eq 'no') {
+ if (lc($Apache::lonhomework::problemstatus) eq 'no' ||
+ $Apache::lonhomework::scantronmode) {
$Apache::lonhomework::results{"resource.$id.tries"} =
$Apache::lonhomework::history{"resource.$id.tries"} + 1;
$Apache::lonhomework::results{"resource.$id.awarded"} = 0;
@@ -687,7 +790,6 @@ sub gradestatus {
&Apache::lonxml::debug('Getting message');
($showbutton,$bgcolor,$message,$previousmsg) =
&decideoutput($award,$awardmsg,$solved,$previous,$target);
- &Apache::lonnet::logthis(" mesage is $message status is $status");
if ($target eq 'tex') {
$message='\vskip 2 mm '.$message.' ';
} else {
@@ -709,7 +811,7 @@ sub gradestatus {
if ( $Apache::lonhomework::type eq 'survey') { $tries_text=&mt('Submissions'); }
if ( $showbutton ) {
if ($target eq 'tex') {
- if ($ENV{'request.state'} ne "construct" && $Apache::lonhomework::type ne 'exam') {
+ if ($ENV{'request.state'} ne "construct" && $Apache::lonhomework::type ne 'exam' && $ENV{'form.suppress_tries'} ne 'yes') {
$trystr = ' {\vskip 1 mm \small \textit{'.$tries_text.'} '.$tries.'/'.$maxtries.'} \vskip 2 mm ';
} else {
$trystr = '\vskip 0 mm ';
@@ -729,15 +831,14 @@ sub gradestatus {
if ( $status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER') {$showbutton = 0;}
if ( $showbutton ) {
if ($target ne 'tex') {
- $button = '';
+ $button = '';
}
}
if ($Apache::lonhomework::history{"resource.$id.afterduedate"}) {
#last submissions was after due date
- if ($target eq 'tex') {
- $latemessage=' The last submission was after the Due Date ';
- } else {
- $latemessage="The last submission was after the Due Date | ";
+ $latemessage=&mt(' The last submission was after the Due Date ');;
+ if ($target eq 'web') {
+ $latemessage=''.$latemessage.' | ';
}
}
}