version 1.295, 2011/10/08 19:19:58
|
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 381 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 576 sub file_selector {
|
Line 579 sub file_selector {
|
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 911 sub decideoutput {
|
Line 928 sub decideoutput {
|
} |
} |
} |
} |
} |
} |
if ($awarded==1) { $button=0; } else { $button=1; } |
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 1070 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 1120 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 1488 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 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; |
} |
} |
|
|