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.354 and 1.362

version 1.354, 2006/12/14 20:34:33	version 1.362, 2007/03/17 02:14:26
Line 554 sub valout {	Line 554 sub valout {
}	}
$result=~s/\s+$//;	$result=~s/\s+$//;
} elsif (&isdateparm($type)) {	} elsif (&isdateparm($type)) {
$result = localtime($value).&date_sanity_info($value);	$result = &Apache::lonlocal::locallocaltime($value).
	&date_sanity_info($value);
} else {	} else {
$result = $value;	$result = $value;
}	}
Line 2121 sub crsenv {	Line 2122 sub crsenv {
'question.email' => '<b>'.&mt('Feedback Addresses for Resource Content Question').	'question.email' => '<b>'.&mt('Feedback Addresses for Resource Content Question').
'</b><br />(<tt>user:domain,'.	'</b><br />(<tt>user:domain,'.
'user:domain(section;section;...;*;...),...</tt>)',	'user:domain(section;section;...;*;...),...</tt>)',
	'question.email.text' => '<b>'.&mt('Custom Text for Resource Content Question Option in Feedback').
	'</b>',
'comment.email' => '<b>'.&mt('Feedback Addresses for Course Content Comments').'</b><br />'.	'comment.email' => '<b>'.&mt('Feedback Addresses for Course Content Comments').'</b><br />'.
'(<tt>user:domain,user:domain(section;section;...;*;...),...</tt>)',	'(<tt>user:domain,user:domain(section;section;...;*;...),...</tt>)',
	'comment.email.text' => '<b>'.&mt('Custom Text for Course Content Option in Feedback').
	'</b>',
'policy.email' => '<b>'.&mt('Feedback Addresses for Course Policy').'</b>'.	'policy.email' => '<b>'.&mt('Feedback Addresses for Course Policy').'</b>'.
'<br />(<tt>user:domain,user:domain(section;section;...;*;...),...</tt>)',	'<br />(<tt>user:domain,user:domain(section;section;...;*;...),...</tt>)',
	'policy.email.text' => '<b>'.&mt('Custom Text for Course Policy Option in Feedback').
	'</b>',
'hideemptyrows' => '<b>'.&mt('Hide Empty Rows in Spreadsheets').'</b><br />'.	'hideemptyrows' => '<b>'.&mt('Hide Empty Rows in Spreadsheets').'</b><br />'.
'('.&mt('"[_1]" for default hiding','<tt>yes</tt>').')',	'('.&mt('"[_1]" for default hiding','<tt>yes</tt>').')',
'pageseparators' => '<b>'.&mt('Visibly Separate Items on Pages').'</b><br />'.	'pageseparators' => '<b>'.&mt('Visibly Separate Items on Pages').'</b><br />'.
Line 2207 sub crsenv {	Line 2214 sub crsenv {
=> '<b>'.&mt('Disable display of problem receipts').'</b><br />'.	=> '<b>'.&mt('Disable display of problem receipts').'</b><br />'.
' ('.&mt('"[_1]" to disable, anything else if not','<tt>yes</tt>').')',	' ('.&mt('"[_1]" to disable, anything else if not','<tt>yes</tt>').')',
'task_messages'	'task_messages'
=> '<b>'.&mt('Send message to student when clicking Done on Tasks. [_1] to send a message only to student, [_2] to send message to student and add record to user information page for instructors. Leave blank to disable.','<tt>only_student</tt>','<tt>student_and_user_notes_screen</tt>').'</b>',	=> '<b>'.&mt('Send message to student when clicking Done on Tasks').'</b><br /> ('.&mt('[_1] to send a message only to student, [_2] to send message to student and add record to user information page for instructors. Leave blank to disable.','<tt>only_student</tt>','<tt>student_and_user_notes_screen</tt>').')',
'disablesigfigs'	'disablesigfigs'
=> '<b>'.&mt('Disable checking of Significant Figures').'</b><br />'.	=> '<b>'.&mt('Disable checking of Significant Figures').'</b><br />'.
' ('.&mt('"[_1]" to disable, anything else if not','<tt>yes</tt>').')',	' ('.&mt('"[_1]" to disable, anything else if not','<tt>yes</tt>').')',
Line 2222 sub crsenv {	Line 2229 sub crsenv {
my @Display_Order = ('url','description','courseid','cloners','grading',	my @Display_Order = ('url','description','courseid','cloners','grading',
'externalsyllabus',	'externalsyllabus',
'default_xml_style','pageseparators',	'default_xml_style','pageseparators',
'question.email','comment.email','policy.email',	'question.email','question.email.text','comment.email','comment.email.text','policy.email','policy.email.text',
'student_classlist_view',	'student_classlist_view',
'plc.roles.denied','plc.users.denied',	'plc.roles.denied','plc.users.denied',
'pch.roles.denied','pch.users.denied',	'pch.roles.denied','pch.users.denied',
Line 2875 ENDOVER	Line 2882 ENDOVER
'<td><input type="checkbox" name="del_'.$thiskey.'" /></td>' );	'<td><input type="checkbox" name="del_'.$thiskey.'" /></td>' );

$r->print('<td>');	$r->print('<td>');
	my $display_value = $resourcedata->{$thiskey};
	if (&isdateparm($resourcedata->{$thiskey.'.type'})) {
	$display_value =
	&Apache::lonlocal::locallocaltime($display_value);
	}
$r->print(&mt('Parameter: "[_1]" with value: "[_2]"',	$r->print(&mt('Parameter: "[_1]" with value: "[_2]"',
&standard_parameter_names($data{'parameter_name'}),	&standard_parameter_names($data{'parameter_name'}),
$resourcedata->{$thiskey}));	$resourcedata->{$thiskey}));
Line 2899 ENDOVER	Line 2911 ENDOVER
$r->print(&mt('Resource: [_1] <br />   with ID: [_2] <br />   in folder [_3]',	$r->print(&mt('Resource: [_1] <br />   with ID: [_2] <br />   in folder [_3]',
$url,$resid,$map));	$url,$resid,$map));
}	}
$r->print(&mt('Part: [_1]',$data{'parameter_part'}));	$r->print(' <br />   '.&mt('Part: [_1]',$data{'parameter_part'}));
$r->print('</td></tr>');	$r->print('</td></tr>');

}	}
Line 3288 sub order_meta_fields {	Line 3300 sub order_meta_fields {
{'metadata.addedorder'=>$ordered_fields},$dom,$crs);	{'metadata.addedorder'=>$ordered_fields},$dom,$crs);
&Apache::lonnet::appenv('course.'.$env{'request.course.id'}.'.metadata.addedorder' => $ordered_fields);	&Apache::lonnet::appenv('course.'.$env{'request.course.id'}.'.metadata.addedorder' => $ordered_fields);
}	}
my $fields = &get_added_meta_fieldnames();	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) {
Line 3323 sub order_meta_fields {	Line 3335 sub order_meta_fields {
$r->print('</table>');	$r->print('</table>');
return 'ok';	return 'ok';
}	}
	sub continue {
	my $output;
	$output .= '<form action="" method="post">';
	$output .= '<input type="hidden" name="action" value="setrestrictmeta" />';
	$output .= '<input type="submit" value="Continue" />';
	return ($output);
	}
sub addmetafield {	sub addmetafield {
my ($r)=@_;	my ($r)=@_;
$r->print(&Apache::loncommon::start_page('Add Metadata Field'));	$r->print(&Apache::loncommon::start_page('Add Metadata Field'));
Line 3330 sub addmetafield {	Line 3349 sub addmetafield {
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'};
if (exists($env{'form.undelete'})) {	if (exists($env{'form.undelete'})) {
my @meta_fields = &Apache::loncommon::get_env_multiple('form.undelete');	my @meta_fields = &Apache::loncommon::get_env_multiple('form.undeletefield');
foreach my $meta_field(@meta_fields) {	foreach my $meta_field(@meta_fields) {
my $options = $env{'course.'.$env{'request.course.id'}.'.metadata.'.$meta_field.'.options'};	my $options = $env{'course.'.$env{'request.course.id'}.'.metadata.'.$meta_field.'.options'};
$options =~ s/deleted//;	$options =~ s/deleted//;
Line 3340 sub addmetafield {	Line 3359 sub addmetafield {

$r->print('Undeleted Metadata Field <strong>'.$env{'course.'.$env{'request.course.id'}.'.metadata.'.$meta_field.'.added'}."</strong> with result ".$put_result.'<br />');	$r->print('Undeleted Metadata Field <strong>'.$env{'course.'.$env{'request.course.id'}.'.metadata.'.$meta_field.'.added'}."</strong> with result ".$put_result.'<br />');
}	}
$r->print('<form action="" method="post">');	$r->print(&continue());
$r->print('<input type="hidden" name="action" value="setrestrictmeta" />');
$r->print('<input type="submit" value="Continue" />');
} elsif (exists($env{'form.fieldname'})) {	} elsif (exists($env{'form.fieldname'})) {
my $meta_field = $env{'form.fieldname'};	my $meta_field = $env{'form.fieldname'};
my $display_field = $env{'form.fieldname'};	my $display_field = $env{'form.fieldname'};
Line 3352 sub addmetafield {	Line 3369 sub addmetafield {
{'metadata.'.$meta_field.'.values'=>"",	{'metadata.'.$meta_field.'.values'=>"",
'metadata.'.$meta_field.'.added'=>"$display_field",	'metadata.'.$meta_field.'.added'=>"$display_field",
'metadata.'.$meta_field.'.options'=>""},$dom,$crs);	'metadata.'.$meta_field.'.options'=>""},$dom,$crs);
$r->print('Added new Metadata Field '.$env{'form.fieldname'}." with result ".$put_result);	$r->print('Added new Metadata Field <strong>'.$env{'form.fieldname'}."</strong> with result ".$put_result.'<br />');
	$r->print(&continue());
} else {	} else {
my $fields = &get_deleted_meta_fieldnames();	my $fields = &get_deleted_meta_fieldnames($env{'request.course.id'});
if ($fields) {	if ($fields) {
$r->print('You may undelete previously deleted fields.<br />Check those you wish to undelete and click Undelete.<br />');	$r->print('You may undelete previously deleted fields.<br />Check those you wish to undelete and click Undelete.<br />');
$r->print('<form method="post" action="">');	$r->print('<form method="post" action="">');
foreach my $key(keys(%$fields)) {	foreach my $key(keys(%$fields)) {
$r->print('<input type="checkbox" name="undelete" value="'.$key.'" />'.$$fields{$key}.'<br /');	$r->print('<input type="checkbox" name="undeletefield" value="'.$key.'" />'.$$fields{$key}.'<br /');
}	}
$r->print('<input type="submit" name="undelete" value="Undelete" />');	$r->print('<input type="submit" name="undelete" value="Undelete" />');
$r->print('</form>');	$r->print('</form>');
Line 3367 sub addmetafield {	Line 3385 sub addmetafield {
$r->print('<hr /><strong>Or</strong> you may enter a new metadata field name.<form method="post" action="/adm/parmset?action=addmetadata"');	$r->print('<hr /><strong>Or</strong> you may enter a new metadata field name.<form method="post" action="/adm/parmset?action=addmetadata"');
$r->print('<input type="text" name="fieldname" /><br />');	$r->print('<input type="text" name="fieldname" /><br />');
$r->print('<input type="submit" value="Add Metadata Field" />');	$r->print('<input type="submit" value="Add Metadata Field" />');
$r->print('</form>');
}	}
	$r->print('</form>');
}	}
sub setrestrictmeta {	sub setrestrictmeta {
my ($r)=@_;	my ($r)=@_;
Line 3419 sub setrestrictmeta {	Line 3437 sub setrestrictmeta {
# Get the default metadata fields	# Get the default metadata fields
my %metadata_fields = &Apache::lonmeta::fieldnames('portfolio');	my %metadata_fields = &Apache::lonmeta::fieldnames('portfolio');
# Now get possible added metadata fields	# Now get possible added metadata fields
my $added_metadata_fields = &get_added_meta_fieldnames(\%metadata_fields);	my $added_metadata_fields = &get_added_meta_fieldnames($env{'request.course.id'});
my $row_alt = 1;	my $row_alt = 1;
$output .= &Apache::loncommon::start_data_table();	$output .= &Apache::loncommon::start_data_table();
foreach my $field (sort(keys(%metadata_fields))) {	foreach my $field (sort(keys(%metadata_fields))) {
Line 3455 ENDenv	Line 3473 ENDenv
}	}
##################################################	##################################################
sub get_added_meta_fieldnames {	sub get_added_meta_fieldnames {
	my ($cid) = @_;
my %fields;	my %fields;
foreach my $key(%env) {	foreach my $key(%env) {
if ($key =~ m/\.metadata\.(.+)\.added$/) {	if ($key =~ m/\Q$cid\E\.metadata\.(.+)\.added$/) {
my $field_name = $1;	my $field_name = $1;
my ($display_field_name) = $env{$key};	my ($display_field_name) = $env{$key};
$fields{$field_name} = $display_field_name;	$fields{$field_name} = $display_field_name;
Line 3466 sub get_added_meta_fieldnames {	Line 3485 sub get_added_meta_fieldnames {
return \%fields;	return \%fields;
}	}
sub get_deleted_meta_fieldnames {	sub get_deleted_meta_fieldnames {
	my ($cid) = @_;
my %fields;	my %fields;
my ($default_fields) = @_;
foreach my $key(%env) {	foreach my $key(%env) {
if ($key =~ m/\.metadata\.(.+)\.added$/) {	if ($key =~ m/\Q$cid\E\.metadata\.(.+)\.added$/) {
my $field_name = $1;	my $field_name = $1;
if ($env{'course.'.$env{'request.course.id'}.'.metadata.'.$field_name.'.options'} =~ m/deleted/) {	if ($env{'course.'.$env{'request.course.id'}.'.metadata.'.$field_name.'.options'} =~ m/deleted/) {
my ($display_field_name) = $env{$key};	my ($display_field_name) = $env{$key};
Line 3753 sub parm_change_log {	Line 3772 sub parm_change_log {
}	}
if ($last) { ($folder) = &Apache::lonnet::decode_symb($last); }	if ($last) { ($folder) = &Apache::lonnet::decode_symb($last); }
}	}
foreach my $id (sort { $parmlog{$b}{'exe_time'}<=>$parmlog{$a}{'exe_time'} } (keys(%parmlog))) {	foreach my $id (sort
	{
	if ($parmlog{$b}{'exe_time'} ne $parmlog{$a}{'exe_time'}) {
	return $parmlog{$b}{'exe_time'} <=>$parmlog{$a}{'exe_time'}
	}
	my $aid = (split('00000',$a))[-1];
	my $bid = (split('00000',$b))[-1];
	return $bid<=>$aid;
	} (keys(%parmlog))) {
my @changes=keys(%{$parmlog{$id}{'logentry'}});	my @changes=keys(%{$parmlog{$id}{'logentry'}});
my $count = 0;	my $count = 0;
my $time =	my $time =
Line 3861 sub parm_change_log {	Line 3888 sub parm_change_log {
$r->print(&Apache::loncommon::end_page());	$r->print(&Apache::loncommon::end_page());
}	}

	sub check_for_course_info {
	my $navmap = Apache::lonnavmaps::navmap->new();
	return 1 if ($navmap);
	return 0;
	}

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

Line 3904 sub handler {	Line 3937 sub handler {
(&Apache::lonnet::allowed('opa',$env{'request.course.id'}) \|\|	(&Apache::lonnet::allowed('opa',$env{'request.course.id'}) \|\|
&Apache::lonnet::allowed('opa',$env{'request.course.id'}.'/'.	&Apache::lonnet::allowed('opa',$env{'request.course.id'}.'/'.
$env{'request.course.sec'}));	$env{'request.course.sec'}));
if ($env{'request.course.id'} && $parm_permission) {	my $exists = &check_for_course_info();

	if ($env{'request.course.id'} && $parm_permission && $exists) {

# Start Page	# Start Page
&Apache::loncommon::content_type($r,'text/html');	&Apache::loncommon::content_type($r,'text/html');
Line 3974 sub handler {	Line 4009 sub handler {
}	}
} else {	} else {
# ----------------------------- Not in a course, or not allowed to modify parms	# ----------------------------- Not in a course, or not allowed to modify parms
$env{'user.error.msg'}=	if ($exists) {
"/adm/parmset:opa:0:0:Cannot modify assessment parameters";	$env{'user.error.msg'}=
	"/adm/parmset:opa:0:0:Cannot modify assessment parameters";
	} else {
	$env{'user.error.msg'}=
	"/adm/parmset::0:1:Course environment gone, reinitialize the course";
	}
return HTTP_NOT_ACCEPTABLE;	return HTTP_NOT_ACCEPTABLE;
}	}
return OK;	return OK;

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

Removed from v.1.354
changed lines
	Added in v.1.362