--- loncom/interface/lonparmset.pm 2005/09/02 22:14:35 1.247
+++ loncom/interface/lonparmset.pm 2005/09/28 23:19:25 1.253
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler to set parameters for assessments
#
-# $Id: lonparmset.pm,v 1.247 2005/09/02 22:14:35 albertel Exp $
+# $Id: lonparmset.pm,v 1.253 2005/09/28 23:19:25 banghart Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1921,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').''
);
@@ -1947,7 +1950,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,6 +2193,7 @@ 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\.\[([^\.]+)\]\.(.+)\.[^\.]+$/);
@@ -2199,7 +2204,25 @@ sub listdata {
if (!defined($bstudent)) {
($brealm)=($b=~/^\Q$env{'request.course.id'}\E\.(.+)$/);
}
- ($arealm cmp $brealm) || ($astudent cmp $bstudent);
+ $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;
}
@@ -2727,17 +2750,43 @@ ENDMAINFORMHEAD
return;
}
### Set instructor defined metadata
+sub output_row {
+ my ($r, $field_name) = @_;
+ my $output;
+ my $active=$env{'course.'.$env{'request.course.id'}.'.metadata.'.$field_name.'.active'};
+ my $onlyone=$env{'course.'.$env{'request.course.id'}.'.metadata.'.$field_name.'.onlyone'};
+ my $stuadd=$env{'course.'.$env{'request.course.id'}.'.metadata.'.$field_name.'.stuadd'};
+ my $values=$env{'course.'.$env{'request.course.id'}.'.metadata.'.$field_name.'.values'};
+ my $checked;
+ unless (defined($active)) {
+ $active = 'no';
+ $stuadd = 'yes';
+ $values = 'Type a list of values separated by commas.';
+ $onlyone = 'no';
+ }
+ $output.='
'.$field_name.' | ';
+ $output.=' | ';
+ if ($onlyone eq 'no') {
+ $checked = ' CHECKED ';
+ } else {
+ $checked = ' ';
+ }
+ $output.=' | ';
+ if ($stuadd 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;
- 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
@@ -2748,66 +2797,71 @@ 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.'};
+ my $save_field = '';
+ my $stuadd;
+ my $onlyone;
+ my $active;
+ if ($env{'form.instmeta'}) {
+ foreach my $field (sort %env) {
+ if ($field=~m/^form.(.+)_(.+)$/) {
+ my $meta_field = $1;
+ my $meta_key = $2;
+ if ($save_field ne $meta_field) {
+ $save_field = $meta_field;
+ if ($env{'form.'.$meta_field.'_stuadd'}) {
+ $stuadd='yes';
+ } else {
+ $stuadd='no';
+ }
+ if ($env{'form.'.$meta_field.'_onlyone'}) {
+ $onlyone='no';
+ } else {
+ $onlyone='yes';
+ }
+ $active='yes';
+ my $name = 'metadata.'.$save_field;
+ $put_result = &Apache::lonnet::put('environment',
+ {'metadata.'.$meta_field.'.stuadd'=>$stuadd,
+ 'metadata.'.$meta_field.'.onlyone'=>$onlyone,
+ 'metadata.'.$meta_field.'.active'=>$active,
+ 'metadata.'.$meta_field.'.values'=>$env{'form.'.$meta_field.'_values'},
+ },$dom,$crs);
+ }
+ }
+ }
+
+ }
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);
+ 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 $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);
-
+ 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'});
- 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.='';
+ &Apache::lonnet::coursedescription($env{'request.course.id'});
+ $output.= &output_row($r, "Title");
+ $output.= &output_row($r, "Subject");
+ $output.= &output_row($r, "Keywords");
$r->print(<
- Title | Options | Choices |
+ Metadata Item | Values | Only One Choice | Student Can Add Choices |
$output