loncom/homework/inputtags.pm - diff

Return to inputtags.pm CVS log

Up to [LON-CAPA] / loncom / homework

Diff for /loncom/homework/inputtags.pm between versions 1.327 and 1.355

version 1.327, 2014/11/07 22:00:17	version 1.355, 2021/09/07 20:37:33
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;
if ($Apache::inputtags::status[-1] eq 'CANNOT_ANSWER') {	if ($Apache::inputtags::status[-1] eq 'CANNOT_ANSWER') {
$name = "none";	$name = "none";
}	}
$result.= '<input onkeydown="javascript:setSubmittedPart(\''.$partid.'\');"'	$result.= '<input onkeydown="javascript:setSubmittedPart(\''.$partid.'\');"'
. ' type="text" '	. ' onfocus="javascript:disableAutoComplete(\''.$input_tag_id.'\');"'
. $readonly.' name="'. $name . '"'	. ' type="text" '.$readonly.' name="'. $name . '"'
. ' id="' . $itemid . '"'	. ' id="' . $input_tag_id . '"'
. ' value="'. $oldresponse.'"'	. ' value="'. $oldresponse.'"'
. ' class="LC_textline spellchecked" size="'.$size.'"'.$maxlength	. ' class="LC_textline spellchecked" size="'.$size.'"'.$maxlength.' />';
. ' autocomplete="off" />';

