--- loncom/homework/lonhomework.pm 2001/08/17 16:50:04 1.55
+++ loncom/homework/lonhomework.pm 2001/11/05 22:49:14 1.62
@@ -1,7 +1,7 @@
# The LON-CAPA Homework handler
# Guy Albertelli
# 11/30 Gerd Kortemeyer
-# 6/1,8/17 Gerd Kortemeyer
+# 6/1,8/17,8/18 Gerd Kortemeyer
package Apache::lonhomework;
use strict;
@@ -10,6 +10,7 @@ use Apache::lonxml;
use Apache::lonnet;
use Apache::inputtags;
use Apache::structuretags;
+use Apache::randomlabel;
use Apache::response;
use Apache::hint;
use Apache::outputtags;
@@ -22,24 +23,25 @@ sub BEGIN {
sub get_target {
if ( $ENV{'request.state'} eq "published") {
- if ( defined $ENV{'form.submitted'}) {
+ if ( defined($ENV{'form.submitted'})) {
return ('grade', 'web');
} else {
return ('web');
}
} elsif ($ENV{'request.state'} eq "construct") {
- if ( defined $ENV{'form.preview'}) {
- if ( defined $ENV{'form.submitted'}) {
+ if ( defined($ENV{'form.preview'})) {
+ if ( defined($ENV{'form.submitted'})) {
return ('grade', 'web');
} else {
return ('web');
}
} else {
if ( $ENV{'form.problemmode'} eq 'View' ) {
- if ( defined $ENV{'form.submitted'}) {
- return ('grade', 'web');
+ if ( defined($ENV{'form.submitted'}) &&
+ (!defined($ENV{'form.resetdata'})) ) {
+ return ('grade', 'web','answer');
} else {
- return ('web');
+ return ('web','answer');
}
} elsif ( $ENV{'form.problemmode'} eq 'Edit' ) {
if ( $ENV{'form.submitted'} eq 'edit' ) {
@@ -132,7 +134,8 @@ sub check_access {
if ($tries >= $maxtries) { $status = 'CANNOT_ANSWER'; }
}
- if (($status ne 'CLOSED') && ($Apache::lonhomework::type eq 'exam')) {
+ if (($status ne 'CLOSED') && ($Apache::lonhomework::type eq 'exam') &&
+ (!$Apache::lonhomework::history{"resource.0.outtoken"})) {
return ('UNCHECKEDOUT','needs to be checked out');
}
@@ -174,6 +177,7 @@ sub setupheader {
} else {
$request->content_type('text/html');
}
+ &Apache::loncommon::no_cache($request);
$request->send_http_header;
return OK if $request->header_only;
return ''
@@ -224,15 +228,9 @@ sub renderpage {
my $result = '';
&Apache::inputtags::initialize_inputtags;
&Apache::edit::initialize_edit;
- %Apache::lonhomework::results=();
- %Apache::lonhomework::history=&Apache::lonnet::restore();
- #ignore error conditions
- my ($temp)=keys %Apache::lonhomework::history ;
- if ($temp =~ m/^error:.*/) { %Apache::lonhomework::history=(); }
if ($target eq 'web') {
if (&Apache::lonnet::symbread() eq '') {
if ($ENV{'request.state'} eq "construct") {
- $request->print("In construction space, submissions ignored
");
} else {
$request->print("Browsing or ambiguous reference, submissions ignored
");
}
@@ -261,14 +259,6 @@ sub renderpage {
$request->print($result);
}
#$request->print(":Result ends");
- if ($target eq 'grade') { &showhash(%Apache::lonhomework::results); }
-
- #store new values
- my ($temp) = keys %Apache::lonhomework::results;
- if ( $temp ne '' ) {
- &Apache::lonxml::debug("Store return message:".
- &Apache::lonnet::cstore(\%Apache::lonhomework::results));
- }
#my $td=&tv_interval($t0);
}
}
@@ -362,6 +352,10 @@ sub handler {
}
if ($ENV{'request.state'} eq "construct") {
+ if ($ENV{'form.resetdata'} eq 'Reset Submissions') {
+ my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();
+ &Apache::lonnet::tmpreset($symb,'',$domain,$name);
+ }
if ( -e $file ) {
if (!(defined $ENV{'form.problemmode'})) {
#first visit to problem in construction space