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

Diff for /loncom/homework/bridgetask.pm between versions 1.207 and 1.208

version 1.207, 2006/11/14 23:04:56 version 1.208, 2006/11/27 20:42:42
Line 380  sub nest { Line 380  sub nest {
     }      }
 }  }
   
   sub start_delay {
       push(@delay,1);
   }
   sub end_delay {
       pop(@delay);
   }
   
 sub nested_parse {  sub nested_parse {
     my ($str,$env,$args) = @_;      my ($str,$env,$args) = @_;
     my @old_env = @Apache::scripttag::parser_env;      my @old_env = @Apache::scripttag::parser_env;
Line 791  sub start_Task { Line 798  sub start_Task {
  if ($target eq 'webgrade') {   if ($target eq 'webgrade') {
     $result.="\n".'<div id="LC_GRADING_criterialist">';      $result.="\n".'<div id="LC_GRADING_criterialist">';
     &Apache::lonxml::startredirection();      &Apache::lonxml::startredirection();
       &start_delay();
       $dimension{$top}{'result'}=$result;
       undef($result);
  }   }
     } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
  $result.=$form_tag_start.   $result.=$form_tag_start.
Line 1257  DONEBUTTON Line 1267  DONEBUTTON
     &Apache::structuretags::finalize_storage();      &Apache::structuretags::finalize_storage();
  }   }
     } elsif ($target eq 'webgrade') {      } elsif ($target eq 'webgrade') {
  $result.=&Apache::lonxml::endredirection();   if (&nest()) {
       &Apache::lonxml::endredirection();
       &end_delay();
       $result.=$dimension{$top}{'result'};
    } else {
       $result.=&Apache::lonxml::endredirection();
    }
  my $dim = $top;   my $dim = $top;
  foreach my $id (@{$dimension{$dim}{'criterias'}} ) {   foreach my $id (@{$dimension{$dim}{'criterias'}} ) {
     my $type = $dimension{$dim}{'criteria.'.$id.'.type'};      my $type = $dimension{$dim}{'criteria.'.$id.'.type'};
Line 2101  sub start_Dimension { Line 2117  sub start_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);
  push(@{$dimension{$top}{'criterias'}},$dim);   push(@{$dimension{$top}{'criterias'}},$dim);
    $dimension{$dim}{'nested'}=$top;
     }      }
     push(@Apache::bridgetask::dimension,$dim);      push(@Apache::bridgetask::dimension,$dim);
     &Apache::lonxml::startredirection();      &Apache::lonxml::startredirection();
Line 2606  sub start_Criteria { Line 2623  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') {
     if ($target eq 'webgrade' && $dim ne 'top') {      if ($target eq 'webgrade') {
  &Apache::lonxml::debug(" for $dim $id stashing results into $dim ");   &Apache::lonxml::debug(" for $dim $id stashing results into $dim ");
  $dimension{$dim}{'result'} .= &internal_location($id);   $dimension{$dim}{'result'} .= &internal_location($id);
     } else {      } else {
Removed from v.1.207  
changed lines
  Added in v.1.208

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