[LON-CAPA-cvs] cvs: loncom /homework bridgetask.pm

albertel lon-capa-cvs@mail.lon-capa.org
Thu, 09 Nov 2006 20:20:19 -0000


albertel		Thu Nov  9 15:20:19 2006 EDT

  Modified files:              
    /loncom/homework	bridgetask.pm 
  Log:
  - making the task and question have the same status
  
  
  
Index: loncom/homework/bridgetask.pm
diff -u loncom/homework/bridgetask.pm:1.197 loncom/homework/bridgetask.pm:1.198
--- loncom/homework/bridgetask.pm:1.197	Thu Nov  9 12:50:51 2006
+++ loncom/homework/bridgetask.pm	Thu Nov  9 15:20:18 2006
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: bridgetask.pm,v 1.197 2006/11/09 17:50:51 albertel Exp $
+# $Id: bridgetask.pm,v 1.198 2006/11/09 20:20:18 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1055,10 +1055,8 @@
 		    my %counts = &get_counts($dim,undef,$parstack,
 					     $safeeval);
 		    $status.="\n<div class='LC_$bt_status LC_criteria LC_task_overall_status'><p>".
-			&mt('You needed to pass all of the [_1] mandatory components and [_2] of the [_3] optional components, of which you passed [_4].',
-			    $counts{'man'},$counts{'opt_req'},
-			    $counts{'opt'},$counts{'opt_passed'}).
-			    "</p></div>\n";
+			&question_status_message(\%counts,-1).
+			"</p></div>\n";
 		    
 
 		    foreach my $id (@{$dimension{$dim}{'criterias'}}) {
@@ -2351,7 +2349,7 @@
     return $result;
 }
 
-sub status_message {
+sub question_status_message {
     my ($counts,$depth) = @_;
     my %req  = ('man' => 'mandatory',
 		'opt' => 'optional',);