--- loncom/interface/lonparmset.pm 2005/10/14 04:25:56 1.259
+++ loncom/interface/lonparmset.pm 2005/11/14 14:01:52 1.266
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler to set parameters for assessments
#
-# $Id: lonparmset.pm,v 1.259 2005/10/14 04:25:56 banghart Exp $
+# $Id: lonparmset.pm,v 1.266 2005/11/14 14:01:52 www 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;
@@ -2753,35 +2755,24 @@ ENDMAINFORMHEAD
sub output_row {
my ($r, $field_name, $field_text) = @_;
my $output;
- my $options=$env{'course.'.$env{'request.course.id'}.'.'.$field_name.'.options'};
- my $values=$env{'course.'.$env{'request.course.id'}.'.'.$field_name.'.values'};
- my $checked;
+ my $options=$env{'course.'.$env{'request.course.id'}.'.metadata.'.$field_name.'.options'};
+ my $values=$env{'course.'.$env{'request.course.id'}.'.metadata.'.$field_name.'.values'};
unless (defined($options)) {
$options = 'active,stuadd';
- $values = 'Type a list of values separated by commas.';
+ $values = '';
}
- if ($options =~ m/active/) {
- $checked = ' checked="checked" ';
- } else {
- $checked = ' ';
- }
- $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);
}
@@ -2793,11 +2784,11 @@ sub setrestrictmeta {
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'}.'.'};
@@ -2821,34 +2812,28 @@ sub setrestrictmeta {
}
my $name = $save_field;
$put_result = &Apache::lonnet::put('environment',
- {$meta_field.'.options'=>$options,
- $meta_field.'.values'=>$env{'form.'.$meta_field.'_values'},
+ {'metadata.'.$meta_field.'.options'=>$options,
+ 'metadata.'.$meta_field.'.values'=>$env{'form.'.$meta_field.'_values'},
},$dom,$crs);
}
}
}
-
}
&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(<
-
-
- Active | Metadata Item | Values | Only One Choice | Student Can Add Choices |
$output
-
-
ENDenv
-
-
$r->print('