--- loncom/interface/lonparmset.pm 2005/09/23 20:16:50 1.251
+++ loncom/interface/lonparmset.pm 2005/09/29 21:10:32 1.254
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler to set parameters for assessments
#
-# $Id: lonparmset.pm,v 1.251 2005/09/23 20:16:50 albertel Exp $
+# $Id: lonparmset.pm,v 1.254 2005/09/29 21:10:32 banghart Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -2750,6 +2750,34 @@ ENDMAINFORMHEAD
return;
}
### Set instructor defined metadata
+sub output_row {
+ my ($r, $field_name) = @_;
+ 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.';
+ }
+ $output.='
'.$field_name.' | ';
+ $output.=' | ';
+ if ($options =~ m/onlyone/) {
+ $checked = ' CHECKED ';
+ } else {
+ $checked = ' ';
+ }
+ $output.=' | ';
+ if ($options =~ m/stuadd/) {
+ $checked = ' CHECKED ';
+ } else {
+ $checked = ' ';
+ }
+ $output.=' | ';
+
+ $output.='
';
+ return ($output);
+}
sub setinstmeta {
my ($r)=@_;
my $next_meta;
@@ -2766,51 +2794,44 @@ sub setinstmeta {
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.'};
- foreach my $field (%env) {
- # start by looking for populated fields
- if ($field=~m/type(\d+)/) {
- my $name;
- my $value;
- $put_result = &Apache::lonnet::put('environment',
- {$name=>$value},$dom,$crs);
- $put_result = &Apache::lonnet::put('environment',
- {$name=>$value},$dom,$crs);
- }
- if ($field=~m/newfield/) {
- my $name = 'metadata.'.$env{'form.titlenew'};
- my %meta_hash = {values=>[$env{'form.valuesnew'}],
- allow_pick=>'many',
- allow_type=>'no'};
-
- my $value = \%meta_hash;
- $put_result = &Apache::lonnet::put('environment',
- {$name=>$value},$dom,$crs);
+ my $save_field = '';
+ if ($env{'form.instmeta'}) {
+ 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 = 'metadata.'.$save_field;
+ $put_result = &Apache::lonnet::put('environment',
+ {'metadata.'.$meta_field.'.options'=>$options,
+ 'metadata.'.$meta_field.'.values'=>$env{'form.'.$meta_field.'_values'},
+ },$dom,$crs);
+ }
+ }
}
- }
- &Apache::lonnet::coursedescription($env{'request.course.id'});
- foreach my $key (sort keys %env) {
- if ($key=~m/^course\.$env{'request.course.id'}\.metadata\.(.+)$/) {
- my $meta_data_item = $1;
- my $meta_hash=$env{$key};
- $output.=''.$meta_data_item.' | ';
- $output.='Select one: ';
- $output.='Select many: | ';
- $output.=' |
';
- }
- }
- $output.='Create new instructor metadata item ';
- $output.=' | ';
- $output.='students must pick only one: ';
- $output.='Allow student to type extra info: | ';
- $output.=' |
';
- $output.='';
- $output.='';
+
+ }
+ &Apache::lonnet::coursedescription($env{'request.course.id'});
+ $output.= &output_row($r, "Title");
+ $output.= &output_row($r, "Subject");
+ $output.= &output_row($r, "Keywords");
$r->print(<
- Title | Options | Choices |
+ Metadata Item | Values | Only One Choice | Student Can Add Choices |
$output