--- loncom/homework/optionresponse.pm	2014/11/27 17:37:09	1.194
+++ loncom/homework/optionresponse.pm	2014/11/28 18:23:04	1.195
@@ -1,7 +1,7 @@
 # LearningOnline Network with CAPA
 # option list style responses
 #
-# $Id: optionresponse.pm,v 1.194 2014/11/27 17:37:09 raeburn Exp $
+# $Id: optionresponse.pm,v 1.195 2014/11/28 18:23:04 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -124,6 +124,8 @@ sub start_foilgroup {
         sel => 'Select Options',
         add => 'Add new Option:',
         del => 'Delete an Option:',
+        maxcheck => 'Enter maximum number students may check (e.g., 3)',
+        mincheck => 'Enter minimum number students need to check (e.g., 1)',
     );
     $result.= (<<ENDTABLE);
       <tr><td>$lt{'sel'}</td>
@@ -147,12 +149,37 @@ ENDTABLE
        $result.='>'.$option.'</option>';
     }
     $result.='</select></label> ';
+    my %checknumtxt = (
+                        maxcheck => 'Max. boxes permitted to check',
+                        mincheck => 'Min. boxes required to check',
+    );
+    my (%onclicknum,%checknum);
+    foreach my $item ('maxcheck','mincheck') {
+        $onclicknum{$item} = 'onclick="'."updateNumber('$item','$Apache::lonxml::curdepth','check','$lt{$item}');".'"';
+        $checknum{$item} = &Apache::lonxml::get_param($item,$parstack,$safeeval);
+    }
     $result.=&Apache::edit::checked_arg('Checkbox options:','checkboxoptions',
                                          [ ['nochoice',"Don't show option list"] ]
                                          ,$token).' '.
              &Apache::edit::checked_arg('','noprompt',
                                          [ ['nochoice','Omit "Select all that are ... "' ] ]
-                                         ,$token).'</td>';
+                                         ,$token);
+    foreach my $item ('maxcheck','mincheck') {
+        my $currnum = $checknum{$item};
+        unless ($currnum =~ /^\d+$/) {
+            $currnum = 'nochoice';
+        } 
+        $result.= ' <span class="LC_nobreak">'.
+                  &Apache::edit::checked_arg('',$item,[ [$currnum,$checknumtxt{$item}] ],
+                                        $token,$onclicknum{$item},1).' '.
+                  '<span id="'.$item.'_numtext_'.$Apache::lonxml::curdepth.'">';
+        if ($checknum{$item} ne '') {
+            $result .= ':&nbsp;<a href="javascript:updateNumber('."'$item','$Apache::lonxml::curdepth','link','$lt{$item}'".')">'.
+                       $checknum{$item}.'</a>';
+        }
+        $result .= '</span></span>';
+    } 
+    $result.= '</td>';
     $result.= &Apache::edit::end_row();
     $result.= &Apache::edit::start_spanning_row();
     $result.= $insertlist.'<br />';
@@ -177,7 +204,22 @@ ENDTABLE
     }
     my $rebuildtag = &Apache::edit::get_new_args($token,$parstack,$safeeval,
 						 'texoptions','checkboxvalue','checkboxoptions',
-                                                 'noprompt');
+                                                 'noprompt','maxcheck','mincheck');
+    if ($rebuildtag) {
+        my $maxcheck = $token->[2]->{'maxcheck'};
+        my $mincheck = $token->[2]->{'mincheck'};
+        if ($mincheck =~ /D/) {
+            $token->[2]->{'mincheck'}='';
+        }
+        if ($maxcheck =~ /D/) {
+            $token->[2]->{'maxcheck'}='';
+        }
+        if (($mincheck ne '') && ($maxcheck ne '')) {
+            if ($mincheck > $maxcheck) {
+                $token->[2]->{'mincheck'}=$maxcheck; 
+            }
+        }
+    }
     if ($optchanged || $rebuildtag ) {
       $result = "<foilgroup options=\"(";
       foreach my $option (@options) {
@@ -190,7 +232,9 @@ ENDTABLE
       $result .= 'texoptions="'.$token->[2]{'texoptions'}.'" ';
       $result .= 'checkboxoptions="'.$token->[2]{'checkboxoptions'}.'" ';
       $result .= 'checkboxvalue="'.$token->[2]{'checkboxvalue'}.'" ';
-      $result .= 'noprompt="'.$token->[2]{'noprompt'}.'"';
+      $result .= 'noprompt="'.$token->[2]{'noprompt'}.'" ';
+      $result .= 'maxcheck="'.$token->[2]{'maxcheck'}.'" ';
+      $result .= 'mincheck="'.$token->[2]{'mincheck'}.'"';
       $result .= '>';
     } # else nothing changed so just use the default mechanism
   }
