--- loncom/interface/lonnavmaps.pm 2007/11/20 17:53:46 1.406 +++ loncom/interface/lonnavmaps.pm 2008/01/03 22:49:56 1.407 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Navigate Maps Handler # -# $Id: lonnavmaps.pm,v 1.406 2007/11/20 17:53:46 albertel Exp $ +# $Id: lonnavmaps.pm,v 1.407 2008/01/03 22:49:56 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -187,6 +187,10 @@ sub getDescription { my $part = shift; my $status = $res->status($part); + my $open = $res->opendate($part); + my $due = $res->duedate($part); + my $answer = $res->answerdate($part); + if ($status == $res->NETWORK_FAILURE) { return &mt("Having technical difficulties; please check status later"); } @@ -194,27 +198,27 @@ sub getDescription { return &mt("Not currently assigned."); } if ($status == $res->OPEN_LATER) { - return "Open " . timeToHumanString($res->opendate($part),'start'); + return "Open " .timeToHumanString($open,'start'); } if ($status == $res->OPEN) { - if ($res->duedate($part)) { + if ($due) { if ($res->is_practice()) { - return &mt("Closes ")." " .timeToHumanString($res->duedate($part),'start'); + return &mt("Closes ")." " .timeToHumanString($due,'start'); } else { - return &mt("Due")." " .timeToHumanString($res->duedate($part),'end'); + return &mt("Due")." " .timeToHumanString($due,'end'); } } else { return &mt("Open, no due date"); } } if ($status == $res->PAST_DUE_ANSWER_LATER) { - return &mt("Answer open")." " . timeToHumanString($res->answerdate($part),'start'); + return &mt("Answer open")." " .timeToHumanString($answer,'start'); } if ($status == $res->PAST_DUE_NO_ANSWER) { if ($res->is_practice()) { - return &mt("Closed")." " . timeToHumanString($res->duedate($part),'start'); + return &mt("Closed")." " . timeToHumanString($due,'start'); } else { - return &mt("Was due")." " . timeToHumanString($res->duedate($part),'end'); + return &mt("Was due")." " . timeToHumanString($due,'end'); } } if (($status == $res->ANSWER_OPEN || $status == $res->PARTIALLY_CORRECT) @@ -237,8 +241,8 @@ sub getDescription { $triesString = "$triesString"; } } - if ($res->duedate($part)) { - return &mt("Due")." " . timeToHumanString($res->duedate($part),'end') . + if ($due) { + return &mt("Due")." " . timeToHumanString($due,'end') . " $triesString"; } else { return &mt("No due date")." $triesString";