'.
- &mt('The chosen course category [_1] is valid.',''.
- $instcode.' ').'
';
- } else {
- $message = ''.
- &mt('No course was found matching your choice of institutional course category.');
- if ($code_chk ne '') {
- $message .= '
';
- }
+ if ($checkedcode) {
+ if ($codechk eq 'valid') {
+ $message = ''.
- &mt('No course was found matching your choice of institutional course category.');
- }
- unless ($code_chk eq 'ok') {
+ &mt('No course was found matching your choice of institutional course category.');
+ if ($codechk ne '') {
+ $message .= '
';
$prev = 'crstype';
}
$r->print($message);
@@ -808,53 +1274,229 @@ sub print_request_form {
$codepicker = &coursecode_form($dom,'instcode',\@codetitles,
\%cat_titles,\%cat_order);
if ($codepicker) {
- $r->print(''.&Apache::lonhtmlcommon::start_pick_box().$codepicker.
+ $r->print(&mt('Specify the course to be created.').
+ '
'.&Apache::lonhtmlcommon::start_pick_box().
+ $codepicker.
&Apache::lonhtmlcommon::end_pick_box().'
');
} else {
+ $next = $states->{$action}[$page+2];
$r->print(&courseinfo_form($dom,$formname,$crstype,$next));
}
} else {
+ if ($crstype eq 'official') {
+ $next = $states->{$action}[$page+2];
+ }
$r->print(&courseinfo_form($dom,$formname,$crstype,$next));
}
} elsif ($prev eq 'codepick') {
- $r->print(&courseinfo_form($dom,$formname,$crstype,$next));
+ if ($instcode eq '') {
+ $prev = $states->{$action}[$page-2];
+ }
+ $r->print(&courseinfo_form($dom,$formname,$crstype,$next,$description));
} elsif ($state eq 'enrollment') {
if ($crstype eq 'official') {
&Apache::lonnet::auto_possible_instcodes($dom,\@codetitles,\%cat_titles,
\%cat_order,\@code_order);
}
$r->print(&print_enrollment_menu($formname,$instcode,$dom,\@codetitles,
- \%cat_titles,\%cat_order,\@code_order));
+ \%cat_titles,\%cat_order,\@code_order,
+ $invalidcrosslist));
} elsif ($state eq 'personnel') {
- $r->print(&print_personnel_menu($dom,$formname,$crstype));
+ $r->print(&print_personnel_menu($dom,$formname,$crstype,$invalidcrosslist));
} elsif ($state eq 'review') {
+ my (%alerts,%rulematch,%inst_results,%curr_rules,%got_rules,%disallowmsg);
+ my $now = time;
+ for (my $i=0; $i<$env{'form.persontotal'}; $i++) {
+ my $personname = $env{'form.person_'.$i.'_uname'};
+ my $persondom = $env{'form.person_'.$i.'_dom'};
+ if (($personname =~ /^$match_username$/) &&
+ ($persondom =~ /^$match_domain$/)) {
+ if (&Apache::lonnet::domain($persondom)) {
+ my $personhome =
+ &Apache::lonnet::homeserver($personname,$persondom);
+ if ($personhome eq 'no_host') {
+ if ($persondom ne $dom) {
+ my $skipuser = 1;
+ if ($env{'user.role.dc./'.$persondom.'/'}) {
+ my ($start,$end) = split('.',$env{'user.role.dc./'.$persondom.'/'});
+ if (((!$start) || ($start < $now)) &&
+ ((!$end) || ($end > $now))) {
+ $skipuser = 0;
+ }
+ }
+ if ($skipuser) {
+ push(@disallowed,$i);
+ $disallowmsg{$i} = &mt('[_1] was excluded because new users need be from the course domain','
'.$personname.':'.$persondom.' ');
+ next;
+ }
+ }
+ if (&get_cancreate_status($persondom,$personname,$dom)) {
+ my ($allowed,$msg) =
+ &check_newuser_rules($persondom,$personname,
+ \%alerts,\%rulematch,\%inst_results,
+ \%curr_rules,\%got_rules);
+ if ($allowed) {
+ if (ref($inst_results{$personname.':'.$persondom}) eq 'HASH') {
+ if ($inst_results{$personname.':'.$persondom}{'lastname'} ne '') {
+ $env{'form.person_'.$i.'_lastname'} = $inst_results{$personname.':'.$persondom}{'lastname'};
+ }
+ if ($inst_results{$personname.':'.$persondom}{'firstname'} ne '') {
+ $env{'form.person_'.$i.'_firstname'} = $inst_results{$personname.':'.$persondom}{'firstname'};
+ }
+ if ($inst_results{$personname.':'.$persondom}{'permanentemail'} ne '') {
+ $env{'form.person_'.$i.'_emailaddr'} = $inst_results{$personname.':'.$persondom}{'permanentemail'};
+ }
+ }
+ } else {
+ push(@disallowed,$i);
+ $disallowmsg{$i} = &mt('[_1] was excluded because the username violated format rules for the domain','
'.$personname.':'.$persondom.' ');
+ }
+ } else {
+ push(@disallowed,$i);
+ $disallowmsg{$i} = &mt('[_1] was excluded because you may not request new users in the domain','
'.$personname.':'.$persondom.' ');
+ }
+ } else {
+ my %userenv =
+ &Apache::lonnet::userenvironment($persondom,$personname,'lastname','firstname','permanentemail');
+ if ($env{'form.person_'.$i.'_lastname'} eq '') {
+ $env{'form.person_'.$i.'_lastname'} = $userenv{'lastname'};
+ }
+ if ($env{'form.person_'.$i.'_firstname'} eq '') {
+ $env{'form.person_'.$i.'_firstname'} = $userenv{'firstname'};
+ }
+ if ($env{'form.person_'.$i.'_emailaddr'} eq '') {
+ $env{'form.person_'.$i.'_emailaddr'} = $userenv{'permanentemail'};
+ }
+ }
+ } elsif ($personname ne '') {
+ push(@disallowed,$i);
+ $disallowmsg{$i} = &mt('[_1] was excluded because the domain is invalid','
'.$personname.':'.$persondom.' ');
+ }
+ } elsif ($personname ne '') {
+ push(@disallowed,$i);
+ $disallowmsg{$i} = &mt('[_1] was excluded because the username or domain is invalid.','
'.$personname.':'.$persondom.' ');
+ }
+ }
my $cnum;
if ($env{'form.origcnum'} =~ /^($match_courseid)$/) {
$cnum = $env{'form.origcnum'};
} else {
- $cnum = &Apache::lonnet::generate_coursenum($dom);
+ my $gentype = 'Course';
+ if ($crstype eq 'community') {
+ $gentype = 'Community';
+ }
+ $cnum = &Apache::lonnet::generate_coursenum($dom,$gentype);
}
&Apache::lonnet::auto_possible_instcodes($dom,\@codetitles,\%cat_titles,
\%cat_order,\@code_order);
- $r->print('
'.&mt('Review the details of the course request before submission.').'
'.
- &print_review($formname,$dom,\@codetitles,\%cat_titles,\%cat_order,
- \@code_order).
+ if ($crstype eq 'community') {
+ $r->print('
'.&mt('Review community request details before submission').' ');
+ } else {
+ $r->print('
'.&mt('Review course request details before submission').' ');
+ }
+ $r->print(&print_review($dom,\@codetitles,\%cat_titles,\%cat_order,\@code_order,'','',\@disallowed,\%disallowmsg).
'
');
- $navtxt{'next'} = &mt('Submit course request');
+ if ($crstype eq 'community') {
+ $navtxt{'next'} = &mt('Submit community request');
+ } else {
+ $navtxt{'next'} = &mt('Submit course request');
+ }
} elsif ($state eq 'process') {
if ($crstype eq 'official') {
&Apache::lonnet::auto_possible_instcodes($dom,\@codetitles,\%cat_titles,
\%cat_order,\@code_order);
}
- my $result = &print_request_outcome($dom,\@codetitles,\@code_order);
+ my ($storeresult,$result) = &print_request_outcome($dom,\@codetitles,
+ \@code_order);
$r->print($result);
+ if (($storeresult eq 'ok') || ($storeresult eq 'created')) {
+ $r->print('
');
+ if ($storeresult eq 'ok') {
+ $r->print(''.
+ &mt('Modify this request').' '.(' 'x4));
+ }
+ $r->print(''.&mt('Make another request').'
');
+ return;
+ }
}
my @excluded = &get_excluded_elements($dom,$states,$action,$state);
+ if ($state eq 'personnel') {
+ push(@excluded,'persontotal');
+ }
+ if ($state eq 'review') {
+ if (@disallowed > 0) {
+ my @items = qw(uname dom lastname firstname emailaddr hidedom role newsec);
+ my @currsecs = ¤t_lc_sections();
+ if (@currsecs) {
+ push(@items,'sec');
+ }
+ my $count = 0;
+ for (my $i=0; $i<$env{'form.persontotal'}; $i++) {
+ unless ($env{'form.person_'.$i.'_uname'} eq '') {
+ if (grep(/^$i$/,@disallowed)) {
+ foreach my $item (@items) {
+ $env{'form.person_'.$i.'_'.$item} = '';
+ }
+ } else {
+ foreach my $item (@items) {
+ $env{'form.person_'.$count.'_'.$item} = $env{'form.person_'.$i.'_'.$item};
+ }
+ }
+ }
+ $count ++;
+ }
+ $env{'form.persontotal'} = $count;
+
+ }
+ }
+ if ($state eq 'enrollment') {
+ push(@excluded,'crosslisttotal');
+ }
$r->print(&Apache::lonhtmlcommon::echo_form_input(\@excluded).'');
- &display_navbuttons($r,$formname,$prev,$navtxt{'prev'},$next,$navtxt{'next'},$state);
+ &display_navbuttons($r,$dom,$formname,$prev,$navtxt{'prev'},$next,
+ $navtxt{'next'},$state);
return;
}
+sub get_cancreate_status {
+ my ($persondom,$personname,$dom) = @_;
+ my ($rules,$ruleorder) =
+ &Apache::lonnet::inst_userrules($persondom,'username');
+ my $usertype = &Apache::lonuserutils::check_usertype($persondom,$personname,
+ $rules);
+ return &Apache::lonuserutils::can_create_user($dom,'requestcrs',$usertype);
+}
+
+sub check_newuser_rules {
+ my ($persondom,$personname,$alerts,$rulematch,$inst_results,$curr_rules,
+ $got_rules) = @_;
+ my $allowed = 1;
+ my $newuser = 1;
+ my ($checkhash,$userchkmsg);
+ my $checks = { 'username' => 1 };
+ $checkhash->{$personname.':'.$persondom} = { 'newuser' => $newuser };
+ &Apache::loncommon::user_rule_check($checkhash,$checks,$alerts,$rulematch,
+ $inst_results,$curr_rules,$got_rules);
+ if (ref($alerts->{'username'}) eq 'HASH') {
+ if (ref($alerts->{'username'}{$persondom}) eq 'HASH') {
+ my $domdesc =
+ &Apache::lonnet::domain($persondom,'description');
+ if ($alerts->{'username'}{$persondom}{$personname}) {
+ if (ref($curr_rules->{$persondom}) eq 'HASH') {
+ $userchkmsg =
+ &Apache::loncommon::instrule_disallow_msg('username',
+ $domdesc,1).
+ &Apache::loncommon::user_rule_formats($persondom,
+ $domdesc,$curr_rules->{$persondom}{'username'},
+ 'username');
+ }
+ $allowed = 0;
+ }
+ }
+ }
+ return ($allowed,$userchkmsg);
+}
+
sub get_excluded_elements {
my ($dom,$states,$action,$state) = @_;
my @excluded = ('counter');
@@ -884,8 +1526,9 @@ sub get_excluded_elements {
}
sub print_enrollment_menu {
- my ($formname,$instcode,$dom,$codetitles,$cat_titles,$cat_order,$code_order) =@_;
- my ($sections,$autoenroll,$access_dates);
+ my ($formname,$instcode,$dom,$codetitles,$cat_titles,$cat_order,$code_order,
+ $invalidcrosslist) =@_;
+ my ($sections,$autoenroll,$access_dates,$output,$hasauto);
my $starttime = time;
my $endtime = time+(6*30*24*60*60); # 6 months from now, approx
@@ -899,10 +1542,18 @@ sub print_enrollment_menu {
);
if ($env{'form.crstype'} eq 'official') {
if (&Apache::lonnet::auto_run('',$dom)) {
- my ($section_form,$crosslist_form,$autoenroll_form);
+ $output = &show_invalid_crosslists($invalidcrosslist);
+ my ($section_form,$crosslist_form);
$section_form = &inst_section_selector($dom,$instcode);
+ if ($section_form) {
+ $sections = &Apache::lonhtmlcommon::row_headline().
+ '
'.&Apache::loncommon::help_open_topic('Course_Request_Sections').
+ ' '.&mt('Sections for auto-enrollment').' '.
+ &Apache::lonhtmlcommon::row_closure(1).
+ $section_form;
+ }
my $crosslisttotal = $env{'form.crosslisttotal'};
- if (!defined($crosslisttotal)) {
+ if (!$crosslisttotal) {
$crosslisttotal = 1;
}
if ($env{'form.addcrosslist'}) {
@@ -914,70 +1565,109 @@ sub print_enrollment_menu {
}
if ($crosslist_form) {
$crosslist_form .=
- &Apache::lonhtmlcommon::row_title(&mt('Add another?')).
+ &Apache::lonhtmlcommon::row_title(&mt('Add another')).
'
'.
'
'.&mt('Add?').&Apache::lonhtmlcommon::row_closure(1);
- }
- if ($section_form || $crosslist_form) {
- $sections = '
'.&Apache::lonhtmlcommon::start_pick_box().
- $section_form.$crosslist_form.
- &Apache::lonhtmlcommon::end_pick_box().'
'."\n";
- }
- $autoenroll_form =
- &Apache::lonhtmlcommon::row_title(&mt('Add registered students automatically')).
+ "'".');" />'.&mt('Add?').&Apache::lonhtmlcommon::row_closure();
+ $sections .= &Apache::lonhtmlcommon::row_headline.
+ '
'.&mt('Crosslisted courses for auto-enrollment').' '.
+ &Apache::lonhtmlcommon::row_closure(1).
+ $crosslist_form;
+ }
+ $hasauto = 1;
+ $autoenroll =
+ &Apache::lonhtmlcommon::row_title(&Apache::loncommon::help_open_topic('Course_Request_Autoadd').' '.&mt('Add registered students automatically')).
'
'.
' '.(' 'x3).''.
' '.
- &Apache::lonhtmlcommon::row_closure().
- &Apache::lonhtmlcommon::row_title(&mt('Drop unregistered students automatically')).
+ &Apache::lonhtmlcommon::row_closure(1).
+ &Apache::lonhtmlcommon::row_title(&Apache::loncommon::help_open_topic('Course_Request_Autodrop').' '.&mt('Drop unregistered students automatically')).
'
'.
' '.(' 'x3).''.
' '.
- &Apache::lonhtmlcommon::row_closure().
- &date_setting_table($starttime,$endtime,$formname,'enroll',%enrolltitles);
- if ($autoenroll_form) {
- $autoenroll = '
'.&Apache::lonhtmlcommon::start_pick_box().
- $autoenroll_form.
- &Apache::lonhtmlcommon::end_pick_box().'
'."\n";
+ &Apache::lonhtmlcommon::row_closure(1).
+ &date_setting_table($starttime,$endtime,$formname,'enroll',
+ $hasauto,%enrolltitles);
+ }
+ }
+ my $access_dates =
+ &date_setting_table($starttime,$endtime,$formname,'access',$hasauto,
+ %accesstitles);
+ $output .= &Apache::lonhtmlcommon::start_pick_box();
+ if ($sections) {
+ $output .= $sections;
+ }
+ if ($autoenroll) {
+ $output .= &Apache::lonhtmlcommon::row_headline('Auto-enroll').
+ '
'.&mt('Auto-enrollment settings').' '.
+ &Apache::lonhtmlcommon::row_closure(1).
+ $autoenroll;
+ }
+ if ($access_dates) {
+ my $header = &mt('Access dates for students');
+ if ($env{'form.crstype'} eq 'community') {
+ $header = &mt('Access dates for community members');
+ }
+ $output .= &Apache::lonhtmlcommon::row_headline('Access').
+ '
'.$header.' '.
+ &Apache::lonhtmlcommon::row_closure(1).
+ $access_dates
+ }
+ return '
'.&Apache::lonhtmlcommon::start_pick_box().$output.
+ &Apache::lonhtmlcommon::end_pick_box().'
';
+}
+
+sub show_invalid_crosslists {
+ my ($invalidcrosslist) = @_;
+ my $output;
+ if (ref($invalidcrosslist) eq 'ARRAY') {
+ if (@{$invalidcrosslist} > 0) {
+ $output = '
'.
+ &mt('The following crosslisted courses were invalid:').'
';
+ foreach my $item (@{$invalidcrosslist}) {
+ $output .= ''.$item.' ';
}
+ $output .= ' ';
}
}
- my $access_dates_form =
- &date_setting_table($starttime,$endtime,$formname,'access',%accesstitles);
- if ($access_dates_form) {
- $access_dates = '
'.&Apache::lonhtmlcommon::start_pick_box().
- $access_dates_form.
- &Apache::lonhtmlcommon::end_pick_box().'
'."\n";
- }
- return $sections.$autoenroll.$access_dates;
+ return $output;
}
+
sub inst_section_selector {
my ($dom,$instcode) = @_;
my @sections = &Apache::lonnet::auto_get_sections(undef,$dom,$instcode);
my $sectotal = scalar(@sections);
my $output;
if ($sectotal) {
- $output .= &Apache::lonhtmlcommon::row_title('Sections').
+ $output .= &Apache::lonhtmlcommon::row_title(&mt('Sections of [_1]',$instcode)).
&Apache::loncommon::start_data_table().
&Apache::loncommon::start_data_table_row().
'
'.&mt('Include?').' '.
'
'.&mt('Institutional Section').' '.
- '
'.&mt('LON-CAPA section').' '.
+ '
'.&Apache::loncommon::help_open_topic('Course_Request_LCSection').
+ ' '.&mt('LON-CAPA section').' '.
&Apache::loncommon::end_data_table_row();
for (my $i=0; $i<@sections; $i++) {
my $colflag = $i%2;
+ my $secon = ' checked="checked"';
+ my $secoff = '';
+ if ($env{'form.origcnum'}) {
+ $secoff = $secon;
+ $secon='';
+ }
$output .= &Apache::loncommon::start_data_table_row().
- '
'.
- '
'.$sections[$i].
+ ' '.
+ '
'.$sections[$i].
' '.
'
'.
' ';
+ $closure = '1';
+ }
+
+ my %help_item = (
+ access => {
+ start => 'Course_Request_Access_Start',
+ end => 'Course_Request_Access_End',
+ },
+ enroll => {
+ start => 'Course_Request_Enroll_Start',
+ end => 'Course_Request_Enroll_End',
+ },
+ );
+ if ($hasauto) {
+ $help_item{'access'}{'start'} = 'Course_Request_RegAccess_Start';
+ $help_item{'access'}{'end'} = 'Course_Request_RegAccess_End';
}
- $table = &Apache::lonhtmlcommon::row_title($datetitles{'start'}).
- $startform.
- &Apache::lonhtmlcommon::row_closure().
- &Apache::lonhtmlcommon::row_title($datetitles{'end'}).
- $endform.$perpetual.
- &Apache::lonhtmlcommon::row_closure(1);
+
+ $table = &Apache::lonhtmlcommon::row_title(&Apache::loncommon::help_open_topic($help_item{$prefix}{'start'}).
+ ' '.&mt($datetitles{'start'})).$startform.
+ &Apache::lonhtmlcommon::row_closure(1).
+ &Apache::lonhtmlcommon::row_title(&Apache::loncommon::help_open_topic($help_item{$prefix}{'end'}).
+ ' '.&mt($datetitles{'end'})).$endform.$perpetual.
+ &Apache::lonhtmlcommon::row_closure($closure);
return $table;
}
sub print_personnel_menu {
- my ($dom,$formname,$crstype) = @_;
- my $output = ''.&Apache::lonhtmlcommon::start_pick_box();
+ my ($dom,$formname,$crstype,$invalidcrosslist) = @_;
+ my $output;
+ if ($crstype eq 'official') {
+ if (&Apache::lonnet::auto_run('',$dom)) {
+ $output .= &show_invalid_crosslists($invalidcrosslist);
+ }
+ }
+ $output .= '
'.&Apache::lonhtmlcommon::start_pick_box();
my $persontotal = $env{'form.persontotal'};
if ((!defined($persontotal)) || (!$persontotal)) {
$persontotal = 1;
@@ -1021,39 +1735,27 @@ sub print_personnel_menu {
if ($env{'form.addperson'}) {
$persontotal ++;
}
- my $userlinktxt = &mt('Set User');
my @items = ('uname','dom','lastname','firstname','emailaddr','hidedom');
- my $roleoptions;
- my @roles = &Apache::lonuserutils::roles_by_context('course');
my $type = 'Course';
if ($crstype eq 'community') {
$type = 'Community';
}
+ my $roleoptions;
+ my @roles = &Apache::lonuserutils::roles_by_context('course','',$type);
foreach my $role (@roles) {
- my $plrole=&Apache::lonnet::plaintext($role,$type);
+ my $plrole = &Apache::lonnet::plaintext($role,$type);
$roleoptions .= '
'.$plrole.' '."\n";
}
my %customroles=&Apache::lonuserutils::my_custom_roles();
if (keys(%customroles) > 0) {
foreach my $cust (sort(keys(%customroles))) {
- my $custrole='cr_cr_'.$env{'user.domain'}.
- '_'.$env{'user.name'}.'_'.$cust;
+ my $custrole="cr/$env{'user.domain'}/$env{'user.name'}/$cust";
$roleoptions .= '
'.$cust.' '."\n";
}
}
- my @currsecs;
- if ($env{'form.sectotal'}) {
- for (my $i=0; $i<$env{'form.sectotal'}; $i++) {
- if (defined($env{'form.loncapasec_'.$i})) {
- my $lcsec = $env{'form.loncapasec_'.$i};
- unless (grep(/^\Q$lcsec\E$/,@currsecs)) {
- push(@currsecs,$lcsec);
- }
- }
- }
- }
+ my @currsecs = ¤t_lc_sections();
my ($existtitle,$existops,$existmult,$newtitle,$seccolspan);
if (@currsecs) {
@@ -1074,19 +1776,24 @@ sub print_personnel_menu {
$newtitle = &mt('Other').': ';
}
+ if ($persontotal) {
+ my %lt = &Apache::lonlocal::texthash(
+ community => 'Requestor is automatically assigned Coordinator role.',
+ official => 'Requestor is automatically assigned Course Coordinator role.',
+ );
+ $lt{'unofficial'} = $lt{'official'};
+ $output .= &Apache::lonhtmlcommon::row_headline().
+ '
'.&Apache::loncommon::help_open_topic('Course_Request_Personnel').' '.$lt{$crstype}.' '.&mt('Include other personnel?').' ';
+ }
for (my $i=0; $i<$persontotal; $i++) {
my @linkargs = map { 'person_'.$i.'_'.$_ } (@items);
my $linkargstr = join("','",@linkargs);
- my $userlink = &Apache::loncommon::selectuser_link($formname,@linkargs,$dom,$userlinktxt);
- my $uname_form = '
';
+ my $uname_form = '
';
my $onchange = 'javascript:fix_domain('."'$formname','person_".$i."_dom',".
- "'person_".$i."_hidedom'".');'.
- 'openuserbrowser('."'$formname','$linkargstr','$dom'".');';
+ "'person_".$i."_hidedom','person_".$i."_uname'".');';
my $udom_form = &Apache::loncommon::select_dom_form($dom,'person_'.$i.'_dom','',
1,$onchange).
- '
';
+ '
';
my %form_elems;
foreach my $item (@items) {
next if (($item eq 'dom') || ($item eq 'uname') || ($item eq 'hidedom'));
@@ -1102,89 +1809,163 @@ sub print_personnel_menu {
}
$sectionselector .= $newtitle.
'
'."\n";
+ my $usersrchlinktxt = &mt('Search for user');
+ my $usersrchlink = &Apache::loncommon::selectuser_link($formname,@linkargs,$dom,
+ $usersrchlinktxt);
+ my $userchklinktxt = &mt('Check username');
+ my $userchklink = &Apache::loncommon::selectuser_link($formname,@linkargs,$dom,
+ $userchklinktxt,'checkusername');
$output .=
- &Apache::lonhtmlcommon::row_title(&mt('Additional Personnel').'
'.
- '
'.$userlink.
- ' ').
- '
'.&mt('Username').' '."\n".
- ''.&mt('Domain').' '."\n".
+ &Apache::lonhtmlcommon::row_title(&mt('Additional Personnel')).
+ ''.$usersrchlink.' '.
+ &mt('Username').': '.$uname_form.' '.$userchklink.' '.&mt('Domain').': '.$udom_form.' '.
''.&mt('First Name').' '."\n".
''.&mt('Last Name').' '."\n".
''.&mt('E-mail').' '."\n".
- ''.&mt('Role').' '."\n".
- ''.&mt('Section(s)').''.&Apache::loncommon::help_open_topic('Course_Roles').' '.&mt('Role').' '."\n".
+ ''.
+ &Apache::loncommon::help_open_topic('Course_Request_Rolesection').' '.&mt('LON-CAPA Section(s)').'
'.&Apache::lonhtmlcommon::row_closure();
}
- $output .= &Apache::lonhtmlcommon::row_title(&mt('Add another?')).
+ $output .= &Apache::lonhtmlcommon::row_title(&mt('Add another')).
''.&mt('You may also add users later, once the community has been created, by using the "Manage community users" link, accessible from the "Main Menu".').'
';
+ } else {
+ $output .= ''.&mt('You may also add users later, once the course has been created, by using the "Manage course users" link, accessible from the "Main Menu".').'
';
+ }
return $output;
}
-sub print_request_status {
- my ($dom) = @_;
+sub current_lc_sections {
+ my @currsecs;
+ if ($env{'form.sectotal'}) {
+ for (my $i=0; $i<$env{'form.sectotal'}; $i++) {
+ if ($env{'form.sec_'.$i}) {
+ if (defined($env{'form.loncapasec_'.$i})) {
+ my $lcsec = $env{'form.loncapasec_'.$i};
+ unless (grep(/^\Q$lcsec\E$/,@currsecs)) {
+ push(@currsecs,$lcsec);
+ }
+ }
+ }
+ }
+ }
+ return @currsecs;
+}
+
+sub sorted_request_history {
+ my ($dom,$action,$curr_req) = @_;
+ my ($after,$before,$statusfilter,$crstypefilter);
+ if ($env{'form.status'} ne '') {
+ $statusfilter = $env{'form.status'};
+ }
+ if ($env{'form.crstype'} ne '') {
+ $crstypefilter = $env{'form.crstype'};
+ }
+ if (ref($curr_req) eq 'HASH') {
+ $after = $curr_req->{'requested_after_date'},
+ $before = $curr_req->{'requested_before_date'};
+ $statusfilter = $curr_req->{'status'};
+ $crstypefilter = $curr_req->{'crstype'};
+ }
my %statusinfo = &Apache::lonnet::dump('courserequests',$env{'user.domain'},
$env{'user.name'},'^status:'.$dom);
- my ($output,$formname,%queue_by_date,%typenames);
- if ($env{'form.crstype'} eq 'any') {
- %typenames = &Apache::lonlocal::texthash (
- official => 'Official course',
- unofficial => 'Unofficial course',
- community => 'Community',
- );
- }
+ my %queue_by_date;
+ my ($types,$typenames) = &Apache::loncommon::course_types();
foreach my $key (keys(%statusinfo)) {
- if (($statusinfo{$key} eq 'approval') || ($statusinfo{$key} eq 'pending')) {
- (undef,my($cdom,$cnum)) = split(':',$key);
- next if ($cdom ne $dom);
- my $requestkey = $cdom.'_'.$cnum;
- if ($requestkey =~ /^($match_domain)_($match_courseid)$/) {
- my %history = &Apache::lonnet::restore($requestkey,'courserequests',
- $env{'user.domain'},$env{'user.name'});
- my $entry;
- my $timestamp = $history{'reqtime'};
- my $crstype = $history{'crstype'};
- my $disposition = $history{'disposition'};
+ if ($action eq 'view') {
+ next unless (($statusinfo{$key} eq 'approval') || ($statusinfo{$key} eq 'pending'));
+ } else {
+ next unless (($statusfilter eq 'any') ||
+ ($statusfilter eq $statusinfo{$key}));
+ }
+ (undef,my($cdom,$cnum)) = split(':',$key);
+ next if ($cdom ne $dom);
+ my $requestkey = $cdom.'_'.$cnum;
+ if ($requestkey =~ /^($match_domain)_($match_courseid)$/) {
+ my %history = &Apache::lonnet::restore($requestkey,'courserequests',
+ $env{'user.domain'},$env{'user.name'});
+ my $entry;
+ my $reqtime = $history{'reqtime'};
+ my $lastupdate = $history{'timestamp'};
+ my $crstype = $history{'crstype'};
+ my $disposition = $history{'disposition'};
+ my $status = $history{'status'};
+ if ($action eq 'view') {
next if ((exists($history{'status'})) && ($history{'status'} eq 'created'));
- next unless (($env{'form.crstype'} eq 'any') ||
- ($env{'form.crstype'} eq $crstype));
+ } else {
+ next if (($reqtime < $after) || ($reqtime > $before));
+ }
+ next unless (($crstypefilter eq 'any') ||
+ ($crstypefilter eq $crstype));
+ if ($action eq 'view') {
next unless (($disposition eq 'approval') ||
($disposition eq 'pending'));
- if (ref($history{'details'}) eq 'HASH') {
- $entry = $requestkey.':'.$crstype.':'.
- &escape($history{'details'}{'cdescr'});
- if ($crstype eq 'official') {
- $entry .= ':'.&escape($history{'details'}{'instcode'});
+ }
+ if (ref($history{'details'}) eq 'HASH') {
+ $entry = $requestkey.':'.$crstype.':'.
+ &escape($history{'details'}{'cdescr'});
+ if ($action eq 'log') {
+ $entry .= ':'.$lastupdate.':';
+ if ($statusinfo{$key} ne '') {
+ $entry .= $statusinfo{$key};
+ } elsif ($status ne '') {
+ $entry .= $status;
+ } else {
+ $entry .= $disposition;
}
}
- if ($entry ne '') {
- if (exists($queue_by_date{$timestamp})) {
- if (ref($queue_by_date{$timestamp}) eq 'ARRAY') {
- push(@{$queue_by_date{$timestamp}},$entry);
- }
- } else {
- @{$queue_by_date{$timestamp}} = ($entry);
+ if ($crstype eq 'official') {
+ $entry .= ':'.&escape($history{'details'}{'instcode'});
+ }
+ }
+ if ($entry ne '') {
+ if (exists($queue_by_date{$reqtime})) {
+ if (ref($queue_by_date{$reqtime}) eq 'ARRAY') {
+ push(@{$queue_by_date{$reqtime}},$entry);
}
+ } else {
+ @{$queue_by_date{$reqtime}} = ($entry);
}
}
}
}
- $formname = 'requestcrs';
+ return %queue_by_date;
+}
+
+sub print_request_status {
+ my ($dom,$action) = @_;
+ my %queue_by_date = &sorted_request_history($dom,$action);
my @sortedtimes = sort {$a <=> $b} (keys(%queue_by_date));
- $output = ''.&mt('Action').' '.
- ''.&mt('Course Description').' '.
+ ''.$desctitle.' '.
''.&mt('Domain').' ';
if ($env{'form.crstype'} eq 'any') {
$output .= ''.&mt('Type').' ';
@@ -1206,7 +1987,10 @@ sub print_request_status {
''.&unescape($desc).' '.
''.$cdom.' ';
if ($env{'form.crstype'} eq 'any') {
- my $typename = $typenames{$type};
+ my $typename;
+ if (ref($typenames) eq 'HASH') {
+ $typename = &mt($typenames->{$type});
+ }
if ($typename eq '') {
$typename = &mt('Unknown type');
}
@@ -1229,11 +2013,16 @@ sub print_request_status {
}
$output .= &Apache::loncommon::end_data_table();
} else {
- $output .= ''.&mt('You have no matching course requests awaiting approval by a Domain Coordinator or held in a queue pending administrative action at your institution.').'
';
+ if ($env{'form.crstype'} eq 'any') {
+$output .= ''.&mt('You have no matching course or community requests awaiting approval by a Domain Coordinator or held in a queue pending administrative action at your institution.').'
';
+ } elsif ($env{'form.crstype'} eq 'community') {
+ $output .= ''.&mt('You have no matching community requests awaiting approval by a Domain Coordinator or held in a queue pending administrative action at your institution.').'
';
+ } else {
+ $output .= ''.&mt('You have no matching course requests awaiting approval by a Domain Coordinator or held in a queue pending administrative action at your institution.').'
';
+ }
}
$output .= '
-'.$showtype.' '.
&Apache::loncommon::end_data_table_row().
&Apache::loncommon::end_data_table().
- ''.
- &mt('Cancelling the request will remove it from the queue of pending course requests').'
';
+ '';
+ if ($crstype eq 'community') {
+ $output .= &mt('Cancelling the request will remove it from the queue of pending community requests').'
';
+ } else {
+ $output .= &mt('Cancelling the request will remove it from the queue of pending course requests').'';
+ }
$result = 'ok';
} else {
$output = ''.&mt('No record exists for the course ID').'
';
@@ -1334,18 +2127,303 @@ ENDJS
}
sub print_request_logs {
- my ($jscript,$loaditems,$crumb) = @_;
+ my ($r,$dom,$jscript,$loaditems,$crumb) = @_;
+ my $title;
+ if ($env{'form.crstype'} eq 'community') {
+ $title = 'Community Request Logs';
+ } elsif ($env{'form.crstype'} eq 'any') {
+ $title = 'Course/Community Request Logs';
+ } else {
+ $title = 'Course Request Logs';
+ }
+ $r->print(&header($title,$jscript,$loaditems).$crumb);
+ my $formname = 'requestcrs';
+ $r->print(''.
+ &Apache::loncommon::end_page());
return;
}
+sub reqstatus_names {
+ my ($crstype) = @_;
+ my @statuses = qw(created approval pending rejected cancelled);
+ my %statusnames =
+ &Apache::lonlocal::texthash (
+ created => 'Created',
+ approval => 'Queued pending approval',
+ pending => 'Queued pending validation',
+ rejected => 'Request rejected',
+ cancelled => 'Request cancelled',
+ );
+ if (($crstype eq 'official') || ($crstype eq 'unofficial')) {
+ $statusnames{'created'} = &mt('Course created');
+ } elsif ($crstype eq 'community') {
+ $statusnames{'created'} = &mt('Community created');
+ }
+ return (\@statuses,\%statusnames);
+}
+
+sub requestlog_display_filter {
+ my ($formname,$curr) = @_;
+ my $nolink = 1;
+ my $output = ''.
+ ''.&mt('Records/page:').' ';
+ my $startform =
+ &Apache::lonhtmlcommon::date_setter($formname,'requested_after_date',
+ $curr->{'requested_after_date'},undef,
+ undef,undef,undef,undef,undef,undef,$nolink);
+ my $endform =
+ &Apache::lonhtmlcommon::date_setter($formname,'requested_before_date',
+ $curr->{'requested_before_date'},undef,
+ undef,undef,undef,undef,undef,undef,$nolink);
+ $output .= ''.&mt('Window during which course/community was requested:').' '.&mt('After:').
+ ' '.$startform.' '.&mt('Before:').' '.
+ ''.$endform.'
'.
+ ' ';
+ my ($types,$typenames) = &Apache::loncommon::course_types();
+ if (ref($types) eq 'ARRAY') {
+ if (@{$types} > 1) {
+ $output .= ''.
+ &mt('Course Type:').' ';
+ my $selstr = '';
+ if ($curr->{'crstype'} eq 'any') {
+ $selstr = ' selected="selected"';
+ }
+ $output .= ''.&mt('All types').' '."\n";
+ foreach my $crstype (@{$types}) {
+ my $selstr = '';
+ if ($curr->{'crstype'} eq $crstype) {
+ $selstr = ' selected="selected"';
+ }
+ my $typename = $crstype;
+ if (ref($typenames) eq 'HASH') {
+ if ($typenames->{$crstype} ne '') {
+ $typename = $typenames->{$crstype};
+ }
+ }
+ $output .= ''.$typename.' '."\n";
+ }
+ $output .= ' '.
+ &mt('Request Status:').' ';
+ my $selstr = '';
+ if ($curr->{'status'} eq 'any') {
+ $selstr = ' selected="selected"';
+ }
+ $output .= ''.&mt('Any status').' '."\n";
+ foreach my $status (@{$statuses}) {
+ my $selstr = '';
+ if ($curr->{'status'} eq $status) {
+ $selstr = ' selected="selected"';
+ }
+ my $statusname = $status;
+ if (ref($statusnames) eq 'HASH') {
+ if ($statusnames->{$status} ne '') {
+ $statusname = $statusnames->{$status};
+ }
+ }
+ $output .= ''.$statusname.' '."\n";
+ }
+ $output .= '
';
+
+ # Update Display button
+ $output .= ''.
+ '
'.&mt('LON-CAPA section').' ';
my $xlistinfo;
- if ($env{'form.crosslisttotal'}) {
- for (my $i=0; $i<$env{'form.crosslisttotal'}; $i++) {
- if ($env{'form.crosslist_'.$i}) {
- $xlistinfo .= '';
- if (ref($code_order) eq 'ARRAY') {
- if (@{$code_order} > 0) {
- foreach my $item (@{$code_order}) {
- $xlistinfo .= $env{'form.crosslist_'.$i.'_'.$item};
- }
+ my $crosslisttotal = $env{'form.crosslisttotal'};
+ if (!$crosslisttotal) {
+ $crosslisttotal = 1;
+ }
+ for (my $i=0; $i<$crosslisttotal; $i++) {
+ if ($env{'form.crosslist_'.$i}) {
+ $xlistinfo .= ' ';
+ if (ref($code_order) eq 'ARRAY') {
+ if (@{$code_order} > 0) {
+ foreach my $item (@{$code_order}) {
+ $xlistinfo .= $env{'form.crosslist_'.$i.'_'.$item};
}
}
- $xlistinfo .= $env{'form.crosslist_'.$i.'_instsec'}.' ';
- if ($env{'form.crosslist_'.$i.'_lcsec'}) {
- $xlistinfo .= $env{'form.crosslist_'.$i.'_lcsec'};
- } else {
- $xlistinfo .= &mt('None');
- }
- $xlistinfo .= ' ';
+ if ($env{'form.crosslist_'.$i.'_lcsec'}) {
+ $xlistinfo .= $env{'form.crosslist_'.$i.'_lcsec'};
+ } else {
+ $xlistinfo .= &mt('None');
+ }
+ $xlistinfo .= ' ';
}
}
if ($xlistinfo eq '') {
$xlistinfo = ''.&mt('None').'
';
+ $section_values .= $xlistinfo;
}
+ $section_values .= '';
}
my %ctxt = &clone_text();
$inst_headers .= '
'.&mt('Clone From').' ';
- if (($env{'form.clonecrs'} =~ /^$match_name$/) &&
+ if (($env{'form.cloning'}) &&
+ ($env{'form.clonecrs'} =~ /^$match_name$/) &&
($env{'form.clonedom'} =~ /^$match_domain$/)) {
my $canclone = &Apache::loncoursequeueadmin::can_clone_course($env{'user.name'},
- $env{'user.domain'},$env{'form.clonecrs'}, $env{'form.clonedom'});
+ $env{'user.domain'},$env{'form.clonecrs'},$env{'form.clonedom'},
+ $env{'form.crstype'});
if ($canclone) {
my %courseenv = &Apache::lonnet::userenvironment($env{'form.clonedom'},
$env{'form.clonecrs'},('description','internal.coursecode'));
@@ -1499,48 +2582,80 @@ sub print_review {
}
my $container = 'Course';
+ my $ccrole = 'cc';
if ($env{'form.crstype'} eq 'community') {
$container = 'Community';
+ $ccrole = 'co';
}
$personnel_headers = '
'.&mt('Name').' '.&mt('Username:Domain').
' '.&mt('Role').' '.&mt('LON-CAPA Sections').
' ';
+
$personnel_values .= '
'.$ownername.' '.$owner.' '.
- ''.&Apache::lonnet::plaintext('cc',$container).' '.
+ ''.&Apache::lonnet::plaintext($ccrole,$container).' '.
''.&mt('None').' ';
for (my $i=0; $i<$env{'form.persontotal'}; $i++) {
if ($env{'form.person_'.$i.'_uname'} ne '') {
- my @allsecs = &Apache::loncommon::get_env_multiple('form.person_'.$i.'_sec');
+ if (ref($disallowed) eq 'ARRAY') {
+ next if (grep(/^$i$/,@{$disallowed}));
+ }
+ my @officialsecs = &Apache::loncommon::get_env_multiple('form.person_'.$i.'_sec');
+ my @allsecs;
+ foreach my $sec (@officialsecs) {
+ next unless ($sec =~ /\w/);
+ next if ($sec =~ /\W/);
+ next if ($sec eq 'none');
+ push(@allsecs,$sec);
+ }
my $newsec = $env{'form.person_'.$i.'_newsec'};
$newsec =~ s/^\s+//;
$newsec =~s/\s+$//;
- my @newsecs = split(/[\s,;]+/,$newsec);
+ my @newsecs = split(/\s*[\s,;:]\s*/,$newsec);
foreach my $sec (@newsecs) {
+ next unless ($sec =~ /\w/);
next if ($sec =~ /\W/);
- next if ($newsec eq 'none');
+ next if ($sec eq 'none');
if ($sec ne '') {
unless (grep(/^\Q$sec\E$/,@allsecs)) {
push(@allsecs,$sec);
}
}
}
- my $showsec = 'None';
+ my $showsec;
if (@allsecs) {
$showsec = join(', ',@allsecs);
}
+ if ($showsec eq '') {
+ $showsec = &mt('None');
+ }
+ if ($env{'form.person_'.$i.'_role'} eq $ccrole) {
+ $showsec = &mt('None');
+ }
+ my $role = $env{'form.person_'.$i.'_role'};
$personnel_values .=
'
'.$env{'form.person_'.$i.'_firstname'}.' '.
$env{'form.person_'.$i.'_lastname'}.' '.
''.$env{'form.person_'.$i.'_uname'}.':'.
$env{'form.person_'.$i.'_dom'}.' '.
- ''.&Apache::lonnet::plaintext($env{'form.person_'.$i.'_role'},
- $container).' '.
+ ''.&Apache::lonnet::plaintext($role,$container).' '.
''.$showsec.' ';
}
}
- my $output =
- '
'.&Apache::lonhtmlcommon::start_pick_box().
+ my $output;
+ if (ref($disallowed) eq 'ARRAY') {
+ if (@{$disallowed} > 0) {
+ if (ref($disallowmsg) eq 'HASH') {
+ $output = '
'.
+ &mt('Not all requested personnel could be included.').'
';
+ foreach my $item (@{$disallowed}) {
+ $output .= ''.$disallowmsg->{$item}.' ';
+ }
+ $output .= ' ';
+ }
+ }
+ }
+ $output .= '
'.&Apache::lonhtmlcommon::start_pick_box().
&Apache::lonhtmlcommon::row_title(&mt('Owner')).
'
'.
''.&mt('Name').' '.
@@ -1569,7 +2684,7 @@ sub print_review {
''.$personnel_headers.' '."\n".
$personnel_values.'
'."\n".
&Apache::lonhtmlcommon::row_closure(1).
- &Apache::lonhtmlcommon::end_pick_box();
+ &Apache::lonhtmlcommon::end_pick_box().'';
return $output;
}
@@ -1586,27 +2701,57 @@ sub dates_from_form {
}
sub courseinfo_form {
- my ($dom,$formname,$crstype,$next) = @_;
- my $nodescr = &mt('You must provide a (brief) course description.');
+ my ($dom,$formname,$crstype,$next,$description) = @_;
+ my %lt = &Apache::lonlocal::texthash(
+ official => 'You must provide a (brief) course description.',
+ community => 'You must provide a (brief) community description.'
+ );
+ $lt{'unofficial'} = $lt{'official'};
my $js_validate = <<"ENDJS";
ENDJS
-
- my $output .= $js_validate."\n".''.&Apache::lonhtmlcommon::start_pick_box().
- &Apache::lonhtmlcommon::row_title('Course Description').
- '
';
+ my $title = &mt('Brief Course Description');
+ my $clonetitle = &mt('Clone content and settings from an existing course?');
+ if ($crstype eq 'community') {
+ $title = &mt('Brief Community Description');
+ $clonetitle = &mt('Clone content and settings from an existing community?');
+ }
+ my $output .= $js_validate."\n".&Apache::lonhtmlcommon::start_pick_box().
+ &Apache::lonhtmlcommon::row_headline().
+ '
'.&Apache::loncommon::help_open_topic('Course_Request_Description').' '.$title.' '.
+ &Apache::lonhtmlcommon::row_closure(1).
+ &Apache::lonhtmlcommon::row_title(&mt('Description')).
+ '
';
my ($home_server_pick,$numlib) =
&Apache::loncommon::home_server_form_item($dom,'chome',
'default','hide');
@@ -1615,9 +2760,24 @@ ENDJS
&Apache::lonhtmlcommon::row_title(&mt('Home Server for Course'));
}
$output .= $home_server_pick.
+ &Apache::lonhtmlcommon::row_closure().
+ &Apache::lonhtmlcommon::row_headline().
+ '
'.&Apache::loncommon::help_open_topic('Course_Request_Clone').' '.$clonetitle.
&Apache::lonhtmlcommon::row_closure(1).
+ &Apache::lonhtmlcommon::row_title(&mt('Clone?')).
+ ''.
+ ' '.
+ ' '.
+ &Apache::lonhtmlcommon::row_closure(1).
+ &Apache::lonhtmlcommon::row_headline().
+ '
'.
+ &Apache::lonhtmlcommon::start_pick_box().
+ &clone_form($dom,$formname,$crstype).
&Apache::lonhtmlcommon::end_pick_box().'
'.
- '
'.&clone_form($dom,$formname,$crstype).'
'."\n";
+ &Apache::lonhtmlcommon::end_pick_box()."\n";
return $output;
}
@@ -1627,17 +2787,16 @@ sub clone_form {
if ($crstype eq 'community') {
$type = 'Community';
}
- my $cloneform = &Apache::loncommon::select_dom_form($dom,'clonedom').
- &Apache::loncommon::selectcourse_link($formname,'clonecrs','clonedom','','','',$type);
my %lt = &clone_text();
my $output .=
- &Apache::lonhtmlcommon::start_pick_box().
+ &Apache::lonhtmlcommon::row_title($lt{'dmn'}).'
'.
+ &Apache::loncommon::select_dom_form($dom,'clonedom').' '.
+ &Apache::lonhtmlcommon::row_closure(1).
&Apache::lonhtmlcommon::row_title($lt{'cid'}).'
'.
- ' '.&Apache::lonhtmlcommon::row_closure(1).'
'.
- &Apache::lonhtmlcommon::row_title($lt{'dmn'}).' '.
- $cloneform.''.&Apache::lonhtmlcommon::row_closure().
+ '
'.
+ ' '.
+ &Apache::loncommon::selectcourse_link($formname,'clonecrs','clonedom','','','',$type).
+ &Apache::lonhtmlcommon::row_closure(1).
&Apache::lonhtmlcommon::row_title($lt{'dsh'}).'
'.
' '.
@@ -1646,8 +2805,7 @@ sub clone_form {
' '.
'
'.
- &Apache::lonhtmlcommon::row_closure(1).
- &Apache::lonhtmlcommon::end_pick_box();
+ &Apache::lonhtmlcommon::row_closure(1);
return $output;
}
@@ -1665,10 +2823,14 @@ sub clone_text {
sub coursecode_form {
my ($dom,$context,$codetitles,$cat_titles,$cat_order,$num) = @_;
my $output;
- my %rowtitle = (
+ my %rowtitle = &Apache::lonlocal::texthash (
instcode => 'Course Category',
crosslist => 'Cross Listed Course',
);
+ my %helpitem = (
+ instcode => 'Course_Request_Category',
+ crosslist => 'Course_Request_Crosslist',
+ );
if ((ref($codetitles) eq 'ARRAY') && (ref($cat_titles) eq 'HASH') &&
(ref($cat_order))) {
my ($sel,$instsec,$lcsec);
@@ -1684,7 +2846,7 @@ sub coursecode_form {
my $lastitem = pop(@{$codetitles});
my $lastinput = '
';
if (@{$codetitles} > 0) {
- $output = &Apache::lonhtmlcommon::row_title($rowtitle{$context}).
+ $output = &Apache::lonhtmlcommon::row_title(&Apache::loncommon::help_open_topic($helpitem{$context}).' '.$rowtitle{$context}).
'
';
if ($context eq 'crosslist') {
$output .= ''.&mt('Include?').'');
if ($prev) {
$r->print('
');
}
@@ -1826,6 +3006,8 @@ sub print_request_outcome {
my ($dom,$codetitles,$code_order) = @_;
my ($output,$cnum,$now,$req_notifylist,$crstype,$enrollstart,$enrollend,
%sections,%crosslistings,%personnel,@baduname,@missingdom,%domconfig,);
+ my $sectotal = $env{'form.sectotal'};
+ my $crosslisttotal = 0;
$cnum = $env{'form.cnum'};
unless ($cnum =~ /^$match_courseid$/) {
$output = &mt('Invalid LON-CAPA course number for the new course')."\n";
@@ -1840,6 +3022,10 @@ sub print_request_outcome {
}
$now = time;
$crstype = $env{'form.crstype'};
+ my $ccrole = 'cc';
+ if ($crstype eq 'community') {
+ $ccrole = 'co';
+ }
my @instsections;
if ($crstype eq 'official') {
if (&Apache::lonnet::auto_run('',$dom)) {
@@ -1867,8 +3053,11 @@ sub print_request_outcome {
}
}
}
- $xlistinfo .= $env{'form.crosslist_'.$i.'_instsec'};
- $crosslistings{$i}{'inst'} = $xlistinfo;
+ $crosslistings{$i}{'instcode'} = $xlistinfo;
+ if ($xlistinfo ne '') {
+ $crosslisttotal ++;
+ }
+ $crosslistings{$i}{'instsec'} = $env{'form.crosslist_'.$i.'_instsec'};
$crosslistings{$i}{'loncapa'} = $env{'form.crosslist_'.$i.'_lcsec'};
}
}
@@ -1898,24 +3087,31 @@ sub print_request_outcome {
} else {
@{$personnel{$uname.':'.$udom}{'roles'}} = ($role);
}
- if ($role eq 'cc') {
+ if ($role eq $ccrole) {
@{$personnel{$uname.':'.$udom}{$role}{'usec'}} = ();
} else {
my @currsec = &Apache::loncommon::get_env_multiple('form.person_'.$i.'_sec');
+ my @allsecs;
+ foreach my $sec (@currsec) {
+ next unless ($sec =~ /\w/);
+ next if ($sec =~ /\W/);
+ next if ($sec eq 'none');
+ push(@allsecs,$sec);
+ }
my $newsec = $env{'form.person_'.$i.'_newsec'};
$newsec =~ s/^\s+//;
$newsec =~s/\s+$//;
my @newsecs = split(/[\s,;]+/,$newsec);
foreach my $sec (@newsecs) {
next if ($sec =~ /\W/);
- next if ($newsec eq 'none');
+ next if ($sec eq 'none');
if ($sec ne '') {
- unless (grep(/^\Q$sec\E$/,@currsec)) {
- push(@currsec,$sec);
+ unless (grep(/^\Q$sec\E$/,@allsecs)) {
+ push(@allsecs,$sec);
}
}
}
- @{$personnel{$uname.':'.$udom}{$role}{'usec'}} = @currsec;
+ @{$personnel{$uname.':'.$udom}{$role}{'usec'}} = @allsecs;
}
}
} else {
@@ -1934,31 +3130,25 @@ sub print_request_outcome {
if ($env{'form.autoadds'}) {
$autodrops = $env{'form.autoadds'};
}
- my $sectotal = 0;
- if ($env{'form.sectotal'}) {
- $sectotal = $env{'form.sectotal'};
- }
if ($env{'form.autoadds'}) {
$autodrops = $env{'form.autoadds'};
}
- my $crosslisttotal = 0;
- if ($env{'form.crosslisttotal'}) {
- $crosslisttotal = $env{'form.crosslisttotal'};
- }
my $instcode = '';
if (exists($env{'form.instcode'})) {
$instcode = $env{'form.instcode'};
}
my $clonecrs = '';
my $clonedom = '';
- if (($env{'form.clonecrs'} =~ /^($match_courseid)$/) &&
+ if (($env{'form.cloning'}) &&
+ ($env{'form.clonecrs'} =~ /^($match_courseid)$/) &&
($env{'form.clonedom'} =~ /^($match_domain)$/)) {
my $clonehome = &Apache::lonnet::homeserver($env{'form.clonecrs'},
$env{'form.clonedom'});
if ($clonehome ne 'no_host') {
my $canclone =
&Apache::loncoursequeueadmin::can_clone_course($env{'user.name'},
- $env{'user.domain'},$env{'form.clonecrs'}, $env{'form.clonedom'});
+ $env{'user.domain'},$env{'form.clonecrs'},$env{'form.clonedom'},
+ $crstype);
if ($canclone) {
$clonecrs = $env{'form.clonecrs'};
$clonedom = $env{'form.clonedom'};
@@ -1990,8 +3180,10 @@ sub print_request_outcome {
accessend => $accessend,
personnel => \%personnel,
};
- my @inststatuses;
- my $val = &get_processtype($dom,$crstype,\@inststatuses,\%domconfig);
+ my (@inststatuses,$storeresult,$creationresult);
+ my $val =
+ &Apache::loncoursequeueadmin::get_processtype($env{'user.name'},$env{'user.domain'},
+ $env{'user.adv'},$dom,$crstype,\@inststatuses,\%domconfig);
if ($val eq '') {
if ($crstype eq 'official') {
$output = &mt('You are not permitted to request creation of official courses.');
@@ -2002,6 +3194,7 @@ sub print_request_outcome {
} else {
$output = &mt('Unrecognized course type: [_1]',$crstype);
}
+ $storeresult = 'notpermitted';
} else {
my ($disposition,$message,$reqstatus);
my %reqhash = (
@@ -2018,7 +3211,7 @@ sub print_request_outcome {
$disposition = &check_autolimit($env{'user.name'},$env{'user.domain'},
$dom,$crstype,$limit,\$message);
} elsif ($val eq 'validate') {
- my $inststatuslist;
+ my ($inststatuslist,$validationchk,$validation);
if (@inststatuses > 0) {
$inststatuslist = join(',',@inststatuses);
}
@@ -2026,23 +3219,20 @@ sub print_request_outcome {
if (@instsections > 0) {
$instseclist = join(',',@instsections);
}
- my $validation =
- &Apache::lonnet::auto_validate_instcode('',$dom,$instcode,
- $env{'user.name'}.':'.$env{'user.domain'},$inststatuslist,
- $instseclist);
- if ($validation eq 'valid') {
- $disposition = 'process';
- } elsif ($validation eq 'rejected') {
- $disposition = 'rejected';
- } elsif ($validation eq 'pending') {
- $disposition = 'pending';
- } elsif ($disposition eq 'approval') {
- $disposition = 'approval';
- } elsif ($disposition =~ /^error(.*)$/) {
+ $validationchk =
+ &Apache::lonnet::auto_courserequest_validation($dom,
+ $env{'user.name'}.':'.$env{'user.domain'},$crstype,
+ $inststatuslist,$instcode,$instseclist);
+ if ($validationchk =~ /:/) {
+ ($validation,$message) = split(':',$validationchk);
+ } else {
+ $validation = $validationchk;
+ }
+ if ($validation =~ /^error(.*)$/) {
$disposition = 'approval';
$validationerror = $1;
} else {
- $disposition = 'approval';
+ $disposition = $validation;
}
} else {
$disposition = 'approval';
@@ -2051,18 +3241,23 @@ sub print_request_outcome {
$reqstatus = $disposition;
my ($modified,$queued);
if ($disposition eq 'rejected') {
- $output = &mt('Your course request was rejected.');
+ if ($crstype eq 'community') {
+ $output = &mt('Your community request was rejected.');
+ } else {
+ $output = &mt('Your course request was rejected.');
+ }
if ($message) {
$output .= ''.$message.'
';
}
+ $storeresult = 'rejected';
} elsif ($disposition eq 'process') {
my %domdefs = &Apache::lonnet::get_domain_defaults($dom);
my ($logmsg,$newusermsg,$addresult,$enrollcount,$response,$keysmsg,%longroles);
- my @roles = &Apache::lonuserutils::roles_by_context('course');
my $type = 'Course';
if ($crstype eq 'community') {
$type = 'Community';
}
+ my @roles = &Apache::lonuserutils::roles_by_context('course','',$type);
foreach my $role (@roles) {
$longroles{$role}=&Apache::lonnet::plaintext($role,$type);
}
@@ -2072,15 +3267,26 @@ sub print_request_outcome {
if ($result eq 'created') {
$disposition = 'created';
$reqstatus = 'created';
- $output = &mt('Your course request has been processed and the course has been created.').
- ''.
- &mt('An error occurred when processing your course request.').
- ''.&mt('Your community request has been processed and the community has been created.');
+ } else {
+ $output = '
'.&mt('Your course request has been processed and the course has been created.');
+ }
+ $output .= '
';
+ $creationresult = 'created';
+ } else {
+ $output = '';
+ if ($crstype eq 'community') {
+ $output .= &mt('An error occurred when processing your community request.');
+ } else {
+ $output .= &mt('An error occurred when processing your course request.');
+ }
+ $output .= ' ';
+ $creationresult = 'error';
}
} else {
my $requestid = $cnum.'_'.$disposition;
@@ -2093,14 +3299,18 @@ sub print_request_outcome {
description => $env{'form.cdescr'},
},
};
+ if ($crstype eq 'official') {
+ $request->{$requestid}->{'instcode'} = $instcode;
+ }
my $statuskey = 'status:'.$dom.':'.$cnum;
my %userreqhash = &Apache::lonnet::get('courserequests',[$statuskey],
$env{'user.domain'},$env{'user.name'});
if ($userreqhash{$statuskey} ne '') {
$modified = 1;
- my %queuehash = &Apache::lonnet::get_dom('courserequestqueue',
- [$cnum.'_approval',
- $cnum.'_pending'],$dom);
+ my $uname = &Apache::lonnet::get_domainconfiguser($dom);
+ my %queuehash = &Apache::lonnet::get('courserequestqueue',
+ [$cnum.'_approval',
+ $cnum.'_pending'],$dom,$uname);
if (($queuehash{$cnum.'_approval'} ne '') ||
($queuehash{$cnum.'_pending'} ne '')) {
$queued = 1;
@@ -2110,7 +3320,12 @@ sub print_request_outcome {
my $putresult = &Apache::lonnet::newput_dom('courserequestqueue',$request,
$dom);
if ($putresult eq 'ok') {
- $output = &mt('Your course request has been recorded.').''.&mt('Your community request has been updated').'
';
+ } else {
+ $output .= ''.&mt('Your course request has been updated').'
';
}
- } else {
- $storeresult = 'error: invalid requestkey format';
+ $output .= ¬ification_information($disposition,$req_notifylist,$cnum,$now);
}
- if ($storeresult ne 'ok') {
- $output .= ''.&mt('An error occurred saving a record of the details of your request: [_1].',$storeresult).' '.&mt('An error occurred saving a record of the status of your request: [_1].',$statusresult).' '.&mt('An error occurred validating your request with institutional data sources: [_1].',$validationerror).'
';
}
- if ($modified && $queued && $storeresult eq 'ok') {
- $output .= ''.&mt('Your course request has been updated').'
'.
- ¬ification_information($disposition,$req_notifylist,$cnum,$now);
+ if ($updateresult) {
+ $output .= $updateresult;
}
- if ($validationerror ne '') {
- $output .= ''.&mt('An error occurred validating your request with institutional data sources: [_1].',$validationerror).'';
+ }
+ if ($creationresult ne '') {
+ return ($creationresult,$output);
+ } else {
+ return ($storeresult,$output);
+ }
+}
+
+sub update_requestors_roles {
+ my ($dom,$cnum,$crstype,$details,$longroles) = @_;
+ my $now = time;
+ my ($active,$future,$numactive,$numfuture,$output);
+ my $owner = $env{'user.name'}.':'.$env{'user.domain'};
+ if (ref($details) eq 'HASH') {
+ if (ref($details->{'personnel'}) eq 'HASH') {
+ my $ccrole = 'cc';
+ if ($crstype eq 'community') {
+ $ccrole = 'co';
+ }
+ unless (ref($details->{'personnel'}{$owner}) eq 'HASH') {
+ $details->{'personnel'}{$owner} = {
+ 'roles' => [$ccrole],
+ $ccrole => { 'usec' => [] },
+ };
+ }
+ my @roles;
+ if (ref($details->{'personnel'}{$owner}{'roles'}) eq 'ARRAY') {
+ @roles = sort(@{$details->{'personnel'}{$owner}{'roles'}});
+ unless (grep(/^\Q$ccrole\E$/,@roles)) {
+ push(@roles,$ccrole);
+ }
+ } else {
+ @roles = ($ccrole);
+ }
+ foreach my $role (@roles) {
+ my $refresh=$env{'user.refresh.time'};
+ if ($refresh eq '') {
+ $refresh = $env{'user.login.time'};
+ }
+ if ($refresh eq '') {
+ $refresh = $now;
+ }
+ my $start = $refresh-1;
+ my $end = '0';
+ if ($role eq 'st') {
+ if ($details->{'accessstart'} ne '') {
+ $start = $details->{'accessstart'};
+ }
+ if ($details->{'accessend'} ne '') {
+ $end = $details->{'accessend'};
+ }
+ }
+ my @usecs;
+ if ($role ne $ccrole) {
+ if (ref($details->{'personnel'}{$owner}{$role}{'usec'}) eq 'ARRAY') {
+ @usecs = @{$details->{'personnel'}{$owner}{$role}{'usec'}};
+ }
+ }
+ if ($role eq 'st') {
+ if (@usecs > 1) {
+ my $firstsec = $usecs[0];
+ @usecs = ($firstsec);
+ }
+ }
+ if (@usecs == 0) {
+ push(@usecs,'');
+ }
+ foreach my $usec (@usecs) {
+ my (%userroles,%newrole,%newgroups,$spec,$area);
+ my $area = '/'.$dom.'/'.$cnum;
+ my $spec = $role.'.'.$area;
+ if ($usec ne '') {
+ $spec .= '/'.$usec;
+ $area .= '/'.$usec;
+ }
+ if ($role =~ /^cr\//) {
+ &Apache::lonnet::custom_roleprivs(\%newrole,$role,$dom,
+ $cnum,$spec,$area);
+ } else {
+ &Apache::lonnet::standard_roleprivs(\%newrole,$role,$dom,
+ $spec,$cnum,$area);
+ }
+ &Apache::lonnet::set_userprivs(\%userroles,\%newrole,
+ \%newgroups);
+ $userroles{'user.role.'.$spec} = $start.'.'.$end;
+ &Apache::lonnet::appenv(\%userroles,[$role,'cm']);
+ if (($end == 0) || ($end > $now)) {
+ my $showrole = $role;
+ if ($role =~ /^cr\//) {
+ $showrole = &Apache::lonnet::plaintext($role,$crstype);
+ } elsif (ref($longroles) eq 'HASH') {
+ if ($longroles->{$role} ne '') {
+ $showrole = $longroles->{$role};
+ }
+ }
+ if ($start <= $now) {
+ $active .= ''.$showrole;
+ if ($usec ne '') {
+ $active .= ' - '.&mt('section:').' '.$usec;
+ }
+ $active .= ' '.$showrole;
+ if ($usec ne '') {
+ $future .= ' - '.&mt('section:').' '.$usec;
+ }
+ $future .= ' ';
+ $numfuture ++;
+ }
+ }
+ }
+ }
+ }
+ }
+ if ($active) {
+ if ($numactive == 1) {
+ if ($crstype eq 'Community') {
+ $output = &mt('Use the following link to enter the community:');
+ } else {
+ $output = &mt('Use the following link to enter the course:');
+ }
+ } else {
+ if ($crstype eq 'Community') {
+ $output = &mt('Use the following links to your new roles to enter the community:');
+ } else {
+ $output = &mt('Use the following links to your new roles to enter the course:');
+ }
}
+ $output .= ' ',' ',&Apache::lonlocal::locallocaltime($details->{'accessstart'}))
+ } else {
+ $output .= &mt('The following course [quant,_1,role] will become available for selection from your [_2]roles page[_3], once the default student access start date - [_4] - has been reached:',$numfuture,'',' ',&Apache::lonlocal::locallocaltime($details->{'accessstart'}));
+ }
+ $output .= ' ';
}
return $output;
}
@@ -2183,128 +3527,43 @@ sub notification_information {
'';
} else {
$output .= ''.
- &mt('Your request status is: [_1].',$disposition).
- '
'
+ &mt('Your request status is: [_1].',$disposition).
+ '';
}
return $output;
}
-sub get_processtype {
- my ($dom,$crstype,$inststatuses,$domconfig) = @_;
- return unless ((ref($inststatuses) eq 'ARRAY') && (ref($domconfig) eq 'HASH'));
- my (%userenv,%settings,$val);
- my @options = ('autolimit','validate','approval');
- if ($dom eq $env{'user.domain'}) {
- %userenv =
- &Apache::lonnet::userenvironment($env{'user.domain'},$env{'user.name'},
- 'requestcourses.'.$crstype,'inststatus');
- if ($userenv{'requestcourses.'.$crstype}) {
- $val = $userenv{'requestcourses.'.$crstype};
- @{$inststatuses} = ('_custom_');
- } else {
- my ($task,%alltasks);
- if (ref($domconfig->{'requestcourses'}) eq 'HASH') {
- %settings = %{$domconfig->{'requestcourses'}};
- if (ref($settings{$crstype}) eq 'HASH') {
- if (($env{'user.adv'}) && (exists($settings{$crstype}{'_LC_adv'}))) {
- $val = $settings{$crstype}{'_LC_adv'};
- @{$inststatuses} = ('_LC_adv_');
- } else {
- if ($userenv{'inststatus'} ne '') {
- @{$inststatuses} = split(',',$userenv{'inststatus'});
- } else {
- @{$inststatuses} = ('default');
- }
- foreach my $status (@{$inststatuses}) {
- if (exists($settings{$crstype}{$status})) {
- my $value = $settings{$crstype}{$status};
- next unless ($value);
- unless (exists($alltasks{$value})) {
- if (ref($alltasks{$value}) eq 'ARRAY') {
- unless(grep(/^\Q$status\E$/,@{$alltasks{$value}})) {
- push(@{$alltasks{$value}},$status);
- }
- } else {
- @{$alltasks{$value}} = ($status);
- }
- }
- }
- }
- my $maxlimit = 0;
-
- foreach my $key (sort(keys(%alltasks))) {
- if ($key =~ /^autolimit=(\d*)$/) {
- if ($1 eq '') {
- $val ='autolimit=';
- last;
- } elsif ($1 > $maxlimit) {
- $maxlimit = $1;
- }
- }
- }
- if ($maxlimit) {
- $val = 'autolimit='.$maxlimit;
- } else {
- foreach my $option (@options) {
- if ($alltasks{$option}) {
- $val = $option;
- last;
- }
- }
- }
- }
- }
- }
- }
- } else {
- %userenv = &Apache::lonnet::userenvironment($env{'user.domain'},
- $env{'user.name'},'reqcrsotherdom.'.$env{'form.crstype'});
- if ($userenv{'reqcrsotherdom.'.$crstype}) {
- my @doms = split(',',$userenv{'reqcrsotherdom.'.$crstype});
- my $optregex = join('|',@options);
- foreach my $item (@doms) {
- my ($extdom,$extopt) = split(':',$item);
- if ($extdom eq $dom) {
- if ($extopt =~ /^($optregex)(=?\d*)$/) {
- $val = $1.$2;
- }
- last;
- }
- }
- @{$inststatuses} = ('_external_');
- }
- }
- return $val;
-}
-
sub check_autolimit {
my ($uname,$udom,$dom,$crstype,$limit,$message) = @_;
my %crsroles = &Apache::lonnet::get_my_roles($env{'user.name'},$env{'user.domain'},
- 'userroles',['active','future'],['cc'],[$dom]);
- my ($types,$typename) = &course_types();
+ 'userroles',['active','future'],['cc','co'],[$dom]);
+ my ($types,$typename) = &Apache::loncommon::course_types();
my %requests = &Apache::lonnet::dumpstore('courserequests',$udom,$uname);
- my %count;
- if (ref($types) eq 'ARRAY') {
- foreach my $type (@{$types}) {
- $count{$type} = 0;
- }
- }
+ my $count = 0;
foreach my $key (keys(%requests)) {
my ($cdom,$cnum) = split('_',$key);
- if (exists($crsroles{$cnum.':'.$cdom.':cc'})) {
- if (ref($requests{$key}) eq 'HASH') {
- my $type = $requests{$key}{'crstype'};
- if ($type =~ /^official|unofficial|community$/) {
- $count{$type} ++;
- }
+ if (ref($requests{$key}) eq 'HASH') {
+ next if ($requests{$key}{'crstype'} ne $crstype);
+ if (($crstype eq 'community') &&
+ (exists($crsroles{$cnum.':'.$cdom.':co'}))) {
+ $count ++;
+ } elsif ((($crstype eq 'official') || ($crstype eq 'unofficial')) &&
+ (exists($crsroles{$cnum.':'.$cdom.':cc'}))) {
+ $count ++;
}
}
}
- if ($count{$crstype} < $limit) {
+ if ($count < $limit) {
return 'process';
} else {
if (ref($typename) eq 'HASH') {
- $$message = &mt('Your request has not been processed because you have reached the limit for the number of courses of this type.').'