--- loncom/homework/lonhomework.pm 2005/07/13 19:48:07 1.213 +++ loncom/homework/lonhomework.pm 2006/05/12 03:46:54 1.246 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # The LON-CAPA Homework handler # -# $Id: lonhomework.pm,v 1.213 2005/07/13 19:48:07 albertel Exp $ +# $Id: lonhomework.pm,v 1.246 2006/05/12 03:46:54 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -86,9 +86,13 @@ sub get_target { } elsif ( defined($env{'form.grade_target'} ) && ($Apache::lonhomework::viewgrades eq 'F' )) { return ($env{'form.grade_target'}); + } elsif ( $env{'form.grade_target'} eq 'webgrade' + && ($Apache::lonhomework::queuegrade eq 'F' )) { + return ($env{'form.grade_target'}); } if ($env{'form.webgrade'} && - $Apache::lonhomework::modifygrades eq 'F') { + ($Apache::lonhomework::modifygrades eq 'F' + || $Apache::lonhomework::queuegrade eq 'F' )) { return ('grade','webgrade'); } if ( defined($env{'form.submitted'}) && @@ -143,12 +147,6 @@ sub setup_vars { # return ';$external::target='.$target.';'; } -sub send_header { - my ($request)= @_; - $request->print(&Apache::lontexconvert::header()); -# $request->print('
'); -} - sub createmenu { my ($which,$request)=@_; if ($which eq 'grade') { @@ -159,35 +157,41 @@ sub createmenu { } } -sub send_footer { - my ($request)= @_; -# $request->print('
'); - $request->print(&Apache::lontexconvert::footer()); -} - sub proctor_checked_in { - my ($slot_name,$slot)=@_; - my @allowed=split(",",$slot->{'proctor'}); - my $version=$Apache::lonhomework::history{'resource.version'}; - foreach my $possible (@allowed) { - if ($Apache::lonhomework::history{"resource.$version.checkedin"} eq - $possible && - $Apache::lonhomework::history{"resource.$version.checkedin.slot"} - eq $slot_name) { + my ($slot_name,$slot,$type)=@_; + my @possible_proctors=split(",",$slot->{'proctor'}); + + my $key; + if ($type eq 'Task') { + my $version=$Apache::lonhomework::history{'resource.0.version'}; + $key ="resource.$version.0.checkedin"; + } elsif ($type eq 'problem') { + $key ='resource.0.checkedin'; + } + + foreach my $possible (@possible_proctors) { + if ($Apache::lonhomework::history{$key} eq $possible + && $Apache::lonhomework::history{$key.'.slot'} eq $slot_name) { return 1; } } + return 0; } $Apache::lonxml::browse=''; sub check_ip_acc { my ($acc)=@_; - if (!defined($acc) || $acc =~ /^\s*$/) { return 1; } + &Apache::lonxml::debug("acc is $acc"); + if (!defined($acc) || $acc =~ /^\s*$/ || $acc =~/^\s*no\s*$/i) { + return 1; + } my $allowed=0; my $ip=$ENV{'REMOTE_ADDR'}; my $name; foreach my $pattern (split(',',$acc)) { + $pattern =~ s/^\s*//; + $pattern =~ s/\s*$//; if ($pattern =~ /\*$/) { #35.8.* $pattern=~s/\*//; @@ -227,13 +231,19 @@ sub check_ip_acc { return $allowed; } -sub check_task_access { +sub check_slot_access { + my ($id,$type)=@_; + # does it pass normal muster - # yes we really do want the default args passing - my ($status,$datemsg)=&check_access; + my ($status,$datemsg)=&check_access($id); + + my $useslots = &Apache::lonnet::EXT("resource.$id.useslots"); + if ($useslots ne 'resource' && $useslots ne 'map') { + return ($status,$datemsg); + } + if ($status eq 'SHOW_ANSWER' || $status eq 'CLOSED' || - $status eq 'CANNOT_ANSWER' || $status eq 'INVALID_ACCESS' || $status eq 'UNAVAILABLE') { return ($status,$datemsg); @@ -241,12 +251,15 @@ sub check_task_access { if ($env{'request.state'} eq "construct") { return ($status,$datemsg); } - my $version=$Apache::lonhomework::history{'resource.version'}; - if ($Apache::lonhomework::history{"resource.$version.checkedin"} && - $Apache::lonhomework::history{"resource.$version.status"} eq 'pass') { - return ('SHOW_ANSWER'); + + if ($type eq 'Task') { + my $version=$Apache::lonhomework::history{'resource.version'}; + if ($Apache::lonhomework::history{"resource.$version.0.checkedin"} && + $Apache::lonhomework::history{"resource.$version.0.status"} eq 'pass') { + return ('SHOW_ANSWER'); + } } - my ($id)=@_; + my @slots= (split(':',&Apache::lonnet::EXT("resource.$id.availablestudent")), split(':',&Apache::lonnet::EXT("resource.$id.available"))); @@ -257,6 +270,7 @@ sub check_task_access { my $slotstatus='NOT_IN_A_SLOT'; my ($returned_slot,$slot_name); foreach my $slot (@slots) { + $slot =~ s/(^\s*|\s*$)//g; &Apache::lonxml::debug("getting $slot"); my %slot=&Apache::lonnet::get_slot($slot); &Apache::lonhomework::showhash(%slot); @@ -271,18 +285,55 @@ sub check_task_access { } } if ($slotstatus eq 'NEEDS_CHECKIN' && - &proctor_checked_in($slot_name,$returned_slot)) { + &proctor_checked_in($slot_name,$returned_slot,$type)) { &Apache::lonxml::debug("protoctor checked in"); $slotstatus='CAN_ANSWER'; } - if ( $slotstatus eq 'NOT_IN_A_SLOT' && - $Apache::lonhomework::history{"resource.$version.checkedin"}) { - if ($Apache::lonhomework::history{"resource.$version.status"} eq 'fail') { + + my ($is_correct,$got_grade,$checkedin); + if ($type eq 'Task') { + my $version=$Apache::lonhomework::history{'resource.0.version'}; + $got_grade = + ($Apache::lonhomework::history{"resource.$version.0.status"} + =~ /^(?:pass|fail)$/); + $is_correct = + ($Apache::lonhomework::history{"resource.$version.0.status"} eq 'pass' + || $Apache::lonhomework::history{"resource.0.solved"} =~ /^correct_/ ); + $checkedin = + $Apache::lonhomework::history{"resource.$version.0.checkedin"}; + } elsif ($type eq 'problem') { + $got_grade = 1; + $checkedin = $Apache::lonhomework::history{"resource.0.checkedin"}; + } + + &Apache::lonxml::debug(" slot is $slotstatus checkedin ($checkedin) got_grade ($got_grade) is_correct ($is_correct)"); + + # no slot is currently open, and has been checked in for this version + # but hasn't got a grade, therefore must be awaiting a grade + if (!defined($slot_name) + && $checkedin + && !$got_grade) { + return ('WAITING_FOR_GRADE'); + } + + if ($slotstatus eq 'NOT_IN_A_SLOT' + && $checkedin ) { + + if ($got_grade) { return ('SHOW_ANSWER'); } else { return ('WAITING_FOR_GRADE'); } + } + if ( $is_correct) { + return ('SHOW_ANSWER'); + } + if ( $status eq 'CANNOT_ANSWER' && + ($slotstatus ne 'NEEDS_CHECKIN' && $slotstatus ne 'NOT_IN_A_SLOT')) { + return ($status,$datemsg); + } + return ($slotstatus,$datemsg,$slot_name,$returned_slot); } @@ -294,7 +345,6 @@ sub check_access { my $status; my $datemsg = ''; my $lastdate = ''; - my $temp; my $type; my $passed; @@ -331,7 +381,7 @@ sub check_access { return($status,$date); } - foreach $temp ("opendate","duedate","answerdate") { + foreach my $temp ("opendate","duedate","answerdate") { $lastdate = $date; $date = &Apache::lonnet::EXT("resource.$id.$temp"); my $thistype = &Apache::lonnet::EXT("resource.$id.$temp.type"); @@ -429,6 +479,20 @@ sub check_access { return ($status,$datemsg); } +sub due_date { + my ($part_id,$symb)=@_; + my $date; + my $interval= &Apache::lonnet::EXT("resource.$part_id.interval",$symb); + if ($interval) { + my $first_access=&Apache::lonnet::get_first_access('map',$symb); + if ($first_access) { $date = $first_access+$interval; } + } + if (!defined($date)) { + $date = &Apache::lonnet::EXT("resource.$part_id.duedate",$symb); + } + return $date +} + sub seconds_to_human_length { my ($length)=@_; @@ -500,13 +564,15 @@ sub setuppermissions { $viewgrades = &Apache::lonnet::allowed('vgr',$env{'request.course.id'}. '/'.$env{'request.course.sec'}); } - $Apache::lonhomework::viewgrades = $viewgrades; # File global variable...dirt. + $Apache::lonhomework::viewgrades = $viewgrades; + if ($Apache::lonhomework::browse eq 'F' && $env{'form.devalidatecourseresdata'} eq 'on') { my (undef,$courseid) = &Apache::lonxml::whichuser(); &Apache::lonnet::devalidatecourseresdata($env{"course.$courseid.num"}, $env{"course.$courseid.domain"}); } + my $modifygrades = &Apache::lonnet::allowed('mgr',$env{'request.course.id'}); if (! $modifygrades && exists($env{'request.course.sec'}) && @@ -516,6 +582,16 @@ sub setuppermissions { '/'.$env{'request.course.sec'}); } $Apache::lonhomework::modifygrades = $modifygrades; + + my $queuegrade = &Apache::lonnet::allowed('mqg',$env{'request.course.id'}); + if (! $queuegrade && + exists($env{'request.course.sec'}) && + $env{'request.course.sec'} !~ /^\s*$/) { + $queuegrade = + &Apache::lonnet::allowed('qgr',$env{'request.course.id'}. + '/'.$env{'request.course.sec'}); + } + $Apache::lonhomework::queuegrade = $queuegrade; return ''; } @@ -578,14 +654,11 @@ sub handle_save_or_undo { sub analyze_header { my ($request) = @_; - my $bodytag=''; - if ($env{'environment.remote'} eq 'off') { - $bodytag=&Apache::loncommon::bodytag(); - } - my $html=&Apache::lonxml::xmlbegin(); - my $result.=$html.' - '.&mt("Analyzing a problem").' - '.$bodytag.&Apache::lonxml::message_location().' + my $result = + &Apache::loncommon::start_page('Analyzing a problem',undef); + + $result .= + &Apache::lonxml::message_location().'
'. &Apache::structuretags::remember_problem_state().' @@ -602,8 +675,7 @@ sub analyze_header { sub analyze_footer { my ($request) = @_; - my $result=''; - $request->print($result); + $request->print(&Apache::loncommon::end_page()); $request->rflush(); } @@ -612,6 +684,7 @@ sub analyze { &Apache::lonxml::debug("Analyze"); my $result; my %overall; + my %seedexample; my %allparts; my $rndseed=$env{'form.rndseed'}; &analyze_header($request); @@ -624,9 +697,10 @@ sub analyze { &Apache::lonhtmlcommon::Increment_PrgWin($request,\%prog_state, &mt('last problem')); if (&Apache::loncommon::connection_aborted($request)) { return; } + my $thisseed=$i+$rndseed; my $subresult=&Apache::lonnet::ssi($request->uri, ('grade_target' => 'analyze'), - ('rndseed' => $i+$rndseed)); + ('rndseed' => $thisseed)); (my $garbage,$subresult)=split(/_HASH_REF__/,$subresult,2); my %analyze=&Apache::lonnet::str2hash($subresult); my @parts; @@ -638,8 +712,13 @@ sub analyze { if ($analyze{$part.'.type'} eq 'numericalresponse' || $analyze{$part.'.type'} eq 'stringresponse' || $analyze{$part.'.type'} eq 'formularesponse' ) { + my $concatanswer=join("\0",@{ $analyze{$part.'.answer'} }); + if (($concatanswer eq '') || ($concatanswer=~/^\@/)) { + @{$analyze{$part.'.answer'}}=(''.&mt('Error').''); + } push( @{ $overall{$part.'.answer'} }, [@{ $analyze{$part.'.answer'} }]); + $seedexample{join("\0",@{ $analyze{$part.'.answer'}})}=$thisseed; } } } @@ -649,17 +728,18 @@ sub analyze { foreach my $part (sort(keys(%allparts))) { if (defined(@{ $overall{$part.'.answer'} })) { my $num_cols=scalar(@{ $overall{$part.'.answer'}->[0] }); - $request->print(''); + $request->print('
'.&mt('Part').' '.$part.'
'); my %frequency; foreach my $answer (sort {$a->[0] <=> $b->[0]} (@{ $overall{$part.'.answer'} })) { $frequency{join("\0",@{ $answer })}++; } - $request->print(''); + $request->print(''); foreach my $answer (sort {(split("\0",$a))[0] <=> (split("\0",$b))[0]} (keys(%frequency))) { - $request->print(''); + $request->print(''); } $request->print('
'.&mt('Part').' '.$part.'
'.&mt('Answer').''.&mt('Frequency').'
'.&mt('Answer').''.&mt('Frequency').'
(' + .&mt('click for example').')
'. - join('',split("\0",$answer)). - '('.$frequency{$answer}. - ')
'. + join('',split("\0",$answer)). + ''.$frequency{$answer}. + '
'); } else { @@ -668,7 +748,7 @@ sub analyze { } } if (scalar(keys(%allparts)) == 0 ) { - $request->print('

'.&mt('Found no analyzable respones in this problem, currently only Numerical, Formula and String response styles are supported.').'

'); + $request->print('

'.&mt('Found no analyzable responses in this problem, currently only Numerical, Formula and String response styles are supported.').'

'); } &Apache::lonhtmlcommon::Close_PrgWin($request,\%prog_state); &analyze_footer($request); @@ -706,29 +786,30 @@ sub editxmlmode { if ($cols > 80) { $cols = 80; } if ($cols < 70) { $cols = 70; } if ($rows < 20) { $rows = 20; } - my $bodytag=''; - if ($env{'environment.remote'} eq 'off') { - $bodytag=&Apache::loncommon::bodytag(); - } - my $html=&Apache::lonxml::xmlbegin(); - $result.=$html.$bodytag. + my $start_page = + &Apache::loncommon::start_page("EditXML $file", + &Apache::edit::js_change_detection()); + + $result.=$start_page. &renderpage($request,$file,['no_output_web'],1). &Apache::lonxml::message_location().' - '. &Apache::structuretags::remember_problem_state().' - + +
-
' . $xml_help . ' - -
'; +
+ + + '.&Apache::loncommon::end_page(); &Apache::lonxml::add_messages(\$result); $request->print($result); } @@ -759,8 +840,10 @@ sub renderpage { $target = 'web'; $output=0; } my $problem=&Apache::lonnet::getfile($file); + my $result; if ($problem eq -1) { - &Apache::lonxml::error(" ".&mt('Unable to find')." $file"); + my $filename=(split('/',$file))[-1]; + $result.=" ".&mt('Unable to find')." $filename"; $problem=''; } @@ -770,10 +853,10 @@ sub renderpage { if ($target eq 'web') {&Apache::lonhomework::showhashsubset(\%env,'^form');} &Apache::lonxml::debug("Should be parsing now"); - my $result = &Apache::lonxml::xmlparse($request, $target, $problem, - &setup_vars($target),%mystyle); + $result .= &Apache::lonxml::xmlparse($request, $target, $problem, + &setup_vars($target),%mystyle); undef($Apache::lonhomework::parsing_a_problem); - if (!$output) { $result = '';&Apache::lonxml::message_location().'c'; } + if (!$output) { $result = ''; } #$request->print("Result follows:"); if ($target eq 'modified') { &handle_save_or_undo($request,\$problem,\$result); @@ -858,8 +941,8 @@ sub newproblem { $errormsg='

'.&mt('You did not select a template.').'

'."\n"; } my $instructions; - my $bodytag=&Apache::loncommon::bodytag(undef,undef,undef, - ($env{'environment.remote'} ne 'off')); + my $start_page = + &Apache::loncommon::start_page("Create New $extension"); if ($templatelist) { $instructions=&mt(", select a template from the pull-down menu below.").'
'.&mt("Then");} my %lt=&Apache::lonlocal::texthash( 'create' => 'Creating a new', 'resource' => 'resource', @@ -870,7 +953,7 @@ sub newproblem { 'Create' => 'Create', 'button' => 'button'); $request->print(<$lt{'create'} $extension $lt{'resource'} $errormsg $lt{'requested'} $shownurl $lt{'not exist'}. @@ -883,34 +966,15 @@ ENDNEWPROBLEM $request->print(""); } $request->print("
"); - $request->print("

"); + $request->print("

".&Apache::loncommon::end_page()); } return ''; } -sub view_or_edit_menu { - my ($request) = @_; - my $url=&HTML::Entities::encode($request->uri,'<>&"'); - my %lt=&Apache::lonlocal::texthash( 'would' => 'Would you like to', - 'view' => 'View', - 'Edit' => 'edit', - 'or' => 'or', - 'the problem' => 'the problem'); - $request->print(< -
-$lt{'would'} -<{'or'} -<{'the problem'}. -
- -EDITMENU -} - sub handler { #my $t0 = [&gettimeofday()]; my $request=$_[0]; - + $Apache::lonxml::request=$request; $Apache::lonxml::debug=$env{'user.debug'}; $env{'request.uri'}=$request->uri; &setuppermissions(); @@ -930,34 +994,20 @@ sub handler { if ($Apache::lonhomework::browse ne 'F' && $env{'request.state'} ne "construct") { #should know where we are, so ask - if ( &Apache::lonnet::mod_perl_version() == 2 ) { - &Apache::lonnet::cleanenv(); - } - &Apache::lonnet::logthis(&Apache::lonnet::mod_perl_version()); $request->internal_redirect('/adm/ambiguous'); return OK; } } if (&setupheader($request)) { return OK; } - &Apache::lonxml::debug("Permissions:$Apache::lonhomework::browse:$Apache::lonhomework::viewgrades:"); + &Apache::lonxml::debug("Permissions:$Apache::lonhomework::browse:$Apache::lonhomework::viewgrades:$Apache::lonhomework::modifygrades:$Apache::lonhomework::queuegrade"); &Apache::lonxml::debug("Problem Mode ".$env{'form.problemmode'}); my ($symb) = &Apache::lonxml::whichuser(); &Apache::lonxml::debug('symb is '.$symb); - if ($env{'request.state'} eq "construct" || $symb eq '') { - if ($env{'form.resetdata'} eq &mt('Reset Submissions') || - $env{'form.resetdata'} eq &mt('New Problem Variation') || - $env{'form.newrandomization'} eq &mt('New Randomization')) { - my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser(); - &Apache::lonnet::tmpreset($symb,'',$domain,$name); - &Apache::lonxml::debug("Attempt reset"); - } - } if ($env{'request.state'} eq "construct") { if ( -e $file ) { &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['problemmode']); if (!(defined $env{'form.problemmode'})) { #first visit to problem in construction space - #&view_or_edit_menu($request); $env{'form.problemmode'}='View'; &renderpage($request,$file); } elsif ($env{'form.problemmode'} eq &mt('EditXML') || @@ -979,7 +1029,6 @@ sub handler { } #my $td=&tv_interval($t0); #&Apache::lonxml::debug("Spent $td seconds processing"); - # &Apache::lonhomework::send_footer($request); # always turn off debug messages $Apache::lonxml::debug=0; return OK;