--- loncom/homework/lonhomework.pm 2002/06/26 17:20:38 1.81
+++ loncom/homework/lonhomework.pm 2002/08/16 21:30:08 1.86
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# The LON-CAPA Homework handler
#
-# $Id: lonhomework.pm,v 1.81 2002/06/26 17:20:38 albertel Exp $
+# $Id: lonhomework.pm,v 1.86 2002/08/16 21:30:08 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -28,6 +28,7 @@
# Guy Albertelli
# 11/30 Gerd Kortemeyer
# 6/1,8/17,8/18 Gerd Kortemeyer
+# 7/18 Jeremy Bowers
package Apache::lonhomework;
use strict;
@@ -41,8 +42,15 @@ use Apache::randomlabel();
use Apache::response();
use Apache::hint();
use Apache::outputtags();
+use Apache::caparesponse();
+use Apache::radiobuttonresponse();
+use Apache::optionresponse();
+use Apache::imageresponse();
+use Apache::essayresponse();
+use Apache::externalresponse();
use Apache::Constants qw(:common);
use HTML::Entities();
+use Apache::loncommon();
#use Time::HiRes qw( gettimeofday tv_interval );
BEGIN {
@@ -315,6 +323,7 @@ sub editxmlmode {
&renderpage($request,$file);
} else {
my ($rows,$cols) = &Apache::edit::textarea_sizes(\$problem);
+ my $xml_help = Apache::loncommon::help_open_topic("Problem_Editor_XML_Index");
if ($cols > 80) { $cols = 80; }
$result.='
+ ' . $xml_help . ' Problem Help
';
@@ -358,13 +368,14 @@ sub renderpage {
if ($symb eq '') {
if ($ENV{'request.state'} eq "construct") {
} else {
- $request->print("Browsing or ambiguous reference, submissions ignored ");
+ my $help = Apache::loncommon::help_open_topic("Ambiguous_Reference");
+ $request->print("Browsing or ambiguous reference, submissions ignored $help ");
}
}
#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) {
@@ -400,6 +411,7 @@ sub renderpage {
sub get_template_list {
my ($namewanted,$extension) = @_;
my $result;
+ my @allnames;
&Apache::lonxml::debug("Looking for :$extension:");
foreach my $file () {
my $name=&Apache::lonnet::metadata($file,'title');
@@ -407,9 +419,13 @@ sub get_template_list {
$result=$file;
last;
} else {
- $result.="";
+ push (@allnames, $name);
}
}
+ if (@allnames && !$result) {
+ $result="\n';
+ }
return $result;
}
@@ -418,7 +434,8 @@ sub newproblem {
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);
@@ -433,33 +450,23 @@ sub newproblem {
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(<
-The requested file $url doesn\'t exist. You can create a new $extension
-
-
-ENDNEWPROBLEM
- return '';
- }
+ my $instructions;
+ if ($templatelist) { $instructions=", select a template from the pull-down menu below. Then";}
$request->print(<