loncom/homework/structuretags.pm - diff

Return to structuretags.pm CVS log

Up to [LON-CAPA] / loncom / homework

Diff for /loncom/homework/structuretags.pm between versions 1.21 and 1.25

-version 1.21, 2000/12/12 22:35:52
+version 1.25, 2000/12/29 21:54:06
  Line 6  use strict;
  use Apache::lonnet;
  sub BEGIN {
-   &Apache::lonxml::register('Apache::structuretags',('block','while','randomlist','problem','web','tex','part'));
+   &Apache::lonxml::register('Apache::structuretags',('block','while','randomlist','problem','web','tex','part','preduedate','postanswerdate','solved','notsolved'));
  }
  sub start_web {
  Line 43  sub start_problem {
  #adeed vars to the scripting enviroment
    my $expression='$external::part='.$Apache::inputtags::part.';';
    &Apache::run::run($expression,$safeeval);
+   my $status;
+   my $datemsg;
    if ($target ne 'meta') {
-     my ($date,$passed) = &Apache::lonhomework::check_date("OPEN_DATE",'0');
+     ($status,$datemsg) = &Apache::lonhomework::check_date('0');
-     if ( !$passed ) {
+     push (@Apache::inputtags::status,$status);
+     my $expression='$external::datestatus="'.$status.'";';
+     $expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.0.solved"}.'";';
+     &Apache::run::run($expression,$safeeval);
+     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. It opens on $date";
+ 	return "<br></br>Problem is not open to be viewed. The problem $datemsg<br></br>";
        }
      }
    }
    if ($target eq 'web') {
-     # create a page header and exit
      my $args ='';
      if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }
      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 '';
  }
  sub end_problem {
    my ($target,$token,$parstack,$parser,$safeeval)=@_;
    my $result='';
+   my $status=$Apache::inputtags::status['-1'];
    unless ($target eq 'meta') {
      if ( $target eq 'grade' && $Apache::inputtags::part eq '0') {
        # if part is zero, no <part>s existed, so we need to the grading
- Line 74  sub end_problem {
+ Line 85  sub end_problem {
        # grading status
        $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 {
      if ($Apache::inputtags::part eq '0') {
        $result=&Apache::response::mandatory_part_meta;
- Line 91  sub start_block {
+ Line 108  sub start_block {
    $code .=';return $condition;';
  #  print "<br>$code<br>";
    my $result = &Apache::run::run($code,$safeeval);
+   &Apache::lonxml::debug("block :$code: returned :$result:");
    if ( ! $result ) {
- #    my $skip=$$parser[$#$parser]->get_text("/block");
      my $skip=&Apache::lonxml::get_all_text("/block",$$parser[$#$parser]);
- #    print "skipped $skip";
+     &Apache::lonxml::debug("skipping ahead :$skip: $$parser[$#$parser]");
    }
    return "";
  }
- Line 196  sub start_part {
+ Line 213  sub start_part {
    if ($target eq 'meta') {
      return &Apache::response::mandatory_part_meta;
    } else {
-     my ($date,$passed) = &Apache::lonhomework::check_date("OPEN_DATE",$id);
+     my ($status,$datemsg) = &Apache::lonhomework::check_date("OPEN_DATE",$id);
-     if ( !$passed ) {
+     push (@Apache::inputtags::status,$status);
+     my $expression='$external::datestatus="'.$status.'";';
+     $expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.$id.solved"}.'";';
+     &Apache::run::run($expression,$safeeval);
+     if ( $status eq 'CLOSED' ) {
        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 "<br></br>Part is not open to be viewed. It $datemsg<br></br>";
        }
      }
    }
- Line 210  sub start_part {
+ Line 231  sub start_part {
  sub end_part {
    my ($target,$token,$parstack,$parser,$safeeval)=@_;
    &Apache::lonxml::debug("in end_part $target ");
+   pop @Apache::inputtags::status;
    if ( $target eq 'meta' ) { return ''; }
-   if ( $target eq 'grade' ) { return &Apaceh::inputtags::grade; }
+   if ( $target eq 'grade' ) { return &Apache::inputtags::grade; }
    return &Apache::inputtags::gradestatus($Apache::inputtags::part);
  }
+ sub start_preduedate {
+   my ($target,$token,$parstack,$parser,$safeeval)=@_;
+   if ($target ne 'meta') {
+     if ($Apache::inputtags::status['-1'] ne 'CAN_ANSWER') {
+       &Apache::lonxml::get_all_text("/pre_duedate",$$parser[$#$parser]);
+     }
+   }
+   return '';
+ }
+ sub end_preduedate {
+   return '';
+ }
+ sub start_postanswerdate {
+   my ($target,$token,$parstack,$parser,$safeeval)=@_;
+   if ($target ne 'meta') {
+     if ($Apache::inputtags::status['-1'] ne 'SHOW_ANSWER') {
+       &Apache::lonxml::get_all_text("/post_answerdate",$$parser[$#$parser]);
+     }
+   }
+   return '';
+ }
+ sub end_postanswerdate {
+   return '';
+ }
+ sub start_notsolved {
+   my ($target,$token,$parstack,$parser,$safeeval)=@_;
+   if ($target ne 'meta') {
+     my $gradestatus=$Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"};
+     &Apache::lonxml::debug("not solved has :$gradestatus:");
+     if ($gradestatus =~ /^correct/) {
+       &Apache::lonxml::debug("skipping");
+       &Apache::lonxml::get_all_text("/not_solved",$$parser[$#$parser]);
+     }
+   }
+   return '';
+ }
+ sub end_notsolved {
+   return '';
+ }
+ sub start_solved {
+   my ($target,$token,$parstack,$parser,$safeeval)=@_;
+   if ($target ne 'meta') {
+     my $gradestatus=$Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"};
+     if ($gradestatus !~ /^correct/) {
+       &Apache::lonxml::get_all_text("/solved",$$parser[$#$parser]);
+     }
+   }
+   return '';
+ }
+ sub end_solved {
+   return '';
+ }
 ;
  __END__

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

Removed from v.1.21
changed lines
	Added in v.1.25