[LON-CAPA-cvs] cvs: loncom /interface lonparmset.pm
raeburn
raeburn at source.lon-capa.org
Sat Jul 15 00:58:17 EDT 2017
raeburn Sat Jul 15 04:58:17 2017 EDT
Modified files:
/loncom/interface lonparmset.pm
Log:
- Changes suggested in #FIXMEs added in rev. 1.560, 1.562, 1.563.
Index: loncom/interface/lonparmset.pm
diff -u loncom/interface/lonparmset.pm:1.580 loncom/interface/lonparmset.pm:1.581
--- loncom/interface/lonparmset.pm:1.580 Sat Jul 15 02:49:10 2017
+++ loncom/interface/lonparmset.pm Sat Jul 15 04:58:17 2017
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler to set parameters for assessments
#
-# $Id: lonparmset.pm,v 1.580 2017/07/15 02:49:10 raeburn Exp $
+# $Id: lonparmset.pm,v 1.581 2017/07/15 04:58:17 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1844,15 +1844,10 @@
}
# Prints the HTML and Javascript to select parameters, with various shortcuts.
-# FIXME: remove unused parameters
#
-# @param {Apache2::RequestRec} $r - the Apache request (unused)
-# @param {hash reference} $allparms - hash parameter name -> parameter title
-# @param {array reference} $pscat - list of selected parameter names (unused)
-# @param {hash reference} $keyorder - hash parameter key -> appearance rank (unused)
+# @param {Apache2::RequestRec} $r - the Apache request
sub parmmenu {
- my ($r,$allparms,$pscat,$keyorder)=@_;
- my $tempkey;
+ my ($r)=@_;
$r->print(<<ENDSCRIPT);
<script type="text/javascript">
// <![CDATA[
@@ -1929,7 +1924,7 @@
ENDSCRIPT
$r->print('<hr />');
- &shortCuts($r,$allparms,$pscat,$keyorder);
+ &shortCuts($r);
$r->print('<hr />');
}
@@ -2110,14 +2105,10 @@
}
# Prints HTML with shortcuts to select groups of parameters in one click, or deselect all.
-# FIXME: remove unused parameters
#
# @param {Apache2::RequestRec} $r - the Apache request
-# @param {hash reference} $allparms - hash parameter name -> parameter title (unused)
-# @param {array reference} $pscat - list of selected parameter names (unused)
-# @param {hash reference} $keyorder - hash parameter key -> appearance rank (unused)
sub shortCuts {
- my ($r,$allparms,$pscat,$keyorder)=@_;
+ my ($r)=@_;
# Parameter Selection
$r->print(
@@ -2310,16 +2301,15 @@
# @param {Apache2::RequestRec} $r - the Apache request
# @param {hash reference} $allparms - hash parameter name -> parameter title
# @param {array reference} $pscat - list of selected parameter names
-# @param {array reference} $psprt - list of selected parameter parts (unused)
# @param {hash reference} $keyorder - hash parameter key -> appearance rank
# @param {string} [$divid] - name used to give an id to the HTML element for the scroll box
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); # only $allparms is used by parmmenu
+ &parmmenu($r);
$r->print(&Apache::loncommon::start_scrollbox('480px','440px','200px',$divid));
&parmboxes($r,$allparms,$pscat,$keyorder);
$r->print(&Apache::loncommon::end_scrollbox());
@@ -3103,7 +3093,7 @@
# 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'));
@@ -5108,7 +5098,7 @@
$r->print('<div class="LC_Box">');
$r->print('<div>');
- &displaymenu($r,\%allparms,\@pscat,\%keyorder); # FIXME: wrong parameters, could make keysindisplayorderCategory crash because $keyorder is undefined
+ &displaymenu($r,\%allparms,\@pscat,\%keyorder);
$r->print(&Apache::lonhtmlcommon::start_pick_box());
$r->print(&Apache::lonhtmlcommon::row_title(&mt('Select Parts to View')));
my $sectionselector = §ionmenu(\@selected_sections);
@@ -5354,10 +5344,8 @@
$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') {
@@ -5464,8 +5452,7 @@
$data{'scope_type'} = 'user';
$data{'scope'} = [$1,$2];
} else {
- #FIXME check for group scope
- $data{'scope_type'} = 'section';
+ $data{'scope_type'} = 'secgroup';
}
$middle=~s/^\[(.*)\]//;
}
@@ -5859,16 +5846,17 @@
$r->print('You may undelete previously deleted fields.<br />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 /');
+ $r->print('<label><input type="checkbox" name="undeletefield" value="'.$key.'" />'.$$fields{$key}.'</label><br /');
}
$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 /><strong>Or</strong> you may enter a new metadata field name.'.
+ '<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('</form>');
}
- $r->print('</form>');
&endSettingsScreen($r);
}
@@ -6191,17 +6179,13 @@
# $issection - section or group name
# $realmdescription - title for the parameter level and resource (without using HTML)
#
-# FIXME: remove unused fields.
-#
# @param {string} $key - parameter log key
# @param {string} $uname - user name
# @param {string} $udom - user domain
-# @param {string} $exeuser - unused
-# @param {string} $exedomain - unused
# @param {boolean} $typeflag - .type log entry
# @returns {Array}
sub components {
- my ($key,$uname,$udom,$exeuser,$exedomain,$typeflag)=@_;
+ my ($key,$uname,$udom,$typeflag)=@_;
if ($typeflag) {
$key=~s/\.type$//;
@@ -6416,7 +6400,7 @@
my $typeflag = ($changed =~/\.type$/ &&
!exists($parmlog{$id}{'logentry'}{$changed.'.type'}));
my ($realm,$section,$parmname,$part,$what,$middle,$uname,$udom,$issection,$realmdescription)=
- &components($changed,$parmlog{$id}{'uname'},$parmlog{$id}{'udom'},undef,undef,$typeflag);
+ &components($changed,$parmlog{$id}{'uname'},$parmlog{$id}{'udom'},$typeflag);
if ($env{'request.course.sec'} ne '') {
next if (($issection ne '') && ($issection ne $env{'request.course.sec'}));
if ($uname ne '') {
More information about the LON-CAPA-cvs
mailing list