version 1.148, 2004/07/15 19:44:54
|
version 1.163, 2005/03/31 21:34:34
|
Line 222 sub start_textline {
|
Line 222 sub start_textline {
|
if ($addchars) { |
if ($addchars) { |
$result.=&addchars('HWVAL_'.$id,$addchars); |
$result.=&addchars('HWVAL_'.$id,$addchars); |
} |
} |
$result.= '<input type="text" name="HWVAL_'.$id.'" value="'. |
my $readonly=&Apache::lonxml::get_param('readonly',$parstack, |
|
$safeeval); |
|
if (lc($readonly) eq 'yes') { |
|
$readonly=' readonly="readonly" '; |
|
} else { |
|
$readonly=''; |
|
} |
|
$result.= '<input type="text" '.$readonly.' name="HWVAL_'.$id.'" value="'. |
$oldresponse.'" size="'.$size.'" maxlength="'.$maxlength.'" />'; |
$oldresponse.'" size="'.$size.'" maxlength="'.$maxlength.'" />'; |
} |
} |
} else { |
} else { |
Line 233 sub start_textline {
|
Line 240 sub start_textline {
|
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
$result=&Apache::edit::tag_start($target,$token); |
$result=&Apache::edit::tag_start($target,$token); |
$result.=&Apache::edit::text_arg('Size:','size',$token,'5'). |
$result.=&Apache::edit::text_arg('Size:','size',$token,'5'). |
&Apache::edit::text_arg |
&Apache::edit::text_arg('Click-On Texts (comma sep):', |
('Click-On Texts (comma sep):','addchars',$token,10)."</td></tr>"; |
'addchars',$token,10); |
$result.=&Apache::edit::end_table; |
$result.=&Apache::edit::select_arg('Readonly:','readonly', |
|
['no','yes'],$token); |
|
$result.=&Apache::edit::end_row(); |
|
$result.=&Apache::edit::end_table(); |
} elsif ($target eq 'modified') { |
} 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); } |
if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); } |
} elsif ($target eq 'tex' and $Apache::lonhomework::type ne 'exam') { |
} elsif ($target eq 'tex' and $Apache::lonhomework::type ne 'exam') { |
my $size = &Apache::lonxml::get_param('size',$parstack,$safeeval); |
my $size = &Apache::lonxml::get_param('size',$parstack,$safeeval); |
Line 282 sub end_hiddenline {
|
Line 294 sub end_hiddenline {
|
return ""; |
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 <tr> |
|
sub file_selector { |
|
my ($part,$id,$uploadedfiletypes,$which)=@_; |
|
if (!$uploadedfiletypes) { return ''; } |
|
my $result; |
|
|
|
$result.='<tr><td>'; |
|
if ($uploadedfiletypes ne '*') { |
|
$result.= |
|
&mt('Allowed filetypes: <b>[_1]</b>',$uploadedfiletypes).'<br />'; |
|
} |
|
if ($which eq 'uploadonly' || $which eq 'both') { |
|
$result.=&mt('Submit a file: (only one file can be uploaded)'). |
|
' <br /><input type="file" size="50" name="HWFILE'. |
|
$part.'_'.$id.'" /><br />'; |
|
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='<a href="'.$url.'"><img src="'.$icon. |
|
'" border="0" />'.$uploadedfile.'</a>'; |
|
$result.=&mt('Currently submitted: <tt>[_1]</tt>',$curfile); |
|
} else { |
|
#$result.=&mt('(Hand in a file you have prepared on your computer)'); |
|
} |
|
} |
|
if ( $which eq 'both') { |
|
$result.='<br />'.'<strong>'.&mt('OR:').'</strong><br />'; |
|
} |
|
if ($which eq 'portfolioonly' || $which eq 'both') { |
|
$result.='<a href='."'".'javascript:void(window.open("/adm/portfolio?mode=selectfile&fieldname=HWPORT'.$part.'_'.$id.'","cat","height=600,width=800,scrollbars=1,resizable=1,menubar=2,location=1"))'."'".'>'. |
|
&mt('Select Portfolio Files').'</a><br />'. |
|
'<input type="text" size="50" name="HWPORT'.$part.'_'.$id.'" value="" />'. |
|
'<br />'; |
|
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,'<a href="'.$url.'"><img src="'.$icon. |
|
'" border="0" />'.$file.'</a>'); |
|
} |
|
$result.=&mt("Portfolio files previously selected: <strong>[_1]</strong>",join(', ',@filelist)); |
|
} |
|
} |
|
$result.='</td></tr>'; |
|
return $result; |
|
} |
|
|
sub checkstatus { |
sub checkstatus { |
my ($value,$awardref,$msgref)=@_; |
my ($value,$awardref,$msgref)=@_; |
for (my $i=0;$i<=$#$awardref;$i++) { |
for (my $i=0;$i<=$#$awardref;$i++) { |
Line 317 sub finalizeawards {
|
Line 388 sub finalizeawards {
|
'BAD_FORMULA', 'SIG_FAIL', 'INCORRECT', |
'BAD_FORMULA', 'SIG_FAIL', 'INCORRECT', |
'MISORDERED_RANK', 'INVALID_FILETYPE', |
'MISORDERED_RANK', 'INVALID_FILETYPE', |
'DRAFT', 'SUBMITTED', 'ASSIGNED_SCORE', |
'DRAFT', 'SUBMITTED', 'ASSIGNED_SCORE', |
'APPROX_ANS', 'EXACT_ANS') { |
'APPROX_ANS', 'EXACT_ANS','COMMA_FAIL') { |
($result,$msg)=&checkstatus($possibleaward,$awardref,$msgref); |
($result,$msg)=&checkstatus($possibleaward,$awardref,$msgref); |
if (defined($result)) { return ($result,$msg); } |
if (defined($result)) { return ($result,$msg); } |
} |
} |
Line 347 sub decideoutput {
|
Line 418 sub decideoutput {
|
$message = '\textbf{'.&mt('You are correct.').'}'; |
$message = '\textbf{'.&mt('You are correct.').'}'; |
} else { |
} else { |
$message = "<b>".&mt('You are correct.')."</b>"; |
$message = "<b>".&mt('You are correct.')."</b>"; |
|
$message.=" ".&mt("Computer's answer now shown above."); |
} |
} |
$message.=" ".&mt("Computer's answer now shown."); |
|
$added_computer_text=1; |
$added_computer_text=1; |
unless ($ENV{'course.'. |
unless ($ENV{'course.'. |
$ENV{'request.course.id'}. |
$ENV{'request.course.id'}. |
Line 380 sub decideoutput {
|
Line 451 sub decideoutput {
|
$message = '\textbf{'.&mt('You are correct.').'}'; |
$message = '\textbf{'.&mt('You are correct.').'}'; |
} else { |
} else { |
$message = "<b>".&mt('You are correct.')."</b>"; |
$message = "<b>".&mt('You are correct.')."</b>"; |
|
$message.=" ".&mt("Computer's answer now shown above."); |
} |
} |
$message.=" ".&mt("Computer's answer now shown."); |
|
$added_computer_text=1; |
$added_computer_text=1; |
unless ($ENV{'course.'. |
unless ($ENV{'course.'. |
$ENV{'request.course.id'}. |
$ENV{'request.course.id'}. |
Line 417 sub decideoutput {
|
Line 488 sub decideoutput {
|
} elsif ($award eq 'MISORDERED_RANK') { |
} elsif ($award eq 'MISORDERED_RANK') { |
$message = &mt('You have provided an invalid ranking'); |
$message = &mt('You have provided an invalid ranking'); |
if ($target ne 'tex') { |
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'}; |
$bgcolor=$possiblecolors{'not_charged_try'}; |
$button=1; |
$button=1; |
Line 439 sub decideoutput {
|
Line 510 sub decideoutput {
|
$bgcolor=$possiblecolors{'not_charged_try'}; |
$bgcolor=$possiblecolors{'not_charged_try'}; |
$button=1; |
$button=1; |
} elsif ($award eq 'UNIT_INVALID_STUDENT') { |
} elsif ($award eq 'UNIT_INVALID_STUDENT') { |
$message = &mt('Unable to interpret units. Computer reads units as "[_1]"','<tt>'.$awardmsg.'</tt>.'); |
$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');} |
if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Physical_Units');} |
$bgcolor=$possiblecolors{'not_charged_try'}; |
$bgcolor=$possiblecolors{'not_charged_try'}; |
$button=1; |
$button=1; |
} elsif ($award eq 'UNIT_FAIL' || $award eq 'UNIT_IRRECONCIBLE') { |
} elsif ($award eq 'UNIT_FAIL' || $award eq 'UNIT_IRRECONCIBLE') { |
$message = &mt('Incompatible units. No conversion found between "[_1]" and the required units ','<tt>'.$awardmsg.'</tt>.'); |
$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');} |
if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Physical_Units');} |
$bgcolor=$possiblecolors{'not_charged_try'}; |
$bgcolor=$possiblecolors{'not_charged_try'}; |
$button=1; |
$button=1; |
} elsif ($award eq 'UNIT_NOTNEEDED') { |
} elsif ($award eq 'UNIT_NOTNEEDED') { |
$message = &mt('Only a number required. Computer reads units of "[_1]"','<tt>'.$awardmsg.'</tt>.'); |
$message = &mt('Only a number required. Computer reads units of "[_1]".',&markup_unit($awardmsg,$target)); |
$bgcolor=$possiblecolors{'not_charged_try'}; |
$bgcolor=$possiblecolors{'not_charged_try'}; |
$button=1; |
$button=1; |
} elsif ($award eq 'NO_UNIT') { |
} elsif ($award eq 'NO_UNIT') { |
Line 457 sub decideoutput {
|
Line 528 sub decideoutput {
|
if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Physical_Units')}; |
if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Physical_Units')}; |
$bgcolor=$possiblecolors{'not_charged_try'}; |
$bgcolor=$possiblecolors{'not_charged_try'}; |
$button=1; |
$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') { |
} elsif ($award eq 'BAD_FORMULA') { |
$message = &mt("Unable to understand formula"); |
$message = &mt("Unable to understand formula"); |
$bgcolor=$possiblecolors{'not_charged_try'}; |
$bgcolor=$possiblecolors{'not_charged_try'}; |
Line 491 sub decideoutput {
|
Line 566 sub decideoutput {
|
$button=1; |
$button=1; |
} |
} |
if ($Apache::inputtags::status[-1] eq 'SHOW_ANSWER' && |
if ($Apache::inputtags::status[-1] eq 'SHOW_ANSWER' && |
!$added_computer_text) { |
!$added_computer_text && $target ne 'tex') { |
$message.=" ".&mt("Computer's answer now shown."); |
$message.=" ".&mt("Computer's answer now shown above."); |
$added_computer_text=1; |
$added_computer_text=1; |
} |
} |
return ($button,$bgcolor,$message,$previousmsg); |
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 "<tt>".$unit."</tt>"; |
|
} |
|
} |
|
|
sub removealldata { |
sub removealldata { |
my ($id)=@_; |
my ($id)=@_; |
foreach my $key (keys(%Apache::lonhomework::results)) { |
foreach my $key (keys(%Apache::lonhomework::results)) { |
Line 524 sub hidealldata {
|
Line 608 sub hidealldata {
|
|
|
sub setgradedata { |
sub setgradedata { |
my ($award,$msg,$id,$previously_used) = @_; |
my ($award,$msg,$id,$previously_used) = @_; |
# if the student already has it correct, don't modify the status |
if ($Apache::lonhomework::scantronmode && |
if ($Apache::lonhomework::scantronmode && defined($ENV{'form.CODE'})) { |
&Apache::lonnet::validCODE($ENV{'form.CODE'})) { |
$Apache::lonhomework::results{"resource.CODE"}=$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 && |
if (!$Apache::lonhomework::scantronmode && |
$Apache::inputtags::status['-1'] ne 'CAN_ANSWER' && |
$Apache::inputtags::status['-1'] ne 'CAN_ANSWER' && |
$Apache::inputtags::status['-1'] ne 'CANNOT_ANSWER') { |
$Apache::inputtags::status['-1'] ne 'CANNOT_ANSWER') { |
Line 536 sub setgradedata {
|
Line 625 sub setgradedata {
|
} elsif ( $Apache::lonhomework::history{"resource.$id.solved"} !~ |
} elsif ( $Apache::lonhomework::history{"resource.$id.solved"} !~ |
/^correct/ || $Apache::lonhomework::scantronmode || |
/^correct/ || $Apache::lonhomework::scantronmode || |
lc($Apache::lonhomework::problemstatus) eq 'no') { |
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; |
my $solvemsg; |
if ($Apache::lonhomework::scantronmode) { |
if ($Apache::lonhomework::scantronmode) { |
$solvemsg='correct_by_scantron'; |
$solvemsg='correct_by_scantron'; |
Line 570 sub setgradedata {
|
Line 662 sub setgradedata {
|
} elsif ( $award eq 'INCORRECT' ) { |
} elsif ( $award eq 'INCORRECT' ) { |
$Apache::lonhomework::results{"resource.$id.tries"} = |
$Apache::lonhomework::results{"resource.$id.tries"} = |
$Apache::lonhomework::history{"resource.$id.tries"} + 1; |
$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.awarded"} = 0; |
} |
} |
$Apache::lonhomework::results{"resource.$id.solved"} = |
$Apache::lonhomework::results{"resource.$id.solved"} = |
Line 589 sub setgradedata {
|
Line 682 sub setgradedata {
|
} else { |
} else { |
$Apache::lonhomework::results{"resource.$id.solved"} = |
$Apache::lonhomework::results{"resource.$id.solved"} = |
'incorrect_attempted'; |
'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::results{"resource.$id.tries"} = |
$Apache::lonhomework::history{"resource.$id.tries"} + 1; |
$Apache::lonhomework::history{"resource.$id.tries"} + 1; |
$Apache::lonhomework::results{"resource.$id.awarded"} = 0; |
$Apache::lonhomework::results{"resource.$id.awarded"} = 0; |
Line 737 sub gradestatus {
|
Line 831 sub gradestatus {
|
if ( $status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER') {$showbutton = 0;} |
if ( $status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER') {$showbutton = 0;} |
if ( $showbutton ) { |
if ( $showbutton ) { |
if ($target ne 'tex') { |
if ($target ne 'tex') { |
$button = '<input type="submit" name="submit" value="'.&mt('Submit Answer').'" />'; |
$button = '<input type="submit" name="submit_'.$id.'" value="'.&mt('Submit Answer').'" />'; |
} |
} |
} |
} |
if ($Apache::lonhomework::history{"resource.$id.afterduedate"}) { |
if ($Apache::lonhomework::history{"resource.$id.afterduedate"}) { |
#last submissions was after due date |
#last submissions was after due date |
if ($target eq 'tex') { |
$latemessage=&mt(' The last submission was after the Due Date ');; |
$latemessage=' The last submission was after the Due Date '; |
if ($target eq 'web') { |
} else { |
$latemessage='<td bgcolor="#ffaaaa">'.$latemessage.'</td>'; |
$latemessage="<td bgcolor=\"#ffaaaa\">The last submission was after the Due Date</td>"; |
|
} |
} |
} |
} |
} |
} |