--- loncom/homework/structuretags.pm	2005/10/18 21:46:42	1.306
+++ loncom/homework/structuretags.pm	2005/11/21 22:16:38	1.325
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.306 2005/10/18 21:46:42 albertel Exp $
+# $Id: structuretags.pm,v 1.325 2005/11/21 22:16:38 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -115,11 +115,17 @@ sub page_start {
 	    &Apache::lonxml::fontsettings();     
     }
     my $body_tag_start;
-    if (!defined($found{'body'}) && $env{'request.state'} eq 'construct'
-	&& $env{'environment.remote'} eq 'off') {
-	if ($target eq 'web' || $target eq 'edit') {
-	    $body_tag_start=&Apache::loncommon::bodytag();
-	    $body_tag_start.=&Apache::lonxml::message_location();
+    if (!defined($found{'body'}) && $env{'request.state'} eq 'construct') {
+	if ($env{'environment.remote'} eq 'off') {
+	    if ($target eq 'web' || $target eq 'edit') {
+		$body_tag_start=&Apache::loncommon::bodytag();
+		$body_tag_start.=&Apache::lonxml::message_location();
+	    }
+	} else {
+	    if ($target eq 'web' || $target eq 'edit') {
+		$body_tag_start=&Apache::loncommon::bodytag(undef,undef,undef,1);
+		$body_tag_start.=&Apache::lonxml::message_location();
+	    }
 	}
     } elsif (!defined($found{'body'})) {
 	my $background=&Apache::lonxml::get_param('background',$parstack,
@@ -175,6 +181,8 @@ sub setup_rndseed {
     my ($symb)=&Apache::lonxml::whichuser();
     if ($env{'request.state'} eq "construct" || $symb eq '' ||
           $Apache::lonhomework::history{'resource.CODE'}) {
+	&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+						['rndseed']);
 	$rndseed=$env{'form.rndseed'};
 	if (!$rndseed) {
 	    $rndseed=$Apache::lonhomework::history{'rndseed'};
@@ -192,7 +200,7 @@ sub setup_rndseed {
 	    delete($env{'form.newrandomization'});
 	}
 	if (defined($rndseed) && $rndseed ne int($rndseed)) {
-	   $rndseed=join(',',&Math::Random::random_seed_from_phrase($rndseed));
+	    $rndseed=join(':',&Apache::lonnet::digest($rndseed));
         }
         if ($Apache::lonhomework::history{'resource.CODE'}) {
 	   $rndseed=&Apache::lonnet::rndseed();
@@ -245,9 +253,11 @@ sub option {
 
 sub problem_web_to_edit_header {
     my ($rndseed)=@_;
-    my $result.='<input type="hidden" name="problemmode" value="'.&mt('View').'" />
-             <input type="submit" name="problemmode" accesskey="e" value="'.&mt('Edit').'" />
-             <input type="submit" name="problemmode" accesskey="x" value="'.&mt('EditXML').'" />
+    my $result.='<input type="hidden" name="problemmode" value="'.&mt('View').'" />';
+    if (!$Apache::lonhomework::parsing_a_task) {
+	$result .= '<input type="submit" name="problemmode" accesskey="e" value="'.&mt('Edit').'" />';
+    }
+    $result .= '<input type="submit" name="problemmode" accesskey="x" value="'.&mt('EditXML').'" />
              <input type="submit" name="newrandomization" accesskey="a" value="'.&mt('New Randomization').'" />
              <input type="submit" name="resetdata" accesskey="r" value="'.&mt('Reset Submissions').'" />
              <nobr><input type="submit" name="changerandseed" value="'.&mt('Change Random Seed To:').'" />
@@ -255,11 +265,17 @@ sub problem_web_to_edit_header {
 	       $rndseed.'"
            onchange="javascript:document.lonhomework.changerandseed.click()" /></nobr>
              <label><input type="checkbox" name="showallfoils" ';
+    my $show_all_foils_text = 
+	($Apache::lonhomework::parsing_a_task) ?
+	&mt('&nbsp;Show&nbsp;All&nbsp;Instances')
+	: &mt('&nbsp;Show&nbsp;All&nbsp;Foils');
+
     if (defined($env{'form.showallfoils'})) { $result.='checked="on"'; }
-    $result.= ' />'.&mt('&nbsp;Show&nbsp;All&nbsp;Foils').
+    $result.= ' />'.$show_all_foils_text.
 	&Apache::loncommon::help_open_topic('Problem_Editor_Testing_Area','Testing Problems').
 	'</label><hr />';
-    $result.="
+    if (!$Apache::lonhomework::parsing_a_task) {
+	$result.="
 <nobr>
 Problem Status:
 <select name='problemstate'>
@@ -290,15 +306,16 @@ Feedback Mode:
 </nobr>
 <input type='submit' name='changeproblemmode' value='".&mt("Change")."' />
 <hr />";
-    my $numtoanalyze=$env{'form.numtoanalyze'};
-    if (!$numtoanalyze) { $numtoanalyze=20; }
-    $result.= '<input type="submit" name="problemmode" value='.
-	&mt('"Calculate answers').'" /> for
+	my $numtoanalyze=$env{'form.numtoanalyze'};
+	if (!$numtoanalyze) { $numtoanalyze=20; }
+	$result.= '<input type="submit" name="problemmode" value='.
+	    &mt('"Calculate answers').'" /> for
              <input type="text" name="numtoanalyze" value="'.
 	     $numtoanalyze.'" size="5" /> '.&mt('versions of this problem').
 	     '.'.&Apache::loncommon::help_open_topic("Analyze_Problem",
 						     '',undef,undef,300).
 						     '<hr />';
+    }
     return $result;
 }
 
@@ -329,6 +346,8 @@ sub initialize_storage {
 sub finalize_storage {
     my $result;
     if (%Apache::lonhomework::results) {
+	my @remove = grep(/^INTERNAL_/,keys(%Apache::lonhomework::results));
+	delete(@Apache::lonhomework::results{@remove});
 	my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();
 	if ($env{'request.state'} eq 'construct' || $symb eq '') {
 	    $Apache::lonhomework::results{'rndseed'}=$env{'form.rndseed'};
@@ -343,6 +362,8 @@ sub finalize_storage {
                 &store_aggregates($symb,$courseid);
             }
 	}
+    } else {
+	&Apache::lonxml::debug('Nothing to store');
     }
     return $result;
 }
@@ -425,16 +446,21 @@ ENDCHECKOUT
 sub init_problem_globals {
     my ($type)=@_;
     #initialize globals
+    #   For problems, we start out in part 0 (outside a <part> tag).
+    #   and part 0 is used to describe the main body of the <problem>
+    #
     if ($type eq 'problem') {
 	$Apache::inputtags::part='0';
 	@Apache::inputtags::partlist=('0');
 	$Apache::lonhomework::problemstatus=&get_problem_status('0');
 	$Apache::lonhomework::ignore_response_errors=0;
+
     } elsif ($type eq 'library') {
 	$Apache::inputtags::part='';
 	@Apache::inputtags::partlist=();
 	$Apache::lonhomework::problemstatus='';	
 	$Apache::lonhomework::ignore_response_errors=1;
+
     } elsif ($type eq 'Task') {
 	$Apache::inputtags::part='0';
 	@Apache::inputtags::partlist=('0');
@@ -490,6 +516,14 @@ sub get_problem_status {
 sub start_problem {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
 
+    # We'll use the redirection to fix up printing of duedates.
+    if (!$Apache::lonxml::metamode) {
+	&Apache::lonxml::startredirection();
+    }
+
+    # Problems don't nest and we don't allow more than one <problem> in
+    # a .problem file.
+    #
     if ( $Apache::inputtags::part ne '' ||
 	 $Apache::lonhomework::parsing_a_problem) {
 	&Apache::lonxml::error('Only one &lt;problem&gt; allowed in a .problem file');
@@ -579,17 +613,22 @@ sub start_problem {
 	    }
 	    $form_tag_start.='<hr />';
 	}
-	($status,$accessmsg) = &Apache::lonhomework::check_access('0');
+
+	($status,$accessmsg,my $slot_name,my $slot) = 
+	    &Apache::lonhomework::check_slot_access('0','problem');
 	push (@Apache::inputtags::status,$status);
+
 	my $expression='$external::datestatus="'.$status.'";';
 	$expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.0.solved"}.'";';
 	&Apache::run::run($expression,$safeeval);
 	&Apache::lonxml::debug("Got $status");
+
 	if (( $status eq 'CLOSED' ) ||
 	    ( $status eq 'UNCHECKEDOUT') ||
 	    ( $status eq 'NOT_YET_VIEWED') ||
 	    ( $status eq 'BANNED') ||
 	    ( $status eq 'UNAVAILABLE') ||
+	    ( $status eq 'NOT_IN_A_SLOT') ||
 	    ( $status eq 'INVALID_ACCESS')) {
 	    my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser);
 	    if ( $target eq "web" ) {
@@ -606,6 +645,8 @@ sub start_problem {
 		    $msg.=&checkout_msg;
 		} elsif ($status eq 'NOT_YET_VIEWED') {
 		    $msg.=&firstaccess_msg($accessmsg,$symb);
+		} elsif ($status eq 'NOT_IN_A_SLOT') {
+		    $msg.=&Apache::bridgetask::add_request_another_attempt_button("Sign up for time to work.");
 		}
 		$result.=$msg.'<br />';
 	    } elsif ($target eq 'tex') {
@@ -616,6 +657,16 @@ sub start_problem {
 		    $result.=&mt('Problem is not open to be viewed. It')." $accessmsg \\vskip 0 mm ";
 		}
 	    }
+	} elsif ($status eq 'NEEDS_CHECKIN') {
+	    my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser);
+	    if ($target eq 'web') {
+		$result .= $head_tag_start.'</head>';
+		$result .= $body_tag_start;
+		$result .= &Apache::bridgetask::proctor_validation_screen();
+	    } elsif ($target eq 'grade') {
+		&Apache::bridgetask::proctor_check_auth($slot_name,$slot,
+							'problem');
+	    }
 	} elsif ($target eq 'web') {
 	    my $name= &get_resource_name($parstack,$safeeval);
 	    $result.="$head_tag_start<title>$name</title></head>
@@ -633,64 +684,8 @@ sub start_problem {
 		}
 	    }
 	} elsif ($target eq 'tex') {
-	    my $startminipage = '';
-	    if (not $env{'form.problem_split'}=~/yes/) {
-		$startminipage = '\begin{minipage}{\textwidth}';
-	    }
-	    my $id = $Apache::inputtags::part;
-	    my $weight = &Apache::lonnet::EXT("resource.$id.weight");
-	    my $packages=&Apache::lonnet::metadata($env{'request.uri'},'packages');
-	    my @packages = split /,/,$packages;
-	    my $allow_print_points = 0;
-	    foreach my $partial_key (@packages) {
-		if ($partial_key=~m/^part_0$/) {
-		    $allow_print_points=1;
-		}
-	    }
-	    my $maxtries = &Apache::lonnet::EXT("resource.$id.maxtries");
-	    if (defined($maxtries) && $maxtries < 0) { $allow_print_points=0; }
-	    if (lc($env{'course.'.$env{'request.course.id'}.
-			    '.disableexampointprint'}) eq 'yes') {
-		$allow_print_points=0;
-	    }
-	    my $duedate = &Apache::lonnet::EXT("resource.$id.duedate"); 
-	    $duedate = POSIX::strftime("%c",localtime($duedate));
-	    my $temp_file;
-	    my $filename = "/home/httpd/prtspool/$env{'user.name'}_$env{'user.domain'}_printout.due";
-	    if (-e $filename) {
-		$temp_file = Apache::File->new($filename);
-	    } else {
-		$temp_file = Apache::File->new('>>'.$filename);
-	    }
-	    my @due_file_content = <$temp_file>;
-	    my $due_file_content = $due_file_content[$#due_file_content];
-	    chomp $due_file_content;
-	    my $name_of_resourse= &Apache::lonxml::latex_special_symbols(&get_resource_name($parstack,$safeeval),'header');
-	    my $begin_doc='\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource <h2>"'.$name_of_resourse.'"</h2> located in <br /><small><b>'.$env{'request.uri'}.'</b></small><br /> STAMPOFPASSEDRESOURCEEND} \noindent ';
-	    my $toc_line='\vskip 1 mm\noindent '.$startminipage.
-		'\addcontentsline{toc}{subsection}{'.$name_of_resourse.'}';
-	    if ($due_file_content ne $duedate) {
-		$temp_file = Apache::File->new('>'.$filename);
-		print $temp_file "$duedate\n";
-		if (not $env{'request.symb'} =~ m/\.page_/) {
-		    if(not $duedate=~m/1969/ and $Apache::lonhomework::type ne 'exam') {
-			$result .= $begin_doc.
-			    '\textit{Due date: '.$duedate.'} '.$toc_line;
-		    } else {
-			$result .= $begin_doc.$toc_line;
-			if ($Apache::lonhomework::type eq 'exam' and $allow_print_points==1) { $result .= '\fbox{\textit{'.$weight.' pt}}';}
-		    }
-		} else {
-		    $result .= '\vskip 1mm\textit{Due date: '.$duedate.'} \\\\\\\\';
-		}
-	    } else {
-		if (not $env{'request.symb'} =~ m/\.page_/) {
-		    $result .= $begin_doc.$toc_line;
-		    if (($Apache::lonhomework::type eq 'exam') and ($allow_print_points==1)) { $result .= '\fbox{\textit{'.$weight.' pt}}';}
-		} else {
-		    $result .= '\vskip 1mm \\\\\\\\';
-		}
-	    }
+	    $result .= 'INSERTTEXFRONTMATTERHERE';
+
 	}
     } elsif ($target eq 'edit') {
 	$result.=$head_tag_start."</head>".$body_tag_start.$form_tag_start.
@@ -711,7 +706,102 @@ sub start_problem {
 
 sub end_problem {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
-    my $result='';
+    my $result;
+
+    if (!$Apache::lonxml::metamode) {
+	$result = &Apache::lonxml::endredirection(); #started in &start_problem
+    }
+
+    if ($target eq 'tex') {
+
+	# Figure out the front matter and replace the
+	# INSERTTEXFRONTMATTERHERE in result with it.  note that we do
+	# this in end_problem because whether or not we display due
+	# dates depends on whether due dates have already been
+	# displayed in the problem parts.
+
+	my $frontmatter   = '';
+	my $startminipage = '';
+	if (not $env{'form.problem_split'}=~/yes/) {
+	    $startminipage = '\begin{minipage}{\textwidth}';
+	}
+	my $id = $Apache::inputtags::part;
+	my $weight = &Apache::lonnet::EXT("resource.$id.weight");
+	my $packages=&Apache::lonnet::metadata($env{'request.uri'},'packages');
+	my @packages = split /,/,$packages;
+	my $allow_print_points = 0;
+	foreach my $partial_key (@packages) {
+	    if ($partial_key=~m/^part_0$/) {
+		$allow_print_points=1;
+	    }
+	}
+	my $maxtries = &Apache::lonnet::EXT("resource.$id.maxtries");
+	if (defined($maxtries) && $maxtries < 0) { $allow_print_points=0; }
+	if (lc($env{'course.'.$env{'request.course.id'}.
+			'.disableexampointprint'}) eq 'yes') {
+	    $allow_print_points=0;
+	}
+	my $name_of_resourse= &Apache::lonxml::latex_special_symbols(&get_resource_name($parstack,$safeeval),'header');
+	my $begin_doc='\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource <h2>"'.$name_of_resourse.'"</h2> located in <br /><small><b>'.$env{'request.uri'}.'</b></small><br /> STAMPOFPASSEDRESOURCEEND} \noindent ';
+	my $toc_line='\vskip 1 mm\noindent '.$startminipage.
+	    '\addcontentsline{toc}{subsection}{'.$name_of_resourse.'}';
+	
+	#  Figure out what the due date is and if we need to print
+	#  it in the problem header.  We have been logging the
+	#  last due date written to file. 
+	
+	my $duetime = &Apache::lonnet::EXT("resource.$id.duedate"); 
+	my $duedate = POSIX::strftime("%c",localtime($duetime));
+	my $temp_file;
+	my $filename = "/home/httpd/prtspool/$env{'user.name'}_$env{'user.domain'}_printout.due";
+	
+	# Figure out what the last printed due date is or set it
+	# to the epoch if no duedates have been printed.
+	
+	my $due_file_content = 0;      #   If the file does not yet exist, time is the epoch.
+	if (-e $filename) {
+	    $temp_file = Apache::File->new($filename);
+	    my @due_file      = <$temp_file>;
+	    $due_file_content = $due_file[$#due_file];
+	    chomp $due_file_content;
+	} 
+	
+	# We display the due date iff it is not the same as the last
+	# duedate in problem header ($due_file_content), and
+	# none of our parts displayed a duedate.
+	#
+	my $parts_with_displayduedate;
+	if (defined $Apache::outputtags::showonce{'displayduedate'}) {
+	    $parts_with_displayduedate = 
+		scalar(@{$Apache::outputtags::showonce{'displayduedate'}});
+	} else {
+	    $parts_with_displayduedate = 0;
+	}
+	if (($due_file_content != $duetime) && ($parts_with_displayduedate == 0) ) {
+	    $temp_file = Apache::File->new('>'.$filename);
+	    print $temp_file "$duetime\n";
+	    if (not $env{'request.symb'} =~ m/\.page_/) {
+		if(not $duedate=~m/1969/ and $Apache::lonhomework::type ne 'exam') {
+		    $frontmatter .= $begin_doc.
+			'\textit{Due date: '.$duedate.'} '.$toc_line;
+		} else {
+		    $frontmatter.= $begin_doc.$toc_line;
+		    if ($Apache::lonhomework::type eq 'exam' and $allow_print_points==1) { $frontmatter .= '\fbox{\textit{'.$weight.' pt}}';}
+		}
+	    } else {
+		$frontmatter .= '\vskip 1mm\textit{Due date: '.$duedate.'} \\\\\\\\';
+	    }
+	} else {
+	    if (not $env{'request.symb'} =~ m/\.page_/) {
+		$frontmatter .= $begin_doc.$toc_line;
+		if (($Apache::lonhomework::type eq 'exam') and ($allow_print_points==1)) { $frontmatter .= '\fbox{\textit{'.$weight.' pt}}';}
+	    } else {
+		$frontmatter .= '\vskip 1mm \\\\\\\\';
+	    }
+	}
+	$result =~ s/INSERTTEXFRONTMATTERHERE/$frontmatter/;
+    }
+
     my $status=$Apache::inputtags::status['-1'];
     if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ||
 	$target eq 'tex') {
@@ -719,6 +809,8 @@ sub end_problem {
 	    # if part is zero, no <part>s existed, so we need to the grading
 	    if ($status eq 'CAN_ANSWER' ||$Apache::lonhomework::scantronmode) {
 		&Apache::inputtags::grade;
+	    } elsif ($status eq 'NEEDS_CHECKIN') {
+		# no need to grade, and don't want to hide data
 	    } else {
 		# move any submission data to .hidden
 		&Apache::inputtags::hidealldata($Apache::inputtags::part);
@@ -779,7 +871,10 @@ sub end_problem {
 	$result.=&Apache::response::meta_response_order();
     } elsif ($target eq 'edit') {
 	&Apache::lonxml::debug("in end_problem with $target, edit");
-	$result = &problem_edit_footer();
+	$result .= &problem_edit_footer();
+    } elsif ($target eq 'modified') {
+	 $result .= $token->[2];
+	 $result.=&Apache::edit::handle_insertafter($token->[1]);
     }
 
     if ($env{'request.state'} eq 'construct' && $target eq 'web') {
@@ -1151,6 +1246,10 @@ sub ordered_show_check {
 
 sub start_part {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+    if (!$Apache::lonxml::metamode) {
+	&Apache::lonxml::startredirection(); # we'll use redirection to fix up 
+	                                     # duedates.
+    }
     my $result='';
     my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval);
     if ($id =~ /^\s*$/) { $id = $Apache::lonxml::curdepth; }
@@ -1259,13 +1358,14 @@ sub end_part {
     my $status=$Apache::inputtags::status['-1'];
     my $hidden=&Apache::loncommon::check_if_partid_hidden($Apache::inputtags::part);
     my $in_order_show=&ordered_show_check();
-    my $result='';
-    if ( $target eq 'meta' ) {
-	$result='';
-    } elsif ($target eq 'grade') {
+    my $result;
+    if (!$Apache::lonxml::metamode) {
+	$result = &Apache::lonxml::endredirection(); # started in &start_part
+    }
+    if ($target eq 'grade') {
 	if (($status eq 'CAN_ANSWER' || $Apache::lonhomework::scantronmode) &&
 	    !$hidden && $in_order_show) {
-	    $result=&Apache::inputtags::grade;
+	    $result.=&Apache::inputtags::grade;
 	} else {
 	    # move any submission data to .hidden
 	    &Apache::inputtags::hidealldata($Apache::inputtags::part);
@@ -1277,10 +1377,13 @@ sub end_part {
 	if ($Apache::lonhomework::type eq 'exam' && $target eq 'tex') {
 	    $gradestatus='';
 	}
-	$result=$gradestatus;
+	$result.=$gradestatus;
 	if ($$tagstack[-2] eq 'td' and $target eq 'tex') {$result.='\end{minipage}';} 
     } elsif ($target eq 'edit') {
-	$result=&Apache::edit::end_table();
+	$result.=&Apache::edit::end_table();
+    } elsif ($target eq 'modified') {
+	 $result .= $token->[2];
+	 $result.=&Apache::edit::handle_insertafter($token->[1]);
     }
     pop @Apache::inputtags::status;
     $Apache::inputtags::part='';