--- loncom/homework/structuretags.pm	2011/12/27 20:13:22	1.500
+++ loncom/homework/structuretags.pm	2012/04/04 10:48:30	1.502
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.500 2011/12/27 20:13:22 foxr Exp $
+# $Id: structuretags.pm,v 1.502 2012/04/04 10:48:30 foxr Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1179,7 +1179,13 @@ sub start_problem {
 	    my @interval=&Apache::lonnet::EXT("resource.0.interval");
 	    &Apache::lonnet::set_first_access($interval[1]);
 	}
+	my $resource_due =  &Apache::lonhomework::due_date(0, $env{'request.symb'});
+	my $time_left = $resource_due - time();
+	if ($resource_due && ($time_left > 0)) {
+	    $result .= &Apache::lonhtmlcommon::set_due_date($resource_due);
+	}
 
+	    
         ($status,$accessmsg,my $slot_name,my $slot) =
             &Apache::lonhomework::check_slot_access('0','problem');
         push (@Apache::inputtags::status,$status);
@@ -1535,6 +1541,14 @@ sub end_problem {
 
     &reset_problem_globals('problem');
 
+    #
+    # This shouild be just above the return so that the
+    # time put in the javascript is as late as possible in the
+    # computation:
+    #
+    if ($target eq 'web') {
+        $result .= &Apache::lonhtmlcommon::set_compute_end_time();
+    }
     return $result;
 }