--- loncom/homework/lonhomework.pm 2002/05/24 18:55:23 1.79
+++ loncom/homework/lonhomework.pm 2002/07/31 14:56:34 1.84
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# The LON-CAPA Homework handler
#
-# $Id: lonhomework.pm,v 1.79 2002/05/24 18:55:23 albertel Exp $
+# $Id: lonhomework.pm,v 1.84 2002/07/31 14:56:34 bowersj2 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 {
@@ -80,7 +88,11 @@ sub get_target {
}
} elsif ( $ENV{'form.problemmode'} eq 'Edit' ) {
if ( $ENV{'form.submitted'} eq 'edit' ) {
- return ('modified','edit');
+ if ( $ENV{'form.submit'} eq 'Submit Changes and View' ) {
+ return ('modified','web','answer');
+ } else {
+ return ('modified','edit');
+ }
} else {
return ('edit');
}
@@ -304,22 +316,32 @@ sub editxmlmode {
\$ENV{'form.editxmltext'});
if (!$error) { $problem=&Apache::lonnet::getfile($file); }
}
- my ($rows,$cols) = &Apache::edit::textarea_sizes(\$problem);
- if ($cols > 80) { $cols = 80; }
- $result.='
+ &Apache::lonhomework::showhashsubset(\%ENV,'^form');
+ if ( $ENV{'form.submit'} eq 'Submit Changes and View' ) {
+ &Apache::lonhomework::showhashsubset(\%ENV,'^form');
+ $ENV{'form.problemmode'}='View';
+ &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.='
';
- $request->print($result);
+ $request->print($result);
+ }
return '';
}
@@ -346,7 +368,8 @@ 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); }
@@ -480,8 +503,10 @@ sub handler {
&Apache::lonxml::debug("Permissions:$Apache::lonhomework::browse:$Apache::lonhomework::viewgrades:");
# some times multiple problemmodes are submitted, need to select
# the last one
+ &Apache::lonxml::debug("Problem Mode ".$ENV{'form.problemmode'});
if ( defined($ENV{'form.problemmode'}) &&
ref($ENV{'form.problemmode'}) ) {
+ &Apache::lonxml::debug("Problem Mode ".join(",",@$ENV{'form.problemmode'}));
my $mode=$ENV{'form.problemmode'}->[-1];
undef $ENV{'form.problemmode'};
$ENV{'form.problemmode'}=$mode;