--- loncom/homework/lonhomework.pm 2003/03/11 18:43:08 1.115
+++ loncom/homework/lonhomework.pm 2003/05/16 19:01:27 1.129
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# The LON-CAPA Homework handler
#
-# $Id: lonhomework.pm,v 1.115 2003/03/11 18:43:08 www Exp $
+# $Id: lonhomework.pm,v 1.129 2003/05/16 19:01:27 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -50,6 +50,7 @@ use Apache::essayresponse();
use Apache::externalresponse();
use Apache::rankresponse();
use Apache::matchresponse();
+#use Apache::chemresponse();
use Apache::Constants qw(:common);
use HTML::Entities();
use Apache::loncommon();
@@ -60,16 +61,18 @@ BEGIN {
}
sub get_target {
- if ( $ENV{'request.state'} eq "published") {
+ if (($ENV{'request.state'} eq "published") ||
+ ($ENV{'request.state'} eq "uploaded")) {
if ( defined($ENV{'form.grade_target'} )
&& ($ENV{'form.grade_target'} eq 'tex')) {
return ($ENV{'form.grade_target'});
} elsif ( defined($ENV{'form.grade_target'} )
- && ($Apache::lonhomework::viewgrades == 'F' )) {
+ && ($Apache::lonhomework::viewgrades eq 'F' )) {
return ($ENV{'form.grade_target'});
}
- if ( defined($ENV{'form.submitted'})) {
+ if ( defined($ENV{'form.submitted'}) &&
+ ( !defined($ENV{'form.resetdata'}))) {
return ('grade', 'web');
} else {
return ('web');
@@ -206,12 +209,20 @@ sub check_access {
$datemsg = "was due on $lastdate, and answers will be available on $date";
}
if ($status eq 'CAN_ANSWER') {
- #check #tries
+ #check #tries, and if correct.
my $tries = $Apache::lonhomework::history{"resource.$id.tries"};
my $maxtries = &Apache::lonnet::EXT("resource.$id.maxtries");
if ( $tries eq '' ) { $tries = '0'; }
if ( $maxtries eq '' ) { $maxtries = '2'; }
- if ($tries >= $maxtries) { $status = 'CANNOT_ANSWER'; }
+ if ($tries >= $maxtries) { $status = 'CANNOT_ANSWER'; }
+ # if (correct and show prob status) or excused then CANNOT_ANSWER
+ if(($Apache::lonhomework::history{"resource.$id.solved"}=~/^correct/
+ &&
+ lc($Apache::lonhomework::problemstatus) ne 'no')
+ ||
+ $Apache::lonhomework::history{"resource.$id.solved"}=~/^excused/) {
+ $status = 'CANNOT_ANSWER';
+ }
}
if (($status ne 'CLOSED') && ($Apache::lonhomework::type eq 'exam') &&
@@ -279,23 +290,31 @@ sub showhashsubset {
sub setuppermissions {
$Apache::lonhomework::browse= &Apache::lonnet::allowed('bre',$ENV{'request.filename'});
- $Apache::lonhomework::viewgrades=&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'});
+ my $viewgrades = &Apache::lonnet::allowed('vgr',$ENV{'request.course.id'});
+ if (! $viewgrades &&
+ exists($ENV{'request.course.sec'}) &&
+ $ENV{'request.course.sec'} !~ /^\s*$/) {
+ $viewgrades = &Apache::lonnet::allowed('vgr',$ENV{'request.course.id'}.
+ '/'.$ENV{'request.course.sec'});
+ }
+ $Apache::lonhomework::viewgrades = $viewgrades;
return ''
}
sub setupheader {
- my $request=$_[0];
- if ($ENV{'browser.mathml'}) {
- $request->content_type('text/xml');
- } else {
- $request->content_type('text/html');
- }
- if (!$Apache::lonxml::debug && ($ENV{'REQUEST_METHOD'} eq 'GET')) {
- &Apache::loncommon::no_cache($request);
- }
- $request->send_http_header;
- return OK if $request->header_only;
- return ''
+ my $request=$_[0];
+ if ($ENV{'browser.mathml'}) {
+ $request->content_type('text/xml');
+ } else {
+ $request->content_type('text/html');
+ }
+ $request->content_encoding('UTF-8');
+ if (!$Apache::lonxml::debug && ($ENV{'REQUEST_METHOD'} eq 'GET')) {
+ &Apache::loncommon::no_cache($request);
+ }
+ $request->send_http_header;
+ return OK if $request->header_only;
+ return ''
}
sub handle_save_or_undo {
@@ -422,7 +441,7 @@ sub editxmlmode {
my ($request,$file) = @_;
my $result;
my $problem=&Apache::lonnet::getfile($file);
- if ($problem == -1) {
+ if ($problem eq -1) {
&Apache::lonxml::error(" Unable to find $file");
$problem='';
}
@@ -478,7 +497,7 @@ sub renderpage {
foreach my $target (@targets) {
#my $t0 = [&gettimeofday()];
my $problem=&Apache::lonnet::getfile($file);
- if ($problem == -1) {
+ if ($problem eq -1) {
&Apache::lonxml::error(" Unable to find $file");
$problem='';
}
@@ -532,7 +551,7 @@ sub get_template_list {
}
if (@allnames && !$result) {
$result="\n';
+ join('';
}
return $result;
}
@@ -543,33 +562,29 @@ sub newproblem {
$extension=~s:^.*\.([\w]+)$:$1:;
&Apache::lonxml::debug("Looking for :$extension:");
if ($ENV{'form.template'} &&
- $ENV{'form.template'} ne "Select a $extension type") {
+ $ENV{'form.template'} ne "Select a $extension template") {
use File::Copy;
my $file = &get_template_list($ENV{'form.template'},$extension);
my $dest = &Apache::lonnet::filelocation("",$request->uri);
copy($file,$dest);
&renderpage($request,$dest);
- } elsif($ENV{'form.newfile'}) {
- # I don't like hard-coded filenames but for now, this will work.
- use File::Copy;
- my $templatefilename =
- $request->dir_config('lonIncludes').'/templates/blank.problem';
- &Apache::lonxml::debug("$templatefilename");
- my $dest = &Apache::lonnet::filelocation("",$request->uri);
- copy($templatefilename,$dest);
- &renderpage($request,$dest);
} else {
my $templatelist=&get_template_list('',$extension);
my $url=$request->uri;
my $dest = &Apache::lonnet::filelocation("",$request->uri);
+ my $errormsg;
+ if ($ENV{'form.newfile'}) {
+ $errormsg='
You did not select a template.
'."\n";
+ }
my $instructions;
if ($templatelist) { $instructions=", select a template from the pull-down menu below. Then";}
$request->print(<
Creating a new $extension resource
+$errormsg
The requested file $url currently does not exist.
-To create a new $extension$instructions click on the "Create $extension" button.
+To create a new $extension$instructions click on the "Create $extension" button.