--- loncom/interface/lonparmset.pm 2005/06/28 15:21:22 1.233 +++ 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.233 2005/06/28 15:21:22 albertel Exp $ +# $Id: lonparmset.pm,v 1.252 2005/09/28 13:29:17 banghart Exp $ # # Copyright Michigan State University Board of Trustees # @@ -904,12 +904,12 @@ ENDSCRIPT $r->print("\n"); my $cnt=0; foreach $tempkey (&keysindisplayorder($allparms,$keyorder)) { - $r->print("\n'); + $r->print('>'.$$allparms{$tempkey}.''); $cnt++; if ($cnt==3) { $r->print("\n"); @@ -941,7 +941,9 @@ sub partmenu { $r->print('>'.&mt('All Parts').''); my %temphash=(); foreach (@{$psprt}) { $temphash{$_}=1; } - foreach my $tempkey (sort keys %{$allparts}) { + foreach my $tempkey (sort { + if ($a==$b) { return ($a cmp $b) } else { return ($a <=> $b); } + } keys(%{$allparts})) { unless ($tempkey =~ /\./) { $r->print(''); - $r->print(''); - - foreach (&keysinorder(\%name,\%keyorder)) { + foreach (&keysinorder_bytype(\%name,\%keyorder)) { unless ($firstrow) { $r->print(''); } else { @@ -1757,9 +1769,13 @@ sub crsenv { # # Let the user know we made the changes if ($name && defined($value)) { + my $failed_cloners; if ($name eq 'cloners') { + $value =~ s/\s//g; $value =~ s/^,//; $value =~ s/,$//; + # check requested clones are valid users. + $failed_cloners = &check_cloners(\$value,\@oldcloner); } my $put_result = &Apache::lonnet::put('environment', {$name=>$value},$dom,$crs); @@ -1776,6 +1792,18 @@ sub crsenv { $setoutput.=&mt('Unable to set').' '.$name.' '.&mt('to'). ' '.$value.' '.&mt('due to').' '.$put_result.'.
'; } + if (($name eq 'cloners') && ($failed_cloners)) { + $setoutput.= &mt('Unable to include').' - '.$failed_cloners.', '. + &mt('reason').' - '.&mt('LON-CAPA user(s) do(es) not exist'). + '.
'.&mt('Please '). + ' '. + &mt('add the user(s)').', '. + &mt('and then return to the '). + ''. + &mt('Course Parameters page').' '. + &mt('to add the new user(s) to the list of possible cloners'). + '.
'; + } } } # ------------------------- Re-init course environment entries for this session @@ -1893,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').'' ); @@ -1919,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); @@ -2161,15 +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'}\.([^\.]+)\.(.+)\.[^\.]+$/); - ($arealm cmp $brealm) || ($astudent cmp $bstudent); + 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); + } } else { $a cmp $b; } } keys %{$listdata}) { + if ($$listdata{$thiskey.'.type'}) { my $thistype=$$listdata{$thiskey.'.type'}; if ($$resourcedata{$thiskey.'.type'}) { @@ -2473,25 +2531,76 @@ ENDOVER ################################################## =pod - -=item change clone - + +=item check_cloners + +Checks if new users included in list of allowed cloners +are valid users. Replaces supplied list with +cleaned list containing only users with valid usernames +and domains. + +Inputs: $clonelist, $oldcloner +where $clonelist is ref to array of requested cloners, +and $oldcloner is ref to array of currently allowed +cloners. + +Returns: string - comma separated list of requested +cloners (username:domain) who do not exist in system. + +=item change_clone + Modifies the list of courses a user can clone (stored -in the user's environemnt.db file), called when a +in the user's environment.db file), called when a change is made to the list of users allowed to clone a course. - + Inputs: $action,$cloner where $action is add or drop, and $cloner is identity of user for whom cloning ability is to be changed in course. - -Returns: =cut ################################################## ################################################## +sub extract_cloners { + my ($clonelist,$allowclone) = @_; + if ($clonelist =~ /,/) { + @{$allowclone} = split/,/,$clonelist; + } else { + $$allowclone[0] = $clonelist; + } +} + + +sub check_cloners { + my ($clonelist,$oldcloner) = @_; + my ($clean_clonelist,$disallowed); + my @allowclone = (); + &extract_cloners($$clonelist,\@allowclone); + foreach my $currclone (@allowclone) { + if (!grep/^$currclone$/,@$oldcloner) { + my ($uname,$udom) = split/:/,$currclone; + if ($uname && $udom) { + if (&Apache::lonnet::homeserver($uname,$udom) eq 'no_host') { + $disallowed .= $currclone.','; + } else { + $clean_clonelist .= $currclone.','; + } + } + } else { + $clean_clonelist .= $currclone.','; + } + } + if ($disallowed) { + $disallowed =~ s/,$//; + } + if ($clean_clonelist) { + $clean_clonelist =~ s/,$//; + } + $$clonelist = $clean_clonelist; + return $disallowed; +} sub change_clone { my ($clonelist,$oldcloner) = @_; @@ -2501,12 +2610,8 @@ sub change_clone { my $clone_crs = $cnum.':'.$cdom; if ($cnum && $cdom) { - my @allowclone = (); - if ($clonelist =~ /,/) { - @allowclone = split/,/,$clonelist; - } else { - $allowclone[0] = $clonelist; - } + my @allowclone; + &extract_cloners($clonelist,\@allowclone); foreach my $currclone (@allowclone) { if (!grep/^$currclone$/,@$oldcloner) { ($uname,$udom) = split/:/,$currclone; @@ -2597,6 +2702,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, @@ -2640,8 +2749,147 @@ ENDMAINFORMHEAD $r->print($menu_html); 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.=''; + $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 $next_meta; + my $output; + my $item_num; + my $put_result; + $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.'}; + 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.=''; +# $output.=''; +# $output.=''; +# } +# } +# $output.=''; +# $output.=''; +# $output.=''; +# $output.=''; +# $output.=''; + $r->print(< + +

+

print("\n
'); - - $r->print(' / res / '); - $r->print(join(' / ', split(/\//,$mapp{$rid}))); + '>'.$maptitles{$mapp{$rid}}.'
'.$field_name.'
'.$meta_data_item.'Select one:
'; +# $output.='Select many:
Create new instructor metadata item
'; +# $output.='		students must pick only one:
'; +# $output.='Allow student to type extra info:
+ + $output +
Metadata ItemValuesOnly One ChoiceStudent Can Add Choices
+ + - +ENDenv + + + $r->print(' + '); + return 'ok'; +} ################################################## sub defaultsetter { @@ -2827,7 +3075,7 @@ sub handler { 'pres_marker', 'pres_value', 'pres_type', - 'udom','uname','symb']); + 'udom','uname','symb','serial']); &Apache::lonhtmlcommon::clear_breadcrumbs(); @@ -2874,6 +3122,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"});