--- loncom/homework/lonhomework.pm 2002/03/29 19:19:21 1.75 +++ loncom/homework/lonhomework.pm 2003/05/16 19:01:27 1.129 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # The LON-CAPA Homework handler # -# $Id: lonhomework.pm,v 1.75 2002/03/29 19:19:21 albertel Exp $ +# $Id: lonhomework.pm,v 1.129 2003/05/16 19:01:27 albertel 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,18 @@ 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::rankresponse(); +use Apache::matchresponse(); +#use Apache::chemresponse(); use Apache::Constants qw(:common); use HTML::Entities(); +use Apache::loncommon(); #use Time::HiRes qw( gettimeofday tv_interval ); BEGIN { @@ -50,12 +61,18 @@ BEGIN { } sub get_target { - if ( $ENV{'request.state'} eq "published") { - if ( defined($ENV{'form.grade_target'}) - && ($Apache::lonhomework::viewgrades == 'F' )) { + if (($ENV{'request.state'} eq "published") || + ($ENV{'request.state'} eq "uploaded")) { + 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 eq 'F' )) { return ($ENV{'form.grade_target'}); } - if ( defined($ENV{'form.submitted'})) { + + if ( defined($ENV{'form.submitted'}) && + ( !defined($ENV{'form.resetdata'}))) { return ('grade', 'web'); } else { return ('web'); @@ -71,7 +88,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 +98,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'); } @@ -122,20 +144,45 @@ 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 =''; - my $status = ''; + my $status; my $datemsg = ''; my $lastdate = ''; my $temp; my $type; my $passed; + + if ($ENV{'request.state'} eq "construct") { + &Apache::lonxml::debug("in construction ignoring dates"); + $status='CAN_ANSWER'; + $datemsg='is in under construction'; + return ($status,$datemsg); + } + &Apache::lonxml::debug("checking for part :$id:"); &Apache::lonxml::debug("time:".time); 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 =~ /^(con_lost|no_such_host)/ || + $date =~ /^(con_lost|no_such_host)/) { + $status='UNAVAILABLE'; + $date="may open later."; + return($status,$date); + } + 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; @@ -162,12 +209,20 @@ sub check_access { $datemsg = "was due on $lastdate, and answers will be available on $date"; } if ($status eq 'CAN_ANSWER') { - #check #tries + #check #tries, and if correct. 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'; } + if ($tries >= $maxtries) { $status = 'CANNOT_ANSWER'; } + # if (correct and show prob status) or excused then CANNOT_ANSWER + if(($Apache::lonhomework::history{"resource.$id.solved"}=~/^correct/ + && + lc($Apache::lonhomework::problemstatus) ne 'no') + || + $Apache::lonhomework::history{"resource.$id.solved"}=~/^excused/) { + $status = 'CANNOT_ANSWER'; + } } if (($status ne 'CLOSED') && ($Apache::lonhomework::type eq 'exam') && @@ -182,31 +237,51 @@ sub check_access { $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 showhash { my (%hash) = @_; + &showhashsubset(\%hash,'.'); + return ''; +} + +sub showarray { + my ($array)=@_; + my $string="("; + foreach my $elm (@{ $array }) { + if (ref($elm)) { + if ($elm =~ /ARRAY/ ) { + $string.=&showarray($elm); + } + } else { + $string.="$elm," + } + } + chop($string); + $string.=")"; + return $string; +} + +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/ ) { + &Apache::lonxml::debug("$resultkey ---- ". + &showarray($$hash{$resultkey})); + } elsif ($$hash{$resultkey} =~ /HASH/ ) { + &Apache::lonxml::debug("$resultkey ---- $$hash{$resultkey}"); + &showhashsubset($$hash{$resultkey},'.'); + } 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"); @@ -215,23 +290,31 @@ sub showhash { sub setuppermissions { $Apache::lonhomework::browse= &Apache::lonnet::allowed('bre',$ENV{'request.filename'}); - $Apache::lonhomework::viewgrades=&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'}); + my $viewgrades = &Apache::lonnet::allowed('vgr',$ENV{'request.course.id'}); + if (! $viewgrades && + exists($ENV{'request.course.sec'}) && + $ENV{'request.course.sec'} !~ /^\s*$/) { + $viewgrades = &Apache::lonnet::allowed('vgr',$ENV{'request.course.id'}. + '/'.$ENV{'request.course.sec'}); + } + $Apache::lonhomework::viewgrades = $viewgrades; return '' } sub setupheader { - my $request=$_[0]; - if ($ENV{'browser.mathml'}) { - $request->content_type('text/xml'); - } else { - $request->content_type('text/html'); - } - if (!$Apache::lonxml::debug && ($ENV{'REQUEST_METHOD'} eq 'GET')) { - &Apache::loncommon::no_cache($request); - } - $request->send_http_header; - return OK if $request->header_only; - return '' + my $request=$_[0]; + if ($ENV{'browser.mathml'}) { + $request->content_type('text/xml'); + } else { + $request->content_type('text/html'); + } + $request->content_encoding('UTF-8'); + if (!$Apache::lonxml::debug && ($ENV{'REQUEST_METHOD'} eq 'GET')) { + &Apache::loncommon::no_cache($request); + } + $request->send_http_header; + return OK if $request->header_only; + return '' } sub handle_save_or_undo { @@ -273,21 +356,92 @@ sub handle_save_or_undo { return $error; } +sub analyze_header { + my ($request) = @_; + my $result.=' + Analyzing a problem + +
+ + +
+ +
+ List of possible answers: +
'; + $request->print($result); + $request->rflush(); +} + +sub analyze_footer { + my ($request) = @_; + my $result=''; + $request->print($result); + $request->rflush(); +} + sub analyze { - my ($request,$file) = @_; - &Apache::lonxml::debug("Analyze"); - my $result=&Apache::lonnet::ssi($request->uri,('grade_target' => 'analyze')); - &Apache::lonxml::debug(":$result:"); - (my $garbage,$result)=split(/_HASH_REF__/,$result,2); - &showhash(&Apache::lonnet::str2hash($result)); - return $result; + my ($request,$file) = @_; + &Apache::lonxml::debug("Analyze"); + my $result; + my %overall; + my %allparts; + my $rndseed=$ENV{'form.rndseed'}; + &analyze_header($request); + my %prog_state= + &Apache::lonhtmlcommon::Create_PrgWin($request,'Analyze Progress', + 'Getting Problem Variants', + $ENV{'form.numtoanalyze'}); + for(my $i=1;$i<$ENV{'form.numtoanalyze'}+1;$i++) { + &Apache::lonhtmlcommon::Increment_PrgWin($request,\%prog_state, + 'last problem'); + my $subresult=&Apache::lonnet::ssi($request->uri, + ('grade_target' => 'analyze'), + ('rndseed' => $i)); + &Apache::lonxml::debug(":$subresult:"); + (my $garbage,$subresult)=split(/_HASH_REF__/,$subresult,2); + my %analyze=&Apache::lonnet::str2hash($subresult); + my @parts; + if (defined(@{ $analyze{'parts'} })) { + @parts=@{ $analyze{'parts'} }; + } + foreach my $part (@parts) { + if (!exists($allparts{$part})) {$allparts{$part}=1;}; + if ($analyze{$part.'.type'} eq 'numericalresponse' || + $analyze{$part.'.type'} eq 'stringresponse' || + $analyze{$part.'.type'} eq 'formularesponse' ) { + push( @{ $overall{$part.'.answer'} }, + [@{ $analyze{$part.'.answer'} }]); + } + } + } + &Apache::lonhtmlcommon::Update_PrgWin($request,\%prog_state, + 'Analyzing Results'); + foreach my $part (keys(%allparts)) { + if (defined(@{ $overall{$part.'.answer'} })) { + $request->print(''); + foreach my $answer (sort {$a->[0] <=> $b->[0]} (@{ $overall{$part.'.answer'} })) { + $request->print(''); + } + $request->print('
Part '.$part.'
'.join('',@{ $answer }). + '
'); + } else { + $request->print('

