--- loncom/homework/lonsimpleproblemedit.pm 2003/07/09 10:05:15 1.3
+++ loncom/homework/lonsimpleproblemedit.pm 2005/03/17 13:56:32 1.14
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Simple Problem Parameter Setting "Editor"
#
-# $Id: lonsimpleproblemedit.pm,v 1.3 2003/07/09 10:05:15 www Exp $
+# $Id: lonsimpleproblemedit.pm,v 1.14 2005/03/17 13:56:32 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -32,6 +32,8 @@ use strict;
use Apache::Constants qw(:common :http);
use Apache::loncommon;
use Apache::lonnet;
+use Apache::lonlocal;
+use Apache::lonnavmaps;
my %qparms;
my $prefix;
@@ -49,30 +51,22 @@ sub evaloptionhash {
}
sub rawrendering {
- my ($request,$uri)=@_;
- my $problem=&Apache::lonnet::getfile
- (&Apache::lonnet::filelocation('',$uri));
- &Apache::lonnet::devalidatecourseresdata(
- $ENV{'course.'.$ENV{'request.course.id'}.'.num'},
- $ENV{'course.'.$ENV{'request.course.id'}.'.domain'});
- my $uname=$ENV{'user.name'};
- my $udom=$ENV{'user.domain'};
- $ENV{'user.name'}=time;
- $ENV{'user.domain'}=time;
- my $result = &Apache::lonxml::xmlparse($request,'web', $problem);
- $ENV{'user.name'}=$uname;
- $ENV{'user.domain'}=$udom;
- $result=~s/^.*\<body[^\>]*\>//si;
- $result=~s/\<\/body[^\>]*\>.*$//si;
- return $result;
+ my ($symb)=@_;
+ my %data=('show_errors'=>'on',
+ 'simple_edit_button' => 'off',
+ 'devalidatecourseresdata'=>'on');
+ return &Apache::loncommon::get_student_view($symb,time,time,
+ $ENV{'request.course.id'},
+ 'web',\%data);
}
sub questiontext {
my $text=$qparms{$prefix.'questiontext'};
+ my $qt=&mt('Question Text');
return (<<ENDQUESTION);
<table bgcolor="#dddd22" cellspacing="4" cellpadding="2">
-<tr><td><b>Question Text</b><br />
-<textarea name="questiontext" cols="80" rows="8">$text</textarea>
+<tr><td><b>$qt</b><br />
+<textarea style="width:100%" name="questiontext" cols="80" rows="8">$text</textarea>
</td></tr>
</table>
<br />
@@ -81,10 +75,11 @@ ENDQUESTION
sub hint {
my $text=$qparms{$prefix.'hinttext'};
+ my $ht=&mt('Hint Text');
return (<<ENDHINT);
<table bgcolor="#accacc" cellspacing="4" cellpadding="2">
-<tr><td><b>Hint Text</b><br />
-<textarea name="hinttext" cols="80" rows="4">$text</textarea>
+<tr><td><b>$ht</b><br />
+<textarea style="width:100%" name="hinttext" cols="80" rows="4">$text</textarea>
</td></tr>
</table>
<br />
@@ -116,38 +111,55 @@ sub foil {
my $selectposition=&Apache::loncommon::select_form
($position,'position'.$number,%positions);
my $text=$qparms{$prefix.'text'.$number};
+ my %lt=&Apache::lonlocal::texthash('foil' => 'Foil',
+ 'value' => 'Value',
+ 'pos' => 'Position',
+ 'text' => 'Text');
+
return (<<ENDFOIL);
<table bgcolor="#dd55ff" cellspacing="4" cellpadding="2">
-<tr><td colspan="2"><b>Foil</b></td></tr>
-<tr><td>Value: $selectvalue</td><td>Position: $selectposition</td></tr>
-<tr><td colspan="2">Text:<br />
-<textarea name="text$number" cols="80" rows="4">$text</textarea>
+<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>
</td></tr>
</table>
<br />
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; }
+ }
+ my ($src,$symb,$anchor)=&Apache::lonnavmaps::getLinkForResource($it->getStack());
+ if (defined($anchor)) { $anchor='#'.$anchor; }
+ return $src.'?symb='.&Apache::lonnet::escape($symb).$anchor;
+}
+
sub handler {
my $r = shift;
if ($r->header_only) {
- $r->content_type('text/html');
+ &Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
return OK;
}
# -------------------------------------------------------------------- Allowed?
- unless (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) {
+ unless (&Apache::lonnet::allowed('mdc',$ENV{'request.course.id'})) {
return HTTP_NOT_ACCEPTABLE;
}
# ----------------------------------------------------------------- Send header
- $r->content_type('text/html');
+ &Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
# ----------------------------------------------------- Figure out where we are
my $uri=$r->uri;
$uri=~s/\/smpedit$//;
- my $symb=&Apache::lonnet::symbread($uri);
+ my $symb=&Apache::lonnet::symbread();
# ------------------------------------------------ Prefix for everything stored
$prefix=$ENV{'request.course.id'}.'.'.$symb.'.0.';
@@ -167,6 +179,7 @@ sub handler {
}
$ENV{'form.options'}="('".join("','",keys %curoptions)."')";
}
+ $ENV{'form.hiddenparts'}='!'.$ENV{'form.questiontype'};
foreach (keys %ENV) {
if ($_=~/^form\.(\w+)$/) {
my $parm=$1;
@@ -197,8 +210,11 @@ ENDDOCUMENT
$r->print(&Apache::loncommon::bodytag('Simple Problem Editor'));
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($r,$uri).
+ &rawrendering($symb).
'</td></tr></table><br />');
$r->print('<form method="post">');
# Question Type
@@ -210,9 +226,11 @@ ENDDOCUMENT
$qtype=$qparms{$prefix.'questiontype'};
unless (defined($qtype)) { $qtype='radio'; }
unless ($questiontypes{$qtype}) { $qtype='radio'; }
- $r->print('Question Type: '.&Apache::loncommon::select_form
+ $r->print('<b>'.&mt('Question Type').
+ ': '.&Apache::loncommon::select_form
($qtype,'questiontype',%questiontypes).
- '<p> </p>');
+ '</b><br /><input type="submit" value="'.&mt('Save and Edit').
+ '" /><p> </p>');
# Question Text
$r->print(&questiontext());
# Radio, Option ===
@@ -229,7 +247,8 @@ ENDDOCUMENT
unless ($randomizes{$randomize}) { $randomize='yes'; }
$r->print(
'<table bgcolor="#00ee44" cellspacing="4" cellpadding="2">'.
- '<tr><td>Max number of foils displayed: <input type="text" size="3" name="maxfoils" value="'.$maxfoils.'" /> '.
+ '<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">');
@@ -241,8 +260,9 @@ ENDDOCUMENT
$r->print(
'<table bgcolor="#ffcc22" cellspacing="4" cellpadding="2">'.
'<tr><td><input type="hidden" name="options" value="'.
- $options.'" />Add new option: '.
- '<input type="text" name="newopt" size="15" />Delete an option: '.
+ $options.'" />'.&mt('Add new option').': '.
+ '<input type="text" name="newopt" size="15" />'.
+ &mt('Delete an option').': '.
&Apache::loncommon::select_form('','delopt',('' => '',%optionshash)).
'</td></tr><tr><td>');
}
@@ -272,7 +292,7 @@ ENDDOCUMENT
unless ($stringtypes{$stringtype}) { $stringtype='cs'; }
$r->print(
'<table bgcolor="#00ee44" cellspacing="4" cellpadding="2">'.
- '<tr><td>Correct answer: <input type="text" size="20" name="stringanswer" value="'.$stringanswer.'" /> '.
+ '<tr><td>'.&mt('Correct answer').': <input type="text" size="20" name="stringanswer" value="'.$stringanswer.'" /> '.
&Apache::loncommon::select_form
($stringtype,'stringtype',%stringtypes).
'</td></tr></table><br />');
@@ -281,9 +301,9 @@ ENDDOCUMENT
}
# Store Button
$r->print(
- '<input type="submit" name="storeproblem" value="Store Changes" /></form>');
+ '<input type="submit" value="'.&mt('Save and Edit').'" /></form>');
} else {
- $r->print('Could not identify problem.');
+ $r->print(&mt('Could not identify problem.'));
}
$r->print('</body></html>');
return OK;