--- loncom/homework/lonhomework.pm 2002/07/29 20:40:34 1.83 +++ loncom/homework/lonhomework.pm 2002/11/10 15:39:37 1.100 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # The LON-CAPA Homework handler # -# $Id: lonhomework.pm,v 1.83 2002/07/29 20:40:34 albertel Exp $ +# $Id: lonhomework.pm,v 1.100 2002/11/10 15:39:37 albertel 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; @@ -204,7 +220,7 @@ sub check_access { sub showhash { my (%hash) = @_; - &showhashsubset(\%hash,''); + &showhashsubset(\%hash,'.'); return ''; } @@ -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.='
@@ -360,30 +378,16 @@ sub renderpage { my %mystyle; my $result = ''; - &Apache::inputtags::initialize_inputtags; - &Apache::edit::initialize_edit; + &Apache::inputtags::initialize_inputtags(); + &Apache::outputtags::initialize_outputtags(); + &Apache::edit::initialize_edit(); if ($target eq 'analyze') { %Apache::lonhomework::anaylze=(); } - if ($target eq 'web') { - my ($symb)=&Apache::lonxml::whichuser(); - if ($symb eq '') { - if ($ENV{'request.state'} eq "construct") { - } else { - $request->print("Browsing or ambiguous reference, submissions ignored
"); - } - } - #if ($Apache::lonhomework::viewgrades eq 'F') {&createmenu('grade',$request); } - } - #if ($target eq 'grade') { &showhash(%Apache::lonhomework::history); } - #if ($target eq 'web') { &showhash(%ENV); } + if ($target eq 'answer') { &showhash(%Apache::lonhomework::history); } + if ($target eq 'web') {&Apache::lonhomework::showhashsubset(\%ENV,'^form');} - 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=''; - } &Apache::lonxml::debug("Should be parsing now"); $result = &Apache::lonxml::xmlparse($request, $target, $problem, - $default.&setup_vars($target),%mystyle); + &setup_vars($target),%mystyle); #$request->print("Result follows:"); if ($target eq 'modified') { @@ -410,6 +414,7 @@ sub renderpage { sub get_template_list { my ($namewanted,$extension) = @_; my $result; + my @allnames; &Apache::lonxml::debug("Looking for :$extension:"); foreach my $file () { my $name=&Apache::lonnet::metadata($file,'title'); @@ -417,9 +422,13 @@ sub get_template_list { $result=$file; last; } else { - $result.=""; + push (@allnames, $name); } } + if (@allnames && !$result) { + $result="\n'; + } return $result; } @@ -428,7 +437,8 @@ sub newproblem { my $extension=$request->uri; $extension=~s:^.*\.([\w]+)$:$1:; &Apache::lonxml::debug("Looking for :$extension:"); - if ($ENV{'form.template'}) { + if ($ENV{'form.template'} && + $ENV{'form.template'} ne "Select a $extension type") { use File::Copy; my $file = &get_template_list($ENV{'form.template'},$extension); my $dest = &Apache::lonnet::filelocation("",$request->uri); @@ -443,33 +453,23 @@ sub newproblem { my $dest = &Apache::lonnet::filelocation("",$request->uri); copy($templatefilename,$dest); &renderpage($request,$dest); - }else { + } else { my $templatelist=&get_template_list('',$extension); my $url=$request->uri; my $dest = &Apache::lonnet::filelocation("",$request->uri); - if (!defined($templatelist)) { - # We didn't find a template, so just create a blank problem. - $request->print(< -The requested file $url doesn\'t exist. You can create a new $extension
- -
- - -ENDNEWPROBLEM - return ''; - } + my $instructions; + if ($templatelist) { $instructions=", select a template from the pull-down menu below. Then";} $request->print(< -The requested file $url doesn\'t exist. You can create a new $extension
+The requested file $url doesn\'t exist.
+To create a new $extension$instructions click on the Create $extension button.
-
- -
- ENDNEWPROBLEM + if (defined($templatelist)) { + $request->print(""); + } + $request->print("
"); + $request->print(""); } return ''; } @@ -491,7 +491,8 @@ 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;} + $Apache::lonxml::debug=$ENV{'user.debug'}; if (&setupheader($request)) { return OK; } $ENV{'request.uri'}=$request->uri;