--- loncom/interface/lonparmset.pm 2005/09/02 22:40:07 1.239.2.1 +++ loncom/interface/lonparmset.pm 2005/09/02 22:14:35 1.247 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler to set parameters for assessments # -# $Id: lonparmset.pm,v 1.239.2.1 2005/09/02 22:40:07 albertel Exp $ +# $Id: lonparmset.pm,v 1.247 2005/09/02 22:14:35 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -1950,7 +1950,7 @@ sub crsenv { 'disablesigfigs' ); 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,7 +2189,6 @@ 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=~/^\Q$env{'request.course.id'}\E\.\[([^\.]+)\]\.(.+)\.[^\.]+$/); @@ -2200,25 +2199,7 @@ sub listdata { 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; } @@ -2698,6 +2679,10 @@ ENDMAINFORMHEAD action => 'crsenv', permission => $parm_permission, }, + { text => 'Set Instructor Defined Metadata', + action => 'setinstmeta', + permission => $parm_permission, + }, { text => 'Set/Modify Resource Parameters - Helper Mode', url => '/adm/helper/parameter.helper', permission => $parm_permission, @@ -2741,8 +2726,100 @@ ENDMAINFORMHEAD $r->print($menu_html); return; } +### Set instructor defined metadata +sub setinstmeta { + my ($r)=@_; + my $next_meta; + my $output; + my $item_num; + my $put_result; + if ($env{'form.serial'}) { + $next_meta = $env{'form.serial'}; + } else { + $next_meta = 1; + } + $r->print(&Apache::lonxml::xmlbegin()); + $r->print(' + LON-CAPA Set Instructor Metadata + '); + $r->print(&Apache::loncommon::bodytag('Set Instructor Metadata')); + $r->print(&Apache::lonhtmlcommon::breadcrumbs(undef, + 'Set Instructor 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.'}; + foreach my $field (%env) { + # start by looking for populated fields + if ($field=~m/type(\d+)/) { + my $item_num = $1; + my $name = 'metadata.'.$item_num.'.type'; + my $value = $env{'form.type'.$item_num}; + $put_result = &Apache::lonnet::put('environment', + {$name=>$value},$dom,$crs); + $name = 'metadata.'.$item_num.'.values'; + $value = $env{'form.values'.$item_num}; + $put_result = &Apache::lonnet::put('environment', + {$name=>$value},$dom,$crs); + } + if ($field=~m/newfield/) { + my $item_num = $env{'form.serial'}; + my $name = 'metadata.'.$item_num.'.type'; + my $value = $env{'form.typenew'}; + $put_result = &Apache::lonnet::put('environment', + {$name=>$value},$dom,$crs); + $name = 'metadata.'.$item_num.'.values'; + $value = $env{'form.valuesnew'}; + $put_result = &Apache::lonnet::put('environment', + {$name=>$value},$dom,$crs); + $name = 'metadata.'.$item_num.'.title'; + $value = $env{'form.titlenew'}; + $put_result = &Apache::lonnet::put('environment', + {$name=>$value},$dom,$crs); + + } + + + } + &Apache::lonnet::coursedescription($env{'request.course.id'}); + foreach my $key (sort keys %env) { + if ($key=~m/^course\.$env{'request.course.id'}\.metadata\.\d+\.title$/) { + $key=~m/(^course\.$env{'request.course.id'}\.metadata\.)(\d+)\.title/; + $key_base = $1; + $item_num = $2; + if ($item_num ge $next_meta) { + $next_meta = $item_num + 1; + } + $output.=''.$env{$key}.''; + $output.='Select one:
'; + $output.='Select many: '; + $output.=''; + } + } + $output.='Create new instructor metadata item
'; + $output.=''; + $output.='Select one:
'; + $output.='Select many: '; + $output.=''; + $output.=''; + $output.=''; + $r->print(< + +

+ + + $output +
TitleOptionsChoices
+ + - +ENDenv + + + $r->print(' + '); + return 'ok'; +} ################################################## sub defaultsetter { @@ -2928,7 +3005,7 @@ sub handler { 'pres_marker', 'pres_value', 'pres_type', - 'udom','uname','symb']); + 'udom','uname','symb','serial']); &Apache::lonhtmlcommon::clear_breadcrumbs(); @@ -2975,6 +3052,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 'newoverview' && $parm_permission) { &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setoverview', text=>"Overview Mode"});