--- loncom/interface/lonparmset.pm 2005/08/27 19:07:58 1.243 +++ loncom/interface/lonparmset.pm 2005/09/14 17:56:25 1.250 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler to set parameters for assessments # -# $Id: lonparmset.pm,v 1.243 2005/08/27 19:07:58 banghart Exp $ +# $Id: lonparmset.pm,v 1.250 2005/09/14 17:56:25 banghart 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,20 +2189,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'}) { @@ -2728,11 +2749,9 @@ ENDMAINFORMHEAD sub setinstmeta { my ($r)=@_; my $next_meta; - if ($env{'form.serial'}) { - $next_meta = $env{'form.serial'}; - } else { - $next_meta = 1; - } + my $output; + my $item_num; + my $put_result; $r->print(&Apache::lonxml::xmlbegin()); $r->print(' LON-CAPA Set Instructor Metadata @@ -2743,56 +2762,59 @@ sub setinstmeta { 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.'}; - if ($env{'form.state'}eq 'add') { - $r->print('Compose a new metadata item:
'); - $r->print('
'); - $r->print ('Title of item: '.&Apache::lonhtmlcommon::textbox("title",undef,undef,undef).'
'); - $r->print ('List if items (comma separated): '.&Apache::lonhtmlcommon::textbox("values",undef,undef,undef).'
'); - $r->print ('Select one:
'); - $r->print ('Select many:
'); - $r->print(''); - $r->print(''); - $r->print(''); - $r->print(''); - $r->print('
'); - } elsif ($env{'form.state'}eq 'save') { - $r->print('Here we save the metadata'); - $key_base.=$env{'form.serial'}.'.'; - $r->print('The title: '.$env{'form.title'}.'
'); - $r->print('The values: '.$env{'form.values'}.'
'); - $r->print('The type: '.$env{'form.type'}.'
'); - $r->print('The number: '.$env{'form.serial'}.'
'); - my $name = 'metadata.'.$env{'form.serial'}.'.title'; - my $value = $env{'form.title'}; - my $put_result = &Apache::lonnet::put('environment', + 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); - $r->print('the put result was: '.$put_result.'
'); - $name = 'metadata.'.$env{'form.serial'}.'.type'; - $value = $env{'form.type'}; - $put_result = &Apache::lonnet::put('environment', + $put_result = &Apache::lonnet::put('environment', {$name=>$value},$dom,$crs); - $name = 'metadata.'.$env{'form.serial'}.'.values'; - $value = $env{'form.values'}; - $put_result = &Apache::lonnet::put('environment', + } + 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'}); - } else { - my $found_one = 0; - foreach my $key (sort keys %env) { - if ($key=~m/^course\.$env{'request.course.id'}\.metadata\.\d+\.title$/) { - unless ($found_one eq 1) { - $found_one = 1; - $r->print('Existing Metadata
'); - } - $r->print($env{$key}.'
'); - $key=~m/^course\.$env{'request.course.id'}\.metadata\.(\d+)\.title/; - if ($1 ge $next_meta) { - $next_meta = $1 + 1; - } - } } - $r->print('Add Metadata Item
'); - } + } + &Apache::lonnet::coursedescription($env{'request.course.id'}); + 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}; + $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 +
TitleOptionsChoices
+ + + +ENDenv + + $r->print(' '); return 'ok';