--- loncom/homework/lonhomework.pm 2005/12/22 22:06:54 1.232 +++ loncom/homework/lonhomework.pm 2006/04/11 21:05:54 1.238 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # The LON-CAPA Homework handler # -# $Id: lonhomework.pm,v 1.232 2005/12/22 22:06:54 albertel Exp $ +# $Id: lonhomework.pm,v 1.238 2006/04/11 21:05:54 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -143,12 +143,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,12 +153,6 @@ sub createmenu { } } -sub send_footer { - my ($request)= @_; -# $request->print('
'); - $request->print(&Apache::lontexconvert::footer()); -} - sub proctor_checked_in { my ($slot_name,$slot,$type)=@_; my @possible_proctors=split(",",$slot->{'proctor'}); @@ -198,6 +186,8 @@ sub check_ip_acc { my $ip=$ENV{'REMOTE_ADDR'}; my $name; foreach my $pattern (split(',',$acc)) { + $pattern =~ s/^\s*//; + $pattern =~ s/\s*$//; if ($pattern =~ /\*$/) { #35.8.* $pattern=~s/\*//; @@ -295,12 +285,15 @@ sub check_slot_access { $slotstatus='CAN_ANSWER'; } - my ($got_grade,$checkedin); + 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') { @@ -308,6 +301,15 @@ sub check_slot_access { $checkedin = $Apache::lonhomework::history{"resource.0.checkedin"}; } + &Apache::lonxml::debug(" slot is $slotstatus checkedin ($checkedin) got_grade ($got_grade) is_correct ($is_correct)"); + + # has a current checked in recrd, but hasn't got a grade, must be awaiting + # a grade + if ($checkedin + && !$got_grade) { + return ('WAITING_FOR_GRADE'); + } + if ($slotstatus eq 'NOT_IN_A_SLOT' && $checkedin ) { @@ -318,6 +320,9 @@ sub check_slot_access { } } + if ( $is_correct) { + return ('SHOW_ANSWER'); + } if ( $status eq 'CANNOT_ANSWER' && ($slotstatus ne 'NEEDS_CHECKIN' && $slotstatus ne 'NOT_IN_A_SLOT')) { return ($status,$datemsg); @@ -617,12 +622,11 @@ sub handle_save_or_undo { sub analyze_header { my ($request) = @_; - my $bodytag=&Apache::loncommon::bodytag(undef,undef,undef, - ($env{'environment.remote'} ne 'off')); - 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, + {'only_body' => ($env{'environment.remote'} ne 'off'),}); + $result .= + &Apache::lonxml::message_location().'
'. &Apache::structuretags::remember_problem_state().' @@ -639,8 +643,7 @@ sub analyze_header { sub analyze_footer { my ($request) = @_; - my $result=''; - $request->print($result); + $request->print(&Apache::loncommon::end_page()); $request->rflush(); } @@ -751,13 +754,13 @@ sub editxmlmode { if ($cols > 80) { $cols = 80; } if ($cols < 70) { $cols = 70; } if ($rows < 20) { $rows = 20; } - my $bodytag=&Apache::loncommon::bodytag(undef,undef,undef, - ($env{'environment.remote'} ne 'off')); - my $html=&Apache::lonxml::xmlbegin(); - my $head="EditXML $file". - &Apache::edit::js_change_detection().""; + my $start_page = + &Apache::loncommon::start_page("EditXML $file", + &Apache::edit::js_change_detection(), + {'only_body' => + ($env{'environment.remote'} ne 'off')}); - $result.=$html.$head.$bodytag. + $result.=$start_page. &renderpage($request,$file,['no_output_web'],1). &Apache::lonxml::message_location().'
-
'; + '.&Apache::loncommon::end_page(); &Apache::lonxml::add_messages(\$result); $request->print($result); } @@ -933,7 +936,7 @@ ENDNEWPROBLEM $request->print(""); } $request->print("
"); - $request->print("

"); + $request->print("

".&Apache::loncommon::end_page()); } return ''; } @@ -988,15 +991,6 @@ sub handler { &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'}, @@ -1025,7 +1019,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;