--- loncom/homework/lonhomework.pm 2001/08/06 20:33:23 1.52
+++ loncom/homework/lonhomework.pm 2001/12/04 14:51:19 1.64
@@ -1,7 +1,33 @@
+# The LearningOnline Network with CAPA
# The LON-CAPA Homework handler
+#
+# $Id: lonhomework.pm,v 1.64 2001/12/04 14:51:19 albertel Exp $
+#
+# Copyright Michigan State University Board of Trustees
+#
+# This file is part of the LearningOnline Network with CAPA (LON-CAPA).
+#
+# LON-CAPA is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# LON-CAPA is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with LON-CAPA; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+# /home/httpd/html/adm/gpl.txt
+#
+# http://www.lon-capa.org/
+#
# Guy Albertelli
# 11/30 Gerd Kortemeyer
-# 6/1 Gerd Kortemeyer
+# 6/1,8/17,8/18 Gerd Kortemeyer
package Apache::lonhomework;
use strict;
@@ -10,6 +36,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 +49,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' ) {
@@ -84,7 +112,8 @@ sub send_footer {
}
$Apache::lonxml::browse='';
-sub check_date {
+
+sub check_access {
my ($id) = @_;
my $date ='';
my $status = '';
@@ -130,6 +159,13 @@ sub check_date {
if ( $maxtries eq '' ) { $maxtries = '2'; }
if ($tries >= $maxtries) { $status = 'CANNOT_ANSWER'; }
}
+
+ if (($status ne 'CLOSED') && ($Apache::lonhomework::type eq 'exam') &&
+ (!$Apache::lonhomework::history{"resource.0.outtoken"})) {
+ return ('UNCHECKEDOUT','needs to be checked out');
+ }
+
+
&Apache::lonxml::debug("sending back :$status:$datemsg:");
if (($Apache::lonhomework::browse eq 'F') && ($status eq 'CLOSED')) {
&Apache::lonxml::debug("should be allowed to browse a resource when closed");
@@ -167,6 +203,7 @@ sub setupheader {
} else {
$request->content_type('text/html');
}
+ if (!$Apache::lonxml::debug) { &Apache::loncommon::no_cache($request); }
$request->send_http_header;
return OK if $request->header_only;
return ''
@@ -176,12 +213,14 @@ sub handle_save_or_undo {
my ($request,$problem,$result) = @_;
my $fileout = &Apache::lonnet::filelocation("",$request->uri);
my $filesave=$fileout.".bak";
+ my $error=0;
if ($ENV{'form.Undo'} eq 'undo') {
if (copy($filesave,$fileout)) {
$request->print("Undid changes, Copied $filesave to $fileout
");
} else {
$request->print("Unable to undo, unable to copy $filesave to $fileout
");
+ $error=1;
}
} else {
my $fs=Apache::File->new(">$filesave");
@@ -190,6 +229,7 @@ sub handle_save_or_undo {
$request->print("Making Backup to $filesave
");
} else {
$request->print("Unable to make backup $filesave");
+ $error=2;
}
my $fh=Apache::File->new(">$fileout");
if (defined($fh)) {
@@ -197,8 +237,42 @@ sub handle_save_or_undo {
$request->print("Saving Modifications to $fileout
");
} else {
$request->print("Unable to write to $fileout");
+ $error|=4;
}
}
+ return $error;
+}
+
+sub editxmlmode {
+ my ($request,$file) = @_;
+ my $result;
+ my $problem=&Apache::lonnet::getfile($file);
+ if ($problem == -1) {
+ &Apache::lonxml::error(" Unable to find $file");
+ $problem='';
+ }
+ if (defined($ENV{'form.editxmltext'}) || defined($ENV{'form.Undo'})) {
+ my $error=&handle_save_or_undo($request,\$problem,
+ \$ENV{'form.editxmltext'});
+ if (!$error) { $problem=&Apache::lonnet::getfile($file); }
+ }
+ my ($rows,$cols) = &Apache::edit::textarea_sizes(\$problem);
+ if ($cols > 80) { $cols = 80; }
+ $result.='
+ ';
+ $request->print($result);
+ return '';
}
sub renderpage {
@@ -217,22 +291,16 @@ 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
");
}
}
#if ($Apache::lonhomework::viewgrades eq 'F') {&createmenu('grade',$request); }
}
- if ($target eq 'grade') { &showhash(%Apache::lonhomework::history); }
+ #if ($target eq 'grade') { &showhash(%Apache::lonhomework::history); }
my $default=&Apache::lonnet::getfile('/home/httpd/html/res/adm/includes/default_homework.lcpm');
if ($default == -1) {
@@ -254,14 +322,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);
}
}
@@ -342,7 +402,7 @@ sub handler {
$Apache::lonhomework::browse= &Apache::lonnet::allowed('bre',$ENV{'request.filename'});
$Apache::lonhomework::viewgrades=&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'});
&Apache::lonxml::debug("Permissions:$Apache::lonhomework::browse:$Apache::lonhomework::viewgrades:");
-
+ &Apache::lonxml::debug("Problem Mode ".$ENV{'form.problemmode'});
my $file=&Apache::lonnet::filelocation("",$request->uri);
#check if we know where we are
@@ -355,11 +415,18 @@ 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
- &view_or_edit_menu($request);
- #&renderpage($request,$file);
+ #&view_or_edit_menu($request);
+ $ENV{'form.problemmode'}='View';
+ &renderpage($request,$file);
+ } elsif ($ENV{'form.problemmode'} eq 'EditXML') {
+ &editxmlmode($request,$file);
} else {
&renderpage($request,$file);
}