version 1.333.2.10, 2021/09/11 16:09:56
|
version 1.358, 2023/04/02 03:16:28
|
Line 460 sub start_textline {
|
Line 460 sub start_textline {
|
} |
} |
my $name = 'HWVAL_'.$id; |
my $name = 'HWVAL_'.$id; |
my $itemid = 'HWVAL_'.$partid.'_'.$id; |
my $itemid = 'HWVAL_'.$partid.'_'.$id; |
|
# NOTE: the input id should match the one given by defaut_homework input_id(). |
my $input_tag_id = $itemid.'_'.$input_id; |
my $input_tag_id = $itemid.'_'.$input_id; |
if ($Apache::inputtags::status[-1] eq 'CANNOT_ANSWER') { |
if ($Apache::inputtags::status[-1] eq 'CANNOT_ANSWER') { |
$name = "none"; |
$name = "none"; |
Line 473 sub start_textline {
|
Line 474 sub start_textline {
|
|
|
$result .= &spellcheck_onblur($itemid, $spellcheck); |
$result .= &spellcheck_onblur($itemid, $spellcheck); |
if (($Apache::inputtags::status['-1'] eq 'CAN_ANSWER') && |
if (($Apache::inputtags::status['-1'] eq 'CAN_ANSWER') && |
(($tagstack->[-2] eq 'formularesponse') || ($tagstack->[-2] eq 'mathresponse')) && |
(((($tagstack->[-2] eq 'formularesponse') || ($tagstack->[-2] eq 'mathresponse')) && |
(&Apache::lonnet::EXT('resource.'.$partid.'_'.$id.'.turnoffeditor') ne 'yes')) { |
(&Apache::lonnet::EXT('resource.'.$partid.'_'.$id.'.turnoffeditor') ne 'yes')) || |
|
(($tagstack->[-2] eq 'customresponse') && |
|
(&Apache::lonnet::EXT('resource.'.$partid.'_'.$id.'.turnoffeditor') eq 'no')))) { |
$result.=&edit_mathresponse_button($input_tag_id); |
$result.=&edit_mathresponse_button($input_tag_id); |
} |
} |
} |
} |
Line 646 sub file_selector {
|
Line 649 sub file_selector {
|
my $current_files_display = ¤t_file_submissions($part,$id); |
my $current_files_display = ¤t_file_submissions($part,$id); |
my $addfiles; |
my $addfiles; |
if ($current_files_display) { |
if ($current_files_display) { |
$result .= &Apache::lonhtmlcommon::row_title(&mt('Currently submitted files')). |
$result .= &Apache::lonhtmlcommon::row_title(&mt('Files currently selected for submission')). |
$current_files_display. |
$current_files_display. |
&Apache::lonhtmlcommon::row_closure(); |
&Apache::lonhtmlcommon::row_closure(); |
$addfiles = &mt('Submit other file(s)'); |
$addfiles = &mt('Submit other file(s)'); |
Line 656 sub file_selector {
|
Line 659 sub file_selector {
|
$result .= &Apache::lonhtmlcommon::row_title($addfiles); |
$result .= &Apache::lonhtmlcommon::row_title($addfiles); |
my $constraints; |
my $constraints; |
if ($uploadedfiletypes ne '*') { |
if ($uploadedfiletypes ne '*') { |
|
my $showtypes = $uploadedfiletypes; |
|
if ($showtypes =~ /,/) { |
|
my $conjunc = &mt('or'); |
|
$showtypes =~ s/,([^,]+)$/ $conjunc $1/; |
|
} |
$constraints = |
$constraints = |
&mt('Allowed filetypes: [_1]','<b>'.$uploadedfiletypes.'</b>').'<br />'; |
&mt('Allowed filetypes: [_1]','<b>'.$showtypes.'</b>').'<br />'; |
} |
} |
if ($maxfilesize) { |
if ($maxfilesize) { |
$constraints .= &mt('Combined size of all files not to exceed: [_1] MB.', |
$constraints .= &mt('Combined size of all files not to exceed: [_1] MB.', |
Line 706 sub current_file_submissions {
|
Line 714 sub current_file_submissions {
|
my $uploadedfile=$Apache::lonhomework::history{"resource.$part.$id.uploadedfile"}; |
my $uploadedfile=$Apache::lonhomework::history{"resource.$part.$id.uploadedfile"}; |
my $portfiles=$Apache::lonhomework::history{"resource.$part.$id.portfiles"}; |
my $portfiles=$Apache::lonhomework::history{"resource.$part.$id.portfiles"}; |
return if (($uploadedfile eq '') && ($portfiles !~/[^\s]/)); |
return if (($uploadedfile eq '') && ($portfiles !~/[^\s]/)); |
|
my @unversioned; |
|
foreach my $file (split(/\s*,\s*/,&unescape($portfiles))) { |
|
my ($path,$name) = ($file =~ m{^(.*/)([^/]+)$}); |
|
my ($origname,$version,$ext) = &Apache::lonnet::file_name_version_ext($name); |
|
unless ($version) { |
|
push(@unversioned,$file); |
|
} |
|
} |
|
return if (!@unversioned); |
my $header = &portpath_popup_js(). |
my $header = &portpath_popup_js(). |
&Apache::loncommon::start_data_table(). |
&Apache::loncommon::start_data_table(). |
&Apache::loncommon::start_data_table_header_row(); |
&Apache::loncommon::start_data_table_header_row(); |
Line 716 sub current_file_submissions {
|
Line 733 sub current_file_submissions {
|
'<th>'.&mt('Size (MB)').'</th>'. |
'<th>'.&mt('Size (MB)').'</th>'. |
'<th>'.&mt('Last Modified').'</th>'. |
'<th>'.&mt('Last Modified').'</th>'. |
&Apache::loncommon::end_data_table_header_row(); |
&Apache::loncommon::end_data_table_header_row(); |
my (undef,$crsid,$udom,$uname)=&Apache::lonnet::whichuser(); |
my ($symb,$crsid,$udom,$uname)=&Apache::lonnet::whichuser(); |
my ($cdom,$cnum) = ($crsid =~ /^($LONCAPA::match_domain)_($LONCAPA::match_courseid)$/); |
my ($cdom,$cnum) = ($crsid =~ /^($LONCAPA::match_domain)_($LONCAPA::match_courseid)$/); |
my ($result,$header_shown,%okfiles,%rows,%legacy,@bad_file_list); |
my ($result,$header_shown,%okfiles,%rows,%legacy,@bad_file_list); |
if ($uploadedfile) { |
if ($uploadedfile) { |
Line 735 sub current_file_submissions {
|
Line 752 sub current_file_submissions {
|
push(@bad_file_list,$error); |
push(@bad_file_list,$error); |
} |
} |
} |
} |
if ($portfiles =~ /[^\s]/) { |
if (@unversioned > 0) { |
my $prefix = "/uploaded/$udom/$uname/portfolio"; |
my $prefix = "/uploaded/$udom/$uname/portfolio"; |
foreach my $file (split(/\s*,\s*/,&unescape($portfiles))) { |
foreach my $file (@unversioned) { |
my ($path,$name) = ($file =~ m{^(.*/)([^/]+)$}); |
my ($path,$name) = ($file =~ m{^(.*/)([^/]+)$}); |
my $url = $prefix.$path.$name; |
my $url = $prefix.$path.$name; |
my $uploadedfile = &HTML::Entities::encode($url,'<>&"'); |
my $uploadedfile = &HTML::Entities::encode($url,'<>&"'); |
Line 1152 sub decideoutput {
|
Line 1169 sub decideoutput {
|
if ($target ne 'tex') { |
if ($target ne 'tex') { |
$message .= &Apache::loncommon::help_open_topic('Some_Items_Were_Not_Submitted'); |
$message .= &Apache::loncommon::help_open_topic('Some_Items_Were_Not_Submitted'); |
} |
} |
$css_class=$possible_class{'not_charged_try'}; |
if (&Apache::lonhomework::show_some_problem_status()) { |
|
$css_class=$possible_class{'no_charge_warn'}; |
|
} else { |
|
$css_class=$possible_class{'not_charged_try'}; |
|
} |
$button = 1; |
$button = 1; |
} elsif ($award eq 'WRONG_NUMBOXESCHECKED') { |
} elsif ($award eq 'WRONG_NUMBOXESCHECKED') { |
$message = &mt('Number of boxes checked outside permissible range (either too few or too many).'); |
$message = &mt('Number of boxes checked outside permissible range (either too few or too many).'); |
Line 1201 sub decideoutput {
|
Line 1222 sub decideoutput {
|
} elsif ($award eq 'SIG_FAIL') { |
} elsif ($award eq 'SIG_FAIL') { |
my ($used,$min,$max)=split(':',$awardmsg); |
my ($used,$min,$max)=split(':',$awardmsg); |
my $word = ($used < $min) ? 'more' : 'fewer'; |
my $word = ($used < $min) ? 'more' : 'fewer'; |
$message = &mt("Submission not graded. Use $word significant figures.",$used); |
$message = &mt("Submission not graded. Use $word significant figures."); |
if (&Apache::lonhomework::show_some_problem_status()) { |
if (&Apache::lonhomework::show_some_problem_status()) { |
$css_class=$possible_class{'no_charge_warn'}; |
$css_class=$possible_class{'no_charge_warn'}; |
} else { |
} else { |
Line 1216 sub decideoutput {
|
Line 1237 sub decideoutput {
|
} elsif ($award eq 'UNIT_INVALID_STUDENT') { |
} elsif ($award eq 'UNIT_INVALID_STUDENT') { |
$message = &mt('Unable to interpret units. Computer reads units as "[_1]".',&markup_unit($awardmsg,$target)); |
$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');} |
$css_class=$possible_class{'not_charged_try'}; |
if (&Apache::lonhomework::show_some_problem_status()) { |
|
$css_class=$possible_class{'no_charge_warn'}; |
|
} else { |
|
$css_class=$possible_class{'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.',&markup_unit($awardmsg,$target)); |
$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');} |
$css_class=$possible_class{'not_charged_try'}; |
if (&Apache::lonhomework::show_some_problem_status()) { |
|
$css_class=$possible_class{'no_charge_warn'}; |
|
} else { |
|
$css_class=$possible_class{'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]".',&markup_unit($awardmsg,$target)); |
$message = &mt('Only a number required. Computer reads units of "[_1]".',&markup_unit($awardmsg,$target)); |
$css_class=$possible_class{'not_charged_try'}; |
if (&Apache::lonhomework::show_some_problem_status()) { |
|
$css_class=$possible_class{'no_charge_warn'}; |
|
} else { |
|
$css_class=$possible_class{'not_charged_try'}; |
|
} |
$button=1; |
$button=1; |
} elsif ($award eq 'NO_UNIT') { |
} elsif ($award eq 'NO_UNIT') { |
$message = &mt("Units required").'.'; |
$message = &mt("Units required").'.'; |
if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Physical_Units')}; |
if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Physical_Units')}; |
$css_class=$possible_class{'not_charged_try'}; |
if (&Apache::lonhomework::show_some_problem_status()) { |
|
$css_class=$possible_class{'no_charge_warn'}; |
|
} else { |
|
$css_class=$possible_class{'not_charged_try'}; |
|
} |
$button=1; |
$button=1; |
} elsif ($award eq 'COMMA_FAIL') { |
} elsif ($award eq 'COMMA_FAIL') { |
$message = &mt("Proper comma separation is required").'.'; |
$message = &mt("Proper comma separation is required").'.'; |
Line 1329 sub decideoutput {
|
Line 1366 sub decideoutput {
|
my $first_access=&Apache::lonnet::get_first_access($interval[1]); |
my $first_access=&Apache::lonnet::get_first_access($interval[1]); |
if (defined($first_access)) { |
if (defined($first_access)) { |
my $due_date= &Apache::lonnet::EXT("resource.$part.duedate"); |
my $due_date= &Apache::lonnet::EXT("resource.$part.duedate"); |
unless (($due_date) && ($due_date < $first_access + $interval[0])) { |
my ($timelimit) = ($interval[0] =~ /^(\d+)/); |
|
unless (($due_date) && ($due_date < $first_access + $timelimit)) { |
$message = &mt("Answer Submitted: Your final submission will be graded when the time limit is reached."); |
$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; |
|
if ($env{'course.'.$env{'request.course.id'}.'.type'} eq 'Placement') { |
|
if ($Apache::inputtags::status[-1] eq 'CANNOT_ANSWER') { |
|
$message = 'Answer Submitted'; |
|
} else { |
|
undef($message); |
|
} |
|
} |
} |
} |
if ($Apache::inputtags::status[-1] eq 'SHOW_ANSWER' && |
if ($Apache::inputtags::status[-1] eq 'SHOW_ANSWER' && |
!$added_computer_text && $target ne 'tex') { |
!$added_computer_text && $target ne 'tex') { |
Line 1638 sub get_grade_messages {
|
Line 1683 sub get_grade_messages {
|
if ($target eq 'tex') { |
if ($target eq 'tex') { |
$message='\vskip 2 mm '.$message.' '; |
$message='\vskip 2 mm '.$message.' '; |
} else { |
} else { |
$message="<td class=\"$tdclass $css_class\">$message</td>"; |
if ($message) { |
|
$message="<td class=\"$tdclass $css_class\">$message</td>"; |
|
} else { |
|
$message="<td class=\"$tdclass\"></td>"; |
|
} |
if ($previousmsg) { |
if ($previousmsg) { |
$previousmsg="<td class=\"$tdclass LC_answer_previous\">$previousmsg</td>"; |
$previousmsg="<td class=\"$tdclass LC_answer_previous\">$previousmsg</td>"; |
} |
} |
Line 1675 sub get_grade_messages {
|
Line 1724 sub get_grade_messages {
|
$trial.="/".$Apache::inputtags::params{'maxtries'}; |
$trial.="/".$Apache::inputtags::params{'maxtries'}; |
} |
} |
} |
} |
$trystr = '<td class="'.$tdclass.'"><span class="LC_nobreak">'.&mt($tries_text.' [_1]',$trial).'</span></td>'; |
|
|
unless (($env{'request.state'} ne "construct") && |
|
($env{'course.'.$env{'request.course.id'}.'.type'} eq 'Placement') && |
|
(!$env{'request.role.adv'})) { |
|
$trystr = '<span class="LC_nobreak">'.&mt($tries_text.' [_1]',$trial).'</span>'; |
|
} |
|
$trystr = '<td class="'.$tdclass.'">'.$trystr.'</td>'; |
} |
} |
} |
} |
|
|
Line 1708 sub gradestatus {
|
Line 1763 sub gradestatus {
|
&& $status ne 'NOT_IN_A_SLOT' |
&& $status ne 'NOT_IN_A_SLOT' |
&& $status ne 'RESERVABLE' |
&& $status ne 'RESERVABLE' |
&& $status ne 'RESERVABLE_LATER' |
&& $status ne 'RESERVABLE_LATER' |
&& $status ne 'NOTRESERVABLE') { |
&& $status ne 'NOTRESERVABLE' |
|
&& $status ne 'NEED_DIFFERENT_IP') { |
|
|
if ($status eq 'SHOW_ANSWER') { |
if ($status eq 'SHOW_ANSWER') { |
$showbutton = 0; |
$showbutton = 0; |
Line 1731 sub gradestatus {
|
Line 1787 sub gradestatus {
|
} |
} |
if ( $showbutton ) { |
if ( $showbutton ) { |
if ($target ne 'tex') { |
if ($target ne 'tex') { |
$button = |
if ($env{'form.disable_submit'}) { |
|
$button = '<input type="submit" name="submit_'.$id.'" id="submit_'.$id.'" class="LC_hwk_submit" value="'.&mt('Submit Answer').'" disabled="disabled" /> '. |
|
'<div id="msg_submit_'.$id.'" style="display:none"></div>'; |
|
} else { |
|
$button = |
'<input onmouseup="javascript:setSubmittedPart(\''.$id.'\');this.form.action+=\'#'.&escape($id).'\';" |
'<input onmouseup="javascript:setSubmittedPart(\''.$id.'\');this.form.action+=\'#'.&escape($id).'\';" |
type="submit" name="submit_'.$id.'" id="submit_'.$id.'" class="LC_hwk_submit" |
type="submit" name="submit_'.$id.'" id="submit_'.$id.'" class="LC_hwk_submit" |
value="'.&mt('Submit Answer').'" /> '. |
value="'.&mt('Submit Answer').'" /> '. |
'<div id="msg_submit_'.$id.'" style="display:none">'. |
'<div id="msg_submit_'.$id.'" style="display:none">'. |
&mt('Processing your submission ...').'</div>'; |
&mt('Processing your submission ...').'</div>'; |
|
} |
} |
} |
} |
} |
|
|
Line 1750 sub gradestatus {
|
Line 1811 sub gradestatus {
|
} else { |
} else { |
$output = |
$output = |
'<table><tr><td>'.$button.'</td>'.$output; |
'<table><tr><td>'.$button.'</td>'.$output; |
if (!$no_previous) { |
if ((!$no_previous) && |
|
(($env{'course.'.$env{'request.course.id'}.'.type'} ne 'Placement') || |
|
($env{'request.role.adv'}))) { |
$output.='<td class="'.$tdclass.'">'.&previous_tries($id,$target).'</td>'; |
$output.='<td class="'.$tdclass.'">'.&previous_tries($id,$target).'</td>'; |
} |
} |
$output.= '</tr></table>'; |
$output.= '</tr></table>'; |
Line 1879 sub previous_tries {
|
Line 1942 sub previous_tries {
|
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; |
if (($env{'request.state'} eq 'construct') || ($id =~ /[._]|[^\w\s\-]/)) { |
if (($env{'request.state'} eq 'construct') || ($id =~ /\W/)) { |
$function_name .= $Apache::lonxml::curdepth; |
$function_name .= $Apache::lonxml::curdepth; |
} else { |
} else { |
$function_name .= &js_escape($id); |
$function_name .= $id; |
} |
} |
$function_name .= '_'.$Apache::lonxml::counter; |
$function_name .= '_'.$Apache::lonxml::counter; |
my $possmathjax = 1; |
my $possmathjax = 1; |