[LON-CAPA-cvs] cvs: loncom /interface lonrequestcourse.pm
raeburn
raeburn@source.lon-capa.org
Tue, 18 Aug 2009 01:41:37 -0000
This is a MIME encoded message
--raeburn1250559697
Content-Type: text/plain
raeburn Tue Aug 18 01:41:37 2009 EDT
Modified files:
/loncom/interface lonrequestcourse.pm
Log:
- Can modify pending requests.
- Can cancel pending requests.
--raeburn1250559697
Content-Type: text/plain
Content-Disposition: attachment; filename="raeburn-20090818014137.txt"
Index: loncom/interface/lonrequestcourse.pm
diff -u loncom/interface/lonrequestcourse.pm:1.15 loncom/interface/lonrequestcourse.pm:1.16
--- loncom/interface/lonrequestcourse.pm:1.15 Mon Aug 17 04:39:15 2009
+++ loncom/interface/lonrequestcourse.pm Tue Aug 18 01:41:37 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Request a course
#
-# $Id: lonrequestcourse.pm,v 1.15 2009/08/17 04:39:15 raeburn Exp $
+# $Id: lonrequestcourse.pm,v 1.16 2009/08/18 01:41:37 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -128,22 +128,24 @@
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);
}
@@ -154,7 +156,7 @@
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')) {
@@ -173,13 +175,20 @@
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)) {
@@ -273,6 +282,7 @@
crstype => {
crstype => 'selectbox',
action => 'selectbox',
+ origcnum => 'hidden',
},
courseinfo => {
cdescr => 'text',
@@ -297,7 +307,6 @@
no_end_date => 'checkbox',
},
personnel => {
- persontotal => 'hidden',
addperson => 'checkbox',
},
review => {
@@ -359,6 +368,9 @@
}
}
my $crosslisttotal = $env{'form.crosslisttotal'};
+ if ($env{'form.addcrosslist'}) {
+ $crosslisttotal ++;
+ }
if (!defined($crosslisttotal)) {
$crosslisttotal = 1;
}
@@ -382,7 +394,10 @@
}
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++) {
@@ -589,13 +604,19 @@
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();
@@ -611,9 +632,108 @@
$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') {
+ $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(&print_request_status($dom));
+ $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);
@@ -706,10 +826,18 @@
} 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') {
@@ -719,6 +847,14 @@
my $result = &print_request_outcome($dom,\@codetitles,\@code_order);
$r->print($result);
}
+ my @excluded = &get_excluded_elements($dom,$states,$action,$state);
+ $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') {
@@ -729,7 +865,7 @@
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);
}
}
@@ -742,9 +878,7 @@
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'},$state);
- return;
+ return @excluded;
}
sub print_enrollment_menu {
@@ -755,7 +889,7 @@
my %accesstitles = (
'start' => 'Default start access',
- 'end' => 'Default end accss',
+ 'end' => 'Default end access',
);
my %enrolltitles = (
'start' => 'Start auto-enrollment',
@@ -879,7 +1013,7 @@
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'}) {
@@ -1038,11 +1172,12 @@
}
$formname = 'requestcrs';
my @sortedtimes = sort {$a <=> $b} (keys(%queue_by_date));
- $output = '<h3>'.&mt('Pending course requests').'</h3><div>'."\n".
- '<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().
@@ -1065,7 +1200,7 @@
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><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') {
@@ -1100,6 +1235,102 @@
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;
@@ -1126,10 +1357,16 @@
$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}) {
@@ -1146,6 +1383,7 @@
}
}
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>'.
@@ -1232,7 +1470,7 @@
}
$inst_values .= '</td><td>';
if ($env{'form.datemode'} eq 'preserve') {
- $inst_values .= $ctxt{'pcd'};
+ $inst_values .= $ctxt{'prd'};
} elsif ($env{'form.datemode'} eq 'shift') {
$inst_values .= &mt('Shift dates by [_1] days',$env{'form.dateshift'});
} else {
@@ -1299,7 +1537,7 @@
'<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>'.
@@ -1315,7 +1553,7 @@
'<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();
@@ -1330,8 +1568,6 @@
$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;
}
@@ -1374,8 +1610,7 @@
'default','hide');
if ($numlib > 1) {
$output .= &Apache::lonhtmlcommon::row_closure().
- &Apache::lonhtmlcommon::row_title(
- &mt('Home Server for Course'));
+ &Apache::lonhtmlcommon::row_title(&mt('Home Server for Course'));
}
$output .= $home_server_pick.
&Apache::lonhtmlcommon::row_closure(1).
@@ -1414,7 +1649,7 @@
return $output;
}
-sub clone_text {
+sub clone_text {
return &Apache::lonlocal::texthash(
'cid' => 'Course ID',
'dmn' => 'Domain',
@@ -1529,26 +1764,28 @@
}
sub display_navbuttons {
- my ($r,$formname,$prev,$prevtext,$next,$nexttext,$state) = @_;
+ 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 ($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();" />');
+ $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>');
}
@@ -1604,7 +1841,7 @@
}
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 '') {
unless (ref($personnel{$uname.':'.$udom}) eq 'HASH') {
@@ -1616,7 +1853,7 @@
}
my $role = $env{'form.person_'.$i.'_role'};
unless ($role eq '') {
- if (ref(@{$personnel{$uname.':'.$udom}{'roles'}}) eq 'ARRAY') {
+ 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);
@@ -1679,10 +1916,12 @@
my $clonedom = '';
if (($env{'form.clonecrs'} =~ /^($match_courseid)$/) &&
($env{'form.clonedom'} =~ /^($match_domain)$/)) {
- my $clonehome = &Apache::lonnet::homeserver($env{'form.clonedom'},$env{'form.clonecrs'});
+ my $clonehome = &Apache::lonnet::homeserver($env{'form.clonecrs'},
+ $env{'form.clonedom'});
if ($clonehome ne 'no_host') {
- my $canclone = &can_clone_course($env{'user.name'},$env{'user.domain'},
- $env{'form.clonecrs'}, $env{'form.clonedom'});
+ 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'};
@@ -1749,6 +1988,7 @@
}
$reqhash{'disposition'} = $disposition;
$reqstatus = $disposition;
+ my ($modified,$queued);
if ($disposition eq 'rejected') {
$output = &mt('Your course request was rejected.');
if ($message) {
@@ -1792,43 +2032,32 @@
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('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);
- }
+ my $statuskey = 'status:'.$dom.':'.$cnum;
+ my %userreqhash = &Apache::lonnet::get('courserequests',[$statuskey],
+ $env{'user.domain'},$env{'user.name'});
+ if (exists($userreqhash{$statuskey})) {
+ $modified = 1;
+ my %queuehash = &Apache::lonnet::get_dom('courserequestqueue',
+ [$cnum.'_approval',
+ $cnum.'_pending'],$dom);
+ if ((exists($queuehash{$cnum.'_approval'})) ||
+ (exists($queuehash{$cnum.'_pending'}))) {
+ $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 {
- $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 />';
-
}
}
my ($storeresult,$statusresult);
@@ -1851,6 +2080,43 @@
$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);
+ }
+ }
+ 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);
+ }
+ } 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>';
}
return $output;
}
@@ -1972,28 +2238,168 @@
}
sub retrieve_settings {
- my ($dom,$request_id) = @_;
- my %reqinfo = &get_request_settings($request_id,$dom);
- my %stored;
- $stored{'cdescr'} = &unescape($reqinfo{'description'});
- $stored{'accessstart'} = $reqinfo{'accessstart'};
- $stored{'accessend'} = $reqinfo{'accessend'};
- if ($stored{'accessend'} == 0) {
- $stored{'no_end_date'} = 1;
- }
- $stored{'enrollstart'} = $reqinfo{'enrollstart'};
- $stored{'enrollend'} = $reqinfo{'enrollend'};
- $stored{'crosslist'} = $reqinfo{'crosslist'};
- $stored{'clonecrs'} = $reqinfo{'clonecrs'};
- $stored{'clonedom'} = $reqinfo{'clonedom'};
- $stored{'sections'} = $reqinfo{'sections'};
- $stored{'personnel'} = $reqinfo{'personnel'};
-
- return %stored;
+ 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 = (
+ instcode => $reqinfo{'instcode'},
+ );
+ &extract_instcode($dom,'instcode',\%crscode);
+ }
+ 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;
+ if (!grep(/^\Q$sec\E$/,@currsec)) {
+ push(@currsec,$sec);
+ }
+ $env{'form.loncapasec_'.$i} = $reqinfo{'sections'}{$i}{'loncapa'};
+ }
+ }
+ }
+ if (ref($reqinfo{'crosslistings'}) eq 'HASH') {
+ foreach my $i (sort(keys(%{$reqinfo{'crosslistings'}}))) {
+ if (ref($reqinfo{'crosslistings'}{$i}) eq 'HASH') {
+ $env{'form.crosslist_'.$i.'_lcsec'} = $reqinfo{'crosslistings'}{$i}{'loncapa'};
+ my $xlistsec = $reqinfo{'crosslistings'}{$i}{'instsec'};
+ my %crscode = (
+ $i => $reqinfo{'crosslistings'}{$i}{'instcode'},
+ );
+ &extract_instcode($dom,'crosslist',\%crscode,$1,$xlistsec);
+ }
+ }
+ }
+ 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 $result;
}
sub get_request_settings {
- my ($request_id,$dom);
+ 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);
+}
+
+sub extract_instcode {
+ my ($cdom,$element,$crscodehashref,$counter,$xlistsec) = @_;
+ my (%codes,@codetitles,%cat_titles,%cat_order);
+ if (ref($crscodehashref) eq 'HASH') {
+ if (&Apache::lonnet::auto_instcode_format('requests',$cdom,$crscodehashref,
+ \%codes,\@codetitles,\%cat_titles,\%cat_order) eq 'ok') {
+ if (@codetitles > 0) {
+ my $sel = $element;
+ if ($element eq 'crosslist') {
+ $sel .= '_'.$counter;
+ }
+ my $lastitem = pop(@codetitles);
+ foreach my $title (@codetitles) {
+ if (ref($cat_order{$title}) eq 'ARRAY') {
+ if (@{$cat_order{$title}} > 0) {
+ $env{'form.'.$sel.'_'.$title} = $cat_order{$title}[0];
+ }
+ }
+ }
+ if ($element eq 'crosslist') {
+ $env{'form.'.$sel.'_'.$lastitem} = $xlistsec;
+ }
+ }
+ }
+ }
+ return;
+}
+
+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;
--raeburn1250559697--