--- loncom/homework/optionresponse.pm	2002/10/17 17:13:44	1.53
+++ loncom/homework/optionresponse.pm	2003/05/16 20:16:18	1.77
@@ -1,7 +1,7 @@
 # LearningOnline Network with CAPA
 # option list style responses
 #
-# $Id: optionresponse.pm,v 1.53 2002/10/17 17:13:44 albertel Exp $
+# $Id: optionresponse.pm,v 1.77 2003/05/16 20:16:18 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -42,6 +42,7 @@ sub start_optionresponse {
   &Apache::lonxml::register('Apache::optionresponse',('foilgroup','foil','conceptgroup'));
   push (@Apache::lonxml::namespace,'optionresponse');
   my $id = &Apache::response::start_response($parstack,$safeeval);
+  %Apache::hint::option=();
   if ($target eq 'edit') {
     $result.=&Apache::edit::start_table($token).
 	"<tr><td>Multiple Option Response Question</td><td>Delete:".
@@ -140,7 +141,7 @@ ENDTABLE
       $result.=')">';
     } # else nothing changed so just use the default mechanism
   }
-  if ($target eq 'tex') {
+  if ($target eq 'tex' and $Apache::lonhomework::type ne 'exam') {
       $result .= ' \begin{enumerate} ';
   }
   return $result;
@@ -179,16 +180,24 @@ sub end_foilgroup {
 	my @whichopt = &whichfoils($max,$randomize);
 	my $temp=1;my $name;
 	my %responsehash;
+	my %grade;
 	my $right=0;
 	my $wrong=0;
 	my $ignored=0;
 	foreach $name (@whichopt) {
-	  my $response = $ENV{'form.HWVAL_'.$Apache::inputtags::response['-1'].":$temp"};
+	  my $response=&Apache::response::getresponse($temp);
+	  if ($ENV{'form.submitted'} eq 'scantron') {
+	      $response = $opt[$response];
+	  }
 	  $responsehash{$name}=$response;
 	  if ( $response =~ /[^\s]/) {
 	    my $value=$Apache::response::foilgroup{$name.'.value'};
 	    &Apache::lonxml::debug("submitted a $response for $value<br />\n");
-	    if ($value eq $response) {$right++;} else {$wrong++;}
+	    if ($value eq $response) {
+		$grade{$name}='1'; $right++;
+	    } else {
+		$grade{$name}='0'; $wrong++;
+	    }
 	  } else {
 	    $ignored++;
 	  }
@@ -197,32 +206,51 @@ sub end_foilgroup {
 	my $part=$Apache::inputtags::part;
 	my $id = $Apache::inputtags::response['-1'];
 	my $responsestr=&Apache::lonnet::hash2str(%responsehash);
+	my $gradestr   =&Apache::lonnet::hash2str(%grade);
 	my %previous=&Apache::response::check_for_previous($responsestr,
 							   $part,$id);
 	&Apache::lonxml::debug("Got $right right and $wrong wrong, and $ignored were ignored");
-	my $ad;
-	if ($wrong==0 && $ignored==0) {
-	  $ad='EXACT_ANS';
-	} elsif ($wrong==0 && $right==0) {
-	  #nothing submitted
+	$Apache::lonhomework::results{"resource.$part.$id.submission"}=
+	    $responsestr;
+	$Apache::lonhomework::results{"resource.$part.$id.submissiongrading"}=$gradestr;
+	
+	if (!$Apache::lonhomework::scantronmode) {
+	    my $ad;
+	    if ($wrong==0 && $ignored==0) {
+		$ad='EXACT_ANS';
+	    } elsif ($wrong==0 && $right==0) {
+		#nothing submitted
+	    } else {
+		if ($ignored==0) {
+		    $ad='INCORRECT';
+		} else {
+		    $ad='MISSING_ANSWER';
+		}
+	    }
+	    $Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$ad;
+	    &Apache::response::handle_previous(\%previous,$ad);
 	} else {
-	  if ($ignored==0) {
-	    $ad='INCORRECT';
-	  } else {
-	    $ad='MISSING_ANSWER';
-	  }
+	    my $ad;
+	    if ($wrong==0 && $right==0) {
+		#nothing submitted
+	    } else {
+		$ad='ASSIGNED_SCORE';
+	    }
+	    $Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$ad;
+	    $Apache::lonhomework::results{"resource.$part.$id.awarded"}=
+		$right/(scalar(@whichopt));
+	    $Apache::lonhomework::results{"resource.$part.$id.numfoils"}=
+		scalar(@whichopt);
 	}
-	$Apache::lonhomework::results{"resource.$part.$id.submission"}=
-	  $responsestr;
-	$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=
-	  $ad;
-	&Apache::response::handle_previous(\%previous,$ad);
       }
     }
+    &Apache::lonxml::increment_counter(&getfoilcounts($max));
   } elsif ($target eq 'edit') {
     $result.=&Apache::edit::end_table();
-  }  
-  if ($target eq 'tex') {$result .= '\end{enumerate}';}
+  }
+  if ($target eq 'tex' and $Apache::lonhomework::type ne 'exam') {
+      $result .= '\end{enumerate}';
+  }
   return $result;
 }
 
