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

Diff for /loncom/homework/bridgetask.pm between versions 1.202 and 1.206

version 1.202, 2006/11/13 21:23:19 version 1.206, 2006/11/14 22:55:19
Line 2104  sub start_Dimension { Line 2104  sub start_Dimension {
     }      }
     push(@Apache::bridgetask::dimension,$dim);      push(@Apache::bridgetask::dimension,$dim);
     &Apache::lonxml::startredirection();      &Apache::lonxml::startredirection();
     &enable_dimension_parsing($dim);      if (!&skip_dimension_parsing($dim)) {
     return &internal_location($dim);   &enable_dimension_parsing($dim);
       }
   #    return &internal_location($dim);
 }  }
   
 sub start_QuestionText {  sub start_QuestionText {
Line 2193  sub end_Dimension { Line 2195  sub end_Dimension {
     my $instance=&get_instance($dim);      my $instance=&get_instance($dim);
     my $version=&get_version();      my $version=&get_version();
     if ($target eq 'web') {      if ($target eq 'web') {
  $result .= "\n".'<div class="LC_question">'."\n";  
  $result .= &nested_parse(\$dimension{$dim}{'intro'},[@_]);   $result .= &nested_parse(\$dimension{$dim}{'intro'},[@_]);
  my @instances = $instance;   my @instances = $instance;
  if (&Apache::response::showallfoils()) {   if (&Apache::response::showallfoils()) {
Line 2230  sub end_Dimension { Line 2231  sub end_Dimension {
  my $question = ('sub' x $dimension{$dim}{'depth'}).'question';   my $question = ('sub' x $dimension{$dim}{'depth'}).'question';
  $question =~ s/^(.)/uc($1)/e;   $question =~ s/^(.)/uc($1)/e;
  if ($dim_status eq 'pass') {   if ($dim_status eq 'pass') {
     $dim_info.='<h3>'.$question.' : you passed the above'.$mandatory.' question</h3>';      $dim_info.='<h3>'.$question.' : you passed the above '.$mandatory.' question</h3>';
  }   }
  if ($dim_status eq 'fail') {   if ($dim_status eq 'fail') {
     $dim_info.='<h3>'.$question.' : you did not pass the above '.$mandatory.' question</h3>';      $dim_info.='<h3>'.$question.' : you did not pass the above '.$mandatory.' question</h3>';
Line 2247  sub end_Dimension { Line 2248  sub end_Dimension {
  @{$dimension{$dim}{'criterias'}}) {   @{$dimension{$dim}{'criterias'}}) {
     my $type = $dimension{$dim}{'criteria.'.$id.'.type'};      my $type = $dimension{$dim}{'criteria.'.$id.'.type'};
     if ($type eq 'dimension') {      if ($type eq 'dimension') {
  $result.=$dimension{$id}{'result'};   if (defined($dimension{$id}{'result'})) {
  next;      $result.=$dimension{$id}{'result'};
       next;
    } else {
       $dim_info .=
    &nested_parse(\$dimension{$dim}{'criteria.'.$id},
         [@_],{'set_dim_id' => $id});
    }
       } else {
    my $criteria =
       &nested_parse(\$dimension{$dim}{'criteria.'.$id},
     [@_]);
    $dim_info .= &layout_web_Criteria($dim,$id,$criteria);
     }      }
     my $criteria =   
  &nested_parse(\$dimension{$dim}{'criteria.'.$id},  
       [@_]);  
     $dim_info .= &layout_web_Criteria($dim,$id,$criteria);  
  }   }
  # puts the results at the end of the dimension   # puts the results at the end of the dimension
  $result .= $dim_info;   $result .= $dim_info;
Line 2263  sub end_Dimension { Line 2271  sub end_Dimension {
  # $result=~s/\Q$internal_location\E/$dim_info/;   # $result=~s/\Q$internal_location\E/$dim_info/;
     }      }
  }   }
  $result .= "\n</div>\n";   if ($result !~ /^\s*$/s) {
       $result = "\n".'<div class="LC_question">'.
    "\n".$result."\n</div>\n";
    }
     } elsif ($target eq 'webgrade') {      } elsif ($target eq 'webgrade') {
  # in case of any side effects that we need   # in case of any side effects that we need
  &nested_parse(\$dimension{$dim}{'intro'},[@_]);   &nested_parse(\$dimension{$dim}{'intro'},[@_]);
Line 2600  sub start_Criteria { Line 2611  sub start_Criteria {
  $dimension{$dim}{'result'} .= &internal_location($id);   $dimension{$dim}{'result'} .= &internal_location($id);
     } else {      } else {
  &Apache::lonxml::debug(" not stashing $dim $id");   &Apache::lonxml::debug(" not stashing $dim $id");
  $result .= &internal_location($id);   #$result .= &internal_location($id);
     }      }
  }   }
  &Apache::lonxml::debug("Criteria $id with $dim");   &Apache::lonxml::debug("Criteria $id with $dim");
Line 2638  sub layout_web_Criteria { Line 2649  sub layout_web_Criteria {
     $status_display=~s/^([a-z])/uc($1)/e;      $status_display=~s/^([a-z])/uc($1)/e;
     my $criteria_info.=      my $criteria_info.=
  '<div class="LC_'.$status.' LC_criteria">'."\n\t".'<h4>'   '<div class="LC_'.$status.' LC_criteria">'."\n\t".'<h4>'
  .$mandatory.' Criteria</h4>'."\n\t".'<p class="LC_criteria_text>'."\n";   .$mandatory.' Criteria</h4>'."\n\t".'<p class="LC_criteria_text">'
    ."\n";
     $criteria =~ s/^\s*//s;      $criteria =~ s/^\s*//s;
     $criteria =~ s/\s*$//s;      $criteria =~ s/\s*$//s;
     $criteria_info.= $criteria;      $criteria_info.= $criteria;
Removed from v.1.202  
changed lines
  Added in v.1.206

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