loncom/interface/lonparmset.pm - diff

Return to lonparmset.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonparmset.pm between versions 1.180 and 1.189

version 1.180, 2004/12/06 21:41:01	version 1.189, 2005/03/18 15:17:36
Line 75 my %keyp;	Line 75 my %keyp;

my %maptitles;	my %maptitles;

my $uname;
my $udom;
my $uhome;
my $csec;
my $coursename;

##################################################	##################################################
##################################################	##################################################

Line 96 Inputs: $what - a parameter spec (inclu	Line 90 Inputs: $what - a parameter spec (inclu

Returns: A list, the first item is the index into the remaining list of items of parm valuse that is the active one, the list consists of parm values at the 11 possible levels	Returns: A list, the first item is the index into the remaining list of items of parm valuse that is the active one, the list consists of parm values at the 11 possible levels

11- resource default	11 - General Course
10- map default	10 - Map or Folder level in course
9 - General Course	9- resource default
8 - Map or Folder level in course	8- map default
7 - resource level in course	7 - resource level in course
6 - General for section	6 - General for section
5 - Map or Folder level for section	5 - Map or Folder level for section
Line 113 Returns: A list, the first item is the	Line 107 Returns: A list, the first item is the
##################################################	##################################################
##################################################	##################################################
sub parmval {	sub parmval {
my ($what,$id,$def)=@_;	my ($what,$id,$def,$uname,$udom,$csec)=@_;
my $result='';	my $result='';
my @outpar=();	my @outpar=();
# ----------------------------------------------------- Cascading lookup scheme	# ----------------------------------------------------- Cascading lookup scheme
Line 129 sub parmval {	Line 123 sub parmval {
my $courselevelr=$ENV{'request.course.id'}.'.'.$symbparm;	my $courselevelr=$ENV{'request.course.id'}.'.'.$symbparm;
my $courselevelm=$ENV{'request.course.id'}.'.'.$mapparm;	my $courselevelm=$ENV{'request.course.id'}.'.'.$mapparm;

# -------------------------------------------------------- first, check default

if (defined($def)) { $outpar[11]=$def; $result=11; }

# ----------------------------------------------------- second, check map parms

my $thisparm=$parmhash{$symbparm};
if (defined($thisparm)) { $outpar[10]=$thisparm; $result=10; }

# --------------------------------------------------------- third, check course	# --------------------------------------------------------- first, check course

if (defined($courseopt{$courselevel})) {	if (defined($courseopt{$courselevel})) {
$outpar[9]=$courseopt{$courselevel};	$outpar[11]=$courseopt{$courselevel};
$result=9;	$result=11;
}	}

if (defined($courseopt{$courselevelm})) {	if (defined($courseopt{$courselevelm})) {
$outpar[8]=$courseopt{$courselevelm};	$outpar[10]=$courseopt{$courselevelm};
$result=8;	$result=10;
}	}

	# ------------------------------------------------------- second, check default

	if (defined($def)) { $outpar[9]=$def; $result=9; }

	# ------------------------------------------------------ third, check map parms

	my $thisparm=$parmhash{$symbparm};
	if (defined($thisparm)) { $outpar[8]=$thisparm; $result=8; }

if (defined($courseopt{$courselevelr})) {	if (defined($courseopt{$courselevelr})) {
$outpar[7]=$courseopt{$courselevelr};	$outpar[7]=$courseopt{$courselevelr};
$result=7;	$result=7;
}	}

	# ------------------------------------------------------ fourth, back to course
if (defined($csec)) {	if (defined($csec)) {
if (defined($courseopt{$seclevel})) {	if (defined($courseopt{$seclevel})) {
$outpar[6]=$courseopt{$seclevel};	$outpar[6]=$courseopt{$seclevel};
Line 171 sub parmval {	Line 168 sub parmval {
}	}
}	}

# ---------------------------------------------------------- fourth, check user	# ---------------------------------------------------------- fifth, check user

if (defined($uname)) {	if (defined($uname)) {
if (defined($useropt{$courselevel})) {	if (defined($useropt{$courselevel})) {
Line 192 sub parmval {	Line 189 sub parmval {
return ($result,@outpar);	return ($result,@outpar);
}	}


	##################################################
	##################################################
	#
	# Store a parameter
	#
	# Takes
	# - resource id
	# - name of parameter
	# - level
	# - new value
	# - new type
	# - username
	# - userdomain

	sub storeparm {
	my ($sresid,$spnam,$snum,$nval,$ntype,$uname,$udom,$csec)=@_;
	$spnam=~s/\_([^\_]+)$/\.$1/;
	# ---------------------------------------------------------- Construct prefixes

	my $symbparm=$symbp{$sresid}.'.'.$spnam;
	my $mapparm=$mapp{$sresid}.'___(all).'.$spnam;

	my $seclevel=$ENV{'request.course.id'}.'.['.$csec.'].'.$spnam;
	my $seclevelr=$ENV{'request.course.id'}.'.['.$csec.'].'.$symbparm;
	my $seclevelm=$ENV{'request.course.id'}.'.['.$csec.'].'.$mapparm;

	my $courselevel=$ENV{'request.course.id'}.'.'.$spnam;
	my $courselevelr=$ENV{'request.course.id'}.'.'.$symbparm;
	my $courselevelm=$ENV{'request.course.id'}.'.'.$mapparm;

	my $storeunder='';
	if (($snum==11) \|\| ($snum==3)) { $storeunder=$courselevel; }
	if (($snum==10) \|\| ($snum==2)) { $storeunder=$courselevelm; }
	if (($snum==7) \|\| ($snum==1)) { $storeunder=$courselevelr; }
	if ($snum==6) { $storeunder=$seclevel; }
	if ($snum==5) { $storeunder=$seclevelm; }
	if ($snum==4) { $storeunder=$seclevelr; }

	my $delete;
	if ($nval eq '') { $delete=1;}
	my %storecontent = ($storeunder => $nval,
	$storeunder.'.type' => $ntype);
	my $reply='';
	if ($snum>3) {
	# ---------------------------------------------------------------- Store Course
	#
	# Expire sheets
	&Apache::lonnet::expirespread('','','studentcalc');
	if (($snum==7) \|\| ($snum==4)) {
	&Apache::lonnet::expirespread('','','assesscalc',$symbp{$sresid});
	} elsif (($snum==8) \|\| ($snum==5)) {
	&Apache::lonnet::expirespread('','','assesscalc',$mapp{$sresid});
	} else {
	&Apache::lonnet::expirespread('','','assesscalc');
	}
	# Store parameter
	if ($delete) {
	$reply=&Apache::lonnet::del
	('resourcedata',[keys(%storecontent)],
	$ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
	$ENV{'course.'.$ENV{'request.course.id'}.'.num'});
	} else {
	$reply=&Apache::lonnet::cput
	('resourcedata',\%storecontent,
	$ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
	$ENV{'course.'.$ENV{'request.course.id'}.'.num'});
	}
	} else {
	# ------------------------------------------------------------------ Store User
	#
	# Expire sheets
	&Apache::lonnet::expirespread($uname,$udom,'studentcalc');
	if ($snum==1) {
	&Apache::lonnet::expirespread
	($uname,$udom,'assesscalc',$symbp{$sresid});
	} elsif ($snum==2) {
	&Apache::lonnet::expirespread
	($uname,$udom,'assesscalc',$mapp{$sresid});
	} else {
	&Apache::lonnet::expirespread($uname,$udom,'assesscalc');
	}
	# Store parameter
	if ($delete) {
	$reply=&Apache::lonnet::del
	('resourcedata',[keys(%storecontent)],$udom,$uname);
	} else {
	$reply=&Apache::lonnet::cput
	('resourcedata',\%storecontent,$udom,$uname);
	}
	}

	if ($reply=~/^error\:(.*)/) {
	return "<font color=red>Write Error: $1</font>";
	}
	return '';
	}

##################################################	##################################################
##################################################	##################################################

Line 309 sub startpage {	Line 404 sub startpage {
my $overallhelp=	my $overallhelp=
&Apache::loncommon::help_open_menu('','Setting Parameters','Course_Setting_Parameters','',10,'Instructor Interface');	&Apache::loncommon::help_open_menu('','Setting Parameters','Course_Setting_Parameters','',10,'Instructor Interface');
my $assessparmhelp=&Apache::loncommon::help_open_topic("Cascading_Parameters","Assessment Parameters");	my $assessparmhelp=&Apache::loncommon::help_open_topic("Cascading_Parameters","Assessment Parameters");
	my $html=&Apache::lonxml::xmlbegin();
$r->print(<<ENDHEAD);	$r->print(<<ENDHEAD);
<html>	$html
<head>	<head>
<title>LON-CAPA Course Parameters</title>	<title>LON-CAPA Course Parameters</title>
<script>	<script>
Line 378 $assessparmhelp	Line 474 $assessparmhelp
</form>	</form>
<hr />	<hr />
ENDHEAD2	ENDHEAD2
}	}
$r->print(<<ENDHEAD3);	my %sectionhash=();
	my $sections='';
	if (&Apache::loncommon::get_sections(
	$ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
	$ENV{'course.'.$ENV{'request.course.id'}.'.num'},
	\%sectionhash)) {
	$sections=$lt{'sg'}.': <select name="csec">';
	foreach ('',sort keys %sectionhash) {
	$sections.='<option value="'.$_.'"'.
	($_ eq $csec?'selected="selected"':'').'>'.$_.'</option>';
	}
	$sections.='</select>';
	}
	$r->print(<<ENDHEAD3);
<form method="post" action="/adm/parmset" name="parmform">	<form method="post" action="/adm/parmset" name="parmform">
<h4>$lt{'captm'}</h4>	<h4>$lt{'captm'}</h4>
ENDHEAD3	ENDHEAD3
Line 389 ENDHEAD3	Line 498 ENDHEAD3
} else {	} else {
$r->print(<<ENDHEAD);	$r->print(<<ENDHEAD);
<b>	<b>
$lt{'sg'}:	$sections
<input type="text" value="$csec" size="6" name="csec">	<br />
<br>
$lt{'fu'}	$lt{'fu'}
<input type="text" value="$uname" size="12" name="uname">	<input type="text" value="$uname" size="12" name="uname" />
$lt{'oi'}	$lt{'oi'}
<input type="text" value="$id" size="12" name="id">	<input type="text" value="$id" size="12" name="id" />
$lt{'ad'}	$lt{'ad'}
$chooseopt	$chooseopt
</b>	</b>
Line 408 ENDHEAD	Line 516 ENDHEAD

sub print_row {	sub print_row {
my ($r,$which,$part,$name,$rid,$default,$defaulttype,$display,$defbgone,	my ($r,$which,$part,$name,$rid,$default,$defaulttype,$display,$defbgone,
$defbgtwo,$parmlev)=@_;	$defbgtwo,$parmlev,$uname,$udom,$csec)=@_;
# get the values for the parameter in cascading order	# get the values for the parameter in cascading order
# empty levels will remain empty	# empty levels will remain empty
my ($result,@outpar)=&parmval($$part{$which}.'.'.$$name{$which},	my ($result,@outpar)=&parmval($$part{$which}.'.'.$$name{$which},
$rid,$$default{$which});	$rid,$$default{$which},$uname,$udom,$csec);
# get the type for the parameters	# get the type for the parameters
# problem: these may not be set for all levels	# problem: these may not be set for all levels
my ($typeresult,@typeoutpar)=&parmval($$part{$which}.'.'.	my ($typeresult,@typeoutpar)=&parmval($$part{$which}.'.'.
$$name{$which}.'.type',	$$name{$which}.'.type',
$rid,$$defaulttype{$which});	$rid,$$defaulttype{$which},$uname,$udom,$csec);
# cascade down manually	# cascade down manually
my $cascadetype=$defaulttype;	my $cascadetype=$$defaulttype{$which};
for (my $i=$#typeoutpar;$i>0;$i--) {	for (my $i=11;$i>0;$i--) {
if ($typeoutpar[$i]) {	if ($typeoutpar[$i]) {
$cascadetype=$typeoutpar[$i];	$cascadetype=$typeoutpar[$i];
} else {	} else {
$typeoutpar[$i]=$cascadetype;	$typeoutpar[$i]=$cascadetype;
}	}
}	}

my $parm=$$display{$which};	my $parm=$$display{$which};

if ($parmlev eq 'full' \|\| $parmlev eq 'brief') {	if ($parmlev eq 'full' \|\| $parmlev eq 'brief') {
Line 450 sub print_row {	Line 557 sub print_row {
} elsif ($csec) {	} elsif ($csec) {
&print_td($r,6,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);	&print_td($r,6,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
} else {	} else {
&print_td($r,9,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);	&print_td($r,11,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
}	}
} elsif ($parmlev eq 'map') {	} elsif ($parmlev eq 'map') {

Line 459 sub print_row {	Line 566 sub print_row {
} elsif ($csec) {	} elsif ($csec) {
&print_td($r,5,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);	&print_td($r,5,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
} else {	} else {
&print_td($r,8,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);	&print_td($r,10,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
}	}
} else {	} else {

&print_td($r,11,'#FFDDDD',$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);	&print_td($r,11,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);

if ($parmlev eq 'brief') {	if ($parmlev eq 'brief') {

Line 477 sub print_row {	Line 584 sub print_row {
}	}
} else {	} else {

&print_td($r,10,'#FFDDDD',$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);	&print_td($r,10,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
&print_td($r,9,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);	&print_td($r,9,'#FFDDDD',$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
&print_td($r,8,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);	&print_td($r,8,'#FFDDDD',$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
&print_td($r,7,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);	&print_td($r,7,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);

if ($csec) {	if ($csec) {
Line 520 sub print_td {	Line 627 sub print_td {
my ($r,$which,$defbg,$result,$outpar,$mprefix,$value,$typeoutpar,$display)=@_;	my ($r,$which,$defbg,$result,$outpar,$mprefix,$value,$typeoutpar,$display)=@_;
$r->print('<td bgcolor='.(($result==$which)?'"#AAFFAA"':$defbg).	$r->print('<td bgcolor='.(($result==$which)?'"#AAFFAA"':$defbg).
' align="center">');	' align="center">');
if ($which<10) {	if ($which<8 \|\| $which > 9) {
$r->print(&plink($$typeoutpar[$which],	$r->print(&plink($$typeoutpar[$which],
$$display{$value},$$outpar[$which],	$$display{$value},$$outpar[$which],
$mprefix."$which",'parmform.pres','psub'));	$mprefix."$which",'parmform.pres','psub'));
Line 631 sub extractResourceInformation {	Line 738 sub extractResourceInformation {
$$maptitles{$mapid}=&Apache::lonnet::gettitle(&Apache::lonnet::clutter($$mapp{$id}));	$$maptitles{$mapid}=&Apache::lonnet::gettitle(&Apache::lonnet::clutter($$mapp{$id}));
}	}
$$maptitles{$$mapp{$id}}=$$maptitles{$mapid};	$$maptitles{$$mapp{$id}}=$$maptitles{$mapid};
$$symbp{$id}=$$mapp{$id}.	$$symbp{$id}=&Apache::lonnet::encode_symb($$mapp{$id},$resid,$srcf);
'___'.$resid.'___'.
&Apache::lonnet::declutter($srcf);
$$symbp{$mapid}=$$mapp{$id}.'___(all)';	$$symbp{$mapid}=$$mapp{$id}.'___(all)';
}	}
}	}
Line 678 sub assessparms {	Line 783 sub assessparms {
my %allmaps=();	my %allmaps=();
my %alllevs=();	my %alllevs=();

	my $uname;
	my $udom;
	my $uhome;
	my $csec;

	my $coursename=$ENV{'course.'.$ENV{'request.course.id'}.'.description'};

$alllevs{'Resource Level'}='full';	$alllevs{'Resource Level'}='full';
# $alllevs{'Resource Level [BRIEF]'}='brief';
$alllevs{'Map Level'}='map';	$alllevs{'Map Level'}='map';
$alllevs{'Course Level'}='general';	$alllevs{'Course Level'}='general';

Line 698 sub assessparms {	Line 809 sub assessparms {
my $message='';	my $message='';

$csec=$ENV{'form.csec'};	$csec=$ENV{'form.csec'};

if ($udom=$ENV{'form.udom'}) {	if ($udom=$ENV{'form.udom'}) {
} elsif ($udom=$ENV{'request.role.domain'}) {	} elsif ($udom=$ENV{'request.role.domain'}) {
} elsif ($udom=$ENV{'user.domain'}) {	} elsif ($udom=$ENV{'user.domain'}) {
Line 715 sub assessparms {	Line 827 sub assessparms {
my $parmlev='';	my $parmlev='';
my $trimheader='';	my $trimheader='';
my $prevvisit=$ENV{'form.prevvisit'};	my $prevvisit=$ENV{'form.prevvisit'};

# unless ($parmlev==$ENV{'form.parmlev'}) {
# $parmlev = 'full';
# }

unless ($ENV{'form.parmlev'}) {	unless ($ENV{'form.parmlev'}) {
$parmlev = 'map';	$parmlev = 'map';
Line 807 sub assessparms {	Line 915 sub assessparms {
}	}

# --------------------------------------------------------- Get all assessments	# --------------------------------------------------------- Get all assessments
extractResourceInformation(\%bighash, \@ids, \%typep,\%keyp, \%allparms, \%allparts, \%allkeys, \%allmaps, $fcat, \%defp, \%mapp, \%symbp,\%maptitles);	&extractResourceInformation(\%bighash, \@ids, \%typep,\%keyp, \%allparms, \%allparts, \%allkeys, \%allmaps, $fcat, \%defp, \%mapp, \%symbp,\%maptitles);

$mapp{'0.0'} = '';	$mapp{'0.0'} = '';
$symbp{'0.0'} = '';	$symbp{'0.0'} = '';

# ---------------------------------------------------------- Anything to store?	# ---------------------------------------------------------- Anything to store?
if ($ENV{'form.pres_marker'}) {	if ($ENV{'form.pres_marker'}) {
my ($sresid,$spnam,$snum)=split(/\&/,$ENV{'form.pres_marker'});	$message.=&storeparm(split(/\&/,$ENV{'form.pres_marker'}),
$spnam=~s/\_([^\_]+)$/\.$1/;	$ENV{'form.pres_value'},
# ---------------------------------------------------------- Construct prefixes	$ENV{'form.pres_type'},
	$uname,$udom,$csec);
my $symbparm=$symbp{$sresid}.'.'.$spnam;
my $mapparm=$mapp{$sresid}.'___(all).'.$spnam;

my $seclevel=$ENV{'request.course.id'}.'.['.$csec.'].'.$spnam;
my $seclevelr=$ENV{'request.course.id'}.'.['.$csec.'].'.$symbparm;
my $seclevelm=$ENV{'request.course.id'}.'.['.$csec.'].'.$mapparm;

my $courselevel=$ENV{'request.course.id'}.'.'.$spnam;
my $courselevelr=$ENV{'request.course.id'}.'.'.$symbparm;
my $courselevelm=$ENV{'request.course.id'}.'.'.$mapparm;

my $storeunder='';
if (($snum==9) \|\| ($snum==3)) { $storeunder=$courselevel; }
if (($snum==8) \|\| ($snum==2)) { $storeunder=$courselevelm; }
if (($snum==7) \|\| ($snum==1)) { $storeunder=$courselevelr; }
if ($snum==6) { $storeunder=$seclevel; }
if ($snum==5) { $storeunder=$seclevelm; }
if ($snum==4) { $storeunder=$seclevelr; }

my $delete;
if ($ENV{'form.pres_value'} eq '') { $delete=1;}
my %storecontent = ($storeunder => $ENV{'form.pres_value'},
$storeunder.'.type' => $ENV{'form.pres_type'});
my $reply='';
if ($snum>3) {
# ---------------------------------------------------------------- Store Course
#
# Expire sheets
&Apache::lonnet::expirespread('','','studentcalc');
if (($snum==7) \|\| ($snum==4)) {
&Apache::lonnet::expirespread('','','assesscalc',$symbp{$sresid});
} elsif (($snum==8) \|\| ($snum==5)) {
&Apache::lonnet::expirespread('','','assesscalc',$mapp{$sresid});
} else {
&Apache::lonnet::expirespread('','','assesscalc');
}
# Store parameter
if ($delete) {
$reply=&Apache::lonnet::del
('resourcedata',[keys(%storecontent)],
$ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
$ENV{'course.'.$ENV{'request.course.id'}.'.num'});
} else {
$reply=&Apache::lonnet::cput
('resourcedata',\%storecontent,
$ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
$ENV{'course.'.$ENV{'request.course.id'}.'.num'});
}
} else {
# ------------------------------------------------------------------ Store User
#
# Expire sheets
&Apache::lonnet::expirespread($uname,$udom,'studentcalc');
if ($snum==1) {
&Apache::lonnet::expirespread
($uname,$udom,'assesscalc',$symbp{$sresid});
} elsif ($snum==2) {
&Apache::lonnet::expirespread
($uname,$udom,'assesscalc',$mapp{$sresid});
} else {
&Apache::lonnet::expirespread($uname,$udom,'assesscalc');
}
# Store parameter
if ($delete) {
$reply=&Apache::lonnet::del
('resourcedata',[keys(%storecontent)],$udom,$uname);
} else {
$reply=&Apache::lonnet::cput
('resourcedata',\%storecontent,$udom,$uname);
}
}

if ($reply=~/^error\:(.*)/) {
$message.="<font color=red>Write Error: $1</font>";
}
# ---------------------------------------------------------------- Done storing	# ---------------------------------------------------------------- Done storing
$message.='<h3>'.&mt('Changes can take up to 10 minutes before being active for all students.').&Apache::loncommon::help_open_topic('Caching').'</h3>';	$message.='<h3>'.&mt('Changes can take up to 10 minutes before being active for all students.').&Apache::loncommon::help_open_topic('Caching').'</h3>';
}	}
Line 917 sub assessparms {	Line 950 sub assessparms {
if ($fcat eq '') {	if ($fcat eq '') {
$a<=>$b;	$a<=>$b;
} else {	} else {
my ($result,@outpar)=&parmval($fcat,$a,$defp{$a});	my ($result,@outpar)=&parmval($fcat,$a,$defp{$a},$uname,$udom,$csec);
my $aparm=$outpar[$result];	my $aparm=$outpar[$result];
($result,@outpar)=&parmval($fcat,$b,$defp{$b});	($result,@outpar)=&parmval($fcat,$b,$defp{$b},$uname,$udom,$csec);
my $bparm=$outpar[$result];	my $bparm=$outpar[$result];
1$aparm<=>1$bparm;	1$aparm<=>1$bparm;
}	}
Line 988 sub assessparms {	Line 1021 sub assessparms {
$r->print('<input type="hidden" value="'.$pssymb.'" name="symb">');	$r->print('<input type="hidden" value="'.$pssymb.'" name="symb">');
}	}

$r->print('<tr><td colspan="3"><hr /><input type="checkbox"');	$r->print('<tr><td colspan="3"><hr /><label><input type="checkbox"');
if ($showoptions eq 'show') {$r->print(" checked ");}	if ($showoptions eq 'show') {$r->print(" checked ");}
$r->print(' name="showoptions" value="show">'.&mt('Show More Options').'<hr /></td></tr>');	$r->print(' name="showoptions" value="show" />'.&mt('Show More Options').'</label><hr /></td></tr>');
# $r->print("<tr><td>Show: $showoptions</td></tr>");	# $r->print("<tr><td>Show: $showoptions</td></tr>");
# $r->print("<tr><td>pscat: @pscat</td></tr>");	# $r->print("<tr><td>pscat: @pscat</td></tr>");
# $r->print("<tr><td>psprt: @psprt</td></tr>");	# $r->print("<tr><td>psprt: @psprt</td></tr>");
Line 1146 sub assessparms {	Line 1179 sub assessparms {
$r->print(<<ENDTABLETWO);	$r->print(<<ENDTABLETWO);
<th rowspan=3>$lt{'pie'}</th>	<th rowspan=3>$lt{'pie'}</th>
<th rowspan=3>$lt{'csv'}<br>($csuname $lt{'at'} $csudom)</th>	<th rowspan=3>$lt{'csv'}<br>($csuname $lt{'at'} $csudom)</th>
</tr><tr><td colspan=5></td><th colspan=2>$lt{'rl'}</th>	</tr><tr><td colspan=5></td><th colspan=2>$lt{'ic'}</th><th colspan=2>$lt{'rl'}</th>
<th colspan=3>$lt{'ic'}</th>	<th colspan=1>$lt{'ic'}</th>

ENDTABLETWO	ENDTABLETWO
if ($csec) {	if ($csec) {
$r->print("<th colspan=3>".	$r->print("<th colspan=3>".
Line 1156 ENDTABLETWO	Line 1190 ENDTABLETWO
$r->print(<<ENDTABLEHEADFOUR);	$r->print(<<ENDTABLEHEADFOUR);
</tr><tr><th>$lt{'aut'}</th><th>$lt{'type'}</th>	</tr><tr><th>$lt{'aut'}</th><th>$lt{'type'}</th>
<th>$lt{'emof'}</th><th>$lt{'part'}</th><th>$lt{'pn'}</th>	<th>$lt{'emof'}</th><th>$lt{'part'}</th><th>$lt{'pn'}</th>
<th>$lt{'def'}</th><th>$lt{'femof'}</th>	<th>$lt{'gen'}</th><th>$lt{'femof'}</th>
<th>$lt{'gen'}</th><th>$lt{'foremf'}</th><th>$lt{'fr'}</th>	<th>$lt{'def'}</th><th>$lt{'foremf'}</th><th>$lt{'fr'}</th>
ENDTABLEHEADFOUR	ENDTABLEHEADFOUR

if ($csec) {	if ($csec) {
Line 1183 ENDTABLEHEADFOUR	Line 1217 ENDTABLEHEADFOUR
\|\|	\|\|
($pssymb && $pssymb eq $symbp{$rid})) {	($pssymb && $pssymb eq $symbp{$rid})) {
# ------------------------------------------------------ Entry for one resource	# ------------------------------------------------------ Entry for one resource
if ($defbgone eq '"E0E099"') {	if ($defbgone eq '"#E0E099"') {
$defbgone='"E0E0DD"';	$defbgone='"#E0E0DD"';
} else {	} else {
$defbgone='"E0E099"';	$defbgone='"#E0E099"';
}	}
if ($defbgtwo eq '"FFFF99"') {	if ($defbgtwo eq '"#FFFF99"') {
$defbgtwo='"FFFFDD"';	$defbgtwo='"#FFFFDD"';
} else {	} else {
$defbgtwo='"FFFF99"';	$defbgtwo='"#FFFF99"';
}	}
my $thistitle='';	my $thistitle='';
my %name= ();	my %name= ();
Line 1255 ENDTABLEHEADFOUR	Line 1289 ENDTABLEHEADFOUR

&print_row($r,$_,\%part,\%name,$rid,\%default,	&print_row($r,$_,\%part,\%name,$rid,\%default,
\%type,\%display,$defbgone,$defbgtwo,	\%type,\%display,$defbgone,$defbgtwo,
$parmlev);	$parmlev,$uname,$udom,$csec);
}	}
}	}
}	}
Line 1363 ENDMAPONE	Line 1397 ENDMAPONE
$r->print('<tr>');	$r->print('<tr>');
&print_row($r,$_,\%part,\%name,$mapid,\%default,	&print_row($r,$_,\%part,\%name,$mapid,\%default,
\%type,\%display,$defbgone,$defbgtwo,	\%type,\%display,$defbgone,$defbgtwo,
$parmlev);	$parmlev,$uname,$udom,$csec);
# $r->print("<tr><td>resource.$part{$_}.$name{$_},$symbp{$mapid}</td></tr>\n");	# $r->print("<tr><td>resource.$part{$_}.$name{$_},$symbp{$mapid}</td></tr>\n");
}	}
$r->print("</table></center>");	$r->print("</table></center>");
Line 1440 ENDMAPONE	Line 1474 ENDMAPONE
foreach (sort keys %name) {	foreach (sort keys %name) {
$r->print('<tr>');	$r->print('<tr>');
&print_row($r,$_,\%part,\%name,$mapid,\%default,	&print_row($r,$_,\%part,\%name,$mapid,\%default,
\%type,\%display,$defbgone,$defbgtwo,$parmlev);	\%type,\%display,$defbgone,$defbgtwo,$parmlev,$uname,$udom,$csec);
# $r->print("<tr><td>resource.$part{$_}.$name{$_},$symbp{$mapid}</td></tr>\n");	# $r->print("<tr><td>resource.$part{$_}.$name{$_},$symbp{$mapid}</td></tr>\n");
}	}
$r->print("</table></center>");	$r->print("</table></center>");
Line 1756 sub crsenv {	Line 1790 sub crsenv {
my $Value=&mt('Value');	my $Value=&mt('Value');
my $Set=&mt('Set');	my $Set=&mt('Set');
my $browse_js=&Apache::loncommon::browser_and_searcher_javascript('parmset');	my $browse_js=&Apache::loncommon::browser_and_searcher_javascript('parmset');
	my $html=&Apache::lonxml::xmlbegin();
$r->print(<<ENDENV);	$r->print(<<ENDENV);
<html>	$html
	<head>
<script type="text/javascript" language="Javascript" >	<script type="text/javascript" language="Javascript" >
$browse_js	$browse_js
</script>	</script>
<head>
<title>LON-CAPA Course Environment</title>	<title>LON-CAPA Course Environment</title>
</head>	</head>
$bodytag	$bodytag
Line 1807 sub overview {	Line 1842 sub overview {
'Set/Modify Course Assessment Parameters');	'Set/Modify Course Assessment Parameters');
my $dom = $ENV{'course.'.$ENV{'request.course.id'}.'.domain'};	my $dom = $ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
my $crs = $ENV{'course.'.$ENV{'request.course.id'}.'.num'};	my $crs = $ENV{'course.'.$ENV{'request.course.id'}.'.num'};
	my $html=&Apache::lonxml::xmlbegin();
$r->print(<<ENDOVER);	$r->print(<<ENDOVER);
<html>	$html
<head>	<head>
<title>LON-CAPA Course Environment</title>	<title>LON-CAPA Course Environment</title>
</head>	</head>
Line 2058 sub handler {	Line 2094 sub handler {

&Apache::loncommon::content_type($r,'text/html');	&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;	$r->send_http_header;

$coursename=$ENV{'course.'.$ENV{'request.course.id'}.'.description'};

if (($ENV{'form.crsenv'}) \|\| (!$ENV{'request.course.fn'})) {	if (($ENV{'form.crsenv'}) \|\| (!$ENV{'request.course.fn'})) {
# ---------------------------------------------- This is for course environment	# ---------------------------------------------- This is for course environment

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.180
changed lines
	Added in v.1.189