--- loncom/homework/lonhomework.pm 2002/08/07 18:20:29 1.85 +++ loncom/homework/lonhomework.pm 2002/09/26 16:54:36 1.92 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # The LON-CAPA Homework handler # -# $Id: lonhomework.pm,v 1.85 2002/08/07 18:20:29 albertel Exp $ +# $Id: lonhomework.pm,v 1.92 2002/09/26 16:54:36 bowersj2 Exp $ # # Copyright Michigan State University Board of Trustees # @@ -59,10 +59,14 @@ BEGIN { sub get_target { if ( $ENV{'request.state'} eq "published") { - if ( defined($ENV{'form.grade_target'}) + 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 { @@ -79,7 +83,8 @@ sub get_target { return ('web'); } } else { - if ( $ENV{'form.problemmode'} eq 'View' ) { + 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'); @@ -134,6 +139,8 @@ sub send_footer { $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 =''; @@ -148,6 +155,15 @@ sub check_access { 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 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; @@ -325,6 +341,8 @@ sub editxmlmode { my ($rows,$cols) = &Apache::edit::textarea_sizes(\$problem); my $xml_help = Apache::loncommon::help_open_topic("Problem_Editor_XML_Index"); if ($cols > 80) { $cols = 80; } + if ($cols < 70) { $cols = 70; } + if ($rows < 20) { $rows = 20; } $result.='
@@ -422,7 +440,7 @@ sub get_template_list { push (@allnames, $name); } } - if (@allnames) { + if (@allnames && !$result) { $result="\n'; } @@ -488,7 +506,7 @@ sub handler { #my $t0 = [&gettimeofday()]; my $request=$_[0]; - if ( $ENV{'user.name'} eq 'albertel' ) {$Apache::lonxml::debug=1;} +# if ( $ENV{'user.name'} eq 'albertel' ) {$Apache::lonxml::debug=1;} if (&setupheader($request)) { return OK; } $ENV{'request.uri'}=$request->uri;