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.509 and 1.517

version 1.509, 2011/01/15 16:21:42	version 1.517, 2011/12/04 16:27:06
Line 137 javascript function 'pjump'.	Line 137 javascript function 'pjump'.

=item extractResourceInformation() :	=item extractResourceInformation() :

Given the course data hash, extractResourceInformation extracts lots of information about the course's resources into a variety of hashes.	extractResourceInformation extracts lots of information about all of the the course's resources into a variety of hashes.

Input: See list below:	Input: See list below:

=item * B<ids> : An array that will contain all of the ids in the course.	=item * B<env{'user.name'}> : Current username

=item * B<typep> : hash, id->type, where "type" contains the extension of the file, thus, I<problem exam quiz assess survey form>.	=item * B<env{'user.domain'}> : Domain of current user.

=item * B<keyp> : hash, id->key list, will contain a comma separated list of the meta-data keys available for the given id	=item * b<env{"request.course.fn"} : Course

=item * B<allparms> : hash, name of parameter->display value (what is the display value?)	Outputs: See list below:

=item * B<allparts> : hash, part identification->text representation of part, where the text representation is "[Part $part]"	=item * B<ids> (out) : An array that will contain all of the ids in the course.

=item * B<allkeys> : hash, full key to part->display value (what's display value?)	=item * B<typep>(out) : hash, id->type, where "type" contains the extension of the file, thus, I<problem exam quiz assess survey form>.

=item * B<allmaps> : hash, ???	=item * B<keyp> (out) : hash, id->key list, will contain a comma separated list of the meta-data keys available for the given id

=item * B<fcat> : ???	=item * B<allparms> (out) : hash, name of parameter->display value (what is the display value?)

=item * B<defp> : hash, ???	=item * B<allparts> (out) : hash, part identification->text representation of part, where the text representation is "[Part $part]"

	=item * B<allmaps> (out) : hash, ???

=item * B<mapp> : ??	=item * B<mapp> : ??

=item * B<symbp> : hash, id->full sym?	=item * B<symbp> : hash, id->full sym?

	=item * B<maptitles>

	=item * B<uris>

	=item * B<keyorder>

	=item * B<defkeytype>

=item isdateparm()	=item isdateparm()

Line 196 Input: See list below:	Line 204 Input: See list below:
Show assessment data and parameters. This is a large routine that should	Show assessment data and parameters. This is a large routine that should
be simplified and shortened... someday.	be simplified and shortened... someday.

Inputs: $r	Inputs: $r - the Apache request object.

Returns: nothing	Returns: nothing

Variables used (guessed by Jeremy):	Variables used (guessed by Jeremy):
Line 805 sub valout {	Line 813 sub valout {
&date_sanity_info($value);	&date_sanity_info($value);
} else {	} else {
$result = $value;	$result = $value;
	$result=~s/\,/\, /gs;
$result = &HTML::Entities::encode($result,'"<>&');	$result = &HTML::Entities::encode($result,'"<>&');
}	}
}	}
Line 892 ENDJS	Line 901 ENDJS
}	}

