[LON-CAPA-cvs] cvs: loncom /homework lonhomework.pm
albertel
lon-capa-cvs@mail.lon-capa.org
Wed, 07 Aug 2002 18:20:29 -0000
albertel Wed Aug 7 14:20:29 2002 EDT
Modified files:
/loncom/homework lonhomework.pm
Log:
-changed the problem creation screen to reflect comment sin BUG#625
Index: loncom/homework/lonhomework.pm
diff -u loncom/homework/lonhomework.pm:1.84 loncom/homework/lonhomework.pm:1.85
--- loncom/homework/lonhomework.pm:1.84 Wed Jul 31 10:56:34 2002
+++ loncom/homework/lonhomework.pm Wed Aug 7 14:20:29 2002
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# The LON-CAPA Homework handler
#
-# $Id: lonhomework.pm,v 1.84 2002/07/31 14:56:34 bowersj2 Exp $
+# $Id: lonhomework.pm,v 1.85 2002/08/07 18:20:29 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -374,8 +374,8 @@
}
#if ($Apache::lonhomework::viewgrades eq 'F') {&createmenu('grade',$request); }
}
- #if ($target eq 'grade') { &showhash(%Apache::lonhomework::history); }
- #if ($target eq 'web') { &showhash(%ENV); }
+ if ($target eq 'answer') { &showhash(%Apache::lonhomework::history); }
+ if ($target eq 'web') {&Apache::lonhomework::showhashsubset(\%ENV,'^form');}
my $default=&Apache::lonnet::getfile('/home/httpd/html/res/adm/includes/default_homework.lcpm');
if ($default == -1) {
@@ -411,6 +411,7 @@
sub get_template_list {
my ($namewanted,$extension) = @_;
my $result;
+ my @allnames;
&Apache::lonxml::debug("Looking for :$extension:");
foreach my $file (</home/httpd/html/res/adm/includes/templates/*.$extension>) {
my $name=&Apache::lonnet::metadata($file,'title');
@@ -418,9 +419,13 @@
$result=$file;
last;
} else {
- $result.="<option>$name</option>";
+ push (@allnames, $name);
}
}
+ if (@allnames) {
+ $result="<option>Select a $extension type</option>\n<option>".
+ join('</option><option>',sort(@allnames)).'</option>';
+ }
return $result;
}
@@ -429,7 +434,8 @@
my $extension=$request->uri;
$extension=~s:^.*\.([\w]+)$:$1:;
&Apache::lonxml::debug("Looking for :$extension:");
- if ($ENV{'form.template'}) {
+ if ($ENV{'form.template'} &&
+ $ENV{'form.template'} ne "Select a $extension type") {
use File::Copy;
my $file = &get_template_list($ENV{'form.template'},$extension);
my $dest = &Apache::lonnet::filelocation("",$request->uri);
@@ -444,33 +450,23 @@
my $dest = &Apache::lonnet::filelocation("",$request->uri);
copy($templatefilename,$dest);
&renderpage($request,$dest);
- }else {
+ } else {
my $templatelist=&get_template_list('',$extension);
my $url=$request->uri;
my $dest = &Apache::lonnet::filelocation("",$request->uri);
- if (!defined($templatelist)) {
- # We didn't find a template, so just create a blank problem.
- $request->print(<<ENDNEWPROBLEM);
-<body bgcolor="#FFFFFF">
-The requested file $url doesn\'t exist. You can create a new $extension <br />
-<form action="$url" method="POST">
-<input type="submit" name="newfile" value="New $extension"><br />
-</form>
-</body>
-ENDNEWPROBLEM
- return '';
- }
+ my $instructions;
+ if ($templatelist) { $instructions=", select a template from the pull-down menu below. Then";}
$request->print(<<ENDNEWPROBLEM);
<body bgcolor="#FFFFFF">
-The requested file $url doesn\'t exist. You can create a new $extension <br />
+The requested file $url doesn\'t exist. <br />
+To create a new $extension$instructions click on the Create $extension button.
<form action="$url" method="POST">
-<input type="submit" value="New $extension"><br />
-<select name="template">
-$templatelist
-</select>
-</form>
-</body>
ENDNEWPROBLEM
+ if (defined($templatelist)) {
+ $request->print("<select name=\"template\">$templatelist</select>");
+ }
+ $request->print("<br /><input type=\"submit\" name=\"newfile\" value=\"Create $extension\" />");
+ $request->print("</form></body>");
}
return '';
}