--- loncom/homework/lonhomework.pm 2001/01/06 16:35:36 1.27 +++ loncom/homework/lonhomework.pm 2003/02/25 23:18:22 1.110 @@ -1,35 +1,111 @@ +# The LearningOnline Network with CAPA # The LON-CAPA Homework handler +# +# $Id: lonhomework.pm,v 1.110 2003/02/25 23:18:22 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 +# 7/18 Jeremy Bowers package Apache::lonhomework; use strict; -use Apache::style; -use Apache::lonxml; -use Apache::lonnet; -use Apache::inputtags; -use Apache::structuretags; -use Apache::response; -use Apache::hint; +use Apache::style(); +use Apache::lonxml(); +use Apache::lonnet(); +use Apache::lonplot(); +use Apache::inputtags(); +use Apache::structuretags(); +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::rankresponse(); +use Apache::matchresponse(); use Apache::Constants qw(:common); +use HTML::Entities(); +use Apache::loncommon(); +#use Time::HiRes qw( gettimeofday tv_interval ); + +BEGIN { + &Apache::lonxml::register_insert(); +} sub get_target { if ( $ENV{'request.state'} eq "published") { - if ( defined $ENV{'form.submit'}) { + 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' )) { + return ($ENV{'form.grade_target'}); + } + + 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.grade_target'}) ) { + return ($ENV{'form.grade_target'}); + } + if ( defined($ENV{'form.preview'})) { + if ( defined($ENV{'form.submitted'})) { return ('grade', 'web'); } else { return ('web'); } } else { - return ('edit'); + if ( $ENV{'form.problemmode'} eq 'View' || + $ENV{'form.problemmode'} eq 'Discard Edits and 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' ) { + if ( $ENV{'form.submit'} eq 'Submit Changes and View' ) { + return ('modified','web','answer'); + } else { + return ('modified','edit'); + } + } else { + return ('edit'); + } + } else { + return ('web'); + } } } return (); @@ -44,34 +120,71 @@ 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=''; + +# JB, 9/24/2002: Any changes in this function may require a change +# in lonnavmaps::resource::getDateStatus. +sub check_access { my ($id) = @_; my $date =''; - my $status = ''; + my $status; my $datemsg = ''; my $lastdate = ''; my $temp; my $type; my $passed; + + if ($ENV{'request.state'} eq "construct") { + &Apache::lonxml::debug("in construction ignoring dates"); + $status='CAN_ANSWER'; + $datemsg='is in under construction'; + return ($status,$datemsg); + } + &Apache::lonxml::debug("checking for part :$id:"); + &Apache::lonxml::debug("time:".time); foreach $temp ("opendate","duedate","answerdate") { $lastdate = $date; $date = &Apache::lonnet::EXT("resource.$id.$temp"); + my $thistype = &Apache::lonnet::EXT("resource.$id.$temp.type"); + if ($thistype =~ /^(con_lost|no_such_host)/ || + $date =~ /^(con_lost|no_such_host)/) { + $status='UNAVAILABLE'; + $date="may open later."; + return($status,$date); + } + if ($thistype eq 'date_interval') { + if ($temp eq 'opendate') { + $date=&Apache::lonnet::EXT("resource.$id.duedate")-$date; + } + if ($temp eq 'answerdate') { + $date=&Apache::lonnet::EXT("resource.$id.duedate")+$date; + } + } &Apache::lonxml::debug("found :$date: for :$temp:"); if ($date eq '') { $date = "an unknown date"; $passed = 0; + } elsif ($date eq 'con_lost') { + $date = "an indeterminate date"; $passed = 0; } else { if (time < $date) { $passed = 0; } else { $passed = 1; } $date = localtime $date; @@ -90,7 +203,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 @@ -100,92 +213,438 @@ 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 ($ENV{'request.state'} eq "construct") { - &Apache::lonxml::debug("in construction ignoring dates"); + 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 in under construction'; + $datemsg='is closed but you are allowed to view it'; } + return ($status,$datemsg); } -sub handler { - my $request=$_[0]; +sub showhash { + my (%hash) = @_; + &showhashsubset(\%hash,'.'); + return ''; +} - if ( $ENV{'user.name'} eq 'albertel' ) { $Apache::lonxml::debug=1; } - - my (@targets) = &get_target(); +sub showarray { + my ($array)=@_; + my $string="("; + foreach my $elm (@{ $array }) { + if (ref($elm)) { + if ($elm =~ /ARRAY/ ) { + $string.=&showarray($elm); + } + } else { + $string.="$elm," + } + } + chop($string); + $string.=")"; + return $string; +} + +sub showhashsubset { + my ($hash,$keyre) = @_; + my $resultkey; + foreach $resultkey (sort keys %$hash) { + if ($resultkey =~ /$keyre/) { + if (ref($$hash{$resultkey})) { + if ($$hash{$resultkey} =~ /ARRAY/ ) { + &Apache::lonxml::debug("$resultkey ---- ". + &showarray($$hash{$resultkey})); + } elsif ($$hash{$resultkey} =~ /HASH/ ) { + &Apache::lonxml::debug("$resultkey ---- $$hash{$resultkey}"); + &showhashsubset($$hash{$resultkey},'.'); + } else { + &Apache::lonxml::debug("$resultkey ---- $$hash{$resultkey}"); + } + } else { + &Apache::lonxml::debug("$resultkey ---- $$hash{$resultkey}"); + } + } + } + &Apache::lonxml::debug("\nUndid changes, Switched $filebak and $file
"); + } else { + $request->print("Unable to undo, unable to switch $filebak and $file
"); + $error=1; + } + } else { + my $fs=Apache::File->new(">$filebak"); + if (defined($fs)) { + print $fs $$problem; + $request->print("Making Backup to $filebakPart '.$part.' | |
'.join(' | ',@{ $answer }). + ' |
Part '.$part. + ' is not analyzabale at this time
'); + } + } + &analyze_footer($request); + &Apache::lonhomework::showhash(%overall); + return $result; +} + +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); } + } + &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",'Problem Editing Help'); + if ($cols > 80) { $cols = 80; } + if ($cols < 70) { $cols = 70; } + if ($rows < 20) { $rows = 20; } + $result.=' + '; + $request->print($result); + } + return ''; +} + +sub renderpage { + my ($request,$file) = @_; + + my (@targets) = &get_target(); + &Apache::lonxml::debug("Running targets ".join(':',@targets)); 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}"); + if ($target eq 'analyze') { %Apache::lonhomework::analyze=(); } + if ($target eq 'answer') { &showhash(%Apache::lonhomework::history); } + if ($target eq 'web') {&Apache::lonhomework::showhashsubset(\%ENV,'^form');} + + &Apache::lonxml::debug("Should be parsing now"); + $result = &Apache::lonxml::xmlparse($request, $target, $problem, + &setup_vars($target),%mystyle); + + #$request->print("Result follows:"); + if ($target eq 'modified') { + &handle_save_or_undo($request,\$problem,\$result); + } else { + if ($target eq 'analyze') { + $result=&Apache::lonnet::hashref2str(\%Apache::lonhomework::analyze); + undef(%Apache::lonhomework::analyze); } - &Apache::lonxml::debug("\n