--- loncom/interface/loncreatecourse.pm 2017/01/22 19:46:46 1.158.2.3
+++ loncom/interface/loncreatecourse.pm 2016/04/04 01:13:38 1.160
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Create a course
#
-# $Id: loncreatecourse.pm,v 1.158.2.3 2017/01/22 19:46:46 raeburn Exp $
+# $Id: loncreatecourse.pm,v 1.160 2016/04/04 01:13:38 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -91,6 +91,8 @@ sub print_course_creation_page {
my $crstype = 'Community';
if ($env{'form.phase'} eq 'courseone') {
$crstype = 'Course';
+ } elsif ($env{'form.phase'} eq 'placementone') {
+ $crstype = 'Placement';
}
my $defdom=$env{'request.role.domain'};
my %domdefaults = &Apache::lonnet::get_domain_defaults($defdom);
@@ -130,7 +132,7 @@ sub print_course_creation_page {
$krbform = &Apache::loncommon::authform_kerberos(%param);
$intform = &Apache::loncommon::authform_internal(%param);
$locform = &Apache::loncommon::authform_local(%param);
- } else {
+ } elsif ($crstype eq 'Community') {
my $title_alert = &mt('A Community title is required');
my $coord_alert = &mt('The username of the Coordinator is required');
&js_escape(\$title_alert);
@@ -147,6 +149,24 @@ function validate(formname) {
formname.submit();
}
|;
+ } else {
+ my $title_alert = &mt('A Placement Test title is required');
+ my $coord_alert = &mt('The username of the Course Coordinator is required');
+ &js_escape(\$title_alert);
+ &js_escape(\$coord_alert);
+ $javascript_validations = qq|
+function validate(formname) {
+ if (formname.title == '') {
+ alert("$title_alert");
+ return;
+ }
+ if (formname.ccuname == '') {
+ alert("$coord_alert");
+ }
+ formname.submit();
+}
+ |;
+
}
my %lt=&Apache::lonlocal::texthash(
'cinf' => "Course Information",
@@ -187,8 +207,7 @@ function validate(formname) {
'oaas' => "Open all assessments",
'mssg' => "Messaging",
'scpf' => "Set course policy feedback to Course Coordinator",
- 'scfc' => "Set resource content feedback to Course Coordinator",
- 'scof' => "Set course content feedback to Course Coordinator",
+ 'scfc' => "Set content feedback to Course Coordinator",
'cmmn' => "Communication",
'dsrd' => "Disable student resource discussion",
'dsuc' => "Disable student use of chat rooms",
@@ -234,8 +253,7 @@ function validate(formname) {
$lt{'navi'} = &mt('Community Contents');
$lt{'cid'} = &mt('Community ID');
$lt{'scpf'} = &mt('Set community policy feedback to Coordinator');
- $lt{'scfc'} = &mt('Set resource content feedback to Coordinator');
- $lt{'scof'} = &mt('Set community content feedback to Coordinator');
+ $lt{'scfc'} = &mt('Set content feedback to Coordinator');
$lt{'dsrd'} = &mt('Disable member resource discussion');
$lt{'dsuc'} = &mt('Disable member use of chat rooms');
$lt{'dads'} = &mt('Default Access Dates for Members');
@@ -246,6 +264,18 @@ function validate(formname) {
$lt{'cc'} = &mt('(will be assigned Coordinator role)');
$lt{'cgrs'} = &mt('Community Group Settings');
$lt{'cgrq'} = &mt('Set a quota for the total disk space available for storage of community group portfolio files');
+ } elsif ($crstype eq 'Placement') {
+ $lt{'cinf'} = &mt('Placement Test Information');
+ $lt{'ctit'} = &mt('Placement Test Title');
+ $lt{'chsr'} = &mt('Placement Test Home Server');
+ $lt{'cidn'} = &mt('Placement Test ID/Number');
+ $lt{'crco'} = &mt('Placement Test Content');
+ $lt{'cncr'} = &mt('Completely new placement test');
+ $lt{'cecr'} = &mt('Clone an existing placement test');
+ $lt{'sacr'} = &mt('Do NOT generate as standard placement test');
+ $lt{'stco'} = &mt('standard placement tests only');
+ $lt{'navi'} = &mt('Placement Test Contents');
+ $lt{'cid'} = &mt('Placement Test ID');
}
my $js = <<END;
<script type="text/javascript">
@@ -274,6 +304,7 @@ END
my %titles = &Apache::lonlocal::texthash(
courseone => 'Create a New Course',
groupone => 'Create a New Community',
+ placementone=> 'Create a New Placement Test',
);
my $start_page =
&Apache::loncommon::start_page($titles{$env{'form.phase'}},$js);
@@ -353,7 +384,11 @@ END
.'<input type="radio" name="uniquecode" value="1" />'.&mt('Yes').(' 'x2)
.'<input type="radio" name="uniquecode" value="0" checked="checked" />'.&mt('No')
.&Apache::lonhtmlcommon::row_closure()
- );
+ );
+ }
+ my $blankchk;
+ if ($crstype eq 'Placement') {
+ $blankchk = ' checked="checked"';
}
# Table: New Course / Clone Course
$r->print(&Apache::lonhtmlcommon::row_headline()
@@ -379,15 +414,14 @@ END
.&Apache::lonhtmlcommon::row_closure()
.&Apache::lonhtmlcommon::row_title($lt{'fres'})
.'<label>'
- .'<input type="radio" name="firstres" value="blank" />'.$lt{'blnk'}
- .'</label>'
- .' ');
+ .'<input type="radio" name="firstres" value="blank"'.$blankchk.' />'.$lt{'blnk'}
+ .'</label>');
if ($crstype eq 'Community') {
- $r->print('<label>'
+ $r->print(' <label>'
.'<input type="radio" name="firstres" value="nav" checked="checked" />'.$lt{'navi'}
.'</label>');
- } else {
- $r->print('<label>'
+ } elsif ($crstype eq 'Course') {
+ $r->print(' <label>'
.'<input type="radio" name="firstres" value="syl" checked="checked" />'.$lt{'sllb'}
.'</label>'
.' '
@@ -464,10 +498,6 @@ END
.'<input type="checkbox" name="setcontent" checked="checked" />'
.&Apache::lonhtmlcommon::row_closure()
- .&Apache::lonhtmlcommon::row_title($lt{'scof'})
- .'<input type="checkbox" name="setcomment" checked="checked" />'
- .&Apache::lonhtmlcommon::row_closure()
-
.&Apache::lonhtmlcommon::row_headline()
.'<h3>'.$lt{'cmmn'}.'</h3>'
.&Apache::lonhtmlcommon::row_closure()
@@ -573,6 +603,14 @@ END
<input type="submit" value="'.$lt{'opcm'}.'" />
</p>'
);
+ } elsif ($crstype eq 'Placement') {
+ $r->print('
+<p>
+<input type="hidden" name="prevphase" value="placementone" />
+<input type="hidden" name="phase" value="placementtwo" />
+<input type="submit" value="'.$lt{'opcm'}.'" />
+</p>'
+ );
}
$r->print('</form>'.
$end_page);
@@ -593,6 +631,8 @@ sub create_course {
$crstype='Course';
$enrollstart=&Apache::lonhtmlcommon::get_date_from_form('startenroll');
$enrollend=&Apache::lonhtmlcommon::get_date_from_form('endenroll');
+ } elsif ($env{'form.phase'} eq 'placementtwo') {
+ $crstype='Placement';
}
$startaccess = &Apache::lonhtmlcommon::get_date_from_form('startaccess');
$endaccess = &Apache::lonhtmlcommon::get_date_from_form('endaccess');
@@ -654,7 +694,6 @@ sub create_course {
endaccess => $endaccess,
setpolicy => $env{'form.setpolicy'},
setcontent => $env{'form.setcontent'},
- setcomment => $env{'form.setcomment'},
reshome => $env{'form.reshome'},
setkeys => $env{'form.setkeys'},
keyauth => $env{'form.keyauth'},
@@ -741,19 +780,15 @@ sub create_course {
}
sub print_intro_page {
- my ($r,$show_all_choices,$cancreate,$permission) = @_;
+ my ($r,$show_all_choices,$cancreate) = @_;
my $start_page =
- &Apache::loncommon::start_page('Create a New Course or Community');
+ &Apache::loncommon::start_page('Create a New Course, Community or Placement Test');
my $crumbs = &Apache::lonhtmlcommon::breadcrumbs('Creation Options','Create_Course',undef,'Create_Courses');
my $end_page =
&Apache::loncommon::end_page();
my $helplink=&Apache::loncommon::help_open_topic('Create_Course_Community',&mt('Help on Creating Courses and Communities'));
# Create menu
- my $approve = 'Display requests awaiting approval';
- if ($permission->{'create'}) {
- $approve = 'Approve or reject requests';
- }
my @menu;
@menu =
({ categorytitle => 'Course/Community Creation',
@@ -761,7 +796,7 @@ sub print_intro_page {
{
linktext => 'Create a single course',
url => '/adm/createcourse?phase=courseone',
- permission => $permission->{'create'},
+ permission => 1,
#help => '',
icon => 'crsnew.png',
linktitle => 'Create a new course by completing an online form.'
@@ -769,30 +804,38 @@ sub print_intro_page {
{
linktext => 'Create a single community',
url => '/adm/createcourse?phase=groupone',
- permission => $permission->{'create'} && $cancreate->{'Community'},
+ permission => $cancreate->{'Community'},
#help => '',
icon => 'crsnew.png',
linktitle => 'Create a new collaborative community by completing an online form.'
},
{
- linktext => 'Create courses/communities by uploading an attributes file',
+ linktext => 'Create a single placement test',
+ url => '/adm/createcourse?phase=placementone',
+ permission => $cancreate->{'Placement'},
+ #help => '',
+ icon => 'crsnew.png',
+ linktitle => 'Create a new placement test by completing an online form.'
+ },
+ {
+ linktext => 'Create courses/communities/placement tests by uploading an attributes file',
url => '/adm/createcourse?phase=batchone',
- permission => $permission->{'create'},
+ permission => 1,
help => 'Batch_Creation',
icon => 'uplcrs.png',
- linktitle => 'Upload an attributes file containing specifications for one or more courses or communities in XML format.'
+ linktitle => 'Upload an attributes file containing specifications for one or more courses, communities or placement tests in XML format.'
},
]
},
{ categorytitle => 'Course/Community Requests',
items => [
{
- linktext => $approve,
+ linktext => 'Approve or reject requests',
url => '/adm/createcourse?phase=requestdisplay',
permission => $show_all_choices,
#help => '',
icon => 'rcrs.png',
- linktitle => 'Display course and community creation requests submitted by authorized users, held pending approval by a Domain Coordinator.'
+ linktitle => 'Display course, community creation and placement test requests submitted by authorized users, held pending approval by a Domain Coordinator.'
},
{
linktext => 'View pending official course requests',
@@ -813,7 +856,7 @@ sub print_intro_page {
permission => $show_all_choices,
#help => '',
icon => 'document-properties.png',
- linktitle => 'Display information about when, how and by whom courses and communities were created in this domain.'
+ linktitle => 'Display information about when, how and by whom courses, communities and placement tests were created in this domain.'
},
]
},
@@ -830,18 +873,18 @@ sub print_intro_page {
sub upload_batchfile {
my $r = shift;
my $start_page =
- &Apache::loncommon::start_page('Create a New Course or Community');
- my $crumbs = &Apache::lonhtmlcommon::breadcrumbs('Upload Course/Community Attributes File','Create_Course',undef,'Create_Courses');
+ &Apache::loncommon::start_page('Create a New Course, Community, or Placement Test');
+ my $crumbs = &Apache::lonhtmlcommon::breadcrumbs('Upload Course/Community/Placement Test Attributes File','Create_Course',undef,'Create_Courses');
my $end_page =
&Apache::loncommon::end_page();
$r->print($start_page.$crumbs);
- $r->print('<h3>'.&mt('Upload a courses or communities attributes file').'</h3>');
+ $r->print('<h3>'.&mt('Upload a courses, communities or placement tests attributes file').'</h3>');
$r->print('<form name="batchcreate" method="post" '.
'enctype="multipart/form-data" action="/adm/createcourse">'.
'<input type="file" name="coursecreatorxml" />'.
'<input type="hidden" name="phase" value="batchtwo" /><br /><br />'.
'<input type="submit" name="batchsubmit" '.
- 'value="'.&mt('Create Courses/Communities').'" /></form>');
+ 'value="'.&mt('Create Courses/Communities/Placement Tests').'" /></form>');
$r->print($end_page);
return;
}
@@ -849,7 +892,7 @@ sub upload_batchfile {
sub process_batchfile {
my $r = shift;
my $start_page =
- &Apache::loncommon::start_page('Create a New Course or Community');
+ &Apache::loncommon::start_page('Create a New Course, Community or Placement Test');
my $crumbs = &Apache::lonhtmlcommon::breadcrumbs('Creation Outcome','Create_Course',undef,'Create_Courses');
my $end_page =
&Apache::loncommon::end_page();
@@ -968,6 +1011,8 @@ sub print_creation_logs {
$crstype = '.';
} elsif ($curr{'type'} eq 'community') {
$crstype = 'Community';
+ } elsif ($curr{'type'} eq 'placement') {
+ $crstype = 'Placement';
}
my ($instcodefilter,$regexpok);
@@ -1058,6 +1103,8 @@ sub print_creation_logs {
my $showtype;
if ($courses{$cid}{type} eq 'Community') {
$showtype = &mt('community');
+ } elsif ($courses{$cid}{type} eq 'Placement') {
+ $showtype = &mt('placement test');
} else {
my $instcode = $courses{$cid}{inst_code};
if ($instcode ne '') {
@@ -1258,20 +1305,6 @@ ENDJS
}
-sub get_permission {
- my ($dom) = @_;
- my ($allowed,%permission);
- if (&Apache::lonnet::allowed('ccc',$dom)) {
- $allowed = 1;
- %permission = (
- create => 1,
- );
- } elsif (&Apache::lonnet::allowed('dcc',$dom)) {
- $allowed = 1;
- }
- return ($allowed,\%permission);
-}
-
# ===================================================================== Handler
sub handler {
my $r = shift;
@@ -1282,27 +1315,28 @@ sub handler {
return OK;
}
- my ($allowed,$permission) = &get_permission($env{'request.role.domain'});
- if ($allowed) {
- my $show_all_choices = 0;
- my $primary_rev = &Apache::lonnet::get_server_loncaparev($env{'request.role.domain'});
- my %cancreate = (
- Community => 0,
- );
- if (($primary_rev ne 'refused') && ($primary_rev ne 'error') &&
- ($primary_rev ne 'unknown_cmd') && ($primary_rev ne 'no_such_host')) {
- $show_all_choices = 1;
- my ($primary_major,$primary_minor) = split(/\./,$primary_rev);
- foreach my $key (keys(%cancreate)) {
- my ($needsmajor,$needsminor) =
- split(/\./,$Apache::lonnet::needsrelease{'course:crstype:'.$key});
- unless (($needsmajor > $primary_major) ||
- (($needsmajor == $primary_major) && ($needsminor > $primary_minor))) {
- $cancreate{$key} = 1;
- }
+ my $show_all_choices = 0;
+ my $primary_rev = &Apache::lonnet::get_server_loncaparev($env{'request.role.domain'});
+ my %cancreate = (
+ Community => 0,
+ Placement => 0,
+ );
+
+ if (($primary_rev ne 'refused') && ($primary_rev ne 'error') &&
+ ($primary_rev ne 'unknown_cmd') && ($primary_rev ne 'no_such_host')) {
+ $show_all_choices = 1;
+ my ($primary_major,$primary_minor) = split(/\./,$primary_rev);
+ foreach my $key (keys(%cancreate)) {
+ my ($needsmajor,$needsminor) =
+ split(/\./,$Apache::lonnet::needsrelease{'course:crstype:'.$key});
+ unless (($needsmajor > $primary_major) ||
+ (($needsmajor == $primary_major) && ($needsminor > $primary_minor))) {
+ $cancreate{$key} = 1;
}
}
+ }
+ if (&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) {
&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
@@ -1313,10 +1347,11 @@ sub handler {
({href=>"/adm/createcourse",
text=>"Creation Options",
faq=>79,bug=>'Dom Coord Interface',});
- if (($permission->{'create'}) &&
- (($env{'form.phase'} eq 'coursetwo') ||
- (($env{'form.phase'} eq 'grouptwo') &&
- ($cancreate{'Community'})))) {
+ if (($env{'form.phase'} eq 'coursetwo') ||
+ (($env{'form.phase'} eq 'grouptwo') &&
+ ($cancreate{'Community'})) ||
+ (($env{'form.phase'} eq 'placementtwo') &&
+ ($cancreate{'Placement'}))) {
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"/adm/createcourse?phase=$env{'form.prevphase'}",
text=>&mt('[_1] Creation Settings',),
@@ -1326,24 +1361,23 @@ sub handler {
text=>"Creation Outcome",
faq=>9,bug=>'Dom Coord Interface',});
&create_course($r);
- } elsif (($permission->{'create'}) &&
- (($env{'form.phase'} eq 'courseone') ||
- (($env{'form.phase'} eq 'groupone') &&
- ($cancreate{'Community'})))) {
+ } elsif (($env{'form.phase'} eq 'courseone') ||
+ (($env{'form.phase'} eq 'groupone') &&
+ ($cancreate{'Community'})) ||
+ (($env{'form.phase'} eq 'placementone') &&
+ ($cancreate{'Placement'}))) {
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"/adm/createcourse?phase=$env{'form.phase'}",
text=>&mt('[_1] Creation Settings',),
faq=>9,bug=>'Dom Coord Interface',});
&print_course_creation_page($r);
- } elsif (($permission->{'create'}) &&
- ($env{'form.phase'} eq 'batchone')) {
+ } elsif ($env{'form.phase'} eq 'batchone') {
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"/adm/createcourse?phase=$env{'form.phase'}",
text=>"Upload Description File",
faq=>9,bug=>'Dom Coord Interface',});
&upload_batchfile($r);
- } elsif (($permission->{'create'}) &&
- ($env{'form.phase'} eq 'batchtwo')) {
+ } elsif ($env{'form.phase'} eq 'batchtwo') {
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"/adm/createcourse?phase=$env{'form.prevphase'}",
text=>"Upload Description File",
@@ -1361,16 +1395,11 @@ sub handler {
my $js = &courserequestbrowser_javascript();
my $start_page=&Apache::loncommon::start_page('Display Requests',$js);
my $crumbs = &Apache::lonhtmlcommon::breadcrumbs('Display Requests','Course_Requests',undef,'Course_Requests');
- my $context = 'domain';
- unless ($permission->{'create'}) {
- $context = 'helpdesk';
- }
$r->print($start_page.$crumbs."\n".'<div>'.
&Apache::loncoursequeueadmin::display_queued_requests(
- $context,$env{'request.role.domain'}).'</div>'.
+ 'domain',$env{'request.role.domain'}).'</div>'.
&Apache::loncommon::end_page());
- } elsif (($permission->{'create'}) &&
- ($env{'form.phase'} eq 'requestchange') && ($show_all_choices)) {
+ } elsif (($env{'form.phase'} eq 'requestchange') && ($show_all_choices)) {
if ($env{'form.queue'} eq 'pending') {
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"/adm/createcourse?phase=pendingdisplay",
@@ -1400,16 +1429,11 @@ sub handler {
my $js = &courserequestbrowser_javascript();
my $start_page=&Apache::loncommon::start_page('Display Pending Queue',$js);
my $crumbs = &Apache::lonhtmlcommon::breadcrumbs('Display Pending Queue','Course_Requests',undef,'Course_Requests');
- my $context = 'pending';
- unless ($permission->{'create'}) {
- $context = 'displaypending';
- }
$r->print($start_page.$crumbs."\n".'<div>'.
&Apache::loncoursequeueadmin::display_queued_requests(
- $context,$env{'request.role.domain'}).'</div>'.
+ 'pending',$env{'request.role.domain'}).'</div>'.
&Apache::loncommon::end_page());
- } elsif (($permission->{'create'}) &&
- ($env{'form.phase'} eq 'requestvalidation') && ($show_all_choices)) {
+ } elsif (($env{'form.phase'} eq 'requestvalidation') && ($show_all_choices)) {
my $js = &courserequestbrowser_javascript();
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"/adm/createcourse?phase=pendingdisplay",
@@ -1436,7 +1460,7 @@ sub handler {
&print_creation_logs($r);
$r->print('</div>'.&Apache::loncommon::end_page());
} else {
- &print_intro_page($r,$show_all_choices,\%cancreate,$permission);
+ &print_intro_page($r,$show_all_choices,\%cancreate);
}
} else {
$env{'user.error.msg'}=