--- loncom/homework/outputtags.pm	2002/10/16 19:21:32	1.20
+++ loncom/homework/outputtags.pm	2003/01/13 21:23:06	1.25
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # tags that create controlled output
 #
-# $Id: outputtags.pm,v 1.20 2002/10/16 19:21:32 albertel Exp $
+# $Id: outputtags.pm,v 1.25 2003/01/13 21:23:06 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -33,7 +33,7 @@ use Apache::lonnet;
 use POSIX qw(strftime);
 
 BEGIN {
-    &Apache::lonxml::register('Apache::outputtags',('displayduedate','displaytitle'));
+    &Apache::lonxml::register('Apache::outputtags',('displayduedate','displaytitle','displayweight'));
 }
 
 sub initialize_outputtags {
@@ -51,21 +51,20 @@ sub start_displayduedate {
     my $status=$Apache::inputtags::status['-1'];
     &Apache::lonxml::debug("got a $status in duedatebox");
     if (($status =~ /CAN.*_ANSWER/) && ($target eq 'web')) {
-	my $format = &Apache::lonxml::get_param('format',$parstack,$safeeval);
-	if ($format eq '') {
-	    &Apache::lonxml::debug("using default format");
-	    $format="%c";
-	}
+#	my $format = &Apache::lonxml::get_param('format',$parstack,$safeeval);
+#	if ($format eq '') {
+#	    &Apache::lonxml::debug("using default format");
+#	    $format="%c";
+#	}
 	my $id = $Apache::inputtags::part;
 	my $date = &Apache::lonnet::EXT("resource.$id.duedate");
 	&Apache::lonxml::debug("duedatebox found $date for $id");
-	if ($date) {
-	    $result ='<table border="on"><tr><td>Due at '.
-		POSIX::strftime($format,localtime($date)).
-			'</td></tr></table>';
-	} else {
-	    $result ='<table border="on"><tr><td>No due date set.</td></tr></table>';
-	}
+	$result ='<table border="on"><tr><td>Due '.
+	    &Apache::lonnavmaps::timeToHumanString($date).
+		'</td></tr></table>';
+#        } else {
+#	    $result ='<table border="on"><tr><td>No due date set.</td></tr></table>';
+#	}
     } elsif ( $target eq 'edit' ) {
 	$result=&Apache::edit::tag_start($target,$token);
 	$result.='</td></tr>';
@@ -84,10 +83,10 @@ sub end_displayduedate {
 sub start_displaytitle {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $result='';
-    if (exists($Apache::outputtags::showonce{'displayduedate'})) {
+    if (exists($Apache::outputtags::showonce{'displayduetitle'})) {
 	return '';
     } else {
-	$Apache::outputtags::showonce{'displayduedate'}=1;
+	$Apache::outputtags::showonce{'displayduetitle'}=1;
     }
     if ($target eq 'web') {
 	$result="<h1>$Apache::lonhomework::name</h1>";
@@ -95,7 +94,7 @@ sub start_displaytitle {
 	$result=&Apache::edit::tag_start($target,$token);
 	$result.='</td></tr>';
 	$result.=&Apache::edit::end_table();
-    } elsif ($target eq 'tex') {
+    } elsif ($target eq 'tex' and $Apache::lonhomework::type ne 'exam') {
 	$Apache::lonhomework::name=~s/%/\%/g;
 	$Apache::lonhomework::name=~s/&/\&/g;
 	$result='\vskip 0 mm\noindent\textbf{'.$Apache::lonhomework::name.'}\vskip 0 mm';
@@ -107,6 +106,36 @@ sub end_displaytitle {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my @result;
     if ($target eq 'edit') { $result[1]='no'; }
+    return @result;
+}
+
+sub start_displayweight {
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+    my $result;
+    if (exists($Apache::outputtags::showonce{'displayweight'})) {
+	return '';
+    } else {
+	$Apache::outputtags::showonce{'displayweight'}=1;
+    }
+    my $status=$Apache::inputtags::status['-1'];
+    if ($target eq 'web' || $target eq 'tex') {
+	my $id = $Apache::inputtags::part;
+	my $weight = &Apache::lonnet::EXT("resource.$id.weight");
+	&Apache::lonxml::debug("duedatebox found $weight for $id");
+	if (!defined($weight) || ($weight eq '')) { $weight=1; }
+	$result.=$weight;
+    } elsif ( $target eq 'edit' ) {
+	$result=&Apache::edit::tag_start($target,$token);
+	$result.='</td></tr>';
+	$result.=&Apache::edit::end_table();
+    }
+    return $result;
+}
+
+sub end_displayweight {
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+    my @result;
+    if ($target eq 'edit') { $result[1]='no'; }
     return @result;
 }