[LON-CAPA-cvs] cvs: loncom /interface lonrequestcourse.pm
raeburn
raeburn@source.lon-capa.org
Mon, 31 Aug 2009 14:57:06 -0000
This is a MIME encoded message
--raeburn1251730626
Content-Type: text/plain
raeburn Mon Aug 31 14:57:06 2009 EDT
Modified files:
/loncom/interface lonrequestcourse.pm
Log:
- move breadcrumb generation to &get_breadcrumbs().
- breadcrumb links point to request main menu if course request submission was
processed without error, or if course request was removed via cancel action.
- move validation of institutional code to &get_breadcrumbs() so trail is correct,
if re-display of course code setting table is needed.
- validate institutional codes for crosslisted courses
- xhtml: use three separate forms on request main menu to satisfy valid tag nesting.
- Add row_headlines in pick_box tables and aggregate items on each page into a single
pick_box table.
- Replace "Back" button on request outcome screen with link to "Make another request",
(and if request is queued - link to "Modify this request".
--raeburn1251730626
Content-Type: text/plain
Content-Disposition: attachment; filename="raeburn-20090831145706.txt"
Index: loncom/interface/lonrequestcourse.pm
diff -u loncom/interface/lonrequestcourse.pm:1.26 loncom/interface/lonrequestcourse.pm:1.27
--- loncom/interface/lonrequestcourse.pm:1.26 Thu Aug 27 00:06:18 2009
+++ loncom/interface/lonrequestcourse.pm Mon Aug 31 14:57:06 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Request a course
#
-# $Id: lonrequestcourse.pm,v 1.26 2009/08/27 00:06:18 raeburn Exp $
+# $Id: lonrequestcourse.pm,v 1.27 2009/08/31 14:57:06 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -44,6 +44,8 @@
=item handler()
+=item get_breadcrumbs()
+
=item header()
=item form_elements()
@@ -58,10 +60,16 @@
=item request_administration()
+=item close_popup_form()
+
+=item get_instcode()
+
=item print_request_form()
=item print_enrollment_menu()
+=item show_invalid_crosslists()
+
=item inst_section_selector()
=item date_setting_table()
@@ -100,6 +108,10 @@
=item get_request_settings()
+=item extract_instcode()
+
+=item generate_date_items()
+
=back
=cut
@@ -122,14 +134,53 @@
return OK;
}
- &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['action','showdom','cnum']);
+ &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+ ['action','showdom','cnum','state']);
&Apache::lonhtmlcommon::clear_breadcrumbs();
my $dom = &get_course_dom();
my $action = $env{'form.action'};
my $state = $env{'form.state'};
- my %stored;
- my $jscript;
- my ($uname,$udom,$result,$warning);
+ my (%states,%stored);
+ my ($jscript,$uname,$udom,$result,$warning);
+
+ $states{'display'} = ['details'];
+ $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');
+ }
+ }
+
+ foreach my $key (keys(%states)) {
+ if (ref($states{$key}) eq 'ARRAY') {
+ unshift (@{$states{$key}},'crstype');
+ }
+ }
+
+ my @invalidcrosslist;
+ my %trail = (
+ crstype => 'Course Request Action',
+ codepick => 'Category',
+ courseinfo => 'Description',
+ 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,$crumb,$newinstcode,$codechk,$checkedcode) =
+ &get_breadcrumbs($dom,$action,\$state,\%states,\%trail);
if ($action eq 'display') {
if (($dom eq $env{'request.role.domain'}) && (&Apache::lonnet::allowed('ccc',$dom))) {
my $namespace = 'courserequestqueue';
@@ -162,6 +213,46 @@
if ((defined($env{'form.showdom'})) && (defined($env{'form.cnum'}))) {
my $result = &retrieve_settings($env{'form.showdom'},$env{'form.cnum'});
}
+ } elsif ($env{'form.crstype'} eq 'official') {
+ if (&Apache::lonnet::auto_run('',$dom)) {
+ if (($action eq 'new') && (($state eq 'enrollment') ||
+ ($state eq 'personnel'))) {
+ my $checkcrosslist = 0;
+ for (my $i=0; $i<$env{'form.crosslisttotal'}; $i++) {
+ if ($env{'form.crosslist_'.$i}) {
+ $checkcrosslist ++;
+ }
+ }
+ if ($checkcrosslist) {
+ my %codechk;
+ my (@codetitles,%cat_titles,%cat_order,@code_order,$lastitem);
+ &Apache::lonnet::auto_possible_instcodes($dom,\@codetitles,
+ \%cat_titles,
+ \%cat_order,
+ \@code_order);
+ my $numtitles = scalar(@codetitles);
+ if ($numtitles) {
+ for (my $i=0; $i<$env{'form.crosslisttotal'}; $i++) {
+ if ($env{'form.crosslist_'.$i}) {
+ my $codecheck;
+ my $crosslistcode = '';
+ foreach my $item (@code_order) {
+ $crosslistcode .= $env{'form.crosslist_'.$i.'_'.$item};
+ }
+ if ($crosslistcode ne '') {
+ $codechk{$i} =
+ &Apache::lonnet::auto_validate_instcode('',$dom,$crosslistcode);
+ }
+ unless ($codechk{$i} eq 'valid') {
+ $env{'form.crosslist_'.$i} = '';
+ push(@invalidcrosslist,$crosslistcode);
+ }
+ }
+ }
+ }
+ }
+ }
+ }
}
my %elements = &form_elements($dom);
my $elementsref = {};
@@ -182,80 +273,6 @@
my $loaditems = &onload_action($action,$state);
- my %states;
- $states{'display'} = ['details'];
- $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');
- }
- }
-
- foreach my $key (keys(%states)) {
- if (ref($states{$key}) eq 'ARRAY') {
- unshift (@{$states{$key}},'crstype');
- }
- }
-
- my %trail = (
- crstype => 'Course Request Action',
- codepick => 'Category',
- courseinfo => 'Description',
- 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)) {
- my $done = 0;
- my $i=0;
- if (ref($states{$action}) eq 'ARRAY') {
- while ($i<@{$states{$action}} && !$done) {
- if ($states{$action}[$i] eq $state) {
- $page = $i;
- $done = 1;
- }
- $i++;
- }
- }
- for (my $i=0; $i<@{$states{$action}}; $i++) {
- if ($state eq $states{$action}[$i]) {
- &Apache::lonhtmlcommon::add_breadcrumb(
- {text=>"$trail{$state}"});
- $crumb = &Apache::lonhtmlcommon::breadcrumbs('Course Requests','Course_Requests');
- last;
- } else {
- if (($state eq 'process') && ($i > 0)) {
- &Apache::lonhtmlcommon::add_breadcrumb(
- {href=>"javascript:backPage(document.requestcrs,'$states{$action}[0]')",
- text=>"$trail{$states{$action}[$i]}"});
- } else {
- &Apache::lonhtmlcommon::add_breadcrumb(
- {href=>"javascript:backPage(document.requestcrs,'$states{$action}[$i]')",
- text=>"$trail{$states{$action}[$i]}"});
- }
- }
- }
- } else {
- &Apache::lonhtmlcommon::add_breadcrumb(
- {text=>'Pick Action'});
- $crumb = &Apache::lonhtmlcommon::breadcrumbs('Course Requests','Course_Requests');
- }
-
my %can_request;
my $canreq = &check_can_request($dom,\%can_request);
if ($action eq 'new') {
@@ -264,8 +281,9 @@
&print_main_menu($r,\%can_request,\%states,$dom,$jscript,$loaditems,
$crumb);
} else {
- &request_administration($r,$action,$state,$page,\%states,$dom,$jscript,
- $loaditems,$crumb);
+ &request_administration($r,$action,$state,$page,\%states,$dom,
+ $jscript,$loaditems,$crumb,$newinstcode,
+ $codechk,$checkedcode,\@invalidcrosslist);
}
} else {
$r->print(&header('Course Requests').$crumb.
@@ -289,7 +307,7 @@
&close_popup_form());
} else {
&request_administration($r,$action,$state,$page,\%states,$dom,$jscript,
- $loaditems,$crumb,$uname,$udom);
+ $loaditems,$crumb,'','','','',$uname,$udom);
}
} elsif ($action eq 'log') {
&print_request_logs($jscript,$loaditems,$crumb);
@@ -299,6 +317,81 @@
return OK;
}
+sub get_breadcrumbs {
+ my ($dom,$action,$state,$states,$trail) = @_;
+ my ($crumb,$newinstcode,$codechk,$checkedcode,$numtitles);
+ my $page = 0;
+ if ((ref($states) eq 'HASH') && (ref($trail) eq 'HASH') && (ref($state))) {
+ if (defined($action)) {
+ my $done = 0;
+ my $i=0;
+ if (ref($states->{$action}) eq 'ARRAY') {
+ while ($i<@{$states->{$action}} && !$done) {
+ if ($states->{$action}[$i] eq $$state) {
+ $page = $i;
+ $done = 1;
+ }
+ $i++;
+ }
+ }
+ if ($env{'form.crstype'} eq 'official') {
+ if ($page > 1) {
+ if ($states->{$action}[$page-1] eq 'codepick') {
+ if ($env{'form.instcode'} eq '') {
+ ($newinstcode,$numtitles) = &get_instcode($dom);
+ if ($numtitles) {
+ if ($newinstcode eq '') {
+ $$state = 'codepick';
+ $page --;
+ } else {
+ $codechk =
+ &Apache::lonnet::auto_validate_instcode('',
+ $dom,$newinstcode);
+ if ($codechk ne 'valid') {
+ $$state = 'codepick';
+ $page --;
+ }
+ $checkedcode = 1;
+ }
+ }
+ }
+ }
+ }
+ }
+ for (my $i=0; $i<@{$states->{$action}}; $i++) {
+ if ($$state eq $states->{$action}[$i]) {
+ &Apache::lonhtmlcommon::add_breadcrumb(
+ {text=>"$trail->{$$state}"});
+ $crumb = &Apache::lonhtmlcommon::breadcrumbs('Course Requests','Course_Requests');
+ last;
+ } else {
+ if (($$state eq 'process') || ($$state eq 'removal')) {
+ &Apache::lonhtmlcommon::add_breadcrumb(
+ { href => '/adm/requestcourse',
+ text => "$trail->{$states->{$action}[$i]}",
+ }
+ );
+ } else {
+ &Apache::lonhtmlcommon::add_breadcrumb(
+ { href => "javascript:backPage(document.requestcrs,'$states->{$action}[$i]')",
+ text => "$trail->{$states->{$action}[$i]}", }
+ );
+ }
+ }
+ }
+ } else {
+ &Apache::lonhtmlcommon::add_breadcrumb(
+ {text=>'Pick Action'});
+ $crumb = &Apache::lonhtmlcommon::breadcrumbs('Course Requests','Course_Requests');
+ }
+ } else {
+ &Apache::lonhtmlcommon::add_breadcrumb(
+ {text=>'Pick Action'});
+ $crumb = &Apache::lonhtmlcommon::breadcrumbs('Course Requests','Course_Requests');
+ }
+ return ($page,$crumb,$newinstcode,$codechk,$checkedcode);
+}
+
sub header {
my ($bodytitle,$jscript,$loaditems,$jsextra,$args) = @_;
if ($jscript) {
@@ -401,7 +494,6 @@
enrollend_year => 'text',
enrollend_minute => 'text',
enrollend_second => 'text',
- crosslisttotal => 'hidden',
addcrosslist => 'checkbox',
autoadds => 'radio',
autodrops => 'radio',
@@ -420,6 +512,7 @@
if (!$crosslisttotal) {
$crosslisttotal = 1;
}
+
for (my $i=0; $i<$env{'form.crosslisttotal'}; $i++) {
if ($numtitles) {
$extras{'crosslist_'.$i.'_'.$lastitem} = 'text';
@@ -536,14 +629,16 @@
my $js = <<"END";
function nextPage(formname) {
- var crschoice = document.requestcrs.crstype.value;
- var actionchoice = document.requestcrs.action.value;
+ var crschoice = document.mainmenu_coursetype.crstype.value;
+ var actionchoice = document.mainmenu_action.action.value;
if (check_can_request(crschoice,actionchoice) == true) {
if ((actionchoice == 'new') && (crschoice == 'official')) {
nextstate = 'codepick';
} else {
$nextstate_setter
- }
+ }
+ formname.crstype.value = crschoice;
+ formname.action.value = actionchoice;
formname.state.value= nextstate;
formname.submit();
}
@@ -598,33 +693,29 @@
END
- $r->print(&header('Course Requests',$js.$jscript,$loaditems).$crumb.
- '<div>'.
- '<form name="domforcourse" method="post" action="/adm/requestcourse">'.
+ $r->print(&header('Course Requests',$js.$jscript,$loaditems).$crumb.'<div>'.
&Apache::lonhtmlcommon::start_pick_box().
- &Apache::lonhtmlcommon::row_title('Course Domain').
+ &Apache::lonhtmlcommon::row_title(&mt('Course Domain')).
+ '<form name="domforcourse" method="post" action="/adm/requestcourse">'.
&Apache::loncommon::select_dom_form($dom,'showdom','',1,$onchange));
if (!$onchange) {
$r->print(' <input type="submit" name="godom" value="'.
&mt('Change').'" />');
}
- $r->print(&Apache::lonhtmlcommon::row_closure(1).
- &Apache::lonhtmlcommon::end_pick_box().'</form></div>');
+ $r->print('</form>'.&Apache::lonhtmlcommon::row_closure());
my $formname = 'requestcrs';
my $nexttext = &mt('Next');
- $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.'" />
+ $r->print(&Apache::lonhtmlcommon::row_title(&mt('Action')).'
+<form name="mainmenu_action" method="post" action="">
<select size="1" name="action" >
<option value="new">'.&mt('New request').'</option>
<option value="view">'.&mt('View/Modify/Cancel pending requests').'</option>
<option value="log">'.&mt('View request history').'</option>
-</select>'.
- &Apache::lonhtmlcommon::row_closure().
- &Apache::lonhtmlcommon::row_title('Course Type').'
+</select></form>'.
+ &Apache::lonhtmlcommon::row_closure(1).
+ &Apache::lonhtmlcommon::row_title(&mt('Course Type')).'
+<form name="mainmenu_coursetype" method="post" action="">
<select size="1" name="crstype">
<option value="any">'.&mt('All types').'</option>');
if ((ref($types) eq 'ARRAY') && (ref($typename) eq 'HASH')) {
@@ -637,18 +728,24 @@
'</option>'."\n");
}
}
- $r->print('</select>
-<input type="hidden" name="state" value="crstype" />'.
- &Apache::lonhtmlcommon::row_closure(1).
- &Apache::lonhtmlcommon::end_pick_box().'<br />
-<input type="button" name="next" value="'.$nexttext.'" onclick="javascript:nextPage(document.'.$formname.')" />
-</form></div>');
+ $r->print('</select></form>'."\n".
+ &Apache::lonhtmlcommon::row_closure(1)."\n".
+ &Apache::lonhtmlcommon::end_pick_box().'</div>'."\n".
+ '<div><form name="'.$formname.'" method="post" action="">'."\n".
+ '<input type="hidden" name="state" value="crstype" />'."\n".
+ '<input type="hidden" name="showdom" value="'.$dom.'" />'."\n".
+ '<input type="hidden" name="crstype" value="" />'."\n".
+ '<input type="hidden" name="action" value="" />'."\n".
+ '<input type="button" name="next" value="'.$nexttext.
+ '" onclick="javascript:nextPage(document.'.$formname.')" />'."\n".
+ '</form></div>');
$r->print(&Apache::loncommon::end_page());
return;
}
sub request_administration {
- my ($r,$action,$state,$page,$states,$dom,$jscript,$loaditems,$crumb,$uname,$udom) = @_;
+ my ($r,$action,$state,$page,$states,$dom,$jscript,$loaditems,$crumb,
+ $newinstcode,$codechk,$checkedcode,$invalidcrosslist,$uname,$udom) = @_;
my $js;
if (($action eq 'new') || (($action eq 'view') && ($state eq 'pick_request'))) {
$js = <<END;
@@ -676,7 +773,8 @@
$jsextra = "\n".&Apache::loncommon::coursebrowser_javascript($dom);
}
$r->print(&header('Request a course',$js.$jscript,$loaditems,$jsextra).$crumb);
- &print_request_form($r,$action,$state,$page,$states,$dom);
+ &print_request_form($r,$action,$state,$page,$states,$dom,$newinstcode,
+ $codechk,$checkedcode,$invalidcrosslist);
} elsif ($action eq 'view') {
my $jsextra;
my $formname = 'requestcrs';
@@ -809,8 +907,25 @@
END
}
+sub get_instcode {
+ my ($dom) = @_;
+ my ($instcode,$numtitles);
+ my (@codetitles,%cat_titles,%cat_order,@code_order,$instcode,$code_chk);
+ &Apache::lonnet::auto_possible_instcodes($dom,\@codetitles,\%cat_titles,
+ \%cat_order,\@code_order);
+ $numtitles = scalar(@codetitles);
+ if (@code_order > 0) {
+ my $message;
+ foreach my $item (@code_order) {
+ $instcode .= $env{'form.instcode_'.$item};
+ }
+ }
+ return ($instcode,$numtitles);
+}
+
sub print_request_form {
- my ($r,$action,$state,$page,$states,$dom) = @_;
+ my ($r,$action,$state,$page,$states,$dom,$newinstcode,$codechk,$checkedcode,
+ $invalidcrosslist) = @_;
my $formname = 'requestcrs';
my ($next,$prev,$message,$output,$codepicker,$crstype);
$prev = $states->{$action}[$page-1];
@@ -825,40 +940,23 @@
if ($crstype eq 'official') {
if ($env{'form.instcode'} ne '') {
$instcode = $env{'form.instcode'};
+ } elsif ($newinstcode ne '') {
+ $instcode = $newinstcode;
}
- }
- if ($prev eq 'codepick') {
- if ($crstype eq 'official') {
- &Apache::lonnet::auto_possible_instcodes($dom,\@codetitles,\%cat_titles,
- \%cat_order,\@code_order);
- }
- if (@code_order > 0) {
- my $message;
- if ($instcode eq '') {
- foreach my $item (@code_order) {
- $instcode .= $env{'form.instcode_'.$item};
- }
- $r->print('<input type="hidden" name="instcode" value="'.$instcode.'" />'."\n");
- }
- if ($instcode ne '') {
- $code_chk = &Apache::lonnet::auto_validate_instcode('',$dom,$instcode);
- if ($code_chk eq 'valid') {
- $message = '<div class="LC_info">'.
- &mt('The chosen course category [_1] is valid.','<b>'.
- $instcode.'</b>').'</div>';
- } else {
- $message = '<div class="LC_warning">'.
- &mt('No course was found matching your choice of institutional course category.');
- if ($code_chk ne '') {
- $message .= '<br />'.$code_chk;
- }
- $message .= '</div>';
- }
+ if ($checkedcode) {
+ if ($codechk eq 'valid') {
+ $message = '<div class="LC_info">'.
+ &mt('The chosen course category [_1] is valid.','<b>'.
+ $instcode.'</b>').
+ '<input type="hidden" name="instcode" value="'.
+ $instcode.'" /></div>';
} else {
$message = '<div class="LC_warning">'.
- &mt('No course was found matching your choice of institutional course category.');
- }
- unless ($code_chk eq 'valid') {
+ &mt('No course was found matching your choice of institutional course category.');
+ if ($codechk ne '') {
+ $message .= '<br />'.$codechk;
+ }
+ $message .= '</div>';
$prev = 'crstype';
}
$r->print($message);
@@ -886,7 +984,7 @@
$r->print(&courseinfo_form($dom,$formname,$crstype,$next));
}
} elsif ($prev eq 'codepick') {
- if ($env{'form.instcode'} eq '') {
+ if ($instcode eq '') {
$prev = $states->{$action}[$page-2];
}
$r->print(&courseinfo_form($dom,$formname,$crstype,$next));
@@ -896,9 +994,10 @@
\%cat_order,\@code_order);
}
$r->print(&print_enrollment_menu($formname,$instcode,$dom,\@codetitles,
- \%cat_titles,\%cat_order,\@code_order));
+ \%cat_titles,\%cat_order,\@code_order,
+ $invalidcrosslist));
} elsif ($state eq 'personnel') {
- $r->print(&print_personnel_menu($dom,$formname,$crstype));
+ $r->print(&print_personnel_menu($dom,$formname,$crstype,$invalidcrosslist));
} elsif ($state eq 'review') {
my $cnum;
if ($env{'form.origcnum'} =~ /^($match_courseid)$/) {
@@ -908,7 +1007,7 @@
}
&Apache::lonnet::auto_possible_instcodes($dom,\@codetitles,\%cat_titles,
\%cat_order,\@code_order);
- $r->print('<p>'.&mt('Review the details of the course request before submission.').'</p>'.
+ $r->print('<h3>'.&mt('Review course request details before submission').'</h3>'.
&print_review($dom,\@codetitles,\%cat_titles,\%cat_order,\@code_order).
'<input type="hidden" name="cnum" value="'.$cnum.'" />');
$navtxt{'next'} = &mt('Submit course request');
@@ -917,13 +1016,26 @@
&Apache::lonnet::auto_possible_instcodes($dom,\@codetitles,\%cat_titles,
\%cat_order,\@code_order);
}
- my $result = &print_request_outcome($dom,\@codetitles,\@code_order);
+ my ($storeresult,$result) = &print_request_outcome($dom,\@codetitles,
+ \@code_order);
$r->print($result);
+ if (($storeresult eq 'ok') || ($storeresult eq 'created')) {
+ $r->print('<p>');
+ if ($storeresult eq 'ok') {
+ $r->print('<a href="/adm/requestcourse?action=view&state=details&showdom='.$dom.'&cnum='. $env{'form.cnum'}.'">'.
+ &mt('Modify this request').'</a>'.(' 'x4));
+ }
+ $r->print('<a href="/adm/requestcourse">'.&mt('Make another request').'</a></p>');
+ return;
+ }
}
my @excluded = &get_excluded_elements($dom,$states,$action,$state);
if ($state eq 'personnel') {
push(@excluded,'persontotal');
}
+ if ($state eq 'enrollment') {
+ push(@excluded,'crosslisttotal');
+ }
$r->print(&Apache::lonhtmlcommon::echo_form_input(\@excluded).'</form>');
&display_navbuttons($r,$formname,$prev,$navtxt{'prev'},$next,$navtxt{'next'},$state);
return;
@@ -958,8 +1070,9 @@
}
sub print_enrollment_menu {
- my ($formname,$instcode,$dom,$codetitles,$cat_titles,$cat_order,$code_order) =@_;
- my ($sections,$autoenroll,$access_dates);
+ my ($formname,$instcode,$dom,$codetitles,$cat_titles,$cat_order,$code_order,
+ $invalidcrosslist) =@_;
+ my ($sections,$autoenroll,$access_dates,$output);
my $starttime = time;
my $endtime = time+(6*30*24*60*60); # 6 months from now, approx
@@ -973,8 +1086,15 @@
);
if ($env{'form.crstype'} eq 'official') {
if (&Apache::lonnet::auto_run('',$dom)) {
- my ($section_form,$crosslist_form,$autoenroll_form);
+ $output = &show_invalid_crosslists($invalidcrosslist);
+ my ($section_form,$crosslist_form);
$section_form = &inst_section_selector($dom,$instcode);
+ if ($section_form) {
+ $sections = &Apache::lonhtmlcommon::row_headline().
+ '<h3>'.&mt('Sections for auto-enrollment').'</h3>'.
+ &Apache::lonhtmlcommon::row_closure(1).
+ $section_form;
+ }
my $crosslisttotal = $env{'form.crosslisttotal'};
if (!$crosslisttotal) {
$crosslisttotal = 1;
@@ -992,53 +1112,80 @@
'<input name="crosslisttotal" type="hidden" value="'.$crosslisttotal.'" />'.
'<input name="addcrosslist" type="checkbox" value="'.$crosslisttotal.'"'.
' onclick="javascript:nextPage(document.'.$formname.",'".$env{'form.state'}.
- "'".');" />'.&mt('Add?').&Apache::lonhtmlcommon::row_closure(1);
- }
- if ($section_form || $crosslist_form) {
- $sections = '<div>'.&Apache::lonhtmlcommon::start_pick_box().
- $section_form.$crosslist_form.
- &Apache::lonhtmlcommon::end_pick_box().'</div>'."\n";
+ "'".');" />'.&mt('Add?').&Apache::lonhtmlcommon::row_closure();
+ $sections .= &Apache::lonhtmlcommon::row_headline.
+ '<h3>'.&mt('Crosslisted courses for auto-enrollment').'</h3>'.
+ &Apache::lonhtmlcommon::row_closure(1).
+ $crosslist_form;
}
- $autoenroll_form =
+ $autoenroll =
&Apache::lonhtmlcommon::row_title(&mt('Add registered students automatically')).
'<span class="LC_nobreak"><label>'.
'<input type="radio" name="autoadds" value="1">'.
&mt('Yes').'</label>'.(' 'x3).'<label>'.
'<input type="radio" name="autoadds" value="0" checked="checked">'.
&mt('No').'</label></span>'.
- &Apache::lonhtmlcommon::row_closure().
+ &Apache::lonhtmlcommon::row_closure(1).
&Apache::lonhtmlcommon::row_title(&mt('Drop unregistered students automatically')).
'<span class="LC_nobreak"><label>'.
'<input type="radio" name="autodrops" value="1">'.
&mt('Yes').'</label>'.(' 'x3).'<label>'.
'<input type="radio" name="autodrops" value="0" checked="checked">'.
&mt('No').'</label></span>'.
- &Apache::lonhtmlcommon::row_closure().
+ &Apache::lonhtmlcommon::row_closure(1).
&date_setting_table($starttime,$endtime,$formname,'enroll',%enrolltitles);
- if ($autoenroll_form) {
- $autoenroll = '<div>'.&Apache::lonhtmlcommon::start_pick_box().
- $autoenroll_form.
- &Apache::lonhtmlcommon::end_pick_box().'</div>'."\n";
- }
}
}
- my $access_dates_form =
+ my $access_dates =
&date_setting_table($starttime,$endtime,$formname,'access',%accesstitles);
- if ($access_dates_form) {
- $access_dates = '<div>'.&Apache::lonhtmlcommon::start_pick_box().
- $access_dates_form.
- &Apache::lonhtmlcommon::end_pick_box().'</div>'."\n";
+ $output .= &Apache::lonhtmlcommon::start_pick_box();
+ if ($sections) {
+ $output .= $sections;
+ }
+ if ($autoenroll) {
+ $output .= &Apache::lonhtmlcommon::row_headline('Auto-enroll').
+ '<h3>'.&mt('Auto-enrollment settings').'</h3>'.
+ &Apache::lonhtmlcommon::row_closure(1).
+ $autoenroll;
+ }
+ if ($access_dates) {
+ my $header = &mt('Access dates for students');
+ if ($env{'form.crstype'} eq 'community') {
+ $header = &mt('Access dates for community members');
+ }
+ $output .= &Apache::lonhtmlcommon::row_headline('Access').
+ '<h3>'.$header.'</h3>'.
+ &Apache::lonhtmlcommon::row_closure(1).
+ $access_dates
}
- return $sections.$autoenroll.$access_dates;
+ return '<div>'.&Apache::lonhtmlcommon::start_pick_box().$output.
+ &Apache::lonhtmlcommon::end_pick_box().'</div>';
}
+sub show_invalid_crosslists {
+ my ($invalidcrosslist) = @_;
+ my $output;
+ if (ref($invalidcrosslist) eq 'ARRAY') {
+ if (@{$invalidcrosslist} > 0) {
+ $output = '<div class="LC_warning">'.
+ &mt('The following crosslisted courses were invalid:').'<ul>';
+ foreach my $item (@{$invalidcrosslist}) {
+ $output .= '<li>'.$item.'</li>';
+ }
+ $output .= '</ul></div><br />';
+ }
+ }
+ return $output;
+}
+
+
sub inst_section_selector {
my ($dom,$instcode) = @_;
my @sections = &Apache::lonnet::auto_get_sections(undef,$dom,$instcode);
my $sectotal = scalar(@sections);
my $output;
if ($sectotal) {
- $output .= &Apache::lonhtmlcommon::row_title('Sections').
+ $output .= &Apache::lonhtmlcommon::row_title(&mt('Sections of [_1]',$instcode)).
&Apache::loncommon::start_data_table().
&Apache::loncommon::start_data_table_row().
'<th>'.&mt('Include?').'<input type="hidden" name="sectotal" '.
@@ -1075,23 +1222,31 @@
$starttime,'','','',1,'','','',1);
my $endform = &Apache::lonhtmlcommon::date_setter($formname,$prefix.'end',
$endtime,'','','',1,'','','',1);
+ my $closure = '';
if ($prefix eq 'access') {
$perpetual = ' <span class="LC_nobreak"><label>'.
'<input type="checkbox" name="no_end_date" />'.
&mt('No end date').'</label></span>';
+ $closure = '1';
}
$table = &Apache::lonhtmlcommon::row_title($datetitles{'start'}).
$startform.
- &Apache::lonhtmlcommon::row_closure().
+ &Apache::lonhtmlcommon::row_closure(1).
&Apache::lonhtmlcommon::row_title($datetitles{'end'}).
$endform.$perpetual.
- &Apache::lonhtmlcommon::row_closure(1);
+ &Apache::lonhtmlcommon::row_closure($closure);
return $table;
}
sub print_personnel_menu {
- my ($dom,$formname,$crstype) = @_;
- my $output = '<div>'.&Apache::lonhtmlcommon::start_pick_box();
+ my ($dom,$formname,$crstype,$invalidcrosslist) = @_;
+ my $output;
+ if ($crstype eq 'official') {
+ if (&Apache::lonnet::auto_run('',$dom)) {
+ $output .= &show_invalid_crosslists($invalidcrosslist);
+ }
+ }
+ $output .= '<div>'.&Apache::lonhtmlcommon::start_pick_box();
my $persontotal = $env{'form.persontotal'};
if ((!defined($persontotal)) || (!$persontotal)) {
$persontotal = 1;
@@ -1152,6 +1307,10 @@
$newtitle = &mt('Other').': ';
}
+ if ($persontotal) {
+ $output .= &Apache::lonhtmlcommon::row_headline().
+ '<h3>'.&mt('Requestor is automatically assigned Course Coordinator role.').' '.&mt('Include other personnel?').'</h3>';
+ }
for (my $i=0; $i<$persontotal; $i++) {
my @linkargs = map { 'person_'.$i.'_'.$_ } (@items);
my $linkargstr = join("','",@linkargs);
@@ -1693,9 +1852,15 @@
</script>
ENDJS
-
+ my $title = &mt('Brief Course Description');
+ if ($crstype eq 'community') {
+ $title = &mt('Brief Community Description');
+ }
my $output .= $js_validate."\n".'<div>'.&Apache::lonhtmlcommon::start_pick_box().
- &Apache::lonhtmlcommon::row_title('Course Description').
+ &Apache::lonhtmlcommon::row_headline().
+ '<h3>'.$title.'</h3>'.
+ &Apache::lonhtmlcommon::row_closure(1).
+ &Apache::lonhtmlcommon::row_title(&mt('Description')).
'<input type="text" size="40" name="cdescr" />';
my ($home_server_pick,$numlib) =
&Apache::loncommon::home_server_form_item($dom,'chome',
@@ -1705,9 +1870,12 @@
&Apache::lonhtmlcommon::row_title(&mt('Home Server for Course'));
}
$output .= $home_server_pick.
+ &Apache::lonhtmlcommon::row_closure().
+ &Apache::lonhtmlcommon::row_headline().
+ '<h3>'.&mt('Clone content and settings from an existing course?').'</h3>'.
&Apache::lonhtmlcommon::row_closure(1).
- &Apache::lonhtmlcommon::end_pick_box().'</div>'.
- '<div>'.&clone_form($dom,$formname,$crstype).'</div>'."\n";
+ &clone_form($dom,$formname,$crstype).
+ &Apache::lonhtmlcommon::end_pick_box().'</div>'."\n";
return $output;
}
@@ -1721,13 +1889,12 @@
&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="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().
+ $cloneform.'</label>'.&Apache::lonhtmlcommon::row_closure(1).
&Apache::lonhtmlcommon::row_title($lt{'dsh'}).'<label>'.
'<input type="radio" name="datemode" value="delete" /> '.$lt{'ncd'}.
'</label><br /><label>'.
@@ -1736,8 +1903,7 @@
'<input type="radio" name="datemode" value="shift" checked="checked" /> '.
$lt{'shd'}.'</label>'.
'<input type="text" size="5" name="dateshift" value="365" />'.
- &Apache::lonhtmlcommon::row_closure(1).
- &Apache::lonhtmlcommon::end_pick_box();
+ &Apache::lonhtmlcommon::row_closure(1);
return $output;
}
@@ -2077,7 +2243,7 @@
accessend => $accessend,
personnel => \%personnel,
};
- my @inststatuses;
+ my (@inststatuses,$storeresult,$creationresult);
my $val = &get_processtype($dom,$crstype,\@inststatuses,\%domconfig);
if ($val eq '') {
if ($crstype eq 'official') {
@@ -2089,6 +2255,7 @@
} else {
$output = &mt('Unrecognized course type: [_1]',$crstype);
}
+ $storeresult = 'notpermitted';
} else {
my ($disposition,$message,$reqstatus);
my %reqhash = (
@@ -2139,6 +2306,7 @@
if ($message) {
$output .= '<div class="LC_warning">'.$message.'</div>';
}
+ $storeresult = 'rejected';
} elsif ($disposition eq 'process') {
my %domdefs = &Apache::lonnet::get_domain_defaults($dom);
my ($logmsg,$newusermsg,$addresult,$enrollcount,$response,$keysmsg,%longroles);
@@ -2159,12 +2327,14 @@
$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.');
+ $creationresult = 'created';
} else {
$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>';
+ $creationresult = 'error';
}
} else {
my $requestid = $cnum.'_'.$disposition;
@@ -2206,7 +2376,7 @@
}
}
}
- my ($storeresult,$statusresult);
+ my ($statusresult);
if ($requestkey =~ /^($match_domain)_($match_courseid)$/) {
$storeresult = &Apache::lonnet::store_userdata(\%reqhash,$requestkey,
'courserequests');
@@ -2214,7 +2384,7 @@
my %status = (
'status:'.$dom.':'.$cnum => $reqstatus,
);
- $statusresult = &Apache::lonnet::put('courserequests',\%status);
+ $statusresult = &Apache::lonnet::put('courserequests',\%status);
}
} else {
$storeresult = 'error: invalid requestkey format';
@@ -2234,7 +2404,11 @@
$output .= '<span class="LC_warning">'.&mt('An error occurred validating your request with institutional data sources: [_1].',$validationerror).'</p>';
}
}
- return $output;
+ if ($creationresult ne '') {
+ return ($creationresult,$output);
+ } else {
+ return ($storeresult,$output);
+ }
}
sub notification_information {
--raeburn1251730626--