--- loncom/interface/lonparmset.pm 2005/08/29 22:57:09 1.244
+++ loncom/interface/lonparmset.pm 2005/11/21 22:00:11 1.268
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler to set parameters for assessments
#
-# $Id: lonparmset.pm,v 1.244 2005/08/29 22:57:09 banghart Exp $
+# $Id: lonparmset.pm,v 1.268 2005/11/21 22:00:11 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -316,6 +316,8 @@ sub storeparm_by_symb {
# store parameter
&storeparm_by_symb_inner
($symb,$spnam,$snum,$nval,$ntype,$uname,$udom,$csec);
+# don't do anything if parameter was reset
+ unless ($nval) { return; }
my ($prefix,$parm)=($spnam=~/^(.*[\_\.])([^\_\.]+)$/);
# remember that this was set
$recstack{$parm}=1;
@@ -1571,10 +1573,7 @@ Set Defaults for All Resources in $folde
Specifically for
ENDMAPONE
if ($uname) {
- my %name=&Apache::lonnet::userenvironment($udom,$uname,
- ('firstname','middlename','lastname','generation', 'id'));
- my $person=$name{'firstname'}.' '.$name{'middlename'}.' '
- .$name{'lastname'}.' '.$name{'generation'};
+ my $person=&Apache::loncommon::plainname($uname,$udom);
$r->print(&mt("User")." $uname \($person\) ".
&mt('in')." \n");
} else {
@@ -1652,10 +1651,7 @@ ENDMAPONE
$coursename
ENDMAPONE
if ($uname) {
- my %name=&Apache::lonnet::userenvironment($udom,$uname,
- ('firstname','middlename','lastname','generation', 'id'));
- my $person=$name{'firstname'}.' '.$name{'middlename'}.' '
- .$name{'lastname'}.' '.$name{'generation'};
+ my $person=&Apache::loncommon::plainname($uname,$udom);
$r->print(" ".&mt("User")." $uname \($person\) \n");
} else {
$r->print(" ".&mt("ALL")." ".&mt("USERS")." \n");
@@ -1921,6 +1917,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,7 +1946,8 @@ sub crsenv {
'default_enrollment_start_date',
'default_enrollment_end_date',
'tthoptions',
- 'disablesigfigs'
+ 'disablesigfigs',
+ 'disableexampointprint'
);
foreach my $parameter (sort(keys(%values))) {
unless (($parameter =~ m/^internal\./)||($parameter =~ m/^metadata\./)) {
@@ -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'}) {
@@ -2671,16 +2692,24 @@ ENDMAINFORMHEAD
#
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+ my $vgr = &Apache::lonnet::allowed('vgr',$env{'request.course.id'});
+
my @menu =
(
{ text => 'Set Course Environment Parameters',
action => 'crsenv',
permission => $parm_permission,
},
- { text => 'Set Instructor Defined Metadata',
- action => 'setinstmeta',
+ { text => 'Set Portfolio Metadata',
+ action => 'setrestrictmeta',
permission => $parm_permission,
},
+ { text => 'Manange Course Slots',
+ url => '/adm/slotrequest?command=showslots',
+ permission => $vgr,
+ },
+ { divider => 1,
+ },
{ text => 'Set/Modify Resource Parameters - Helper Mode',
url => '/adm/helper/parameter.helper',
permission => $parm_permission,
@@ -2705,6 +2734,10 @@ ENDMAINFORMHEAD
);
my $menu_html = '';
foreach my $menu_item (@menu) {
+ if ($menu_item->{'divider'}) {
+ $menu_html .= '
';
$menu_html.='';
@@ -2724,91 +2757,89 @@ ENDMAINFORMHEAD
$r->print($menu_html);
return;
}
-### Set instructor defined metadata
-sub setinstmeta {
+### Set portfolio metadata
+sub output_row {
+ my ($r, $field_name, $field_text) = @_;
+ my $output;
+ my $options=$env{'course.'.$env{'request.course.id'}.'.metadata.'.$field_name.'.options'};
+ my $values=$env{'course.'.$env{'request.course.id'}.'.metadata.'.$field_name.'.values'};
+ unless (defined($options)) {
+ $options = 'active,stuadd';
+ $values = '';
+ }
+ $output.=''.$field_text.':';
+ $output.='
';
+
+ my @options= ( ['active', 'Show to student'],
+ ['onlyone','Student may select only one choice'],
+ ['stuadd', 'Student may type choices']);
+ foreach my $opt (@options) {
+ my $checked = ($options =~ m/$opt->[0]/) ? ' checked="checked" ' : '' ;
+ $output.=(' 'x5).'
';
+ }
+ return ($output);
+}
+
+sub setrestrictmeta {
my ($r)=@_;
my $next_meta;
my $output;
- if ($env{'form.serial'}) {
- $next_meta = $env{'form.serial'};
- } else {
- $next_meta = 1;
- }
+ my $item_num;
+ my $put_result;
$r->print(&Apache::lonxml::xmlbegin());
$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/;
-
- if ($1 ge $next_meta) {
- $next_meta = $1 + 1;
+ my $key_base = $env{'course.'.$env{'request.course.id'}.'.'};
+ my $save_field = '';
+ if ($env{'form.restrictmeta'}) {
+ foreach my $field (sort(keys(%env))) {
+ if ($field=~m/^form.(.+)_(.+)$/) {
+ my $options;
+ my $meta_field = $1;
+ my $meta_key = $2;
+ if ($save_field ne $meta_field) {
+ $save_field = $meta_field;
+ if ($env{'form.'.$meta_field.'_stuadd'}) {
+ $options.='stuadd,';
+ }
+ if ($env{'form.'.$meta_field.'_onlyone'}) {
+ $options.='onlyone,';
+ }
+ if ($env{'form.'.$meta_field.'_active'}) {
+ $options.='active,';
+ }
+ my $name = $save_field;
+ $put_result = &Apache::lonnet::put('environment',
+ {'metadata.'.$meta_field.'.options'=>$options,
+ 'metadata.'.$meta_field.'.values'=>$env{'form.'.$meta_field.'_values'},
+ },$dom,$crs);
}
- $output.=' ';
}
}
- $output.=''.$env{$key}.' ';
- $output.='Select one: ';
- $output.='
';
- $output.='Select many: ';
+ }
+ &Apache::lonnet::coursedescription($env{'request.course.id'});
+ my %metadata_fields = &Apache::lonmeta::fieldnames('portfolio');
+ foreach my $field (sort(keys(%metadata_fields))) {
+ &Apache::lonnet::logthis ($field);
+ if ($field ne 'courserestricted') {
+ $output.= &output_row($r, $field, $metadata_fields{$field});
+ }
+ }
$r->print(<Create new instructor metadata item
';
- $output.='Options here ';
- $output.='