sub startpage {	sub startpage {
my ($r) = @_;	my ($r,$psymb) = @_;

my %loaditems = ('onunload' => "pclose()",	my %loaditems = (
'onload' => "showHide_courseContent(); group_or_section('cgroup')",	'onunload' => "pclose()",
);	'onload' => "group_or_section('cgroup')",
	);
	if (!$psymb) {
	$loaditems{'onload'} = "showHide_courseContent(); group_or_section('cgroup')";
	}

if ((($env{'form.command'} eq 'set') && ($env{'form.url'})	if ((($env{'form.command'} eq 'set') && ($env{'form.url'})
&& (!$env{'form.dis'})) \|\| ($env{'form.symb'})) {	&& (!$env{'form.dis'})) \|\| ($env{'form.symb'})) {
Line 1165 sub extractResourceInformation {	Line 1178 sub extractResourceInformation {
$$typep{$id}=$1;	$$typep{$id}=$1;
$$keyp{$id}='';	$$keyp{$id}='';
$$uris{$id}=$srcf;	$$uris{$id}=$srcf;

foreach my $key (split(/\,/,&Apache::lonnet::metadata($srcf,'allpossiblekeys'))) {	foreach my $key (split(/\,/,&Apache::lonnet::metadata($srcf,'allpossiblekeys'))) {
next if ($key!~/^parameter_/);	next if ($key!~/^parameter_/);

Line 1264 sub parmmenu {	Line 1278 sub parmmenu {
ele = document.forms.parmform.elements[i];	ele = document.forms.parmform.elements[i];
if (ele.name == checkName) {	if (ele.name == checkName) {
document.forms.parmform.elements[i].checked=value;	document.forms.parmform.elements[i].checked=value;
document.getElementById(document.forms.parmform.elements[i].value.concat(li)).style.display = displayOverview;
}	}
}	}
}	}

function checkthis(thisvalue, checkName) {	function checkthis(thisvalue, checkName) {

document.getElementById(thisvalue.concat("_li")).style.display = "";

for (i=0; i<document.forms.parmform.elements.length; i++) {	for (i=0; i<document.forms.parmform.elements.length; i++) {
ele = document.forms.parmform.elements[i];	ele = document.forms.parmform.elements[i];
Line 1322 sub parmmenu {	Line 1334 sub parmmenu {
checkthis('problemstatus','pscat');	checkthis('problemstatus','pscat');
}	}

function hideParms() {
document.getElementById('LC_parm_overview_parm_menu').style.display = "none";
}

function showParms() {
document.getElementById('LC_parm_overview_parm_menu').style.display = "";
}

function checkboxChecked(id) {
var li = "_li";
var id_li = id.concat(li);
if (document.getElementById(id_li).style.display == "none") {
document.getElementById(id_li).style.display = "";
}
else {
document.getElementById(id_li).style.display = "none";
}
}
// ]]>	// ]]>
</script>	</script>
ENDSCRIPT	ENDSCRIPT
$r->print(&Apache::lonhtmlcommon::row_title(&mt('Select Parameters to View')));

#part to print selected parms overview
$r->print(&mt('Selected Parameters:').'<br />');

#print out all possible parms and hide them by default
$r->print('<ul class="LC_parm_parmlist">');
foreach $tempkey (&keysindisplayorder($allparms,$keyorder)) {
$r->print('<li id="'.$tempkey.'_li" value="'.$tempkey.'_li" name="pscat_li"');
if (!($$pscat[0] eq "all" \|\| grep $_ eq $tempkey, @{$pscat})) {
$r->print(' style="display:none"');
}
$r->print('>'
.($$allparms{$tempkey}=~/\S/ ? $$allparms{$tempkey} : $tempkey)
.'</li>'
);
}
$r->print('</ul>');

$r->print('<hr />');	$r->print('<hr />');
&shortCuts($r,$allparms,$pscat,$keyorder);	&shortCuts($r,$allparms,$pscat,$keyorder);
$r->print('<hr />');	$r->print('<hr />');

$r->print(
'<p><a href="javascript:showParms()">'
.&mt('Show detailed Parameter Selection')
.'</a></p>'
);

$r->print(&Apache::lonhtmlcommon::row_closure(1));
}	}
# return a hash	# return a hash
sub categories {	sub categories {
Line 1399 sub lookUpTableParameter {	Line 1367 sub lookUpTableParameter {
'contentopen' => 'time_settings',	'contentopen' => 'time_settings',
'contentclose' => 'time_settings',	'contentclose' => 'time_settings',
'discussend' => 'time_settings',	'discussend' => 'time_settings',
	'printopendate' => 'time_settings',
	'printclosedate' => 'time_settings',
'weight' => 'grading',	'weight' => 'grading',
'handgrade' => 'grading',	'handgrade' => 'grading',
'maxtries' => 'tries',	'maxtries' => 'tries',
Line 1430 sub lookUpTableParameter {	Line 1400 sub lookUpTableParameter {
'acc' => 'misc',	'acc' => 'misc',
'maxcollaborators' => 'misc',	'maxcollaborators' => 'misc',
'scoreformat' => 'misc',	'scoreformat' => 'misc',
	'lenient' => 'grading',

);	);
}	}
Line 1498 sub parmboxes {	Line 1469 sub parmboxes {
'file_submission' => [],	'file_submission' => [],
'misc' => [],	'misc' => [],
);	);
my $hidelink =
'<p>'
.'<a href="javascript:hideParms()">'
.&mt('Hide detailed Parameter Selection')
.'</a>'
.'</p>'
."\n";
;
foreach $tempparameter (keys %$allparms) {	foreach $tempparameter (keys %$allparms) {
&whatIsMyCategory($tempparameter, \%categoryList);	&whatIsMyCategory($tempparameter, \%categoryList);
}	}
#part to print the parm-list	#part to print the parm-list
$r->print(	$r->print('<div class="LC_columnSection">'."\n");
'<div id="LC_parm_overview_parm_menu" class="LC_Box" style="display:none">'."\n"
.'<h3>'.&mt('Parameter').'</h3>'."\n"
.$hidelink
.'<div class="LC_columnSection">'."\n"
);

#Print parameters	#Print parameters
for my $key (sort { $category_order{$a} <=> $category_order{$b} } keys %categoryList) {	for my $key (sort { $category_order{$a} <=> $category_order{$b} } keys %categoryList) {
Line 1530 sub parmboxes {	Line 1489 sub parmboxes {
$r->print('<span class="LC_nobreak">'	$r->print('<span class="LC_nobreak">'
.'<label><input type="checkbox" name="pscat" ');	.'<label><input type="checkbox" name="pscat" ');
$r->print('value="'.$tempkey.'" ');	$r->print('value="'.$tempkey.'" ');
$r->print('onclick="checkboxChecked(\''.$tempkey.'\')"');
if ($$pscat[0] eq "all" \|\| grep $_ eq $tempkey, @{$pscat}) {	if ($$pscat[0] eq "all" \|\| grep $_ eq $tempkey, @{$pscat}) {
$r->print(' checked="checked"');	$r->print(' checked="checked"');
}	}
Line 1542 sub parmboxes {	Line 1500 sub parmboxes {
}	}
}	}

#&shortCuts($r,$allparms,$pscat,$keyorder);	$r->print("</div>\n");
$r->print(
"</div>\n"
.$hidelink
."</div>\n"
);
}	}
#	#
# This function offers some links on the parameter section to get with one click a group a parameters	# This function offers some links on the parameter section to get with one click a group a parameters
Line 1708 function group_or_section(caller) {	Line 1661 function group_or_section(caller) {
# This function shows on table Mode the available Parameters for the selected Resources	# This function shows on table Mode the available Parameters for the selected Resources
#	#
sub displaymenu {	sub displaymenu {
my ($r,$allparms,$allparts,$pscat,$psprt,$keyorder)=@_;	my ($r,$allparms,$pscat,$psprt,$keyorder)=@_;

$r->print(&Apache::lonhtmlcommon::start_pick_box());	$r->print(&Apache::lonhtmlcommon::start_pick_box());
	$r->print(&Apache::lonhtmlcommon::row_title(&mt('Select Parameters to View')));

&parmmenu($r,$allparms,$pscat,$keyorder);	&parmmenu($r,$allparms,$pscat,$keyorder);
$r->print(&Apache::lonhtmlcommon::end_pick_box());	$r->print(&Apache::loncommon::start_scrollbox());
&parmboxes($r,$allparms,$pscat,$keyorder);	&parmboxes($r,$allparms,$pscat,$keyorder);
	$r->print(&Apache::loncommon::end_scrollbox());

	$r->print(&Apache::lonhtmlcommon::row_closure(1));
	$r->print(&Apache::lonhtmlcommon::end_pick_box());

}	}

sub mapmenu {	sub mapmenu {
Line 1988 sub standardkeyorder {	Line 1949 sub standardkeyorder {
'parameter_0_sig' => 17,	'parameter_0_sig' => 17,
'parameter_0_turnoffunit' => 18,	'parameter_0_turnoffunit' => 18,
'parameter_0_discussend' => 19,	'parameter_0_discussend' => 19,
'parameter_0_discusshide' => 20);	'parameter_0_discusshide' => 20,
	'parameter_0_printopendate' => 21,
	'parameter_0_printclosedate' => 22);
}	}


Line 1996 sub assessparms {	Line 1959 sub assessparms {

my $r=shift;	my $r=shift;



	# -------------------------------------------------------- Variable declaration
my @ids=();	my @ids=();
my %symbp=();	my %symbp=();
my %mapp=();	my %mapp=();
Line 2003 sub assessparms {	Line 1969 sub assessparms {
my %keyp=();	my %keyp=();
my %uris=();	my %uris=();
my %maptitles=();	my %maptitles=();

# -------------------------------------------------------- Variable declaration

my %allmaps=();	my %allmaps=();
my %alllevs=();	my %alllevs=();

Line 2024 sub assessparms {	Line 1987 sub assessparms {

my %allparms;	my %allparms;
my %allparts;	my %allparts;
	# ------------------------------------------------------------------------------

#	#
# Order in which these parameters will be displayed	# Order in which these parameters will be displayed
#	#
my %keyorder=&standardkeyorder();	my %keyorder=&standardkeyorder();

@ids=();	# @ids=();
%symbp=();	# %symbp=(); # These seem defined above already.
%typep=();	# %typep=();

my $message='';	my $message='';

Line 2051 sub assessparms {	Line 2016 sub assessparms {


my @psprt=&Apache::loncommon::get_env_multiple('form.psprt');	my @psprt=&Apache::loncommon::get_env_multiple('form.psprt');
if (!@psprt) { $psprt[0]='0'; }	if (!@psprt) { $psprt[0]='all'; }
if (($env{'form.part'}) && ($psprt[0] ne 'all')) { $psprt[0]=$env{'form.part'}; }	if (($env{'form.part'}) && ($psprt[0] ne 'all')) { $psprt[0]=$env{'form.part'}; }

my $pssymb='';	my $pssymb='';
Line 2153 sub assessparms {	Line 2118 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;


for (my $i=0;$i<=$#markers;$i++) {	for (my $i=0;$i<=$#markers;$i++) {
my ($needsrelease,$needsnewer);	my ($needsrelease,$needsnewer,$name);
if ($markers[$i] =~ /^[\d.]+\&0_availablestudent\&(1\|2\|3)$/) {	if ($markers[$i] =~ /^[\d.]+\&0_availablestudent\&(1\|2\|3)$/) {
my (@ok_slots,@fail_slots,@del_slots);	my (@ok_slots,@fail_slots,@del_slots);
my $courseopt=&Apache::lonnet::get_courseresdata($cnum,$cdom);	my $courseopt=&Apache::lonnet::get_courseresdata($cnum,$cdom);
Line 2185 sub assessparms {	Line 2152 sub assessparms {
}	}
}	}
}	}
} elsif ($markers[$i] =~ /_type\&\d+$/) {	} elsif ($markers[$i] =~ /_(type\|lenient)\&\d+$/) {
	$name = $1;
$needsrelease =	$needsrelease =
$Apache::lonnet::needsrelease{'parameter:type:'.$values[$i]};	$Apache::lonnet::needsrelease{"parameter:$name:$values[$i]"};
if ($needsrelease) {	if ($needsrelease) {
unless ($got_chostname) {	unless ($got_chostname) {
($chostname,$cmajor,$cminor) = &questiontype_release_vars();	($chostname,$cmajor,$cminor) = &parameter_release_vars();
$got_chostname = 1;	$got_chostname = 1;
}	}
$needsnewer = &questiontype_releasecheck($values[$i],	$needsnewer = &parameter_releasecheck($name,$values[$i],
$needsrelease,	$needsrelease,
$chostname,	$chostname,
$cmajor,$cminor);	$cmajor,$cminor);
}	}
}	}
if ($needsnewer) {	if ($needsnewer) {
$message .= &oldversion_warning($values[$i],$chostname,$cmajor,	$message .= &oldversion_warning($name,$values[$i],$chostname,$cmajor,
$cminor,$needsrelease);	$cminor,$needsrelease);
} else {	} else {
$message.=&storeparm(split(/\&/,$markers[$i]),	$message.=&storeparm(split(/\&/,$markers[$i]),
Line 2224 sub assessparms {	Line 2192 sub assessparms {
if ($psprt[0] eq "all" \|\| !@psprt) {@psprt = (keys %allparts);}	if ($psprt[0] eq "all" \|\| !@psprt) {@psprt = (keys %allparts);}
# ------------------------------------------------------------------ Start page	# ------------------------------------------------------------------ Start page

&startpage($r);	&startpage($r,$pssymb);

foreach ('tolerance','date_default','date_start','date_end',	foreach ('tolerance','date_default','date_start','date_end',
'date_interval','int','float','string') {	'date_interval','int','float','string') {
Line 2288 COURSECONTENTSCRIPT	Line 2256 COURSECONTENTSCRIPT

# Step 2	# Step 2
$r->print(&Apache::lonhtmlcommon::topic_bar(2,&mt('Parameter Specification')));	$r->print(&Apache::lonhtmlcommon::topic_bar(2,&mt('Parameter Specification')));
&displaymenu($r,\%allparms,\%allparts,\@pscat,\@psprt,\%keyorder);	&displaymenu($r,\%allparms,\@pscat,\@psprt,\%keyorder);

# Step 3	# Step 3
$r->print(&Apache::lonhtmlcommon::topic_bar(3,&mt('User Specification (optional)')));	$r->print(&Apache::lonhtmlcommon::topic_bar(3,&mt('User Specification (optional)')));
Line 2300 COURSECONTENTSCRIPT	Line 2268 COURSECONTENTSCRIPT
# Update Display Button	# Update Display Button
$r->print('<p>'	$r->print('<p>'
.'<input type="submit" name="dis"'	.'<input type="submit" name="dis"'
.' value="'.&mt('Update Parameter Display').'" />'	.' value="'.&mt('Update Display').'" />'
.'<input type="hidden" name="hideparmsel" value="hidden" />'	.'<input type="hidden" name="hideparmsel" value="hidden" />'
.'</p>');	.'</p>');
$r->print('</div>');	$r->print('</div>');
Line 2316 COURSECONTENTSCRIPT	Line 2284 COURSECONTENTSCRIPT
.'</a>'	.'</a>'
.'</p>');	.'</p>');
} else {	} else {
	$r->print();
# parameter screen for a single resource.	# parameter screen for a single resource.
my ($map,$iid,$resource)=&Apache::lonnet::decode_symb($pssymb);	my ($map,$iid,$resource)=&Apache::lonnet::decode_symb($pssymb);
my $title = &Apache::lonnet::gettitle($pssymb);	my $title = &Apache::lonnet::gettitle($pssymb);
Line 2325 COURSECONTENTSCRIPT	Line 2294 COURSECONTENTSCRIPT
'<br />');	'<br />');
$r->print(&Apache::lonhtmlcommon::topic_bar('',&mt('Additional Display Specification (optional)')));	$r->print(&Apache::lonhtmlcommon::topic_bar('',&mt('Additional Display Specification (optional)')));
$r->print(&Apache::lonhtmlcommon::start_pick_box());	$r->print(&Apache::lonhtmlcommon::start_pick_box());
$r->print(&Apache::lonhtmlcommon::row_title(&mt('Select Parts to View')).
'<label>'.
'<input type="checkbox" name="psprt" value="all"'.
($env{'form.psprt'}?' checked="checked"':'').' />'.
&mt('Show all parts').
'</label></td></tr>');
&usermenu($r,$uname,$id,$udom,$csec,$cgroup,$parmlev,\@usersgroups);	&usermenu($r,$uname,$id,$udom,$csec,$cgroup,$parmlev,\@usersgroups);
$r->print(&Apache::lonhtmlcommon::row_closure(1));	$r->print(&Apache::lonhtmlcommon::row_closure(1));
$r->print(&Apache::lonhtmlcommon::end_pick_box());	$r->print(&Apache::lonhtmlcommon::end_pick_box());
$r->print('<p>'	$r->print('<p>'
.'<input type="submit" name="dis"'	.'<input type="submit" name="dis"'
.' value="'.&mt('Update Parameter Display').'" />'	.' value="'.&mt('Update Display').'" />'
.'<input type="hidden" name="hideparmsel" value="hidden" />'	.'<input type="hidden" name="hideparmsel" value="hidden" />'
.'</p>');	.'</p>');
}	}
Line 2371 COURSECONTENTSCRIPT	Line 2334 COURSECONTENTSCRIPT
$coursespan += 3;	$coursespan += 3;
}	}

$r->print('<p><table border="2">');	$r->print(&Apache::loncommon::start_data_table());
#	#
# This produces the headers	# This produces the headers
#	#
Line 2481 ENDTABLEHEADFOUR	Line 2444 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 (&keysplit($keyp{$rid})) {
my $tempkeyp = $_;	my $tempkeyp = $_;
if (grep $_ eq $tempkeyp, @catmarker) {	if (grep $_ eq $tempkeyp, @catmarker) {
Line 2536 ENDTABLEHEADFOUR	Line 2498 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 (&keysinorder_bytype(\%name,\%keyorder)) {

unless ($firstrow) {	unless ($firstrow) {
$r->print('<tr>');	$r->print('<tr>');
} else {	} else {
Line 2552 ENDTABLEHEADFOUR	Line 2514 ENDTABLEHEADFOUR
}	}
} # end foreach ids	} # end foreach ids
# -------------------------------------------------- End entry for one resource	# -------------------------------------------------- End entry for one resource
$r->print('</table>');	$r->print(&Apache::loncommon::end_data_table);
} # end of full	} # end of full
#--------------------------------------------------- Entry for parm level map	#--------------------------------------------------- Entry for parm level map
if ($parmlev eq 'map') {	if ($parmlev eq 'map') {
Line 2843 sub storedata {	Line 2805 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);	my ($data, $typeof, $text, $name);
if ($cmd eq 'set') {	if ($cmd eq 'set') {
$data=$env{$key};	$data=$env{$key};
$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') {
	$name = 'type';
	} elsif ($typeof eq 'string_lenient') {
	$name = 'lenient';
	}
	if ($name ne '') {
my ($needsrelease,$needsnewer);	my ($needsrelease,$needsnewer);
$needsrelease = $Apache::lonnet::needsrelease{'parameter:type:'.$data};	$needsrelease = $Apache::lonnet::needsrelease{"parameter:$name:$data"};
if ($needsrelease) {	if ($needsrelease) {
unless ($got_chostname) {	unless ($got_chostname) {
($chostname,$cmajor,$cminor)=&questiontype_release_vars();	($chostname,$cmajor,$cminor)=&parameter_release_vars();
$got_chostname = 1;	$got_chostname = 1;
}	}
$needsnewer = &questiontype_releasecheck($data,$needsrelease,	$needsnewer = &parameter_releasecheck($name,$data,
$chostname,$cmajor,	$needsrelease,
$cminor);	$chostname,$cmajor,
	$cminor);
}	}
if ($needsnewer) {	if ($needsnewer) {
$r->print('<br />'.&oldversion_warning($data,$chostname,$cmajor,	$r->print('<br />'.&oldversion_warning($name,$data,
	$chostname,$cmajor,
$cminor,$needsrelease));	$cminor,$needsrelease));
next;	next;
}	}
Line 3096 sub listdata {	Line 3065 sub listdata {
$$resourcedata{$thiskey}));	$$resourcedata{$thiskey}));
} elsif ($thistype =~ m/^string/) {	} elsif ($thistype =~ m/^string/) {
$r->print(&string_selector($thistype,$thiskey,	$r->print(&string_selector($thistype,$thiskey,
$$resourcedata{$thiskey}));	$$resourcedata{$thiskey},$name));
} else {	} else {
$r->print(&default_selector($thiskey,$$resourcedata{$thiskey}));	$r->print(&default_selector($thiskey,$$resourcedata{$thiskey}));
}	}
Line 3170 my %strings =	Line 3139 my %strings =
[ 'randomizetry', 'New Randomization Each N Tries (default N=1)'],	[ 'randomizetry', 'New Randomization Each N Tries (default N=1)'],
[ 'practice', 'Practice'],	[ 'practice', 'Practice'],
[ 'surveycred', 'Survey (credit for submission)']],	[ 'surveycred', 'Survey (credit for submission)']],
	'string_lenient'
	=> [['yes', 'Yes' ],
	[ 'no', 'No' ],
	[ 'default', 'Default - only bubblesheet grading is lenient' ]]
);	);

sub standard_string_options {	sub standard_string_options {
Line 3181 sub standard_string_options {	Line 3154 sub standard_string_options {
}	}

sub string_selector {	sub string_selector {
my ($thistype, $thiskey, $showval) = @_;	my ($thistype, $thiskey, $showval, $name) = @_;

if (!exists($strings{$thistype})) {	if (!exists($strings{$thistype})) {
return &default_selector($thiskey,$showval);	return &default_selector($thiskey,$showval);
}	}

my %skiptype;	my %skiptype;
if ($thistype eq 'string_questiontype') {	if (($thistype eq 'string_questiontype') \|\|
	($thistype eq 'string_lenient')) {
my ($got_chostname,$chostname,$cmajor,$cminor);	my ($got_chostname,$chostname,$cmajor,$cminor);
foreach my $possibilities (@{ $strings{$thistype} }) {	foreach my $possibilities (@{ $strings{$thistype} }) {
next unless (ref($possibilities) eq 'ARRAY');	next unless (ref($possibilities) eq 'ARRAY');
my ($name, $description) = @{ $possibilities };	my ($parmval, $description) = @{ $possibilities };
my $needsrelease=$Apache::lonnet::needsrelease{'parameter:type:'.$name};	my $needsrelease=$Apache::lonnet::needsrelease{"parameter:$name:$parmval"};
if ($needsrelease) {	if ($needsrelease) {
unless ($got_chostname) {	unless ($got_chostname) {
($chostname,$cmajor,$cminor)=&questiontype_release_vars();	($chostname,$cmajor,$cminor)=&parameter_release_vars();
$got_chostname = 1;	$got_chostname = 1;
}	}
my $needsnewer=&questiontype_releasecheck($name,$needsrelease,	my $needsnewer=&parameter_releasecheck($name,$parmval,$needsrelease,
$chostname,$cmajor,	$chostname,$cmajor,
$cminor);	$cminor);
if ($needsnewer) {	if ($needsnewer) {
$skiptype{$name} = 1;	$skiptype{$parmval} = 1;
}	}
}	}
}	}
}	}


my $result;	my $result;
my $numinrow = 3;	my $numinrow = 3;
Line 3332 ENDOVER	Line 3307 ENDOVER
my $pschp=$env{'form.pschp'};	my $pschp=$env{'form.pschp'};

my @psprt=&Apache::loncommon::get_env_multiple('form.psprt');	my @psprt=&Apache::loncommon::get_env_multiple('form.psprt');
if (!@psprt) { $psprt[0]='0'; }	if (!@psprt) { $psprt[0]='all'; }

my @selected_sections =	my @selected_sections =
&Apache::loncommon::get_env_multiple('form.Section');	&Apache::loncommon::get_env_multiple('form.Section');
Line 3378 ENDOVER	Line 3353 ENDOVER

$r->print('<div class="LC_Box">');	$r->print('<div class="LC_Box">');
$r->print('<div>');	$r->print('<div>');
$r->print(&Apache::lonhtmlcommon::start_pick_box());	&displaymenu($r,\%allparms,\@pscat,\%keyorder);
&parmmenu($r,\%allparms,\@pscat,\%keyorder);
$r->print(&Apache::lonhtmlcommon::end_pick_box());
&parmboxes($r,\%allparms,\@pscat,\%keyorder);
$r->print(&Apache::lonhtmlcommon::start_pick_box());	$r->print(&Apache::lonhtmlcommon::start_pick_box());
$r->print(&Apache::lonhtmlcommon::row_title(&mt('Select Parts to View')));	$r->print(&Apache::lonhtmlcommon::row_title(&mt('Select Parts to View')));
$r->print('<table>'.	$r->print('<table>'.
Line 3608 sub date_shift_one {	Line 3580 sub date_shift_one {
'<table><tr><td>'.&mt('Currently set date:').'</td><td>'.	'<table><tr><td>'.&mt('Currently set date:').'</td><td>'.
&Apache::lonlocal::locallocaltime($env{'form.timebase'}).'</td></tr>'.	&Apache::lonlocal::locallocaltime($env{'form.timebase'}).'</td></tr>'.
'<tr><td>'.&mt('Shifted date:').'</td><td>'.	'<tr><td>'.&mt('Shifted date:').'</td><td>'.
&Apache::lonhtmlcommon::date_setter('shiftform',	&Apache::lonhtmlcommon::dshowerfuck.net
	ate_setter('shiftform',
'timeshifted',	'timeshifted',
$env{'form.timebase'},,	$env{'form.timebase'},,
'').	'').
Line 4614 sub check_for_course_info {	Line 4587 sub check_for_course_info {
return 0;	return 0;
}	}

sub questiontype_release_vars {	sub parameter_release_vars {
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};	my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
my $chome = $env{'course.'.$env{'request.course.id'}.'.home'};	my $chome = $env{'course.'.$env{'request.course.id'}.'.home'};
my $chostname = &Apache::lonnet::hostname($chome);	my $chostname = &Apache::lonnet::hostname($chome);
Line 4623 sub questiontype_release_vars {	Line 4596 sub questiontype_release_vars {
return ($chostname,$cmajor,$cminor);	return ($chostname,$cmajor,$cminor);
}	}

sub questiontype_releasecheck {	sub parameter_releasecheck {
my ($questiontype,$needsrelease,$chostname,$cmajor,$cminor) = @_;	my ($name,$value,$needsrelease,$chostname,$cmajor,$cminor) = @_;
my $needsnewer;	my $needsnewer;
my ($needsmajor,$needsminor) = split(/\./,$needsrelease);	my ($needsmajor,$needsminor) = split(/\./,$needsrelease);
if (($cmajor < $needsmajor) \|\|	if (($cmajor < $needsmajor) \|\|
($cmajor == $needsmajor && $cminor < $needsminor)) {	($cmajor == $needsmajor && $cminor < $needsminor)) {
$needsnewer = 1;	$needsnewer = 1;
} else {	} else {
&Apache::lonnet::update_released_required($Apache::lonnet::needsrelease{'parameter:type:'.$questiontype});	&Apache::lonnet::update_released_required($Apache::lonnet::needsrelease{'parameter:'.$name.':'.$value});
}	}
return $needsnewer;	return $needsnewer;
}	}

sub oldversion_warning {	sub oldversion_warning {
my ($questiontype,$chostname,$cmajor,$cminor,$needsrelease) = @_;	my ($name,$value,$chostname,$cmajor,$cminor,$needsrelease) = @_;
my $desc;	my $desc;
if (ref($strings{'string_questiontype'}) eq 'ARRAY') {	my %stringtypes = (
foreach my $possibilities (@{ $strings{'string_questiontype'} }) {	type => 'string_questiontype',
next unless (ref($possibilities) eq 'ARRAY');	lenient => 'string_lenient'
my ($name, $description) = @{ $possibilities };	);
if ($name eq $questiontype) {	if (exists($stringtypes{$name})) {
$desc = $description;	if (ref($strings{$stringtypes{$name}}) eq 'ARRAY') {
last;	foreach my $possibilities (@{ $strings{$stringtypes{$name}} }) {
	next unless (ref($possibilities) eq 'ARRAY');
	my ($parmval, $description) = @{ $possibilities };
	if ($parmval eq $value) {
	$desc = $description;
	last;
	}
}	}
}	}
}	}
	my $standard_name = &standard_parameter_names($name);
return '<p class="LC_warning">'.	return '<p class="LC_warning">'.
&mt('Question Type was [_1]not[_2] set to [_3].',	&mt('[_1] was [_2]not[_3] set to [_4].',
'<b>','</b>','"'.$desc.'"').'<br />'.	$standard_name,'<b>','</b>','"'.$desc.'"').'<br />'.
&mt('LON-CAPA version ([_1]) installed on home server ([_2]) does not meet version requirements ([_3] or newer).',	&mt('LON-CAPA version ([_1]) installed on home server ([_2]) does not meet version requirements ([_3] or newer).',
$cmajor.'.'.$cminor,$chostname,	$cmajor.'.'.$cminor,$chostname,
$needsrelease).	$needsrelease).

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

Removed from v.1.509
changed lines
	Added in v.1.517