--- loncom/homework/lonhomework.pm 2005/12/15 23:27:22 1.229 +++ loncom/homework/lonhomework.pm 2006/05/09 19:03:02 1.243 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # The LON-CAPA Homework handler # -# $Id: lonhomework.pm,v 1.229 2005/12/15 23:27:22 albertel Exp $ +# $Id: lonhomework.pm,v 1.243 2006/05/09 19:03:02 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,20 +153,14 @@ 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'}); my $key; if ($type eq 'Task') { - my $version=$Apache::lonhomework::history{'resource.version'}; - $key ="resource.$version.checkedin"; + my $version=$Apache::lonhomework::history{'resource.0.version'}; + $key ="resource.$version.0.checkedin"; } elsif ($type eq 'problem') { $key ='resource.0.checkedin'; } @@ -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/\*//; @@ -244,7 +234,7 @@ sub check_slot_access { my ($status,$datemsg)=&check_access($id); my $useslots = &Apache::lonnet::EXT("resource.$id.useslots"); - if ($useslots ne 'resource') { + if ($useslots ne 'resource' && $useslots ne 'sequence') { return ($status,$datemsg); } @@ -260,8 +250,8 @@ sub check_slot_access { if ($type eq 'Task') { my $version=$Apache::lonhomework::history{'resource.version'}; - if ($Apache::lonhomework::history{"resource.$version.checkedin"} && - $Apache::lonhomework::history{"resource.$version.status"} eq 'pass') { + if ($Apache::lonhomework::history{"resource.$version.0.checkedin"} && + $Apache::lonhomework::history{"resource.$version.0.status"} eq 'pass') { return ('SHOW_ANSWER'); } } @@ -276,6 +266,7 @@ sub check_slot_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); @@ -295,28 +286,45 @@ sub check_slot_access { $slotstatus='CAN_ANSWER'; } - my ($pass_status,$checkedin); + my ($is_correct,$got_grade,$checkedin); if ($type eq 'Task') { - my $version=$Apache::lonhomework::history{'resource.version'}; - $pass_status = - $Apache::lonhomework::history{"resource.$version.status"} eq 'fail'; + 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.checkedin"}; + $Apache::lonhomework::history{"resource.$version.0.checkedin"}; } elsif ($type eq 'problem') { - $pass_status = 1; + $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 ($pass_status) { + 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); @@ -616,12 +624,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); + + $result .= + &Apache::lonxml::message_location().'
'. &Apache::structuretags::remember_problem_state().' @@ -638,8 +645,7 @@ sub analyze_header { sub analyze_footer { my ($request) = @_; - my $result=''; - $request->print($result); + $request->print(&Apache::loncommon::end_page()); $request->rflush(); } @@ -750,13 +756,11 @@ 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()); - $result.=$html.$head.$bodytag. + $result.=$start_page. &renderpage($request,$file,['no_output_web'],1). &Apache::lonxml::message_location().' - +
@@ -775,7 +779,7 @@ sub editxmlmode { &HTML::Entities::encode($problem,'<>&"').'
-
'; + '.&Apache::loncommon::end_page(); &Apache::lonxml::add_messages(\$result); $request->print($result); } @@ -907,8 +911,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', @@ -919,7 +923,7 @@ sub newproblem { 'Create' => 'Create', 'button' => 'button'); $request->print(<$lt{'create'} $extension $lt{'resource'} $errormsg $lt{'requested'} $shownurl $lt{'not exist'}. @@ -932,30 +936,11 @@ 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]; @@ -987,22 +972,12 @@ 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'}, ['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') || @@ -1024,7 +999,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;