@@ -220,6 +264,10 @@ sub end_foilgroup {
 					     -2,0);
     my $checkboxvalue=&Apache::lonxml::get_param('checkboxvalue',$parstack,$safeeval);
     my $checkboxchoices=(&Apache::lonxml::get_param('checkboxoptions',$parstack,$safeeval) ne 'nochoice');
+    my $maxcheck=&Apache::lonxml::get_param('maxcheck', $parstack, $safeeval);
+    $maxcheck =~ s/\D+//g;
+    my $mincheck=&Apache::lonxml::get_param('mincheck', $parstack, $safeeval);
+    $mincheck =~ s/\D+//g;
     my $noprompt=&Apache::lonxml::get_param('noprompt', $parstack, $safeeval);
 
     if ($target eq 'tex' && $tex_option_switch eq 'nochoice') {@opt=();}
@@ -228,7 +276,7 @@ sub end_foilgroup {
     my $randomize = &Apache::lonxml::get_param('randomize',$parstack,
 					       $safeeval,'-2');
     if ($target eq 'web' || $target eq 'tex') {
-      $result.=&displayfoils($target,$max,$randomize,$TeXlayout,$checkboxvalue,$checkboxchoices,$tex_option_switch, $noprompt, @opt);
+      $result.=&displayfoils($target,$max,$randomize,$TeXlayout,$checkboxvalue,$checkboxchoices,$tex_option_switch, $noprompt,$maxcheck,$mincheck, @opt);
       $Apache::lonxml::post_evaluate=0;
     } elsif ( $target eq 'answer') {
       $result.=&displayanswers($max,$randomize,@opt);
@@ -250,6 +298,7 @@ sub end_foilgroup {
 	my $right=0;
 	my $wrong=0;
 	my $ignored=0;
+        my $checked=0;
         my ($numrows,$bubbles_per_row);
         if ($Apache::lonhomework::scantronmode) {
             my $numitems = scalar(@opt);
@@ -259,6 +308,26 @@ sub end_foilgroup {
         if ($numrows < 1) {
             $numrows = 1;
         }
+        my $checkboxopt;
+        if ($checkboxvalue) {
+            $checkboxopt = &check_box_opt($target,$checkboxvalue,@opt);
+            if (($checkboxopt) && ($Apache::lonhomework::type !~ /survey/)) {
+                my $corrnumcheck = 0;
+                if (($maxcheck ne '') || ($mincheck ne '')) {
+                    foreach $name (@whichopt) {
+                        if ($Apache::response::foilgroup{$name.'.value'} eq $checkboxopt) {
+                            $corrnumcheck ++; 
+                        }
+                    }
+                    if (($maxcheck ne '') && ($corrnumcheck > $maxcheck)) {
+                        $maxcheck = $corrnumcheck;
+                    }
+                    if (($mincheck ne '') && ($corrnumcheck < $mincheck)) {
+                        $mincheck = $corrnumcheck;
+                    }
+                }
+            }
+        }
 	foreach $name (@whichopt) {
 	  my $response;
           if ($env{'form.submitted'} eq 'scantron') {
@@ -296,6 +365,11 @@ sub end_foilgroup {
 	    } else {
 		$grade{$name}='0'; $wrong++;
 	    }
+            if ($checkboxopt) {
+                if ($response eq $checkboxopt) {
+                    $checked++;
+                }
+            } 
 	  } else {
 	    $ignored++;
 	  }
@@ -314,65 +388,76 @@ sub end_foilgroup {
         if ($Apache::lonhomework::type eq 'randomizetry') {
             $Apache::lonhomework::results{"resource.$part.$id.foilorder"} = &Apache::lonnet::array2str(@whichopt);
         }
-	if (($Apache::lonhomework::type eq 'survey') ||
-            ($Apache::lonhomework::type eq 'surveycred') ||
-            ($Apache::lonhomework::type eq 'anonsurvey') ||
-            ($Apache::lonhomework::type eq 'anonsurveycred')) {
-	    if ($ignored == 0) {
-                my $ad;
-                if ($Apache::lonhomework::type eq 'anonsurveycred') {
-                    $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='ANONYMOUS_CREDIT';
-                } elsif ($Apache::lonhomework::type eq 'anonsurvey') {
-                    $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='ANONYMOUS';
-                } elsif ($Apache::lonhomework::type eq 'surveycred') {
-                    $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='SUBMITTED_CREDIT';
-                } else {
-		    $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='SUBMITTED';
-                }
-		&Apache::response::handle_previous(\%previous,$ad);
-	    } elsif ($wrong==0 && $right==0) {
-	    } else {
-		my $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='MISSING_ANSWER';
-		&Apache::response::handle_previous(\%previous,$ad);
-	    }
-	} elsif ($nonlenient) {
+        my $skipaward;
+        if ($checkboxvalue) {
+            if ((($maxcheck ne '') && ($checked > $maxcheck)) ||
+                (($mincheck ne '') && ($checked < $mincheck))) {
+                my $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='WRONG_NUMBOXESCHECKED';
+                &Apache::response::handle_previous(\%previous,$ad);
+                $skipaward = 1;
+            }
+        }
+        unless ($skipaward) {
+	    if (($Apache::lonhomework::type eq 'survey') ||
+                ($Apache::lonhomework::type eq 'surveycred') ||
+                ($Apache::lonhomework::type eq 'anonsurvey') ||
+                ($Apache::lonhomework::type eq 'anonsurveycred')) {
+	        if ($ignored == 0) {
+                    my $ad;
+                    if ($Apache::lonhomework::type eq 'anonsurveycred') {
+                        $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='ANONYMOUS_CREDIT';
+                    } elsif ($Apache::lonhomework::type eq 'anonsurvey') {
+                        $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='ANONYMOUS';
+                    } elsif ($Apache::lonhomework::type eq 'surveycred') {
+                        $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='SUBMITTED_CREDIT';
+                    } else {
+		        $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='SUBMITTED';
+                    }
+		    &Apache::response::handle_previous(\%previous,$ad);
+	        } elsif ($wrong==0 && $right==0) {
+	        } else {
+		    my $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='MISSING_ANSWER';
+		    &Apache::response::handle_previous(\%previous,$ad);
+	        }
+	    } elsif ($nonlenient) {
 #
 # Non-lenient mode. All right or all wrong
 #
-	    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 {
+	        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 {
 #
 # This is lenient mode
 #
-	    my $ad;
-	    if ($wrong==0 && $right==0) {
-		#nothing submitted only assign a score if we 
-		#need to override a previous grade
-		if (defined($Apache::lonhomework::history{"resource.$part.$id.awarddetail"})) {
+	        my $ad;
+	        if ($wrong==0 && $right==0) {
+		    #nothing submitted only assign a score if we 
+		    #need to override a previous grade
+		    if (defined($Apache::lonhomework::history{"resource.$part.$id.awarddetail"})) {
+		        $ad='ASSIGNED_SCORE';
+		    }
+	        } else {
 		    $ad='ASSIGNED_SCORE';
-		}
-	    } 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.awarddetail"}=$ad;
+	        $Apache::lonhomework::results{"resource.$part.$id.awarded"}=
+		    $right/(scalar(@whichopt));
+	        $Apache::lonhomework::results{"resource.$part.$id.numfoils"}=
+		    scalar(@whichopt);
+	     }
+       }
       }
     }
     my $part_id     = $Apache::inputtags::part;
@@ -481,7 +566,7 @@ sub check_box_opt {
 # Check if we are in checkbox mode: checkboxvalue specified, on web, only two options.
 # If so, return "checked" value
     if ($#opt!=1) { return ''; }
-    if ($target ne 'web') { return ''; }
+    unless (($target eq 'web') || ($target eq 'grade')) { return ''; }
     return $checkboxvalue;
 }
 
@@ -508,7 +593,7 @@ sub check_for_invalid {
 
 sub displayfoils {
   my ($target,$max,$randomize,$TeXlayout,$checkboxvalue,$checkboxchoices,
-      $tex_option_switch, $no_tfprompt, @opt)=@_;
+      $tex_option_switch, $no_tfprompt, $maxcheck, $mincheck, @opt)=@_;
   my @names; 
   if (ref($Apache::response::foilgroup{'names'}) eq 'ARRAY') {
       @names = @{ $Apache::response::foilgroup{'names'} };
@@ -594,7 +679,10 @@ sub displayfoils {
         }
     }
     my $internal_counter=$Apache::lonxml::counter;
-    my $checkboxopt=&check_box_opt($target,$checkboxvalue,@opt);
+    my $checkboxopt;
+    if ($target eq 'web') {
+        $checkboxopt=&check_box_opt($target,$checkboxvalue,@opt);
+    }
     if ($checkboxopt && (!$no_tfprompt)) {
        $result.='<br />'.
                 ($checkboxchoices?&mt('Choices: ').'<b>'.$opt[0].','.$opt[1].'</b>. ':'').