--- loncom/homework/structuretags.pm	2006/06/26 22:33:22	1.359
+++ loncom/homework/structuretags.pm	2007/05/23 22:36:21	1.377
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.359 2006/06/26 22:33:22 albertel Exp $
+# $Id: structuretags.pm,v 1.377 2007/05/23 22:36:21 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -88,6 +88,14 @@ sub page_start {
 					   $parstack,$parser,$safeeval);
     }
 
+    $extra_head.= '
+<script type="text/javascript">
+function setSubmittedPart (part) {
+   this.document.lonhomework.submitted.value="part_"+part;
+}
+</script>
+';
+
     my %body_args;
     if (defined($found{'html'})) {
 	$body_args{'skip_phases'}{'head'}=1;
@@ -134,7 +142,7 @@ sub page_start {
 	$body_args{'force_register'} = 1;
 	$body_args{'add_entries'}    = \%add_entries;	
     }
-
+    $body_args{'no_auto_mt_title'} = 1;
     my $page_start = &Apache::loncommon::start_page($name,$extra_head,
 						    \%body_args);
 
@@ -142,7 +150,7 @@ sub page_start {
 	&& $env{'request.state'} ne 'construct'
 	&& ($target eq 'web' || $target eq 'webgrade')) {
 
-	my ($symb,undef,undef,undef,$publicuser)= &Apache::lonxml::whichuser();
+	my ($symb,undef,undef,undef,$publicuser)= &Apache::lonnet::whichuser();
 	if ($symb eq '' && !$publicuser) {
 	    my $help = &Apache::loncommon::help_open_topic("Ambiguous_Reference");
 	    $help=&mt("Browsing resource, all submissions are temporary.")."<br />";
@@ -162,14 +170,14 @@ sub page_start {
 	if ($target eq 'edit') {
 	    $form_tag_start.=&Apache::edit::form_change_detection();
 	}
-	$form_tag_start.='>';
+	$form_tag_start.='>'."\n";
 
 	my $symb=&Apache::lonnet::symbread();
 	if ($symb =~ /\S/) {
 	    $symb=
 		&HTML::Entities::encode(&Apache::lonenc::check_encrypt($symb));
 	    $form_tag_start.=
-		'<input type="hidden" name="symb" value="'.$symb.'" />';
+		"\t".'<input type="hidden" name="symb" value="'.$symb.'" />'."\n";
 	}
     }
     return ($page_start,$form_tag_start);
@@ -181,7 +189,7 @@ sub get_resource_name {
     if (defined($Apache::lonhomework::name)) {
 	return $Apache::lonhomework::name;
     }
-    my ($symb)=&Apache::lonxml::whichuser();
+    my ($symb)=&Apache::lonnet::whichuser();
     my $name=&Apache::lonnet::gettitle($symb);
     if ($name eq '') {
 	$name=&Apache::lonnet::EXT('resource.title');
@@ -198,7 +206,7 @@ sub get_resource_name {
 sub setup_rndseed {
     my ($safeeval)=@_;
     my $rndseed;
-    my ($symb)=&Apache::lonxml::whichuser();
+    my ($symb)=&Apache::lonnet::whichuser();
     if ($env{'request.state'} eq "construct" 
 	|| $symb eq '' 
 	|| $Apache::lonhomework::type eq 'practice'
@@ -213,7 +221,8 @@ sub setup_rndseed {
 	    }
 	    $env{'form.rndseed'}=$rndseed;
 	}
-	if ($env{'form.resetdata'} eq &mt('New Problem Variation') ||
+	if ( ($env{'form.resetdata'} eq &mt('New Problem Variation')
+	      && $env{'form.submitted'} eq 'yes')  ||
 	    $env{'form.newrandomization'} eq &mt('New Randomization')) {
 	    srand(time);
 	    $rndseed=int(rand(2100000000));
@@ -276,9 +285,7 @@ sub option {
 sub problem_web_to_edit_header {
     my ($rndseed)=@_;
     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="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').'" />
@@ -293,9 +300,9 @@ sub problem_web_to_edit_header {
 	: &mt('&nbsp;Show&nbsp;All&nbsp;Foils');
 
     if (defined($env{'form.showallfoils'})) { $result.='checked="on"'; }
-    $result.= ' />'.$show_all_foils_text.
+    $result.= ' />'.$show_all_foils_text.'</label>'.
 	&Apache::loncommon::help_open_topic('Problem_Editor_Testing_Area','Testing Problems').
-	'</label><hr />';
+	'<hr />';
     if (!$Apache::lonhomework::parsing_a_task) {
 	$result.="
 <nobr>
@@ -337,6 +344,20 @@ Feedback Mode:
 	     '.'.&Apache::loncommon::help_open_topic("Analyze_Problem",
 						     '',undef,undef,300).
 						     '<hr />';
+    } elsif ($Apache::lonhomework::parsing_a_task) {
+	$result.="
+<nobr>
+Problem Status:
+<select name='problemstate'>
+  <option value=''></option>
+  ".&option('CLOSED'               ,'problemstate').&mt("Closed")."</option>
+  ".&option('CAN_ANSWER'           ,'problemstate').&mt("Answerable")."</option>
+  ".&option('WEB_GRADE'            ,'problemstate').&mt("Criteria Grading")."</option>
+  ".&option('SHOW_ANSWER'          ,'problemstate').&mt("Show Feedback")."</option>
+</select>
+</nobr>
+<input type='submit' name='changeproblemmode' value='".&mt("Change")."' />
+<hr />";
     }
     return $result;
 }
@@ -346,7 +367,7 @@ sub initialize_storage {
     undef(%Apache::lonhomework::results);
     undef(%Apache::lonhomework::history);
     my ($symb,$courseid,$domain,$name) = 
-	&Apache::lonxml::whichuser($given_symb);
+	&Apache::lonnet::whichuser($given_symb);
     
     # anonymous users (CODEd exams) have no data
     if ($name eq 'anonymous' 
@@ -360,7 +381,8 @@ sub initialize_storage {
 	
 	my $namespace = $symb || $env{'request.uri'};
 	if ($env{'form.resetdata'} eq &mt('Reset Submissions') ||
-	    $env{'form.resetdata'} eq &mt('New Problem Variation') ||
+	    ($env{'form.resetdata'} eq &mt('New Problem Variation')
+	     && $env{'form.submitted'} eq 'yes') ||
 	    $env{'form.newrandomization'} eq &mt('New Randomization')) {
 	    &Apache::lonnet::tmpreset($namespace,'',$domain,$name);
 	    &Apache::lonxml::debug("Attempt reset");
@@ -392,7 +414,7 @@ sub finalize_storage {
 	my @remove = grep(/^INTERNAL_/,keys(%Apache::lonhomework::results));
 	delete(@Apache::lonhomework::results{@remove});
 	my ($symb,$courseid,$domain,$name) = 
-	    &Apache::lonxml::whichuser($given_symb);
+	    &Apache::lonnet::whichuser($given_symb);
 	if ($env{'request.state'} eq 'construct' 
 	    || $symb eq ''
 	    || $Apache::lonhomework::type eq 'practice') {
@@ -528,7 +550,6 @@ sub init_problem_globals {
     undef($Apache::lonhomework::name);
     undef($Apache::lonhomework::default_type);
     undef($Apache::lonhomework::type);
-    undef($Apache::lonhomework::problemstatus);
 }
 
 sub reset_problem_globals {
@@ -594,11 +615,7 @@ sub start_problem {
 	$Apache::lonhomework::scantronmode=1;
     }
 
-    &initialize_storage();
     if ($target ne 'analyze') {
-	if ($target eq 'web') {
-	    &Apache::lonhomework::showhash(%Apache::lonhomework::history);
-	}
        	if ($env{'request.state'} eq 'construct') { &set_problem_state('0'); }
 	$Apache::lonhomework::type=&Apache::lonnet::EXT('resource.0.type');
 	if (($env{'request.state'} eq 'construct') &&
@@ -619,6 +636,12 @@ sub start_problem {
     }
     $Apache::lonhomework::default_type = $Apache::lonhomework::type;
 
+    &initialize_storage();
+    if ($target eq 'web') {
+	&Apache::lonxml::debug(" grading history ");
+	&Apache::lonhomework::showhash(%Apache::lonhomework::history);
+    }
+
     #added vars to the scripting enviroment
     my $expression='$external::part=\''.$Apache::inputtags::part.'\';';
     $expression.='$external::type=\''.$Apache::lonhomework::type.'\';';
@@ -656,7 +679,7 @@ sub start_problem {
 	}
 	#handle rand seed in construction space
 	my $rndseed=&setup_rndseed($safeeval);
-	my ($symb)=&Apache::lonxml::whichuser();
+	my ($symb)=&Apache::lonnet::whichuser();
 	if ($env{'request.state'} ne "construct" && 
 	    ($symb eq '' || $Apache::lonhomework::type eq 'practice')) {
 	    $form_tag_start.='<input type="hidden" name="rndseed" value="'.
@@ -730,13 +753,21 @@ sub start_problem {
 	    my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser,
 						       $style);
 	    if ($target eq 'web') {
-		$result .= &Apache::bridgetask::proctor_validation_screen();
+		$result .= 
+		    &Apache::bridgetask::proctor_validation_screen($slot);
 	    } elsif ($target eq 'grade') {
 		&Apache::bridgetask::proctor_check_auth($slot_name,$slot,
 							'problem');
 	    }
 	} elsif ($target eq 'web') {
-	    $result.="\n $form_tag_start".	
+	    if ($status eq 'CAN_ANSWER' 
+		&& $slot_name ne ''
+		&& $Apache::lonhomework::history{'resource.0.checkedin'} eq '') {
+		# unproctored slot access, self checkin
+		&Apache::bridgetask::check_in('problem',undef,undef,
+					      $slot_name);
+	    }
+	    $result.="\n $form_tag_start \t".	
 	      '<input type="hidden" name="submitted" value="yes" />';
 	    # create a page header and exit
 	    if ($env{'request.state'} eq "construct") {
@@ -761,7 +792,6 @@ sub start_problem {
 	$result.=$temp;
     } elsif ($target eq 'modified') {
 	$result=$token->[4];
-	$result.=&Apache::edit::handle_insert();
     } else {
 	# page_start returned a starting result, delete it if we don't need it
 	$result = '';
@@ -779,7 +809,6 @@ sub end_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
@@ -939,7 +968,6 @@ sub end_problem {
 	$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') {
@@ -955,7 +983,7 @@ sub end_problem {
 sub start_library {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my ($result,$form_tag_start);
-    if ($$tagstack[0] eq 'library') {
+    if ($#$tagstack eq 0 && $$tagstack[0] eq 'library') {
 	&init_problem_globals('library');
 	$Apache::lonhomework::type='problem';
     }
@@ -968,9 +996,8 @@ sub start_library {
 	$result.=$temp;
     } elsif ($target eq 'modified') {
 	$result=$token->[4];
-	$result.=&Apache::edit::handle_insert();
     } elsif (($target eq 'web' || $target eq 'webgrade')
-	     && $$tagstack[0] eq 'library' 
+	     && ($#$tagstack eq 0 && $$tagstack[0] eq 'library')
 	     && $env{'request.state'} eq "construct" ) {
 	my $name=&get_resource_name($parstack,$safeeval);
 	($result,$form_tag_start)=
@@ -989,11 +1016,14 @@ sub end_library {
     my $result='';
     if ($target eq 'edit') {
 	$result=&problem_edit_footer();
-    } elsif ($target eq 'web' && $$tagstack[0] ne 'problem' &&
-	     $env{'request.state'} eq "construct") {
+    } elsif ($target eq 'web' 
+	     && ($#$tagstack eq 0 && $$tagstack[0] eq 'library') 
+	     && $env{'request.state'} eq "construct") {
 	$result.='</form>'.&Apache::loncommon::end_page({'discussion' => 1});
     }
-    if ($$tagstack[0] eq 'library') { &reset_problem_globals('library') };
+    if ( $#$tagstack eq 0 && $$tagstack[0] eq 'library') {
+	&reset_problem_globals('library');
+    }
     return $result;
 }
 
@@ -1412,7 +1442,6 @@ sub start_part {
 	    #limiting ids to only letters numbers, and space
 	    $token->[2]->{'id'}=~s/[^A-Za-z0-9 ]//gs;
 	    $result = &Apache::edit::rebuild_tag($token);
-	    $result.=&Apache::edit::handle_insert();
 	}
     }
     return $result;
@@ -1450,7 +1479,6 @@ sub end_part {
 	$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='';
@@ -1477,15 +1505,21 @@ sub end_preduedate {
     return '';
 }
 
+# In all the modes where <postanswerdate> text is 
+# displayable,  all we do is eat up the text between the start/stop
+# tags if the conditions are not right to display it.
 sub start_postanswerdate {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
-    if ($target eq 'web' || $target eq 'grade' || $target eq 'webgrade') {
+    my $pav = &Apache::lonnet::allowed('pav', $env{'request.course.id'}) ||
+	&Apache::lonnet::allowed('pav',
+			   $env{'request.course.id'}.'/'.$env{'request.course.sec'});
+    if ($target eq 'web' || $target eq 'grade' || $target eq 'webgrade' ||
+	$target eq 'tex' ) {
 	if ($Apache::lonhomework::scantronmode ||
-	    $Apache::inputtags::status['-1'] ne 'SHOW_ANSWER') {
+	    $Apache::inputtags::status['-1'] ne 'SHOW_ANSWER' ||
+	    (($target eq 'tex') && !$pav)) {
 	    &Apache::lonxml::get_all_text("/postanswerdate",$parser,$style);
 	}
-    } elsif ($target eq 'tex') {
-	&Apache::lonxml::get_all_text("/postanswerdate",$parser,$style);
     }
     return '';
 }
@@ -1592,9 +1626,10 @@ sub end_startouttext {
 		 ."</td>
 <td>".
                  &Apache::edit::insertlist($target,$token).
+		 '</td><td align="right" valign="top">' .
+		 &Apache::loncommon::helpLatexCheatsheet().
 		 &Apache::edit::end_row().
-                 &Apache::edit::start_spanning_row()."\n"
-		 . &Apache::loncommon::helpLatexCheatsheet () .
+                 &Apache::edit::start_spanning_row()."\n".
 		 &Apache::edit::editfield($token->[1],$text,"",80,8,1);
     }
     if ($target eq 'modified') {
@@ -1612,7 +1647,8 @@ sub start_endouttext {
     if ($target eq "edit" ) { $result="</td></tr>".&Apache::edit::end_table()."\n"; }
     if ($target eq "modified") {
 	$result='<endouttext />'.
-	    &Apache::edit::handle_insertafter('startouttext'); }
+	    &Apache::edit::handle_insertafter('startouttext');
+    }
     return $result;
 }
 
@@ -1645,7 +1681,7 @@ sub start_simpleeditbutton {
         (&Apache::lonnet::allowed('mdc',$env{'request.course.id'}))) {
         my $url=$env{'request.noversionuri'};
         $url=~s/\?.*$//;
-	my ($symb) = &Apache::lonxml::whichuser();
+	my ($symb) = &Apache::lonnet::whichuser();
 	$result='<table width="100%" bgcolor="#FFFFAA" border="2"><tr><td>'.
                 '<a href="'.$url.'/smpedit?symb='.&escape($symb).'">'.&mt('Edit').'</a> - '.&mt('Note: it can take up to 10 minutes for changes to take effect for all users.').
 &Apache::loncommon::help_open_topic('Caching').'</td></tr></table><br />';