--- loncom/homework/bridgetask.pm 2005/09/21 21:54:20 1.52 +++ loncom/homework/bridgetask.pm 2005/09/22 22:25:35 1.53 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: bridgetask.pm,v 1.52 2005/09/21 21:54:20 albertel Exp $ +# $Id: bridgetask.pm,v 1.53 2005/09/22 22:25:35 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -204,6 +204,67 @@ sub preserve_grade_info { return $result; } +sub style { + return (< +STYLE + +} + sub start_Task { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; @@ -291,7 +352,7 @@ sub start_Task { } elsif ($target eq 'web') { my $name= &Apache::structuretags::get_resource_name($parstack,$safeeval); $result.="$head_tag_start
'; + my $mandatory=($dimension{$instance.'.criteria.'.$id.'.mandatory'} ne 'N'); + if ($mandatory) { + $mandatory='Mandatory'; + } else { + $mandatory='Optional'; + } if ($status eq 'fail') { - $result.=''.&mt('Did not pass').''; } elsif ($status eq 'pass') { - $result.=''.&mt('Passed').''; } else { &Apache::lonxml::error("Student viewing a graded bridgetask was shown a status of $status"); } - $result.=' |
';
+ my $status_display=$status;
+ $status_display=~s/^([a-z])/uc($1)/e;
+ $result.=''.$mandatory. + ' Criteria'. + $dimension{$instance.'.criteria.'.$id}. + ' '.$status_display.' '; if ($Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"}) { - $result.=&mt('Comment from grader: ').$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"}.' |
';
+ $result.=' '.$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"}.' '; } - $result.=$dimension{$instance.'.criteria.'.$id}. - ' |