--- loncom/interface/lonparmset.pm 2005/10/14 17:05:44 1.260 +++ 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.260 2005/10/14 17:05:44 banghart 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 '
'. ''. - &valout($value,$type).''; + &valout($value,$type).' |
';
$menu_html.='';
@@ -2753,36 +2761,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 = '';
}
$output.=''.$field_text.':';
- $output.='
';
- if ($options =~ m/active/) {
- $checked = ' checked="checked" ';
- } else {
- $checked = ' ';
- }
- $output.=' ';
- $output.='Active
';
- if ($options =~ m/onlyone/) {
- $checked = ' checked="checked" ';
- } else {
- $checked = ' ';
- }
- $output.=' ';
- $output.='Student may select only one choice
';
- if ($options =~ m/stuadd/) {
- $checked = ' checked="checked" ';
- } else {
- $checked = ' ';
+ $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.='Student may type choices
';
return ($output);
}
@@ -2822,8 +2818,8 @@ 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);
}
}
@@ -2832,7 +2828,10 @@ sub setrestrictmeta {
&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(<