--- loncom/homework/lonsimpleproblemedit.pm 2005/04/07 06:56:22 1.15
+++ loncom/homework/lonsimpleproblemedit.pm 2009/10/19 15:15:03 1.29
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Simple Problem Parameter Setting "Editor"
#
-# $Id: lonsimpleproblemedit.pm,v 1.15 2005/04/07 06:56:22 albertel Exp $
+# $Id: lonsimpleproblemedit.pm,v 1.29 2009/10/19 15:15:03 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -34,6 +34,9 @@ use Apache::loncommon;
use Apache::lonnet;
use Apache::lonlocal;
use Apache::lonnavmaps;
+use lib '/home/httpd/lib/perl/';
+use LONCAPA;
+
my %qparms;
my $prefix;
@@ -63,10 +66,13 @@ sub rawrendering {
sub questiontext {
my $text=$qparms{$prefix.'questiontext'};
my $qt=&mt('Question Text');
+ my $spell_link=
+ &Apache::lonhtmlcommon::spelllink('simpleedit','questiontext');
return (<<ENDQUESTION);
-<table bgcolor="#dddd22" cellspacing="4" cellpadding="2">
+<table bgcolor="#dddd22" cellspacing="4" cellpadding="2" style="width:100%">
<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
</td></tr>
</table>
<br />
@@ -76,16 +82,32 @@ ENDQUESTION
sub hint {
my $text=$qparms{$prefix.'hinttext'};
my $ht=&mt('Hint Text');
+ my $spell_link=
+ &Apache::lonhtmlcommon::spelllink('simpleedit','hinttext');
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 />
-<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
</td></tr>
</table>
<br />
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 {
my $number=shift;
my %values='';
@@ -116,12 +138,15 @@ sub foil {
'pos' => 'Position',
'text' => 'Text');
+ 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" style="width:100%">
<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>
<br />
@@ -131,13 +156,16 @@ ENDFOIL
sub get_parent_uri {
my ($cur_symb)=@_;
my $navmap = Apache::lonnavmaps::navmap->new();
- my $it = $navmap->getIterator(undef, undef, undef, 1);
- while ( my $res=$it->next()) {
- if (ref($res) && $res->symb() eq $cur_symb) { last; }
+ if (defined($navmap)) {
+ my $it = $navmap->getIterator(undef, undef, undef, 1);
+ while ( my $res=$it->next()) {
+ if (ref($res) && $res->symb() eq $cur_symb) { last; }
+ }
+ my ($src,$symb,$anchor)=&Apache::lonnavmaps::getLinkForResource($it->getStack());
+ if (defined($anchor)) { $anchor='#'.$anchor; }
+ return $src.'?symb='.&escape($symb).$anchor;
}
- my ($src,$symb,$anchor)=&Apache::lonnavmaps::getLinkForResource($it->getStack());
- if (defined($anchor)) { $anchor='#'.$anchor; }
- return $src.'?symb='.&Apache::lonnet::escape($symb).$anchor;
+ return;
}
sub handler {
@@ -163,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'}))) {
@@ -188,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
@@ -202,35 +247,68 @@ sub handler {
$env{'request.course.id'}.'.'.$symb);
# ------------------------------------------------------------ Print the screen
- $r->print(<<ENDDOCUMENT);
-<html>
-<head>
-<title>The LearningOnline Network with CAPA</title>
-ENDDOCUMENT
- $r->print(&Apache::loncommon::bodytag('Simple Problem Editor'));
+ my $spell_header=&Apache::lonhtmlcommon::spellheader();
+ $r->print(&Apache::loncommon::start_page('Simple Problem Editor',
+ $spell_header));
if ($symb) {
- $r->print('<h1>'.&Apache::lonnet::gettitle($symb).'</h1>');
- $r->print('<table width="100%" bgcolor="#FFFFAA" border="2"><tr><td>'.
- '<a href="'.&get_parent_uri($symb).'">'.&mt('Student View').'</a> - '.&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('<table border="2" bgcolor="#FFFFFF" width="100%"><tr><td>'.
- &rawrendering($symb).
- '</td></tr></table><br />');
- $r->print('<form method="post">');
+ my $title='<h1>'.&Apache::lonnet::gettitle($symb).'</h1>';
+ my $displaylink = &get_parent_uri($symb);
+ 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)
+ .$title);
+ } else {
+ $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('<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(
+ '<div class="LC_Box">'
+ .&rawrendering($symb)
+ .'</div>'
+ );
+ $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'; }
- $r->print('<b>'.&mt('Question Type').
- ': '.&Apache::loncommon::select_form
- ($qtype,'questiontype',%questiontypes).
- '</b><br /><input type="submit" value="'.&mt('Save and Edit').
- '" /><p> </p>');
+ $r->print(
+ '<fieldset style="width:400px;">'
+ .'<legend>'.&mt('Question Type').'</legend>'
+ .&Apache::loncommon::select_form
+ ($qtype,'questiontype',%questiontypes)
+ .'</fieldset>'
+ );
+ $r->print(
+ '<p>'
+ .'<input type="submit" value="'.&mt('Save and Edit').'" />'
+ .'</p>'
+ );
+# Script
+ if ($qtype eq 'numerical') {
+ $r->print(&script());
+ }
# Question Text
$r->print(&questiontext());
# Radio, Option ===
@@ -246,19 +324,19 @@ ENDDOCUMENT
unless (defined($randomize)) { $randomize='yes'; }
unless ($randomizes{$randomize}) { $randomize='yes'; }
$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').
': <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'};
unless (defined($options)) { $options="('true','false')"; }
my %optionshash=&evaloptionhash($options);
$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="'.
$options.'" />'.&mt('Add new option').': '.
'<input type="text" name="newopt" size="15" />'.
@@ -291,21 +369,39 @@ ENDDOCUMENT
unless (defined($stringtype)) { $stringtype='cs'; }
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.'" /> '.
+ '<table bgcolor="#00ee44" cellspacing="4" cellpadding="2" style="width:100%">'.
+ '<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" 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
$r->print(
'<input type="submit" value="'.&mt('Save and Edit').'" /></form>');
} else {
$r->print(&mt('Could not identify problem.'));
}
- $r->print('</body></html>');
+ $r->print(&Apache::loncommon::end_page());
return OK;
}