--- loncom/interface/lonparmset.pm	2010/12/18 23:18:39	1.503
+++ loncom/interface/lonparmset.pm	2012/05/01 15:54:49	1.505.2.1.2.2
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.503 2010/12/18 23:18:39 raeburn Exp $
+# $Id: lonparmset.pm,v 1.505.2.1.2.2 2012/05/01 15:54:49 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1265,6 +1265,7 @@ sub parmmenu {
     function checkdisset() {
     checkthis('discussend','pscat');
      checkthis('discusshide','pscat');
+     checkthis('discussvote','pscat');
     }
 
     function checkcontdates() {
@@ -1403,6 +1404,7 @@ sub lookUpTableParameter {
         'acc' => 'misc',
         'maxcollaborators' => 'misc',
         'scoreformat' => 'misc',
+        'discussvote'  => 'misc',
 
     );    
 }
@@ -1748,12 +1750,11 @@ sub mapmenu {
         # Info about selectable folders/maps
         $r->print(
             '<div class="LC_info">'
-           .&mt('You can only select those maps and folders which can be currently parameterized.')
-         # .' '.&Apache::loncommon::help_open_topic('...') # Later: Add further help
+           .&mt('You can only select maps and folders which have modifiable settings.')
+           .' '.&Apache::loncommon::help_open_topic('Parameter_Set_Folder')
            .'</div>'
         );
 
-
         $r->print(&Apache::loncommon::start_data_table());
 
         # Display row: "All Maps or Folders"
@@ -1959,8 +1960,9 @@ sub standardkeyorder {
         'parameter_0_tol' => 16,
         'parameter_0_sig' => 17,
         'parameter_0_turnoffunit' => 18,
-            'parameter_0_discussend' => 19,
-            'parameter_0_discusshide' => 20);
+        'parameter_0_discussend' => 19,
+        'parameter_0_discusshide' => 20,
+        'parameter_0_discussvote' => 21);
 }
 
 
@@ -2119,7 +2121,11 @@ sub assessparms {
         my @types=split(/\&\&\&/,$env{'form.pres_type'});
         my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
         my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+        my $chome = $env{'course.'.$env{'request.course.id'}.'.home'};
+        my ($got_chostname,$chostname,$cmajor,$cminor);
+        my $totalstored = 0;
         for (my $i=0;$i<=$#markers;$i++) {
+            my ($needsrelease,$needsnewer,$name);
             if ($markers[$i] =~ /^[\d.]+\&0_availablestudent\&(1|2|3)$/) {
                 my (@ok_slots,@fail_slots,@del_slots);
                 my $courseopt=&Apache::lonnet::get_courseresdata($cnum,$cdom);
@@ -2150,21 +2156,39 @@ sub assessparms {
                         }
                     }
                 }
-            } elsif ($markers[$i] =~ /_type\&\d+$/) {
-                if (($values[$i] eq 'anonsurvey') || ($values[$i] eq 'anonsurveycred') || ($values[$i] eq 'randomizetry')) {
-                    &Apache::lonnet::update_released_required($Apache::lonnet::needsrelease{'parameter:type:'.$values[$i]});
+            } elsif ($markers[$i] =~ /_(type|discussvote)\&\d+$/) {
+                $name = $1;
+                $needsrelease =
+                    $Apache::lonnet::needsrelease{"parameter:$name:$values[$i]"};
+                if ($needsrelease) {
+                    unless ($got_chostname) {
+                        ($chostname,$cmajor,$cminor) = &parameter_release_vars();
+                        $got_chostname = 1;
+                    }
+                    $needsnewer = &parameter_releasecheck($name,$values[$i],
+                                                          $needsrelease,
+                                                          $chostname,
+                                                          $cmajor,$cminor);
                 }
             }
-            $message.=&storeparm(split(/\&/,$markers[$i]),
-                 $values[$i],
-                 $types[$i],
-                 $uname,$udom,$csec,$cgroup);
+            if ($needsnewer) {
+                $message .= &oldversion_warning($name,$values[$i],$chostname,$cmajor,
+                                                $cminor,$needsrelease);
+            } else {
+                $message.=&storeparm(split(/\&/,$markers[$i]),
+                                     $values[$i],
+                                     $types[$i],
+                                     $uname,$udom,$csec,$cgroup);
+                $totalstored ++;
+            }
         }
 # ---------------------------------------------------------------- Done storing
-        $message.='<p class="LC_warning">'
-                 .&mt('Changes can take up to 10 minutes before being active for all students.')
-                 .&Apache::loncommon::help_open_topic('Caching')
-                 .'</p>';
+        if ($totalstored) {
+            $message.='<p class="LC_warning">'
+                     .&mt('Changes can take up to 10 minutes before being active for all students.')
+                     .&Apache::loncommon::help_open_topic('Caching')
+                     .'</p>';
+        }
     }
 #----------------------------------------------- if all selected, fill in array
     if ($pscat[0] eq "all") {@pscat = (keys %allparms);}
