--- loncom/interface/lonparmset.pm 2005/09/28 23:19:25 1.253
+++ loncom/interface/lonparmset.pm 2005/10/03 19:10:22 1.256
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler to set parameters for assessments
#
-# $Id: lonparmset.pm,v 1.253 2005/09/28 23:19:25 banghart Exp $
+# $Id: lonparmset.pm,v 1.256 2005/10/03 19:10:22 banghart Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -2702,7 +2702,7 @@ ENDMAINFORMHEAD
action => 'crsenv',
permission => $parm_permission,
},
- { text => 'Set Instructor Defined Metadata',
+ { text => 'Set Portfolio Metadata',
action => 'setinstmeta',
permission => $parm_permission,
},
@@ -2749,35 +2749,38 @@ ENDMAINFORMHEAD
$r->print($menu_html);
return;
}
-### Set instructor defined metadata
+### Set portfolio metadata
sub output_row {
- my ($r, $field_name) = @_;
+ my ($r, $field_name, $field_text) = @_;
my $output;
- my $active=$env{'course.'.$env{'request.course.id'}.'.metadata.'.$field_name.'.active'};
- my $onlyone=$env{'course.'.$env{'request.course.id'}.'.metadata.'.$field_name.'.onlyone'};
- my $stuadd=$env{'course.'.$env{'request.course.id'}.'.metadata.'.$field_name.'.stuadd'};
+ 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($active)) {
- $active = 'no';
- $stuadd = 'yes';
+ unless (defined($options)) {
+ $options = 'active,stuadd';
$values = 'Type a list of values separated by commas.';
- $onlyone = 'no';
}
- $output.='| '.$field_name.' | ';
+ if ($options =~ m/active/) {
+ $checked = ' CHECKED ';
+ } else {
+ $checked = ' ';
+ }
+ $output.='
| ';
+ $output.=''.$field_text.' | ';
$output.=' | ';
- if ($onlyone eq 'no') {
+ if ($options =~ m/onlyone/) {
$checked = ' CHECKED ';
} else {
- $checked = ' ';
+ $checked = ' ';
}
- $output.=' | ';
- if ($stuadd eq 'yes') {
+ $output.=' | ';
+ if ($options =~ m/stuadd/) {
$checked = ' CHECKED ';
} else {
$checked = ' ';
}
$output.=' | ';
+
$output.='
';
return ($output);
}
@@ -2789,41 +2792,35 @@ sub setinstmeta {
my $put_result;
$r->print(&Apache::lonxml::xmlbegin());
$r->print('
- LON-CAPA Set Instructor Metadata
+ LON-CAPA Set Portfolio Metadata
');
- $r->print(&Apache::loncommon::bodytag('Set Instructor Metadata'));
+ $r->print(&Apache::loncommon::bodytag('Set Portfolio Metadata'));
$r->print(&Apache::lonhtmlcommon::breadcrumbs(undef,
- 'Set Instructor Metadata'));
+ 'Set Portfolio 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 $save_field = '';
- my $stuadd;
- my $onlyone;
- my $active;
if ($env{'form.instmeta'}) {
- foreach my $field (sort %env) {
+ 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'}) {
- $stuadd='yes';
- } else {
- $stuadd='no';
- }
+ $options.='stuadd,';
+ }
if ($env{'form.'.$meta_field.'_onlyone'}) {
- $onlyone='no';
- } else {
- $onlyone='yes';
+ $options.='onlyone,';
+ }
+ if ($env{'form.'.$meta_field.'_active'}) {
+ $options.='active,';
}
- $active='yes';
my $name = 'metadata.'.$save_field;
$put_result = &Apache::lonnet::put('environment',
- {'metadata.'.$meta_field.'.stuadd'=>$stuadd,
- 'metadata.'.$meta_field.'.onlyone'=>$onlyone,
- 'metadata.'.$meta_field.'.active'=>$active,
+ {'metadata.'.$meta_field.'.options'=>$options,
'metadata.'.$meta_field.'.values'=>$env{'form.'.$meta_field.'_values'},
},$dom,$crs);
}
@@ -2831,40 +2828,24 @@ sub setinstmeta {
}
}
- 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);
- }
- }
&Apache::lonnet::coursedescription($env{'request.course.id'});
- $output.= &output_row($r, "Title");
- $output.= &output_row($r, "Subject");
- $output.= &output_row($r, "Keywords");
+ my %metadata_fields = &Apache::lonmeta::fieldnames();
+
+ foreach my $field (sort(keys (%metadata_fields))) {
+
+ if ($field =~ m/metadata/) {
+ $output.= &output_row($r, $field, $metadata_fields{$field});
+ }
+ }
$r->print(<
- | Metadata Item | Values | Only One Choice | Student Can Add Choices |
|---|
+ | Active | Metadata Item | Values | Only One Choice | Student Can Add Choices |
|---|
$output
-
+
ENDenv
@@ -3108,7 +3089,7 @@ sub handler {
&overview($r);
} elsif ($env{'form.action'} eq 'setinstmeta' && $parm_permission) {
&Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setinstmeta',
- text=>"Instructor Metadata"});
+ text=>"Portfolio Metadata"});
&setinstmeta($r);
} elsif ($env{'form.action'} eq 'newoverview' && $parm_permission) {
&Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setoverview',