Diff for /loncom/homework/structuretags.pm between versions 1.19 and 1.22

version 1.19, 2000/12/04 21:51:30 version 1.22, 2000/12/15 20:31:30
Line 43  sub start_problem { Line 43  sub start_problem {
 #adeed vars to the scripting enviroment  #adeed vars to the scripting enviroment
   my $expression='$external::part='.$Apache::inputtags::part.';';    my $expression='$external::part='.$Apache::inputtags::part.';';
   &Apache::run::run($expression,$safeeval);    &Apache::run::run($expression,$safeeval);
     my $status;
     my $datemsg;
     if ($target ne 'meta') {
       ($status,$datemsg) = &Apache::lonhomework::check_date('0');
       push (@Apache::inputtags::status,$status);
       if ( $status eq 'CLOSED' ) {
         my $bodytext=&Apache::lonxml::get_all_text("/problem",$$parser[$#$parser]);
         if ( $target eq "web" ) {
    return "Problem is not open to be viewed. The problem $datemsg";
         }
       } 
     }
   if ($target eq 'web') {    if ($target eq 'web') {
     # create a page header and exit  
     my $args ='';      my $args ='';
     if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }      if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }
     my $name = &Apache::run::run("{$args;".'return $name}',$safeeval);      my $name = &Apache::run::run("{$args;".'return $name}',$safeeval);
     return "<title>$name</title>\n<body bgcolor=#FFFFFF>\n<form name=\"lonhomework\" method=\"POST\" action=\"".$ENV{'request.uri'}."\">";      if ($status eq 'CAN_ANSWER') {
   }         # create a page header and exit
         return "<title>$name</title>\n<body bgcolor=#FFFFFF>\n<form name=\"lonhomework\" method=\"POST\" action=\"".$ENV{'request.uri'}."\">";
       } elsif ($status eq 'SHOW_ANSWER') {
         return "<title>$name</title>\n<body bgcolor=#FFFFFF>\n";
       }
     }
   return '';    return '';
 }  }
   
 sub end_problem {  sub end_problem {
   my ($target,$token,$parstack,$parser,$safeeval)=@_;    my ($target,$token,$parstack,$parser,$safeeval)=@_;
   my $result='';    my $result='';
     my $status=@Apache::inputtags::status['-1'];
   unless ($target eq 'meta') {    unless ($target eq 'meta') {
     if ( $target eq 'grade' && $Apache::inputtags::part eq '0') {      if ( $target eq 'grade' && $Apache::inputtags::part eq '0') {
       # if part is zero, no <part>s existed, so we need to the grading        # if part is zero, no <part>s existed, so we need to the grading
Line 64  sub end_problem { Line 80  sub end_problem {
     } elsif ($Apache::inputtags::part eq '0') {      } elsif ($Apache::inputtags::part eq '0') {
       # if part is zero, no <part>s existed, so we need show the current         # if part is zero, no <part>s existed, so we need show the current 
       # grading status        # grading status
       $result.= &Apache::inputtags::gradestatus;        $result.= &Apache::inputtags::gradestatus($Apache::inputtags::part);
     }       } 
     if ($target eq 'web') { $result.="</form></body>\n"; }      if ($target eq 'web') { 
         if ($status eq 'CAN_ANSWER') {
    $result.="</form></body>\n"; 
         } elsif ($status eq 'SHOW_ANSWER') {
    $result.="</body>\n"; 
         } 
       }
   } else {    } else {
     if ($Apache::inputtags::part eq '0') {      if ($Apache::inputtags::part eq '0') {
       $result=&Apache::response::mandatory_part_meta;        $result=&Apache::response::mandatory_part_meta;
Line 187  sub start_part { Line 209  sub start_part {
   @Apache::inputtags::responselist = ();    @Apache::inputtags::responselist = ();
   if ($target eq 'meta') {    if ($target eq 'meta') {
     return &Apache::response::mandatory_part_meta;      return &Apache::response::mandatory_part_meta;
     } else {
       my ($date,$passed) = &Apache::lonhomework::check_date("OPEN_DATE",$id);
       if ( !$passed ) {
         my $bodytext=&Apache::lonxml::get_all_text("/part",$$parser[$#$parser]);
         if ( $target eq "web" ) {
    return "Part is not open to be viewed. It opens on $date";
         }
       }
   }    }
   return '';    return '';
 }  }
Line 196  sub end_part { Line 226  sub end_part {
   &Apache::lonxml::debug("in end_part $target ");    &Apache::lonxml::debug("in end_part $target ");
   if ( $target eq 'meta' ) { return ''; }    if ( $target eq 'meta' ) { return ''; }
   if ( $target eq 'grade' ) { return &Apaceh::inputtags::grade; }    if ( $target eq 'grade' ) { return &Apaceh::inputtags::grade; }
   return &Apache::inputtags::gradestatus;    return &Apache::inputtags::gradestatus($Apache::inputtags::part);
 }  }
   
 1;  1;

Removed from v.1.19  
changed lines
  Added in v.1.22


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