@@ -2762,8 +2786,9 @@ sub storedata {
     undef %newdata;
     my @deldata=();
     undef @deldata;
-    foreach (keys %env) {
-    if ($_=~/^form\.([a-z]+)\_(.+)$/) {
+    my ($got_chostname,$chostname,$cmajor,$cminor);
+    foreach my $key (keys(%env)) { 
+    if ($key =~ /^form\.([a-z]+)\_(.+)$/) {
         my $cmd=$1;
         my $thiskey=$2;
         my ($tuname,$tudom)=&extractuser($thiskey);
@@ -2772,13 +2797,38 @@ sub storedata {
         $tkey=~s/\.\[useropt\:$tuname\:$tudom\]\./\./;
         }
         if ($cmd eq 'set' || $cmd eq 'datepointer' || $cmd eq 'dateinterval') {
-        my ($data, $typeof, $text);
+        my ($data, $typeof, $text, $name);
         if ($cmd eq 'set') {
-            $data=$env{$_};
+            $data=$env{$key};
             $typeof=$env{'form.typeof_'.$thiskey};
             $text = &mt('Saved modified parameter for');
+            if ($typeof eq 'string_questiontype') {
+                $name = 'type';    
+            } elsif ($typeof eq 'string_discussvote') {
+                $name = 'discussvote';
+            }
+            if ($name ne '') {
+                my ($needsrelease,$needsnewer);
+                $needsrelease = $Apache::lonnet::needsrelease{'parameter:type:'.$data};
+                if ($needsrelease) {
+                    unless ($got_chostname) {
+                        ($chostname,$cmajor,$cminor)=&parameter_release_vars();
+                        $got_chostname = 1;
+                    }
+                    $needsnewer = &parameter_releasecheck($name,$data,
+                                                          $needsrelease,
+                                                          $chostname,$cmajor,
+                                                          $cminor);
+                }
+                if ($needsnewer) {
+                    $r->print('<br />'.&oldversion_warning($name,$data,
+                                                           $chostname,$cmajor,
+                                                           $cminor,$needsrelease));
+                    next;
+                }
+            }
         } elsif ($cmd eq 'datepointer') {
-            $data=&Apache::lonhtmlcommon::get_date_from_form($env{$_});
+            $data=&Apache::lonhtmlcommon::get_date_from_form($env{$key});
             $typeof=$env{'form.typeof_'.$thiskey};
             $text = &mt('Saved modified date for');
         } elsif ($cmd eq 'dateinterval') {
@@ -3007,7 +3057,7 @@ sub listdata {
                           $$resourcedata{$thiskey}));
         } elsif ($thistype =~ m/^string/) {
         $r->print(&string_selector($thistype,$thiskey,
-                       $$resourcedata{$thiskey}));
+                       $$resourcedata{$thiskey},$name));
         } else {
         $r->print(&default_selector($thiskey,$$resourcedata{$thiskey}));
         }
@@ -3072,25 +3122,104 @@ my %strings =
          [ 'answer', 'Yes, and show correct answer if they exceed the maximum number of tries.' ],
          [ 'no', 'No, don\'t show correct/incorrect feedback.' ],
          [ 'no_feedback_ever', 'No, show no feedback at all.' ]],
+     'string_questiontype'
+             => [[ 'problem', 'Standard Problem'],
+                 [ 'survey', 'Survey'],
+                 [ 'anonsurveycred', 'Anonymous Survey (credit for submission)'],
+                 [ 'exam', 'Exam'],
+                 [ 'anonsurvey', 'Anonymous Survey'],
+                 [ 'randomizetry', 'New Randomization Each N Tries (default N=1)'],
+                 [ 'practice', 'Practice'],
+                 [ 'surveycred', 'Survey (credit for submission)']],
+     'string_discussvote'
+             => [['yes','Yes'],
+                 ['notended','Yes, unless discussion ended'],
+                 ['no','No']],
      );
 
+sub standard_string_options {
+    my ($string_type) = @_;
+    if (ref($strings{$string_type}) eq 'ARRAY') {
+        return $strings{$string_type};
+    }
+    return;
+}
 
 sub string_selector {
-    my ($thistype, $thiskey, $showval) = @_;
+    my ($thistype, $thiskey, $showval, $name) = @_;
 
     if (!exists($strings{$thistype})) {
     return &default_selector($thiskey,$showval);
     }
 
+    my %skiptype;
+    if (($thistype eq 'string_questiontype') ||
+        ($thistype eq 'string_discussvote')) {
+        my ($got_chostname,$chostname,$cmajor,$cminor); 
+        foreach my $possibilities (@{ $strings{$thistype} }) {
+            next unless (ref($possibilities) eq 'ARRAY');
+            my ($parmval, $description) = @{ $possibilities };
+            my $needsrelease=$Apache::lonnet::needsrelease{"parameter:$name:$parmval"};
+            if ($needsrelease) {
+                unless ($got_chostname) {
+                    ($chostname,$cmajor,$cminor)=&parameter_release_vars();
+                    $got_chostname = 1;
+                }
+                my $needsnewer=&parameter_releasecheck($name,$parmval,$needsrelease,
+                                                       $chostname,$cmajor,
+                                                       $cminor);
+                if ($needsnewer) {
+                    $skiptype{$parmval} = 1;
+                }
+            }
+        }
+    }
+
     my $result;
-    foreach my $possibilities (@{ $strings{$thistype} }) {
-    my ($name, $description) = @{ $possibilities };
-    $result .= '<label><input type="radio" name="set_'.$thiskey.
-          '" value="'.$name.'"';
-    if ($showval eq $name) {
-        $result .= ' checked="checked"';
+    my $numinrow = 3;
+    if ($thistype eq 'string_problemstatus') {
+        $numinrow = 2;
+    } elsif ($thistype eq 'string_questiontype') {
+        if (keys(%skiptype) > 0) {
+             $numinrow = 4;
+        }
+    }
+    my $rem;
+    if (ref($strings{$thistype}) eq 'ARRAY') {
+        my $i=0;
+        foreach my $possibilities (@{ $strings{$thistype} }) {
+            next unless (ref($possibilities) eq 'ARRAY');
+            my ($name, $description) = @{ $possibilities };
+            next if ($skiptype{$name}); 
+            $rem = $i%($numinrow);
+            if ($rem == 0) {
+                if ($i > 0) {
+                    $result .= '</tr>';
+                }
+                $result .= '<tr>';
+            }
+            $result .= '<td class="LC_left_item">'.
+                       '<span class="LC_nobreak"><label>'.
+                       '<input type="radio" name="set_'.$thiskey.
+                       '" value="'.$name.'"';
+            if ($showval eq $name) {
+                $result .= ' checked="checked"';
+            }
+            $result .= ' />'.&mt($description).'</label></span></td>';
+            $i++;
+        }
+        $rem = @{ $strings{$thistype} }%($numinrow);
+        my $colsleft = $numinrow - $rem;
+        if ($colsleft > 1 ) {
+            $result .= '<td colspan="'.$colsleft.'" class="LC_left_item">'.
+                       '&nbsp;</td>';
+        } elsif ($colsleft == 1) {
+            $result .= '<td class="LC_left_item">&nbsp;</td>';
+        }
+        $result .= '</tr>';
     }
-    $result .= ' />'.&mt($description).'</label> ';
+    if ($result) {
+        $result = '<table border="0">'.$result.'</table>';
     }
     return $result;
 }
@@ -4442,6 +4571,56 @@ sub check_for_course_info {
     return 0;
 }
 
+sub parameter_release_vars { 
+   my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+   my $chome = $env{'course.'.$env{'request.course.id'}.'.home'};
+   my $chostname = &Apache::lonnet::hostname($chome);
+   my ($cmajor,$cminor) = 
+       split(/\./,&Apache::lonnet::get_server_loncaparev($cdom,$chome));
+   return ($chostname,$cmajor,$cminor);
+}
+
+sub parameter_releasecheck {
+    my ($name,$value,$needsrelease,$chostname,$cmajor,$cminor) = @_;
+    my $needsnewer;
+    my ($needsmajor,$needsminor) = split(/\./,$needsrelease);
+    if (($cmajor < $needsmajor) || 
+        ($cmajor == $needsmajor && $cminor < $needsminor)) {
+        $needsnewer = 1;
+    } else {
+        &Apache::lonnet::update_released_required($Apache::lonnet::needsrelease{'parameter:'.$name.':'.$value});
+    }
+    return $needsnewer;
+}
+
+sub oldversion_warning {
+    my ($name,$value,$chostname,$cmajor,$cminor,$needsrelease) = @_;
+    my $desc;
+    my %stringtypes = (
+                        type         => 'string_questiontype',
+                        discussvote  => 'string_discussvote',
+                      );
+    if (exists($stringtypes{$name})) {
+        if (ref($strings{$stringtypes{$name}}) eq 'ARRAY') {
+            foreach my $possibilities (@{ $strings{$stringtypes{$name}} }) {
+                next unless (ref($possibilities) eq 'ARRAY');
+                my ($parmval, $description) = @{ $possibilities };
+                if ($parmval eq $value) {
+                    $desc = $description;
+                    last;
+                }
+            }
+        }
+    }
+    my $standard_name = &standard_parameter_names($name);
+    return '<p class="LC_warning">'.
+           &mt('[_1] was [_2]not[_3] set to [_4].',
+               $standard_name,'<b>','</b>','"'.$desc.'"').'<br />'.
+           &mt('LON-CAPA version ([_1]) installed on home server ([_2]) does not meet version requirements ([_3] or newer).',
+           $cmajor.'.'.$cminor,$chostname,
+           $needsrelease).
+           '</p>';
+}
 
 sub handler {
     my $r=shift;