loncom/homework/lonsimpleproblemedit.pm - diff

Return to lonsimpleproblemedit.pm CVS log

Up to [LON-CAPA] / loncom / homework

Diff for /loncom/homework/lonsimpleproblemedit.pm between versions 1.20.2.1 and 1.35

version 1.20.2.1, 2009/08/12 21:22:40	version 1.35, 2013/05/10 12:48:48
Line 71 sub questiontext {	Line 71 sub questiontext {
return (<<ENDQUESTION);	return (<<ENDQUESTION);
<table bgcolor="#dddd22" cellspacing="4" cellpadding="2" style="width:100%">	<table bgcolor="#dddd22" cellspacing="4" cellpadding="2" style="width:100%">
<tr><td><b>$qt</b><br />	<tr><td><b>$qt</b><br />
<textarea style="width:100%" name="questiontext" cols="80" rows="8">$text</textarea>	<textarea style="width:99%" name="questiontext" cols="80" rows="8">$text</textarea>
<br />$spell_link	<br />$spell_link
</td></tr>	</td></tr>
</table>	</table>
Line 85 sub hint {	Line 85 sub hint {
my $spell_link=	my $spell_link=
&Apache::lonhtmlcommon::spelllink('simpleedit','hinttext');	&Apache::lonhtmlcommon::spelllink('simpleedit','hinttext');
return (<<ENDHINT);	return (<<ENDHINT);
<table bgcolor="#accacc" cellspacing="4" cellpadding="2">	<table bgcolor="#accacc" cellspacing="4" cellpadding="2" style="width:100%">
<tr><td><b>$ht</b><br />	<tr><td><b>$ht</b><br />
<textarea style="width:100%" name="hinttext" cols="80" rows="4">$text</textarea>	<textarea style="width:99%" name="hinttext" cols="80" rows="4">$text</textarea>
<br />$spell_link	<br />$spell_link
</td></tr>	</td></tr>
</table>	</table>
Line 95 sub hint {	Line 95 sub hint {
ENDHINT	ENDHINT
}	}

	sub script {
	my $text=$qparms{$prefix.'numericalscript'};
	my $ht=&mt('Scripting (optional)');
	return (<<ENDSCRIPT);
	<table bgcolor="#ccccaa" cellspacing="4" cellpadding="2" style="width:100%">
	<tr><td><b>$ht</b><br />
	<textarea style="width:99%" name="numericalscript" cols="80" rows="4">$text</textarea>
	</td></tr>
	</table>
	<br />
	ENDSCRIPT
	}

sub foil {	sub foil {
my $number=shift;	my $number=shift;
my %values='';	my (%values,%defaultvalues,%customvalues);
	%defaultvalues = &Apache::lonlocal::texthash(
	'unused' => 'Not shown, not used'
	);
if ($qtype eq 'radio') {	if ($qtype eq 'radio') {
%values=('true' => 'True', 'false' => 'False');	%customvalues = &Apache::lonlocal::texthash(
	'true' => 'True',
	'false' => 'False'
	);
} elsif ($qtype eq 'option') {	} elsif ($qtype eq 'option') {
%values=&evaloptionhash($qparms{$prefix.'options'});	%customvalues=&evaloptionhash($qparms{$prefix.'options'});
}	}
$values{'unused'}='Not shown, not used';	%values = (%defaultvalues,%customvalues);
my $value=$qparms{$prefix.'value'.$number};	my $value=$qparms{$prefix.'value'.$number};
unless (defined($value)) { $value='unused'; }	unless (defined($value)) { $value='unused'; }
unless ($values{$value}) { $value='unused'; }	unless ($values{$value}) { $value='unused'; }
Line 115 sub foil {	Line 134 sub foil {
unless ($positions{$position}) {	unless ($positions{$position}) {
$position='random';	$position='random';
}	}
my $selectvalue=&Apache::loncommon::select_form	my $selectvalue=&Apache::loncommon::select_form(
($value,'value'.$number,%values);	$value,
my $selectposition=&Apache::loncommon::select_form	'value'.$number,
($position,'position'.$number,%positions);	\%values);
	my $selectposition=&Apache::loncommon::select_form(
	$position,
	'position'.$number,
	{&Apache::lonlocal::texthash(%positions)});
my $text=$qparms{$prefix.'text'.$number};	my $text=$qparms{$prefix.'text'.$number};
my %lt=&Apache::lonlocal::texthash('foil' => 'Foil',	my %lt=&Apache::lonlocal::texthash('foil' => 'Foil',
'value' => 'Value',	'value' => 'Value',
Line 128 sub foil {	Line 151 sub foil {
my $spell_link=	my $spell_link=
&Apache::lonhtmlcommon::spelllink('simpleedit',"text$number");	&Apache::lonhtmlcommon::spelllink('simpleedit',"text$number");
return (<<ENDFOIL);	return (<<ENDFOIL);
<table bgcolor="#dd55ff" cellspacing="4" cellpadding="2">	<table bgcolor="#E8D8EE" cellspacing="2" cellpadding="1" style="width:100%">
<tr><td colspan="2"><b>$lt{'foil'}</b></td></tr>	<tr><td colspan="2"><b>$lt{'foil'}</b></td></tr>
<tr><td>$lt{'value'}: $selectvalue</td><td>$lt{'pos'}: $selectposition</td></tr>	<tr><td>$lt{'value'}: $selectvalue</td><td>$lt{'pos'}: $selectposition</td></tr>
<tr><td colspan="2">$lt{'text'}:<br />	<tr><td colspan="2">$lt{'text'}:<br />
<textarea style="width:100%" name="text$number" cols="80" rows="4">$text</textarea>	<textarea style="width:99%" name="text$number" cols="80" rows="4">$text</textarea>
<br />$spell_link	<br />$spell_link
</td></tr>	</td></tr>
</table>	</table>
Line 178 sub handler {	Line 201 sub handler {

# ------------------------------------------------ Prefix for everything stored	# ------------------------------------------------ Prefix for everything stored
$prefix=$env{'request.course.id'}.'.'.$symb.'.0.';	$prefix=$env{'request.course.id'}.'.'.$symb.'.0.';
	#------------------------------------------------- Prefix for storing weight of Problem Parts
	my $weightprefix=$env{'request.course.id'}.'.'.$symb.'.';

# ---------------------------------------------------------- Anything to store?	# ---------------------------------------------------------- Anything to store?
	my $storeresult;
if (($symb) && (defined($env{'form.questiontype'}))) {	if (($symb) && (defined($env{'form.questiontype'}))) {
my %storecontent=();	my %storecontent=();
undef %storecontent;	undef %storecontent;
Line 203 sub handler {	Line 229 sub handler {
$storecontent{$prefix.$parm}=~s/\s+$//s;	$storecontent{$prefix.$parm}=~s/\s+$//s;
}	}
}	}
	# ---------------------------------------------------- Set weights of hidden parts to zero
	# ------------------------------------------------------ and used part to 1
	$storecontent{$weightprefix.'essay.weight'}=0;
	$storecontent{$weightprefix.'numerical.weight'}=0;
	$storecontent{$weightprefix.'option.weight'}=0;
	$storecontent{$weightprefix.'radio.weight'}=0;
	$storecontent{$weightprefix.'string.weight'}=0;
	$storecontent{$weightprefix.$env{'form.questiontype'}.'.weight'}=1;


my $reply=&Apache::lonnet::cput	my $reply=&Apache::lonnet::cput
('resourcedata',\%storecontent,	('resourcedata',\%storecontent,
$env{'course.'.$env{'request.course.id'}.'.domain'},	$env{'course.'.$env{'request.course.id'}.'.domain'},
$env{'course.'.$env{'request.course.id'}.'.num'});	$env{'course.'.$env{'request.course.id'}.'.num'});

	&Apache::lonnet::devalidatecourseresdata(
	$env{'course.'.$env{'request.course.id'}.'.num'},
	$env{'course.'.$env{'request.course.id'}.'.domain'});
	if ($reply eq 'ok') {
	if ($env{'form.forceview'}) {
	my $dest = &get_parent_uri($symb);
	if ($dest) {
	$r->internal_redirect($dest);
	return OK;
	}
	}
	} else {
	$storeresult = $reply;
	}
}	}
# ------------------------------------------------------------------- Read Data	# ------------------------------------------------------------------- Read Data

Line 216 sub handler {	Line 266 sub handler {
$env{'course.'.$env{'request.course.id'}.'.num'},	$env{'course.'.$env{'request.course.id'}.'.num'},
$env{'request.course.id'}.'.'.$symb);	$env{'request.course.id'}.'.'.$symb);

	my $js = <<"ENDJS";

	<script type="text/javascript">
	// <![CDATA[

	function setForceView() {
	if (document.getElementById('spview')) {
	document.getElementById('spview').value = 1;
	}
	return true;
	}
	// END LON-CAPA Internal -->
	// ]]>
	</script>

	ENDJS

# ------------------------------------------------------------ Print the screen	# ------------------------------------------------------------ Print the screen
my $spell_header=&Apache::lonhtmlcommon::spellheader();	my $spell_header=&Apache::lonhtmlcommon::spellheader();
$r->print(&Apache::loncommon::start_page('Simple Problem Editor',	$r->print(&Apache::loncommon::start_page('Simple Problem Editor',
$spell_header));	$spell_header.$js));
if ($symb) {	if ($symb) {
$r->print('<h1>'.&Apache::lonnet::gettitle($symb).'</h1>');	my $title='<h1>'.&Apache::lonnet::gettitle($symb).'</h1>';
$r->print('<table width="100%" bgcolor="#FFFFAA" border="2"><tr><td>');	if (&get_parent_uri($symb)) {
my $displaylink = &get_parent_uri($symb);	$r->print($title);
if ($displaylink ne '') {	if ($storeresult) {
$r->print('<a href="'.$displaylink.'">'.&mt('Student View').'</a> - ');	$r->print('<p class="LC_error">'.&mt('An error: [_1] occurred saving your changes',$storeresult).'</p>');
	}
} else {	} else {
$r->print('<span class="LC_error">'.&mt('An error occurred retrieving the link to this problem').'<br />'.&mt('You may need to [_1]re-select the course[_2] and then return to this resource to view it.','<a href="/adm/roles">','</a>').'</span><br />');	$r->print($title
	.'<p class="LC_error">'
	.&mt('An error occurred retrieving the link to this problem.')
	.'<br />'
	.&mt('You may need to [_1]re-select the course[_2] and then return to this resource to view it.'
	,'<a href="/adm/roles">','</a>')
	.'</p>'
	);
}	}
$r->print(&mt('Note: it can take up to 10 minutes for changes to take effect for all users.').	$r->print('<p class="LC_warning">'
&Apache::loncommon::help_open_topic('Caching').'</td></tr></table>');	.&mt('Note: it can take up to 10 minutes for changes to take effect for all users.')
$r->print('<table border="2" bgcolor="#FFFFFF" width="100%"><tr><td>'.	.&Apache::loncommon::help_open_topic('Caching')
&rawrendering($symb).	.'</p>'
'</td></tr></table><br />');	);

	$r->print(
	'<div class="LC_Box">'
	.&rawrendering($symb)
	.'</div>'
	);
$r->print('<form name="simpleedit" method="post">');	$r->print('<form name="simpleedit" method="post">');
# Question Type	# Question Type
my %questiontypes=('radio' =>	my %questiontypes=(
'1 out of N multiple choice (radio button)',	'radio' => '1 out of N multiple choice (radio button)',
'option' => 'Option response',	'option' => 'Option Response',
'string' => 'Short string response',	'string' => 'Short string response',
'essay' => 'Essay, open end');	'essay' => 'Essay, open end',
	'numerical' => 'Numerical Response');
$qtype=$qparms{$prefix.'questiontype'};	$qtype=$qparms{$prefix.'questiontype'};
unless (defined($qtype)) { $qtype='radio'; }	unless (defined($qtype)) { $qtype='radio'; }
unless ($questiontypes{$qtype}) { $qtype='radio'; }	unless ($questiontypes{$qtype}) { $qtype='radio'; }
$r->print('<b>'.&mt('Question Type').	$r->print(
': '.&Apache::loncommon::select_form	'<fieldset style="width:400px;">'
($qtype,'questiontype',%questiontypes).	.'<legend>'.&mt('Question Type').'</legend>'
'</b><br /><input type="submit" value="'.&mt('Save and Edit').	.&Apache::loncommon::select_form(
'" /><p> </p>');	$qtype,
	'questiontype',
	{&Apache::lonlocal::texthash(%questiontypes)})
	.'</fieldset>'
	);
	$r->print(
	'<p>'
	.'<input type="hidden" name="forceview" value="" id="spview" />'
	.'<input type="submit" value="'.&mt('Save and Edit').'" />'
	.(' ' x3)
	.'<input type="submit" value="'.&mt('Save and View').'" onclick="javascript:setForceView();" />'
	.'</p>'
	);
	# Script
	if ($qtype eq 'numerical') {
	$r->print(&script());
	}
# Question Text	# Question Text
$r->print(&questiontext());	$r->print(&questiontext());
# Radio, Option ===	# Radio, Option ===
Line 258 sub handler {	Line 356 sub handler {
unless (defined($maxfoils)) { $maxfoils=10; }	unless (defined($maxfoils)) { $maxfoils=10; }
unless ($maxfoils=~/^\d+$/) { $maxfoils=10; }	unless ($maxfoils=~/^\d+$/) { $maxfoils=10; }
if ($maxfoils<=0) { $maxfoils=10; }	if ($maxfoils<=0) { $maxfoils=10; }
my %randomizes=('yes' => 'Display foils in random order',	my %randomizes=(
'no' => 'Display foils in order given');	'yes' => 'Display foils in random order',
	'no' => 'Display foils in order given');
my $randomize=$qparms{$prefix.'randomize'};	my $randomize=$qparms{$prefix.'randomize'};
unless (defined($randomize)) { $randomize='yes'; }	unless (defined($randomize)) { $randomize='yes'; }
unless ($randomizes{$randomize}) { $randomize='yes'; }	unless ($randomizes{$randomize}) { $randomize='yes'; }
$r->print(	$r->print(
'<table bgcolor="#00ee44" cellspacing="4" cellpadding="2">'.	'<table bgcolor="#00ee44" cellspacing="4" cellpadding="2" style="width:100%">'.
'<tr><td>'.&mt('Max number of foils displayed').	'<tr><td>'.&mt('Max number of foils displayed').
': <input type="text" size="3" name="maxfoils" value="'.$maxfoils.'" />  '.	': <input type="text" size="3" name="maxfoils" value="'.$maxfoils.'" />  '.
&Apache::loncommon::select_form	&Apache::loncommon::select_form(
($randomize,'randomize',%randomizes).	$randomize,
'</td></tr><tr><td bgcolor="#AAAAAA">');	'randomize',
	{&Apache::lonlocal::texthash(%randomizes)}).
	'</td></tr><tr><td bgcolor="#F0F0F0">');
# Option Response: Options	# Option Response: Options
if ($qtype eq 'option') {	if ($qtype eq 'option') {
my $options=$qparms{$prefix.'options'};	my $options=$qparms{$prefix.'options'};
unless (defined($options)) { $options="('true','false')"; }	unless (defined($options)) { $options="('true','false')"; }
my %optionshash=&evaloptionhash($options);	my %optionshash=&evaloptionhash($options);
$r->print(	$r->print(
'<table bgcolor="#ffcc22" cellspacing="4" cellpadding="2">'.	'<table bgcolor="#ffcc22" cellspacing="4" cellpadding="2" style="width:100%">'.
'<tr><td><input type="hidden" name="options" value="'.	'<tr><td><input type="hidden" name="options" value="'.
$options.'" />'.&mt('Add new option').': '.	$options.'" />'.&mt('Add new option').': '.
'<input type="text" name="newopt" size="15" />'.	'<input type="text" name="newopt" size="15" />'.
&mt('Delete an option').': '.	&mt('Delete an option').': '.
&Apache::loncommon::select_form('','delopt',('' => '',%optionshash)).	&Apache::loncommon::select_form('','delopt',{'' => '',%optionshash}).
'</td></tr><tr><td>');	'</td></tr><tr><td>');
}	}
# Foils	# Foils
Line 309 sub handler {	Line 410 sub handler {
unless (defined($stringtype)) { $stringtype='cs'; }	unless (defined($stringtype)) { $stringtype='cs'; }
unless ($stringtypes{$stringtype}) { $stringtype='cs'; }	unless ($stringtypes{$stringtype}) { $stringtype='cs'; }
$r->print(	$r->print(
'<table bgcolor="#00ee44" cellspacing="4" cellpadding="2">'.	'<table bgcolor="#00ee44" cellspacing="4" cellpadding="2" style="width:100%">'.
'<tr><td>'.&mt('Correct answer').': <input type="text" size="20" name="stringanswer" value="'.$stringanswer.'" />  '.	'<tr><td><label>'.&mt('Correct answer').': <input type="text" size="20" name="stringanswer" value="'.$stringanswer.'" /></label>  '.
&Apache::loncommon::select_form	&Apache::loncommon::select_form(
($stringtype,'stringtype',%stringtypes).	$stringtype,
	'stringtype',
	{&Apache::lonlocal::texthash(%stringtypes)}).
'</td></tr></table><br />');	'</td></tr></table><br />');
# Hint	# Hint
$r->print(&hint());	$r->print(&hint());
}	}
	if ($qtype eq 'numerical') {
	my $numericalanswer=$qparms{$prefix.'numericalanswer'};
	unless (defined($numericalanswer)) { $numericalanswer=''; }
	my $numericaltolerance=$qparms{$prefix.'numericaltolerance'};
	unless (defined($numericaltolerance)) { $numericaltolerance='5%'; }
	my $numericalsigfigs=$qparms{$prefix.'numericalsigfigs'};
	unless (defined($numericalsigfigs)) { $numericalsigfigs='1,15'; }

	$r->print(
	'<table bgcolor="#00ee44" cellspacing="4" cellpadding="2" style="width:100%">'.
	'<tr><td><label>'.&mt('Correct answer').': <input type="text" size="20" name="numericalanswer" value="'.$numericalanswer.'" /></label>  '.
	'<label>'.&mt('Unit').': <input type="text" size="5" name="numericalunit" value="'.$qparms{$prefix.'numericalunit'}.'" /></label>  '.
	'<label>'.&mt('Format').': <input type="text" size="5" name="numericalformat" value="'.$qparms{$prefix.'numericalformat'}.'" /></label>  '.
	'<label>'.&mt('Tolerance').': <input type="text" size="5" name="numericaltolerance" value="'.$numericaltolerance.'" /></label>  '.
	'<label>'.&mt('Significant digits').': <input type="text" size="5" name="numericalsigfigs" value="'.$numericalsigfigs.'" /></label>'.
	'</td></tr></table><br />');
	$r->print(&hint());
	}
# Store Button	# Store Button
$r->print(	$r->print(
'<input type="submit" value="'.&mt('Save and Edit').'" /></form>');	'<input type="submit" value="'.&mt('Save and Edit').'" />'.
	(' ' x3).
	'<input type="submit" value="'.&mt('Save and View').'" onclick="javascript:setForceView();" />'.
	'</form>');
} else {	} else {
$r->print(&mt('Could not identify problem.'));	$r->print(&mt('Could not identify problem.'));
}	}
$r->print(&Apache::loncommon::end_page());	$r->print(&Apache::loncommon::end_page());
return OK;	return OK;
}	}

1;	1;
__END__	__END__

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

Removed from v.1.20.2.1
changed lines
	Added in v.1.35