--- loncom/interface/lonparmset.pm 2005/09/28 23:19:25 1.253 +++ loncom/interface/lonparmset.pm 2005/11/17 20:04:05 1.267 @@ -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.267 2005/11/17 20:04:05 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; @@ -1571,10 +1573,7 @@ Set Defaults for All Resources in $folde Specifically for ENDMAPONE if ($uname) { - my %name=&Apache::lonnet::userenvironment($udom,$uname, - ('firstname','middlename','lastname','generation', 'id')); - my $person=$name{'firstname'}.' '.$name{'middlename'}.' ' - .$name{'lastname'}.' '.$name{'generation'}; + my $person=&Apache::loncommon::plainname($uname,$udom); $r->print(&mt("User")." $uname \($person\) ". &mt('in')." \n"); } else { @@ -1652,10 +1651,7 @@ ENDMAPONE $coursename
ENDMAPONE if ($uname) { - my %name=&Apache::lonnet::userenvironment($udom,$uname, - ('firstname','middlename','lastname','generation', 'id')); - my $person=$name{'firstname'}.' '.$name{'middlename'}.' ' - .$name{'lastname'}.' '.$name{'generation'}; + my $person=&Apache::loncommon::plainname($uname,$udom); $r->print(" ".&mt("User")." $uname \($person\) \n"); } else { $r->print(" ".&mt("ALL")." ".&mt("USERS")." \n"); @@ -2702,8 +2698,8 @@ ENDMAINFORMHEAD action => 'crsenv', permission => $parm_permission, }, - { text => 'Set Instructor Defined Metadata', - action => 'setinstmeta', + { text => 'Set Portfolio Metadata', + action => 'setrestrictmeta', permission => $parm_permission, }, { text => 'Set/Modify Resource Parameters - Helper Mode', @@ -2749,39 +2745,32 @@ 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'; - $values = 'Type a list of values separated by commas.'; - $onlyone = 'no'; - } - $output.=''.$field_name.''; - $output.=''; - if ($onlyone eq 'no') { - $checked = ' CHECKED '; - } else { - $checked = ' '; - } - $output.='
'; - if ($stuadd eq 'yes') { - $checked = ' CHECKED '; - } else { - $checked = ' '; + 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).'
'; } - $output.=''; - $output.=''; return ($output); } -sub setinstmeta { + +sub setrestrictmeta { my ($r)=@_; my $next_meta; my $output; @@ -2789,87 +2778,56 @@ sub setinstmeta { my $put_result; $r->print(&Apache::lonxml::xmlbegin()); $r->print(' - LON-CAPA Set Instructor Metadata + LON-CAPA Restrict Metadata '); - $r->print(&Apache::loncommon::bodytag('Set Instructor Metadata')); + $r->print(&Apache::loncommon::bodytag('Restrict Metadata')); $r->print(&Apache::lonhtmlcommon::breadcrumbs(undef, - 'Set Instructor 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'}.'.metadata.'}; + my $key_base = $env{'course.'.$env{'request.course.id'}.'.'}; my $save_field = ''; - my $stuadd; - my $onlyone; - my $active; - if ($env{'form.instmeta'}) { - foreach my $field (sort %env) { + 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'}) { - $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; + my $name = $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); } } } - } - 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('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(< - +

- - $output -
Metadata ItemValuesOnly One ChoiceStudent Can Add Choices
- +

- ENDenv - - $r->print(' '); return 'ok'; @@ -3046,6 +3004,7 @@ Main handler. Calls &assessparms and &c ################################################## # use Data::Dumper; + sub handler { my $r=shift; @@ -3106,10 +3065,10 @@ sub handler { &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setoverview', text=>"Overview Mode"}); &overview($r); - } elsif ($env{'form.action'} eq 'setinstmeta' && $parm_permission) { - &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setinstmeta', - text=>"Instructor Metadata"}); - &setinstmeta($r); + } elsif ($env{'form.action'} eq 'setrestrictmeta' && $parm_permission) { + &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setrestrictmeta', + text=>"Restrict Metadata"}); + &setrestrictmeta($r); } elsif ($env{'form.action'} eq 'newoverview' && $parm_permission) { &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setoverview', text=>"Overview Mode"});