--- loncom/interface/lonrequestcourse.pm 2009/08/12 14:24:35 1.11
+++ loncom/interface/lonrequestcourse.pm 2009/08/23 03:51:53 1.24
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Request a course
#
-# $Id: lonrequestcourse.pm,v 1.11 2009/08/12 14:24:35 raeburn Exp $
+# $Id: lonrequestcourse.pm,v 1.24 2009/08/23 03:51:53 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -44,6 +44,62 @@ described at http://www.lon-capa.org.
=item handler()
+=item header()
+
+=item form_elements()
+
+=item onload_action()
+
+=item check_can_request()
+
+=item course_types()
+
+=item print_main_menu()
+
+=item request_administration()
+
+=item print_request_form()
+
+=item print_enrollment_menu()
+
+=item inst_section_selector()
+
+=item date_setting_table()
+
+=item print_personnel_menu()
+
+=item print_request_status()
+
+=item print_request_logs()
+
+=item print_review()
+
+=item dates_from_form()
+
+=item courseinfo_form()
+
+=item clone_form()
+
+=item clone_text()
+
+=item coursecode_form()
+
+=item get_course_dom()
+
+=item display_navbuttons()
+
+=item print_request_outcome()
+
+=item get_processtype()
+
+=item check_autolimit()
+
+=item build_batchcreatehash()
+
+=item retrieve_settings()
+
+=item get_request_settings()
+
=back
=cut
@@ -60,34 +116,34 @@ use LONCAPA qw(:DEFAULT :match);
sub handler {
my ($r) = @_;
+ &Apache::loncommon::content_type($r,'text/html');
+ $r->send_http_header;
if ($r->header_only) {
- &Apache::loncommon::content_type($r,'text/html');
- $r->send_http_header;
return OK;
}
- &Apache::loncommon::content_type($r,'text/html');
- $r->send_http_header;
&Apache::lonhtmlcommon::clear_breadcrumbs();
my $dom = &get_course_dom();
my $action = $env{'form.action'};
my $state = $env{'form.state'};
-
my %stored;
my $jscript;
if ((defined($state)) && (defined($action))) {
- my %elements = &form_elements($dom);
- if (($action eq 'view') && ($state ne 'crstype')) {
- if (defined($env{'form.request_id'})) {
- %stored = &retrieve_settings($dom,$env{'form.request_id'});
+ if (($action eq 'view') && ($state eq 'details')) {
+ if ((defined($env{'form.showdom'})) && (defined($env{'form.cnum'}))) {
+ my $result = &retrieve_settings($env{'form.showdom'},$env{'form.cnum'});
}
}
+ my %elements = &form_elements($dom);
my $elementsref = {};
if (ref($elements{$action}) eq 'HASH') {
if (ref($elements{$action}{$state}) eq 'HASH') {
$elementsref = $elements{$action}{$state};
}
}
+ if (($state eq 'courseinfo') && ($env{'form.clonedom'} eq '')) {
+ $env{'form.clonedom'} = $dom;
+ }
$jscript = &Apache::lonhtmlcommon::set_form_elements($elementsref,\%stored);
}
@@ -98,12 +154,13 @@ sub handler {
my $loaditems = &onload_action($action,$state);
my %states;
- $states{'view'} = ['pick_request','details','review','process'];
+ $states{'view'} = ['pick_request','details','cancel','removal'];
$states{'log'} = ['filter','display'];
$states{'new'} = ['courseinfo','enrollment','personnel','review','process'];
+
if (($action eq 'new') && ($env{'form.crstype'} eq 'official')) {
unless ($env{'form.state'} eq 'crstype') {
- unshift (@{$states{'new'}},'codepick');
+ unshift(@{$states{'new'}},'codepick');
}
}
@@ -117,13 +174,20 @@ sub handler {
crstype => 'Course Request Action',
codepick => 'Category',
courseinfo => 'Description',
- enrollment => 'Enrollment',
+ enrollment => 'Access Dates',
personnel => 'Personnel',
review => 'Review',
process => 'Result',
pick_request => 'Display Summary',
+ details => 'Request Details',
+ cancel => 'Cancel Request',
+ removal => 'Outcome',
);
+ if (($env{'form.crstype'} eq 'official') && (&Apache::lonnet::auto_run('',$dom))) {
+ $trail{'enrollment'} = 'Enrollment';
+ }
+
my $page = 0;
my $crumb;
if (defined($action)) {
@@ -217,33 +281,36 @@ sub form_elements {
crstype => {
crstype => 'selectbox',
action => 'selectbox',
+ origcnum => 'hidden',
},
courseinfo => {
cdescr => 'text',
- clonecourse => 'text',
- clonedomain => 'selectbox',
+ clonecrs => 'text',
+ clonedom => 'selectbox',
datemode => 'radio',
dateshift => 'text',
},
enrollment => {
- startaccess_month => 'selectbox',
- startaccess_hour => 'selectbox',
- endaccess_month => 'selectbox',
- endaccess_hour => 'selectbox',
- startaccess_day => 'text',
- startaccess_year => 'text',
- startaccess_minute => 'text',
- startaccess_second => 'text',
- endaccess_day => 'text',
- endaccess_year => 'text',
- endaccess_minute => 'text',
- endaccess_second => 'text',
+ accessstart_month => 'selectbox',
+ accessstart_hour => 'selectbox',
+ accessend_month => 'selectbox',
+ accessend_hour => 'selectbox',
+ accessstart_day => 'text',
+ accessstart_year => 'text',
+ accessstart_minute => 'text',
+ accessstart_second => 'text',
+ accessend_day => 'text',
+ accessend_year => 'text',
+ accessend_minute => 'text',
+ accessend_second => 'text',
no_end_date => 'checkbox',
},
personnel => {
- persontotal => 'hidden',
addperson => 'checkbox',
},
+ review => {
+ cnum => 'hidden',
+ },
},
view => {
crstype => {
@@ -252,6 +319,13 @@ sub form_elements {
},
},
);
+ my %servers = &Apache::lonnet::get_servers($dom,'library');
+ my $numlib = keys(%servers);
+ if ($numlib > 1) {
+ $elements{'new'}{'courseinfo'}{'chome'} = 'selectbox';
+ } else {
+ $elements{'new'}{'courseinfo'}{'chome'} = 'hidden';
+ }
my (@codetitles,%cat_titles,%cat_order,@code_order,$lastitem);
&Apache::lonnet::auto_possible_instcodes($dom,\@codetitles,\%cat_titles,
\%cat_order,\@code_order);
@@ -268,18 +342,18 @@ sub form_elements {
if (&Apache::lonnet::auto_run('',$dom)) {
my %extras = (
sectotal => 'hidden',
- startenroll_month => 'selectbox',
- startenroll_hour => 'selectbox',
- endenroll_month => 'selectbox',
- endenroll_hour => 'selectbox',
- startenroll_day => 'text',
- startenroll_year => 'text',
- startenroll_minute => 'text',
- startenroll_second => 'text',
- endenroll_day => 'text',
- endenroll_year => 'text',
- endenroll_minute => 'text',
- endenroll_second => 'text',
+ enrollstart_month => 'selectbox',
+ enrollstart_hour => 'selectbox',
+ enrollend_month => 'selectbox',
+ enrollend_hour => 'selectbox',
+ enrollstart_day => 'text',
+ enrollstart_year => 'text',
+ enrollstart_minute => 'text',
+ enrollstart_second => 'text',
+ enrollend_day => 'text',
+ enrollend_year => 'text',
+ enrollend_minute => 'text',
+ enrollend_second => 'text',
crosslisttotal => 'hidden',
addcrosslist => 'checkbox',
autoadds => 'radio',
@@ -289,47 +363,50 @@ sub form_elements {
for (my $i=0; $i<$env{'form.sectotal'}; $i++) {
$extras{'sec_'.$i} = 'checkbox',
$extras{'secnum_'.$i} = 'text',
- $extras{'loncapasec_'.$i} = 'checkbox',
+ $extras{'loncapasec_'.$i} = 'text',
}
}
my $crosslisttotal = $env{'form.crosslisttotal'};
- if (!defined($crosslisttotal)) {
+ if ($env{'form.addcrosslist'}) {
+ $crosslisttotal ++;
+ }
+ if (!$crosslisttotal) {
$crosslisttotal = 1;
}
- if ($crosslisttotal > 0) {
- for (my $i=0; $i<$env{'form.crosslisttotal'}; $i++) {
- if ($numtitles) {
- $extras{'crosslist_'.$i.'_'.$lastitem} = 'text';
- }
- if (@codetitles > 0) {
- foreach my $item (@codetitles) {
- $extras{'crosslist_'.$i.'_'.$item} = 'selectbox';
- }
+ for (my $i=0; $i<$env{'form.crosslisttotal'}; $i++) {
+ if ($numtitles) {
+ $extras{'crosslist_'.$i.'_'.$lastitem} = 'text';
+ }
+ if (@codetitles > 0) {
+ foreach my $item (@codetitles) {
+ $extras{'crosslist_'.$i.'_'.$item} = 'selectbox';
}
- $extras{'crosslist_'.$i} = 'checkbox';
- $extras{'crosslist_'.$i.'_instsec'} = 'text',
- $extras{'crosslist_'.$i.'_lcsec'} = 'text',
}
+ $extras{'crosslist_'.$i} = 'checkbox';
+ $extras{'crosslist_'.$i.'_instsec'} = 'text',
+ $extras{'crosslist_'.$i.'_lcsec'} = 'text',
}
my %mergedhash = (%{$elements{'new'}{'enrollment'}},%extras);
%{$elements{'new'}{'enrollment'}} = %mergedhash;
}
my %people;
my $persontotal = $env{'form.persontotal'};
- if (!defined($persontotal)) {
+ if ($env{'form.addperson'}) {
+ $persontotal ++;
+ }
+ if ((!defined($persontotal)) || (!$persontotal)) {
$persontotal = 1;
}
for (my $i=0; $i<$persontotal; $i++) {
- $people{'person_'.$i.'_uname'} = 'text',
- $people{'person_'.$i.'_dom'} = 'selectbox',
- $people{'person_'.$i.'_hidedom'} = 'hidden',
- $people{'person_'.$i.'_first'} = 'text',
- $people{'person_'.$i.'_last'} = 'text',
- $people{'person_'.$i.'_email'} = 'text',
- $people{'person_'.$i.'_role'} = 'selectbox',
- $people{'person_'.$i.'_sec'} = 'selectbox',
- $people{'person_'.$i.'_newsec'} = 'text',
- $people{'person_'.$i.'_sections'} = 'hidden',
+ $people{'person_'.$i.'_uname'} = 'text',
+ $people{'person_'.$i.'_dom'} = 'selectbox',
+ $people{'person_'.$i.'_hidedom'} = 'hidden',
+ $people{'person_'.$i.'_firstname'} = 'text',
+ $people{'person_'.$i.'_lastname'} = 'text',
+ $people{'person_'.$i.'_emailaddr'} = 'text',
+ $people{'person_'.$i.'_role'} = 'selectbox',
+ $people{'person_'.$i.'_sec'} = 'selectbox',
+ $people{'person_'.$i.'_newsec'} = 'text',
}
my %personnelhash = (%{$elements{'new'}{'personnel'}},%people);
%{$elements{'new'}{'personnel'}} = %personnelhash;
@@ -349,6 +426,8 @@ sub check_can_request {
my ($dom,$can_request) = @_;
my $canreq = 0;
my ($types,$typename) = &course_types();
+ my @options = ('approval','validate','autolimit');
+ my $optregex = join('|',@options);
if ((ref($can_request) eq 'HASH') && (ref($types) eq 'ARRAY')) {
foreach my $type (@{$types}) {
if (&Apache::lonnet::usertools_access($env{'user.name'},
@@ -364,7 +443,7 @@ sub check_can_request {
if (@curr > 0) {
$canreq ++;
unless ($dom eq $env{'user.domain'}) {
- if (grep(/^\Q$dom\E$/,@curr)) {
+ if (grep(/^\Q$dom\E:($optregex)(=?\d*)$/,@curr)) {
$can_request->{$type} = 1;
}
}
@@ -487,7 +566,8 @@ END
my $formname = 'requestcrs';
my $nexttext = &mt('Next');
- $r->print('<div><form name="'.$formname.'" method="post" action="/adm/requestcourse">'.
+ $r->print(
+ '<div><form name="'.$formname.'" method="post" action="/adm/requestcourse">'.
&Apache::lonhtmlcommon::start_pick_box().
&Apache::lonhtmlcommon::row_title('Action').'
<input type="hidden" name="showdom" value="'.$dom.'" />
@@ -523,13 +603,19 @@ END
sub request_administration {
my ($r,$action,$state,$page,$states,$dom,$jscript,$loaditems,$crumb) = @_;
my $js;
- if (($action eq 'new') || ($action eq 'view')) {
+ if (($action eq 'new') || (($action eq 'view') && ($state eq 'pick_request'))) {
$js = <<END;
function nextPage(formname,nextstate) {
formname.state.value= nextstate;
formname.submit();
}
+
+END
+ }
+ if (($action eq 'new') || ($action eq 'view')) {
+ $js .= <<END;
+
function backPage(formname,prevstate) {
formname.state.value = prevstate;
formname.submit();
@@ -545,9 +631,108 @@ END
$r->print(&header('Request a course',$js.$jscript,$loaditems,$jsextra).$crumb);
&print_request_form($r,$action,$state,$page,$states,$dom);
} elsif ($action eq 'view') {
- $r->print(&header('Manage course requests',$js.$jscript,$loaditems).$crumb);
+ my $jsextra;
+ my $formname = 'requestcrs';
+ my $prev = $states->{$action}[$page-1];
+ my $next = $states->{$action}[$page+1];
if ($state eq 'pick_request') {
- $r->print(&print_request_status($dom));
+ $next = $states->{$action}[$page+1];
+ $jsextra = &viewrequest_javascript($formname,$next);
+ } elsif ($state eq 'details') {
+ $jsextra = &viewdetails_javascript($formname);
+
+ } elsif ($state eq 'cancel') {
+ $jsextra = &viewcancel_javascript($formname);
+ }
+ $r->print(&header('Manage course requests',$js.$jscript.$jsextra,$loaditems).
+ $crumb);
+ my $form = '<form method="post" name="'.$formname.'" action="/adm/requestcourse" />';
+ if ($state eq 'pick_request') {
+ $r->print('<h3>'.&mt('Pending course requests').'</h3><div>'."\n".$form."\n".
+ &print_request_status($dom).'</form>');
+ } elsif ($state eq 'details') {
+ my (@codetitles,%cat_titles,%cat_order,@code_order,$instcode,$code_chk);
+ my $origcnum = $env{'form.cnum'};
+ if ($origcnum eq '') {
+ $origcnum = $env{'form.origcnum'};
+ }
+ if ($env{'form.crstype'} eq 'official') {
+ &Apache::lonnet::auto_possible_instcodes($dom,\@codetitles,\%cat_titles,
+ \%cat_order,\@code_order);
+ }
+ $r->print('<h3>'.&mt('Course Request Details').'</h3><div>'."\n".$form."\n".
+ &print_review($formname,$dom,\@codetitles,\%cat_titles,\%cat_order,
+ \@code_order)."\n".
+ '<input name="origcnum" value="'.$origcnum.'" type="hidden" />'."\n");
+ my @excluded = &get_excluded_elements($dom,$states,'new','review');
+ push(@excluded,'origcnum');
+ $r->print(&Apache::lonhtmlcommon::echo_form_input(\@excluded).'</div>');
+ my $other = 'modify';
+ my %navtxt = &Apache::lonlocal::texthash (
+ prev => 'Back',
+ other => 'Modify Request',
+ next => 'Cancel Request',
+ );
+ &display_navbuttons($r,$formname,$prev,$navtxt{'prev'},$next,$navtxt{'next'},
+ $state,$other,$navtxt{'other'});
+ $r->print('</form>');
+ } elsif ($state eq 'cancel') {
+ my ($result,$output) = &print_cancel_request($dom,$env{'form.origcnum'});
+ $r->print('<h3>'.&mt('Cancel course request').'</h3><div>'."\n".$form."\n".
+ $output);
+ my @excluded = &get_excluded_elements($dom,$states,'view','cancel');
+ $r->print(&Apache::lonhtmlcommon::echo_form_input(\@excluded).'</div>');
+ my %navtxt = &Apache::lonlocal::texthash (
+ prev => 'Back',
+ next => 'Confirm Cancellation',
+ );
+ if ($result eq 'ok') {
+ &display_navbuttons($r,$formname,$prev,$navtxt{'prev'},$next,
+ $navtxt{'next'},$state);
+ } else {
+ &display_navbuttons($r,$formname,$prev,$navtxt{'prev'},undef,'',$state);
+ }
+ $r->print('</form>');
+ } elsif ($state eq 'removal') {
+ my $cnum = $env{'form.origcnum'};
+ my $statuskey = 'status:'.$dom.':'.$cnum;
+ my %userreqhash = &Apache::lonnet::get('courserequests',[$statuskey],
+ $env{'user.domain'},$env{'user.name'});
+ my $currstatus = $userreqhash{$statuskey};
+ my ($result,$error);
+ if (($currstatus eq 'approval') || ($currstatus eq 'pending')) {
+ my %status = (
+ $statuskey => 'cancelled',
+ );
+ my $statusresult = &Apache::lonnet::put('courserequests',\%status);
+ if ($statusresult eq 'ok') {
+ my $delresult =
+ &Apache::lonnet::del_dom('courserequestqueue',
+ [$cnum.'_'.$currstatus],$dom);
+ if ($delresult eq 'ok') {
+ $result = 'ok';
+ } else {
+ $error = &mt('An error occurred when updating the pending requests queue: [_1]',$delresult);
+ }
+ } else {
+ $error = &mt("An error occurred when updating the status of this request in the requestor's records: [_1]",$statusresult);
+ }
+ } else {
+ $error = &mt('The current status of this request could not be verified as pending approval/institutional action.');
+ }
+ $r->print('<h3>'.&mt('Request Cancellation').'</h3><div>'."\n".$form."\n".
+ '<input type="hidden" name="state" value="'.$state.'" />'."\n".
+ '<input type="hidden" name="action" value="'.$action.'" />'."\n".
+ '<input type="hidden" name="showdom" value="'.$dom.'" />'."\n".
+ '<input type="hidden" name="orignum" value="'.$cnum.'" />'."\n");
+ if ($result eq 'ok') {
+ $r->print(&mt('Your course request has been cancelled.'));
+ } else {
+ $r->print('<div class="LC_error">'.
+ &mt('The request cancellation process was not complete.').
+ '<br />'.$error.'</div>');
+ }
+ $r->print('</form>');
}
} elsif ($action eq 'log') {
$r->print(&coursereq_log('View request log',$jscript,$loaditems).$crumb);
@@ -589,7 +774,7 @@ sub print_request_form {
}
if ($instcode ne '') {
$code_chk = &Apache::lonnet::auto_validate_instcode('',$dom,$instcode);
- if ($code_chk eq 'ok') {
+ if ($code_chk eq 'valid') {
$message = '<div class="LC_info">'.
&mt('The chosen course category [_1] is valid.','<b>'.
$instcode.'</b>').'</div>';
@@ -605,7 +790,7 @@ sub print_request_form {
$message = '<div class="LC_warning">'.
&mt('No course was found matching your choice of institutional course category.');
}
- unless ($code_chk eq 'ok') {
+ unless ($code_chk eq 'valid') {
$prev = 'crstype';
}
$r->print($message);
@@ -623,13 +808,20 @@ sub print_request_form {
$r->print('<div>'.&Apache::lonhtmlcommon::start_pick_box().$codepicker.
&Apache::lonhtmlcommon::end_pick_box().'</div>');
} else {
- $r->print(&courseinfo_form($dom,$formname,$crstype));
+ $next = $states->{$action}[$page+2];
+ $r->print(&courseinfo_form($dom,$formname,$crstype,$next));
}
} else {
- $r->print(&courseinfo_form($dom,$formname,$crstype));
+ 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));
+ if ($env{'form.instcode'} eq '') {
+ $prev = $states->{$action}[$page-2];
+ }
+ $r->print(&courseinfo_form($dom,$formname,$crstype,$next));
} elsif ($state eq 'enrollment') {
if ($crstype eq 'official') {
&Apache::lonnet::auto_possible_instcodes($dom,\@codetitles,\%cat_titles,
@@ -640,10 +832,18 @@ sub print_request_form {
} elsif ($state eq 'personnel') {
$r->print(&print_personnel_menu($dom,$formname,$crstype));
} elsif ($state eq 'review') {
+ my $cnum;
+ if ($env{'form.origcnum'} =~ /^($match_courseid)$/) {
+ $cnum = $env{'form.origcnum'};
+ } else {
+ $cnum = &Apache::lonnet::generate_coursenum($dom);
+ }
&Apache::lonnet::auto_possible_instcodes($dom,\@codetitles,\%cat_titles,
\%cat_order,\@code_order);
- $r->print(&print_review($formname,$dom,\@codetitles,\%cat_titles,\%cat_order,
- \@code_order));
+ $r->print('<p>'.&mt('Review the details of the course request before submission.').'</p>'.
+ &print_review($formname,$dom,\@codetitles,\%cat_titles,\%cat_order,
+ \@code_order).
+ '<input type="hidden" name="cnum" value="'.$cnum.'" />');
$navtxt{'next'} = &mt('Submit course request');
} elsif ($state eq 'process') {
if ($crstype eq 'official') {
@@ -651,7 +851,19 @@ sub print_request_form {
\%cat_order,\@code_order);
}
my $result = &print_request_outcome($dom,\@codetitles,\@code_order);
+ $r->print($result);
+ }
+ my @excluded = &get_excluded_elements($dom,$states,$action,$state);
+ if ($state eq 'personnel') {
+ push(@excluded,'persontotal');
}
+ $r->print(&Apache::lonhtmlcommon::echo_form_input(\@excluded).'</form>');
+ &display_navbuttons($r,$formname,$prev,$navtxt{'prev'},$next,$navtxt{'next'},$state);
+ return;
+}
+
+sub get_excluded_elements {
+ my ($dom,$states,$action,$state) = @_;
my @excluded = ('counter');
my %elements = &form_elements($dom);
if (ref($states) eq 'HASH') {
@@ -662,7 +874,7 @@ sub print_request_form {
for (my $i=$numitems-1; $i>=0; $i--) {
if (ref($elements{$action}) eq 'HASH') {
if (ref($elements{$action}{$items[$i]}) eq 'HASH') {
- foreach my $key (keys(%{$elements{$action}{$items[$i]}})) {
+ foreach my $key (keys(%{$elements{$action}{$items[$i]}})) {
push(@excluded,$key);
}
}
@@ -675,9 +887,7 @@ sub print_request_form {
if (grep(/^instcode_/,@excluded)) {
push(@excluded,'instcode');
}
- $r->print(&Apache::lonhtmlcommon::echo_form_input(\@excluded).'</form>');
- &display_navbuttons($r,$formname,$prev,$navtxt{'prev'},$next,$navtxt{'next'});
- return;
+ return @excluded;
}
sub print_enrollment_menu {
@@ -688,7 +898,7 @@ sub print_enrollment_menu {
my %accesstitles = (
'start' => 'Default start access',
- 'end' => 'Default end accss',
+ 'end' => 'Default end access',
);
my %enrolltitles = (
'start' => 'Start auto-enrollment',
@@ -699,7 +909,7 @@ sub print_enrollment_menu {
my ($section_form,$crosslist_form,$autoenroll_form);
$section_form = &inst_section_selector($dom,$instcode);
my $crosslisttotal = $env{'form.crosslisttotal'};
- if (!defined($crosslisttotal)) {
+ if (!$crosslisttotal) {
$crosslisttotal = 1;
}
if ($env{'form.addcrosslist'}) {
@@ -765,15 +975,19 @@ sub inst_section_selector {
&Apache::loncommon::start_data_table().
&Apache::loncommon::start_data_table_row().
'<th>'.&mt('Include?').'<input type="hidden" name="sectotal" '.
- 'value="'.$sectotal.'"</th>'.
+ 'value="'.$sectotal.'" /></th>'.
'<th>'.&mt('Institutional Section').'</th>'.
'<th>'.&mt('LON-CAPA section').'</th>'.
&Apache::loncommon::end_data_table_row();
for (my $i=0; $i<@sections; $i++) {
my $colflag = $i%2;
+ my $checked = ' checked="checked"';
+ if ($env{'form.origcnum'}) {
+ $checked='';
+ }
$output .= &Apache::loncommon::start_data_table_row().
'<td><input type="checkbox" name="sec_'.$i.
- '" checked="checked" /></td>'.
+ '"'.$checked.' value="1" /></td>'.
'<td>'.$sections[$i].
'<input type="hidden" name="secnum_'.$i.'" value="'.
$sections[$i].'" /></td>'.
@@ -788,13 +1002,13 @@ sub inst_section_selector {
}
sub date_setting_table {
- my ($starttime,$endtime,$formname,$suffix,%datetitles) = @_;
+ my ($starttime,$endtime,$formname,$prefix,%datetitles) = @_;
my ($perpetual,$table);
- my $startform = &Apache::lonhtmlcommon::date_setter($formname,'start'.$suffix,
+ my $startform = &Apache::lonhtmlcommon::date_setter($formname,$prefix.'start',
$starttime,'','','',1,'','','',1);
- my $endform = &Apache::lonhtmlcommon::date_setter($formname,'end'.$suffix,
+ my $endform = &Apache::lonhtmlcommon::date_setter($formname,$prefix.'end',
$endtime,'','','',1,'','','',1);
- if ($suffix eq 'access') {
+ if ($prefix eq 'access') {
$perpetual = ' <span class="LC_nobreak"><label>'.
'<input type="checkbox" name="no_end_date" />'.
&mt('No end date').'</label></span>';
@@ -812,14 +1026,14 @@ sub print_personnel_menu {
my ($dom,$formname,$crstype) = @_;
my $output = '<div>'.&Apache::lonhtmlcommon::start_pick_box();
my $persontotal = $env{'form.persontotal'};
- if (!defined($persontotal)) {
+ if ((!defined($persontotal)) || (!$persontotal)) {
$persontotal = 1;
}
if ($env{'form.addperson'}) {
$persontotal ++;
}
my $userlinktxt = &mt('Set User');
- my @items = ('uname','dom','last','first','email','hidedom');
+ my @items = ('uname','dom','lastname','firstname','emailaddr','hidedom');
my $roleoptions;
my @roles = &Apache::lonuserutils::roles_by_context('course');
@@ -898,18 +1112,16 @@ sub print_personnel_menu {
$existmult.'>'."\n".$existops.'</select>'.(' ' x3);
}
$sectionselector .= $newtitle.
- '<input type="text" name="person_'.$i.'_newsec" size="15" value="" />'.
- '<input type="hidden" name="person_'.$i.'_sections" value="" />'."\n";
-
+ '<input type="text" name="person_'.$i.'_newsec" size="15" value="" />'."\n";
$output .=
&Apache::lonhtmlcommon::row_title(&mt('Additional Personnel').'<br />'.
'<span class="LC_nobreak">'.$userlink.
'</span>').
'<table><tr><td align="center" valign="top">'.&mt('Username').'<br />'.$uname_form.'</td>'."\n".
'<td align="center" valign="top" colspan="2">'.&mt('Domain').'<br />'.$udom_form.'</td></tr><tr>'."\n".
- '<td align="center" valign="top">'.&mt('First Name').'<br />'.$form_elems{'first'}.'</td>'."\n".
- '<td align="center" valign="top">'.&mt('Last Name').'<br />'.$form_elems{'last'}.'</td>'."\n".
- '<td align="center" valign="top">'.&mt('E-mail').'<br />'.$form_elems{email}.'</td></tr>'."\n".
+ '<td align="center" valign="top">'.&mt('First Name').'<br />'.$form_elems{'firstname'}.'</td>'."\n".
+ '<td align="center" valign="top">'.&mt('Last Name').'<br />'.$form_elems{'lastname'}.'</td>'."\n".
+ '<td align="center" valign="top">'.&mt('E-mail').'<br />'.$form_elems{'emailaddr'}.'</td></tr>'."\n".
'<tr><td align="center" valign="top">'.&mt('Role').'<br />'.$roleselector.'</td>'."\n".
'<td'.$seccolspan.' align="center" valign="top">'.&mt('Section(s)').'<br />'.$sectionselector.'</td>'."\n".
'</tr></table>'.&Apache::lonhtmlcommon::row_closure();
@@ -925,52 +1137,70 @@ sub print_personnel_menu {
sub print_request_status {
my ($dom) = @_;
- my %requests = &Apache::lonnet::dumpstore('courserequests',$env{'user.domain'},
- $env{'user.name'});
- my ($output,$formname,%queue_by_date);
- foreach my $key (keys(%requests)) {
- if (ref($requests{$key}) eq 'HASH') {
- my ($cdom,$cnum) = split('_',$key);
- next if ($cdom ne $dom);
- my $entry;
- my $timestamp = $requests{$key}{'timestamp'};
- my $crstype = $requests{$key}{'crstype'};
- my $status = $requests{$key}{'status'};
- next unless (($env{'form.crstype'} eq 'all') ||
- ($env{'form.crstype'} eq $crstype));
- next unless (($status eq 'approval') || ($status eq 'pending'));
- if (ref($requests{$key}{'details'}) eq 'HASH') {
- $entry = $key.':'.$crstype.':'.$requests{$key}{'details'}{'cdesc'};
- if ($crstype eq 'official') {
- $entry .= ':'.$requests{$key}{'details'}{'instcode'};
- }
- }
- if ($entry ne '') {
- if (exists($queue_by_date{$timestamp})) {
- if (ref($queue_by_date{$timestamp}) eq 'ARRAY') {
- push(@{$queue_by_date{$timestamp}},$entry);
+ 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',
+ );
+ }
+ 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'};
+ next if ((exists($history{'status'})) && ($history{'status'} eq 'created'));
+ next unless (($env{'form.crstype'} eq 'any') ||
+ ($env{'form.crstype'} eq $crstype));
+ 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 ($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);
}
- } else {
- @{$queue_by_date{$timestamp}} = ($entry);
}
}
}
}
$formname = 'requestcrs';
my @sortedtimes = sort {$a <=> $b} (keys(%queue_by_date));
- $output = '<form method="post" name="'.$formname.'" action="/adm/requestcourse" />'."\n".
- '<input type="hidden" name="action" value="'.$env{'form.action'}.'" />'."\n".
+ $output = '<input type="hidden" name="action" value="'.$env{'form.action'}.'" />'."\n".
+
'<input type="hidden" name="state" value="'.$env{'form.state'}.'" />'."\n".
- '<input type="hidden" name="crstype" value="'.$env{'form.crstype'}.'" />'."\n";
+ '<input type="hidden" name="crstype" value="'.$env{'form.crstype'}.'" />'."\n".
+ '<input type="hidden" name="showdom" value="" />'."\n".
+ '<input type="hidden" name="cnum" value="" />'."\n";
if (@sortedtimes > 0) {
$output .= &Apache::loncommon::start_data_table().
&Apache::loncommon::start_data_table_header_row().
'<th>'.&mt('Action').'</th>'.
- '<th>'.&mt('Description').'</th>';
- if ($env{'form.crstype'} eq 'all') {
+ '<th>'.&mt('Course Description').'</th>'.
+ '<th>'.&mt('Domain').'</th>';
+ if ($env{'form.crstype'} eq 'any') {
$output .= '<th>'.&mt('Type').'</th>';
}
- if (($env{'form.crstype'} eq 'all') || ($env{'form.crstype'} eq 'official')) {
+ if (($env{'form.crstype'} eq 'any') || ($env{'form.crstype'} eq 'official')) {
$output .= '<th>'.&mt('Institutional Code').'</th>';
}
$output .= '<th>'.&mt('Date requested').'</th>'.
@@ -983,14 +1213,25 @@ sub print_request_status {
my ($key,$type,$desc,$instcode) = split(':',$request);
my ($cdom,$cnum) = split('_',$key);
$output .= &Apache::loncommon::start_data_table_row().
- '<td><input type="button" value="'.&mt('Select').'" onclick="javascript:viewrequest('."'$cdom','$cnum'".')" /></td>'.
- '<td>'.$desc.'</td>';
- if ($env{'form.crstype'} eq 'all') {
- $output .= '<td>'.&course_types($type).'</td>';
+ '<td><input type="button" value="'.&mt('Select').'" onclick="javascript:chooseRequest('."'$cdom','$cnum'".')" /></td>'.
+ '<td>'.&unescape($desc).'</td>'.
+ '<td>'.$cdom.'</td>';
+ if ($env{'form.crstype'} eq 'any') {
+ my $typename = $typenames{$type};
+ if ($typename eq '') {
+ $typename = &mt('Unknown type');
+ }
+ $output .= '<td>'.$typename.'</td>';
}
- if (($env{'form.crstype'} eq 'all') ||
+ if (($env{'form.crstype'} eq 'any') ||
($env{'form.crstype'} eq 'official')) {
- $output .= '<td>'.$instcode.'</td>';
+ my $showinstcode;
+ if ($type eq 'official') {
+ $showinstcode = &unescape($instcode);
+ } else {
+ $showinstcode = &mt('Not applicable');
+ }
+ $output .= '<td>'.$showinstcode.'</td>';
}
$output .= '<td>'.$showtime.'</td>'.
&Apache::loncommon::end_data_table_row();
@@ -1002,11 +1243,107 @@ sub print_request_status {
$output .= '<div>'.&mt('You have no matching course requests awaiting approval by a Domain Coordinator or held in a queue pending administrative action at your institution.').'</div>';
}
$output .= '
-<input type="button" name="prev" value="'.&mt('Back').'" onclick="javascript:backPage(document.'.$formname.",'crstype'".')" />
-</form>';
+<br /><input type="button" name="prev" value="'.&mt('Back').'" onclick="javascript:backPage(document.'.$formname.",'crstype'".')" />
+</form></div>';
return $output;
}
+sub print_cancel_request {
+ my ($dom,$cnum) = @_;
+ my $requestkey = $dom.'_'.$cnum;
+ my ($result,$output);
+ if ($requestkey =~ /^($match_domain)_($match_courseid)$/) {
+ my %history = &Apache::lonnet::restore($requestkey,'courserequests',
+ $env{'user.domain'},$env{'user.name'});
+ my $timestamp = $history{'reqtime'};
+ my $crstype = $history{'crstype'};
+ my $status = $history{'status'};
+ if (($status eq 'cancelled') || ($status eq 'created')) {
+ if ($status eq 'cancelled') {
+ $output = &mt('This request has already been cancelled.');
+ } elsif ($status eq 'created') {
+ $output = &mt('This request has already been processed, and a course created.');
+ }
+ $output = &mt('No further action will be taken');
+ } elsif (ref($history{'details'}) eq 'HASH') {
+ my ($types,$typename) = &course_types();
+ my $showtype = $crstype;
+ if (defined($typename->{$crstype})) {
+ $showtype = $typename->{$crstype};
+ }
+ $output = '<p>'.&Apache::loncommon::start_data_table().
+ &Apache::loncommon::start_data_table_header_row().
+ '<th>'.&mt('Description').'</th><th>'.&mt('Requested').'</th>'.
+ '<th>'.&mt('Type').'</th>'.
+ &Apache::loncommon::end_data_table_header_row().
+ &Apache::loncommon::start_data_table_row().
+ '<td>'.$history{details}{'cdescr'}.'</td><td>'.
+ &Apache::lonlocal::locallocaltime($timestamp).'</td>'.
+ '<td>'.$showtype.'</td>'.
+ &Apache::loncommon::end_data_table_row().
+ &Apache::loncommon::end_data_table().
+ '<br /><div class="LC_warning">'.
+ &mt('Cancelling the request will remove it from the queue of pending course requests').'</div>';
+ $result = 'ok';
+ } else {
+ $output = '<div class="LC_error">'.&mt('No record exists for the course ID').'</div>';
+ }
+ } else {
+ $output = '<div class="LC_error">'.&mt('Invalid course ID').'</div>';
+ }
+ return ($result,$output);
+}
+
+sub viewrequest_javascript {
+ my ($formname,$next) = @_;
+ return <<"ENDJS";
+
+function chooseRequest(cdom,cnum) {
+ document.$formname.showdom.value = cdom;
+ document.$formname.cnum.value = cnum;
+ nextPage(document.$formname,'$next');
+}
+
+ENDJS
+}
+
+sub viewdetails_javascript {
+ my ($formname) = @_;
+ return << "ENDJS";
+
+function nextPage(formname,nextstate) {
+ if (nextstate == "modify") {
+ formname.state.value = "personnel";
+ formname.action.value = "new";
+ } else {
+ formname.state.value = nextstate;
+ }
+ formname.submit();
+}
+
+function backPage(formname,prevstate) {
+ formname.state.value = prevstate;
+ formname.submit();
+}
+
+ENDJS
+}
+
+sub viewcancel_javascript {
+ my $alert = &mt('Are you sure you want to cancel this request?\\n'.
+ 'Your request will be removed.');
+ return << "ENDJS";
+function nextPage(formname,nextstate) {
+ if (confirm('$alert')) {
+ formname.state.value = nextstate;
+ formname.submit();
+ }
+ return;
+}
+
+ENDJS
+}
+
sub print_request_logs {
my ($jscript,$loaditems,$crumb) = @_;
return;
@@ -1033,10 +1370,16 @@ sub print_review {
$crstypename = $typename->{$env{'form.crstype'}};
}
}
+ my $category = 'Course';
+ if ($env{'form.crstype'} eq 'community') {
+ $category = 'Community';
+ }
$inst_headers = '<th>'.&mt('Description').'</th><th>'.&mt('Type').'</th>';
$inst_values = '<td>'.$env{'form.cdescr'}.'</td><td>'.$crstypename.'</td>';
+ my $enrollrow_title = &mt('Default Access Dates').'<br />'.
+ '('.&Apache::lonnet::plaintext('st',$category).')';
if ($env{'form.crstype'} eq 'official') {
if ((ref($codetitles) eq 'ARRAY') && (ref($cat_titles) eq 'HASH')) {
foreach my $title (@{$codetitles}) {
@@ -1053,6 +1396,7 @@ sub print_review {
}
}
if (&Apache::lonnet::auto_run('',$dom)) {
+ $enrollrow_title = &mt('Enrollment');
$enroll_headers = '<th>'.&mt('Automatic Adds').'</th>'.
'<th>'.&mt('Automatic Drops').'</th>'.
'<th>'.&mt('Enrollment Starts').'</th>'.
@@ -1060,12 +1404,12 @@ sub print_review {
$section_headers = '<th>'.&mt('Sections').'</th>'.
'<th>'.&mt('Crosslistings').'</th>';
- my ($startenroll,$endenroll) = &dates_from_form('startenroll','endenroll');
+ my ($enrollstart,$enrollend) = &dates_from_form('enrollstart','enrollend');
my @autoroster = (&mt('No'),&mt('Yes'));
$enroll_values = '<td>'.$autoroster[$env{'form.autoadds'}].'</td>'.
'<td>'.$autoroster[$env{'form.autodrops'}].'</td>'.
- '<td>'.&Apache::lonlocal::locallocaltime($startenroll).'</td>'.
- '<td>'.&Apache::lonlocal::locallocaltime($endenroll).'</td>';
+ '<td>'.&Apache::lonlocal::locallocaltime($enrollstart).'</td>'.
+ '<td>'.&Apache::lonlocal::locallocaltime($enrollend).'</td>';
$section_values = '<td><table class="LC_innerpickbox"><tr><th>'.
&mt('Institutional section').'</th>'.
'<th>'.&mt('LON-CAPA section').'</th></tr>';
@@ -1091,76 +1435,81 @@ sub print_review {
&mt('Institutional course/section').'</th>'.
'<th>'.&mt('LON-CAPA section').'</th></tr>';
my $xlistinfo;
- if ($env{'form.crosslisttotal'}) {
- for (my $i=0; $i<$env{'form.crosslisttotal'}; $i++) {
- if ($env{'form.crosslist_'.$i}) {
- $xlistinfo .= '<tr><td>';
- 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 .= '<tr><td>';
+ 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'}.'</td><td>';
- if ($env{'form.crosslist_'.$i.'_lcsec'}) {
- $xlistinfo .= $env{'form.crosslist_'.$i.'_lcsec'};
- } else {
- $xlistinfo .= &mt('None');
- }
- $xlistinfo .= '</td></tr>';
}
+ $xlistinfo .= $env{'form.crosslist_'.$i.'_instsec'}.'</td><td>';
+ if ($env{'form.crosslist_'.$i.'_lcsec'}) {
+ $xlistinfo .= $env{'form.crosslist_'.$i.'_lcsec'};
+ } else {
+ $xlistinfo .= &mt('None');
+ }
+ $xlistinfo .= '</td></tr>';
}
}
if ($xlistinfo eq '') {
$xlistinfo = '<tr><td colspan="2">'.&mt('None').'</td></tr>';
}
- $section_values .= $xlistinfo.'</table></td>';
+ $section_values .= $xlistinfo;
}
+ $section_values .= '</table></td>';
}
my %ctxt = &clone_text();
$inst_headers .= '<th>'.&mt('Clone From').'</th>';
- if (($env{'form.clonecourse'} =~ /^$match_name$/) &&
- ($env{'form.clonedomain'} =~ /^$match_domain$/)) {
- my %coursehash =
- &Apache::lonnet::courseiddump($env{'form.clonedomain'},'.',1,'.','.',
- $env{'form.clonecourse'},undef,undef,'.');
- my $cloneid = $env{'form.clonedomain'}.'_'.$env{'form.clonecourse'};
- if (ref($coursehash{$cloneid}) eq 'HASH') {
- $inst_headers .= '<th>'.$ctxt{'dsh'}.'</th>';
- my $clonedesc = $coursehash{$cloneid}{'description'};
- my $cloneinst = $coursehash{$cloneid}{'inst_code'};
-
- $inst_values .= '<td>'.$clonedesc.' ';
- if ($cloneinst ne '') {
- $inst_values .= &mt('([_1] in [_2])',$cloneinst,$env{'form.clonedomain'});
- } else {
- $inst_values .= &mt('(from [_1])',$env{'form.clonedomain'});
- }
- $inst_values .= '</td><td>';
- if ($env{'form.datemode'} eq 'preserve') {
- $inst_values .= $ctxt{'pcd'};
- } elsif ($env{'form.datemode'} eq 'shift') {
- $inst_values .= &mt('Shift dates by [_1] days',$env{'form.dateshift'});
- } else {
- $inst_values .= $ctxt{'ncd'};
- }
- $inst_values .= '</td>';
- } else {
- $inst_values .= '<td>'.&mt('Unknown').'</td>';
- }
+ if (($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'});
+ if ($canclone) {
+ my %courseenv = &Apache::lonnet::userenvironment($env{'form.clonedom'},
+ $env{'form.clonecrs'},('description','internal.coursecode'));
+ if (keys(%courseenv) > 0) {
+ $inst_headers .= '<th>'.$ctxt{'dsh'}.'</th>';
+ $inst_values .= '<td>'.$courseenv{'description'}.' ';
+ my $cloneinst = $courseenv{'internal.coursecode'};
+ if ($cloneinst ne '') {
+ $inst_values .= $cloneinst.' '.&mt('in').' '.$env{'form.clonedom'};
+ } else {
+ $inst_values .= &mt('from').' '.$env{'form.clonedom'};
+ }
+ $inst_values .= '</td><td>';
+ if ($env{'form.datemode'} eq 'preserve') {
+ $inst_values .= $ctxt{'prd'};
+ } elsif ($env{'form.datemode'} eq 'shift') {
+ $inst_values .= &mt('Shift dates by [_1] days',$env{'form.dateshift'});
+ } else {
+ $inst_values .= $ctxt{'ncd'};
+ }
+ $inst_values .= '</td>';
+ } else {
+ $inst_values .= '<td>'.&mt('Unknown').'</td>';
+ }
+ } else {
+ $inst_values .= '<td>'.&mt('Not permitted'),'</td>';
+ }
} else {
$inst_values .= '<td>'.&mt('None').'</td>';
}
$enroll_headers .= '<th>'.&mt('Access Starts').'</th>'.
'<th>'.&mt('Access Ends').'</th>';
- my ($startaccess,$endaccess) = &dates_from_form('startaccess','endaccess');
- $enroll_values .= '<td>'.&Apache::lonlocal::locallocaltime($startaccess).'</td>';
- if ($endaccess == 0) {
+ my ($accessstart,$accessend) = &dates_from_form('accessstart','accessend');
+ $enroll_values .= '<td>'.&Apache::lonlocal::locallocaltime($accessstart).'</td>';
+ if ($accessend == 0) {
$enroll_values .= '<td>'.&mt('No end date').'</td>';
} else {
- $enroll_values .= '<td>'.&Apache::lonlocal::locallocaltime($endaccess).'</td>';
+ $enroll_values .= '<td>'.&Apache::lonlocal::locallocaltime($accessend).'</td>';
}
my $container = 'Course';
@@ -1176,17 +1525,41 @@ sub print_review {
'<td>'.&mt('None').'</td></tr>';
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');
+ 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');
+ if ($sec ne '') {
+ unless (grep(/^\Q$sec\E$/,@allsecs)) {
+ push(@allsecs,$sec);
+ }
+ }
+ }
+ my $showsec;
+ if (@allsecs) {
+ $showsec = join(', ',@allsecs);
+ }
+ if ($showsec eq '') {
+ $showsec = &mt('None');
+ }
+ if ($env{'form.person_'.$i.'_role'} eq 'cc') {
+ $showsec = &mt('None');
+ }
$personnel_values .=
- '<tr><td>'.$env{'form.person_'.$i.'_first'}.' '.
- $env{'form.person_'.$i.'_last'}.'</td>'.
+ '<tr><td>'.$env{'form.person_'.$i.'_firstname'}.' '.
+ $env{'form.person_'.$i.'_lastname'}.'</td>'.
'<td>'.$env{'form.person_'.$i.'_uname'}.':'.
$env{'form.person_'.$i.'_dom'}.'</td>'.
'<td>'.&Apache::lonnet::plaintext($env{'form.person_'.$i.'_role'},
$container).'</td>'.
- '<td>'.$env{'form.person_'.$i.'_sections'}.'</td></tr>';
+ '<td>'.$showsec.'</td></tr>';
}
}
- my $output = '<p>'.&mt('Review the details of the course request before submission.').'</p>'.
+ my $output =
'<div>'.&Apache::lonhtmlcommon::start_pick_box().
&Apache::lonhtmlcommon::row_title(&mt('Owner')).
'<table class="LC_innerpickbox"><tr>'.
@@ -1202,7 +1575,7 @@ sub print_review {
'<table class="LC_innerpickbox"><tr>'.$inst_headers.'</tr>'."\n".
'<tr>'.$inst_values.'</tr></table>'."\n".
&Apache::lonhtmlcommon::row_closure().
- &Apache::lonhtmlcommon::row_title(&mt('Enrollment')).
+ &Apache::lonhtmlcommon::row_title($enrollrow_title).
'<table class="LC_innerpickbox"><tr>'.$enroll_headers.'</tr>'."\n".
'<tr>'.$enroll_values.'</tr></table>'."\n".
&Apache::lonhtmlcommon::row_closure();
@@ -1217,8 +1590,6 @@ sub print_review {
$personnel_values.'</table>'."\n".
&Apache::lonhtmlcommon::row_closure(1).
&Apache::lonhtmlcommon::end_pick_box();
- my $cnum = &Apache::lonnet::generate_coursenum($dom);
- $output .= '<input type="hidden" name="cnum" value="'.$cnum.'" />';
return $output;
}
@@ -1226,7 +1597,7 @@ sub dates_from_form {
my ($startname,$endname) = @_;
my $startdate = &Apache::lonhtmlcommon::get_date_from_form($startname);
my $enddate = &Apache::lonhtmlcommon::get_date_from_form($endname);
- if ($endname eq 'endaccess') {
+ if ($endname eq 'accessend') {
if (exists($env{'form.no_end_date'}) ) {
$enddate = 0;
}
@@ -1235,13 +1606,38 @@ sub dates_from_form {
}
sub courseinfo_form {
- my ($dom,$formname,$crstype) = @_;
- my $output = '<div>'.&Apache::lonhtmlcommon::start_pick_box().
- &Apache::lonhtmlcommon::row_title('Course Description').
- '<input type="text" size="40" name="cdescr" />'.
- &Apache::lonhtmlcommon::row_closure(1).
- &Apache::lonhtmlcommon::end_pick_box().'</div>'.
- '<div>'.&clone_form($dom,$formname,$crstype).'</div>'."\n";
+ my ($dom,$formname,$crstype,$next) = @_;
+ my $nodescr = &mt('You must provide a (brief) course description.');
+ my $js_validate = <<"ENDJS";
+<script type="text/javascript">
+// <![CDATA['
+
+function validateForm() {
+ if ((document.$formname.cdescr.value == "") || (document.$formname.cdescr.value == "undefined")) {
+ alert('$nodescr');
+ return;
+ }
+ nextPage(document.$formname,'$next');
+}
+// ]]
+</script>
+
+ENDJS
+
+ my $output .= $js_validate."\n".'<div>'.&Apache::lonhtmlcommon::start_pick_box().
+ &Apache::lonhtmlcommon::row_title('Course Description').
+ '<input type="text" size="40" name="cdescr" />';
+ my ($home_server_pick,$numlib) =
+ &Apache::loncommon::home_server_form_item($dom,'chome',
+ 'default','hide');
+ if ($numlib > 1) {
+ $output .= &Apache::lonhtmlcommon::row_closure().
+ &Apache::lonhtmlcommon::row_title(&mt('Home Server for Course'));
+ }
+ $output .= $home_server_pick.
+ &Apache::lonhtmlcommon::row_closure(1).
+ &Apache::lonhtmlcommon::end_pick_box().'</div>'.
+ '<div>'.&clone_form($dom,$formname,$crstype).'</div>'."\n";
return $output;
}
@@ -1251,14 +1647,14 @@ sub clone_form {
if ($crstype eq 'community') {
$type = 'Community';
}
- my $cloneform = &Apache::loncommon::select_dom_form($dom,'clonedomain').
- &Apache::loncommon::selectcourse_link($formname,'clonecourse','clonedomain','','','',$type);
+ 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{'cid'}).'<label>'.
- '<input type="text" size="25" name="clonecourse" value="" onfocus="this.blur();'.
- 'opencrsbrowser('."'$formname','clonecourse','clonedomain','','','','$type'".');" />'.
+ '<input type="text" size="25" name="clonecrs" value="" onfocus="this.blur();'.
+ 'opencrsbrowser('."'$formname','clonecrs','clonedom','','','','$type'".');" />'.
'</label>'.&Apache::lonhtmlcommon::row_closure(1).'<label>'.
&Apache::lonhtmlcommon::row_title($lt{'dmn'}).'</label>'.
$cloneform.'</label>'.&Apache::lonhtmlcommon::row_closure().
@@ -1275,7 +1671,7 @@ sub clone_form {
return $output;
}
-sub clone_text {
+sub clone_text {
return &Apache::lonlocal::texthash(
'cid' => 'Course ID',
'dmn' => 'Domain',
@@ -1375,46 +1771,83 @@ sub coursecode_form {
sub get_course_dom {
my $codedom = &Apache::lonnet::default_login_domain();
+ if ($env{'form.showdom'} ne '') {
+ if (&Apache::lonnet::domain($env{'form.showdom'}) ne '') {
+ return $env{'form.showdom'};
+ }
+ }
if (($env{'user.domain'} ne '') && ($env{'user.domain'} ne 'public')) {
+ my ($types,$typename) = &course_types();
+ if (ref($types) eq 'ARRAY') {
+ foreach my $type (@{$types}) {
+ if (&Apache::lonnet::usertools_access($env{'user.name'},
+ $env{'user.domain'},$type,
+ undef,'requestcourses')) {
+ return $env{'user.domain'};
+ }
+ }
+ my @possible_doms;
+ foreach my $type (@{$types}) {
+ my $dom_str = $env{'environment.reqcrsotherdom.'.$type};
+ if ($dom_str ne '') {
+ my @domains = split(',',$dom_str);
+ foreach my $entry (@domains) {
+ my ($extdom,$extopt) = split(':',$entry);
+ if ($extdom eq $env{'request.role.domain'}) {
+ return $extdom;
+ }
+ unless(grep(/^\Q$extdom\E$/,@possible_doms)) {
+ push(@possible_doms,$extdom);
+ }
+ }
+ }
+ }
+ if (@possible_doms) {
+ @possible_doms = sort(@possible_doms);
+ return $possible_doms[0];
+ }
+ }
$codedom = $env{'user.domain'};
if ($env{'request.role.domain'} ne '') {
$codedom = $env{'request.role.domain'};
}
}
- if ($env{'form.showdom'} ne '') {
- if (&Apache::lonnet::domain($env{'form.showdom'}) ne '') {
- $codedom = $env{'form.showdom'};
- }
- }
return $codedom;
}
sub display_navbuttons {
- my ($r,$formname,$prev,$prevtext,$next,$nexttext) = @_;
+ my ($r,$formname,$prev,$prevtext,$next,$nexttext,$state,$other,$othertext) = @_;
$r->print('<div class="LC_navbuttons">');
if ($prev) {
- $r->print('
- <input type="button" name="previous" value = "'.$prevtext.'"
- onclick="javascript:backPage(document.'.$formname.','."'".$prev."'".')"/>
- ');
+ $r->print('<input type="button" name="previous" value = "'.$prevtext.'" '.
+ 'onclick="javascript:backPage(document.'.$formname.','."'".$prev."'".')"/>'.
+ (' 'x3));
} elsif ($prevtext) {
- $r->print('
- <input type="button" name="previous" value = "'.$prevtext.'"
- onclick="javascript:history.back()"/>
- ');
+ $r->print('<input type="button" name="previous" value = "'.$prevtext.'" '.
+ 'onclick="javascript:history.back()"/>'.(' 'x3));
}
- if ($next) {
+ if ($state eq 'details') {
+ $r->print(' <input type="button" name="other" value="'.$othertext.'" '.
+ 'onclick="javascript:nextPage(document.'.$formname.','."'".$other."'".
+ ')" />');
+ }
+ if ($state eq 'courseinfo') {
+ $r->print('<input type="button" name="next" value="'.$nexttext.'" '.
+ 'onclick="javascript:validateForm();" />');
+ } elsif ($next) {
$r->print('
- <input type="button" name="next" value="'.$nexttext.'"
- onclick="javascript:nextPage(document.'.$formname.','."'".$next."'".')" />');
+ <input type="button" name="next" value="'.$nexttext.'" '.
+ 'onclick="javascript:nextPage(document.'.$formname.','."'".$next."'".')" />');
}
$r->print('</div>');
}
sub print_request_outcome {
my ($dom,$codetitles,$code_order) = @_;
- my ($output,$cnum,$now,$req_notifylist,$crstype,$startenroll,$endenroll,
+ 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";
@@ -1429,14 +1862,20 @@ sub print_request_outcome {
}
$now = time;
$crstype = $env{'form.crstype'};
+ my @instsections;
if ($crstype eq 'official') {
if (&Apache::lonnet::auto_run('',$dom)) {
- ($startenroll,$endenroll)=&dates_from_form('startenroll','endenroll');
+ ($enrollstart,$enrollend)=&dates_from_form('enrollstart','enrollend');
}
for (my $i=0; $i<$env{'form.sectotal'}; $i++) {
if ($env{'form.sec_'.$i}) {
if ($env{'form.secnum_'.$i} ne '') {
- $sections{$env{'form.secnum_'.$i}} = $env{'form.loncapasec_'.$i};
+ my $sec = $env{'form.secnum_'.$i};
+ $sections{$i}{'inst'} = $sec;
+ if (($sec ne '') && (!grep(/^\Q$sec\E$/,@instsections))) {
+ push(@instsections,$sec);
+ }
+ $sections{$i}{'loncapa'} = $env{'form.loncapasec_'.$i};
}
}
}
@@ -1450,24 +1889,60 @@ sub print_request_outcome {
}
}
}
- $xlistinfo .= $env{'form.crosslist_'.$i.'_instsec'};
- $crosslistings{$xlistinfo} = $env{'form.crosslist_'.$i.'_lcsec'};
+ $crosslistings{$i}{'instcode'} = $xlistinfo;
+ if ($xlistinfo ne '') {
+ $crosslisttotal ++;
+ }
+ $crosslistings{$i}{'instsec'} = $env{'form.crosslist_'.$i.'_instsec'};
+ $crosslistings{$i}{'loncapa'} = $env{'form.crosslist_'.$i.'_lcsec'};
}
}
+ } else {
+ $enrollstart = '';
+ $enrollend = '';
}
-
for (my $i=0; $i<$env{'form.persontotal'}; $i++) {
my $uname = $env{'form.person_'.$i.'_uname'};
- my $udom = $env{'form.person_'.$i.'_uname'};
+ my $udom = $env{'form.person_'.$i.'_dom'};
if (($uname =~ /^$match_username$/) && ($udom =~ /^$match_domain$/)) {
if (&Apache::lonnet::domain($udom) ne '') {
- $personnel{$uname.':'.$udom} = {
- first => $env{'form.person_'.$i.'_first'},
- last => $env{'form.person_'.$i.'_last'},
- email => $env{'form.person_'.$i.'_email'},
- role => $env{'form.person_'.$i.'_role'},
- sections => $env{'form.person_'.$i.'_sections'},
- };
+ unless (ref($personnel{$uname.':'.$udom}) eq 'HASH') {
+ $personnel{$uname.':'.$udom} = {
+ firstname => $env{'form.person_'.$i.'_firstname'},
+ lastname => $env{'form.person_'.$i.'_lastname'},
+ emailaddr => $env{'form.person_'.$i.'_emailaddr'},
+ };
+ }
+ my $role = $env{'form.person_'.$i.'_role'};
+ unless ($role eq '') {
+ if (ref($personnel{$uname.':'.$udom}{'roles'}) eq 'ARRAY') {
+ my @curr_roles = @{$personnel{$uname.':'.$udom}{'roles'}};
+ unless (grep(/^\Q$role\E$/,@curr_roles)) {
+ push(@{$personnel{$uname.':'.$udom}{'roles'}},$role);
+ }
+ } else {
+ @{$personnel{$uname.':'.$udom}{'roles'}} = ($role);
+ }
+ if ($role eq 'cc') {
+ @{$personnel{$uname.':'.$udom}{$role}{'usec'}} = ();
+ } else {
+ my @currsec = &Apache::loncommon::get_env_multiple('form.person_'.$i.'_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');
+ if ($sec ne '') {
+ unless (grep(/^\Q$sec\E$/,@currsec)) {
+ push(@currsec,$sec);
+ }
+ }
+ }
+ @{$personnel{$uname.':'.$udom}{$role}{'usec'}} = @currsec;
+ }
+ }
} else {
push(@missingdom,$uname.':'.$udom);
}
@@ -1475,52 +1950,84 @@ sub print_request_outcome {
push(@baduname,$uname.':'.$udom);
}
}
-
- my ($startaccess,$endaccess) = &dates_from_form('startaccess','endacess');
+ my ($accessstart,$accessend) = &dates_from_form('accessstart','accessend');
+ my $autodrops = 0;
+ if ($env{'form.autodrops'}) {
+ $autodrops = $env{'form.autodrops'};
+ }
+ my $autoadds = 0;
+ if ($env{'form.autoadds'}) {
+ $autodrops = $env{'form.autoadds'};
+ }
+ if ($env{'form.autoadds'}) {
+ $autodrops = $env{'form.autoadds'};
+ }
+ my $instcode = '';
+ if (exists($env{'form.instcode'})) {
+ $instcode = $env{'form.instcode'};
+ }
+ my $clonecrs = '';
+ my $clonedom = '';
+ if (($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'});
+ if ($canclone) {
+ $clonecrs = $env{'form.clonecrs'};
+ $clonedom = $env{'form.clonedom'};
+ }
+ }
+ }
my $details = {
owner => $env{'user.name'},
domain => $env{'user.domain'},
cdom => $dom,
cnum => $cnum,
- cdesc => $env{'form.cdesc'},
+ coursehome => $env{'form.chome'},
+ cdescr => $env{'form.cdescr'},
crstype => $env{'form.crstype'},
- instcode => $env{'form.instcode'},
- clonedomain => $env{'form.clonedomain'},
- clonecourse => $env{'form.clonecourse'},
+ instcode => $instcode,
+ clonedom => $clonedom,
+ clonecrs => $clonecrs,
datemode => $env{'form.datemode'},
- dateshift => $env{'form.datshift'},
- sectotal => $env{'form.sectotal'},
+ dateshift => $env{'form.dateshift'},
+ sectotal => $sectotal,
sections => \%sections,
- crosslisttotal => $env{'form.crosslisttotal'},
- crosslistings => \%crosslistings,
- autoadds => $env{'form.autoadds'},
- autodrops => $env{'form.autodrops'},
- startenroll => $startenroll,
- endenroll => $endenroll,
- startaccess => $startaccess,
- endaccess => $endaccess,
+ crosslisttotal => $crosslisttotal,
+ crosslists => \%crosslistings,
+ autoadds => $autoadds,
+ autodrops => $autodrops,
+ enrollstart => $enrollstart,
+ enrollend => $enrollend,
+ accessstart => $accessstart,
+ accessend => $accessend,
personnel => \%personnel,
};
my @inststatuses;
my $val = &get_processtype($dom,$crstype,\@inststatuses,\%domconfig);
if ($val eq '') {
if ($crstype eq 'official') {
- $output = &mt('You are not permitted to request creation of official courses');
+ $output = &mt('You are not permitted to request creation of official courses.');
} elsif ($crstype eq 'unofficial') {
- $output = &mt('You are not permitted to request creation of unofficial courses');
+ $output = &mt('You are not permitted to request creation of unofficial courses.');
} elsif ($crstype eq 'community') {
$output = &mt('You are not permitted to request creation of communities');
} else {
$output = &mt('Unrecognized course type: [_1]',$crstype);
}
} else {
- my ($disposition,$message);
+ my ($disposition,$message,$reqstatus);
my %reqhash = (
- timestamp => $now,
+ reqtime => $now,
crstype => $crstype,
details => $details,
);
my $requestkey = $dom.'_'.$cnum;
+ my $validationerror;
if ($val eq 'autolimit=') {
$disposition = 'process';
} elsif ($val =~ /^autolimit=(\d+)$/) {
@@ -1528,36 +2035,66 @@ sub print_request_outcome {
$disposition = &check_autolimit($env{'user.name'},$env{'user.domain'},
$dom,$crstype,$limit,\$message);
} elsif ($val eq 'validate') {
- $disposition =
- &Apache::lonnet::auto_courserequest_validation($dom,$details,
- \@inststatuses,\$message);
+ my ($inststatuslist,$validationchk,$validation);
+ if (@inststatuses > 0) {
+ $inststatuslist = join(',',@inststatuses);
+ }
+ my $instseclist;
+ if (@instsections > 0) {
+ $instseclist = join(',',@instsections);
+ }
+ $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 = $validation;
+ }
} else {
$disposition = 'approval';
}
- $reqhash{'status'} = $disposition;
+ $reqhash{'disposition'} = $disposition;
+ $reqstatus = $disposition;
+ my ($modified,$queued);
if ($disposition eq 'rejected') {
$output = &mt('Your course request was rejected.');
if ($message) {
$output .= '<div class="LC_warning">'.$message.'</div>';
}
} 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 ($logmsg,$newusermsg,$addresult,$enrollcount,$output,$keysmsg,%longroles);
- my @roles = &Apache::lonuserutils::roles_by_context('course');
foreach my $role (@roles) {
$longroles{$role}=&Apache::lonnet::plaintext($role,$type);
}
- my %reqdetails = &build_batchcreatehash($details);
- my $cid = &LONCAPA::batchcreatecourse::build_course($dom,$cnum,'request',\%reqdetails,\%longroles,\$logmsg,\$newusermsg,\$addresult,\$enrollcount,\$output,\$keysmsg,$env{'user.domain'},$env{'user.name'},$cnum);
- $disposition = 'created';
- if ($cid eq $cnum) {
+ my $result = &Apache::loncoursequeueadmin::course_creation($dom,$cnum,
+ 'autocreate',$details,\$logmsg,\$newusermsg,\$addresult,
+ \$enrollcount,\$response,\$keysmsg,\%domdefs,\%longroles);
+ if ($result eq 'created') {
$disposition = 'created';
- $output = &mt('Your course request has been processed and the course has been created.').'<br />'.&mt('You will need to logout and log-in again to be able to select a role in the course.');
+ $reqstatus = 'created';
+ $output = &mt('Your course request has been processed and the course has been created.').
+ '<br />'.
+ &mt('You will need to logout and log-in again to be able to select a role in the course.');
} else {
- $output = &mt('An error occurred when processing your course request.').'<br />'.&mt('You may want to review the request details and submit the request again.');
+ $output = '<span class="LC_error">'.
+ &mt('An error occurred when processing your course request.').
+ '<br />'.
+ &mt('You may want to review the request details and submit the request again.').
+ '</span>';
}
} else {
my $requestid = $cnum.'_'.$disposition;
@@ -1567,59 +2104,101 @@ sub print_request_outcome {
crstype => $crstype,
ownername => $env{'user.name'},
ownerdom => $env{'user.domain'},
- description => $env{'form.cdesc'},
+ description => $env{'form.cdescr'},
},
};
- my $putresult = &Apache::lonnet::newput_dom('courserequestqueue',$request,
- $dom);
- if ($putresult eq 'ok') {
- my %emails = &Apache::loncommon::getemails();
- my $address;
- if (($emails{'permanentemail'} ne '') || ($emails{'notification'} ne '')) {
- $address = $emails{'permanentemail'};
- if ($address eq '') {
- $address = $emails{'notification'};
- }
- }
- $output = &mt('Your course request has been recorded.').'<br />';
- if ($disposition eq 'approval') {
- $output .= &mt('Your course request has been recorded.').'<br />'.
- &mt('A message will be sent to your LON-CAPA account when a domain coordinator takes action on your request.').'<br />'.
- &mt('To access your LON-CAPA message, go to the Main Menu and click on "Send and Receive Messages".').'<br />';
- if ($address ne '') {
- $output.= &mt('An e-mail will also be sent to: [_1] when this occurs.',$address).'<br />';
- }
- if ($req_notifylist) {
- my $fullname = &Apache::loncommon::plainname($env{'user.name'},
- $env{'user.domain'});
- &Apache::loncoursequeueadmin::send_selfserve_notification($req_notifylist,$fullname,$now,$dom,$details);
- }
+ 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);
+ if (($queuehash{$cnum.'_approval'} ne '') ||
+ ($queuehash{$cnum.'_pending'} ne '')) {
+ $queued = 1;
+ }
+ }
+ unless ($queued) {
+ my $putresult = &Apache::lonnet::newput_dom('courserequestqueue',$request,
+ $dom);
+ if ($putresult eq 'ok') {
+ $output = &mt('Your course request has been recorded.').'<br />'.
+ ¬ification_information($disposition,$req_notifylist,
+ $cnum,$now);
} else {
- $output .= '<div class="LC_info">'.
-&mt('Your request has been placed in a queue pending administrative action.').'<br />'.
-&mt("Usually this means that your institution's information systems do not list you among the instructional personnel for this course.").'<br />'.
-&mt('The list of instructional personnel for the course will be automatically checked daily, and once you are listed the request will be processed.').
- '</div>';
+ $reqstatus = 'domainerror';
+ $reqhash{'disposition'} = $disposition;
+ my $warning = &mt('An error occurred saving your request in the pending requests queue.');
+ $output = '<span class"LC_warning">'.$warning.'</span><br />';
}
- } else {
- $reqhash{'status'} = 'domainerror';
- $reqhash{'disposition'} = $disposition;
- my $warning = &mt('An error occurred saving your request in the pending requests queue.');
- $output = '<span class"LC_warning">'.$warning.'</span><br />';
-
}
}
- my $storeresult;
+ my ($storeresult,$statusresult);
if ($requestkey =~ /^($match_domain)_($match_courseid)$/) {
$storeresult = &Apache::lonnet::store_userdata(\%reqhash,$requestkey,
'courserequests');
+ if ($storeresult eq 'ok') {
+ my %status = (
+ 'status:'.$dom.':'.$cnum => $reqstatus,
+ );
+ $statusresult = &Apache::lonnet::put('courserequests',\%status);
+ }
} else {
$storeresult = 'error: invalid requestkey format';
}
if ($storeresult ne 'ok') {
- $output .= '<span class="LC_warning">'.&mt('An error occurred saving a record of the details of your request.').'</span><br />';
- &logthis("Error saving course request - $requestkey for $env{'user.name'}:$env{'user.domain'} - $storeresult");
+ $output .= '<span class="LC_warning">'.&mt('An error occurred saving a record of the details of your request: [_1].',$storeresult).'</span><br />';
+ &Apache::lonnet::logthis("Error saving course request - $requestkey for $env{'user.name'}:$env{'user.domain'} - $storeresult");
+ } elsif ($statusresult ne 'ok') {
+ $output .= '<span class="LC_warning">'.&mt('An error occurred saving a record of the status of your request: [_1].',$statusresult).'</span><br />';
+ &Apache::lonnet::logthis("Error saving course request status for $requestkey (for $env{'user.name'}:$env{'user.domain'}) - $statusresult");
+ }
+ if ($modified && $queued && $storeresult eq 'ok') {
+ $output .= '<p>'.&mt('Your course request has been updated').'</p>'.
+ ¬ification_information($disposition,$req_notifylist,$cnum,$now);
+ }
+ if ($validationerror ne '') {
+ $output .= '<span class="LC_warning">'.&mt('An error occurred validating your request with institutional data sources: [_1].',$validationerror).'</p>';
+ }
+ }
+ return $output;
+}
+
+sub notification_information {
+ my ($disposition,$req_notifylist,$cnum,$now) = @_;
+ my %emails = &Apache::loncommon::getemails();
+ my $address;
+ if (($emails{'permanentemail'} ne '') || ($emails{'notification'} ne '')) {
+ $address = $emails{'permanentemail'};
+ if ($address eq '') {
+ $address = $emails{'notification'};
+ }
+ }
+ my $output;
+ if ($disposition eq 'approval') {
+ $output .= &mt('A message will be sent to your LON-CAPA account when a domain coordinator takes action on your request.').'<br />'.
+ &mt('To access your LON-CAPA message, go to the Main Menu and click on "Send and Receive Messages".').'<br />';
+ if ($address ne '') {
+ $output.= &mt('An e-mail will also be sent to: [_1] when this occurs.',$address).'<br />';
+ }
+ if ($req_notifylist) {
+ my $fullname = &Apache::loncommon::plainname($env{'user.name'},
+ $env{'user.domain'});
+ my $sender = $env{'user.name'}.':'.$env{'user.domain'};
+ &Apache::loncoursequeueadmin::send_selfserve_notification($req_notifylist,"$fullname ($env{'user.name'}:$env{'user.domain'})",$cnum,$env{'form.cdescr'},$now,'coursereq',$sender);
}
+ } elsif ($disposition eq 'pending') {
+ $output .= '<div class="LC_info">'.
+&mt('Your request has been placed in a queue pending administrative action.').'<br />'.
+&mt("Usually this means that your institution's information systems do not list you among the instructional personnel for this course.").'<br />'.
+&mt('The list of instructional personnel for the course will be automatically checked daily, and once you are listed the request will be processed.').
+ '</div>';
+ } else {
+ $output .= '<div class="LC_warning">'.
+ &mt('Your request status is: [_1].',$disposition).
+ '</div>'
}
return $output;
}
@@ -1628,7 +2207,7 @@ 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','approve');
+ my @options = ('autolimit','validate','approval');
if ($dom eq $env{'user.domain'}) {
%userenv =
&Apache::lonnet::userenvironment($env{'user.domain'},$env{'user.name'},
@@ -1641,14 +2220,14 @@ sub get_processtype {
if (ref($domconfig->{'requestcourses'}) eq 'HASH') {
%settings = %{$domconfig->{'requestcourses'}};
if (ref($settings{$crstype}) eq 'HASH') {
- if (($env{'user.adv'}) && (exists($settings{$crstype}{'_LC_adv'}))) {
+ if (($env{'user.adv'}) && ($settings{$crstype}{'_LC_adv'} ne '')) {
$val = $settings{$crstype}{'_LC_adv'};
@{$inststatuses} = ('_LC_adv_');
} else {
if ($userenv{'inststatus'} ne '') {
@{$inststatuses} = split(',',$userenv{'inststatus'});
} else {
- @{$inststatuses} = ('other');
+ @{$inststatuses} = ('default');
}
foreach my $status (@{$inststatuses}) {
if (exists($settings{$crstype}{$status})) {
@@ -1666,6 +2245,7 @@ sub get_processtype {
}
}
my $maxlimit = 0;
+
foreach my $key (sort(keys(%alltasks))) {
if ($key =~ /^autolimit=(\d*)$/) {
if ($1 eq '') {
@@ -1693,11 +2273,17 @@ sub get_processtype {
} else {
%userenv = &Apache::lonnet::userenvironment($env{'user.domain'},
$env{'user.name'},'reqcrsotherdom.'.$env{'form.crstype'});
- if ($userenv{'reqcrsotherdom'}) {
- my @doms = split(',',$userenv{'reqcrsotherdom'});
- my $optregex = join('|',@options);
- if (grep(/^\Q$dom\E:($optregex=?\d*)/,@doms)) {
- $val = $1;
+ 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_');
}
@@ -1739,38 +2325,167 @@ sub check_autolimit {
return;
}
-sub build_batchcreatehash {
- my ($details) = @_;
- my %batchhash;
- if (ref($details) eq 'HASH') {
-
+sub retrieve_settings {
+ my ($dom,$cnum) = @_;
+ my ($result,%reqinfo) = &get_request_settings($dom,$cnum);
+ if ($result eq 'ok') {
+ if (($env{'user.name'} eq $reqinfo{'owner'}) &&
+ ($env{'user.domain'} eq $reqinfo{'domain'})) {
+ $env{'form.chome'} = $reqinfo{'coursehome'};
+ $env{'form.cdescr'} = $reqinfo{'cdescr'};
+ $env{'form.crstype'} = $reqinfo{'crstype'};
+ &generate_date_items($reqinfo{'accessstart'},'accessstart');
+ &generate_date_items($reqinfo{'accessend'},'accessend');
+ if ($reqinfo{'accessend'} == 0) {
+ $env{'form.no_end_date'} = 1;
+ }
+ if (($reqinfo{'crstype'} eq 'official') && (&Apache::lonnet::auto_run('',$dom))) {
+ &generate_date_items($reqinfo{'enrollstart'},'enrollstart');
+ &generate_date_items($reqinfo{'enrollend'},'enrollend');
+ }
+ $env{'form.clonecrs'} = $reqinfo{'clonecrs'};
+ $env{'form.clonedom'} = $reqinfo{'clonedom'};
+ $env{'form.datemode'} = $reqinfo{'datemode'};
+ $env{'form.dateshift'} = $reqinfo{'dateshift'};
+ if (($reqinfo{'crstype'} eq 'official') && ($reqinfo{'instcode'} ne '')) {
+ $env{'form.sectotal'} = $reqinfo{'sectotal'};
+ $env{'form.crosslisttotal'} = $reqinfo{'crosslisttotal'};
+ $env{'form.autoadds'} = $reqinfo{'autoadds'};
+ $env{'form.autdrops'} = $reqinfo{'autodrops'};
+ $env{'form.instcode'} = $reqinfo{'instcode'};
+ my $crscode = {
+ $cnum => $reqinfo{'instcode'},
+ };
+ &extract_instcode($dom,'instcode',$crscode,$cnum);
+ }
+ my @currsec;
+ if (ref($reqinfo{'sections'}) eq 'HASH') {
+ foreach my $i (sort(keys(%{$reqinfo{'sections'}}))) {
+ if (ref($reqinfo{'sections'}{$i}) eq 'HASH') {
+ my $sec = $reqinfo{'sections'}{$i}{'inst'};
+ $env{'form.secnum_'.$i} = $sec;
+ $env{'form.sec_'.$i} = '1';
+ if (!grep(/^\Q$sec\E$/,@currsec)) {
+ push(@currsec,$sec);
+ }
+ $env{'form.loncapasec_'.$i} = $reqinfo{'sections'}{$i}{'loncapa'};
+ }
+ }
+ }
+ if (ref($reqinfo{'crosslists'}) eq 'HASH') {
+ foreach my $i (sort(keys(%{$reqinfo{'crosslists'}}))) {
+ if (ref($reqinfo{'crosslists'}{$i}) eq 'HASH') {
+ $env{'form.crosslist_'.$i} = '1';
+ $env{'form.crosslist_'.$i.'_instsec'} = $reqinfo{'crosslists'}{$i}{'instsec'};
+ $env{'form.crosslist_'.$i.'_lcsec'} = $reqinfo{'crosslists'}{$i}{'loncapa'};
+ if ($reqinfo{'crosslists'}{$i}{'instcode'} ne '') {
+ my $key = $cnum.$i;
+ my $crscode = {
+ $key => $reqinfo{'crosslists'}{$i}{'instcode'},
+ };
+ &extract_instcode($dom,'crosslist',$crscode,$key,$i);
+ }
+ }
+ }
+ }
+ if (ref($reqinfo{'personnel'}) eq 'HASH') {
+ my $i = 0;
+ foreach my $user (sort(keys(%{$reqinfo{'personnel'}}))) {
+ my ($uname,$udom) = split(':',$user);
+ if (ref($reqinfo{'personnel'}{$user}) eq 'HASH') {
+ if (ref($reqinfo{'personnel'}{$user}{'roles'}) eq 'ARRAY') {
+ foreach my $role (sort(@{$reqinfo{'personnel'}{$user}{'roles'}})) {
+ $env{'form.person_'.$i.'_role'} = $role;
+ $env{'form.person_'.$i.'_firstname'} = $reqinfo{'personnel'}{$user}{'firstname'};
+ $env{'form.person_'.$i.'_lastname'} = $reqinfo{'personnel'}{$user}{'lastname'}; ;
+ $env{'form.person_'.$i.'_emailaddr'} = $reqinfo{'personnel'}{$user}{'emailaddr'};
+ $env{'form.person_'.$i.'_uname'} = $uname;
+ $env{'form.person_'.$i.'_dom'} = $udom;
+ if (ref($reqinfo{'personnel'}{$user}{$role}) eq 'HASH') {
+ if (ref($reqinfo{'personnel'}{$user}{$role}{'usec'}) eq 'ARRAY') {
+ my @usecs = @{$reqinfo{'personnel'}{$user}{$role}{'usec'}};
+ my @newsecs;
+ if (@usecs > 0) {
+ foreach my $sec (@usecs) {
+ if (grep(/^\Q$sec\E/,@currsec)) {
+ $env{'form.person_'.$i.'_sec'} = $sec;
+ } else {
+ push(@newsecs,$sec);
+ }
+ }
+ }
+ if (@newsecs > 0) {
+ $env{'form.person_'.$i.'_newsec'} = join(',',@newsecs);
+ }
+ }
+ }
+ $i ++;
+ }
+ }
+ }
+ }
+ $env{'form.persontotal'} = $i;
+ }
+ }
}
- return %batchhash;
+ return $result;
}
-sub retrieve_settings {
- my ($dom,$request_id) = @_;
- my %reqinfo = &get_request_settings($request_id,$dom);
- my %stored;
- $stored{'cdescr'} = &unescape($reqinfo{'description'});
- $stored{'startaccess'} = $reqinfo{'startaccess'};
- $stored{'endaccess'} = $reqinfo{'endaccess'};
- if ($stored{'endaccess'} == 0) {
- $stored{'no_end_date'} = 1;
- }
- $stored{'startenroll'} = $reqinfo{'startenroll'};
- $stored{'endenroll'} = $reqinfo{'endenroll'};
- $stored{'crosslist'} = $reqinfo{'crosslist'};
- $stored{'clonecourse'} = $reqinfo{'clonecourse'};
- $stored{'clonedomain'} = $reqinfo{'clonedomain'};
- $stored{'sections'} = $reqinfo{'sections'};
- $stored{'personnel'} = $reqinfo{'personnel'};
+sub get_request_settings {
+ my ($dom,$cnum) = @_;
+ my $requestkey = $dom.'_'.$cnum;
+ my ($result,%reqinfo);
+ if ($requestkey =~ /^($match_domain)_($match_courseid)$/) {
+ my %history = &Apache::lonnet::restore($requestkey,'courserequests',
+ $env{'user.domain'},$env{'user.name'});
+ my $disposition = $history{'disposition'};
+ if (($disposition eq 'approval') || ($disposition eq 'pending')) {
+ if (ref($history{'details'}) eq 'HASH') {
+ %reqinfo = %{$history{'details'}};
+ $result = 'ok';
+ } else {
+ $result = 'nothash';
+ }
+ } else {
+ $result = 'notqueued';
+ }
+ } else {
+ $result = 'invalid';
+ }
+ return ($result,%reqinfo);
+}
- return %stored;
+sub extract_instcode {
+ my ($cdom,$element,$crscode,$crskey,$counter) = @_;
+ my (%codes,@codetitles,%cat_titles,%cat_order);
+ if (&Apache::lonnet::auto_instcode_format('requests',$cdom,$crscode,\%codes,
+ \@codetitles,\%cat_titles,
+ \%cat_order) eq 'ok') {
+ if (ref($codes{$crskey}) eq 'HASH') {
+ if (@codetitles > 0) {
+ my $sel = $element;
+ if ($element eq 'crosslist') {
+ $sel .= '_'.$counter;
+ }
+ foreach my $title (@codetitles) {
+ $env{'form.'.$sel.'_'.$title} = $codes{$crskey}{$title};
+ }
+ }
+ }
+ }
+ return;
}
-sub get_request_settings {
- my ($request_id,$dom);
+sub generate_date_items {
+ my ($currentval,$item) = @_;
+ if ($currentval =~ /\d+/) {
+ my ($tzname,$sec,$min,$hour,$mday,$month,$year) =
+ &Apache::lonhtmlcommon::get_timedates($currentval);
+ $env{'form.'.$item.'_day'} = $mday;
+ $env{'form.'.$item.'_month'} = $month+1;
+ $env{'form.'.$item.'_year'} = $year;
+ }
+ return;
}
1;