--- loncom/homework/lonhomework.pm 2002/03/29 18:32:46 1.74 +++ loncom/homework/lonhomework.pm 2002/09/24 12:39:42 1.90 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # The LON-CAPA Homework handler # -# $Id: lonhomework.pm,v 1.74 2002/03/29 18:32:46 albertel Exp $ +# $Id: lonhomework.pm,v 1.90 2002/09/24 12:39:42 sakharuk Exp $ # # Copyright Michigan State University Board of Trustees # @@ -28,6 +28,7 @@ # Guy Albertelli # 11/30 Gerd Kortemeyer # 6/1,8/17,8/18 Gerd Kortemeyer +# 7/18 Jeremy Bowers package Apache::lonhomework; use strict; @@ -41,8 +42,15 @@ 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::Constants qw(:common); use HTML::Entities(); +use Apache::loncommon(); #use Time::HiRes qw( gettimeofday tv_interval ); BEGIN { @@ -51,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 { @@ -71,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'); @@ -80,7 +93,11 @@ sub get_target { } } elsif ( $ENV{'form.problemmode'} eq 'Edit' ) { if ( $ENV{'form.submitted'} eq 'edit' ) { - return ('modified','edit'); + if ( $ENV{'form.submit'} eq 'Submit Changes and View' ) { + return ('modified','web','answer'); + } else { + return ('modified','edit'); + } } else { return ('edit'); } @@ -108,7 +125,7 @@ sub createmenu { my ($which,$request)=@_; if ($which eq 'grade') { $request->print(''); } @@ -136,6 +153,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; @@ -178,7 +204,7 @@ sub check_access { &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"); + &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'; } @@ -192,21 +218,29 @@ sub check_access { sub showhash { my (%hash) = @_; + &showhashsubset(\%hash,''); + return ''; +} + +sub showhashsubset { + my ($hash,$keyre) = @_; my $resultkey; - foreach $resultkey (sort keys %hash) { - if (ref($hash{$resultkey})) { - if ($hash{$resultkey} =~ /ARRAY/ ) { - my $string="$resultkey ---- ("; - foreach my $elm (@{ $hash{$resultkey} }) { - $string.="$elm,"; + foreach $resultkey (sort keys %$hash) { + if ($resultkey =~ /$keyre/) { + if (ref($$hash{$resultkey})) { + if ($$hash{$resultkey} =~ /ARRAY/ ) { + my $string="$resultkey ---- ("; + foreach my $elm (@{ $$hash{$resultkey} }) { + $string.="$elm,"; + } + chop($string); + &Apache::lonxml::debug("$string)"); + } else { + &Apache::lonxml::debug("$resultkey ---- $$hash{$resultkey}"); } - chop($string); - &Apache::lonxml::debug("$string)"); } else { - &Apache::lonxml::debug("$resultkey ---- $hash{$resultkey}"); + &Apache::lonxml::debug("$resultkey ---- $$hash{$resultkey}"); } - } else { - &Apache::lonxml::debug("$resultkey ---- $hash{$resultkey}"); } } &Apache::lonxml::debug("\n
restored values^
\n"); @@ -296,22 +330,34 @@ sub editxmlmode { \$ENV{'form.editxmltext'}); if (!$error) { $problem=&Apache::lonnet::getfile($file); } } - my ($rows,$cols) = &Apache::edit::textarea_sizes(\$problem); - if ($cols > 80) { $cols = 80; } - $result.=' + &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"); + if ($cols > 80) { $cols = 80; } + if ($cols < 70) { $cols = 70; } + if ($rows < 20) { $rows = 20; } + $result.='
- +
+
+ ' . $xml_help . ' Problem Help
'; - $request->print($result); + $request->print($result); + } return ''; } @@ -334,23 +380,26 @@ sub renderpage { &Apache::edit::initialize_edit; if ($target eq 'analyze') { %Apache::lonhomework::anaylze=(); } if ($target eq 'web') { - if (&Apache::lonnet::symbread() eq '') { + my ($symb)=&Apache::lonxml::whichuser(); + if ($symb eq '') { if ($ENV{'request.state'} eq "construct") { } else { - $request->print("Browsing or ambiguous reference, submissions ignored
"); + my $help = Apache::loncommon::help_open_topic("Ambiguous_Reference"); + $request->print("Browsing or ambiguous reference, submissions ignored $help
"); } } #if ($Apache::lonhomework::viewgrades eq 'F') {&createmenu('grade',$request); } } - #if ($target eq 'grade') { &showhash(%Apache::lonhomework::history); } + 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'); +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"); + &Apache::lonxml::error("Unable to find default_homework.lcpm"); $default=''; } &Apache::lonxml::debug("Should be parsing now"); - $result = &Apache::lonxml::xmlparse($target, $problem, + $result = &Apache::lonxml::xmlparse($request, $target, $problem, $default.&setup_vars($target),%mystyle); #$request->print("Result follows:"); @@ -359,6 +408,7 @@ sub renderpage { } else { if ($target eq 'analyze') { $result=&Apache::lonnet::hashref2str(\%Apache::lonhomework::analyze); + undef(%Apache::lonhomework::analyze); } #my $td=&tv_interval($t0); #if ( $Apache::lonxml::debug) { @@ -377,16 +427,22 @@ sub renderpage { sub get_template_list { my ($namewanted,$extension) = @_; my $result; + my @allnames; &Apache::lonxml::debug("Looking for :$extension:"); - foreach my $file () { + foreach my $file () + { my $name=&Apache::lonnet::metadata($file,'title'); if ($namewanted && ($name eq $namewanted)) { $result=$file; last; } else { - $result.=""; + push (@allnames, $name); } } + if (@allnames && !$result) { + $result="\n'; + } return $result; } @@ -395,7 +451,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); @@ -410,33 +467,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 ''; } @@ -458,7 +505,7 @@ sub handler { #my $t0 = [&gettimeofday()]; my $request=$_[0]; - if ( $ENV{'user.name'} eq 'albertel' ) {$Apache::lonxml::debug=1;} +# if ( $ENV{'user.name'} eq 'physnet' ) {$Apache::lonxml::debug=1;} if (&setupheader($request)) { return OK; } $ENV{'request.uri'}=$request->uri; @@ -469,8 +516,10 @@ sub handler { &Apache::lonxml::debug("Permissions:$Apache::lonhomework::browse:$Apache::lonhomework::viewgrades:"); # some times multiple problemmodes are submitted, need to select # the last one + &Apache::lonxml::debug("Problem Mode ".$ENV{'form.problemmode'}); if ( defined($ENV{'form.problemmode'}) && - defined(@{ $ENV{'form.problemmode'} })) { + ref($ENV{'form.problemmode'}) ) { + &Apache::lonxml::debug("Problem Mode ".join(",",@$ENV{'form.problemmode'})); my $mode=$ENV{'form.problemmode'}->[-1]; undef $ENV{'form.problemmode'}; $ENV{'form.problemmode'}=$mode;