Part '.$part. + ' is not analyzabale at this time

'); + } + } + &Apache::lonhtmlcommon::Close_PrgWin($request,\%prog_state); + &analyze_footer($request); + &Apache::lonhomework::showhash(%overall); + return $result; } sub editxmlmode { my ($request,$file) = @_; my $result; my $problem=&Apache::lonnet::getfile($file); - if ($problem == -1) { + if ($problem eq -1) { &Apache::lonxml::error(" Unable to find $file"); $problem=''; } @@ -296,22 +450,42 @@ 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",'Problem Editing Help') + .''. + &Apache::loncommon::help_open_topic("Greek_Symbols",'Greek Symbols', + undef,undef,600) + .''. + &Apache::loncommon::help_open_topic("Other_Symbols",'Other Symbols', + undef,undef,600) + .'
'; + if ($cols > 80) { $cols = 80; } + if ($cols < 70) { $cols = 70; } + if ($rows < 20) { $rows = 20; } + $result.='
- +
+
+ ' . $xml_help . '
'; - $request->print($result); + $request->print($result); + } return ''; } @@ -323,36 +497,21 @@ sub renderpage { foreach my $target (@targets) { #my $t0 = [&gettimeofday()]; my $problem=&Apache::lonnet::getfile($file); - if ($problem == -1) { + if ($problem eq -1) { &Apache::lonxml::error(" Unable to find $file"); $problem=''; } my %mystyle; my $result = ''; - &Apache::inputtags::initialize_inputtags; - &Apache::edit::initialize_edit; - if ($target eq 'analyze') { %Apache::lonhomework::anaylze=(); } - if ($target eq 'web') { - if (&Apache::lonnet::symbread() 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 'analyze') { %Apache::lonhomework::analyze=(); } + 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($target, $problem, - $default.&setup_vars($target),%mystyle); - + $result = &Apache::lonxml::xmlparse($request, $target, $problem, + &setup_vars($target),%mystyle); + undef($Apache::lonhomework::parsing_a_problem); #$request->print("Result follows:"); if ($target eq 'modified') { &handle_save_or_undo($request,\$problem,\$result); @@ -367,6 +526,7 @@ sub renderpage { #$result.="
Spent $td seconds processing target $target\n"; #} $request->print($result); + $request->rflush(); } #$request->print(":Result ends"); #my $td=&tv_interval($t0); @@ -378,6 +538,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'); @@ -385,9 +546,13 @@ sub get_template_list { $result=$file; last; } else { - $result.=""; + if ($name) { push (@allnames, $name); } } } + if (@allnames && !$result) { + $result="\n'; + } return $result; } @@ -396,48 +561,38 @@ 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 template") { use File::Copy; my $file = &get_template_list($ENV{'form.template'},$extension); my $dest = &Apache::lonnet::filelocation("",$request->uri); copy($file,$dest); &renderpage($request,$dest); - } elsif($ENV{'form.newfile'}) { - # I don't like hard-coded filenames but for now, this will work. - use File::Copy; - my $templatefilename = - $request->dir_config('lonIncludes').'/templates/blank.problem'; - &Apache::lonxml::debug("$templatefilename"); - 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 $errormsg; + if ($ENV{'form.newfile'}) { + $errormsg='

You did not select a template.

'."\n"; + } + 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
-
-
- -
- +

Creating a new $extension resource

+$errormsg +The requested file $url currently does not exist. +

+To create a new $extension$instructions click on the "Create $extension" button. +

+

ENDNEWPROBLEM + if (defined($templatelist)) { + $request->print(""); + } + $request->print("
"); + $request->print("

"); } return ''; } @@ -459,7 +614,7 @@ sub handler { #my $t0 = [&gettimeofday()]; my $request=$_[0]; - 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; @@ -470,8 +625,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; @@ -488,11 +645,16 @@ sub handler { } } + my ($symb) = &Apache::lonxml::whichuser(); + &Apache::lonxml::debug('symb is '.$symb); + if ($ENV{'request.state'} eq "construct" || $symb eq '') { + if ($ENV{'form.resetdata'} eq 'Reset Submissions' || + $ENV{'form.resetdata'} eq 'New Problem Variation' ) { + my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser(); + &Apache::lonnet::tmpreset($symb,'',$domain,$name); + } + } if ($ENV{'request.state'} eq "construct") { - if ($ENV{'form.resetdata'} eq 'Reset Submissions') { - my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser(); - &Apache::lonnet::tmpreset($symb,'',$domain,$name); - } if ( -e $file ) { if (!(defined $ENV{'form.problemmode'})) { #first visit to problem in construction space