--- loncom/homework/lonhomework.pm 2000/12/21 15:34:44 1.23 +++ loncom/homework/lonhomework.pm 2001/02/19 20:35:21 1.39 @@ -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,27 @@ 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 ('edit'); + #edit is currently broken + return ('web'); } } return (); @@ -46,14 +51,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 +84,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,16 +104,34 @@ 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 + 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]; - - if ( $ENV{'user.name'} eq 'albertel' ) { $Apache::lonxml::debug=1; } + + if ( $ENV{'user.name'} eq 'albertel' ) {$Apache::lonxml::debug=1;} else {$Apache::lonxml::debug=0;} my (@targets) = &get_target(); @@ -107,11 +141,23 @@ sub handler { $request->content_type('text/html'); } $request->send_http_header; - return 'OK' if $request->header_only; - + return OK if $request->header_only; + + #setup permissions + $Apache::lonhomework::browse= &Apache::lonnet::allowed('bre',$ENV{'request.filename'}); + $Apache::lonhomework::viewgrades=&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'}); + + #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; + } + } + &Apache::lonhomework::send_header($request); - - #check if allowed to see + &Apache::lonxml::debug("Permissions:$Apache::lonhomework::browse:$Apache::lonhomework::viewgrades:"); foreach my $target (@targets) { my $file=&Apache::lonnet::filelocation("",$request->uri); @@ -129,26 +175,28 @@ sub handler { #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 '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') { my $resultkey; foreach $resultkey (sort keys %Apache::lonhomework::history) { &Apache::lonxml::debug("$resultkey ---- $Apache::lonhomework::history{$resultkey}"); } - &Apache::lonxml::debug("\n
restored values^
\n"); + &Apache::lonxml::debug("\n
restored values^
\n"); } 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); @@ -156,11 +204,12 @@ sub handler { $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"); + &Apache::lonxml::debug("\n
storing values^
\n"); } my ($temp) = keys %Apache::lonhomework::results; @@ -170,7 +219,7 @@ sub handler { } &Apache::lonhomework::send_footer($request); - return 'OK'; + return OK; }