--- loncom/interface/lonparmset.pm 2005/08/29 22:57:09 1.244 +++ 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.244 2005/08/29 22:57:09 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.='';
@@ -2724,91 +2757,89 @@ ENDMAINFORMHEAD
$r->print($menu_html);
return;
}
-### Set instructor defined metadata
-sub setinstmeta {
+### Set portfolio metadata
+sub output_row {
+ my ($r, $field_name, $field_text) = @_;
+ 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'};
+ 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).'
';
+ }
+ return ($output);
+}
+
+sub setrestrictmeta {
my ($r)=@_;
my $next_meta;
my $output;
- if ($env{'form.serial'}) {
- $next_meta = $env{'form.serial'};
- } else {
- $next_meta = 1;
- }
+ my $item_num;
+ my $put_result;
$r->print(&Apache::lonxml::xmlbegin());
$r->print('
-
');
- $r->print('');
- } elsif ($env{'form.state'}eq 'save') {
- $r->print('Here we save the metadata');
- $key_base.=$env{'form.serial'}.'.';
- $r->print('The title: '.$env{'form.title'}.'
');
- $r->print('The values: '.$env{'form.values'}.'
');
- $r->print('The type: '.$env{'form.type'}.'
');
- $r->print('The number: '.$env{'form.serial'}.'
');
- my $name = 'metadata.'.$env{'form.serial'}.'.title';
- my $value = $env{'form.title'};
- my $put_result = &Apache::lonnet::put('environment',
- {$name=>$value},$dom,$crs);
- $r->print('the put result was: '.$put_result.'
');
- $name = 'metadata.'.$env{'form.serial'}.'.type';
- $value = $env{'form.type'};
- $put_result = &Apache::lonnet::put('environment',
- {$name=>$value},$dom,$crs);
- $name = 'metadata.'.$env{'form.serial'}.'.values';
- $value = $env{'form.values'};
- $put_result = &Apache::lonnet::put('environment',
- {$name=>$value},$dom,$crs);
- &Apache::lonnet::coursedescription($env{'request.course.id'});
- } else {
-
- foreach my $key (sort keys %env) {
- if ($key=~m/^course\.$env{'request.course.id'}\.metadata\.\d+\.title$/) {
- $key=~m/^course\.$env{'request.course.id'}\.metadata\.(\d+)\.title/;
-
- if ($1 ge $next_meta) {
- $next_meta = $1 + 1;
+ my $key_base = $env{'course.'.$env{'request.course.id'}.'.'};
+ my $save_field = '';
+ if ($env{'form.restrictmeta'}) {
+ foreach my $field (sort(keys(%env))) {
+ if ($field=~m/^form.(.+)_(.+)$/) {
+ my $options;
+ my $meta_field = $1;
+ my $meta_key = $2;
+ if ($save_field ne $meta_field) {
+ $save_field = $meta_field;
+ if ($env{'form.'.$meta_field.'_stuadd'}) {
+ $options.='stuadd,';
+ }
+ if ($env{'form.'.$meta_field.'_onlyone'}) {
+ $options.='onlyone,';
+ }
+ if ($env{'form.'.$meta_field.'_active'}) {
+ $options.='active,';
+ }
+ my $name = $save_field;
+ $put_result = &Apache::lonnet::put('environment',
+ {'metadata.'.$meta_field.'.options'=>$options,
+ 'metadata.'.$meta_field.'.values'=>$env{'form.'.$meta_field.'_values'},
+ },$dom,$crs);
}
- $output.=' ';
}
}
- $output.=''.$env{$key}.' ';
- $output.='Select one: ';
- $output.='
';
- $output.='Select many: ';
+ }
+ &Apache::lonnet::coursedescription($env{'request.course.id'});
+ my %metadata_fields = &Apache::lonmeta::fieldnames('portfolio');
+ foreach my $field (sort(keys(%metadata_fields))) {
+ &Apache::lonnet::logthis ($field);
+ if ($field ne 'courserestricted') {
+ $output.= &output_row($r, $field, $metadata_fields{$field});
+ }
+ }
$r->print(<Create new instructor metadata item
';
- $output.='Options here ';
- $output.='