@@ -237,55 +265,15 @@ sub getfoilcounts {
 }
 
 sub whichfoils {
-  my ($max,$randomize)=@_;
-  $max = &getfoilcounts($max);
-  &Apache::lonxml::debug("randomize $randomize");
-  my @names = @{ $Apache::response::foilgroup{'names'} };
-  my @whichopt =();
-  my (%top,@toplist,%bottom,@bottomlist);
-  if (!(&Apache::response::showallfoils() || ($randomize eq 'no'))) {
-      my $current=0;
-      foreach my $name (@names) {
-	  $current++;
-	  if ($Apache::response::foilgroup{$name.'.location'} eq 'top') {
-	      $top{$name}=$current;
-	  } elsif ($Apache::response::foilgroup{$name.'.location'} eq
-		   'bottom') {
-	      $bottom{$name}=$current;
-	  }
-      }
-  }
-  while ((($#whichopt+1) < $max) && ($#names > -1)) {
-    &Apache::lonxml::debug("Have $#whichopt max is $max");
-    my $aopt;
-    if (&Apache::response::showallfoils() || ($randomize eq 'no')) {
-      $aopt=0;
-    } else {
-      $aopt=int(&Math::Random::random_uniform() * ($#names+1));
-    }
-    &Apache::lonxml::debug("From $#whichopt $max $#names elms, picking $aopt");
-    $aopt=splice(@names,$aopt,1);
-    &Apache::lonxml::debug("Picked $aopt");
-    if ($top{$aopt}) {
-	$toplist[$top{$aopt}]=$aopt;
-    } elsif ($bottom{$aopt}) {
-	$bottomlist[$bottom{$aopt}]=$aopt;
-    } else {
-	push (@whichopt,$aopt);
-    }
-  }
-  for (my $i=0;$i<=$#toplist;$i++) {
-      if ($toplist[$i]) { unshift(@whichopt,$toplist[$i]) }
-  }
-  for (my $i=0;$i<=$#bottomlist;$i++) {
-      if ($bottomlist[$i]) { push(@whichopt,$bottomlist[$i]) }
-  }
-
-  return @whichopt;
+    my ($max,$randomize)=@_;
+    return &Apache::response::whichorder($max,$randomize,
+					 &Apache::response::showallfoils(),
+					 \%Apache::response::foilgroup);
 }
 
 sub displayanswers {
   my ($max,$randomize,@opt)=@_;
+  if (!defined(@{ $Apache::response::foilgroup{'names'} })) {return;}
   my @names = @{ $Apache::response::foilgroup{'names'} };
   my @whichopt = &whichfoils($max,$randomize);
   my $result=&Apache::response::answer_header('optionresponse');
@@ -299,36 +287,68 @@ sub displayanswers {
 
 sub displayfoils {
   my ($target,$max,$randomize,@opt)=@_;
+  if (!defined(@{ $Apache::response::foilgroup{'names'} })) {return;}
   my @names = @{ $Apache::response::foilgroup{'names'} };
   my @truelist;
   my @falselist;
   my $result;
   my $name;
   my $displayoptionintex=0;
-  my @alphabet = ('A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P',
-		  'Q','R','S','T','U','V','W','X','Y','Z');
+  my @alphabet = ('A'..'Z');
   my @whichopt = &whichfoils($max,$randomize);
   my $part=$Apache::inputtags::part;
   my $id=$Apache::inputtags::response[-1];
-  if (($Apache::lonhomework::history{"resource.$part.solved"} =~ /^correct/)  || ($Apache::inputtags::status[-1] eq  'SHOW_ANSWER')) {
+  my $break;
+  my $solved=$Apache::lonhomework::history{"resource.$part.solved"};
+  my $status=$Apache::inputtags::status[-1];
+  if (
+      ($target ne 'tex') &&
+      (($solved =~ /^correct/) || ($status eq 'SHOW_ANSWER')) ) {
     foreach $name (@whichopt) {
-      if ($target eq 'web') {
-	  $result.="<br />";
+	my $text=$Apache::response::foilgroup{$name.'.text'};
+	if ($text!~/^\s*$/) {
+	    if ($target eq 'tex') {
+		$break='\vskip 0 mm ';
+	    } elsif ($target eq 'web') {
+		$break='<br />';
+	    }
+	}
+	$result.=$break;
+	if ($target eq 'web') {
+	    my $value=$Apache::response::foilgroup{$name.'.value'};
+	    if (!($text=~s|<drawoptionlist\s*/>|$value|)) {
+		if ($text=~/^\s*$/) {
+		    $text=$value.$text;
+		} else {
+		    $text=$value.': '.$text;
+		}
+	    }
+	    $result.=$text."\n";
       } elsif ($target eq 'tex') {
-	  $result.='\vskip 0 mm ';
-      }
-      if ($target ne 'tex') {
-	  $result .=$Apache::response::foilgroup{$name.'.value'}.
-	      ":".$Apache::response::foilgroup{$name.'.text'}."\n";
-      } else {
- 	  $result .='\item '.$Apache::response::foilgroup{$name.'.value'}.
+	  $Apache::response::foilgroup{$name.'.text'}=~s/\\item//;
+ 	  $result .='\item \textit{'.$Apache::response::foilgroup{$name.'.value'}.'}'.
 	      ":".$Apache::response::foilgroup{$name.'.text'}."\n";
       }
+      if ($Apache::lonhomework::type eq 'exam') {
+	if ($target ne 'tex') {
+	  $result.=&webbubbles(\@opt,\@alphabet);
+        } else {
+	  $result.=&bubbles(\@alphabet,\@opt);
+        }
+      }
     }
   } else {
     my $temp=1;
     my %lastresponse=&Apache::lonnet::str2hash($Apache::lonhomework::history{"resource.$part.$id.submission"});
     foreach $name (@whichopt) {
+      my $text=$Apache::response::foilgroup{$name.'.text'};
+      if ($text!~/^\s*$/) {
+	  if ($target eq 'tex') {
+	      $break='\vskip 0 mm ';
+	  } elsif ($target eq 'web') {
+	      $break='<br />';
+	  }
+      }
       my $lastopt=$lastresponse{$name};
       my $optionlist="<option></option>\n";
       my $option;
@@ -340,62 +360,69 @@ sub displayfoils {
 	}
       }
       if ($target ne 'tex') {
-	  $result.="<br /><select name=\"HWVAL_$Apache::inputtags::response['-1']:$temp\">"
-	      .$optionlist
-		  ."</select>\n".$Apache::response::foilgroup{$name.'.text'}."\n";
+	  if ($Apache::lonhomework::type ne 'exam') {
+	    $optionlist='<select name="HWVAL_'.
+	      $Apache::inputtags::response['-1'].':'.$temp.'">'.
+		  $optionlist."</select>\n";
+	  }
+	  my $text=$Apache::response::foilgroup{$name.'.text'};
+	  if (!($text=~s|<drawoptionlist\s*/>|$optionlist|) && $Apache::lonhomework::type ne 'exam') {
+	      $text=$optionlist.$text;
+	  }
+	  $result.=$break.$text."\n";
 	  if ($Apache::lonhomework::type eq 'exam') {
-		  my $number_of_bubbles = $#opt + 1;
-		  $result.= '<table border="1"><tr>';
-		  for (my $ind=0;$ind<$number_of_bubbles;$ind++) {
-		      $result.='<td>'.$alphabet[$ind].': '.$opt[$ind].'</td>';
-		  }
-		  $result.='</tr></table>';
+	    $result.=&webbubbles(\@opt,\@alphabet,$temp);
 	  }
 	  $temp++;
       } else {
+          my $texoptionlist = &optionlist_correction($optionlist);
 	  if ($displayoptionintex == 0) {
-              my $texoptionlist = &optionlist_correction($optionlist);
-	      if ($Apache::lonhomework::type eq 'exam') {$texoptionlist='';}
+	      if ($Apache::lonhomework::type eq 'exam') {$texoptionlist='';} #if exam we do not need to show optionlist
 	      if ($Apache::response::foilgroup{$name.'.text'}=~m/\\item /) {
-		  if ($Apache::lonhomework::type eq 'exam') {
-		      $Apache::response::foilgroup{$name.'.text'}=~s/\\item/\\item[\\textbf{$Apache::lonxml::counter}\.]/;
-		  }
-		  $result.= $texoptionlist.$Apache::response::foilgroup{$name.'.text'};
+		if ($Apache::lonhomework::type eq 'exam') {
+	          $Apache::response::foilgroup{$name.'.text'}=~s/\\item/\\vskip 2 mm/;
+	        }
+	        if ($Apache::response::foilgroup{$name.'.text'}=~/<drawoptionlist\s*\/>/) {
+	          $Apache::response::foilgroup{$name.'.text'}=~s|<drawoptionlist\s*/>| \\makebox\[0\.3in\]\[b\]\{\\hrulefill\} |;
+	        }
+		$result.= $texoptionlist.$Apache::response::foilgroup{$name.'.text'};
 	      } else {
 		  if ($Apache::lonhomework::type eq 'exam') {
-		      $result.= $texoptionlist.'\item[\textbf{'.$Apache::lonxml::counter.'}.]'.$Apache::response::foilgroup{$name.'.text'};
+		      $result.= $texoptionlist.'  '.$Apache::response::foilgroup{$name.'.text'};
 		  } else {
-		      $result.= $texoptionlist.'\item '.$Apache::response::foilgroup{$name.'.text'};
+		      $result.= $texoptionlist.'\vspace*{-2 mm}\item '.$Apache::response::foilgroup{$name.'.text'};
 		  }
 	      }
 	      if ($Apache::lonhomework::type eq 'exam') {
-		  $result.=&bubbles(\@alphabet,\@opt);
+		  $result.='\vskip -2 mm\parbox{\textwidth}{\begin{enumerate}\item[\textbf{'.$Apache::lonxml::counter.'}.]\parbox{\textwidth - 5 mm}{'.&bubbles(\@alphabet,\@opt).'}\end{enumerate}} \vskip -9 mm \strut ';
 	      }
 	      $displayoptionintex=1;
 	  } else {
 	      if ($Apache::response::foilgroup{$name.'.text'}=~m/\\item /) {
 		  if ($Apache::lonhomework::type eq 'exam') {
-		      $Apache::response::foilgroup{$name.'.text'}=~s/\\item/\\item[\\textbf{$Apache::lonxml::counter}\.]/;
+		      $Apache::response::foilgroup{$name.'.text'}=~s/\\item//;
 		  }
-		  $result.= $Apache::response::foilgroup{$name.'.text'};
+	        if ($Apache::response::foilgroup{$name.'.text'}=~/<drawoptionlist\s*\/>/) {
+	          $Apache::response::foilgroup{$name.'.text'}=~s|<drawoptionlist\s*/>| \\makebox\[0\.3in\]\[b\]\{\\hrulefill\} |;
+	        }
+		$result.= $Apache::response::foilgroup{$name.'.text'};
 	      } else {
 		  if ($Apache::lonhomework::type eq 'exam') {
-		      $result.= '\item[\textbf{'.$Apache::lonxml::counter.'}.]'.$Apache::response::foilgroup{$name.'.text'};
+		      $result.= '  '.$Apache::response::foilgroup{$name.'.text'};
 		  } else {
 		      $result.= '\item '.$Apache::response::foilgroup{$name.'.text'};
 		  }
 	      }
 	      if ($Apache::lonhomework::type eq 'exam') {
-		  $result.=&bubbles(\@alphabet,\@opt);
+		  $result.='\vskip -2 mm \parbox{\textwidth}{\begin{enumerate}\item[\textbf{'.$Apache::lonxml::counter.'}.]\parbox{\textwidth - 5 mm}{'.&bubbles(\@alphabet,\@opt).'}\end{enumerate}} \vskip -9 mm \strut ';
 	      }
 	  }
-      } 
+      }
     }
-  } 
-  if ($target ne 'tex') {
-      return $result."<br />";
   }
-  else {
+  if ($target ne 'tex') {
+      return $result.$break;
+  } else {
       return $result;
   }
 }
@@ -412,10 +439,28 @@ sub optionlist_correction {
     $texoptionlist =~ s/>/\$>\$/g;
     $texoptionlist =~ s/</\$<\$/g;
     $texoptionlist =~ s/=/\$=\$/g;
+    $texoptionlist =~ s/\^(\d+)/<m>\$$1\$<\/m>/g;
     return $texoptionlist;
 }
 
 
+sub webbubbles {
+
+    my ($ropt,$ralphabet,$temp)=@_;
+    my @opt=@$ropt; 
+    my @alphabet=@$ralphabet;
+    my $result='';
+	my $number_of_bubbles = $#opt + 1;
+	$result.= '<table border="1"><tr>';
+	for (my $ind=0;$ind<$number_of_bubbles;$ind++) {
+	   $result.='<td><input type="radio" name="HWVAL_'.$Apache::inputtags::response['-1'].':'.$temp.
+                    '" value='.$opt[$ind].'>'.$alphabet[$ind].': '.$opt[$ind].'</td>';
+	}
+	$result.='</tr></table>';
+	return $result;
+}
+
+
 sub bubbles {
 
     my ($ralphabit,$ropt) = @_;
@@ -438,7 +483,6 @@ sub bubbles {
 	}
 
     }
-    &Apache::lonxml::increment_counter();
     return $result;
 }
 
@@ -497,6 +541,12 @@ sub end_conceptgroup {
 	  $Apache::lonhomework::analyze{"$part_id.foil.location.$name"} =
 	    $Apache::response::conceptgroup{"$name.location"};
 	}
+      } elsif ($target eq 'web') {
+	  my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]";
+	  push(@{ $Apache::hint::option{"$part_id.concepts"} },
+	       $concept);
+	  $Apache::hint::option{"$part_id.concept.$concept"}=
+	      $Apache::response::conceptgroup{'names'};
       }
     }
   } elsif ($target eq 'edit') {
@@ -545,7 +595,7 @@ sub end_foil {
   my $result = '';
   if ($target eq 'web' || $target eq 'tex') { 
       $text=&Apache::lonxml::endredirection;
-      if ($target eq 'tex') { $text = '\item '.$text; }
+      if ($target eq 'tex' and $Apache::lonhomework::type ne 'exam') { $text = '\vspace*{-2 mm}\item '.$text; }
   }
   if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' 
       || $target eq 'tex' || $target eq 'analyze') {
@@ -560,12 +610,28 @@ sub end_foil {
 	   && !&Apache::response::showallfoils() ) {
 	push @{ $Apache::response::conceptgroup{'names'} }, $name;
 	$Apache::response::conceptgroup{"$name.value"} = $value;
-	$Apache::response::conceptgroup{"$name.text"} = $text;
+	if ($target eq 'tex' and $Apache::lonhomework::type eq 'exam') {
+	    $Apache::response::conceptgroup{"$name.text"} = '\vskip 4 mm $\triangleright$ '.$text;
+	} else {
+	    if ($target eq 'tex' and $Apache::lonhomework::type eq 'exam') {
+		$Apache::response::conceptgroup{"$name.text"} = ' $\triangleright$ '.$text;
+	    } else {
+		$Apache::response::conceptgroup{"$name.text"} = $text;
+	    }
+	}
 	$Apache::response::conceptgroup{"$name.location"} = $location;
       } else {
 	push @{ $Apache::response::foilgroup{'names'} }, $name;
 	$Apache::response::foilgroup{"$name.value"} = $value;
-	$Apache::response::foilgroup{"$name.text"} = $text;
+	if ($Apache::lonhomework::type eq 'exam') {
+	    $Apache::response::foilgroup{"$name.text"} = '\vskip 5 mm $\triangleright$ '.$text;
+	} else {
+	    if ($target eq 'tex' and $Apache::lonhomework::type eq 'exam') {
+		$Apache::response::foilgroup{"$name.text"} = ' $\triangleright$ '.$text;
+	    } else {
+		$Apache::response::foilgroup{"$name.text"} = $text;
+	    }
+	}
 	$Apache::response::foilgroup{"$name.location"} = $location;
       }
     }