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.544 and 1.548

version 1.544, 2014/06/07 02:26:01	version 1.548, 2014/12/12 02:12:18
Line 1025 sub print_row {	Line 1025 sub print_row {
my ($othergrp,$grp_parm,$controlgrp);	my ($othergrp,$grp_parm,$controlgrp);

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

if ($uname) {	if ($uname) {
&print_td($r,3,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);	&print_td($r,3,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
} elsif ($cgroup) {	} elsif ($cgroup) {
&print_td($r,6,$defbgthree,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);	&print_td($r,6,$defbgthree,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
} elsif ($csec) {	} elsif ($csec) {
&print_td($r,9,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);	&print_td($r,9,$defbgtwo,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
} else {	} else {
&print_td($r,14,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);	&print_td($r,14,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
}	}
} elsif ($parmlev eq 'map') {	} elsif ($parmlev eq 'map') {

if ($uname) {	if ($uname) {
&print_td($r,2,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);	&print_td($r,2,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
} elsif ($cgroup) {	} elsif ($cgroup) {
&print_td($r,5,$defbgthree,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);	&print_td($r,5,$defbgthree,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
} elsif ($csec) {	} elsif ($csec) {
&print_td($r,8,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);	&print_td($r,8,$defbgtwo,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
} else {	} else {
&print_td($r,13,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);	&print_td($r,13,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
}	}
} else {	} else {
if ($uname) {	if ($uname) {
Line 1064 sub print_row {	Line 1063 sub print_row {
}	}
}	}

&print_td($r,14,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);	&print_td($r,14,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
	&print_td($r,13,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
&print_td($r,13,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);	&print_td($r,12,'#FFDDDD',$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
&print_td($r,12,'#FFDDDD',$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);	&print_td($r,11,'#FFDDDD',$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
&print_td($r,11,'#FFDDDD',$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);	&print_td($r,10,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
&print_td($r,10,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
	if ($csec) {
if ($csec) {	&print_td($r,9,$defbgtwo,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
&print_td($r,9,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);	&print_td($r,8,$defbgtwo,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
&print_td($r,8,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);	&print_td($r,7,$defbgtwo,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
&print_td($r,7,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);	}
}

if ($cgroup) {	if ($cgroup) {
&print_td($r,6,$defbgthree,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);	&print_td($r,6,$defbgthree,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
&print_td($r,5,$defbgthree,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);	&print_td($r,5,$defbgthree,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
&print_td($r,4,$defbgthree,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);	&print_td($r,4,$defbgthree,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
}	}

if ($uname) {	if ($uname) {
if ($othergrp) {	if ($othergrp) {
$r->print($othergrp);	$r->print($othergrp);
}	}
&print_td($r,3,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);	&print_td($r,3,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
&print_td($r,2,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);	&print_td($r,2,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
&print_td($r,1,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);	&print_td($r,1,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
}	}

} # end of $parmlev if/else	} # end of $parmlev if/else
$r->print('<td style="background-color:#CCCCFF;" align="center">'.$effective_parm.'</td>');	$r->print('<td style="background-color:#CCCCFF;" align="center">'.$effective_parm.'</td>');
Line 1410 sub lookUpTableParameter {	Line 1408 sub lookUpTableParameter {
'contentopen' => 'time_settings',	'contentopen' => 'time_settings',
'contentclose' => 'time_settings',	'contentclose' => 'time_settings',
'discussend' => 'time_settings',	'discussend' => 'time_settings',
'printopendate' => 'time_settings',	'printstartdate' => 'time_settings',
'printclosedate' => 'time_settings',	'printenddate' => 'time_settings',
'weight' => 'grading',	'weight' => 'grading',
'handgrade' => 'grading',	'handgrade' => 'grading',
'maxtries' => 'tries',	'maxtries' => 'tries',
Line 1498 sub category_order {	Line 1496 sub category_order {

sub parmboxes {	sub parmboxes {
my ($r,$allparms,$pscat,$keyorder)=@_;	my ($r,$allparms,$pscat,$keyorder)=@_;
my $tempkey;	my %categories = &categories();
my $tempparameter;
my %categories = &categories;
my %category_order = &category_order();	my %category_order = &category_order();
my %categoryList = (	my %categoryList = (
'time_settings' => [],	'time_settings' => [],
Line 1515 sub parmboxes {	Line 1511 sub parmboxes {
'misc' => [],	'misc' => [],
);	);

foreach $tempparameter (keys %$allparms) {	foreach my $tempparameter (keys(%$allparms)) {
&whatIsMyCategory($tempparameter, \%categoryList);	&whatIsMyCategory($tempparameter, \%categoryList);
}	}
#part to print the parm-list	#part to print the parm-list
Line 1622 sub usermenu {	Line 1618 sub usermenu {
$sections .= qq\| onchange="group_or_section('csec')" \|;	$sections .= qq\| onchange="group_or_section('csec')" \|;
}	}
$sections .= '>';	$sections .= '>';
foreach my $section ('',sort keys %sectionhash) {	foreach my $section ('',sort(keys(%sectionhash))) {
$sections.='<option value="'.$section.'" '.	$sections.='<option value="'.$section.'" '.
($section eq $csec?'selected="selected"':'').'>'.$section.	($section eq $csec?'selected="selected"':'').'>'.$section.
'</option>';	'</option>';
Line 1667 function group_or_section(caller) {	Line 1663 function group_or_section(caller) {
$groups .= qq\| onchange="group_or_section('cgroup')" \|;	$groups .= qq\| onchange="group_or_section('cgroup')" \|;
}	}
$groups .= '>';	$groups .= '>';
foreach my $grp ('',sort keys %grouphash) {	foreach my $grp ('',sort(keys(%grouphash))) {
$groups.='<option value="'.$grp.'" ';	$groups.='<option value="'.$grp.'" ';
if ($grp eq $cgroup) {	if ($grp eq $cgroup) {
unless ((defined($uname)) && ($grp eq '')) {	unless ((defined($uname)) && ($grp eq '')) {
Line 1873 sub mapmenu {	Line 1869 sub mapmenu {
sub levelmenu {	sub levelmenu {
my ($r,$alllevs,$parmlev)=@_;	my ($r,$alllevs,$parmlev)=@_;

$r->print(&Apache::lonhtmlcommon::row_title(&mt('Select Parameter Level').&Apache::loncommon::help_open_topic('Course_Parameter_Levels')));	$r->print(&Apache::lonhtmlcommon::row_title(&mt('Select Parameter Level').
	&Apache::loncommon::help_open_topic('Course_Parameter_Levels')));
$r->print('<select id="parmlev" name="parmlev" onchange="showHide_courseContent()">');	$r->print('<select id="parmlev" name="parmlev" onchange="showHide_courseContent()">');
foreach (reverse sort keys %{$alllevs}) {	foreach my $lev (reverse(sort(keys(%{$alllevs})))) {
$r->print('<option value="'.$$alllevs{$_}.'"');	$r->print('<option value="'.$$alllevs{$lev}.'"');
if ($parmlev eq $$alllevs{$_}) {	if ($parmlev eq $$alllevs{$lev}) {
$r->print(' selected="selected"');	$r->print(' selected="selected"');
}	}
$r->print('>'.&mt($_).'</option>');	$r->print('>'.&mt($lev).'</option>');
}	}
$r->print("</select>");	$r->print("</select>");
}	}
Line 1892 sub sectionmenu {	Line 1889 sub sectionmenu {
return if (!%sectionhash);	return if (!%sectionhash);

$r->print('<select name="Section" multiple="multiple" size="8">');	$r->print('<select name="Section" multiple="multiple" size="8">');
foreach my $s ('all',sort keys %sectionhash) {	foreach my $s ('all',sort(keys(%sectionhash))) {
$r->print(' <option value="'.$s.'"');	$r->print(' <option value="'.$s.'"');
foreach (@{$selectedsections}) {	foreach my $sec (@{$selectedsections}) {
if ($s eq $_) {	if ($s eq $sec) {
$r->print(' selected="selected"');	$r->print(' selected="selected"');
last;	last;
	}
}	}
}	$r->print('>'.$s."</option>\n");
$r->print('>'.$s."</option>\n");
}	}
$r->print("</select>\n");	$r->print("</select>\n");
}	}
Line 1912 sub groupmenu {	Line 1909 sub groupmenu {

$r->print('<select name="Group" multiple="multiple" size="8">');	$r->print('<select name="Group" multiple="multiple" size="8">');
foreach my $group (sort(keys(%grouphash))) {	foreach my $group (sort(keys(%grouphash))) {
$r->print(' <option value="'.$group.'"');	$r->print(' <option value="'.$group.'"');
foreach (@{$selectedgroups}) {	foreach my $grp (@{$selectedgroups}) {
if ($group eq $_) {	if ($group eq $grp) {
$r->print(' selected="selected"');	$r->print(' selected="selected"');
last;	last;
	}
}	}
}	$r->print('>'.$group."</option>\n");
$r->print('>'.$group."</option>\n");
}	}
$r->print("</select>\n");	$r->print("</select>\n");
}	}
Line 1934 sub keysinorder {	Line 1931 sub keysinorder {
my ($name,$keyorder)=@_;	my ($name,$keyorder)=@_;
return sort {	return sort {
$$keyorder{$a} <=> $$keyorder{$b};	$$keyorder{$a} <=> $$keyorder{$b};
} (keys %{$name});	} (keys(%{$name}));
}	}

sub keysinorder_bytype {	sub keysinorder_bytype {
Line 1946 sub keysinorder_bytype {	Line 1943 sub keysinorder_bytype {
return ($a cmp $b);	return ($a cmp $b);
}	}
$$keyorder{'parameter_0_'.$ta} <=> $$keyorder{'parameter_0_'.$tb};	$$keyorder{'parameter_0_'.$ta} <=> $$keyorder{'parameter_0_'.$tb};
} (keys %{$name});	} (keys(%{$name}));
}	}

sub keysindisplayorder {	sub keysindisplayorder {
my ($name,$keyorder)=@_;	my ($name,$keyorder)=@_;
return sort {	return sort {
$$keyorder{'parameter_0_'.$a} <=> $$keyorder{'parameter_0_'.$b};	$$keyorder{'parameter_0_'.$a} <=> $$keyorder{'parameter_0_'.$b};
} (keys %{$name});	} (keys(%{$name}));
}	}

sub sortmenu {	sub sortmenu {
Line 1993 sub standardkeyorder {	Line 1990 sub standardkeyorder {
'parameter_0_discussend' => 19,	'parameter_0_discussend' => 19,
'parameter_0_discusshide' => 20,	'parameter_0_discusshide' => 20,
'parameter_0_discussvote' => 21,	'parameter_0_discussvote' => 21,
'parameter_0_printopendate' => 22,	'parameter_0_printstartdate' => 22,
'parameter_0_printclosedate' => 23);	'parameter_0_printenddate' => 23);
}	}


Line 2167 sub assessparms {	Line 2164 sub assessparms {
my $chome = $env{'course.'.$env{'request.course.id'}.'.home'};	my $chome = $env{'course.'.$env{'request.course.id'}.'.home'};
my ($got_chostname,$chostname,$cmajor,$cminor);	my ($got_chostname,$chostname,$cmajor,$cminor);
my $totalstored = 0;	my $totalstored = 0;
	my $now = time;

for (my $i=0;$i<=$#markers;$i++) {	for (my $i=0;$i<=$#markers;$i++) {
my ($needsrelease,$needsnewer,$name);	my ($needsrelease,$needsnewer,$name);
Line 2201 sub assessparms {	Line 2198 sub assessparms {
}	}
}	}
}	}
} elsif ($markers[$i] =~ /_(type\|lenient\|retrypartial\|discussvote\|examcode)\&\d+$/) {	} elsif ($markers[$i] =~ /_(type\|lenient\|retrypartial\|discussvote\|examcode\|printstartdate\|printenddate)\&\d+$/) {
$name = $1;	$name = $1;
my $val = $values[$i];	my $val = $values[$i];
if ($name eq 'examcode') {	if ($name eq 'examcode') {
if (&Apache::lonnet::validCODE($values[$i])) {	if (&Apache::lonnet::validCODE($values[$i])) {
$val = 'valid';	$val = 'valid';
}	}
	} elsif ($name eq 'printstartdate') {
	if ($val =~ /^\d+$/) {
	if ($val > $now) {
	$val = 'future';
	}
	}
	} elsif ($name eq 'printenddate') {
	if ($val =~ /^\d+$/) {
	if ($val < $now) {
	$val = 'past';
	}
	}
}	}
$needsrelease =	$needsrelease =
$Apache::lonnet::needsrelease{"parameter:$name:$val"};	$Apache::lonnet::needsrelease{"parameter:$name:$val"};
Line 2215 sub assessparms {	Line 2224 sub assessparms {
unless ($got_chostname) {	unless ($got_chostname) {
($chostname,$cmajor,$cminor) = &parameter_release_vars();	($chostname,$cmajor,$cminor) = &parameter_release_vars();
$got_chostname = 1;	$got_chostname = 1;
}	}
$needsnewer = &parameter_releasecheck($name,$val,	$needsnewer = &parameter_releasecheck($name,$val,
$needsrelease,	$needsrelease,
$cmajor,$cminor);	$cmajor,$cminor);
Line 2241 sub assessparms {	Line 2250 sub assessparms {
}	}
}	}
#----------------------------------------------- if all selected, fill in array	#----------------------------------------------- if all selected, fill in array
if ($pscat[0] eq "all") {@pscat = (keys %allparms);}	if ($pscat[0] eq "all") {@pscat = (keys(%allparms));}
if (!@pscat) { @pscat=('duedate','opendate','answerdate','weight','maxtries','type','problemstatus') };	if (!@pscat) { @pscat=('duedate','opendate','answerdate','weight','maxtries','type','problemstatus') };
if ($psprt[0] eq "all" \|\| !@psprt) {@psprt = (keys %allparts);}	if ($psprt[0] eq "all" \|\| !@psprt) {@psprt = (keys(%allparts));}
# ------------------------------------------------------------------ Start page	# ------------------------------------------------------------------ Start page

my $crstype = &Apache::loncommon::course_type();	my $crstype = &Apache::loncommon::course_type();
&startpage($r,$pssymb,$crstype);	&startpage($r,$pssymb,$crstype);

foreach ('tolerance','date_default','date_start','date_end',	foreach my $item ('tolerance','date_default','date_start','date_end',
'date_interval','int','float','string') {	'date_interval','int','float','string') {
$r->print('<input type="hidden" value="'.	$r->print('<input type="hidden" value="'.
&HTML::Entities::encode($env{'form.recent_'.$_},'"&<>').	&HTML::Entities::encode($env{'form.recent_'.$item},'"&<>').
'" name="recent_'.$_.'" />');	'" name="recent_'.$item.'" />');
}	}

# ----- Start Parameter Selection	# ----- Start Parameter Selection
Line 2360 ENDPARMSELSCRIPT	Line 2369 ENDPARMSELSCRIPT

@pscat = @temp_pscat;	@pscat = @temp_pscat;


if (($env{'form.prevvisit'}) \|\| ($pschp) \|\| ($pssymb)) {	if (($env{'form.prevvisit'}) \|\| ($pschp) \|\| ($pssymb)) {
# ----------------------------------------------------------------- Start Table	# ----------------------------------------------------------------- Start Table
my @catmarker=map { tr\|.\|_\|; 'parameter_'.$_; } @pscat;	my @catmarker=map { tr\|.\|_\|; 'parameter_'.$_; } @pscat;
Line 2485 ENDTABLEHEADFOUR	Line 2495 ENDTABLEHEADFOUR
my $uri=&Apache::lonnet::declutter($uris{$rid});	my $uri=&Apache::lonnet::declutter($uris{$rid});

my $filter=$env{'form.filter'};	my $filter=$env{'form.filter'};
foreach (&keysplit($keyp{$rid})) {	foreach my $tempkeyp (&keysplit($keyp{$rid})) {
my $tempkeyp = $_;
if (grep $_ eq $tempkeyp, @catmarker) {	if (grep $_ eq $tempkeyp, @catmarker) {
my $parmname=&Apache::lonnet::metadata($uri,$_.'.name');	my $parmname=&Apache::lonnet::metadata($uri,$tempkeyp.'.name');
# We may only want certain parameters listed	# We may only want certain parameters listed
if ($filter) {	if ($filter) {
unless ($filter=~/\Q$parmname\E/) { next; }	unless ($filter=~/\Q$parmname\E/) { next; }
}	}
$name{$_}=$parmname;	$name{$tempkeyp}=$parmname;
$part{$_}=&Apache::lonnet::metadata($uri,$_.'.part');	$part{$tempkeyp}=&Apache::lonnet::metadata($uri,$tempkeyp.'.part');

my $parmdis=&Apache::lonnet::metadata($uri,$_.'.display');	my $parmdis=&Apache::lonnet::metadata($uri,$tempkeyp.'.display');
if ($allparms{$name{$_}} ne '') {	if ($allparms{$name{$tempkeyp}} ne '') {
my $identifier;	my $identifier;
if ($parmdis =~ /(\s\[Part.)$/) {	if ($parmdis =~ /(\s\[Part.)$/) {
$identifier = $1;	$identifier = $1;
}	}
$display{$_} = $allparms{$name{$_}}.$identifier;	$display{$tempkeyp} = $allparms{$name{$tempkeyp}}.$identifier;
} else {	} else {
$display{$_} = $parmdis;	$display{$tempkeyp} = $parmdis;
}	}
unless ($display{$_}) { $display{$_}=''; }	unless ($display{$tempkeyp}) { $display{$tempkeyp}=''; }
$display{$_}.=' ('.$name{$_}.')';	$display{$tempkeyp}.=' ('.$name{$tempkeyp}.')';
$default{$_}=&Apache::lonnet::metadata($uri,$_);	$default{$tempkeyp}=&Apache::lonnet::metadata($uri,$tempkeyp);
$type{$_}=&Apache::lonnet::metadata($uri,$_.'.type');	$type{$tempkeyp}=&Apache::lonnet::metadata($uri,$tempkeyp.'.type');
$thistitle=&Apache::lonnet::metadata($uri,$_.'.title');	$thistitle=&Apache::lonnet::metadata($uri,$tempkeyp.'.title');
}	}
}	}
my $totalparms=scalar keys %name;	my $totalparms=scalar(keys(%name));
if ($totalparms>0) {	if ($totalparms>0) {
my $firstrow=1;	my $firstrow=1;
my $title=&Apache::lonnet::gettitle($symbp{$rid});	my $title=&Apache::lonnet::gettitle($symbp{$rid});
Line 2539 ENDTABLEHEADFOUR	Line 2548 ENDTABLEHEADFOUR
$r->print('<td style="background-color:'.$defbgone.';"'.	$r->print('<td style="background-color:'.$defbgone.';"'.
' rowspan='.$totalparms.	' rowspan='.$totalparms.
'>'.$maptitles{$mapp{$rid}}.'</td>');	'>'.$maptitles{$mapp{$rid}}.'</td>');
foreach (&keysinorder_bytype(\%name,\%keyorder)) {	foreach my $item (&keysinorder_bytype(\%name,\%keyorder)) {

unless ($firstrow) {	unless ($firstrow) {
$r->print('<tr>');	$r->print('<tr>');
} else {	} else {
undef $firstrow;	undef $firstrow;
}	}
&print_row($r,$_,\%part,\%name,\%symbp,$rid,\%default,	&print_row($r,$item,\%part,\%name,\%symbp,$rid,\%default,
\%type,\%display,$defbgone,$defbgtwo,	\%type,\%display,$defbgone,$defbgtwo,
$defbgthree,$parmlev,$uname,$udom,$csec,	$defbgthree,$parmlev,$uname,$udom,$csec,
$cgroup,\@usersgroups);	$cgroup,\@usersgroups);
Line 2573 ENDTABLEHEADFOUR	Line 2581 ENDTABLEHEADFOUR

#-------------------------------------------- for each map, gather information	#-------------------------------------------- for each map, gather information
my $mapid;	my $mapid;
foreach $mapid (sort {$maplist{$a} cmp $maplist{$b}} keys %maplist) {	foreach $mapid (sort {$maplist{$a} cmp $maplist{$b}} keys(%maplist)) {
my $maptitle = $maplist{$mapid};	my $maptitle = $maplist{$mapid};

#----------------------- loop through ids and get all parameter types for map	#----------------------- loop through ids and get all parameter types for map
Line 2587 ENDTABLEHEADFOUR	Line 2595 ENDTABLEHEADFOUR

# $r->print("Catmarker: @catmarker<br />\n");	# $r->print("Catmarker: @catmarker<br />\n");

foreach (@ids) {	foreach my $id (@ids) {
($map)=(/([\d]*?)\./);	($map)=($id =~ /([\d]*?)\./);
my $rid = $_;	my $rid = $id;

# $r->print("$mapid:$map: $rid <br /> \n");	# $r->print("$mapid:$map: $rid <br /> \n");

Line 2604 ENDTABLEHEADFOUR	Line 2612 ENDTABLEHEADFOUR
# When storing information, store as part 0	# When storing information, store as part 0
# When requesting information, request from full part	# When requesting information, request from full part
#-------------------------------------------------------------------	#-------------------------------------------------------------------
foreach (&keysplit($keyp{$rid})) {	foreach my $fullkeyp (&keysplit($keyp{$rid})) {
my $tempkeyp = $_;	my $tempkeyp = $fullkeyp;
my $fullkeyp = $tempkeyp;	$tempkeyp =~ s/_\w+_/_0_/;
$tempkeyp =~ s/_\w+_/_0_/;

if ((grep $_ eq $fullkeyp, @catmarker) &&(!$name{$tempkeyp})) {	if ((grep $_ eq $fullkeyp, @catmarker) &&(!$name{$tempkeyp})) {
$part{$tempkeyp}="0";	$part{$tempkeyp}="0";
$name{$tempkeyp}=&Apache::lonnet::metadata($uri,$fullkeyp.'.name');	$name{$tempkeyp}=&Apache::lonnet::metadata($uri,$fullkeyp.'.name');
my $parmdis=&Apache::lonnet::metadata($uri,$fullkeyp.'.display');	my $parmdis=&Apache::lonnet::metadata($uri,$fullkeyp.'.display');
Line 2668 ENDTABLEHEADFOUR	Line 2675 ENDTABLEHEADFOUR
.&Apache::loncommon::end_data_table_header_row()	.&Apache::loncommon::end_data_table_header_row()
);	);

foreach (&keysinorder(\%name,\%keyorder)) {	foreach my $item (&keysinorder(\%name,\%keyorder)) {
$r->print(&Apache::loncommon::start_data_table_row());	$r->print(&Apache::loncommon::start_data_table_row());
&print_row($r,$_,\%part,\%name,\%symbp,$mapid,\%default,	&print_row($r,$item,\%part,\%name,\%symbp,$mapid,\%default,
\%type,\%display,$defbgone,$defbgtwo,$defbgthree,	\%type,\%display,$defbgone,$defbgtwo,$defbgthree,
$parmlev,$uname,$udom,$csec,$cgroup);	$parmlev,$uname,$udom,$csec,$cgroup);
}	}
Line 2695 ENDTABLEHEADFOUR	Line 2702 ENDTABLEHEADFOUR
my %type = ();	my %type = ();
my %default = ();	my %default = ();

foreach (@ids) {	foreach $id (@ids) {
my $rid = $_;	my $rid = $id;

my $uri=&Apache::lonnet::declutter($uris{$rid});	my $uri=&Apache::lonnet::declutter($uris{$rid});

Line 2707 ENDTABLEHEADFOUR	Line 2714 ENDTABLEHEADFOUR
# When storing information, store as part 0	# When storing information, store as part 0
# When requesting information, request from full part	# When requesting information, request from full part
#-------------------------------------------------------------------	#-------------------------------------------------------------------
foreach (&keysplit($keyp{$rid})) {	foreach my $fullkeyp (&keysplit($keyp{$rid})) {
my $tempkeyp = $_;	my $tempkeyp = $fullkeyp;
my $fullkeyp = $tempkeyp;	$tempkeyp =~ s/_\w+_/_0_/;
$tempkeyp =~ s/_\w+_/_0_/;	if ((grep $_ eq $fullkeyp, @catmarker) &&(!$name{$tempkeyp})) {
if ((grep $_ eq $fullkeyp, @catmarker) &&(!$name{$tempkeyp})) {
$part{$tempkeyp}="0";	$part{$tempkeyp}="0";
$name{$tempkeyp}=&Apache::lonnet::metadata($uri,$fullkeyp.'.name');	$name{$tempkeyp}=&Apache::lonnet::metadata($uri,$fullkeyp.'.name');
my $parmdis=&Apache::lonnet::metadata($uri,$fullkeyp.'.display');	my $parmdis=&Apache::lonnet::metadata($uri,$fullkeyp.'.display');
Line 2759 ENDMAPONE	Line 2765 ENDMAPONE
.&Apache::loncommon::end_data_table_header_row()	.&Apache::loncommon::end_data_table_header_row()
);	);

foreach (&keysinorder(\%name,\%keyorder)) {	foreach my $item (&keysinorder(\%name,\%keyorder)) {
$r->print(&Apache::loncommon::start_data_table_row());	$r->print(&Apache::loncommon::start_data_table_row());
&print_row($r,$_,\%part,\%name,\%symbp,$mapid,\%default,	&print_row($r,$item,\%part,\%name,\%symbp,$mapid,\%default,
\%type,\%display,$defbgone,$defbgtwo,$defbgthree,	\%type,\%display,$defbgone,$defbgtwo,$defbgthree,
$parmlev,$uname,$udom,$csec,$cgroup);	$parmlev,$uname,$udom,$csec,$cgroup);
}	}
Line 2807 sub readdata {	Line 2813 sub readdata {
# Read userdata	# Read userdata

my $classlist=&Apache::loncoursedata::get_classlist();	my $classlist=&Apache::loncoursedata::get_classlist();
foreach (keys %$classlist) {	foreach my $user (keys(%$classlist)) {
if ($_=~/^($match_username)\:($match_domain)$/) {	if ($user=~/^($match_username)\:($match_domain)$/) {
my ($tuname,$tudom)=($1,$2);	my ($tuname,$tudom)=($1,$2);
my $useropt=&Apache::lonnet::get_userresdata($tuname,$tudom);	my $useropt=&Apache::lonnet::get_userresdata($tuname,$tudom);
foreach my $userkey (keys %{$useropt}) {	foreach my $userkey (keys(%{$useropt})) {
if ($userkey=~/^$env{'request.course.id'}/) {	if ($userkey=~/^\Q$env{'request.course.id'}\E/) {
my $newkey=$userkey;	my $newkey=$userkey;
$newkey=~s/^($env{'request.course.id'}\.)/$1\[useropt\:$tuname\:$tudom\]\./;	$newkey=~s/^($env{'request.course.id'}\.)/$1\[useropt\:$tuname\:$tudom\]\./;
$$resourcedata{$newkey}=$$useropt{$userkey};	$$resourcedata{$newkey}=$$useropt{$userkey};
}	}
	}
}	}
}	}
}
return $resourcedata;	return $resourcedata;
}	}

Line 2836 sub storedata {	Line 2842 sub storedata {
my @deldata=();	my @deldata=();
undef @deldata;	undef @deldata;
my ($got_chostname,$chostname,$cmajor,$cminor);	my ($got_chostname,$chostname,$cmajor,$cminor);
	my $now = time;
foreach my $key (keys(%env)) {	foreach my $key (keys(%env)) {
if ($key =~ /^form\.([a-z]+)\_(.+)$/) {	if ($key =~ /^form\.([a-z]+)\_(.+)$/) {
my $cmd=$1;	my $cmd=$1;
Line 2846 sub storedata {	Line 2853 sub storedata {
$tkey=~s/\.\[useropt\:$tuname\:$tudom\]\./\./;	$tkey=~s/\.\[useropt\:$tuname\:$tudom\]\./\./;
}	}
if ($cmd eq 'set' \|\| $cmd eq 'datepointer' \|\| $cmd eq 'dateinterval') {	if ($cmd eq 'set' \|\| $cmd eq 'datepointer' \|\| $cmd eq 'dateinterval') {
my ($data, $typeof, $text, $name);	my ($data, $typeof, $text, $name, $valchk);
if ($cmd eq 'set') {	if ($cmd eq 'set') {
$data=$env{$key};	$data=$env{$key};
	$valchk = $data;
$typeof=$env{'form.typeof_'.$thiskey};	$typeof=$env{'form.typeof_'.$thiskey};
$text = &mt('Saved modified parameter for');	$text = &mt('Saved modified parameter for');
if ($typeof eq 'string_questiontype') {	if ($typeof eq 'string_questiontype') {
Line 2858 sub storedata {	Line 2866 sub storedata {
} elsif ($typeof eq 'string_discussvote') {	} elsif ($typeof eq 'string_discussvote') {
$name = 'discussvote';	$name = 'discussvote';
} elsif ($typeof eq 'string_examcode') {	} elsif ($typeof eq 'string_examcode') {
$name = 'examcode';	$name = 'examcode';
	if (&Apache::lonnet::validCODE($data)) {
	$valchk = 'valid';
	}
} elsif ($typeof eq 'string_yesno') {	} elsif ($typeof eq 'string_yesno') {
if ($thiskey =~ /\.retrypartial$/) {	if ($thiskey =~ /\.retrypartial$/) {
$name = 'retrypartial';	$name = 'retrypartial';
}	}
}	}
if ($name ne '') {	} elsif ($cmd eq 'datepointer') {
my ($needsrelease,$needsnewer);	$data=&Apache::lonhtmlcommon::get_date_from_form($env{$key});
$needsrelease = $Apache::lonnet::needsrelease{"parameter:$name:$data"};	$typeof=$env{'form.typeof_'.$thiskey};
if ($needsrelease) {	$text = &mt('Saved modified date for');
unless ($got_chostname) {	if ($typeof eq 'date_start') {
($chostname,$cmajor,$cminor)=&parameter_release_vars();	if ($thiskey =~ /\.printstartdate$/) {
$got_chostname = 1;	$name = 'printstartdate';
	if (($data) && ($data > $now)) {
	$valchk = 'future';
}	}
$needsnewer = &parameter_releasecheck($name,$data,
$needsrelease,
$cmajor,$cminor);
}	}
	} elsif ($typeof eq 'date_end') {
	if ($thiskey =~ /\.printenddate$/) {
	$name = 'printenddate';
	if (($data) && ($data < $now)) {
	$valchk = 'past';
	}
	}
	}
	} elsif ($cmd eq 'dateinterval') {
	$data=&get_date_interval_from_form($thiskey);
	$typeof=$env{'form.typeof_'.$thiskey};
	$text = &mt('Saved modified date for');
	}
	if ($name ne '') {
	my ($needsrelease,$needsnewer);
	$needsrelease = $Apache::lonnet::needsrelease{"parameter:$name:$valchk"};
	if ($needsrelease) {
	unless ($got_chostname) {
	($chostname,$cmajor,$cminor)=&parameter_release_vars();
	$got_chostname = 1;
	}
	$needsnewer = &parameter_releasecheck($name,$valchk,
	$needsrelease,
	$cmajor,$cminor);
if ($needsnewer) {	if ($needsnewer) {
$r->print('<br />'.&oldversion_warning($name,$data,	$r->print('<br />'.&oldversion_warning($name,$data,
$chostname,$cmajor,	$chostname,$cmajor,
Line 2883 sub storedata {	Line 2917 sub storedata {
next;	next;
}	}
}	}
} elsif ($cmd eq 'datepointer') {
$data=&Apache::lonhtmlcommon::get_date_from_form($env{$key});
$typeof=$env{'form.typeof_'.$thiskey};
$text = &mt('Saved modified date for');
} elsif ($cmd eq 'dateinterval') {
$data=&get_date_interval_from_form($thiskey);
$typeof=$env{'form.typeof_'.$thiskey};
$text = &mt('Saved modified date for');
}	}
if (defined($data) and $$olddata{$thiskey} ne $data) {	if (defined($data) and $$olddata{$thiskey} ne $data) {
if ($tuname) {	if ($tuname) {
Line 2928 sub storedata {	Line 2954 sub storedata {
}	}
# Store all course level	# Store all course level
my $delentries=$#deldata+1;	my $delentries=$#deldata+1;
my @newdatakeys=keys %newdata;	my @newdatakeys=keys(%newdata);
my $putentries=$#newdatakeys+1;	my $putentries=$#newdatakeys+1;
if ($delentries) {	if ($delentries) {
if (&Apache::lonnet::del('resourcedata',\@deldata,$dom,$crs) eq 'ok') {	if (&Apache::lonnet::del('resourcedata',\@deldata,$dom,$crs) eq 'ok') {
my %loghash=map { $_ => '' } @deldata;	my %loghash=map { $_ => '' } @deldata;
&log_parmset(\%loghash,1);	&log_parmset(\%loghash,1);
$r->print('<h2>'.&mt('Deleted [_1] parameter(s)',$delentries).'</h2>');	$r->print('<h2>'.&mt('Deleted [quant,_1,parameter]',$delentries/2).'</h2>');
} else {	} else {
$r->print('<div class="LC_error">'.	$r->print('<div class="LC_error">'.
&mt('Error deleting parameters').'</div>');	&mt('Error deleting parameters').'</div>');
Line 2944 sub storedata {	Line 2970 sub storedata {
if ($putentries) {	if ($putentries) {
if (&Apache::lonnet::put('resourcedata',\%newdata,$dom,$crs) eq 'ok') {	if (&Apache::lonnet::put('resourcedata',\%newdata,$dom,$crs) eq 'ok') {
&log_parmset(\%newdata,0);	&log_parmset(\%newdata,0);
$r->print('<h3>'.&mt('Saved [_1] parameter(s)',$putentries/2).'</h3>');	$r->print('<h3>'.&mt('Saved [quant,_1,parameter]',$putentries/2).'</h3>');
} else {	} else {
$r->print('<div class="LC_error">'.	$r->print('<div class="LC_error">'.
&mt('Error saving parameters').'</div>');	&mt('Error saving parameters').'</div>');
Line 3029 sub listdata {	Line 3055 sub listdata {
}	}

$result;	$result;
} keys %{$listdata}) {	} keys(%{$listdata})) {

if ($$listdata{$thiskey.'.type'}) {	if ($$listdata{$thiskey.'.type'}) {
my $thistype=$$listdata{$thiskey.'.type'};	my $thistype=$$listdata{$thiskey.'.type'};
Line 3296 sub dateshift {	Line 3322 sub dateshift {
my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};	my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
my %data=&Apache::lonnet::dump('resourcedata',$dom,$crs);	my %data=&Apache::lonnet::dump('resourcedata',$dom,$crs);
# ugly retro fix for broken version of types	# ugly retro fix for broken version of types
foreach my $key (keys %data) {	foreach my $key (keys(%data)) {
if ($key=~/\wtype$/) {	if ($key=~/\wtype$/) {
my $newkey=$key;	my $newkey=$key;
$newkey=~s/type$/\.type/;	$newkey=~s/type$/\.type/;
Line 3306 sub dateshift {	Line 3332 sub dateshift {
}	}
my %storecontent=();	my %storecontent=();
# go through all parameters and look for dates	# go through all parameters and look for dates
foreach my $key (keys %data) {	foreach my $key (keys(%data)) {
if ($data{$key.'.type'}=~/^date_(start\|end)$/) {	if ($data{$key.'.type'}=~/^date_(start\|end)$/) {
my $newdate=$data{$key}+$shift;	my $newdate=$data{$key}+$shift;
$storecontent{$key}=$newdate;	$storecontent{$key}=$newdate;
Line 3491 sub secgroup_lister {	Line 3517 sub secgroup_lister {
$$listdata{$newparmkey.'.type'}=$$defkeytype{$cat};	$$listdata{$newparmkey.'.type'}=$$defkeytype{$cat};
} elsif ($parmlev eq 'map') {	} elsif ($parmlev eq 'map') {
# map-level parameter	# map-level parameter
foreach my $mapid (keys %{$allmaps}) {	foreach my $mapid (keys(%{$allmaps})) {
if (($pschp ne 'all') && ($pschp ne $mapid)) { next; }	if (($pschp ne 'all') && ($pschp ne $mapid)) { next; }
my $newparmkey=$rootparmkey.'.'.$$allmaps{$mapid}.'___(all).'.$part.'.'.$cat;	my $newparmkey=$rootparmkey.'.'.$$allmaps{$mapid}.'___(all).'.$part.'.'.$cat;
$$listdata{$newparmkey}=1;	$$listdata{$newparmkey}=1;
Line 3911 sub order_meta_fields {	Line 3937 sub order_meta_fields {
my $newpos = $env{'form.newpos'} - 1;	my $newpos = $env{'form.newpos'} - 1;
my $currentpos = $env{'form.currentpos'} - 1;	my $currentpos = $env{'form.currentpos'} - 1;
my @neworder = ();	my @neworder = ();
my @oldorder = split /,/,$env{'course.'.$env{'request.course.id'}.'.metadata.addedorder'};	my @oldorder = split(/,/,$env{'course.'.$env{'request.course.id'}.'.metadata.addedorder'});
my $i;	my $i;
if ($newpos > $currentpos) {	if ($newpos > $currentpos) {
# moving stuff up	# moving stuff up
Line 3945 sub order_meta_fields {	Line 3971 sub order_meta_fields {
}	}
my $fields = &get_added_meta_fieldnames($env{'request.course.id'});	my $fields = &get_added_meta_fieldnames($env{'request.course.id'});
my $ordered_fields;	my $ordered_fields;
my @fields_in_order = split /,/,$env{'course.'.$env{'request.course.id'}.'.metadata.addedorder'};	my @fields_in_order = split(/,/,$env{'course.'.$env{'request.course.id'}.'.metadata.addedorder'});
if (!@fields_in_order) {	if (!@fields_in_order) {
# no order found, pick sorted order then create metadata.addedorder key.	# no order found, pick sorted order then create metadata.addedorder key.
foreach my $key (sort keys %$fields) {	foreach my $key (sort(keys(%$fields))) {
push @fields_in_order, $key;	push @fields_in_order, $key;
$ordered_fields = join ",", @fields_in_order;	$ordered_fields = join ",", @fields_in_order;
}	}
Line 4229 sub defaultsetter {	Line 4255 sub defaultsetter {
}	}
}	}
}	}
foreach my $key (keys %allparms) {	foreach my $key (keys(%allparms)) {
$newrules{$key.'_triggers'}=$triggers{$key};	$newrules{$key.'_triggers'}=$triggers{$key};
}	}
&Apache::lonnet::put('parmdefactions',\%newrules,$cdom,$cnum);	&Apache::lonnet::put('parmdefactions',\%newrules,$cdom,$cnum);
Line 4731 sub oldversion_warning {	Line 4757 sub oldversion_warning {
}	}
}	}
}	}
	} elsif (($name eq 'printstartdate') \|\| ($name eq 'printenddate')) {
	my $now = time;
	if ($value =~ /^\d+$/) {
	if ($name eq 'printstartdate') {
	if ($value > $now) {
	$desc = &Apache::lonlocal::locallocaltime($value);
	}
	} elsif ($name eq 'printenddate') {
	if ($value < $now) {
	$desc = &Apache::lonlocal::locallocaltime($value);
	}
	}
	}
}	}
my $standard_name = &standard_parameter_names($name);	my $standard_name = &standard_parameter_names($name);
return '<p class="LC_warning">'.	return '<p class="LC_warning">'.

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

Removed from v.1.544
changed lines
	Added in v.1.548