--- loncom/interface/lonparmset.pm 2005/09/28 23:19:25 1.253
+++ loncom/interface/lonparmset.pm 2005/11/21 22:00:11 1.268
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler to set parameters for assessments
#
-# $Id: lonparmset.pm,v 1.253 2005/09/28 23:19:25 banghart Exp $
+# $Id: lonparmset.pm,v 1.268 2005/11/21 22:00:11 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -316,6 +316,8 @@ sub storeparm_by_symb {
# store parameter
&storeparm_by_symb_inner
($symb,$spnam,$snum,$nval,$ntype,$uname,$udom,$csec);
+# don't do anything if parameter was reset
+ unless ($nval) { return; }
my ($prefix,$parm)=($spnam=~/^(.*[\_\.])([^\_\.]+)$/);
# remember that this was set
$recstack{$parm}=1;
@@ -1571,10 +1573,7 @@ Set Defaults for All Resources in $folde
Specifically for
ENDMAPONE
if ($uname) {
- my %name=&Apache::lonnet::userenvironment($udom,$uname,
- ('firstname','middlename','lastname','generation', 'id'));
- my $person=$name{'firstname'}.' '.$name{'middlename'}.' '
- .$name{'lastname'}.' '.$name{'generation'};
+ my $person=&Apache::loncommon::plainname($uname,$udom);
$r->print(&mt("User")." $uname \($person\) ".
&mt('in')." \n");
} else {
@@ -1652,10 +1651,7 @@ ENDMAPONE
$coursename
ENDMAPONE
if ($uname) {
- my %name=&Apache::lonnet::userenvironment($udom,$uname,
- ('firstname','middlename','lastname','generation', 'id'));
- my $person=$name{'firstname'}.' '.$name{'middlename'}.' '
- .$name{'lastname'}.' '.$name{'generation'};
+ my $person=&Apache::loncommon::plainname($uname,$udom);
$r->print(" ".&mt("User")." $uname \($person\) \n");
} else {
$r->print(" ".&mt("ALL")." ".&mt("USERS")." \n");
@@ -2696,16 +2692,24 @@ ENDMAINFORMHEAD
#
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+ my $vgr = &Apache::lonnet::allowed('vgr',$env{'request.course.id'});
+
my @menu =
(
{ text => 'Set Course Environment Parameters',
action => 'crsenv',
permission => $parm_permission,
},
- { text => 'Set Instructor Defined Metadata',
- action => 'setinstmeta',
+ { text => 'Set Portfolio Metadata',
+ action => 'setrestrictmeta',
permission => $parm_permission,
},
+ { text => 'Manange Course Slots',
+ url => '/adm/slotrequest?command=showslots',
+ permission => $vgr,
+ },
+ { divider => 1,
+ },
{ text => 'Set/Modify Resource Parameters - Helper Mode',
url => '/adm/helper/parameter.helper',
permission => $parm_permission,
@@ -2730,6 +2734,10 @@ ENDMAINFORMHEAD
);
my $menu_html = '';
foreach my $menu_item (@menu) {
+ if ($menu_item->{'divider'}) {
+ $menu_html .= '
';
$menu_html.='';
@@ -2749,39 +2757,32 @@ ENDMAINFORMHEAD
$r->print($menu_html);
return;
}
-### Set instructor defined metadata
+### Set portfolio metadata
sub output_row {
- my ($r, $field_name) = @_;
+ my ($r, $field_name, $field_text) = @_;
my $output;
- my $active=$env{'course.'.$env{'request.course.id'}.'.metadata.'.$field_name.'.active'};
- my $onlyone=$env{'course.'.$env{'request.course.id'}.'.metadata.'.$field_name.'.onlyone'};
- my $stuadd=$env{'course.'.$env{'request.course.id'}.'.metadata.'.$field_name.'.stuadd'};
+ my $options=$env{'course.'.$env{'request.course.id'}.'.metadata.'.$field_name.'.options'};
my $values=$env{'course.'.$env{'request.course.id'}.'.metadata.'.$field_name.'.values'};
- my $checked;
- unless (defined($active)) {
- $active = 'no';
- $stuadd = 'yes';
- $values = 'Type a list of values separated by commas.';
- $onlyone = 'no';
- }
- $output.=' ';
return ($output);
}
-sub setinstmeta {
+
+sub setrestrictmeta {
my ($r)=@_;
my $next_meta;
my $output;
@@ -2789,87 +2790,56 @@ sub setinstmeta {
my $put_result;
$r->print(&Apache::lonxml::xmlbegin());
$r->print('
- '.$field_name.' ';
- $output.='';
- if ($onlyone eq 'no') {
- $checked = ' CHECKED ';
- } else {
- $checked = ' ';
+ unless (defined($options)) {
+ $options = 'active,stuadd';
+ $values = '';
+ }
+ $output.=''.$field_text.':';
+ $output.='
';
+
+ my @options= ( ['active', 'Show to student'],
+ ['onlyone','Student may select only one choice'],
+ ['stuadd', 'Student may type choices']);
+ foreach my $opt (@options) {
+ my $checked = ($options =~ m/$opt->[0]/) ? ' checked="checked" ' : '' ;
+ $output.=(' 'x5).'
';
}
- $output.=' ';
- if ($stuadd eq 'yes') {
- $checked = ' CHECKED ';
- } else {
- $checked = ' ';
- }
- $output.='';
- $output.='