--- loncom/interface/lonparmset.pm 2005/08/26 19:55:19 1.241 +++ loncom/interface/lonparmset.pm 2005/09/28 13:29:17 1.252 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler to set parameters for assessments # -# $Id: lonparmset.pm,v 1.241 2005/08/26 19:55:19 banghart Exp $ +# $Id: lonparmset.pm,v 1.252 2005/09/28 13:29:17 banghart Exp $ # # Copyright Michigan State University Board of Trustees # @@ -1921,6 +1921,9 @@ sub crsenv { 'disablesigfigs' => ''.&mt('Disable checking of Significant Figures').'
'. ' ('.&mt('"[_1]" to disable, anything else if not','yes').')', + 'disableexampointprint' + => ''.&mt('Disable automatically printing point values onto exams.').'
'. + ' ('.&mt('"[_1]" to disable, anything else if not','yes').')', 'tthoptions' => ''.&mt('Default set of options to pass to tth/m when converting tex').'' ); @@ -1947,10 +1950,11 @@ sub crsenv { 'default_enrollment_start_date', 'default_enrollment_end_date', 'tthoptions', - 'disablesigfigs' + 'disablesigfigs', + 'disableexampointprint' ); foreach my $parameter (sort(keys(%values))) { - unless ($parameter =~ m/^internal\./) { + unless (($parameter =~ m/^internal\./)||($parameter =~ m/^metadata\./)) { if (! $descriptions{$parameter}) { $descriptions{$parameter}=$parameter; push(@Display_Order,$parameter); @@ -2189,20 +2193,41 @@ sub listdata { my $pointer=0; $tableopen=0; my $foundkeys=0; + my %keyorder=&standardkeyorder(); foreach my $thiskey (sort { if ($sortorder eq 'realmstudent') { - my ($astudent,$arealm)=($a=~/^$env{'request.course.id'}\.([^\.]+)\.(.+)\.[^\.]+$/); - my ($bstudent,$brealm)=($b=~/^$env{'request.course.id'}\.([^\.]+)\.(.+)\.[^\.]+$/); - if (!defined($astudent) && !defined($bstudent) && - !defined($arealm) && !defined($brealm)) { - ($arealm)=($a=~/^$env{'request.course.id'}\.(.+)\.[^\.]+$/); - ($brealm)=($b=~/^$env{'request.course.id'}\.(.+)\.[^\.]+$/); + my ($astudent,$arealm)=($a=~/^\Q$env{'request.course.id'}\E\.\[([^\.]+)\]\.(.+)\.[^\.]+$/); + my ($bstudent,$brealm)=($b=~/^\Q$env{'request.course.id'}\E\.\[([^\.]+)\]\.(.+)\.[^\.]+$/); + if (!defined($astudent)) { + ($arealm)=($a=~/^\Q$env{'request.course.id'}\E\.(.+)$/); + } + if (!defined($bstudent)) { + ($brealm)=($b=~/^\Q$env{'request.course.id'}\E\.(.+)$/); + } + $arealm=~s/\.type//; + my ($ares, $aparm) = ($arealm=~/^(.*)\.(.*)$/); + $aparm=$keyorder{'parameter_0_'.$aparm}; + $brealm=~s/\.type//; + my ($bres, $bparm) = ($brealm=~/^(.*)\.(.*)$/); + $bparm=$keyorder{'parameter_0_'.$bparm}; + if ($ares eq $bres) { + if (defined($aparm) && defined($bparm)) { + ($aparm <=> $bparm); + } elsif (defined($aparm)) { + -1; + } elsif (defined($bparm)) { + 1; + } else { + ($arealm cmp $brealm) || ($astudent cmp $bstudent); + } + } else { + ($arealm cmp $brealm) || ($astudent cmp $bstudent); } - ($arealm cmp $brealm) || ($astudent cmp $bstudent); } else { $a cmp $b; } } keys %{$listdata}) { + if ($$listdata{$thiskey.'.type'}) { my $thistype=$$listdata{$thiskey.'.type'}; if ($$resourcedata{$thiskey.'.type'}) { @@ -2725,9 +2750,42 @@ ENDMAINFORMHEAD return; } ### Set instructor defined metadata +sub output_row { + my ($field_name) = @_; + 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 = ' '; + } + $output.=''; + $output.=''; + + return ($output); +} sub setinstmeta { my ($r)=@_; - my $setoutput=''; + my $next_meta; + my $output; + my $item_num; + my $put_result; $r->print(&Apache::lonxml::xmlbegin()); $r->print(' LON-CAPA Set Instructor Metadata @@ -2737,7 +2795,97 @@ sub setinstmeta { 'Set Instructor Metadata')); my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'}; my $crs = $env{'course.'.$env{'request.course.id'}.'.num'}; - $r->print('Set instructor metadata here'); + my $key_base = $env{'course.'.$env{'request.course.id'}.'.metadata.'}; + my $save_field = ''; + my %meta_hash; + if ($env{'form.instmeta'}) { + foreach my $field (sort %env) { + if ($field=~m/^form.(.+)_(.+)$/) { + 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); + } + $save_field = $meta_field; + %meta_hash = {$meta_key=>[$env{$field}]}; + } + } + + + } + %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.=''; + $r->print(< + +

+ + + $output +
Metadata ItemValuesOnly One ChoiceStudent Can Add Choices
+ + + +ENDenv + + $r->print(' '); return 'ok'; @@ -2927,7 +3075,7 @@ sub handler { 'pres_marker', 'pres_value', 'pres_type', - 'udom','uname','symb']); + 'udom','uname','symb','serial']); &Apache::lonhtmlcommon::clear_breadcrumbs();