version 1.115, 2003/09/17 20:51:15
|
version 1.123, 2003/11/16 03:23:17
|
Line 112 sub start_textfield {
|
Line 112 sub start_textfield {
|
if ( $cols eq '') { $cols = 80; } |
if ( $cols eq '') { $cols = 80; } |
my $rows = &Apache::lonxml::get_param('rows',$parstack,$safeeval); |
my $rows = &Apache::lonxml::get_param('rows',$parstack,$safeeval); |
if ( $rows eq '') { $rows = 10; } |
if ( $rows eq '') { $rows = 10; } |
$result= '<textarea name="HWVAL_'.$resid.'" '. |
$result= '<textarea wrap="hard" name="HWVAL_'.$resid.'" '. |
"rows=\"$rows\" cols=\"$cols\">".$oldresponse; |
"rows=\"$rows\" cols=\"$cols\">".$oldresponse; |
if ($oldresponse ne '') { |
if ($oldresponse ne '') { |
#get rid of any startup text if the user has already responded |
#get rid of any startup text if the user has already responded |
Line 145 sub start_textfield {
|
Line 145 sub start_textfield {
|
} else { |
} else { |
$result=$token->[4]; |
$result=$token->[4]; |
} |
} |
my $bodytext=&Apache::lonxml::get_all_text("/textfield",$parser); |
$result.=&Apache::edit::modifiedfield("/textfield",$parser); |
$result.=&Apache::edit::modifiedfield(); |
|
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
my $number_of_lines = &Apache::lonxml::get_param('rows',$parstack,$safeeval); |
my $number_of_lines = &Apache::lonxml::get_param('rows',$parstack,$safeeval); |
my $width_of_box = &Apache::lonxml::get_param('cols',$parstack,$safeeval); |
my $width_of_box = &Apache::lonxml::get_param('cols',$parstack,$safeeval); |
Line 414 sub decideoutput {
|
Line 413 sub decideoutput {
|
$bgcolor=$possiblecolors{'not_charged_try'}; |
$bgcolor=$possiblecolors{'not_charged_try'}; |
$button=1; |
$button=1; |
} elsif ($award eq 'SIG_FAIL') { |
} elsif ($award eq 'SIG_FAIL') { |
$message = &mt("Please adjust significant figures.");# you provided %s significant figures"; |
$message = &mt("Significant figures are incorrect, submission was not graded.");# you provided %s significant figures"; |
$bgcolor=$possiblecolors{'not_charged_try'}; |
$bgcolor=$possiblecolors{'not_charged_try'}; |
$button=1; |
$button=1; |
} elsif ($award eq 'UNIT_FAIL') { |
} elsif ($award eq 'UNIT_FAIL') { |
Line 455 sub decideoutput {
|
Line 454 sub decideoutput {
|
$message = &mt("Unknown message").": $award"; |
$message = &mt("Unknown message").": $award"; |
$button=1; |
$button=1; |
} |
} |
if (lc($Apache::lonhomework::problemstatus) eq 'no') { |
if (lc($Apache::lonhomework::problemstatus) eq 'no' && |
|
$Apache::inputtags::status[-1] ne 'SHOW_ANSWER') { |
$message = &mt("Answer Submitted"); |
$message = &mt("Answer Submitted"); |
$bgcolor=$possiblecolors{'correct'}; |
$bgcolor=$possiblecolors{'correct'}; |
$button=1; |
$button=1; |
Line 517 sub setgradedata {
|
Line 517 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') { |
|
$Apache::lonhomework::results{"resource.$id.awarded"} = 0; |
|
} |
$Apache::lonhomework::results{"resource.$id.solved"} = |
$Apache::lonhomework::results{"resource.$id.solved"} = |
'incorrect_attempted' |
'incorrect_attempted' |
} elsif ( $award eq 'SUBMITTED' ) { |
} elsif ( $award eq 'SUBMITTED' ) { |
Line 536 sub setgradedata {
|
Line 539 sub setgradedata {
|
if (lc($Apache::lonhomework::problemstatus) eq 'no') { |
if (lc($Apache::lonhomework::problemstatus) eq 'no') { |
$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; |
} |
} |
} |
} |
|
|
Line 616 sub gradestatus {
|
Line 620 sub gradestatus {
|
|
|
my $status = $Apache::inputtags::status['-1']; |
my $status = $Apache::inputtags::status['-1']; |
&Apache::lonxml::debug("gradestatus has :$status:"); |
&Apache::lonxml::debug("gradestatus has :$status:"); |
if ( $status ne 'CLOSED' && $status ne 'UNAVAILABLE') { |
if ( $status ne 'CLOSED' && $status ne 'UNAVAILABLE' && |
|
$status ne 'INVALID_ACCESS') { |
my $award = $Apache::lonhomework::history{"resource.$id.award"}; |
my $award = $Apache::lonhomework::history{"resource.$id.award"}; |
my $solved = $Apache::lonhomework::history{"resource.$id.solved"}; |
my $solved = $Apache::lonhomework::history{"resource.$id.solved"}; |
my $previous = $Apache::lonhomework::history{"resource.$id.previous"}; |
my $previous = $Apache::lonhomework::history{"resource.$id.previous"}; |
Line 637 sub gradestatus {
|
Line 642 sub gradestatus {
|
my $tries = $Apache::lonhomework::history{"resource.$id.tries"}; |
my $tries = $Apache::lonhomework::history{"resource.$id.tries"}; |
my $maxtries = &Apache::lonnet::EXT("resource.$id.maxtries"); |
my $maxtries = &Apache::lonnet::EXT("resource.$id.maxtries"); |
&Apache::lonxml::debug("got maxtries of :$maxtries:"); |
&Apache::lonxml::debug("got maxtries of :$maxtries:"); |
|
#if tries are set to negative turn off the Tries/Button and messages |
|
if (defined($maxtries) && $maxtries < 0) { return ''; } |
if ( $tries eq '' ) { $tries = '0'; } |
if ( $tries eq '' ) { $tries = '0'; } |
if ( $maxtries eq '' ) { $maxtries = '2'; } |
if ( $maxtries eq '' ) { $maxtries = '2'; } |
if ( $maxtries eq 'con_lost' ) { $maxtries = '0'; } |
if ( $maxtries eq 'con_lost' ) { $maxtries = '0'; } |
if ( $showbutton ) { |
if ( $showbutton ) { |
if ($target eq 'tex') { |
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') { |
$trystr = ' {\vskip 1 mm \small \textit{Tries} '.$tries.'/'.$maxtries.'} \vskip 2 mm '; |
$trystr = ' {\vskip 1 mm \small \textit{'.&mt('Tries').'} '.$tries.'/'.$maxtries.'} \vskip 2 mm '; |
} else { |
} else { |
$trystr = '\vskip 0 mm '; |
$trystr = '\vskip 0 mm '; |
} |
} |
} else { |
} else { |
$trystr = "<td>Tries $tries/$maxtries</td>"; |
$trystr = "<td>".&mt('Tries')." $tries/$maxtries</td>"; |
} |
} |
} |
} |
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 = '<br /><input type="submit" name="submit" value="Submit Answer" />'; |
$button = '<br /><input type="submit" name="submit" value="'.&mt('Submit Answer').'" />'; |
} |
} |
} |
} |
if ($Apache::lonhomework::history{"resource.$id.afterduedate"}) { |
if ($Apache::lonhomework::history{"resource.$id.afterduedate"}) { |