--- loncom/interface/lonparmset.pm 2005/09/23 20:19:18 1.239.2.2 +++ loncom/interface/lonparmset.pm 2005/08/30 00:40:12 1.245 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler to set parameters for assessments # -# $Id: lonparmset.pm,v 1.239.2.2 2005/09/23 20:19:18 albertel Exp $ +# $Id: lonparmset.pm,v 1.245 2005/08/30 00:40:12 banghart Exp $ # # Copyright Michigan State University Board of Trustees # @@ -1921,9 +1921,6 @@ 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').'' ); @@ -1950,11 +1947,10 @@ sub crsenv { 'default_enrollment_start_date', 'default_enrollment_end_date', 'tthoptions', - 'disablesigfigs', - 'disableexampointprint' + '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); @@ -2193,41 +2189,20 @@ 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\.\[([^\.]+)\]\.(.+)\.[^\.]+$/); - 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); + 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'}\.(.+)\.[^\.]+$/); } + ($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'}) { @@ -2702,6 +2677,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, @@ -2745,8 +2724,99 @@ ENDMAINFORMHEAD $r->print($menu_html); return; } +### Set instructor defined metadata +sub setinstmeta { + my ($r)=@_; + my $next_meta; + my $output; + my $item_num; + 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.'}; + 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', + {$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', + {$name=>$value},$dom,$crs); + $name = 'metadata.'.$env{'form.serial'}.'.values'; + $value = $env{'form.values'}; + $put_result = &Apache::lonnet::put('environment', + {$name=>$value},$dom,$crs); + &Apache::lonnet::coursedescription($env{'request.course.id'}); + } else { + + 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/; + $item_num = $1; + if ($1 ge $next_meta) { + $next_meta = $1 + 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.=''; + $r->print(< + +

+ + + $output +
TitleOptionsChoices
+ + - +ENDenv + + } + $r->print(' + '); + return 'ok'; +} ################################################## sub defaultsetter { @@ -2932,7 +3002,7 @@ sub handler { 'pres_marker', 'pres_value', 'pres_type', - 'udom','uname','symb']); + 'udom','uname','symb','serial']); &Apache::lonhtmlcommon::clear_breadcrumbs(); @@ -2979,6 +3049,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"});