--- loncom/homework/lonsimpleproblemedit.pm 2009/02/01 20:40:28 1.20
+++ loncom/homework/lonsimpleproblemedit.pm 2009/10/16 17:23:51 1.28
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Simple Problem Parameter Setting "Editor"
#
-# $Id: lonsimpleproblemedit.pm,v 1.20 2009/02/01 20:40:28 raeburn Exp $
+# $Id: lonsimpleproblemedit.pm,v 1.28 2009/10/16 17:23:51 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -95,6 +95,19 @@ sub hint {
ENDHINT
}
+sub script {
+ my $text=$qparms{$prefix.'numericalscript'};
+ my $ht=&mt('Scripting (optional)');
+ return (<<ENDSCRIPT);
+<table bgcolor="#ccccaa" cellspacing="4" cellpadding="2">
+<tr><td><b>$ht</b><br />
+<textarea style="width:100%" name="numericalscript" cols="80" rows="4">$text</textarea>
+</td></tr>
+</table>
+<br />
+ENDSCRIPT
+}
+
sub foil {
my $number=shift;
my %values='';
@@ -128,11 +141,11 @@ sub foil {
my $spell_link=
&Apache::lonhtmlcommon::spelllink('simpleedit',"text$number");
return (<<ENDFOIL);
-<table bgcolor="#dd55ff" cellspacing="4" cellpadding="2">
+<table bgcolor="#E8D8EE" cellspacing="2" cellpadding="1">
<tr><td colspan="2"><b>$lt{'foil'}</b></td></tr>
<tr><td>$lt{'value'}: $selectvalue</td><td>$lt{'pos'}: $selectposition</td></tr>
<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
</td></tr>
</table>
@@ -178,6 +191,9 @@ sub handler {
# ------------------------------------------------ Prefix for everything stored
$prefix=$env{'request.course.id'}.'.'.$symb.'.0.';
+#------------------------------------------------- Prefix for storing weight of Problem Parts
+ my $weightprefix=$env{'request.course.id'}.'.'.$symb.'.';
+
# ---------------------------------------------------------- Anything to store?
if (($symb) && (defined($env{'form.questiontype'}))) {
@@ -203,11 +219,25 @@ sub handler {
$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
('resourcedata',\%storecontent,
$env{'course.'.$env{'request.course.id'}.'.domain'},
$env{'course.'.$env{'request.course.id'}.'.num'});
+ &Apache::lonnet::devalidatecourseresdata(
+ $env{'course.'.$env{'request.course.id'}.'.num'},
+ $env{'course.'.$env{'request.course.id'}.'.domain'});
+
}
# ------------------------------------------------------------------- Read Data
@@ -222,25 +252,40 @@ sub handler {
$spell_header));
if ($symb) {
$r->print('<h1>'.&Apache::lonnet::gettitle($symb).'</h1>');
- $r->print('<table width="100%" bgcolor="#FFFFAA" border="2"><tr><td>');
my $displaylink = &get_parent_uri($symb);
- if ($displaylink ne '') {
- $r->print('<a href="'.$displaylink.'">'.&mt('Student View').'</a> - ');
+ if ($displaylink ne '') {
+ my $functions=&Apache::lonhtmlcommon::start_funclist()
+ .&Apache::lonhtmlcommon::add_item_funclist(
+ '<a href="'.$displaylink.'">'
+ .&mt('Student View').'</a>')
+ .&Apache::lonhtmlcommon::end_funclist();
+ $r->print(&Apache::loncommon::head_subbox($functions));
} 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('<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.').
- &Apache::loncommon::help_open_topic('Caching').'</td></tr></table>');
+ $r->print('<p class="LC_warning">'
+ .&mt('Note: it can take up to 10 minutes for changes to take effect for all users.')
+ .&Apache::loncommon::help_open_topic('Caching')
+ .'</p>'
+ );
+
$r->print('<table border="2" bgcolor="#FFFFFF" width="100%"><tr><td>'.
&rawrendering($symb).
'</td></tr></table><br />');
- $r->print('<form name="simpleedit" method="POST">');
+ $r->print('<form name="simpleedit" method="post">');
# Question Type
my %questiontypes=('radio' =>
'1 out of N multiple choice (radio button)',
'option' => 'Option response',
'string' => 'Short string response',
- 'essay' => 'Essay, open end');
+ 'essay' => 'Essay, open end',
+ 'numerical' => 'Numerical response');
$qtype=$qparms{$prefix.'questiontype'};
unless (defined($qtype)) { $qtype='radio'; }
unless ($questiontypes{$qtype}) { $qtype='radio'; }
@@ -249,6 +294,10 @@ sub handler {
($qtype,'questiontype',%questiontypes).
'</b><br /><input type="submit" value="'.&mt('Save and Edit').
'" /><p> </p>');
+# Script
+ if ($qtype eq 'numerical') {
+ $r->print(&script());
+ }
# Question Text
$r->print(&questiontext());
# Radio, Option ===
@@ -269,7 +318,7 @@ sub handler {
': <input type="text" size="3" name="maxfoils" value="'.$maxfoils.'" /> '.
&Apache::loncommon::select_form
($randomize,'randomize',%randomizes).
- '</td></tr><tr><td bgcolor="#AAAAAA">');
+ '</td></tr><tr><td bgcolor="#F0F0F0">');
# Option Response: Options
if ($qtype eq 'option') {
my $options=$qparms{$prefix.'options'};
@@ -310,13 +359,31 @@ sub handler {
unless ($stringtypes{$stringtype}) { $stringtype='cs'; }
$r->print(
'<table bgcolor="#00ee44" cellspacing="4" cellpadding="2">'.
- '<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
($stringtype,'stringtype',%stringtypes).
'</td></tr></table><br />');
# 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">'.
+ '<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
$r->print(
'<input type="submit" value="'.&mt('Save and Edit').'" /></form>');