--- loncom/homework/structuretags.pm	2000/12/01 00:44:48	1.18
+++ loncom/homework/structuretags.pm	2001/02/19 21:02:59	1.33
@@ -1,18 +1,21 @@
 # The LearningOnline Network with CAPA # <script> definiton
-
+# 2/19 Guy
 package Apache::structuretags; 
 
 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 {
   my ($target,$token,$parstack,$parser,$safeeval)=@_;
   my $bodytext=&Apache::lonxml::get_all_text("/web",$$parser[$#$parser]);
-  return $bodytext;
+  if ($target eq 'web') {
+    return $bodytext;
+  } 
+  return '';
 }
 
 sub end_web {
@@ -21,6 +24,9 @@ sub end_web {
 sub start_tex {
   my ($target,$token,$parstack,$parser,$safeeval)=@_;
   my $bodytext=&Apache::lonxml::get_all_text("/tex",$$parser[$#$parser]);
+  if ($target eq 'tex') {
+    return $bodytext
+  }
   return '';
 }
 
@@ -29,29 +35,69 @@ sub end_tex {
 
 sub start_problem {
   my ($target,$token,$parstack,$parser,$safeeval)=@_;
-  unless ($target eq 'meta') {
+
+#intialize globals
+  $Apache::inputtags::part='0';
+  @Apache::inputtags::responselist = ();
+
+#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') {
+    ($status,$datemsg) = &Apache::lonhomework::check_date('0');
+    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 "<body bgcolor=\"#FFFFFF\"> <br />Problem is not open to be viewed. The problem $datemsg<br />";
+      }
+    } 
+  }
+  if ($target eq 'web') {
     my $args ='';
-    if ( $#$parstack > -1 ) {
-      $args=$$parstack[$#$parstack];
-    }
+    if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }
     my $name = &Apache::run::run("{$args;".'return $name}',$safeeval);
-    $Apache::inputtags::part='0';
-    @Apache::inputtags::responselist = ();
-    my $expression='$external::part='.$Apache::inputtags::part.';';
-    $safeeval->share_from('Apache::inputtags',['@part']);
-    &Apache::run::run($expression,$safeeval);
-    return "<title>$name</title>\n<body bgcolor=#FFFFFF>\n<form name=\"lonhomework\" method=\"POST\" action=\"".$ENV{'request.uri'}."\">";
-  } 
+    if ($name eq '') { 
+      $name=&Apache::lonnet::EXT('resource.title');
+      if ($name eq 'con_lost') { $name = ''; }
+    }
+    $Apache::lonhomework::name=$name;
+    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'}."\">".'<input type="hidden" name="submitted" value="yes" />';
+    } elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER' || $status eq 'CLOSED') {
+      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 'web' && $Apache::inputtags::part eq '0') {
-      $result.=&Apache::inputtags::grade;
+    if ( $target eq 'grade' && $Apache::inputtags::part eq '0' &&
+       $status eq 'CAN_ANSWER') {
+      # if part is zero, no <part>s existed, so we need to the grading
+      &Apache::inputtags::grade;
+    } elsif ($Apache::inputtags::part eq '0') {
+      # if part is zero, no <part>s existed, so we need show the current 
+      # grading status
+      $result.= &Apache::inputtags::gradestatus($Apache::inputtags::part);
+    } 
+    if ($target eq 'web') { 
+      if ($status eq 'CAN_ANSWER') {
+	$result.="</form></body>\n"; 
+      } elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER') {
+	$result.="</body>\n"; 
+      } 
     }
-    $result.="</form></body>\n";
   } else {
     if ($Apache::inputtags::part eq '0') {
       $result=&Apache::response::mandatory_part_meta;
@@ -66,12 +112,12 @@ sub start_block {
   my $code = @$parstack[$#$parstack];
   $code =~ s/\"//g;
   $code .=';return $condition;';
-#  print "<br>$code<br>";
+#  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 "";
 }
@@ -129,14 +175,14 @@ sub start_randomlist {
       $list_item = &Apache::lonxml::get_all_text('/'.$b_tok->[1],$b_parser);
       $list_item = "$b_tok->[4]"."$list_item"."</$b_tok->[1]>";
       push(@randomlist,$list_item);
-   #  print "<BR><B>START-TAG $b_tok->[1], $b_tok->[4], $list_item</B>";
+   #  print "<br /><b>START-TAG $b_tok->[1], $b_tok->[4], $list_item</b>";
     }
     if($b_tok->[0] eq 'T') { # text
     # what to do with text in between tags?
-      #  print "<B>TEXT $b_tok->[1]</B><BR>";
+      #  print "<b>TEXT $b_tok->[1]</b><br />";
     }
     # if($b_tok->[0] eq 'E') { # end tag, should not happen
-      #  print "<B>END-TAG $b_tok->[1]</B><BR>";
+      #  print "<b>END-TAG $b_tok->[1]</b><br />";
     # }
   }
   my @idx_arr = (0 .. $#randomlist);
@@ -172,18 +218,93 @@ sub start_part {
   @Apache::inputtags::responselist = ();
   if ($target eq 'meta') {
     return &Apache::response::mandatory_part_meta;
+  } else {
+    my ($status,$datemsg) = &Apache::lonhomework::check_date("OPEN_DATE",$id);
+    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 "<br />Part is not open to be viewed. It $datemsg<br />";
+      }
+    }
   }
+  return '';
 }
 
 sub end_part {
   my ($target,$token,$parstack,$parser,$safeeval)=@_;
   &Apache::lonxml::debug("in end_part $target ");
-  if ( $target eq 'meta' ) {
-    return '';
+  my $status=$Apache::inputtags::status['-1'];
+  pop @Apache::inputtags::status;
+  if ( $target eq 'meta' ) { return ''; }
+  if ( $target eq 'grade' && $status eq 'CAN_ANSWER') { 
+    return &Apache::inputtags::grade; 
   }
-  my $result=&Apaceh::inputtags::grade;
-  return $result;
+  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::inputtags::status['-1'] ne 'CANNOT_ANSWER' ) {
+      &Apache::lonxml::get_all_text("/preduedate",$$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("/postanswerdate",$$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("/notsolved",$$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 '';
+}
 1;
 __END__
