--- loncom/homework/lonhomework.pm	2006/02/16 01:25:33	1.233.2.1
+++ loncom/homework/lonhomework.pm	2006/03/24 17:34:11	1.237
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Homework handler
 #
-# $Id: lonhomework.pm,v 1.233.2.1 2006/02/16 01:25:33 albertel Exp $
+# $Id: lonhomework.pm,v 1.237 2006/03/24 17:34:11 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('<form name='.$env{'form.request.prefix'}.'lonhomework method="POST" action="'.$request->uri.'">');
-}
-
 sub createmenu {
     my ($which,$request)=@_;
     if ($which eq 'grade') {
@@ -159,12 +153,6 @@ sub createmenu {
     }
 }
 
-sub send_footer {
-    my ($request)= @_;
-#  $request->print('</form>');
-    $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 ) {
 
@@ -649,8 +644,7 @@ sub analyze_header {
 
 sub analyze_footer {
     my ($request) = @_;
-    my $result='</body></html>';
-    $request->print($result);
+    $request->print(&Apache::loncommon::end_page());
     $request->rflush();
 }
 
@@ -998,15 +992,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'},
@@ -1035,7 +1020,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;