$result .= &spellcheck_onblur($itemid, $spellcheck);	$result .= &spellcheck_onblur($itemid, $spellcheck);
	if (($Apache::inputtags::status['-1'] eq 'CAN_ANSWER') &&
	(($tagstack->[-2] eq 'formularesponse') \|\| ($tagstack->[-2] eq 'mathresponse')) &&
	(&Apache::lonnet::EXT('resource.'.$partid.'_'.$id.'.turnoffeditor') ne 'yes')) {
	$result.=&edit_mathresponse_button($input_tag_id);
	}
}	}
if ($Apache::lonhomework::type eq 'exam'	if ($Apache::lonhomework::type eq 'exam'
&& &needs_exam_box($tagstack)) {	&& &needs_exam_box($tagstack)) {
Line 641 sub file_selector {	Line 647 sub file_selector {
my $current_files_display = &current_file_submissions($part,$id);	my $current_files_display = &current_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 661 sub file_selector {	Line 667 sub file_selector {
if ($constraints) {	if ($constraints) {
$result .= $constraints.'<br />';	$result .= $constraints.'<br />';
}	}
if ($which eq 'uploadonly' \|\| $which eq 'both') {	if ($which eq 'uploadonly' \|\| $which eq 'both') {
$result.=&mt('Submit a file: (only one file per submission)').	my $free_space = $maxfilesize * 1048576;
' <br /><input type="file" size="50" name="HWFILE'.	$result .= &mt('Submit a file: (only one file per submission)').
$jspart.'_'.$id.'" id="HWFILE'.$jspart.'_'.$id.'" /><br />';	' <br /><input type="file" size="50" name="HWFILE'.$jspart.'_'.$id.
	'" id="HWFILE'.$jspart.'_'.$id.'" class="LC_flUpload LC_hwkfile" />'.
	'<input type="hidden" id="LC_free_space_'.$jspart.'_'.$id.'"'.
	' value="'.$free_space.'" /><br />';
}	}
if ( $which eq 'both') {	if ( $which eq 'both') {
$result.='<br />'.'<strong>'.&mt('OR:').'</strong><br />';	$result.='<br />'.'<strong>'.&mt('OR:').'</strong><br />';
Line 686 sub file_selector {	Line 695 sub file_selector {
&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 />';

}	}
$result.=&Apache::lonhtmlcommon::row_closure(1);	$result.=&Apache::lonhtmlcommon::row_closure(1);
return $result;	return $result;
Line 699 sub current_file_submissions {	Line 707 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 709 sub current_file_submissions {	Line 726 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 728 sub current_file_submissions {	Line 745 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 878 END	Line 895 END
sub valid_award {	sub valid_award {
my ($award) =@_;	my ($award) =@_;
foreach my $possibleaward ('EXTRA_ANSWER','MISSING_ANSWER', 'ERROR',	foreach my $possibleaward ('EXTRA_ANSWER','MISSING_ANSWER', 'ERROR',
'NO_RESPONSE',	'NO_RESPONSE','WRONG_NUMBOXESCHECKED',
'TOO_LONG', 'UNIT_INVALID_INSTRUCTOR',	'TOO_LONG', 'UNIT_INVALID_INSTRUCTOR',
'UNIT_INVALID_STUDENT', 'UNIT_IRRECONCIBLE',	'UNIT_INVALID_STUDENT', 'UNIT_IRRECONCIBLE',
'UNIT_FAIL', 'NO_UNIT',	'UNIT_FAIL', 'NO_UNIT',
Line 898 sub valid_award {	Line 915 sub valid_award {

{	{
my @awards = ('EXTRA_ANSWER', 'MISSING_ANSWER', 'ERROR', 'NO_RESPONSE',	my @awards = ('EXTRA_ANSWER', 'MISSING_ANSWER', 'ERROR', 'NO_RESPONSE',
'TOO_LONG',	'WRONG_NUMBOXESCHECKED','TOO_LONG',
'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',
Line 988 sub finalizeawards {	Line 1005 sub finalizeawards {
$j++;	$j++;
}	}

	# if at least one response item is set to include lenient grading
	# and that item is partially correct then overall award reflects
	# that, unless an award for one of the other response items does
	# not fall within the basic awards for correct or incorrect.
	if ($Apache::inputtags::leniency) {
	if (($$awardref[$which] eq 'INCORRECT')
	&& (grep { $_ eq 'EXACT_ANS' \|\|
	$_ eq 'APPROX_ANS' \|\|
	$_ eq 'ASSIGNED_SCORE' } (@$awardref))
	&& !((grep { $_ ne 'INCORRECT' &&
	$_ ne 'EXACT_ANS' &&
	$_ ne 'APPROX_ANS' &&
	$_ ne 'ASSIGNED_SCORE' } (@$awardref)))) {
	return ('ASSIGNED_SCORE');
	}
	}

if (defined($which)) {	if (defined($which)) {
if (ref($nameref)) {	if (ref($nameref)) {
return ($$awardref[$which],$$msgref[$which],$$nameref[$which]);	return ($$awardref[$which],$$msgref[$which],$$nameref[$which]);
Line 1013 sub decideoutput {	Line 1047 sub decideoutput {
'not_charged_try' => 'LC_answer_not_charged_try',	'not_charged_try' => 'LC_answer_not_charged_try',
'no_grade' => 'LC_answer_no_grade',	'no_grade' => 'LC_answer_no_grade',
'no_message' => 'LC_no_message',	'no_message' => 'LC_no_message',
	'no_charge_warn' => 'LC_answer_warning',
);	);

my $part = $Apache::inputtags::part;	my $part = $Apache::inputtags::part;
Line 1026 sub decideoutput {	Line 1061 sub decideoutput {
#	#

my $computer = ($handgrade \|\| $nocorrect)? ''	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:");

if ($previous) { $previousmsg=&mt('You have entered that answer before'); }	if ($previous) { $previousmsg=&mt('You have entered that answer before'); }
Line 1050 sub decideoutput {	Line 1085 sub decideoutput {
$message = '\textbf{'.$message.'}';	$message = '\textbf{'.$message.'}';
} else {	} else {
$message = "<b>".$message."</b>";	$message = "<b>".$message."</b>";
$message.= $computer;	if ($computer) {
	$message = "$computer $message";
	}
}	}
$added_computer_text=1;	$added_computer_text=1;
if ($awarded > 0) {	if ($awarded > 0) {
Line 1094 sub decideoutput {	Line 1131 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.= $computer;	if ($computer) {
	$message = "$computer $message";
	}
}	}
$added_computer_text=1;	$added_computer_text=1;
if ($awarded > 0	if ($awarded > 0
Line 1123 sub decideoutput {	Line 1162 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') {
	$message = &mt('Number of boxes checked outside permissible range (either too few or too many).');
	if ($target ne 'tex') {
	$message .= &Apache::loncommon::help_open_topic('Wrong_Num_Boxes_Checked');
	}
	$css_class=$possible_class{'not_charged_try'};
	$button = 1;
} elsif ($award eq 'ERROR') {	} elsif ($award eq 'ERROR') {
$message = &mt('An error occurred while grading your answer.');	$message = &mt('An error occurred while grading your answer.');
$css_class=$possible_class{'not_charged_try'};	$css_class=$possible_class{'not_charged_try'};
Line 1165 sub decideoutput {	Line 1215 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 digits.",$used);	$message = &mt("Submission not graded. Use $word significant figures.");
$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_INVALID_INSTRUCTOR') {	} elsif ($award eq 'UNIT_INVALID_INSTRUCTOR') {
$message = &mt('Error in instructor specifed unit. This error has been reported to the instructor.', $awardmsg);	$message = &mt('Error in instructor specifed unit. This error has been reported to the instructor.', $awardmsg);
Line 1176 sub decideoutput {	Line 1230 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 1289 sub decideoutput {	Line 1359 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') {
$message.= $computer;	if ($computer) {
	$message = "$computer $message";
	}
$added_computer_text=1;	$added_computer_text=1;
}	}
if ($Apache::lonhomework::type eq 'practice') {	if ($Apache::lonhomework::type eq 'practice') {
Line 1496 sub setgradedata {	Line 1576 sub setgradedata {
$Apache::lonhomework::results{"resource.$id.type"} = $Apache::lonhomework::type;	$Apache::lonhomework::results{"resource.$id.type"} = $Apache::lonhomework::type;
$Apache::lonhomework::results{"resource.$id.duedate"} = &Apache::lonnet::EXT("resource.$id.duedate");	$Apache::lonhomework::results{"resource.$id.duedate"} = &Apache::lonnet::EXT("resource.$id.duedate");
$Apache::lonhomework::results{"resource.$id.hinttries"} = &Apache::lonnet::EXT("resource.$id.hinttries");	$Apache::lonhomework::results{"resource.$id.hinttries"} = &Apache::lonnet::EXT("resource.$id.hinttries");
$Apache::lonhomework::results{"resourse.$id.version"} = &Apache::lonnet::usedversion();	$Apache::lonhomework::results{"resource.$id.version"} = &Apache::lonnet::usedversion();
	$Apache::lonhomework::results{"resource.$id.maxtries"} = &Apache::lonnet::EXT("resource.$id.maxtries");
}	}

sub find_which_previous {	sub find_which_previous {
Line 1595 sub get_grade_messages {	Line 1676 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 1632 sub get_grade_messages {	Line 1717 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 1665 sub gradestatus {	Line 1756 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 1707 sub gradestatus {	Line 1799 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 1723 sub previous_tries {	Line 1817 sub previous_tries {

my $count;	my $count;
my %count_lookup;	my %count_lookup;
my $lastrndseed;	my ($lastrndseed,$lasttype);
my $numstamps = 0;	my $numstamps = 0;

foreach my $i (1..$Apache::lonhomework::history{'version'}) {	foreach my $i (1..$Apache::lonhomework::history{'version'}) {
my $prefix = $i.":resource.$id";	my $prefix = $i.":resource.$id";
my $is_anon;	my $is_anon;
	my $curr_type = $Apache::lonhomework::history{"$prefix.type"};
if (defined($env{'form.grade_symb'})) {	if (defined($env{'form.grade_symb'})) {
if (($Apache::lonhomework::history{"$prefix.type"} eq 'anonsurvey') \|\|	if (($curr_type eq 'anonsurvey') \|\| ($curr_type eq 'anonsurveycred')) {
($Apache::lonhomework::history{"$prefix.type"} eq 'anonsurveycred')) {
$is_anon = 1;	$is_anon = 1;
}	}
}	}
Line 1770 sub previous_tries {	Line 1864 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) && ($i > 1)) {	if (($curr_rndseed ne '') && ($lastrndseed ne '')) {
if ($curr_rndseed ne $lastrndseed) {	if (($curr_rndseed ne $lastrndseed) &&
	(($curr_type eq 'randomizetry') \|\| ($lasttype eq 'randomizetry'))) {
$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>';
}	}
}	}
Line 1812 sub previous_tries {	Line 1907 sub previous_tries {
}	}
$output.=&Apache::loncommon::end_data_table_row()."\n";	$output.=&Apache::loncommon::end_data_table_row()."\n";
$lastrndseed = $curr_rndseed;	$lastrndseed = $curr_rndseed;
	$lasttype = $curr_type;
}	}
return if ($output eq '');	return if ($output eq '');
my $headers = '<tr>'.	my $headers = '<tr>'.
Line 1833 sub previous_tries {	Line 1929 sub previous_tries {
my $tries_text = &get_tries_text('link');	my $tries_text = &get_tries_text('link');
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'};	if (($env{'request.state'} eq 'construct') \|\| ($id =~ /\W/)) {
my $result = &Apache::loncommon::modal_adhoc_window($function_name,420,410,$output,&mt($tries_text))."<br />";	$function_name .= $Apache::lonxml::curdepth;
	} else {
	$function_name .= $id;
	}
	$function_name .= '_'.$Apache::lonxml::counter;
	my $possmathjax = 1;
	my $result = &Apache::loncommon::modal_adhoc_window($function_name,420,410,$output,
	&mt($tries_text),$possmathjax)."<br />";
return $result;	return $result;
}	}

Line 1876 sub spelling_languages {	Line 1979 sub spelling_languages {
return \@spelllangs;	return \@spelllangs;
}	}

	sub edit_mathresponse_button {
	my ($field) = @_;
	my $eqneditor = 'lcmath';
	if ($env{'browser.type'} eq 'safari') {
	if ($env{'browser.os'} eq 'mac') {
	my ($prefix,$version) = ($env{'browser.version'} =~ /^(\d*)(\d{3})\./);
	if ($env{'browser.mobile'}) {
	if (($version < 531) \|\| (($prefix eq '') && ($version < 533))) {
	$eqneditor = '';
	}
	} elsif ($version < 533) {
	$eqneditor = 'dragmath';
	}
	} elsif ($env{'browser.os'} eq 'win') {
	if ($env{'browser.version'} < 533) {
	$eqneditor = 'dragmath';
	}
	}
	} elsif ($env{'browser.type'} eq 'explorer') {
	if ($env{'browser.version'} < 9) {
	$eqneditor = 'dragmath';
	}
	} elsif ($env{'browser.type'} eq 'mozilla') {
	if ($env{'browser.version'} < 5) {
	$eqneditor = 'dragmath';
	} else {
	if ($env{'browser.info'} =~ /^firefox\-([\d\.]+)/) {
	my $firefox = $1;
	if ($firefox < 4) {
	$eqneditor = 'dragmath';
	}
	}
	}
	} elsif ($env{'browser.type'} eq 'chrome') {
	if ($env{'browser.version'} < 5) {
	$eqneditor = 'dragmath';
	}
	} elsif ($env{'browser.type'} eq 'opera') {
	if ($env{'browser.version'} < 12) {
	$eqneditor = 'dragmath';
	}
	}
	if ($eqneditor eq 'lcmath') {
	if (($env{'request.course.id'}) && ($env{'request.state'} ne 'construct')) {
	if (exists($env{'course.'.$env{'request.course.id'}.'.uselcmath'})) {
	if ($env{'course.'.$env{'request.course.id'}.'.uselcmath'} eq '0') {
	$eqneditor = 'dragmath';
	}
	} else {
	my %domdefs = &Apache::lonnet::get_domain_defaults($env{'course.'.$env{'request.course.id'}.'.domain'});
	if ($domdefs{'uselcmath'} eq '0') {
	$eqneditor = 'dragmath';
	}
	}
	} else {
	my %domdefs = &Apache::lonnet::get_domain_defaults($env{'course.'.$env{'request.course.id'}.'.domain'});
	if ($domdefs{'uselcmath'} eq '0') {
	$eqneditor = 'dragmath';
	}
	}
	}
	if ($eqneditor eq 'dragmath') {
	# DragMath applet
	my $button=&mt('Edit Answer');
	# my $helplink=&Apache::loncommon::help_open_topic('Formula_Editor');
	my $iconpath=$Apache::lonnet::perlvar{'lonIconsURL'};
	return(<<ENDFORMULABUTTON);
	<script type="text/javascript" language="JavaScript">
	function LC_mathedit_${field} (LCtextline) {
	thenumber = LCtextline;
	var thedata = '';
	if (document.getElementById(LCtextline)) {
	thedata = document.getElementById(LCtextline).value;
	}
	newwin = window.open("/adm/dragmath/MaximaPopup.html","","width=565,height=400,resizable");
	}
	</script>
	<a href="javascript:LC_mathedit_${field}('${field}');void(0);"><img class="stift" src="$iconpath/stift.gif" alt="$button" title="$button" /></a>
	ENDFORMULABUTTON
	} elsif ($eqneditor eq 'lcmath') {
	# LON-CAPA math equation editor
	my $mathjaxjs;
	unless (lc(&Apache::lontexconvert::tex_engine()) eq 'mathjax') {
	$mathjaxjs = <<"MATHJAX_SCRIPT";
	var mathjaxscript = document.createElement("script");
	mathjaxscript.type = "text/javascript";
	mathjaxscript.src = "/adm/MathJax/MathJax.js?config=TeX-AMS-MML_HTMLorMML";
	document.body.appendChild(mathjaxscript);
	MATHJAX_SCRIPT
	}
	return(<<EQ_EDITOR_SCRIPT);
	<script type="text/javascript">
	var LCmathField = document.getElementById('${field}');
	LCmathField.className += ' math'; // note the space
	LCmathField.setAttribute('data-implicit_operators', 'true');
	var LCMATH_started;
	if (typeof LCMATH_started === 'undefined') {
	$mathjaxjs
	LCMATH_started = true;
	var script = document.createElement("script");
	script.type = "text/javascript";
	script.src = "/adm/LC_math_editor/LC_math_editor.min.js";
	document.body.appendChild(script);
	window.addEventListener('load', function(e) {
	LCMATH.initEditors();
	}, false);
	}
	</script>
	EQ_EDITOR_SCRIPT
	}
	}

1;	1;
__END__	__END__

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.327
changed lines
	Added in v.1.355