--- loncom/homework/matchresponse.pm	2003/02/20 08:57:51	1.2
+++ loncom/homework/matchresponse.pm	2003/02/20 09:55:07	1.4
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Full matching style response
 #
-# $Id: matchresponse.pm,v 1.2 2003/02/20 08:57:51 albertel Exp $
+# $Id: matchresponse.pm,v 1.4 2003/02/20 09:55:07 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -85,11 +85,24 @@ sub start_itemgroup {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result;
     %Apache::response::itemgroup=();
+    %Apache::matchresponse::itemtable=();
     if ($target eq 'edit') {
 	$result=&Apache::edit::tag_start($target,$token);
 	$result.=&Apache::edit::select_arg('Randomize Order:','randomize',
 					   ['yes','no'],$token);
+	$result.=&Apache::edit::select_arg('Items Display Location:',
+					   'location',
+					   ['top','bottom','left','right'],
+					   $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,'randomize',
+						     'location');
+	if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
+    } elsif ($target eq 'web') {
+	$Apache::matchresponse::itemtable{'location'}=
+	    &Apache::lonxml::get_param('location',$parstack,$safeeval);
     }
     return $result;
 }
@@ -102,7 +115,8 @@ sub end_itemgroup {
     my @names=@{ $Apache::response::itemgroup{'names'} };
     my $randomize =&Apache::lonxml::get_param('randomize',$parstack,$safeeval);
     if ($randomize ne 'no' ) {
-	@names=&Math::Random::random_permutation(@names);
+	@names=&whichorder($#names+1,$randomize,0,
+			   \%Apache::response::itemgroup)
     }
     my %letter_name_map;
     my %name_letter_map;
@@ -116,15 +130,16 @@ sub end_itemgroup {
     $Apache::response::itemgroup{'letter_name_map'}=\%letter_name_map;
     $Apache::response::itemgroup{'name_letter_map'}=\%name_letter_map;
     if ($target eq 'web') {
-	$result.='<table>';
+	my $table='<table>';
 	my $i=0;
 	foreach my $name (@names) {
-	    $result.='<tr><td>'.$alphabet[$i].'</td><td>'.
+	    $table.='<tr><td>'.$alphabet[$i].'</td><td>'.
 		$Apache::response::itemgroup{$name.'.text'}.
 		    '</td></tr>';
 	    $i++;
 	}
-	$result.='</table>';
+	$table.='</table>';
+	$Apache::matchresponse::itemtable{'display'}=$table;
     } elsif ($target eq 'edit') { $result=&Apache::edit::end_table(); }
     return $result;
 }
@@ -135,12 +150,20 @@ sub start_item {
     if ($target eq 'web' ) {
 	&Apache::lonxml::startredirection;
     } elsif ($target eq 'edit') {
+	my $randomize=&Apache::lonxml::get_param('randomize',$parstack,
+						 $safeeval,'-2');
 	$result=&Apache::edit::tag_start($target,$token,"Item");
 	$result.=&Apache::edit::text_arg('Name:','name',$token);
-	$result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
+	if ($randomize ne 'no') {
+	    $result.=&Apache::edit::select_arg('Location:','location',
+					       ['random','top','bottom'],
+					       $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,'name');
+						     $safeeval,'name',
+						     'location');
 	if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
     }
     return $result;
@@ -156,11 +179,14 @@ sub end_item {
     if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
 	$target eq 'edit') {
 	my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);
+	my $location=&Apache::lonxml::get_param('location',$parstack,
+						$safeeval);
 	&Apache::lonxml::debug("Got a name of :$name:");
 	if (!$name) { $name=$Apache::lonxml::curdepth; }
 	&Apache::lonxml::debug("Using a name of :$name:");
 	push @{ $Apache::response::itemgroup{'names'} }, $name;
 	$Apache::response::itemgroup{"$name.text"} = $text;
+	$Apache::response::itemgroup{"$name.location"} = $location;
     }
     if ($target eq 'edit') {
 	$result.= &Apache::edit::tag_end($target,$token,'');
@@ -217,7 +243,9 @@ sub displayanswers {
     my ($max,$randomize,@opt)=@_;
     if (!defined(@{ $Apache::response::foilgroup{'names'} })) { return; }
     my @names = @{ $Apache::response::foilgroup{'names'} };
-    my @whichfoils = &whichfoils($max,$randomize);
+    my @whichfoils = &whichorder(&getfoilcounts($max),$randomize,
+				 &Apache::response::showallfoils(),
+				 \%Apache::response::foilgroup);
     my $result=&Apache::response::answer_header('matchresponse');
     my %name_letter_map;
     if (defined(%{ $Apache::response::itemgroup{'name_letter_map'} })) {
@@ -236,7 +264,9 @@ sub displayanswers {
 
 sub grade_response {
     my ($max,$randomize)=@_;
-    my (@whichfoils)=&whichfoils($max,$randomize);
+    my (@whichfoils)=&whichorder(&getfoilcounts($max),$randomize,
+				 &Apache::response::showallfoils(),
+				 \%Apache::response::foilgroup);
     if (!defined($ENV{'form.submitted'})) { return; }
     my %responsehash;
     my %grade;
@@ -290,10 +320,24 @@ sub grade_response {
     &Apache::response::handle_previous(\%previous,$ad);
 }
 
+sub itemdisplay {
+    my ($location)=@_;
+    if ($location eq 'top' &&
+	!defined($Apache::matchresponse::itemtable{'location'})) {
+	return $Apache::matchresponse::itemtable{'display'};
+    }
+    if ($Apache::matchresponse::itemtable{'location'} eq $location) {
+	return $Apache::matchresponse::itemtable{'display'};
+    }
+    return undef;
+}
 sub displayfoils {
     my ($target,$max,$randomize)=@_;
     my $result;
-    my (@whichfoils)=&whichfoils($max,$randomize);
+    my $question;
+    my (@whichfoils)=&whichorder(&getfoilcounts($max),$randomize,
+				 &Apache::response::showallfoils(),
+				 \%Apache::response::foilgroup);
     my $part=$Apache::inputtags::part;
     my $solved=$Apache::lonhomework::history{"resource.$part.solved"};
     my $status=$Apache::inputtags::status[-1];
@@ -312,7 +356,7 @@ sub displayfoils {
 	    my $text=$Apache::response::foilgroup{$name.'.text'};
 	    my $value=$Apache::response::foilgroup{$name.'.value'};
 	    my $letter=$name_letter_map{$value};
-	    $result.='<br />'.$letter.':'.$text;
+	    $question.='<br />'.$letter.':'.$text;
 	}
     } else {
 	my $i = 0;
@@ -337,10 +381,21 @@ sub displayfoils {
 		$Apache::inputtags::response[-1].':'.$temp.'">'.
 		    $optionlist."</select>\n";
 	    my $text=$Apache::response::foilgroup{$name.'.text'};
-	    $result.='<br />'.$optionlist.$text."\n";
+	    $question.='<br />'.$optionlist.$text."\n";
 	    $temp++;
 	}
     }
+    if ($result=&itemdisplay('top')) {
+	$result.=$question;
+    } elsif ($result=&itemdisplay('bottom')) {
+	$result=$question.$result;
+    } elsif ($result=&itemdisplay('right')) {
+	$result='<table><tr><td>'.$question.'</td><td>'.$result.
+	    '</td></tr></table>';
+    } elsif ($result=&itemdisplay('left')) {
+	$result='<table><tr><td>'.$result.'</td><td>'.$question.
+	    '</td></tr></table>';
+    }
     $result.="<br />";
     return $result;
 }
@@ -355,37 +410,35 @@ sub getfoilcounts {
     return $count;
 }
 
-sub whichfoils {
-    my ($max,$randomize)=@_;
-    $max = &getfoilcounts($max);
- #   &Apache::lonxml::debug("man $max randomize $randomize");
-    if (!defined(@{ $Apache::response::foilgroup{'names'} })) { return; }
-    my @names = @{ $Apache::response::foilgroup{'names'} };
+sub whichorder {
+    my ($max,$randomize,$showall,$hash)=@_;
+    #&Apache::lonxml::debug("man $max randomize $randomize");
+    if (!defined(@{ $$hash{'names'} })) { return; }
+    my @names = @{ $$hash{'names'} };
     my @whichopt =();
     my (%top,@toplist,%bottom,@bottomlist);
-    if (!(&Apache::response::showallfoils() || ($randomize eq 'no'))) {
+    if (!($showall || ($randomize eq 'no'))) {
 	my $current=0;
 	foreach my $name (@names) {
 	    $current++;
-	    if ($Apache::response::foilgroup{"$name.location"} eq 'top') {
+	    if ($$hash{"$name.location"} eq 'top') {
 		$top{$name}=$current;
-	    } elsif ($Apache::response::foilgroup{"$name.location"} eq
-		     'bottom') {
+	    } elsif ($$hash{"$name.location"} eq 'bottom') {
 		$bottom{$name}=$current;
 	    }
 	}
     }
     while ((($#whichopt+1) < $max) && ($#names > -1)) {
-#	&Apache::lonxml::debug("Have $#whichopt max is $max");
+	#&Apache::lonxml::debug("Have $#whichopt max is $max");
 	my $aopt;
-	if (&Apache::response::showallfoils() || ($randomize eq 'no')) {
+	if ($showall || ($randomize eq 'no')) {
 	    $aopt=0;
 	} else {
 	    $aopt=int(&Math::Random::random_uniform() * ($#names+1));
 	}
-#	&Apache::lonxml::debug("From $#whichopt $max $#names elms, picking $aopt");
+	#&Apache::lonxml::debug("From $#whichopt $max $#names elms, picking $aopt");
 	$aopt=splice(@names,$aopt,1);
-#	&Apache::lonxml::debug("Picked $aopt");
+	#&Apache::lonxml::debug("Picked $aopt");
 	if ($top{$aopt}) {
 	    $toplist[$top{$aopt}]=$aopt;
 	} elsif ($bottom{$aopt}) {