--- loncom/interface/lonparmset.pm	2018/09/03 20:23:37	1.522.2.24
+++ loncom/interface/lonparmset.pm	2020/02/12 19:54:47	1.522.2.27
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.522.2.24 2018/09/03 20:23:37 raeburn Exp $
+# $Id: lonparmset.pm,v 1.522.2.27 2020/02/12 19:54:47 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -36,7 +36,8 @@ lonparmset - Handler to set parameters f
 
 =head1 SYNOPSIS
 
-lonparmset provides an interface to setting course parameters. 
+lonparmset provides an interface to setting content parameters in a 
+course.
 
 =head1 DESCRIPTION
 
@@ -129,7 +130,7 @@ javascript function 'pjump'.
 
 =item print_td()
 
-=item print_usergroups()
+=item check_other_groups()
 
 =item parm_control_group()
 
@@ -1024,7 +1025,7 @@ sub print_row {
             if (@{$usersgroups} > 1) {
                 my ($coursereply,$grp_parm,$controlgrp);
                 ($coursereply,$othergrp,$grp_parm,$controlgrp) =
-                    &print_usergroups($r,$$part{$which}.'.'.$$name{$which},
+                    &check_other_groups($$part{$which}.'.'.$$name{$which},
                        $rid,$cgroup,$defbgone,$usersgroups,$result,$courseopt);
                 if ($coursereply && $result > 3) {
                     if (defined($controlgrp)) {
@@ -1117,8 +1118,8 @@ sub print_td {
     $r->print('</td>'."\n");
 }
 
-sub print_usergroups {
-    my ($r,$what,$rid,$cgroup,$defbg,$usersgroups,$result,$courseopt) = @_;
+sub check_other_groups {
+    my ($what,$rid,$cgroup,$defbg,$usersgroups,$result,$courseopt) = @_;
     my $courseid = $env{'request.course.id'};
     my $output;
     my $symb = &symbcache($rid);
@@ -1133,7 +1134,6 @@ sub print_usergroups {
     if (($coursereply) && ($cgroup ne $resultgroup)) {
         if ($result > 3) {
             $bgcolor = '#AAFFAA';
-            $grp_parm = &valout($coursereply,$resulttype);
         }
         $grp_parm = &valout($coursereply,$resulttype);
         $output = '<td style="background-color:'.$bgcolor.';" align="center">';
@@ -1285,8 +1285,7 @@ sub isdateparm {
 # from which you can select all desired parameters.
 #
 sub parmmenu {
-    my ($r,$allparms,$pscat,$keyorder)=@_;
-    my $tempkey;
+    my ($r)=@_;
     $r->print(<<ENDSCRIPT);
 <script type="text/javascript">
 // <![CDATA[
@@ -1365,7 +1364,7 @@ sub parmmenu {
 ENDSCRIPT
 
     $r->print('<hr />');
-    &shortCuts($r,$allparms,$pscat,$keyorder);
+    &shortCuts($r);
     $r->print('<hr />');
 }
 # return a hash
@@ -1430,7 +1429,7 @@ sub lookUpTableParameter {
         'retrypartial' => 'tries',
         'discussvote'  => 'misc',
         'examcode' => 'high_level_randomization',
-    );    
+    );
 }
 
 sub whatIsMyCategory {
@@ -1512,6 +1511,7 @@ sub parmboxes {
                   .&mt($categories{$key})
                   .'</h4>'."\n");
         foreach $tempkey (&keysindisplayorderCategory($categoryList{$key},$keyorder)) {
+            next if ($tempkey eq '');
             $r->print('<span class="LC_nobreak">'
                      .'<label><input type="checkbox" name="pscat" '
                      .'value="'.$tempkey.'" ');
@@ -1531,7 +1531,7 @@ sub parmboxes {
 # This function offers some links on the parameter section to get with one click a group a parameters
 #
 sub shortCuts {
-    my ($r,$allparms,$pscat,$keyorder)=@_;
+    my ($r)=@_;
 
     # Parameter Selection
     $r->print(
@@ -1592,9 +1592,37 @@ sub partmenu {
 sub usermenu {
     my ($r,$uname,$id,$udom,$csec,$cgroup,$parmlev,$usersgroups,$pssymb)=@_;
     my $chooseopt=&Apache::loncommon::select_dom_form($udom,'udom').' '.
-        &Apache::loncommon::selectstudent_link('parmform','uname','udom');
-    my $selscript=&Apache::loncommon::studentbrowser_javascript();
+                  &Apache::loncommon::selectstudent_link('parmform','uname','udom','condition').
+                  &Apache::lonhtmlcommon::scripttag(<<ENDJS);
+function setCourseadv(form,caller) {
+    if (caller.value == 'st') {
+        form.courseadv.value = 'none';
+    } else {
+        form.courseadv.value = '';
+    }
+    return;
+}
+ENDJS
 
+    my (%chkroles,$stuonly,$courseadv);
+    if ($env{'form.userroles'} eq 'any') {
+        $chkroles{'any'} = ' checked="checked"';
+    } else {
+        $chkroles{'st'} = ' checked="checked"';
+        $courseadv = 'none';
+    }
+    my $crstype = $env{'course.'.$env{'request.course.id'}.'.type'};
+    if ($crstype eq 'Community') {
+        $stuonly = &mt('member only');
+    } else {
+        $stuonly = &mt('student only');
+    }
+    $chooseopt .= '<br /><span class="LC_cusr_subheading">'.
+                  &mt("User's role").':&nbsp;'.
+                  '<label><input type="radio" name="userroles" value="st"'.$chkroles{'st'}.' onclick="setCourseadv(this.form,this);" />'.
+                  $stuonly.'</label>&nbsp;&nbsp;'.
+                  '<label><input type="radio" name="userroles" value="any"'.$chkroles{'any'}.' onclick="setCourseadv(this.form,this);" />'.
+                  &mt('any role').'</label><input type="hidden" id="courseadv" name="courseadv" value="'.$courseadv.'" /></span>';
     my $sections='';
     my %sectionhash = &Apache::loncommon::get_sections();
 
@@ -1701,12 +1729,12 @@ function group_or_section(caller) {
 # This function shows on table Mode the available Parameters for the selected Resources
 #
 sub displaymenu {
-    my ($r,$allparms,$pscat,$psprt,$keyorder,$divid)=@_;
+    my ($r,$allparms,$pscat,$keyorder,$divid)=@_;
 
     $r->print(&Apache::lonhtmlcommon::start_pick_box());
     $r->print(&Apache::lonhtmlcommon::row_title(&mt('Select Parameters to View')));
 
-    &parmmenu($r,$allparms,$pscat,$keyorder);
+    &parmmenu($r);
     $r->print(&Apache::loncommon::start_scrollbox('480px','440px','200px',$divid));
     &parmboxes($r,$allparms,$pscat,$keyorder);
     $r->print(&Apache::loncommon::end_scrollbox());
@@ -1906,7 +1934,7 @@ sub sectionmenu {
         }
         $output .= '>'."$s</option>\n";
     }
-    $output .= "</select>\n");
+    $output .= "</select>\n";
     return $output;
 }
 
@@ -2136,25 +2164,124 @@ sub assessparms {
             $csec=&Apache::lonnet::getsection($udom,$uname,
                           $env{'request.course.id'});
             if ($csec eq '-1') {
-                $message='<span class="LC_error">'.
-                &mt("User")." '$uname' ".&mt("at domain")." '$udom' ".
-                &mt("not in this course")."</span>";
-                $uname='';
-                $csec=$env{'form.csec'};
+                my $crstype = $env{'course.'.$env{'request.course.id'}.'.type'};
+                if ($env{'form.userroles'} eq 'any') {
+                    if (($env{'user.name'} eq $uname) && ($env{'user.domain'} eq $udom)) {
+                        $csec = $env{'request.course.sec'};
+                        $message = '<span class="LC_info">';
+                        if ($crstype eq 'Community') {
+                            $message .= &mt('User [_1] at domain [_2] has a non-member role in this community',
+                                            $uname,$udom);
+                        } else {
+                            $message .= &mt('User [_1] at domain [_2] has a non-student role in this course',
+                                            $uname,$udom);
+                        }
+                        $message .= '</span>';
+                    } else {
+                        my @possroles = ('in','ep','ta','cr');
+                        if ($crstype eq 'Community') {
+                            unshift(@possroles,'co');
+                        } else {
+                            unshift(@possroles,'cc');
+                        }
+                        my %not_student_roles =
+                            &Apache::lonnet::get_my_roles($uname,$udom,'userroles',['active'],
+                                                          \@possroles,[$udom],1,1);
+                        my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+                        my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+                        my %sections_by_role;
+                        foreach my $role (keys(%not_student_roles)) {
+                            if ($role =~ /^\Q$cnum:$cdom:\E([^:]+):(|[^:]+)$/) {
+                                my ($rolename,$sec) = ($1,$2);
+                                if ($rolename =~ m{^cr/}) {
+                                    $rolename = 'cr';
+                                }
+                                push(@{$sections_by_role{$rolename}},$sec);
+                            }
+                        }
+                        my $numroles = scalar(keys(%sections_by_role));
+                        if ($numroles) {
+                            foreach my $role (@possroles) {
+                                if (ref($sections_by_role{$role}) eq 'ARRAY') {
+                                    my @secs = sort { $a <=> $b } @{$sections_by_role{$role}};
+                                    $csec = $secs[0]; 
+                                    last;
+                                }
+                            }
+                        }
+                        if ($csec eq '-1') {
+                            $message = '<span class="LC_warning">';
+                            if ($crstype eq 'Community') {
+                                $message .= &mt('User [_1] at domain [_2] does not have a role in this community',
+                                                $uname,$udom);
+                            } else {
+                                $message .= &mt('User [_1] at domain [_2] does not have a role in this course',
+                                                $uname,$udom);
+                            }
+                            $message .= '</span>';
+                            $uname='';
+                            if ($env{'request.course.sec'} ne '') {
+                                $csec=$env{'request.course.sec'};
+                            } else {
+                                $csec=$env{'form.csec'};
+                            }
+                            $cgroup=$env{'form.cgroup'};
+                        } else {
+                            $message = '<span class="LC_info">';
+                            if ($crstype eq 'Community') {
+                                $message .= &mt('User [_1] at domain [_2] has a non-member role in this community',
+                                         $uname,$udom);
+                            } else {
+                                $message .= &mt('User [_1] at domain [_2] has a non-student role in this course',
+                                                $uname,$udom);
+                            }
+                            $message .= '</span>';
+                        }
+                    }
+                } else {
+                    $message = '<span class="LC_warning">';
+                    if ($crstype eq 'Community') {
+                        $message .= &mt('User [_1] at domain [_2] does not have a member role in this community',
+                                         $uname,$udom);
+                    } else {
+                         $message .= &mt('User [_1] at domain [_2] does not have a student role in this course',
+                                         $uname,$udom);
+                    }
+                    $message .= '</span>';
+                    $uname=''; 
+                    if ($env{'request.course.sec'} ne '') {
+                        $csec=$env{'request.course.sec'};
+                    } else {
+                        $csec=$env{'form.csec'};
+                    }
+                    $cgroup=$env{'form.cgroup'};
+                }
+            } elsif ($env{'request.course.sec'} ne '') {
+                if ($csec ne $env{'request.course.sec'}) {
+                    $message='<span class="LC_warning">'.
+                              &mt("User '[_1]' at domain '[_2]' not in section '[_3]'",
+                                  $uname,$udom,$env{'request.course.sec'}).
+                              '</span>';
+                    $uname='';
+                    $csec=$env{'request.course.sec'};
+                }
                 $cgroup=$env{'form.cgroup'};
-            } else {
+            }
+            if ($uname ne '') {
                 my %name=&Apache::lonnet::userenvironment($udom,$uname,
                   ('firstname','middlename','lastname','generation','id'));
-                $message="\n<p>\n".&mt("Full Name").": ".
-                $name{'firstname'}.' '.$name{'middlename'}.' '
-                .$name{'lastname'}.' '.$name{'generation'}.
-                "<br />\n".&mt('Student/Employee ID').": ".$name{'id'}.'<p>';
-            }
-            @usersgroups = &Apache::lonnet::get_users_groups(
-                                       $udom,$uname,$env{'request.course.id'});
-            if (@usersgroups > 0) {
-                unless (grep(/^\Q$cgroup\E$/,@usersgroups)) {
-                    $cgroup = $usersgroups[0];
+                $message .= "\n<p>\n".&mt('Full Name').': '
+                            .$name{'firstname'}.' '.$name{'middlename'}.' '
+                            .$name{'lastname'}.' '.$name{'generation'}
+                            ."<br />\n".&mt('Student/Employee ID').': '.$name{'id'}.'</p>';
+                @usersgroups = &Apache::lonnet::get_users_groups(
+                                   $udom,$uname,$env{'request.course.id'});
+                if (@usersgroups > 0) {
+                    unless (grep(/^\Q$cgroup\E$/,@usersgroups)) {
+                        $cgroup = $usersgroups[0];
+                    }
+                } else {
+                    $cgroup = '';
                 }
             }
         }
@@ -2329,7 +2456,7 @@ ENDPARMSELSCRIPT
 
         # Step 2
         $r->print(&Apache::lonhtmlcommon::topic_bar(2,&mt('Parameter Specification'),'parmstep2'));
-        &displaymenu($r,\%allparms,\@pscat,\@psprt,\%keyorder,'parmmenuscroll');
+        &displaymenu($r,\%allparms,\@pscat,\%keyorder,'parmmenuscroll');
 
         # Step 3
         $r->print(&Apache::lonhtmlcommon::topic_bar(3,&mt('User Specification (optional)'),'parmstep3'));
@@ -3063,6 +3190,7 @@ sub listdata {
     $tableopen=0;
     my $foundkeys=0;
     my %keyorder=&standardkeyorder();
+    my $readonlyall = $readonly;
 
     my ($secidx,%grouphash);
     if (($env{'request.course.sec'} ne '') && ($caller eq 'overview')) {
@@ -3123,6 +3251,7 @@ sub listdata {
         my ($middle,$part,$name)=
         ($thiskey=~/^$env{'request.course.id'}\.(?:(.+)\.)*([\w\s]+)\.(\w+)$/);
         my $section=&mt('All Students');
+        $readonly = $readonlyall;
         if ($middle=~/^\[(.*)\]/) {
             my $issection=$1;
             if ($issection=~/^useropt\:($match_username)\:($match_domain)/) {
@@ -3418,9 +3547,22 @@ sub string_selector {
 #
 
 sub dateshift {
-    my ($shift)=@_;
+    my ($shift,$numchanges)=@_;
     my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
     my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
+    my $sec = $env{'request.course.sec'};
+    my $secgrpregex;
+    if ($sec ne '') {
+        my @groups;
+        if ($env{'request.course.groups'} ne '') {
+            @groups = split(/:/,$env{'request.course.groups'});
+        }
+        if (@groups) {
+            $secgrpregex = '(?:'.join('|',($sec,@groups)).')';
+        } else {
+            $secgrpregex = $sec;
+        }
+    }
     my %data=&Apache::lonnet::dump('resourcedata',$dom,$crs);
 # ugly retro fix for broken version of types
     foreach my $key (keys %data) {
@@ -3435,7 +3577,11 @@ sub dateshift {
 # go through all parameters and look for dates
     foreach my $key (keys %data) {
        if ($data{$key.'.type'}=~/^date_(start|end)$/) {
+          if ($sec ne '') {
+              next unless ($key =~ /^$env{'request.course.id'}\.\[$secgrpregex\]\./);
+          }
           my $newdate=$data{$key}+$shift;
+          $$numchanges ++;
           $storecontent{$key}=$newdate;
        }
     }
@@ -3764,10 +3910,8 @@ ENDOVER
         $r->print(&mt('All users'));
         } elsif ($data{'scope_type'} eq 'user') {
         $r->print(&mt('User: [_1]',join(':',@{$data{'scope'}})));
-        } elsif ($data{'scope_type'} eq 'section') {
-        $r->print(&mt('Section: [_1]',$data{'scope'}));
-        } elsif ($data{'scope_type'} eq 'group') {
-        $r->print(&mt('Group: [_1]',$data{'scope'}));
+        } elsif ($data{'scope_type'} eq 'secgroup') {
+        $r->print(&mt('Group/Section: [_1]',$data{'scope'}));
         }
         $r->print('<br />');
         if ($data{'realm_type'} eq 'all') {
@@ -3796,9 +3940,21 @@ sub date_shift_one {
     my ($r) = @_;
     my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
     my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
-
+    my $sec = $env{'request.course.sec'};
     &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=dateshift1&timebase='.$env{'form.timebase'},
         text=>"Shifting Dates"});
+    my $submit_text = &mt('Shift all dates accordingly');
+    if ($sec ne '') {
+        my @groups;
+        if ($env{'request.course.groups'} ne '') {
+            @groups = split(/:/,$env{'request.course.groups'});
+        }
+        if (@groups) {
+            $submit_text = &mt("Shift dates set just for your section/group(s), accordingly");
+        } else {
+            $submit_text = &mt("Shift dates set just for your section, accordingly");
+        }
+    }
     my $start_page=&Apache::loncommon::start_page('Shift Dates');
     my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs('Shift');
     $r->print($start_page.$breadcrumbs);
@@ -3813,7 +3969,7 @@ sub date_shift_one {
               '</td></tr></table>'.
               '<input type="hidden" name="action" value="dateshift2" />'.
               '<input type="hidden" name="timebase" value="'.$env{'form.timebase'}.'" />'.
-              '<input type="submit" value="'.&mt('Shift all dates accordingly').'" /></form>');
+              '<input type="submit" value="'.$submit_text.'" /></form>');
     $r->print(&Apache::loncommon::end_page());
 }
 
@@ -3821,20 +3977,54 @@ sub date_shift_two {
     my ($r) = @_;
     my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
     my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
+    my $sec = $env{'request.course.sec'};
     &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=dateshift1&timebase='.$env{'form.timebase'},
         text=>"Shifting Dates"});
     my $start_page=&Apache::loncommon::start_page('Shift Dates');
     my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs('Shift');
     $r->print($start_page.$breadcrumbs);
     my $timeshifted=&Apache::lonhtmlcommon::get_date_from_form('timeshifted');
-    $r->print('<h2>'.&mt('Shift Dates').'</h2>'.
-              '<p>'.&mt('Shifting all dates such that [_1] becomes [_2]',
-              &Apache::lonlocal::locallocaltime($env{'form.timebase'}),
-              &Apache::lonlocal::locallocaltime($timeshifted)).'</p>');
+    $r->print('<h2>'.&mt('Shift Dates').'</h2>');
+    if ($sec ne '') {
+        my @groups;
+        if ($env{'request.course.groups'} ne '') {
+            @groups = split(/:/,$env{'request.course.groups'});
+        }
+        if (@groups) {
+            $r->print('<p>'.
+                      &mt("Shift dates set just for your section/group(s), such that [_1] becomes [_2]",
+                          &Apache::lonlocal::locallocaltime($env{'form.timebase'}),
+                          &Apache::lonlocal::locallocaltime($timeshifted)).
+                      '</p>');
+        } else {
+            $r->print('<p>'.
+                      &mt("Shift dates set just for your section, such that [_1] becomes [_2]",
+                          &Apache::lonlocal::locallocaltime($env{'form.timebase'}),
+                          &Apache::lonlocal::locallocaltime($timeshifted)).
+                      '</p>');
+        }
+    } else {
+        $r->print('<p>'.&mt('Shifting all dates such that [_1] becomes [_2]',
+                            &Apache::lonlocal::locallocaltime($env{'form.timebase'}),
+                            &Apache::lonlocal::locallocaltime($timeshifted)).
+                  '</p>');
+    }
     my $delta=$timeshifted-$env{'form.timebase'};
-    &dateshift($delta);
+    my $numchanges = 0;
+    my $result = &dateshift($delta,\$numchanges);
+    if ($result eq 'ok') {
+        $r->print(
+            &Apache::lonhtmlcommon::confirm_success(&mt('Completed shifting of [quant,_1,date setting]',
+                                                    $numchanges)));
+    } elsif ($result eq 'con_delayed') {
+        $r->print(
+            &Apache::lonhtmlcommon::confirm_success(&mt('Queued shifting of [quant,_1,date setting]',
+                                                        $numchanges)));
+    } else {
+        $r->print(
+            &Apache::lonhtmlcommon::confirm_success(&mt('An error occurred attempting to shift dates'),1));
+    }
     $r->print(
-        &Apache::lonhtmlcommon::confirm_success(&mt('Done')).
         '<br /><br />'.
         &Apache::lonhtmlcommon::actionbox(
             ['<a href="/adm/parmset">'.&mt('Content and Problem Settings').'</a>']));
@@ -3853,8 +4043,7 @@ sub parse_key {
         $data{'scope_type'} = 'user';
         $data{'scope'} = [$1,$2];
     } else {
-        #FIXME check for group scope
-        $data{'scope_type'} = 'section';
+        $data{'scope_type'} = 'secgroup';
     }
     $middle=~s/^\[(.*)\]//;
     }
@@ -4168,7 +4357,7 @@ sub continue {
     my $output;
     $output .= '<form action="" method="post">';
     $output .= '<input type="hidden" name="action" value="setrestrictmeta" />';
-    $output .= '<input type="submit" value="Continue" />';
+    $output .= '<input type="submit" value="'.&mt('Continue').'" />';
     return ($output);
 }
 
@@ -4190,7 +4379,10 @@ sub addmetafield {
             my $put_result = &Apache::lonnet::put('environment',
                                         {'metadata.'.$meta_field.'.options'=>$options},$dom,$crs);
 
-            $r->print('Undeleted Metadata Field <strong>'.$env{'course.'.$env{'request.course.id'}.'.metadata.'.$meta_field.'.added'}."</strong> with result ".$put_result.'<br />');
+            $r->print(&mt('Undeleted Metadata Field [_1] with result [_2]',
+                          '<strong>'.$env{'course.'.$env{'request.course.id'}.'.metadata.'.$meta_field.'.added'}.
+                          '</strong>',$put_result).
+                      '<br />');
         }
         $r->print(&continue());
     } elsif (exists($env{'form.fieldname'})) {
@@ -4202,12 +4394,17 @@ sub addmetafield {
                             {'metadata.'.$meta_field.'.values'=>"",
                              'metadata.'.$meta_field.'.added'=>"$display_field",
                              'metadata.'.$meta_field.'.options'=>""},$dom,$crs);
-        $r->print('Added new Metadata Field <strong>'.$env{'form.fieldname'}."</strong> with result ".$put_result.'<br />');
+        $r->print(&mt('Added new Metadata Field [_1] with result [_2]',
+                      '<strong>'.$env{'form.fieldname'}.'</strong>',$put_result).
+                  '<br />');
         $r->print(&continue());
     } else {
         my $fields = &get_deleted_meta_fieldnames($env{'request.course.id'});
         if ($fields) {
-            $r->print('You may undelete previously deleted fields.<br />Check those you wish to undelete and click Undelete.<br />');
+            $r->print(&mt('You may undelete previously deleted fields.').
+                      '<br />'.
+                      &mt('Check those you wish to undelete and click Undelete.').
+                      '<br />');
             $r->print('<form method="post" action="">');
             foreach my $key(keys(%$fields)) {
                 $r->print('<input type="checkbox" name="undeletefield" value="'.$key.'" />'.$$fields{$key}.'<br /');
@@ -4215,9 +4412,12 @@ sub addmetafield {
             $r->print('<input type="submit" name="undelete" value="Undelete" />');
             $r->print('</form>');
         }
-        $r->print('<hr /><strong>Or</strong> you may enter a new metadata field name.<form method="post" action="/adm/parmset?action=addmetadata">');
+        $r->print('<hr />'.
+                  &mt('[_1]Or[_2] you may enter a new metadata field name.',
+                      '<strong>','</strong>').
+                 '<form method="post" action="/adm/parmset?action=addmetadata">');
         $r->print('<input type="text" name="fieldname" /><br />');
-        $r->print('<input type="submit" value="Add Metadata Field" />');
+        $r->print('<input type="submit" value="'.&mt('Add Metadata Field').'" />');
     }
     $r->print('</form>');
 }
@@ -4238,6 +4438,11 @@ sub setrestrictmeta {
     my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
     my $key_base = $env{'course.'.$env{'request.course.id'}.'.'};
     my $save_field = '';
+    my %lt = &Apache::lonlocal::texthash(
+                                           addm => 'Add Metadata Field',
+                                           ordm => 'Order Metadata Fields',
+                                           save => 'Save',
+                                        );
     if ($env{'form.restrictmeta'}) {
         foreach my $field (sort(keys(%env))) {
             if ($field=~m/^form.(.+)_(.+)$/) {
@@ -4276,28 +4481,25 @@ sub setrestrictmeta {
     my %metadata_fields = &Apache::lonmeta::fieldnames('portfolio');
     # Now get possible added metadata fields
     my $added_metadata_fields = &get_added_meta_fieldnames($env{'request.course.id'});
-    my $row_alt = 1;
     $output .= &Apache::loncommon::start_data_table();
     foreach my $field (sort(keys(%metadata_fields))) {
         if ($field ne 'courserestricted') {
-            $row_alt = $row_alt ? 0 : 1;
         $output.= &output_row($r, $field, $metadata_fields{$field});
     }
     }
     my $buttons = (<<ENDButtons);
-        <input type="submit" name="restrictmeta" value="Save" />
+        <input type="submit" name="restrictmeta" value="$lt{'save'}" />
         </form><br />
         <form method="post" action="/adm/parmset?action=addmetadata" name="form1">
-        <input type="submit" name="restrictmeta" value="Add a Metadata Field" />
+        <input type="submit" name="restrictmeta" value="$lt{'addm'}" />
         </form>
         <br />
         <form method="post" action="/adm/parmset?action=ordermetadata" name="form2">
-        <input type="submit" name="restrictmeta" value="Order Metadata Fields" />
+        <input type="submit" name="restrictmeta" value="$lt{'ordm'}" />
 ENDButtons
     my $added_flag = 1;
     foreach my $field (sort(keys(%$added_metadata_fields))) {
-        $row_alt = $row_alt ? 0 : 1;
-        $output.= &output_row($r, $field, $$added_metadata_fields{$field},$added_flag, $row_alt);
+        $output.= &output_row($r,$field,$$added_metadata_fields{$field},$added_flag);
     }
     $output .= &Apache::loncommon::end_data_table();
     $r->print(<<ENDenv);
@@ -4542,7 +4744,7 @@ my %standard_parms;
 my %standard_parms_types;
 
 sub load_parameter_names {
-    open(my $config,"<$Apache::lonnet::perlvar{'lonTabDir'}/packages.tab");
+    open(my $config,"<","$Apache::lonnet::perlvar{'lonTabDir'}/packages.tab");
     while (my $configline=<$config>) {
     if ($configline !~ /\S/ || $configline=~/^\#/) { next; }
     chomp($configline);
@@ -4557,6 +4759,7 @@ sub load_parameter_names {
     close($config);
     $standard_parms{'int_pos'}      = 'Positive Integer';
     $standard_parms{'int_zero_pos'} = 'Positive Integer or Zero';
+    $standard_parms{'scoreformat'}  = 'Format for display of score';
 }
 
 sub standard_parameter_names {
@@ -4636,6 +4839,12 @@ sub parm_change_log {
     }
     if ($last) { ($folder) = &Apache::lonnet::decode_symb($last); }
     }
+    my $numgroups = 0;
+    my @groups;
+    if ($env{'request.course.groups'} ne '') {
+        @groups = split(/:/,$env{'request.course.groups'});
+        $numgroups = scalar(@groups);
+    }
     foreach my $id (sort
             {
             if ($parmlog{$b}{'exe_time'} ne $parmlog{$a}{'exe_time'}) {
@@ -4676,7 +4885,8 @@ sub parm_change_log {
             my ($realm,$section,$parmname,$part,$what,$middle,$uname,$udom,$issection,$realmdescription)=
         &components($changed,$parmlog{$id}{'uname'},$parmlog{$id}{'udom'},undef,undef,$typeflag);
         if ($env{'request.course.sec'} ne '') {
-            next if (($issection ne '') && ($issection ne $env{'request.course.sec'}));
+            next if (($issection ne '') && (!(($issection eq $env{'request.course.sec'}) ||
+                                              ($numgroups && (grep(/^\Q$issection\E$/,@groups))))));
             if ($uname ne '') {
                 my $stusection = &Apache::lonnet::getsection($uname,$udom,$env{'request.course.id'});
                 next if (($stusection ne '-1') && ($stusection ne $env{'request.course.sec'}));