--- loncom/homework/structuretags.pm	2012/03/25 14:35:58	1.501
+++ loncom/homework/structuretags.pm	2012/04/05 09:49:51	1.503
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.501 2012/03/25 14:35:58 foxr Exp $
+# $Id: structuretags.pm,v 1.503 2012/04/05 09:49:51 foxr Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1181,7 +1181,7 @@ sub start_problem {
 	}
 	my $resource_due =  &Apache::lonhomework::due_date(0, $env{'request.symb'});
 	my $time_left = $resource_due - time();
-	if ($resource_due && ($time_left > 0)) {
+	if ($resource_due && ($time_left > 0) && ($target eq 'web')) {
 	    $result .= &Apache::lonhtmlcommon::set_due_date($resource_due);
 	}
 
@@ -1541,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;
 }