--- loncom/interface/lonparmset.pm 2009/02/13 20:20:30 1.430
+++ loncom/interface/lonparmset.pm 2009/04/05 17:31:04 1.442
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler to set parameters for assessments
#
-# $Id: lonparmset.pm,v 1.430 2009/02/13 20:20:30 schafran Exp $
+# $Id: lonparmset.pm,v 1.442 2009/04/05 17:31:04 droeschl Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -973,9 +973,8 @@ sub print_row {
if ($parmlev eq 'full') {
$r->print('
'
.$$part{$which}.' | ');
- } else {
+ } else {
$parm=~s|\[.*\]\s||g;
- $parm=&mt($parm);
}
my $automatic=&rulescache(($which=~/\_([^\_]+)$/)[0].'_triggers');
if ($automatic) {
@@ -1077,12 +1076,20 @@ sub print_td {
my ($r,$which,$defbg,$result,$outpar,$mprefix,$value,$typeoutpar,$display)=@_;
$r->print('');
- if ($which<11 || $which > 12) {
- $r->print(&plink($$typeoutpar[$which],
- $$display{$value},$$outpar[$which],
- $mprefix."$which",'parmform.pres','psub'));
+ my $nolink = 0;
+ if ($which == 11 || $which == 12) {
+ $nolink = 1;
+ } elsif ($mprefix =~ /availablestudent\&$/) {
+ if ($which > 3) {
+ $nolink = 1;
+ }
+ }
+ if ($nolink) {
+ $r->print(&valout($$outpar[$which],$$typeoutpar[$which]));
} else {
- $r->print(&valout($$outpar[$which],$$typeoutpar[$which]));
+ $r->print(&plink($$typeoutpar[$which],
+ $$display{$value},$$outpar[$which],
+ $mprefix."$which",'parmform.pres','psub'));
}
$r->print(' | '."\n");
}
@@ -1183,9 +1190,15 @@ sub extractResourceInformation {
#
my $name=&Apache::lonnet::metadata($srcf,$key.'.name');
if (!exists($$allparms{$name}) || $$allparms{$name} =~ m/^\s*$/ ) {
- my $display= &Apache::lonnet::metadata($srcf,$key.'.display');
- my $parmdis = $display;
- $parmdis =~ s/\s*\[Part.*$//g;
+ my ($display,$parmdis);
+ $display = &standard_parameter_names($name);
+ if ($display eq '') {
+ $display= &Apache::lonnet::metadata($srcf,$key.'.display');
+ $parmdis = $display;
+ $parmdis =~ s/\s*\[Part.*$//g;
+ } else {
+ $parmdis = $display;
+ }
$$allparms{$name}=$parmdis;
if (ref($defkeytype)) {
$$defkeytype{$name}=
@@ -1317,14 +1330,9 @@ ENDSCRIPT
if ($$pscat[0] eq "all" || grep $_ eq $tempkey, @{$pscat}) {
$r->print(' checked="checked"');
}
- my $displaykey;
- if ($$allparms{$tempkey}=~/\S/) {
- $displaykey = $$allparms{$tempkey};
- } else {
- $displaykey = $tempkey;
- }
- $displaykey =~ s/(\[|\])/~$1/g;
- $r->print(' />'.&mt($displaykey).'');
+ $r->print(' />'.($$allparms{$tempkey}=~/\S/ ? $$allparms{$tempkey}
+ : $tempkey)
+ .'');
$cnt++;
if ($cnt==3) {
$r->print("\n");
@@ -1797,6 +1805,39 @@ sub assessparms {
my @values=split(/\&\&\&/,$env{'form.pres_value'});
my @types=split(/\&\&\&/,$env{'form.pres_type'});
for (my $i=0;$i<=$#markers;$i++) {
+ if ($markers[$i] =~ /^[\d.]+\&0_availablestudent\&(1|2|3)$/) {
+ my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+ my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+ my (@ok_slots,@fail_slots,@del_slots);
+ my $courseopt=&Apache::lonnet::get_courseresdata($cnum,$cdom);
+ my ($level,@all) =
+ &parmval_by_symb('0.availablestudent',$pssymb,'',$uname,$udom,
+ $csec,$cgroup,$courseopt);
+ foreach my $slot_name (split(/:/,$values[$i])) {
+ next if ($slot_name eq '');
+ if (&update_slots($slot_name,$cdom,$cnum,$pssymb,$uname,$udom) eq 'ok') {
+ push(@ok_slots,$slot_name);
+
+ } else {
+ push(@fail_slots,$slot_name);
+ }
+ }
+ if (@ok_slots) {
+ $values[$i] = join(':',@ok_slots);
+ } else {
+ $values[$i] = '';
+ }
+ if ($all[$level] ne '') {
+ my @existing = split(/:/,$all[$level]);
+ foreach my $slot_name (@existing) {
+ if (!grep(/^\Q$slot_name\E$/,split(/:/,$values[$i]))) {
+ if (&delete_slots($slot_name,$cdom,$cnum,$uname,$udom,$pssymb) eq 'ok') {
+ push(@del_slots,$slot_name);
+ }
+ }
+ }
+ }
+ }
$message.=&storeparm(split(/\&/,$markers[$i]),
$values[$i],
$types[$i],
@@ -1976,7 +2017,16 @@ ENDTABLEHEADFOUR
if (grep $_ eq $tempkeyp, @catmarker) {
$part{$_}=&Apache::lonnet::metadata($uri,$_.'.part');
$name{$_}=&Apache::lonnet::metadata($uri,$_.'.name');
- $display{$_}=&Apache::lonnet::metadata($uri,$_.'.display');
+ my $parmdis=&Apache::lonnet::metadata($uri,$_.'.display');
+ if ($allparms{$name{$_}} ne '') {
+ my $identifier;
+ if ($parmdis =~ /(\s*\[Part.*)$/) {
+ $identifier = $1;
+ }
+ $display{$_} = $allparms{$name{$_}}.$identifier;
+ } else {
+ $display{$_} = $parmdis;
+ }
unless ($display{$_}) { $display{$_}=''; }
$display{$_}.=' ('.$name{$_}.')';
$default{$_}=&Apache::lonnet::metadata($uri,$_);
@@ -2083,7 +2133,16 @@ ENDTABLEHEADFOUR
if ((grep $_ eq $fullkeyp, @catmarker) &&(!$name{$tempkeyp})) {
$part{$tempkeyp}="0";
$name{$tempkeyp}=&Apache::lonnet::metadata($uri,$fullkeyp.'.name');
- $display{$tempkeyp}=&Apache::lonnet::metadata($uri,$fullkeyp.'.display');
+ my $parmdis=&Apache::lonnet::metadata($uri,$fullkeyp.'.display');
+ if ($allparms{$name{$tempkeyp}} ne '') {
+ my $identifier;
+ if ($parmdis =~ /(\s*\[Part.*)$/) {
+ $identifier = $1;
+ }
+ $display{$tempkeyp} = $allparms{$name{$tempkeyp}}.$identifier;
+ } else {
+ $display{$tempkeyp} = $parmdis;
+ }
unless ($display{$tempkeyp}) { $display{$tempkeyp}=''; }
$display{$tempkeyp}.=' ('.$name{$tempkeyp}.')';
$display{$tempkeyp} =~ s/_\w+_/_0_/;
@@ -2176,7 +2235,16 @@ ENDTABLEHEADFOUR
if ((grep $_ eq $fullkeyp, @catmarker) &&(!$name{$tempkeyp})) {
$part{$tempkeyp}="0";
$name{$tempkeyp}=&Apache::lonnet::metadata($uri,$fullkeyp.'.name');
- $display{$tempkeyp}=&Apache::lonnet::metadata($uri,$fullkeyp.'.display');
+ my $parmdis=&Apache::lonnet::metadata($uri,$fullkeyp.'.display');
+ if ($allparms{$name{$tempkeyp}} ne '') {
+ my $identifier;
+ if ($parmdis =~ /(\s*\[Part.*)$/) {
+ $identifier = $1;
+ }
+ $display{$tempkeyp} = $allparms{$name{$tempkeyp}}.$identifier;
+ } else {
+ $display{$tempkeyp} = $parmdis;
+ }
unless ($display{$tempkeyp}) { $display{$tempkeyp}=''; }
$display{$tempkeyp}.=' ('.$name{$tempkeyp}.')';
$display{$tempkeyp} =~ s/_\w+_/_0_/;
@@ -2241,6 +2309,7 @@ sub crsenv {
my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
my (%crsinfo,$chome);
+ my $crstype = &Apache::loncommon::course_type();
#
# Go through list of changes
@@ -2251,6 +2320,23 @@ sub crsenv {
if ($name eq 'newp') {
$name = $env{'form.newp_name'};
}
+ if ($name =~ /^rolenames_([^_]+)$/) {
+ $name = $1.'.plaintext';
+ my $standardtitle =
+ &Apache::lonnet::plaintext($1,$crstype,$env{'request.course.id'},1);
+ my %adv_roles =
+ &Apache::lonnet::get_course_adv_roles($env{'request.course.id'},1);
+ if ($value ne '') {
+ foreach my $role (keys(%adv_roles)) {
+ if ($role =~ m{^cr/$match_domain/$match_name/\Q$value\E$}) {
+ $setoutput.= ''.
+ &mt('Requested replacement title for [_1] role is already used as the name of a custom role ([_2]).',$standardtitle,$value).
+ '
';
+ undef($value);
+ }
+ }
+ }
+ }
if ($name eq 'url') {
$value=~s/^\/res\///;
my $bkuptime=time;
@@ -2412,9 +2498,6 @@ sub crsenv {
}
}
- my $start_table =&Apache::loncommon::start_data_table();
- my $start_header_row=&Apache::loncommon::start_data_table_header_row();
- my $end_header_row =&Apache::loncommon::end_data_table_header_row();
# ------------------------- Re-init course environment entries for this session
&Apache::lonnet::coursedescription($env{'request.course.id'},
@@ -2426,7 +2509,14 @@ sub crsenv {
my $SelectStyleFile=&mt('Select Style File');
my $SelectSpreadsheetFile=&mt('Select Spreadsheet File');
my $output='';
+ my $output_SB = ''; # will be replaced by "$output" when all changes are done
my $can_categorize;
+ my %lt=&Apache::lonlocal::texthash(
+ 'par' => 'Parameter',
+ 'val' => 'Value',
+ 'set' => 'Set?',
+ 'sav' => 'Save',
+ );
if (! exists($values{'con_lost'})) {
my %descriptions=
('url' => ''.&mt('Top Level Map').'
'.
@@ -2435,7 +2525,7 @@ sub crsenv {
&mt('Select Map').'
'.
&mt('Modification may make assessment data inaccessible!').
'',
- 'description' => ''.&mt('Course Description').'',
+ 'description' => ''.&mt('Course Title').'',
'courseid' => ''.&mt('Course ID or number').
'
'.
'('.&mt('internal, optional').')',
@@ -2473,12 +2563,12 @@ sub crsenv {
.'('.&mt("[_1] for link to each a listing of each student's files.",'"yes"').')',
'student_classlist_opt_in' => ''.&mt("Student's agreement needed for listing in student-viewable roster").'
'
.'('.&mt('[_1] to require students to opt-in to listing in the roster (on the roster page).','"yes"').')',
- 'plc.roles.denied'=> ''.&mt('Disallow live chatroom use for Roles').'
'
+ 'plc.roles.denied'=> ''.&mt('Disallow chat room use for Roles').'
'
.'('.&mt('[_1]: student, [_2]: TA, [_3]: instructor','"st"','"ta"','"in"').')
'
.'("'.&mt('role,role,...').'") '
.Apache::loncommon::help_open_topic("Course_Disable_Discussion"),
'plc.users.denied' =>
- ''.&mt('Disallow live chatroom use for Users').'
'.
+ ''.&mt('Disallow chat room use for Users').'
'.
'("'.&mt('user:domain,user:domain,...').'")',
'pch.roles.denied'=> ''.&mt('Disallow Resource Discussion for Roles').'
'
@@ -2553,7 +2643,7 @@ sub crsenv {
'externalsyllabus'
=> ''.&mt('URL of Syllabus (not using internal handler)').'',
'tthoptions'
- => ''.&mt('Default set of options to pass to tth/m when converting tex').'',
+ => ''.&mt('Default set of options to pass to tth/m when converting TeX').'',
'texengine'
=> ''.&mt('Force all students in the course to use a specific math rendering engine.').'
'
@@ -2572,69 +2662,32 @@ sub crsenv {
&mt('Display Categories').'',
'datelocale'
=> ''.&mt('Locale used for course calendar').'',
+ 'rolenames'
+ => ''.&mt('Replacement titles for standard course roles').'
'.
+ '('.&mt('To replace the standard title for a course role, enter the title you wish to use, otherwise leave blank.').')',
);
- my @Display_Order = ('url','description','courseid','cloners');
- (my $can_toggle_cat,$can_categorize) = &can_modify_catsettings($dom);
- if ($can_toggle_cat) {
- push(@Display_Order,'hidefromcat');
- }
- if ($can_categorize) {
- push(@Display_Order,'categories');
- }
- push (@Display_Order,('grading',
- 'externalsyllabus',
- 'default_xml_style','pageseparators',
- 'question.email','question.email.text','comment.email',
- 'comment.email.text','policy.email','policy.email.text',
- 'student_classlist_view',
- 'student_classlist_opt_in',
- 'student_classlist_portfiles',
- 'plc.roles.denied','plc.users.denied',
- 'pch.roles.denied','pch.users.denied',
- 'allow_limited_html_in_feedback',
- 'allow_discussion_post_editing',
- 'languages',
- 'timezone',
- 'datelocale',
- 'nothideprivileged',
- 'rndseed',
- 'receiptalg',
- 'problem_stream_switch',
- 'suppress_tries',
- 'suppress_embed_prompt',
- 'default_paper_size',
- 'print_header_format',
- 'disable_receipt_display',
- 'spreadsheet_default_classcalc',
- 'spreadsheet_default_studentcalc',
- 'spreadsheet_default_assesscalc',
- 'hideemptyrows',
- 'default_enrollment_start_date',
- 'default_enrollment_end_date',
- 'tthoptions',
- 'texengine',
- 'disablesigfigs',
- 'disableexampointprint',
- 'task_messages','task_grading'));
- foreach my $parameter (sort(keys(%values))) {
- unless (($parameter =~ m/^internal\./)||($parameter =~ m/^metadata\./) ||
- ($parameter =~ m/^selfenroll_/) || ($parameter =~ /_selfenroll$/)
- || ($parameter eq 'type')) {
- if (! $descriptions{$parameter}) {
- $descriptions{$parameter}=$parameter;
- push(@Display_Order,$parameter);
- }
- }
- }
-
- foreach my $parameter (@Display_Order) {
- my $description = $descriptions{$parameter};
- # onchange is javascript to automatically check the 'Set' button.
- my $onchange = 'onFocus="javascript:window.document.forms'.
- "['envform'].elements['".$parameter."_setparmval']".
- '.checked=true;"';
- $output .= &Apache::loncommon::start_data_table_row().
- ''.$description.' | ';
+
+
+# ----------------------------------------------------------------
+# Begin: New Version with Parameter Categories
+
+ sub parameter_row {
+ # Create parameter row for course environment screen
+
+ my ($parameter, $description) = @_;
+
+ # Start Parameter Row
+ my $output = &Apache::loncommon::start_data_table_row();
+
+ # Column 1/3: Descriptive text of current parameter
+ $output .= ''.$description.' | ';
+
+ # Column 2/3: Input field (Sometimes special field(s), depending on parameter)
+
+ # onchange is javascript to automatically check the 'Set' button.
+ my $onchange = 'onFocus="javascript:window.document.forms'
+ ."['envform'].elements['".$parameter."_setparmval']"
+ .'.checked=true;"';
if ($parameter =~ /^default_enrollment_(start|end)_date$/) {
$output .= ''.
&Apache::lonhtmlcommon::date_setter('envform',
@@ -2659,7 +2712,27 @@ sub crsenv {
$output .= ' | '.
&Apache::loncommon::select_datelocale($parameter.'_value',
$currdatelocale,
- $onchange,$includeempty).' | ';
+ $onchange,$includeempty).'';
+ } elsif ($parameter eq 'rolenames') {
+ $output.= '';
+ foreach my $role ('cc','in','ta','ep','ad','st') {
+ my $onchange = 'onFocus="javascript:window.document.forms'.
+ "['envform'].elements['".
+ $parameter.'_'.$role."_setparmval']".
+ '.checked=true;"';
+ $output.= ''.&Apache::lonnet::plaintext($role,$crstype,undef,1).
+ ' | '.
+ &Apache::lonhtmlcommon::textbox($parameter.'_'.$role.'_value',
+ $values{$role.'.plaintext'},
+ 15,$onchange).
+ ' | ';
+ }
+ $output .= ' | ';
+ foreach my $role ('cc','in','ta','ep','ad','st') {
+ $output .= ''.&Apache::lonhtmlcommon::checkbox($parameter.'_'.$role.'_setparmval').
+ ' | ';
+ }
+ $output .= ' | ';
} elsif ($parameter eq 'categories') {
my $catdisplay;
if ($values{'categories'} ne '') {
@@ -2675,39 +2748,229 @@ sub crsenv {
$values{'categories'}.'" />'.
'';
- } else {
- $output .= ''.
- &Apache::lonhtmlcommon::textbox($parameter.'_value',
- $values{$parameter},
- 40,$onchange).' | ';
- }
- $output .= ''.
- &Apache::lonhtmlcommon::checkbox($parameter.'_setparmval').
- ' | ';
- $output .= &Apache::loncommon::end_data_table_row()."\n";
- }
- my $onchange = 'onFocus="javascript:window.document.forms'.
- '[\'envform\'].elements[\'newp_setparmval\']'.
- '.checked=true;"';
- $output.=&Apache::loncommon::start_data_table_row().
- ''.&mt('Create New Environment Variable').' '.
- ' | '.
- ' | '.
- ' | '.
- &Apache::loncommon::end_data_table_row()."\n";
+ } else { # Display default textbox in all other cases
+ $output .= ''
+ .&Apache::lonhtmlcommon::textbox($parameter.'_value',
+ $values{$parameter},
+ 40,
+ $onchange)
+ .' | ';
+ }
+
+ # Column 3/3: Check Box (in most cases)
+ unless ($parameter eq 'rolenames') {
+ $output .= ''
+ .&Apache::lonhtmlcommon::checkbox($parameter.'_setparmval')
+ .' | ';
+ }
+
+ # End Parameter Row
+ $output .= &Apache::loncommon::end_data_table_row();
+
+ return $output;
+ } # End sub parameter_row
+
+
+ # Parameter Category Names
+ my %parm_cat_names = &Apache::lonlocal::texthash (
+ 'cat_0' => 'Parameter Category Zero',
+ 'cat_1' => 'Parameter Category One',
+ 'cat_2' => 'Parameter Category Two',
+ 'cat_3' => 'Parameter Category Three',
+ 'cat_4' => 'Parameter Category Four',
+ 'cat_5' => 'Parameter Category Five',
+ 'cat_6' => 'Parameter Category Six',
+ 'cat_7' => 'Parameter Category Seven',
+ 'cat_can' => 'Parameter Category Can',
+ 'cat_custom' => 'Parameter Category Custom',
+ );
+
+ # Display Order of Parameter Categories
+ my @Display_Order = (
+ 'cat_0',
+ 'cat_1',
+ 'cat_2',
+ 'cat_3',
+ 'cat_4',
+ 'cat_5',
+ 'cat_6',
+ 'cat_7',
+ 'cat_can',
+ 'cat_custom',
+ );
+
+ # Link Parameter Categories with Parameters
+ # Order of parameters is display order
+ my %parm_cat_parms = (
+ 'cat_0' => [
+ 'url',
+ 'description',
+ 'courseid',
+ 'cloners'
+ ],
+ 'cat_1' => [
+ 'grading',
+ 'externalsyllabus',
+ 'default_xml_style',
+ 'pageseparators'
+ ],
+ 'cat_2' => [
+ 'question.email',
+ 'question.email.text',
+ 'comment.email',
+ 'comment.email.text',
+ 'policy.email',
+ 'policy.email.text',
+ ],
+ 'cat_3' => [
+ 'student_classlist_view',
+ 'student_classlist_opt_in',
+ 'student_classlist_portfiles',
+ 'plc.roles.denied',
+ 'plc.users.denied',
+ 'pch.roles.denied',
+ 'pch.users.denied',
+ 'allow_limited_html_in_feedback',
+ 'allow_discussion_post_editing',
+ ],
+ 'cat_4' => [
+ 'languages',
+ 'timezone',
+ 'datelocale',
+ 'rolenames',
+ 'nothideprivileged',
+ 'rndseed',
+ 'receiptalg',
+ 'problem_stream_switch',
+ 'suppress_tries',
+ 'suppress_embed_prompt',
+ 'default_paper_size',
+ 'print_header_format',
+ 'disable_receipt_display',
+ ],
+ 'cat_5' => [
+ 'spreadsheet_default_classcalc',
+ 'spreadsheet_default_studentcalc',
+ 'spreadsheet_default_assesscalc',
+ 'hideemptyrows',
+ ],
+ 'cat_6' => [
+ 'default_enrollment_start_date',
+ 'default_enrollment_end_date',
+ ],
+ 'cat_7' => [
+ 'tthoptions',
+ 'texengine',
+ 'disablesigfigs',
+ 'disableexampointprint',
+ 'task_messages',
+ 'task_grading',
+ ],
+ );
+
+ # Add special parameters depending on special context to parameter categories hash
+ my @can_cats;
+ (my $can_toggle_cat,$can_categorize) = &can_modify_catsettings($dom);
+ if ($can_toggle_cat) {
+ push(@can_cats,'hidefromcat');
}
- my %lt=&Apache::lonlocal::texthash(
- 'par' => 'Parameter',
- 'val' => 'Value',
- 'set' => 'Set?',
- 'sav' => 'Save'
- );
-
- my $Parameter=&mt('Parameter');
- my $Value=&mt('Value');
- my $Set=&mt('Set');
+ if ($can_categorize) {
+ push(@can_cats,'categories');
+ }
+ $parm_cat_parms{'cat_can'} = [@can_cats];
+
+ # Add custom parameters to custom parameter category
+ my @custom_cats;
+ foreach my $parameter (sort(keys(%values))) {
+ unless (($parameter =~ m/^internal\./)||($parameter =~ m/^metadata\./) ||
+ ($parameter =~ m/^selfenroll_/) || ($parameter =~ /_selfenroll$/)
+ || ($parameter eq 'type') ||
+ ($parameter =~ m/^(cc|in|ta|ep|ad|st)\.plaintext$/)) {
+ if (! $descriptions{$parameter}) {
+ $descriptions{$parameter}=$parameter;
+ push(@custom_cats,$parameter);
+ }
+ }
+ }
+ $parm_cat_parms{'cat_custom'} = [@custom_cats];
+
+
+# Display Course Parameter Overview
+# Provide hyperlinks to detailed parameter settings
+$output_SB .= ''
+ .''
+ .'
'.&mt('Course Parameter Overview').'
'
+ .'
';
+foreach my $catkey (@Display_Order) {
+ if (!@{$parm_cat_parms{$catkey}}) { next; } # Only display non-empty categories
+ $output_SB .= '- '
+ .''
+ .$parm_cat_names{$catkey}
+ .''
+ .'
';
+}
+$output_SB .= '
'
+ .'
';
+
+
+my $buttons='';
+
+# Display all Parameters grouped by categories
+$output_SB .= ''.&mt('Course Parameters').'
';
+
+foreach my $catkey (@Display_Order) {
+ if (!@{$parm_cat_parms{$catkey}}) { next; } # Only display non-empty categories
+ $output_SB .= &Apache::loncommon::start_data_table();
+ $output_SB .= &Apache::loncommon::start_data_table_empty_row()
+ .''
+ .''
+ .''.$parm_cat_names{$catkey}.''
+ .' | '
+ .&Apache::loncommon::end_data_table_empty_row
+ .&Apache::loncommon::start_data_table_header_row()
+ .''.$lt{'par'}.' | '.$lt{'val'}.' | '.$lt{'set'}.' | '
+ .&Apache::loncommon::end_data_table_header_row();
+
+ foreach my $parameter (@{$parm_cat_parms{$catkey}}) {
+ my $description = $descriptions{$parameter};
+ $output_SB .= ¶meter_row($parameter, $description);
+ }
+ # Add special row to custom category
+ # Offer possibilty to create a new environment variable
+ if ($catkey eq 'cat_custom') {
+ my $onchange = 'onFocus="javascript:window.document.forms'
+ .'[\'envform\'].elements[\'newp_setparmval\']'
+ .'.checked=true;"';
+ $output_SB .= &Apache::loncommon::start_data_table_row()
+ .''
+ .''.&mt('Create New Environment Variable').' '
+ .''
+ .' | '
+ .''
+ .' | '
+ .' | '
+ .&Apache::loncommon::end_data_table_row();
+ }
+ # Add buttons row at end of each category
+ $output_SB .= &Apache::loncommon::start_data_table_empty_row()
+ .''
+ .$buttons
+ .' | '
+ .&Apache::loncommon::end_data_table_empty_row;
+
+ $output_SB .= &Apache::loncommon::end_data_table()
+ . '
';
+}
+
+# End: New Version with Parameter Categories
+# ----------------------------------------------------------------
+
+
+ }
+
my ($jscript,$categorize_js);
my $browse_js = &Apache::loncommon::browser_and_searcher_javascript('parmset');
if ($can_categorize) {
@@ -2730,20 +2993,12 @@ ENDSCRIPT
$jscript);
my $end_page =
&Apache::loncommon::end_page();
- my $end_table=&Apache::loncommon::end_data_table();
$r->print(<
$setoutput
-
-$start_table
-$start_header_row
-$lt{'par'} | $lt{'val'} | $lt{'set'} |
-$end_header_row
-$output
-$end_table
-
+$output_SB
$end_page
ENDENV
@@ -4570,6 +4825,94 @@ sub parm_change_log {
$r->print(&Apache::loncommon::end_page());
}
+sub update_slots {
+ my ($slot_name,$cdom,$cnum,$symb,$uname,$udom) = @_;
+ my %slot=&Apache::lonnet::get_slot($slot_name);
+ if (!keys(%slot)) {
+ return 'error: slot does not exist';
+ }
+ my $max=$slot{'maxspace'};
+ if (!defined($max)) { $max=99999; }
+
+ my %consumed=&Apache::lonnet::dump('slot_reservations',$cdom,$cnum,
+ "^$slot_name\0");
+ my ($tmp)=%consumed;
+ if ($tmp=~/^error: 2 / ) {
+ return 'error: unable to determine current slot status';
+ }
+ my $last=0;
+ foreach my $key (keys(%consumed)) {
+ my $num=(split('\0',$key))[1];
+ if ($num > $last) { $last=$num; }
+ if ($consumed{$key}->{'name'} eq $uname.':'.$udom) {
+ return 'ok';
+ }
+ }
+
+ if (scalar(keys(%consumed)) >= $max) {
+ return 'error: no space left in slot';
+ }
+ my $wanted=$last+1;
+
+ my %reservation=('name' => $uname.':'.$udom,
+ 'timestamp' => time,
+ 'symb' => $symb);
+
+ my $success=&Apache::lonnet::newput('slot_reservations',
+ {"$slot_name\0$wanted" =>
+ \%reservation},
+ $cdom, $cnum);
+ if ($success eq 'ok') {
+ my %storehash = (
+ symb => $symb,
+ slot => $slot_name,
+ action => 'reserve',
+ context => 'parameter',
+ );
+ &Apache::lonnet::instructor_log('slotreservationslog',\%storehash,
+ '',$uname,$udom,$cnum,$cdom);
+
+ &Apache::lonnet::instructor_log($cdom.'_'.$cnum.'_slotlog',\%storehash,
+ '',$uname,$udom,$uname,$udom);
+ }
+ return $success;
+}
+
+sub delete_slots {
+ my ($slot_name,$cdom,$cnum,$uname,$udom,$symb) = @_;
+ my $delresult;
+ my %consumed = &Apache::lonnet::dump('slot_reservations',$cdom,
+ $cnum, "^$slot_name\0");
+ if (&Apache::lonnet::error(%consumed)) {
+ return 'error: unable to determine current slot status';
+ }
+ my ($tmp)=%consumed;
+ if ($tmp=~/^error: 2 /) {
+ return 'error: unable to determine current slot status';
+ }
+ foreach my $key (keys(%consumed)) {
+ if ($consumed{$key}->{'name'} eq $uname.':'.$udom) {
+ my $num=(split('\0',$key))[1];
+ my $entry = $slot_name.'\0'.$num;
+ $delresult = &Apache::lonnet::del('slot_reservations',[$entry],
+ $cdom,$cnum);
+ if ($delresult eq 'ok') {
+ my %storehash = (
+ symb => $symb,
+ slot => $slot_name,
+ action => 'release',
+ context => 'parameter',
+ );
+ &Apache::lonnet::instructor_log('slotreservationslog',\%storehash,
+ 1,$uname,$udom,$cnum,$cdom);
+ &Apache::lonnet::instructor_log($cdom.'_'.$cnum.'_slotlog',\%storehash,
+ 1,$uname,$udom,$uname,$udom);
+ }
+ }
+ }
+ return $delresult;
+}
+
sub check_for_course_info {
my $navmap = Apache::lonnavmaps::navmap->new();
return 1 if ($navmap);
@@ -4599,7 +4942,8 @@ sub handler {
text=>"Parameter Manager",
faq=>10,
bug=>'Instructor Interface',
- help => 'Parameter_Manager'});
+ help =>
+ 'Parameter_Manager,Course_Environment,Parameter_Helper,Parameter_Overview,Table_Mode'});
# ----------------------------------------------------- Needs to be in a course
my $parm_permission =