--- loncom/homework/lonhomework.pm 2001/01/11 15:20:58 1.31
+++ loncom/homework/lonhomework.pm 2001/11/29 18:36:59 1.63
@@ -1,7 +1,33 @@
+# The LearningOnline Network with CAPA
# The LON-CAPA Homework handler
+#
+# $Id: lonhomework.pm,v 1.63 2001/11/29 18:36:59 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,29 +36,48 @@ use Apache::lonxml;
use Apache::lonnet;
use Apache::inputtags;
use Apache::structuretags;
+use Apache::randomlabel;
use Apache::response;
use Apache::hint;
use Apache::outputtags;
use Apache::Constants qw(:common);
+#use Time::HiRes qw( gettimeofday tv_interval );
+
+sub BEGIN {
+ &Apache::lonxml::register_insert();
+}
sub get_target {
if ( $ENV{'request.state'} eq "published") {
- if ( defined $ENV{'form.submit'}) {
+ 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.submit'}) {
+ if ( defined($ENV{'form.preview'})) {
+ if ( defined($ENV{'form.submitted'})) {
return ('grade', 'web');
} else {
return ('web');
}
} else {
- #return ('edit');
- #edit is currently broken
- return ('web');
+ if ( $ENV{'form.problemmode'} eq 'View' ) {
+ if ( defined($ENV{'form.submitted'}) &&
+ (!defined($ENV{'form.resetdata'})) ) {
+ return ('grade', 'web','answer');
+ } else {
+ return ('web','answer');
+ }
+ } elsif ( $ENV{'form.problemmode'} eq 'Edit' ) {
+ if ( $ENV{'form.submitted'} eq 'edit' ) {
+ return ('modified','edit');
+ } else {
+ return ('edit');
+ }
+ } else {
+ return ('web');
+ }
}
}
return ();
@@ -47,19 +92,28 @@ sub setup_vars {
sub send_header {
my ($request)= @_;
$request->print(&Apache::lontexconvert::header());
- $ENV{'request.uri'}=$request->uri;
# $request->print('');
$request->print(&Apache::lontexconvert::footer());
}
-#@Apache::lonhomework::date_status=();
-#@Apache::lonhomework::date_msg=();
-sub check_date {
+$Apache::lonxml::browse='';
+
+sub check_access {
my ($id) = @_;
my $date ='';
my $status = '';
@@ -95,7 +149,7 @@ sub check_date {
$datemsg = "is due at $date";
} elsif ($type eq 'answerdate') {
$status='CLOSED';
- $datemsg = "was due as $lastdate, and answers will be available at $date";
+ $datemsg = "was due on $lastdate, and answers will be available on $date";
}
if ($status eq 'CAN_ANSWER') {
#check #tries
@@ -105,7 +159,19 @@ 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");
+ $status='CAN_ANSWER';
+ $datemsg='is closed but you are allowed to view it';
+ }
if ($ENV{'request.state'} eq "construct") {
&Apache::lonxml::debug("in construction ignoring dates");
$status='CAN_ANSWER';
@@ -114,51 +180,91 @@ sub check_date {
return ($status,$datemsg);
}
-sub handler {
- my $request=$_[0];
+sub showhash {
+ my (%hash) = @_;
+ my $resultkey;
+ foreach $resultkey (sort keys %hash) {
+ &Apache::lonxml::debug("$resultkey ---- $hash{$resultkey}");
+ }
+ &Apache::lonxml::debug("\n
restored values^\n");
+ return '';
+}
- if ( $ENV{'user.name'} eq 'albertel' ) { $Apache::lonxml::debug=1; }
-
- my (@targets) = &get_target();
+sub setuppermissions {
+ $Apache::lonhomework::browse= &Apache::lonnet::allowed('bre',$ENV{'request.filename'});
+ $Apache::lonhomework::viewgrades=&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'});
+ return ''
+}
+sub setupheader {
+ my $request=$_[0];
if ($ENV{'browser.mathml'}) {
$request->content_type('text/xml');
} else {
$request->content_type('text/html');
}
+ &Apache::loncommon::no_cache($request);
$request->send_http_header;
return OK if $request->header_only;
-
- &Apache::lonhomework::send_header($request);
-
- #check if allowed to see
-
+ return ''
+}
+
+sub handle_save_or_undo {
+ my ($request,$problem,$result) = @_;
+ my $fileout = &Apache::lonnet::filelocation("",$request->uri);
+ my $filesave=$fileout.".bak";
+
+ 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
");
+ }
+ } else {
+ my $fs=Apache::File->new(">$filesave");
+ if (defined($fs)) {
+ print $fs $$problem;
+ $request->print("Making Backup to $filesave
");
+ } else {
+ $request->print("Unable to make backup $filesave");
+ }
+ my $fh=Apache::File->new(">$fileout");
+ if (defined($fh)) {
+ print $fh $$result;
+ $request->print("Saving Modifications to $fileout
");
+ } else {
+ $request->print("Unable to write to $fileout");
+ }
+ }
+}
+
+sub renderpage {
+ my ($request,$file) = @_;
+
+ my (@targets) = &get_target();
foreach my $target (@targets) {
- my $file=&Apache::lonnet::filelocation("",$request->uri);
+ #my $t0 = [&gettimeofday()];
my $problem=&Apache::lonnet::getfile($file);
if ($problem == -1) {
&Apache::lonxml::error(" Unable to find $file");
$problem='';
}
-
+
my %mystyle;
my $result = '';
&Apache::inputtags::initialize_inputtags;
- %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' && &Apache::lonnet::symbread() eq '') {
- $request->print("Vieiwing this problem as not a student, submissions will be ignored.");
- }
- if ($target eq 'grade') {
- my $resultkey;
- foreach $resultkey (sort keys %Apache::lonhomework::history) {
- &Apache::lonxml::debug("$resultkey ---- $Apache::lonhomework::history{$resultkey}");
+ &Apache::edit::initialize_edit;
+ if ($target eq 'web') {
+ if (&Apache::lonnet::symbread() eq '') {
+ if ($ENV{'request.state'} eq "construct") {
+ } else {
+ $request->print("Browsing or ambiguous reference, submissions ignored
");
+ }
}
- &Apache::lonxml::debug("\n
restored values^\n");
+ #if ($Apache::lonhomework::viewgrades eq 'F') {&createmenu('grade',$request); }
}
+ 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) {
&Apache::lonxml::error("Unable to find default_homework.lcpm");
@@ -168,24 +274,135 @@ sub handler {
$default.&setup_vars($target),%mystyle);
#$request->print("Result follows:");
- $request->print($result);
+ if ($target eq 'modified') {
+ &handle_save_or_undo($request,\$problem,\$result);
+ } else {
+ #my $td=&tv_interval($t0);
+ #if ( $Apache::lonxml::debug) {
+ #$result =~ s: ::;
+ #$result.="