--- loncom/interface/lonparmset.pm 2005/10/06 22:05:56 1.258
+++ loncom/interface/lonparmset.pm 2005/11/22 19:02:40 1.268.2.1
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler to set parameters for assessments
#
-# $Id: lonparmset.pm,v 1.258 2005/10/06 22:05:56 albertel Exp $
+# $Id: lonparmset.pm,v 1.268.2.1 2005/11/22 19:02:40 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;
@@ -527,10 +529,10 @@ sub plink {
my ($parmname)=((split(/\&/,$marker))[1]=~/\_([^\_]+)$/);
my ($hour,$min,$sec,$val)=&preset_defaults($parmname);
unless (defined($winvalue)) { $winvalue=$val; }
- return
+ return '
';
}
sub startpage {
@@ -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,6 +2692,8 @@ 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',
@@ -2703,9 +2701,15 @@ ENDMAINFORMHEAD
permission => $parm_permission,
},
{ text => 'Set Portfolio Metadata',
- action => 'setinstmeta',
+ 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 .= '
';
+ next;
+ }
next if (! $menu_item->{'permission'});
$menu_html.='';
$menu_html.='';
@@ -2755,36 +2763,26 @@ sub output_row {
my $output;
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($options)) {
$options = 'active,stuadd';
- $values = 'Type a list of values separated by commas.';
- }
- if ($options =~ m/active/) {
- $checked = ' checked="checked" ';
- } else {
- $checked = ' ';
+ $values = '';
}
- $output.=' | ';
- $output.=''.$field_text.' | ';
- $output.=' | ';
- if ($options =~ m/onlyone/) {
- $checked = ' checked="checked" ';
- } else {
- $checked = ' ';
- }
- $output.=' | ';
- if ($options =~ m/stuadd/) {
- $checked = ' checked="checked" ';
- } else {
- $checked = ' ';
+ $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.=' | ';
-
- $output.='
';
return ($output);
}
-sub setinstmeta {
+
+sub setrestrictmeta {
my ($r)=@_;
my $next_meta;
my $output;
@@ -2792,16 +2790,16 @@ sub setinstmeta {
my $put_result;
$r->print(&Apache::lonxml::xmlbegin());
$r->print('
- LON-CAPA Set Portfolio Metadata
+ LON-CAPA Restrict Metadata
');
- $r->print(&Apache::loncommon::bodytag('Set Portfolio Metadata'));
+ $r->print(&Apache::loncommon::bodytag('Restrict Metadata'));
$r->print(&Apache::lonhtmlcommon::breadcrumbs(undef,
- 'Set Portfolio Metadata'));
+ 'Restrict Metadata'));
my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
- my $key_base = $env{'course.'.$env{'request.course.id'}.'.metadata.'};
+ my $key_base = $env{'course.'.$env{'request.course.id'}.'.'};
my $save_field = '';
- if ($env{'form.instmeta'}) {
+ if ($env{'form.restrictmeta'}) {
foreach my $field (sort(keys(%env))) {
if ($field=~m/^form.(.+)_(.+)$/) {
my $options;
@@ -2818,7 +2816,7 @@ sub setinstmeta {
if ($env{'form.'.$meta_field.'_active'}) {
$options.='active,';
}
- my $name = 'metadata.'.$save_field;
+ my $name = $save_field;
$put_result = &Apache::lonnet::put('environment',
{'metadata.'.$meta_field.'.options'=>$options,
'metadata.'.$meta_field.'.values'=>$env{'form.'.$meta_field.'_values'},
@@ -2826,28 +2824,22 @@ sub setinstmeta {
}
}
}
-
}
&Apache::lonnet::coursedescription($env{'request.course.id'});
my %metadata_fields = &Apache::lonmeta::fieldnames('portfolio');
-
foreach my $field (sort(keys(%metadata_fields))) {
- $output.= &output_row($r, $field, $metadata_fields{$field});
+ &Apache::lonnet::logthis ($field);
+ if ($field ne 'courserestricted') {
+ $output.= &output_row($r, $field, $metadata_fields{$field});
+ }
}
$r->print(<
-
+
-
ENDenv
-
-
$r->print('