[LON-CAPA-cvs] cvs: loncom /homework inputtags.pm /interface loncommon.pm
www
www@source.lon-capa.org
Mon, 06 Jun 2011 22:20:52 -0000
www Mon Jun 6 22:20:52 2011 EDT
Modified files:
/loncom/homework inputtags.pm
/loncom/interface loncommon.pm
Log:
Bug #6476: hinttries and duedate
Index: loncom/homework/inputtags.pm
diff -u loncom/homework/inputtags.pm:1.288 loncom/homework/inputtags.pm:1.289
--- loncom/homework/inputtags.pm:1.288 Mon Jun 6 21:25:54 2011
+++ loncom/homework/inputtags.pm Mon Jun 6 22:20:46 2011
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# input definitons
#
-# $Id: inputtags.pm,v 1.288 2011/06/06 21:25:54 www Exp $
+# $Id: inputtags.pm,v 1.289 2011/06/06 22:20:46 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1321,6 +1321,8 @@
&Apache::response::add_to_gradingqueue();
}
$Apache::lonhomework::results{"resource.$id.type"} = $Apache::lonhomework::type;
+ $Apache::lonhomework::results{"resource.$id.duedate"} = &Apache::lonnet::EXT("resource.$id.duedate");
+ $Apache::lonhomework::results{"resource.$id.hinttries"} = &Apache::lonnet::EXT("resource.$id.hinttries");
}
sub find_which_previous {
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.1010 loncom/interface/loncommon.pm:1.1011
--- loncom/interface/loncommon.pm:1.1010 Mon Jun 6 21:25:59 2011
+++ loncom/interface/loncommon.pm Mon Jun 6 22:20:52 2011
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common routines
#
-# $Id: loncommon.pm,v 1.1010 2011/06/06 21:25:59 www Exp $
+# $Id: loncommon.pm,v 1.1011 2011/06/06 22:20:52 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -3585,7 +3585,7 @@
sub format_previous_attempt_value {
my ($key,$value) = @_;
- if ($key =~ /timestamp/) {
+ if (($key =~ /timestamp/) || ($key=~/duedate/)) {
$value = &Apache::lonlocal::locallocaltime($value);
} elsif (ref($value) eq 'ARRAY') {
$value = '('.join(', ', @{ $value }).')';