--- loncom/homework/structuretags.pm	2004/01/30 16:21:26	1.230
+++ loncom/homework/structuretags.pm	2004/02/13 23:59:24	1.235
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.230 2004/01/30 16:21:26 albertel Exp $
+# $Id: structuretags.pm,v 1.235 2004/02/13 23:59:24 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -37,6 +37,7 @@ use Apache::lonnet;
 use Apache::File();
 use Apache::lonmenu;
 use Apache::lonlocal;
+use Apache::lonxml;
 
 BEGIN {
     &Apache::lonxml::register('Apache::structuretags',('block','languageblock','instructorcomment','while','randomlist','problem','library','web','tex','part','preduedate','postanswerdate','solved','notsolved','startouttext','endouttext',
@@ -199,6 +200,16 @@ sub problem_edit_footer {
     <input type="submit" name="submit" value="'.&mt('Submit Changes and View').'" />';
 }
 
+sub option {
+    my ($value,$name) = @_;
+    my $result ="<option value='".$value."' ";
+    if ($ENV{'form.'.$name} eq $value) {
+	$result.=" selected='on' ";
+    }
+    $result.='>';
+    return $result;
+}
+
 sub problem_web_to_edit_header {
     my ($rndseed)=@_;
     my $result.='<input type="hidden" name="problemmode" value="'.&mt('View').'" />
@@ -215,6 +226,37 @@ sub problem_web_to_edit_header {
     $result.= ' />'.&mt('&nbsp;Show&nbsp;All&nbsp;Foils').
 	&Apache::loncommon::help_open_topic('Problem_Editor_Testing_Area','Testing Problems').
 	'<hr />';
+    $result.="
+<nobr>
+Problem Status:
+<select name='problemstate'>
+  <option name=''></option>
+  ".&option('CLOSED'               ,'problemstate').&mt("Closed")."</option>
+  ".&option('CAN_ANSWER'           ,'problemstate').&mt("Answerable")."</option>
+  ".&option('CANNOT_ANSWER_tries'  ,'problemstate').&mt("Open with full tries")."</option>
+  ".&option('CANNOT_ANSWER_correct','problemstate').&mt("Open and correct")."</option>
+  ".&option('SHOW_ANSWER'          ,'problemstate').&mt("Show Answer")."</option>
+</select>
+</nobr>
+<nobr>
+Problem Type:
+<select name='problemtype'>
+  <option name=''></option>
+  ".&option('exam'   ,'problemtype')."Exam Problem</option>
+  ".&option('problem','problemtype')."Homework problem</option>
+  ".&option('survey' ,'problemtype')."Survey Question</option>
+</select>
+</nobr>
+<nobr>
+Feedback Mode:
+<select name='problemstatus'>
+  <option value=''></option>
+  ".&option('yes','problemstatus')."Show Feedback</option>
+  ".&option('no', 'problemstatus')."Don\'t Show Feedback</option>
+</select>
+<input type='submit' name='changeproblemmode' value='Change' />
+</nobr>
+<hr />";
     my $numtoanalyze=$ENV{'form.numtoanalyze'};
     if (!$numtoanalyze) { $numtoanalyze=20; }
     $result.= '<input type="submit" name="problemmode" value='.
@@ -296,6 +338,12 @@ sub init_problem_globals {
 	@Apache::inputtags::partlist=('0');
 	$Apache::lonhomework::problemstatus=
 	    &Apache::lonnet::EXT('resource.0.problemstatus');
+	&Apache::lonxml::debug("problem status is  $Apache::lonhomework::problemstatus");
+	&Apache::lonxml::debug("env probstat is ".$ENV{'form.problemstatus'});
+	if ($ENV{'request.state'} eq 'construct' &&
+	    defined($ENV{'form.problemstatus'})) {
+	    $Apache::lonhomework::problemstatus=$ENV{'form.problemstatus'};
+	}
     } else {
 	$Apache::inputtags::part='';
 	@Apache::inputtags::partlist=();
@@ -475,7 +523,7 @@ sub start_problem {
 	    my @due_file_content = <$temp_file>;
 	    my $due_file_content = $due_file_content[$#due_file_content];
 	    chomp $due_file_content;
-	    my $name_of_resourse= &get_resource_name($parstack,$safeeval);
+	    my $name_of_resourse= &Apache::lonxml::latex_special_symbols(&get_resource_name($parstack,$safeeval));
 	    if ($due_file_content ne $duedate) {
 		$temp_file = Apache::File->new('>'.$filename);
 		print $temp_file "$duedate\n";
@@ -522,7 +570,7 @@ sub end_problem {
     if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ||
 	$target eq 'tex') {
 	if ( $target eq 'grade' && $Apache::inputtags::part eq '0' &&
-	     $status eq 'CAN_ANSWER' ) {
+	     ($status eq 'CAN_ANSWER' || $Apache::lonhomework::scantronmode)) {
 	    # if part is zero, no <part>s existed, so we need to the grading
 	    &Apache::inputtags::grade;
 	} elsif ( ($target eq 'web' || $target eq 'tex') &&
@@ -983,6 +1031,8 @@ sub start_part {
 			}
 		    }
 		    if (($Apache::lonhomework::type eq 'exam') && ($allow_print_points)) { $result .= '\fbox{\textit{'.$weight.' pt}}';}
+		} elsif ($target eq 'web') {
+		    $result.='<a name="'.&Apache::lonnet::escape($Apache::inputtags::part).'" />';
 		}
 	    }
 	}
@@ -1014,7 +1064,9 @@ sub end_part {
     my $result='';
     if ( $target eq 'meta' ) {
 	$result='';
-    } elsif ( $target eq 'grade' && $status eq 'CAN_ANSWER' && !$hidden) {
+    } elsif ($target eq 'grade' && 
+	     ($status eq 'CAN_ANSWER' || $Apache::lonhomework::scantronmode) &&
+	     !$hidden) {
 	$result=&Apache::inputtags::grade;
     } elsif (($target eq 'web' || $target eq 'tex') && !$hidden ) {
 	my $gradestatus=&Apache::inputtags::gradestatus($Apache::inputtags::part,
@@ -1049,12 +1101,12 @@ sub end_preduedate {
 
 sub start_postanswerdate {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
-    if ($target eq 'web' || $target eq 'grade' || $target eq 'tex') {
+    if ($target eq 'web' || $target eq 'grade') {
 	if ($Apache::inputtags::status['-1'] ne 'SHOW_ANSWER') {
 	    &Apache::lonxml::get_all_text("/postanswerdate",$parser);
 	}
     } elsif ($target eq 'tex') {
-	return '\vskip 0 mm \noindent';
+	&Apache::lonxml::get_all_text("/postanswerdate",$parser);
     }
     return '';
 }