--- loncom/interface/lonparmset.pm 2005/09/28 13:29:17 1.252 +++ loncom/interface/lonparmset.pm 2005/12/28 18:56:22 1.268.2.2 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler to set parameters for assessments # -# $Id: lonparmset.pm,v 1.252 2005/09/28 13:29:17 banghart Exp $ +# $Id: lonparmset.pm,v 1.268.2.2 2005/12/28 18:56:22 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).'
'; } sub startpage { @@ -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"); @@ -1897,8 +1893,8 @@ sub crsenv { => ''.&mt('Receipt algorithm used').'
'. &mt('This controls how receipt numbers are generated.'), 'suppress_tries' - => ''.&mt('Suppress number of tries in printing').'('. - &mt('yes if supress').')', + => ''.&mt('Suppress number of tries in printing').'
'. + ' ('.&mt('"[_1]" to suppress, anything else to not supress','yes').')', 'problem_stream_switch' => ''.&mt('Allow problems to be split over pages').'
'. ' ('.&mt('"[_1]" if allowed, anything else if not','yes').')', @@ -2696,16 +2692,24 @@ ENDMAINFORMHEAD # my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; + my $vgr = &Apache::lonnet::allowed('vgr',$env{'request.course.id'}); + my @menu = ( { text => 'Set Course Environment Parameters', action => 'crsenv', permission => $parm_permission, }, - { text => 'Set Instructor Defined Metadata', - action => 'setinstmeta', + { text => 'Set Portfolio Metadata', + action => 'setrestrictmeta', permission => $parm_permission, }, + { text => 'Manage Course Slots', + url => '/adm/slotrequest?command=showslots', + permission => $vgr, + }, + { divider => 1, + }, { text => 'Set/Modify Resource Parameters - Helper Mode', url => '/adm/helper/parameter.helper', permission => $parm_permission, @@ -2730,6 +2734,10 @@ ENDMAINFORMHEAD ); my $menu_html = ''; foreach my $menu_item (@menu) { + if ($menu_item->{'divider'}) { + $menu_html .= '
'; + next; + } next if (! $menu_item->{'permission'}); $menu_html.='

'; $menu_html.=''; @@ -2749,38 +2757,32 @@ ENDMAINFORMHEAD $r->print($menu_html); return; } -### Set instructor defined metadata +### Set portfolio metadata sub output_row { - my ($field_name) = @_; + my ($r, $field_name, $field_text) = @_; my $output; - my $meta_hash_ref=$env{'course.'.$env{'request.course.id'}.'.metadata.'.$field_name}; - my $values=$$meta_hash_ref{'values'}; - my $checked; - unless (defined($$meta_hash_ref{'active'})) { - $$meta_hash_ref{'active'} = 'no'; - $$meta_hash_ref{'stu_add_values'} = 'yes'; - $$meta_hash_ref{'values'} = 'Type a list of values separated by commas.'; - $$meta_hash_ref{'stu_pick_many'} = 'yes'; - } - $output.=''.$field_name.''; - $output.=''; - if ($$meta_hash_ref{'stu_add_values'}eq'yes') { - $checked = ' CHECKED '; - } else { - $checked = ' '; - } - $output.='

'; - if ($$meta_hash_ref{'stu_pick_many'}eq'yes') { - $checked = ' CHECKED '; - } else { - $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 = ''; + } + $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; @@ -2788,104 +2790,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 %meta_hash; - 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 eq $meta_field) { - %meta_hash = {$meta_key=>[$env{$field}]}; - } else { - if ($save_field ne '') { - %meta_hash = {active=>'yes'}; - my $value = \%meta_hash; - my $name = $save_field; - $r->print('Saving '.$name.' meta
'); - $put_result = &Apache::lonnet::put('environment', - {$name=>$value},$dom,$crs); - } + if ($save_field ne $meta_field) { $save_field = $meta_field; - %meta_hash = {$meta_key=>[$env{$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); } } - - - } - %meta_hash = {active=>'yes'}; - my $value = \%meta_hash; - my $name = $save_field; - $r->print('Saving '.$name.' meta
'); - $put_result = &Apache::lonnet::put('environment', - {$name=>$value},$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("Title"); - $output.= &output_row("Subject"); - $output.= &output_row("Keywords"); -# 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}; -# # keys are 'values', stu_pick_many, stu_add_values, active -# -# $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.=''; + 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'; @@ -3062,6 +3016,7 @@ Main handler. Calls &assessparms and &c ################################################## # use Data::Dumper; + sub handler { my $r=shift; @@ -3122,10 +3077,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"});