--- loncom/homework/lonhomework.pm 2006/02/16 01:24:39 1.235 +++ loncom/homework/lonhomework.pm 2006/04/11 21:08:29 1.239 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # The LON-CAPA Homework handler # -# $Id: lonhomework.pm,v 1.235 2006/02/16 01:24:39 albertel Exp $ +# $Id: lonhomework.pm,v 1.239 2006/04/11 21:08:29 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'}); @@ -315,6 +303,13 @@ sub check_slot_access { &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 ) { @@ -627,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().' @@ -649,8 +643,7 @@ sub analyze_header { sub analyze_footer { my ($request) = @_; - my $result=''; - $request->print($result); + $request->print(&Apache::loncommon::end_page()); $request->rflush(); } @@ -761,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); } @@ -943,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]; @@ -1004,7 +978,6 @@ sub handler { ['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') || @@ -1026,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;