[BACK]Return to bridgetask.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / homework

Diff for /loncom/homework/bridgetask.pm between versions 1.194 and 1.196

version 1.194, 2006/11/07 19:43:37 version 1.196, 2006/11/07 21:31:22
Line 2097  sub start_Dimension { Line 2097  sub start_Dimension {
     &Apache::lonxml::get_param('Mandatory',$parstack,$safeeval);      &Apache::lonxml::get_param('Mandatory',$parstack,$safeeval);
  push(@{$dimension{$previous_dim}{'criterias'}},$dim);   push(@{$dimension{$previous_dim}{'criterias'}},$dim);
  $dimension{$dim}{'nested'}=$previous_dim;   $dimension{$dim}{'nested'}=$previous_dim;
    $dimension{$dim}{'depth'} = 1 + $dimension{$previous_dim}{'depth'};
  &Apache::lonxml::debug("adding $dim as criteria to $previous_dim");   &Apache::lonxml::debug("adding $dim as criteria to $previous_dim");
     } else {      } else {
    $dimension{$top}{'depth'}=0;
  $dimension{$top}{'criteria.'.$dim.'.type'}='dimension';   $dimension{$top}{'criteria.'.$dim.'.type'}='dimension';
  $dimension{$top}{'criteria.'.$dim.'.mandatory'}=   $dimension{$top}{'criteria.'.$dim.'.mandatory'}=
     &Apache::lonxml::get_param('Mandatory',$parstack,$safeeval);      &Apache::lonxml::get_param('Mandatory',$parstack,$safeeval);
Line 2227  sub end_Dimension { Line 2229  sub end_Dimension {
     $mandatory='Optional';      $mandatory='Optional';
  }   }
  my $dim_info="<div class='LC_$dim_status LC_question_grade'>\n";   my $dim_info="<div class='LC_$dim_status LC_question_grade'>\n";
    my $question = ('sub' x $dimension{$dim}{'depth'}).'question';
    my $ucquestion = $question;
    $ucquestion =~ s/^(.)/uc($1)/e;
  if ($dim_status eq 'pass') {   if ($dim_status eq 'pass') {
     $dim_info.='<h3>Question : you passed this '.$mandatory.' question</h3>';      $dim_info.='<h3>'.$ucquestion.' : you passed this '.$mandatory.' '.$question.'</h3>';
  }   }
  if ($dim_status eq 'fail') {   if ($dim_status eq 'fail') {
     $dim_info.='<h3>Question : you did not pass this '.$mandatory.' question</h3>';      $dim_info.='<h3>'.$ucquestion.' : you did not pass this '.$mandatory.' '.$question.'</h3>';
  }   }
  my $man_count=0;   my $man_count=0;
  my $man_passed=0;   my $man_passed=0;
Line 2284  sub end_Dimension { Line 2289  sub end_Dimension {
  $result.=   $result.=
     &nested_parse(\$dimension{$dim}{'questiontext'},[@_],      &nested_parse(\$dimension{$dim}{'questiontext'},[@_],
   {'set_dim_id'          => undef,    {'set_dim_id'          => undef,
    'delayed_dim_results' => 0});     'delayed_dim_results' => 1});
  foreach my $id (@{$dimension{$dim}{$instance.'.criterias'}},   foreach my $id (@{$dimension{$dim}{$instance.'.criterias'}},
  @{$dimension{$dim}{'criterias'}} ) {   @{$dimension{$dim}{'criterias'}} ) {
     my $type = $dimension{$dim}{'criteria.'.$id.'.type'};      my $type = $dimension{$dim}{'criteria.'.$id.'.type'};
Line 2518  sub start_Criteria { Line 2523  sub start_Criteria {
  my $dim = &get_dim_id();   my $dim = &get_dim_id();
  my $id=&get_id($parstack,$safeeval);   my $id=&get_id($parstack,$safeeval);
  if ($target eq 'web' || $target eq 'webgrade') {   if ($target eq 'web' || $target eq 'webgrade') {
     $result .= &internal_location($id);      if ($target eq 'webgrade' && $dim ne 'top') {
    &Apache::lonxml::debug(" for $dim $id stashing results into $dim ");
    $dimension{$dim}{'result'} .= &internal_location($id);
       } else {
    &Apache::lonxml::debug(" not stashing $dim $id");
    $result .= &internal_location($id);
       }
  }   }
  &Apache::lonxml::debug("Criteria $id with $dim");   &Apache::lonxml::debug("Criteria $id with $dim");
  if (&Apache::londefdef::is_inside_of($tagstack,'Instance')) {   if (&Apache::londefdef::is_inside_of($tagstack,'Instance')) {
Removed from v.1.194  
changed lines
  Added in v.1.196

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>