version 1.271.2.7, 2011/05/16 01:02:57
|
version 1.308, 2012/09/10 09:50:57
|
Line 185 sub start_textfield {
|
Line 185 sub start_textfield {
|
} |
} |
} |
} |
unless ($newvariation) { |
unless ($newvariation) { |
$oldresponse = &HTML::Entities::encode($Apache::lonhomework::history{"resource.$partid.$resid.submission"},'<>&"'); |
$oldresponse = $Apache::lonhomework::history{"resource.$partid.$resid.submission"}; |
} |
} |
if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') { |
if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') { |
my $cols = &Apache::lonxml::get_param('cols',$parstack,$safeeval); |
my $cols = &Apache::lonxml::get_param('cols',$parstack,$safeeval); |
Line 197 sub start_textfield {
|
Line 197 sub start_textfield {
|
if ($addchars) { |
if ($addchars) { |
$result.=&addchars('HWVAL_'.$resid,$addchars); |
$result.=&addchars('HWVAL_'.$resid,$addchars); |
} |
} |
my $textareaclass = 'class="LC_richDetectHtml"'; |
my $textareaclass = 'class="LC_richDetectHtml spellchecked"'; |
$result.= '<textarea wrap="hard" name="HWVAL_'.$resid.'" id="HWVAL_'.$resid.'" '. |
$result.= '<textarea wrap="hard" name="HWVAL_'.$resid.'" id="HWVAL_'.$resid.'" ' . |
'rows="'.$rows.'" cols="'.$cols.'" '.$textareaclass.'>'. |
'rows="'.$rows.'" cols="'.$cols.'" '.$textareaclass |
$oldresponse; |
. "onblur='\$(this).spellchecker(\"check\")'" |
|
.'>'. |
|
&HTML::Entities::encode($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 354 sub start_textline {
|
Line 356 sub start_textline {
|
unless ($newvariation) { |
unless ($newvariation) { |
$oldresponse = $Apache::lonhomework::history{"resource.$partid.$id.submission"}; |
$oldresponse = $Apache::lonhomework::history{"resource.$partid.$id.submission"}; |
&Apache::lonxml::debug("oldresponse $oldresponse is ".ref($oldresponse)); |
&Apache::lonxml::debug("oldresponse $oldresponse is ".ref($oldresponse)); |
|
|
if (ref($oldresponse) eq 'ARRAY') { |
if (ref($oldresponse) eq 'ARRAY') { |
$oldresponse = $oldresponse->[$#Apache::inputtags::inputlist]; |
$oldresponse = $oldresponse->[$#Apache::inputtags::inputlist]; |
} |
} |
Line 382 sub start_textline {
|
Line 383 sub start_textline {
|
$name = "none"; |
$name = "none"; |
} |
} |
$result.= '<input onkeydown="javascript:setSubmittedPart(\''.$partid.'\');" type="text" '.$readonly.' name="'.$name.'" value="'. |
$result.= '<input onkeydown="javascript:setSubmittedPart(\''.$partid.'\');" type="text" '.$readonly.' name="'.$name.'" value="'. |
$oldresponse.'" size="'.$size.'"'.$maxlength.' />'; |
$oldresponse.'" class="spellchecked" size="'.$size.'"'.$maxlength.' |
|
onblur=' . "'\$(this).spellchecker(\"check\")'" . '/>'; |
} |
} |
if ($Apache::lonhomework::type eq 'exam' |
if ($Apache::lonhomework::type eq 'exam' |
&& &needs_exam_box($tagstack)) { |
&& &needs_exam_box($tagstack)) { |
Line 479 sub end_hiddenline {
|
Line 481 sub end_hiddenline {
|
return ""; |
return ""; |
} |
} |
|
|
|
|
sub start_hiddensubmission { |
sub start_hiddensubmission { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my $result = ""; |
my $result = ""; |
Line 571 sub file_selector {
|
Line 574 sub file_selector {
|
if ($which eq 'uploadonly' || $which eq 'both') { |
if ($which eq 'uploadonly' || $which eq 'both') { |
$result.=&mt('Submit a file: (only one file per submission)'). |
$result.=&mt('Submit a file: (only one file per submission)'). |
' <br /><input type="file" size="50" name="HWFILE'. |
' <br /><input type="file" size="50" name="HWFILE'. |
$jspart.'_'.$id.'" /><br />'; |
$jspart.'_'.$id.'" id="HWFILE'.$jspart.'_'.$id.'" /><br />'; |
} |
} |
if ( $which eq 'both') { |
if ( $which eq 'both') { |
$result.='<br />'.'<strong>'.&mt('OR:').'</strong><br />'; |
$result.='<br />'.'<strong>'.&mt('OR:').'</strong><br />'; |
} |
} |
if ($which eq 'portfolioonly' || $which eq 'both') { |
if ($which eq 'portfolioonly' || $which eq 'both') { |
$result.=$extratext.'<a href='."'".'javascript:void(window.open("/adm/portfolio?mode=selectfile&fieldname='.$env{'form.request.prefix'}.'HWPORT'.$jspart.'_'.$id.'","cat","height=600,width=800,scrollbars=1,resizable=1,menubar=2,location=1"))'."'".'>'. |
my $symb = $env{'request.symb'}; |
|
(undef,undef,my $res)=&Apache::lonnet::decode_symb($symb); |
|
my $showsymb; |
|
# If resource is a .task and URL is unencrypted, include symb in query string |
|
# for url opened in portfolio file selection window. Can be used to override |
|
# blocking of portfolio access resulting from an exam event in a different course. |
|
if ($res =~ /\.task$/i) { |
|
my $encsymb = &Apache::lonenc::check_encrypt($symb); |
|
if ($symb eq $encsymb) { |
|
$showsymb = $symb; |
|
} |
|
} |
|
$result.=$extratext.'<a href='."'".'javascript:void(window.open("/adm/portfolio?mode=selectfile&fieldname='.$env{'form.request.prefix'}.'HWPORT'.$jspart.'_'.$id.'&symb='.$showsymb.'","cat","height=600,width=800,scrollbars=1,resizable=1,menubar=2,location=1"))'."'".'>'. |
&mt('Select Portfolio Files: (one or more files per submission)').'</a><br />'. |
&mt('Select Portfolio Files: (one or more files per submission)').'</a><br />'. |
'<input type="text" size="50" name="HWPORT'.$jspart.'_'.$id.'" value="" />'. |
'<input type="text" size="50" name="HWPORT'.$jspart.'_'.$id.'" value="" />'. |
'<br />'; |
'<br />'; |
Line 676 sub current_file_submissions {
|
Line 691 sub current_file_submissions {
|
} |
} |
} |
} |
if ($header_shown) { |
if ($header_shown) { |
$result .= &Apache::loncommon::end_data_table(). |
$result .= &Apache::loncommon::end_data_table(); |
'<br /><span class="LC_warning">'. |
if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') { |
&mt('Exclude existing file(s) from grading by checking the "Delete?" checkbox(es) and clicking "Submit Answer"').'</span>'; |
$result .= '<br /><span class="LC_warning">'. |
|
&mt('Exclude existing file(s) from grading by checking the "Delete?" checkbox(es) and clicking "Submit Answer"').'</span>'; |
|
} |
} |
} |
if (@bad_file_list) { |
if (@bad_file_list) { |
my $bad_files = '<span class="LC_filename">'. |
my $bad_files = '<span class="LC_filename">'. |
Line 728 sub valid_award {
|
Line 745 sub valid_award {
|
'UNIT_FAIL', 'NO_UNIT', |
'UNIT_FAIL', 'NO_UNIT', |
'UNIT_NOTNEEDED', 'WANTED_NUMERIC', |
'UNIT_NOTNEEDED', 'WANTED_NUMERIC', |
'BAD_FORMULA', 'NOT_FUNCTION', 'WRONG_FORMAT', |
'BAD_FORMULA', 'NOT_FUNCTION', 'WRONG_FORMAT', |
'INTERNAL_ERROR', 'SIG_FAIL', 'INCORRECT', |
'INTERNAL_ERROR', 'SIG_FAIL', 'INCORRECT', |
'MISORDERED_RANK', 'INVALID_FILETYPE', |
'MISORDERED_RANK', 'INVALID_FILETYPE', |
'EXCESS_FILESIZE', 'FILENAME_INUSE', |
'EXCESS_FILESIZE', 'FILENAME_INUSE', |
'DRAFT', 'SUBMITTED', 'SUBMITTED_CREDIT', |
'DRAFT', 'SUBMITTED', 'SUBMITTED_CREDIT', |
Line 746 sub valid_award {
|
Line 763 sub valid_award {
|
'UNIT_INVALID_INSTRUCTOR', 'UNIT_INVALID_STUDENT', |
'UNIT_INVALID_INSTRUCTOR', 'UNIT_INVALID_STUDENT', |
'UNIT_IRRECONCIBLE', 'UNIT_FAIL', 'NO_UNIT', |
'UNIT_IRRECONCIBLE', 'UNIT_FAIL', 'NO_UNIT', |
'UNIT_NOTNEEDED', 'WANTED_NUMERIC', 'BAD_FORMULA', 'NOT_FUNCTION', |
'UNIT_NOTNEEDED', 'WANTED_NUMERIC', 'BAD_FORMULA', 'NOT_FUNCTION', |
'WRONG_FORMAT', 'INTERNAL_ERROR', |
'WRONG_FORMAT', 'INTERNAL_ERROR', |
'COMMA_FAIL', 'SIG_FAIL', 'INCORRECT', 'MISORDERED_RANK', |
'COMMA_FAIL', 'SIG_FAIL', 'INCORRECT', 'MISORDERED_RANK', |
'INVALID_FILETYPE', 'EXCESS_FILESIZE', 'FILENAME_INUSE', |
'INVALID_FILETYPE', 'EXCESS_FILESIZE', 'FILENAME_INUSE', |
'DRAFT', 'SUBMITTED', |
'DRAFT', 'SUBMITTED', |
Line 844 sub finalizeawards {
|
Line 861 sub finalizeawards {
|
} |
} |
|
|
sub decideoutput { |
sub decideoutput { |
my ($award,$awarded,$awardmsg,$solved,$previous,$target)=@_; |
my ($award,$awarded,$awardmsg,$solved,$previous,$target,$nocorrect)=@_; |
|
|
my $message=''; |
my $message=''; |
my $button=0; |
my $button=0; |
Line 862 sub decideoutput {
|
Line 879 sub decideoutput {
|
my $part = $Apache::inputtags::part; |
my $part = $Apache::inputtags::part; |
my $tohandgrade = &Apache::lonnet::EXT("resource.$part.handgrade"); |
my $tohandgrade = &Apache::lonnet::EXT("resource.$part.handgrade"); |
my $handgrade = ('yes' eq lc($tohandgrade)); |
my $handgrade = ('yes' eq lc($tohandgrade)); |
|
# |
|
# Should "Computer's Answer" be displayed? |
|
# Should not be displayed if still answerable, |
|
# if the problem is handgraded, |
|
# or if the problem does not give a correct answer |
|
# |
|
|
my $computer = ($handgrade)? '' |
my $computer = ($handgrade || $nocorrect)? '' |
: " ".&mt("Computer's answer now shown above."); |
: " ".&mt("Computer's answer now shown above."); |
&Apache::lonxml::debug("handgrade has :$handgrade:"); |
&Apache::lonxml::debug("handgrade has :$handgrade:"); |
|
|
Line 879 sub decideoutput {
|
Line 902 sub decideoutput {
|
$message=&mt('Incorrect.'); |
$message=&mt('Incorrect.'); |
$css_class=$possible_class{'charged_try'}; |
$css_class=$possible_class{'charged_try'}; |
} |
} |
if ($env{'request.filename'} =~ |
if ($handgrade || |
m|/res/lib/templates/examupload.problem$|) { |
($env{'request.filename'}=~/\/res\/lib\/templates\/(examupload|DropBox).problem$/)) { |
$message = &mt("A score has been assigned."); |
$message = &mt("A score has been assigned."); |
$added_computer_text=1; |
$added_computer_text=1; |
} else { |
} else { |
Line 905 sub decideoutput {
|
Line 928 sub decideoutput {
|
} |
} |
} |
} |
} |
} |
$button=0; |
if ($awarded >= 1) { |
|
$button=0; |
|
} elsif (&Apache::lonnet::EXT("resource.$part.retrypartial") !~/^1|on|yes$/i) { |
|
$button=0; |
|
} else { |
|
$button=1; |
|
} |
$previousmsg=''; |
$previousmsg=''; |
} elsif ($solved =~ /^excused/) { |
} elsif ($solved =~ /^excused/) { |
if ($target eq 'tex') { |
if ($target eq 'tex') { |
Line 1041 sub decideoutput {
|
Line 1070 sub decideoutput {
|
$message = &mt("Wrong format").'.'; |
$message = &mt("Wrong format").'.'; |
$css_class=$possible_class{'not_charged_try'}; |
$css_class=$possible_class{'not_charged_try'}; |
$button=1; |
$button=1; |
} elsif ($award eq 'INTERNAL_ERROR') { |
} elsif ($award eq 'INTERNAL_ERROR') { |
$message = &mt("An internal error occurred while processing your answer. Please try again later."); |
$message = &mt("An internal error occurred while processing your answer. Please try again later."); |
$css_class=$possible_class{'not_charged_try'}; |
$css_class=$possible_class{'not_charged_try'}; |
$button=1; |
$button=1; |
Line 1064 sub decideoutput {
|
Line 1093 sub decideoutput {
|
} elsif ($award eq 'ANONYMOUS_CREDIT') { |
} elsif ($award eq 'ANONYMOUS_CREDIT') { |
$message = &mt("Your anonymous submission has been recorded, and credit awarded."); |
$message = &mt("Your anonymous submission has been recorded, and credit awarded."); |
$css_class=$possible_class{'correct'}; |
$css_class=$possible_class{'correct'}; |
|
$button=1; |
} elsif ($award eq 'DRAFT') { |
} elsif ($award eq 'DRAFT') { |
$message = &mt("Copy saved but not submitted."); |
$message = &mt("Copy saved but not submitted."); |
$css_class=$possible_class{'not_charged_try'}; |
$css_class=$possible_class{'not_charged_try'}; |
Line 1114 sub decideoutput {
|
Line 1144 sub decideoutput {
|
if (&Apache::lonhomework::hide_problem_status() |
if (&Apache::lonhomework::hide_problem_status() |
&& $Apache::inputtags::status[-1] ne 'SHOW_ANSWER' |
&& $Apache::inputtags::status[-1] ne 'SHOW_ANSWER' |
&& &hide_award($award)) { |
&& &hide_award($award)) { |
$message = &mt("Answer Submitted: Your final submission will be graded after the due date."); |
$message = &mt("Answer Submitted: Your final submission will be graded after the due date."); |
|
my @interval= &Apache::lonnet::EXT("resource.$part.interval"); |
|
if ($interval[0] =~ /\d+/) { |
|
my $first_access=&Apache::lonnet::get_first_access($interval[1]); |
|
if (defined($first_access)) { |
|
my $due_date= &Apache::lonnet::EXT("resource.$part.duedate"); |
|
unless (($due_date) && ($due_date < $first_access + $interval[0])) { |
|
$message = &mt("Answer Submitted: Your final submission will be graded when the time limit is reached."); |
|
} |
|
} |
|
} |
$css_class=$possible_class{'no_grade'}; |
$css_class=$possible_class{'no_grade'}; |
$button=1; |
$button=1; |
} |
} |
Line 1131 sub decideoutput {
|
Line 1171 sub decideoutput {
|
} |
} |
$message.=&mt('Submissions to practice problems are not permanently recorded.'); |
$message.=&mt('Submissions to practice problems are not permanently recorded.'); |
} |
} |
|
|
return ($button,$css_class,$message,$previousmsg); |
return ($button,$css_class,$message,$previousmsg); |
} |
} |
|
|
Line 1184 sub setgradedata {
|
Line 1223 sub setgradedata {
|
$Apache::inputtags::status['-1'] ne 'CANNOT_ANSWER') { |
$Apache::inputtags::status['-1'] ne 'CANNOT_ANSWER') { |
$Apache::lonhomework::results{"resource.$id.afterduedate"}=$award; |
$Apache::lonhomework::results{"resource.$id.afterduedate"}=$award; |
return ''; |
return ''; |
} elsif ( $Apache::lonhomework::history{"resource.$id.solved"} !~ |
} elsif ( $Apache::lonhomework::history{"resource.$id.awarded"} < 1 |
/^correct/ |
|
|| $Apache::lonhomework::scantronmode |
|| $Apache::lonhomework::scantronmode |
|| &Apache::lonhomework::hide_problem_status() ) { |
|| &Apache::lonhomework::hide_problem_status() ) { |
# the student doesn't already have it correct, |
# the student doesn't already have it correct, |
Line 1306 sub setgradedata {
|
Line 1344 sub setgradedata {
|
$Apache::lonhomework::results{"resource.$id.previous"} = '0'; |
$Apache::lonhomework::results{"resource.$id.previous"} = '0'; |
} |
} |
} |
} |
} elsif ( $Apache::lonhomework::history{"resource.$id.solved"} =~ |
} elsif ( $Apache::lonhomework::history{"resource.$id.awarded"} == 1 ) { |
/^correct/ ) { |
|
#delete all data as they student already has it correct |
#delete all data as they student already has it correct |
&removealldata($id); |
&removealldata($id); |
#and since they didn't do anything we were never here |
#and since they didn't do anything we were never here |
Line 1317 sub setgradedata {
|
Line 1354 sub setgradedata {
|
if ($award eq 'SUBMITTED') { |
if ($award eq 'SUBMITTED') { |
&Apache::response::add_to_gradingqueue(); |
&Apache::response::add_to_gradingqueue(); |
} |
} |
if (($Apache::lonhomework::type eq 'anonsurvey') || |
$Apache::lonhomework::results{"resource.$id.type"} = $Apache::lonhomework::type; |
($Apache::lonhomework::type eq 'anonsurveycred') || |
$Apache::lonhomework::results{"resource.$id.duedate"} = &Apache::lonnet::EXT("resource.$id.duedate"); |
($Apache::lonhomework::type eq 'randomizetry')) { |
$Apache::lonhomework::results{"resource.$id.hinttries"} = &Apache::lonnet::EXT("resource.$id.hinttries"); |
$Apache::lonhomework::results{"resource.$id.type"} = $Apache::lonhomework::type; |
$Apache::lonhomework::results{"resourse.$id.version"} = &Apache::lonnet::usedversion(); |
} |
|
if ($Apache::lonhomework::type eq 'randomizetry') { |
|
$Apache::lonhomework::results{"resource.$id.rndseed"} = $env{'form.'.$id.'.rndseed'}; |
|
} |
|
} |
} |
|
|
sub find_which_previous { |
sub find_which_previous { |
Line 1404 sub grade {
|
Line 1437 sub grade {
|
} |
} |
|
|
sub get_grade_messages { |
sub get_grade_messages { |
my ($id,$prefix,$target,$status) = @_; |
my ($id,$prefix,$target,$status,$nocorrect) = @_; |
|
# nocorrect suppresses "Computer's answer now shown above" |
my ($message,$latemessage,$trystr,$previousmsg); |
my ($message,$latemessage,$trystr,$previousmsg); |
my $showbutton = 1; |
my $showbutton = 1; |
|
|
Line 1419 sub get_grade_messages {
|
Line 1452 sub get_grade_messages {
|
&Apache::lonxml::debug('Getting message'); |
&Apache::lonxml::debug('Getting message'); |
($showbutton,my $css_class,$message,$previousmsg) = |
($showbutton,my $css_class,$message,$previousmsg) = |
&decideoutput($award,$awarded,$awardmsg,$solved,$previous, |
&decideoutput($award,$awarded,$awardmsg,$solved,$previous, |
$target); |
$target,(($status eq 'CAN_ANSWER') || $nocorrect)); |
if ($target eq 'tex') { |
if ($target eq 'tex') { |
$message='\vskip 2 mm '.$message.' '; |
$message='\vskip 2 mm '.$message.' '; |
} else { |
} else { |
Line 1437 sub get_grade_messages {
|
Line 1470 sub get_grade_messages {
|
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'; } |
my $tries_text= &get_tries_text();; |
my $tries_text= &get_tries_text(); |
if ($showbutton) { |
if ($showbutton) { |
if ($target eq 'tex') { |
if ($target eq 'tex') { |
if ($env{'request.state'} ne "construct" |
if ($env{'request.state'} ne "construct" |
&& $Apache::lonhomework::type ne 'exam' |
&& $Apache::lonhomework::type ne 'exam' |
&& $env{'form.suppress_tries'} ne 'yes') { |
&& $env{'form.suppress_tries'} ne 'yes') { |
$trystr = ' {\vskip 1 mm \small \textit{'.$tries_text.'} '. |
$trystr ='{\vskip 1 mm \small ' |
$tries.'/'.$maxtries.'} \vskip 2 mm '; |
.&mt('[_1]'.$tries_text.'[_2] [_3]' |
|
,'\textit{','}',$tries.'/'.$maxtries ) |
|
.'} \vskip 2 mm'; |
} else { |
} else { |
$trystr = '\vskip 0 mm '; |
$trystr = '\vskip 0 mm '; |
} |
} |
} else { |
} else { |
$trystr = '<td><span class="LC_nobreak">'.&mt($tries_text)." $tries"; |
my $trial =$tries; |
if ($Apache::lonhomework::parsing_a_task) { |
if ($Apache::lonhomework::parsing_a_task) { |
} elsif($env{'request.state'} ne 'construct') { |
} elsif($env{'request.state'} ne 'construct') { |
$trystr.="/$maxtries"; |
$trial.="/".&Apache::lonhtmlcommon::direct_parm_link($maxtries,$env{'request.symb'},'maxtries',$id,$target); |
} else { |
} else { |
if (defined($Apache::inputtags::params{'maxtries'})) { |
if (defined($Apache::inputtags::params{'maxtries'})) { |
$trystr.="/".$Apache::inputtags::params{'maxtries'}; |
$trial.="/".$Apache::inputtags::params{'maxtries'}; |
} |
} |
} |
} |
$trystr.="</span></td>"; |
$trystr = '<td><span class="LC_nobreak">'.&mt($tries_text.' [_1]',$trial).'</span></td>'; |
} |
} |
} |
} |
|
|
Line 1487 sub gradestatus {
|
Line 1522 sub gradestatus {
|
&& $status ne 'UNAVAILABLE' |
&& $status ne 'UNAVAILABLE' |
&& $status ne 'INVALID_ACCESS' |
&& $status ne 'INVALID_ACCESS' |
&& $status ne 'NEEDS_CHECKIN' |
&& $status ne 'NEEDS_CHECKIN' |
&& $status ne 'NOT_IN_A_SLOT') { |
&& $status ne 'NOT_IN_A_SLOT' |
|
&& $status ne 'RESERVABLE' |
|
&& $status ne 'RESERVABLE_LATER' |
|
&& $status ne 'NOTRESERVABLE') { |
|
|
|
if ($status eq 'SHOW_ANSWER') { |
|
$showbutton = 0; |
|
} |
|
|
($previousmsg,$latemessage,$message,$trystr) = |
($previousmsg,$latemessage,$message,$trystr) = |
&get_grade_messages($id,"resource.$id",$target,$status, |
&get_grade_messages($id,"resource.$id",$target,$status, |
$showbutton); |
$showbutton); |
if ( $status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER') { |
if ($status eq 'CANNOT_ANSWER') { |
$showbutton = 0; |
$showbutton = 0; |
} |
} |
if ( $status eq 'SHOW_ANSWER') { |
if ( $status eq 'SHOW_ANSWER') { |
Line 1548 sub previous_tries {
|
Line 1590 sub previous_tries {
|
$count++; |
$count++; |
$count_lookup{$i} = $count; |
$count_lookup{$i} = $count; |
my $curr_rndseed = $Apache::lonhomework::history{"$prefix.rndseed"}; |
my $curr_rndseed = $Apache::lonhomework::history{"$prefix.rndseed"}; |
|
|
my ($previousmsg,$latemessage,$message,$trystr); |
my ($previousmsg,$latemessage,$message,$trystr); |
|
|
($previousmsg,$latemessage,$message,$trystr) = |
($previousmsg,$latemessage,$message,$trystr) = |
Line 1580 sub previous_tries {
|
Line 1621 sub previous_tries {
|
{$1 <strong>$txt_correct</strong>. $3}s; |
{$1 <strong>$txt_correct</strong>. $3}s; |
} |
} |
my $trystr = "(".&mt('Try [_1]',$Apache::lonhomework::history{"$prefix.tries"}).")"; |
my $trystr = "(".&mt('Try [_1]',$Apache::lonhomework::history{"$prefix.tries"}).")"; |
if ($curr_rndseed || $lastrndseed) { |
if (($curr_rndseed || $lastrndseed) && ($i > 1)) { |
if ($curr_rndseed ne $lastrndseed) { |
if ($curr_rndseed ne $lastrndseed) { |
$trystr .= '<br /><span style="color: green; white-space: nowrap; font-style: italic; font-weight: bold; font-size: 80%;">'.&mt('New problem variation this try.').'</span>'; |
$trystr .= '<br /><span style="color: green; white-space: nowrap; font-style: italic; font-weight: bold; font-size: 80%;">'.&mt('New problem variation this try.').'</span>'; |
} |
} |
} |
} |
$message =~ s{(</td>)}{ $trystr $1}; |
$message =~ s{(</td>)}{ $trystr $1}; |
} |
} |
my ($class) = ($message =~ m{<td.*class="([^"]*)"}); #" |
my ($class) = ($message =~ m{<td.*class="([^"]*)"}); #" |
Line 1622 sub previous_tries {
|
Line 1663 sub previous_tries {
|
'</th><th colspan="'.scalar(@Apache::inputtags::response).'">'. |
'</th><th colspan="'.scalar(@Apache::inputtags::response).'">'. |
&mt('Submitted Answer').'</th>'; |
&mt('Submitted Answer').'</th>'; |
$output ='<table class="LC_prior_tries">'.$headers.$output.'</table>'; |
$output ='<table class="LC_prior_tries">'.$headers.$output.'</table>'; |
#return $output; |
|
$output = &Apache::loncommon::js_ready($output); |
|
$output.='<br /><form action=""><center><input type="button" name="close" value="'.&mt('Close Window').'" onClick="window.close()" /></center></form>'; |
|
|
|
my $windowopen=&Apache::lonhtmlcommon::javascript_docopen(); |
|
my $tries_text = &get_tries_text('link'); |
my $tries_text = &get_tries_text('link'); |
my $start_page = |
|
&Apache::loncommon::start_page($tries_text, undef, |
|
{'only_body' => 1, |
|
'bgcolor' => '#FFFFFF', |
|
'js_ready' => 1, |
|
'inherit_jsmath' => 1, }); |
|
my $end_page = |
|
&Apache::loncommon::end_page({'js_ready' => 1,}); |
|
my $prefix = $env{'form.request.prefix'}; |
my $prefix = $env{'form.request.prefix'}; |
$prefix =~ tr{.}{_}; |
$prefix =~ tr{.}{_}; |
my $function_name = "LONCAPA_previous_tries_".$prefix. |
my $function_name = "LONCAPA_previous_tries_".$prefix. |
$Apache::lonxml::curdepth.'_'.$env{'form.counter'}; |
$Apache::lonxml::curdepth.'_'.$env{'form.counter'}; |
my $result ="<script type=\"text/javascript\"> |
my $result = &Apache::loncommon::modal_adhoc_window($function_name,420,410,$output,&mt($tries_text))."<br />"; |
// <![CDATA[ |
|
function $function_name() {newWindow=open('','new_W','width=500,height=500,scrollbars=1,resizable=yes');newWindow.$windowopen;newWindow.document.writeln('$start_page $output $end_page');newWindow.document.close();newWindow.focus()} |
|
// ]]> |
|
</script><a href=\"javascript:$function_name();void(0);\">".&mt($tries_text)."</a><br />"; |
|
#use Data::Dumper; |
|
#&Apache::lonnet::logthis(&Dumper(\%Apache::inputtags::submission_display)); |
|
return $result; |
return $result; |
} |
} |
|
|