--- loncom/homework/lonhomework.pm 2000/12/19 23:22:22 1.22 +++ loncom/homework/lonhomework.pm 2001/04/26 21:28:33 1.41 @@ -1,6 +1,7 @@ # The LON-CAPA Homework handler # Guy Albertelli # 11/30 Gerd Kortemeyer +# 6/1 Gerd Kortemeyer package Apache::lonhomework; use strict; @@ -11,23 +12,30 @@ use Apache::inputtags; use Apache::structuretags; use Apache::response; use Apache::hint; +use Apache::outputtags; +use Apache::Constants qw(:common); 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.submitted'}) { return ('grade', 'web'); } else { return ('web'); } } else { - return ('edit'); + return ('grade','web'); + if ( $ENV{'form.submitted'} eq 'edit' ) { + return ('modified','edit'); + } else { + return ('edit'); + } } } return (); @@ -46,14 +54,23 @@ sub send_header { # $request->print('
'); } +sub createmenu { + my ($which,$request)=@_; + if ($which eq 'grade') { + $request->print(''); + } +} + sub send_footer { my ($request)= @_; # $request->print('
'); $request->print(&Apache::lontexconvert::footer()); } -#@Apache::lonhomework::date_status=(); -#@Apache::lonhomework::date_msg=(); +$Apache::lonxml::browse=''; sub check_date { my ($id) = @_; my $date =''; @@ -70,6 +87,8 @@ sub check_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; @@ -88,89 +107,169 @@ sub check_date { $datemsg = "is due at $date"; } elsif ($type eq 'answerdate') { $status='CLOSED'; - $datemsg = "was due as $lastdate, and asnswers will be available at $date"; + $datemsg = "was due on $lastdate, and answers will be available on $date"; + } + if ($status eq 'CAN_ANSWER') { + #check #tries + 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'; } } &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'; + $datemsg='is in under construction'; + } 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'); } $request->send_http_header; - return 'OK' if $request->header_only; - + return OK if $request->header_only; &Apache::lonhomework::send_header($request); - - #check if allowed to see - + return '' +} + +sub renderpage { + my ($request,$file) = @_; + + my (@targets) = &get_target(); foreach my $target (@targets) { - my $file=&Apache::lonnet::filelocation("",$request->uri); 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; + %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 '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
"); + } } - &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"); $default=''; } - if ( $target eq 'grade') { - $Apache::lonxml::textredirection = 0; - } else { - $Apache::lonxml::textredirection = 1; - } $result = &Apache::lonxml::xmlparse($target, $problem, $default.&setup_vars($target),%mystyle); #$request->print("Result follows:"); - $request->print($result); - #$request->print(":Result ends"); - if ($target eq 'grade') { - my $resultkey; - foreach $resultkey (sort keys %Apache::lonhomework::results) { - &Apache::lonxml::debug("$resultkey ---- $Apache::lonhomework::results{$resultkey}"); - } - &Apache::lonxml::debug("\n
storing values^
\n"); + if ($target eq 'modified') { + my $fileout = &Apache::lonnet::filelocation("",$request->uri); + my $filesave=$fileout.".bak"; + + my $fs=Apache::File->new(">$filesave"); + print $fs $problem; + $request->print("Making Backup to $filesave
"); + + my $fh=Apache::File->new(">$fileout"); + print $fh $result; + $request->print("Saving Modifications to $fileout
"); + } else { + $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)); + &Apache::lonxml::debug("Store return message:". + &Apache::lonnet::cstore(\%Apache::lonhomework::results)); + } + } +} + +sub handler { + my $request=$_[0]; + + if ( $ENV{'user.name'} eq 'albertel' ) {$Apache::lonxml::debug=1;} + + if (&setupheader($request)) { return OK; } + + #setup permissions + $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:"); + + my $file=&Apache::lonnet::filelocation("",$request->uri); + + #check if we know where we are + if ($ENV{'request.course.fn'} && !&Apache::lonnet::symbread()) { + # if we are browsing we might not be able to know where we are + if ($Apache::lonhomework::browse ne 'F') { + #should know where we are, so ask + $request->internal_redirect('/adm/ambiguous'); return; + } + } + + if ($ENV{'request.state'} eq "construct") { + if ( -e $file ) { + if (!(defined $ENV{'form.showproblem'})) { + #first visit to problem in construction space + &view_or_edit_menu($request); + } else { + &renderpage($request,$file); + } + } else { + # requested file doesn't exist in contruction space + &newproblem($request); } + } else { + # just render the page normally outside of construction space + &renderpage($request,$file); } + &Apache::lonhomework::send_footer($request); - - return 'OK'; + # always turn off debug messages + $Apache::lonxml::debug=0; + return OK; }