--- loncom/homework/structuretags.pm	2004/02/16 20:01:26	1.240
+++ loncom/homework/structuretags.pm	2004/05/27 04:32:19	1.251
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.240 2004/02/16 20:01:26 albertel Exp $
+# $Id: structuretags.pm,v 1.251 2004/05/27 04:32:19 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -40,8 +40,7 @@ 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',
-'simpleeditbutton','definetag'));
+    &Apache::lonxml::register('Apache::structuretags',('block','languageblock','instructorcomment','while','randomlist','problem','library','web','tex','part','preduedate','postanswerdate','solved','notsolved','problemtype','startouttext','endouttext','simpleeditbutton','definetag'));
 }
 
 sub start_web {
@@ -120,6 +119,7 @@ sub page_start {
 		$body_tag_start.=$help;
 	    }
 	}
+	$body_tag_start.=&Apache::lonxml::message_location();
     }
     my $form_tag_start;
     if (!defined($found{'form'})) {
@@ -152,7 +152,8 @@ sub setup_rndseed {
     my ($safeeval)=@_;
     my $rndseed;
     my ($symb)=&Apache::lonxml::whichuser();
-    if ($ENV{'request.state'} eq "construct" || $symb eq '') {
+    if ($ENV{'request.state'} eq "construct" || $symb eq '' ||
+          $Apache::lonhomework::history{'resource.CODE'}) {
 	$rndseed=$ENV{'form.rndseed'};
 	if (!$rndseed) {
 	    $rndseed=$Apache::lonhomework::history{'rndseed'};
@@ -172,9 +173,12 @@ sub setup_rndseed {
 	if (defined($rndseed) && $rndseed ne int($rndseed)) {
 	   $rndseed=join(',',&Math::Random::random_seed_from_phrase($rndseed));
         }
+        if ($Apache::lonhomework::history{'resource.CODE'}) {
+	   $rndseed=&Apache::lonnet::rndseed();
+	}
 	if ($safeeval) {
 	    &Apache::lonxml::debug("Setting rndseed to $rndseed");
-	    &Apache::run::run('$external::randomseed='.$rndseed.';',$safeeval);
+	    &Apache::run::run('$external::randomseed="'.$rndseed.'";',$safeeval);
 	}
     }
     return $rndseed;
@@ -183,11 +187,11 @@ sub setup_rndseed {
 sub problem_edit_header {
     return '<input type="hidden" name="submitted" value="edit" />
        <input type="hidden" name="problemmode" value="'.&mt('Edit').'" />
-       <input type="submit" name="problemmode" value="'.&mt('Discard Edits and View').'" />
-       <input type="submit" name="problemmode" value="'.&mt('EditXML').'" />
-       <input type="submit" name="Undo" value="'.&mt('undo').'" /> <hr />
-       <input type="submit" name="submit" value="'.&mt('Submit Changes and Edit').'" />
-       <input type="submit" name="submit" value="'.&mt('Submit Changes and View').'" /><table><tr><td>'.
+       <input type="submit" name="problemmode" accesskey="d" value="'.&mt('Discard Edits and View').'" />
+       <input type="submit" name="problemmode" accesskey="x" value="'.&mt('EditXML').'" />
+       <input type="submit" name="Undo" accesskey="u" value="'.&mt('undo').'" /> <hr />
+       <input type="submit" name="submit" accesskey="s" value="'.&mt('Submit Changes and Edit').'" />
+       <input type="submit" name="submit" accesskey="v" value="'.&mt('Submit Changes and View').'" /><table><tr><td>'.
        &Apache::loncommon::help_open_topic('Problem_Editor_XML_Index',
 					   'Problem Editing Help').'</td><td>'.
        &Apache::loncommon::help_open_faq(5).
@@ -213,10 +217,10 @@ 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" value="'.&mt('Edit').'" />
-             <input type="submit" name="problemmode" value="'.&mt('EditXML').'" />
-             <input type="submit" name="newrandomization" value="'.&mt('New Randomization').'" />
-             <input type="submit" name="resetdata" value="'.&mt('Reset Submissions').'" />
+             <input type="submit" name="problemmode" accesskey="e" value="'.&mt('Edit').'" />
+             <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:').'" />
               <input type="text" name="rndseed" width="10" value="'.
 	       $rndseed.'"
@@ -242,20 +246,20 @@ Problem Status:
 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>
+  ".&option('exam'   ,'problemtype').&mt("Exam Problem")."</option>
+  ".&option('problem','problemtype').&mt("Homework problem")."</option>
+  ".&option('survey' ,'problemtype').&mt("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>
+  ".&option('yes','problemstatus').&mt("Show Feedback")."</option>
+  ".&option('no', 'problemstatus').&mt("Don't Show Feedback")."</option>
 </select>
-<input type='submit' name='changeproblemmode' value='Change' />
 </nobr>
+<input type='submit' name='changeproblemmode' value='".&mt("Change")."' />
 <hr />";
     my $numtoanalyze=$ENV{'form.numtoanalyze'};
     if (!$numtoanalyze) { $numtoanalyze=20; }
@@ -336,14 +340,8 @@ sub init_problem_globals {
     if ($type eq 'problem') {
 	$Apache::inputtags::part='0';
 	@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'};
-	}
+
+	$Apache::lonhomework::problemstatus=&get_problem_status('0')
     } else {
 	$Apache::inputtags::part='';
 	@Apache::inputtags::partlist=();
@@ -373,7 +371,7 @@ sub reset_problem_globals {
     undef($Apache::lonhomework::name);
 }
 
-sub set_problem_status {
+sub set_problem_state {
     my ($part)=@_;
     if ($ENV{'form.problemstate'} eq 'CANNOT_ANSWER_correct') {
 	$Apache::lonhomework::history{"resource.$part.solved"}=
@@ -381,6 +379,18 @@ sub set_problem_status {
     }
 }
 
+sub get_problem_status {
+    my ($part)=@_;
+    my $problem_status=&Apache::lonnet::EXT("resource.$part.problemstatus");
+    &Apache::lonxml::debug("problem status for $part is $problem_status");
+    &Apache::lonxml::debug("env probstat is ".$ENV{'form.problemstatus'});
+    if ($ENV{'request.state'} eq 'construct' &&
+	defined($ENV{'form.problemstatus'})) {
+	$problem_status=$ENV{'form.problemstatus'};
+    }
+    return $problem_status;
+}
+
 sub start_problem {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
 
@@ -398,12 +408,12 @@ sub start_problem {
 	$Apache::lonhomework::scantronmode=1;
     }
 
+    &initialize_storage();
     if ($target ne 'analyze') {
-	&initialize_storage();
 	if ($target eq 'web') {
 	    &Apache::lonhomework::showhash(%Apache::lonhomework::history);
 	}
-       	if ($ENV{'request.state'} eq 'construct') { &set_problem_status('0'); }
+       	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') &&
 	    defined($ENV{'form.problemtype'})) {
@@ -424,6 +434,7 @@ sub start_problem {
 
     #added vars to the scripting enviroment
     my $expression='$external::part=\''.$Apache::inputtags::part.'\';';
+    $expression.='$external::type=\''.$Apache::lonhomework::type.'\';';
     &Apache::run::run($expression,$safeeval);
     my $status;
     my $accessmsg;
@@ -475,9 +486,9 @@ sub start_problem {
 		$result.= $head_tag_start.'</head>';
 		my $msg=$body_tag_start;
 		if ($status eq 'UNAVAILABLE') {
-		    $result.='<h1>'.&mt('Unable to determine if this resource is open due to network problems. Please try again later.').'</h1>';
+		    $msg.='<h1>'.&mt('Unable to determine if this resource is open due to network problems. Please try again later.').'</h1>';
 		} else {
-		    $result.='<h1>'.&mt('Not open to be viewed').'</h1>';
+		    $msg.='<h1>'.&mt('Not open to be viewed').'</h1>';
 		}
 		if ($status eq 'CLOSED' || $status eq 'INVALID_ACCESS') {
 		    $msg.='The problem '.$accessmsg;
@@ -582,10 +593,14 @@ sub end_problem {
     my $status=$Apache::inputtags::status['-1'];
     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' || $Apache::lonhomework::scantronmode)) {
+	if ( $target eq 'grade' && $Apache::inputtags::part eq '0') {
 	    # if part is zero, no <part>s existed, so we need to the grading
-	    &Apache::inputtags::grade;
+	    if ($status eq 'CAN_ANSWER' ||$Apache::lonhomework::scantronmode) {
+		&Apache::inputtags::grade;
+	    } else {
+		# move any submission data to .hidden
+		&Apache::inputtags::hidealldata($Apache::inputtags::part);
+	    }
 	} elsif ( ($target eq 'web' || $target eq 'tex') &&
 		  $Apache::inputtags::part eq '0' &&
 		  $status ne 'UNCHECKEDOUT') {
@@ -650,7 +665,10 @@ sub end_problem {
 sub start_library {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my ($result,$head_tag_start,$body_tag_start,$form_tag_start);
-    if ($$tagstack[0] eq 'library') { &init_problem_globals('library') };
+    if ($$tagstack[0] eq 'library') {
+	&init_problem_globals('library');
+	$Apache::lonhomework::type='problem';
+    }
     if ($target eq 'edit') {
 	($result,$head_tag_start,$body_tag_start,$form_tag_start)=
 	    &page_start($target,$token,$tagstack,$parstack,$parser,$safeeval);
@@ -965,12 +983,13 @@ sub shuffle {
     my $a=shift;
     my $i;
     if (defined(@$a)) {
-	&Apache::response::setrandomnumber();
+	&Apache::response::pushrandomnumber();
 	for($i=@$a;--$i;) {
 	    my $j=int(&Math::Random::random_uniform() * ($i+1));
 	    next if $i == $j;
 	    @$a[$i,$j] = @$a[$j,$i];
 	}
+	&Apache::response::poprandomnumber();
     }
 }
 
@@ -994,8 +1013,7 @@ sub start_part {
     @Apache::inputtags::response=();
     @Apache::inputtags::previous=();
     @Apache::inputtags::previous_version=();
-    $Apache::lonhomework::problemstatus=
-	&Apache::lonnet::EXT("resource.$id.problemstatus");
+    $Apache::lonhomework::problemstatus=&get_problem_status($id);
     my $hidden=&Apache::loncommon::check_if_partid_hidden($Apache::inputtags::part);
     my $expression='$external::part=\''.$Apache::inputtags::part.'\';';
     &Apache::run::run($expression,$safeeval);
@@ -1015,7 +1033,7 @@ sub start_part {
 	    $expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.$id.solved"}.'";';
 	    &Apache::run::run($expression,$safeeval);
 	    if ($ENV{'request.state'} eq 'construct') {
-		&set_problem_status($Apache::inputtags::part); 
+		&set_problem_state($Apache::inputtags::part); 
 	    }
 	    if (( $status eq 'CLOSED' ) ||
 		( $status eq 'UNCHECKEDOUT') ||
@@ -1080,10 +1098,14 @@ sub end_part {
     my $result='';
     if ( $target eq 'meta' ) {
 	$result='';
-    } elsif ($target eq 'grade' && 
-	     ($status eq 'CAN_ANSWER' || $Apache::lonhomework::scantronmode) &&
-	     !$hidden) {
-	$result=&Apache::inputtags::grade;
+    } elsif ($target eq 'grade') {
+	if (($status eq 'CAN_ANSWER' || $Apache::lonhomework::scantronmode) &&
+	    !$hidden) {
+	    $result=&Apache::inputtags::grade;
+	} else {
+	    # move any submission data to .hidden
+	    &Apache::inputtags::hidealldata($Apache::inputtags::part);
+	}
     } elsif (($target eq 'web' || $target eq 'tex') && !$hidden ) {
 	my $gradestatus=&Apache::inputtags::gradestatus($Apache::inputtags::part,
 							$target);
@@ -1168,6 +1190,48 @@ sub end_solved {
     return '';
 }
 
+sub start_problemtype {
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+    my $result;
+    if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
+	$target eq 'tex' || $target eq 'analyze') {
+	my $mode=lc(&Apache::lonxml::get_param('mode',$parstack,$safeeval));
+	if (!defined($mode)) { $mode='show'; }
+	my $for=&Apache::lonxml::get_param('for',$parstack,$safeeval);
+	my $found=0;
+	foreach my $type (split(',',$for)) {
+	    if ($Apache::lonhomework::type eq lc($type)) { $found=1; }
+	}
+	if ($mode eq 'show' && !$found) {
+	    &Apache::lonxml::get_all_text("/problemtype",$parser);
+	}
+	if ($mode eq 'hide' && $found) {
+	    &Apache::lonxml::get_all_text("/problemtype",$parser);
+	}
+    } elsif ($target eq 'edit') {
+	$result .=&Apache::edit::tag_start($target,$token);
+	$result.=&Apache::edit::select_arg('Mode:','mode',
+					   [['show','Show'],
+					    ['hide','Hide']]
+					   ,$token);
+	$result .=&Apache::edit::checked_arg('When used as type(s):','for',
+					     [ ['exam','Exam/Quiz Problem'],
+					       ['survey','Survey'],
+					       ['problem','Homework Problem'] ]
+					     ,$token);
+	$result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
+    } elsif ($target eq 'modified') {
+	my $constructtag=&Apache::edit::get_new_args($token,$parstack,
+						     $safeeval,'mode','for');
+	if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
+    }
+    return $result;
+}
+
+sub end_problemtype {
+    return '';
+}
+
 sub start_startouttext {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my @result=(''.'');