--- loncom/interface/lonparmset.pm 2008/06/27 00:02:55 1.402
+++ loncom/interface/lonparmset.pm 2008/08/28 03:54:53 1.407
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler to set parameters for assessments
#
-# $Id: lonparmset.pm,v 1.402 2008/06/27 00:02:55 raeburn Exp $
+# $Id: lonparmset.pm,v 1.407 2008/08/28 03:54:53 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1899,7 +1899,7 @@ ENDTABLEHEADFOUR
}
$r->print('
'
.&mt('Set Defaults for All Resources in [_1]Specifically for [_2][_3]'
- ,$foldermap.' $showtitle '
+ ,$foldermap.' '.$showtitle.' '
,$tmp
,''.$coursename.''
)
@@ -2126,6 +2126,8 @@ sub crsenv {
$setoutput.=&mt('Set').' '.$name.' '.&mt('to').' ';
if ($name =~ /^default_enrollment_(start|end)_date$/) {
$setoutput .= &Apache::lonlocal::locallocaltime($value);
+ } elsif ($name eq 'categories') {
+ $setoutput .= $env{'form.categories_display'};
} else {
$setoutput .= $value;
}
@@ -2135,11 +2137,11 @@ sub crsenv {
}
# Update environment and nohist_courseids.db
if (($name eq 'description') || ($name eq 'cloners') ||
- ($name eq 'hidefromcat')) {
+ ($name eq 'hidefromcat') || ($name eq 'categories')) {
if ($chome eq '') {
%crsinfo =
&Apache::lonnet::courseiddump($dom,'.',1,'.','.',
- $crs,undef,undef,'Course');
+ $crs,undef,undef,'.');
$chome = &Apache::lonnet::homeserver($crs,$dom);
}
}
@@ -2152,17 +2154,10 @@ sub crsenv {
$chome,'notime');
}
}
- if ($name eq 'cloners') {
+ if (($name eq 'cloners') || ($name eq 'hidefromcat') || ($name eq 'categories')) {
if (ref($crsinfo{$env{'request.course.id'}}) eq 'HASH') {
- $crsinfo{$env{'request.course.id'}}{'cloners'} = $value;
- my $putresult =
- &Apache::lonnet::courseidput($dom,\%crsinfo,
- $chome,'notime');
- }
- }
- if ($name eq 'hidefromcat') {
- if (ref($crsinfo{$env{'request.course.id'}}) eq 'HASH') {
- $crsinfo{$env{'request.course.id'}}{'hidefromcat'} = $value;
+ &Apache::lonnet::appenv({'course.'.$env{'request.course.id'}.'.'.$name => $value});
+ $crsinfo{$env{'request.course.id'}}{$name} = $value;
my $putresult =
&Apache::lonnet::courseidput($dom,\%crsinfo,
$chome,'notime');
@@ -2218,6 +2213,7 @@ sub crsenv {
my $SelectStyleFile=&mt('Select Style File');
my $SelectSpreadsheetFile=&mt('Select Spreadsheet File');
my $output='';
+ my $can_categorize;
if (! exists($values{'con_lost'})) {
my %descriptions=
('url' => ''.&mt('Top Level Map').' '.
@@ -2355,14 +2351,21 @@ sub crsenv {
'suppress_embed_prompt'
=> ''.&mt('Suppress prompt to upload items referenced in a web page being uploaded to portfolio, when current role is student.').' '.
' ('.&mt('[_1] to suppress, anything else to not suppress','"yes"').')',
- 'hidefromcat'
+ 'hidefromcat'
=> ''.&mt('Exclude from course catalog').' '.
' ('.&mt('[_1] to exclude, anything else to include - included if assigned an institutional code, or manually catagorized','"yes"').')',
+ 'categories'
+ => ''.&mt('Categorize course').''.
+ &mt('Display Categories').'',
);
my @Display_Order = ('url','description','courseid','cloners');
- if (&can_toggle_cat($dom)) {
+ (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',
@@ -2398,7 +2401,9 @@ sub crsenv {
'disableexampointprint',
'task_messages','task_grading'));
foreach my $parameter (sort(keys(%values))) {
- unless (($parameter =~ m/^internal\./)||($parameter =~ m/^metadata\./)) {
+ 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);
@@ -2428,6 +2433,21 @@ sub crsenv {
&Apache::loncommon::select_timezone($parameter.'_value',
$timezone,
$onchange,$includeempty).'';
+ } elsif ($parameter eq 'categories') {
+ my $catdisplay;
+ if ($values{'categories'} ne '') {
+ my @curritems = split(/\&/,$values{'categories'});
+ foreach my $item (@curritems) {
+ my ($name,$parent,$pos) = split(/:/,$item);
+ $catdisplay .= &unescape($name).'&';
+ }
+ $catdisplay =~ s/\&$//;
+ }
+ $output .= '
'.
+ ''.
+ '
';
} else {
$output .= '
'.
&Apache::lonhtmlcommon::textbox($parameter.'_value',
@@ -2461,14 +2481,26 @@ sub crsenv {
my $Parameter=&mt('Parameter');
my $Value=&mt('Value');
my $Set=&mt('Set');
- my $browse_js=
- '';
-
+ my ($jscript,$categorize_js);
+ my $browse_js = &Apache::loncommon::browser_and_searcher_javascript('parmset');
+ if ($can_categorize) {
+ $categorize_js = <'."\n".
+ $browse_js."\n".$categorize_js."\n".'';
my $start_page =
&Apache::loncommon::start_page('Set Course Environment',
- $browse_js);
+ $jscript);
my $end_page =
&Apache::loncommon::end_page();
my $end_table=&Apache::loncommon::end_data_table();
@@ -2490,16 +2522,95 @@ $end_page
ENDENV
}
-sub can_toggle_cat {
+sub can_modify_catsettings {
my ($dom) = @_;
my %domconf = &Apache::lonnet::get_dom('configuration',['coursecategories'],$dom);
- my $can_toggle_cat = '';
+ my ($can_toggle_cat,$can_categorize);
if (ref($domconf{'coursecategories'}) eq 'HASH') {
if ($domconf{'coursecategories'}{'togglecats'} eq 'crs') {
$can_toggle_cat = 1;
}
+ if ($domconf{'coursecategories'}{'categorize'} eq 'crs') {
+ $can_categorize = 1;
+ }
}
- return $can_toggle_cat;
+ return ($can_toggle_cat,$can_categorize);
+}
+
+sub assign_course_categories {
+ my ($r) = @_;
+ my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+ my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+ my $hascats = 0;
+ my $cathash;
+ my %domconf = &Apache::lonnet::get_dom('configuration',['coursecategories'],$cdom);
+ if (ref($domconf{'coursecategories'}) eq 'HASH') {
+ $cathash = $domconf{'coursecategories'}{'cats'};
+ if (ref($cathash) eq 'HASH') {
+ $hascats = 1;
+ }
+ }
+ my $catwin_js;
+ if ($hascats) {
+ my $alert = &mt('Use \"Save\" in the main window to save course categories');
+ $catwin_js = <
+
+function updateCategories() {
+ var newcategories = '';
+ var unescapedcats = '';
+ if (document.chgcats.usecategory.length) {
+ for (var i=0; i 0) {
+ newcategories = newcategories.slice(0,-1);
+ }
+ if (unescapedcats.length > 0) {
+ usescapedcats = unescapedcats.slice(0,-3);
+ }
+ } else {
+ if (document.chgcats.usecategory.checked == true) {
+ newcategories = document.chgcats.usecategory.value;
+ unescapedcats = document.chgcats.catname.value;
+ }
+ }
+ opener.document.envform.categories_value.value = newcategories;
+ opener.document.envform.categories_display.value = unescapedcats;
+ opener.document.envform.categories_setparmval.checked = true;
+ alert("$alert");
+ self.close();
+ return;
+}
+
+
+ENDSCRIPT
+ } else {
+ my $onload;
+ }
+ my $start_page =
+ &Apache::loncommon::start_page('Course Categories',$catwin_js,
+ {'only_body' => 1,});
+ my $end_page = &Apache::loncommon::end_page();
+ my $categoriesform = '
'.&mt('Categorize Course').'
';
+ if ($hascats) {
+ my %currsettings =
+ &Apache::lonnet::get('environment',['hidefromcat','categories'],$cdom,$cnum);
+ $categoriesform .= &mt('Assign one or more categories to this course.').'
'.
+ ' ';
+ } else {
+ $categoriesform .= &mt('No categories defined for this domain');
+ }
+ $r->print($start_page.$categoriesform.$end_page);
+ return;
}
##################################################
@@ -4363,7 +4474,9 @@ sub handler {
&Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=dateshift1&timebase='.$env{'form.timebase'},
text=>"Shifting Dates"});
&date_shift_two($r);
- }
+ } elsif ($env{'form.action'} eq 'categorizecourse' && $parm_permission) {
+ &assign_course_categories($r);
+ }
} else {
# ----------------------------- Not in a course, or not allowed to modify parms
if ($exists) {