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.319 and 1.333.2.4

version 1.319, 2013/07/24 18:21:42	version 1.333.2.4, 2016/08/05 23:17:10
Line 222 sub start_textfield {	Line 222 sub start_textfield {
$oldresponse = $Apache::lonhomework::history{"resource.$partid.$resid.submission"};	$oldresponse = $Apache::lonhomework::history{"resource.$partid.$resid.submission"};
} elsif (($Apache::lonhomework::history{"resource.$partid.type"} eq 'anonsurvey') \|\|	} elsif (($Apache::lonhomework::history{"resource.$partid.type"} eq 'anonsurvey') \|\|
($Apache::lonhomework::history{"resource.$partid.type"} eq 'anonsurveycred')) {	($Apache::lonhomework::history{"resource.$partid.type"} eq 'anonsurveycred')) {
$oldresponse = '* '.&mt('only shown to submitter').' *';	$oldresponse = '* '.&mt('(only shown to submitter)').' *';
} else {	} else {
$oldresponse = $Apache::lonhomework::history{"resource.$partid.$resid.submission"};	$oldresponse = $Apache::lonhomework::history{"resource.$partid.$resid.submission"};
}	}
Line 235 sub start_textfield {	Line 235 sub start_textfield {
my $addchars=&Apache::lonxml::get_param('addchars',$parstack,$safeeval);	my $addchars=&Apache::lonxml::get_param('addchars',$parstack,$safeeval);
$result='';	$result='';
my $tagident = 'HWVAL_' . $resid;	my $tagident = 'HWVAL_' . $resid;
	my $itemid = 'HWVAL_'.$partid.'_'.$resid;
if ($addchars) {	if ($addchars) {
$result.=&addchars($tagident, $addchars);	$result.=&addchars($tagident, $addchars);
}	}
my $textareaclass = 'class="LC_richDetectHtml spellchecked"';	my $textareaclass;
$result.= '<textarea wrap="hard" name="'.$tagident.'" id="'.$tagident.'" ' .	unless (&Apache::londefdef::is_inside_of($tagstack,
	'externalresponse')) {
	$textareaclass = 'class="LC_richDetectHtml spellchecked"';
	}
	$result.= '<textarea wrap="hard" name="'.$tagident.'" id="'.$itemid.'" ' .
'rows="'.$rows.'" cols="'.$cols.'" '.$textareaclass	'rows="'.$rows.'" cols="'.$cols.'" '.$textareaclass
.'>'.	.'>'.
&HTML::Entities::encode($oldresponse,'<>&"');	&HTML::Entities::encode($oldresponse,'<>&"');
Line 254 sub start_textfield {	Line 259 sub start_textfield {
&& &Apache::londefdef::is_inside_of($tagstack,	&& &Apache::londefdef::is_inside_of($tagstack,
'essayresponse') ) {	'essayresponse') ) {
$result='<table class="LC_pastsubmission"><tr><td>'.	$result='<table class="LC_pastsubmission"><tr><td>'.
$oldresponse.'</td></tr></table>';	&HTML::Entities::encode($oldresponse,'"<>&').
	'</td></tr></table>';
}	}
#get rid of any startup text	#get rid of any startup text
&Apache::lonxml::get_all_text("/textfield",$parser,$style);	&Apache::lonxml::get_all_text("/textfield",$parser,$style);
Line 320 sub end_textfield {	Line 326 sub end_textfield {
my $spellcheck = &Apache::lonxml::get_param('spellcheck', $parstack, $safeeval);	my $spellcheck = &Apache::lonxml::get_param('spellcheck', $parstack, $safeeval);
$Apache::lonxml::evaluate++;	$Apache::lonxml::evaluate++;
if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') {	if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
	my $partid=$Apache::inputtags::part;
my $resid = $Apache::inputtags::response[-1];	my $resid = $Apache::inputtags::response[-1];
my $tagident = 'HWVAL_' . $resid;	my $itemid = 'HWVAL_' . $partid . '_' . $resid;
my $result = "</textarea>";	my $result = "</textarea>";
$result .= &spellcheck_onblur($tagident, $spellcheck);	$result .= &spellcheck_onblur($itemid, $spellcheck);
return $result;	return $result;
}	}
} elsif ($target eq 'edit') {	} elsif ($target eq 'edit') {
Line 424 sub start_textline {	Line 431 sub start_textline {
($Apache::lonhomework::history{"resource.$partid.type"} eq 'anonsurveycred') \|\|	($Apache::lonhomework::history{"resource.$partid.type"} eq 'anonsurveycred') \|\|
($Apache::lonhomework::type eq 'anonsurvey') \|\|	($Apache::lonhomework::type eq 'anonsurvey') \|\|
($Apache::lonhomework::type eq 'anonsurveycred')) {	($Apache::lonhomework::type eq 'anonsurveycred')) {
$oldresponse = '* '.&mt('only shown to submitter').' *';	$oldresponse = '* '.&mt('(only shown to submitter)').' *';
} else {	} else {
$oldresponse = $Apache::lonhomework::history{"resource.$partid.$id.submission"};	$oldresponse = $Apache::lonhomework::history{"resource.$partid.$id.submission"};
}	}
Line 452 sub start_textline {	Line 459 sub start_textline {
$readonly='';	$readonly='';
}	}
my $name = 'HWVAL_'.$id;	my $name = 'HWVAL_'.$id;
	my $itemid = 'HWVAL_'.$partid.'_'.$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="' . $name . '"'	. ' id="' . $input_tag_id . '"'
. ' value="'. $oldresponse.'"'	. ' value="'. $oldresponse.'"'
. ' class="spellchecked" size="'.$size.'"'.$maxlength	. ' class="LC_textline spellchecked" size="'.$size.'"'.$maxlength.' />';
. '/>';

$result .= &spellcheck_onblur($name, $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 691 sub current_file_submissions {	Line 704 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 $header = &Apache::loncommon::start_data_table().	my $header = &portpath_popup_js().
	&Apache::loncommon::start_data_table().
&Apache::loncommon::start_data_table_header_row();	&Apache::loncommon::start_data_table_header_row();
if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') {	if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
$header .= '<th>'.&mt('Delete?').'</th>';	$header .= '<th>'.&mt('Delete?').'</th>';
Line 757 sub current_file_submissions {	Line 771 sub current_file_submissions {
' value="'.$portfile.'" id="HWFILE'.$jspart.'_'.$id.'_'.$num.'_delete" /></td>'."\n";	' value="'.$portfile.'" id="HWFILE'.$jspart.'_'.$id.'_'.$num.'_delete" /></td>'."\n";
$num ++;	$num ++;
}	}
my $showname = $rows{$url}{path}.$name;	my $pathid = 'HWFILE'.$jspart.'_'.$id.'_'.$num.'_path';
	my $pathidtext = $pathid.'text';
	my ($showname,$showpath);
if ($legacy{$url}) {	if ($legacy{$url}) {
$showname = $name.' '.&mt('not in portfolio');	$showname = $name.' '.&mt('not in portfolio');
	} else {
	$showname = $name;
	$showpath = '<br />'.
	'<span id="'.$pathidtext.'" class="LC_cusr_subheading">'.
	'<a href="javascript:showPortPath('."'$pathid','$pathidtext'".');" '.
	'class="LC_menubuttons_link">'.
	&mt('(Show path)').'</a></span>'.
	'<div id="'.$pathid.'" class="LC_dccid">'.$rows{$url}{path}.$name.
	'</div>';
}	}
$result .=	$result .=
'<td><a href="'.$link.'"><img src="'.$icon.	'<td><a href="'.$link.'"><img src="'.$icon.
'" border="0" alt="" />'.$showname.'</a></td>'."\n".	'" border="0" alt="" />'.$showname.'</a>'.$showpath.'</td>'."\n".
'<td align="right" valign="bottom">'.$rows{$url}{size}.'</td>'."\n".	'<td align="right" valign="bottom">'.$rows{$url}{size}.'</td>'."\n".
'<td align="right" valign="bottom">'.$rows{$url}{lastmodified}.'</td>'."\n".	'<td align="right" valign="bottom">'.$rows{$url}{lastmodified}.'</td>'."\n".
&Apache::loncommon::end_data_table_row();	&Apache::loncommon::end_data_table_row();
Line 818 sub current_file_info {	Line 843 sub current_file_info {
return ($status,\%info,$error);	return ($status,\%info,$error);
}	}

	sub portpath_popup_js {
	my %lt = &Apache::lonlocal::texthash(
	show => '(Show path)',
	hide => '(Hide)',
	);
	return <<"END";
	<script type="text/javascript">
	// <![CDATA[

	function showPortPath(id,idtext) {
	document.getElementById(id).style.display='block';
	document.getElementById(id).style.textAlign='left';
	document.getElementById(id).style.textFace='normal';
	if (document.getElementById(idtext)) {
	document.getElementById(idtext).innerHTML ='<a href="javascript:hidePortPath(\\''+id+'\\',\\''+idtext+'\\'); '+
	'"class="LC_menubuttons_link">$lt{'hide'}</a> ';
	}
	return;
	}

	function hidePortPath(id,idtext) {
	if (document.getElementById(id)) {
	document.getElementById(id).style.display='none';
	}
	if (document.getElementById(idtext)) {
	document.getElementById(idtext).innerHTML ='<a href="javascript:showPortPath(\\''+id+'\\',\\''+idtext+'\\');" '+
	'class="LC_menubuttons_link">$lt{'show'}</a>';
	}
	return;
	}

	// ]]>
	</script>

	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 841 sub valid_award {	Line 903 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 931 sub finalizeawards {	Line 993 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 943 sub finalizeawards {	Line 1022 sub finalizeawards {
}	}

sub decideoutput {	sub decideoutput {
my ($award,$awarded,$awardmsg,$solved,$previous,$target,$nocorrect)=@_;	my ($award,$awarded,$awardmsg,$solved,$previous,$target,$nocorrect,$tdclass)=@_;

my $message='';	my $message='';
my $button=0;	my $button=0;
Line 969 sub decideoutput {	Line 1048 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 993 sub decideoutput {	Line 1072 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 1037 sub decideoutput {	Line 1118 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 1068 sub decideoutput {	Line 1151 sub decideoutput {
}	}
$css_class=$possible_class{'not_charged_try'};	$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 1088 sub decideoutput {	Line 1178 sub decideoutput {
$css_class=$possible_class{'not_charged_try'};	$css_class=$possible_class{'not_charged_try'};
$button=1;	$button=1;
} elsif ($award eq 'EXCESS_FILESIZE') {	} elsif ($award eq 'EXCESS_FILESIZE') {
$message = &mt('Submission won\'t be graded. The combined size of submitted files exceeded the amount allowed.');	$message = &mt("Submission won't be graded. The combined size of submitted files exceeded the amount allowed.");
$css_class=$possible_class{'not_charged_try'};	$css_class=$possible_class{'not_charged_try'};
$button=1;	$button=1;
} elsif ($award eq 'FILENAME_INUSE') {	} elsif ($award eq 'FILENAME_INUSE') {
Line 1242 sub decideoutput {	Line 1332 sub decideoutput {
}	}
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 1439 sub setgradedata {	Line 1531 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 1519 sub grade {	Line 1612 sub grade {
}	}

sub get_grade_messages {	sub get_grade_messages {
my ($id,$prefix,$target,$status,$nocorrect) = @_;	my ($id,$prefix,$target,$status,$nocorrect,$tdclass) = @_;
# nocorrect suppresses "Computer's answer now shown above"	# 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 1534 sub get_grade_messages {	Line 1627 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,(($status eq 'CAN_ANSWER') \|\| $nocorrect));	$target,(($status eq 'CAN_ANSWER') \|\| $nocorrect),$tdclass);
if ($target eq 'tex') {	if ($target eq 'tex') {
$message='\vskip 2 mm '.$message.' ';	$message='\vskip 2 mm '.$message.' ';
} else {	} else {
$message="<td class=\"$css_class\">$message</td>";	$message="<td class=\"$tdclass $css_class\">$message</td>";
if ($previousmsg) {	if ($previousmsg) {
$previousmsg="<td class=\"LC_answer_previous\">$previousmsg</td>";	$previousmsg="<td class=\"$tdclass LC_answer_previous\">$previousmsg</td>";
}	}
}	}
}	}
Line 1575 sub get_grade_messages {	Line 1668 sub get_grade_messages {
$trial.="/".$Apache::inputtags::params{'maxtries'};	$trial.="/".$Apache::inputtags::params{'maxtries'};
}	}
}	}
$trystr = '<td><span class="LC_nobreak">'.&mt($tries_text.' [_1]',$trial).'</span></td>';	$trystr = '<td class="'.$tdclass.'"><span class="LC_nobreak">'.&mt($tries_text.' [_1]',$trial).'</span></td>';
}	}
}	}

Line 1583 sub get_grade_messages {	Line 1676 sub get_grade_messages {
#last submissions was after due date	#last submissions was after due date
$latemessage=&mt(' The last submission was after the Due Date ');;	$latemessage=&mt(' The last submission was after the Due Date ');;
if ($target eq 'web') {	if ($target eq 'web') {
$latemessage='<td class="LC_answer_late">'.$latemessage.'</td>';	$latemessage='<td class="'.$tdclass.' LC_answer_late">'.$latemessage.'</td>';
}	}
}	}
return ($previousmsg,$latemessage,$message,$trystr,$showbutton);	return ($previousmsg,$latemessage,$message,$trystr,$showbutton);
Line 1597 sub gradestatus {	Line 1690 sub gradestatus {
my $trystr='';	my $trystr='';
my $button='';	my $button='';
my $previousmsg='';	my $previousmsg='';
	my $tdclass='';

my $status = $Apache::inputtags::status['-1'];	my $status = $Apache::inputtags::status['-1'];
&Apache::lonxml::debug("gradestatus has :$status:");	&Apache::lonxml::debug("gradestatus has :$status:");
Line 1613 sub gradestatus {	Line 1707 sub gradestatus {
$showbutton = 0;	$showbutton = 0;
}	}

	unless (($status eq 'SHOW_ANSWER') \|\| ($status eq 'CANNOT_ANSWER')) {
	if ($target ne 'tex') {
	$tdclass = 'LC_status_submit_'.$id;
	}
	}

($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,$tdclass);
if ($status eq 'CANNOT_ANSWER') {	if ($status eq 'CANNOT_ANSWER') {
$showbutton = 0;	$showbutton = 0;
}	}
if ( $status eq 'SHOW_ANSWER') {	if ( $status eq 'SHOW_ANSWER') {
undef($previousmsg);	undef($previousmsg);
}	}
if ( $showbutton ) {	if ( $showbutton ) {
if ($target ne 'tex') {	if ($target ne 'tex') {
$button =	$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.'"	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">'.
	&mt('Processing your submission ...').'</div>';
}	}
}	}

Line 1642 sub gradestatus {	Line 1744 sub gradestatus {
$output =	$output =
'<table><tr><td>'.$button.'</td>'.$output;	'<table><tr><td>'.$button.'</td>'.$output;
if (!$no_previous) {	if (!$no_previous) {
$output.='<td>'.&previous_tries($id,$target).'</td>';	$output.='<td class="'.$tdclass.'">'.&previous_tries($id,$target).'</td>';
}	}
$output.= '</tr></table>';	$output.= '</tr></table>';
return $output;	return $output;
Line 1657 sub previous_tries {	Line 1759 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 1704 sub previous_tries {	Line 1806 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 1746 sub previous_tries {	Line 1849 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 1810 sub spelling_languages {	Line 1914 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.319
changed lines
	Added in v.1.333.2.4