--- loncom/interface/lonparmset.pm 2007/01/18 21:14:04 1.350.2.6
+++ loncom/interface/lonparmset.pm 2006/12/11 23:57:17 1.351
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler to set parameters for assessments
#
-# $Id: lonparmset.pm,v 1.350.2.6 2007/01/18 21:14:04 albertel Exp $
+# $Id: lonparmset.pm,v 1.351 2006/12/11 23:57:17 banghart Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -122,10 +122,7 @@ sub parmval_by_symb {
# load caches
&cacheparmhash();
- my $useropt;
- if ($uname ne '' && $udom ne '') {
- $useropt = &Apache::lonnet::get_userresdata($uname,$udom);
- }
+ my $useropt=&Apache::lonnet::get_userresdata($uname,$udom);
my $result='';
my @outpar=();
@@ -176,7 +173,7 @@ sub parmval_by_symb {
}
# ------------------------------------------------------ fourth, back to course
- if ($csec ne '') {
+ if (defined($csec)) {
if (defined($$courseopt{$seclevel})) {
$outpar[9]=$$courseopt{$seclevel};
$result=9;
@@ -192,7 +189,7 @@ sub parmval_by_symb {
}
}
# ------------------------------------------------------ fifth, check course group
- if ($cgroup ne '') {
+ if (defined($cgroup)) {
if (defined($$courseopt{$grplevel})) {
$outpar[6]=$$courseopt{$grplevel};
$result=6;
@@ -209,7 +206,7 @@ sub parmval_by_symb {
# ---------------------------------------------------------- fifth, check user
- if ($uname ne '') {
+ if (defined($uname)) {
if (defined($$useropt{$courselevel})) {
$outpar[3]=$$useropt{$courselevel};
$result=3;
@@ -272,8 +269,10 @@ sub resetrulescache {
sub rulescache {
my $id=shift;
- if ($rulesid ne $env{'request.course.id'}
- && !defined($rules{$id})) {
+ if ($rulesid ne $env{'request.course.id'}) {
+ %rules=();
+ }
+ unless (defined($rules{$id})) {
my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
%rules=&Apache::lonnet::dump('parmdefactions',$dom,$crs);
@@ -3189,7 +3188,6 @@ ENDMAINFORMHEAD
### Set portfolio metadata
sub output_row {
my ($r, $field_name, $field_text, $added_flag) = @_;
- my $row_class;
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'};
@@ -3198,26 +3196,47 @@ sub output_row {
$values = '';
}
if (!($options =~ /deleted/)) {
- $output = &Apache::loncommon::start_data_table_row();
- $output .= '
'.$field_text.':
';
- # $output .= '
'.$field_text.':
';
- $output .= '
';
- $output .= &Apache::loncommon::end_data_table_row();
my @options= ( ['active', 'Show to student'],
- ['onlyone','Student may select only one choice'],
- ['stuadd', 'Student may type choices']);
+ ['stuadd', 'Provide text area for students to type catalog information'],
+ ['choices','Provide choices for students to select from']);
+# ['onlyone','Student may select only one choice']);
if ($added_flag) {
push @options,['deleted', 'Delete Metadata Field'];
}
+ $output = &Apache::loncommon::start_data_table_row();
+ $output .= '