--- loncom/interface/lonrequestcourse.pm 2010/02/26 22:38:31 1.41.2.6
+++ loncom/interface/lonrequestcourse.pm 2010/11/29 04:40:12 1.41.2.9
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Request a course
#
-# $Id: lonrequestcourse.pm,v 1.41.2.6 2010/02/26 22:38:31 raeburn Exp $
+# $Id: lonrequestcourse.pm,v 1.41.2.9 2010/11/29 04:40:12 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -128,13 +128,21 @@ sub handler {
if ($r->header_only) {
return OK;
}
-
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
['action','showdom','cnum','state','crstype']);
&Apache::lonhtmlcommon::clear_breadcrumbs();
- my $dom = &get_course_dom();
- my $action = $env{'form.action'};
+ my $action = $env{'form.reqaction'};
my $state = $env{'form.state'};
+ my $context;
+ &generate_page($r,$action,$state,$context);
+ return OK;
+}
+
+sub generate_page {
+ my ($r,$action,$state,$context) = @_;
+ &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+ ['action','showdom','cnum','state','crstype']);
+ my $dom = &get_course_dom();
my (%states,%stored);
my ($jscript,$uname,$udom,$result,$warning);
@@ -145,10 +153,17 @@ sub handler {
if ($dom eq 'gcitest') {
$states{'new'} = ['courseinfo','review','process'];
+ if ($env{'form.concepttest'} eq 'editmyown') {
+ push(@{$states{'new'}},'chooseitems','uploadroster','enrolling');
+ } elsif (($env{'form.concepttest'} eq 'defchosen') ||
+ (($env{'form.concepttest'} eq 'cloning') && (!$env{'form.cloneroster'}))) {
+ push(@{$states{'new'}},'uploadroster','enrolling');
+ } else {
+ push(@{$states{'new'}},'done');
+ }
}
-
if (($action eq 'new') && ($env{'form.crstype'} eq 'official')) {
- unless ($env{'form.state'} eq 'crstype') {
+ unless ($state eq 'crstype') {
unshift(@{$states{'new'}},'codepick');
}
}
@@ -172,6 +187,10 @@ sub handler {
details => 'Request Details',
cancel => 'Cancel Request',
removal => 'Outcome',
+ chooseitems => 'Saved Test',
+ uploadroster => 'Upload Roster',
+ enrolling => 'Completed',
+ done => 'Completed',
);
if ($dom eq 'gcitest') {
$trail{'crstype'} = 'Building a Test';
@@ -282,7 +301,7 @@ sub handler {
$env{'form.clonedom'} = $dom;
}
if ($state eq 'crstype') {
- $jscript = &mainmenu_javascript();
+ $jscript = &mainmenu_javascript($action);
} else {
$jscript = &Apache::lonhtmlcommon::set_form_elements($elementsref,\%stored);
if ($state eq 'courseinfo') {
@@ -310,6 +329,10 @@ sub handler {
$jscript,$loaditems,$crumb,$newinstcode,
$codechk,$checkedcode,$description,
\@invalidcrosslist);
+ if ($state eq 'chooseitems' || $state eq 'uploadroster' ||
+ $state eq 'enrolling') {
+ return $canreq;
+ }
}
} else {
$r->print(&header('Course/Community Requests').$crumb.
@@ -340,10 +363,11 @@ sub handler {
} else {
&print_main_menu($r,\%can_request,\%states,$dom,$jscript,'',$crumb,\%request_domains);
}
- return OK;
+ return;
}
sub mainmenu_javascript {
+ my ($action) = @_;
return <<"END";
function setType(courseForm) {
for (var i=0; i<courseForm.crstype.length; i++) {
@@ -356,11 +380,11 @@ function setType(courseForm) {
}
function setAction(courseForm) {
- for (var i=0; i<courseForm.action.length; i++) {
- if (courseForm.action.options[i].value == "$env{'form.action'}") {
- courseForm.action.options[i].selected = true;
+ for (var i=0; i<courseForm.reqaction.length; i++) {
+ if (courseForm.reqaction.options[i].value == "$action") {
+ courseForm.reqaction.options[i].selected = true;
} else {
- courseForm.action.options[i].selected = false;
+ courseForm.reqaction.options[i].selected = false;
}
}
}
@@ -432,6 +456,19 @@ sub get_breadcrumbs {
}
}
}
+ my %forms = (
+ chooseitems => 'requestcrs',
+ uploadroster => 'studentform',
+ enrolling => 'requestcrs',
+ done => 'requestcrs',
+ );
+ my $lastidx;
+ for (my $i=0; $i<@{$states->{$action}}; $i++) {
+ if ($$state eq $states->{$action}[$i]) {
+ $lastidx = $i;
+ last;
+ }
+ }
for (my $i=0; $i<@{$states->{$action}}; $i++) {
if ($$state eq $states->{$action}[$i]) {
&Apache::lonhtmlcommon::add_breadcrumb(
@@ -446,13 +483,34 @@ sub get_breadcrumbs {
}
);
} else {
- &Apache::lonhtmlcommon::add_breadcrumb(
+ if (($$state eq 'chooseitems') || ($$state eq 'uploadroster') ||
+ ($$state eq 'enrolling') || ($$state eq 'done')) {
+ if (($states->{$action}[$i] ne 'process') &&
+ ($states->{$action}[$i] ne 'chooseitems') &&
+ ($states->{$action}[$i] ne 'uploadroster') &&
+ ($states->{$action}[$i] ne 'enrolling') &&
+ ($states->{$action}[$i] ne 'done')) {
+ &Apache::lonhtmlcommon::add_breadcrumb(
+ { href => '/adm/requestcourse',
+ text => "$trail->{$states->{$action}[$i]}",
+ }
+ );
+ } else {
+ my $diff = $i-$lastidx;
+ &Apache::lonhtmlcommon::add_breadcrumb(
+ { href => "javascript:history.go($diff)",
+ 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=>$firstcrumb});
@@ -477,11 +535,13 @@ sub header {
if (ref($args) eq 'HASH') {
my %loadhash = (
'add_entries' => $loaditems,
+ 'function' => 'norole',
);
my %arghash = (%loadhash,%{$args});
- $args = \%arghash;
+ $args = \%arghash;
} else {
- $args = {'add_entries' => $loaditems,};
+ $args = {'add_entries' => $loaditems,
+ 'function' => 'norole'};
}
}
return &Apache::loncommon::start_page($bodytitle,$jscript.$jsextra,$args);
@@ -540,6 +600,7 @@ sub form_elements {
cdescr => 'text',
concepttest => 'radio',
);
+ $elements{'new'}{'enrollment'}{'timezone'} = 'selectbox';
if (&show_cloneable()) {
$elements{'new'}{'courseinfo'}{'clonecrs'} = 'selectbox';
$elements{'new'}{'courseinfo'}{'clonedom'} = 'hidden';
@@ -652,14 +713,6 @@ sub onload_action {
} else {
$loaditems{'onload'} = 'javascript:setFormElements(document.requestcrs);';
}
- if ($state eq 'courseinfo') {
- if (&show_cloneable()) {
- $loaditems{'onload'} .= 'javascript:setCloneDisplay(document.requestcrs);';
- }
- }
- if (($state eq 'process') && ($env{'form.concepttest'} eq 'editmyown')) {
- $loaditems{'onload'} = 'javascript:setInitialVisibility()';
- }
}
return \%loaditems;
}
@@ -691,7 +744,7 @@ sub print_main_menu {
function nextPage(formname) {
var crschoice = document.mainmenu_coursetype.crstype.value;
- var actionchoice = document.mainmenu_action.action.value;
+ var actionchoice = document.mainmenu_action.reqaction.value;
if (check_can_request(crschoice,actionchoice) == true) {
if ((actionchoice == 'new') && (crschoice == 'official')) {
nextstate = 'codepick';
@@ -699,7 +752,7 @@ function nextPage(formname) {
$nextstate_setter
}
formname.crstype.value = crschoice;
- formname.action.value = actionchoice;
+ formname.reqaction.value = actionchoice;
formname.state.value= nextstate;
formname.submit();
}
@@ -787,12 +840,12 @@ END
'<li>'.&mt('Enrollment of students').'</li>'.
'</ol></p><p>'.&mt('When assembling a test you may:').
'<br />'.&mt('(a) have a valid test built automatically by the WebCenter, or').'<br />'.&mt('(b) select the questions to include by combining questions chosen from eleven bins with four mandatory questions, or').
- '<br />'.&mt('(c) copy one of your existing tests (including optional copying of the student roster)').'</p><p>'.&mt('The most efficient way to enroll students is to upload a text file containing usernames and passwords.').'<br />'.&mt("Students' full e-mail addresses should be used as their usernames to ensure uniqueness.").'</p><div>'.
+ '<br />'.&mt('(c) copy one of your existing tests (including optional copying of the student roster)').'</p><p>'.&mt('The most efficient way to enroll students is to upload a text file containing usernames and passwords.').'<br />'.&mt("Students' e-mail addresses must be used as their usernames to ensure uniqueness.").'</p><div>'.
'<form name="'.$formname.'" method="post" action="/adm/requestcourse">'."\n".
'<input type="hidden" name="state" value="courseinfo" />'."\n".
'<input type="hidden" name="showdom" value="'.$dom.'" />'."\n".
'<input type="hidden" name="crstype" value="unofficial" />'."\n".
- '<input type="hidden" name="action" value="new" />'."\n".
+ '<input type="hidden" name="reqaction" value="new" />'."\n".
'<input type="button" name="next" value="'.$nexttext.
'" onclick="this.form.submit();" />'."\n".
'</form></div>'.
@@ -845,7 +898,7 @@ END
my $nexttext = &mt('Next');
$r->print(&Apache::lonhtmlcommon::row_title(&mt('Action')).'
<form name="mainmenu_action" method="post" action="">
-<select size="1" name="action" >
+<select size="1" name="reqaction" >
<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>
@@ -883,7 +936,7 @@ END
'<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="hidden" name="reqaction" value="" />'."\n".
'<input type="button" name="next" value="'.$nexttext.
'" onclick="javascript:nextPage(document.'.$formname.')" />'."\n".
'</form></div>');
@@ -909,8 +962,13 @@ END
if (($action eq 'new') || ($action eq 'view')) {
$js .= <<END;
-function backPage(formname,prevstate) {
+function backPage(formname,prevstate,currstate) {
formname.state.value = prevstate;
+ if (currstate == "enrolling") {
+ if (prevstate == "chooseitems" || prevstate == "uploadroster") {
+ formname.action = "/adm/createuser";
+ }
+ }
formname.submit();
}
@@ -933,10 +991,14 @@ END
my $title;
if ($env{'form.crstype'} eq 'community') {
$title = 'Request a community';
+ } elsif (&Apache::loncommon::needs_gci_custom()) {
+ $title = 'Create a new Concept Test';
} else {
$title = 'Request a course';
}
$r->print(&header($title,$js.$jscript,$loaditems,$jsextra).$crumb);
+ return if (($state eq 'chooseitems') || ($state eq 'uploadroster') ||
+ ($state eq 'enrolling'));
&print_request_form($r,$action,$state,$page,$states,$dom,$newinstcode,
$codechk,$checkedcode,$description,$invalidcrosslist);
} elsif ($action eq 'view') {
@@ -973,7 +1035,7 @@ END
$title = &mt('Pending course/community requests');
}
$r->print('<h3>'.$title.'</h3><div>'."\n".$form."\n".
- &print_request_status($dom).'</form></div>');
+ &print_request_status($dom,$action,$state).'</form></div>');
} elsif ($state eq 'details') {
my (@codetitles,%cat_titles,%cat_order,@code_order,$instcode,$code_chk);
my $origcnum = $env{'form.cnum'};
@@ -1059,7 +1121,7 @@ END
}
$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="reqaction" value="'.$action.'" />'."\n".
'<input type="hidden" name="showdom" value="'.$dom.'" />'."\n".
'<input type="hidden" name="orignum" value="'.$cnum.'" />'."\n");
if ($result eq 'ok') {
@@ -1342,29 +1404,29 @@ sub print_request_form {
&Apache::lonhtmlcommon::end_pick_box().'</div>');
} else {
$next = $states->{$action}[$page+2];
- $r->print(&courseinfo_form($dom,$formname,$crstype,$next));
+ $r->print(&courseinfo_form($dom,$formname,$state,$crstype,$next));
}
} else {
if ($crstype eq 'official') {
$next = $states->{$action}[$page+2];
}
- $r->print(&courseinfo_form($dom,$formname,$crstype,$next));
+ $r->print(&courseinfo_form($dom,$formname,$state,$crstype,$next));
}
} elsif ($prev eq 'codepick') {
if ($instcode eq '') {
$prev = $states->{$action}[$page-2];
}
- $r->print(&courseinfo_form($dom,$formname,$crstype,$next,$description));
+ $r->print(&courseinfo_form($dom,$formname,$state,$crstype,$next,$description));
} elsif ($state eq 'enrollment') {
if ($crstype eq 'official') {
&Apache::lonnet::auto_possible_instcodes($dom,\@codetitles,\%cat_titles,
\%cat_order,\@code_order);
}
- $r->print(&print_enrollment_menu($formname,$instcode,$dom,\@codetitles,
+ $r->print(&print_enrollment_menu($formname,$state,$instcode,$dom,\@codetitles,
\%cat_titles,\%cat_order,\@code_order,
$invalidcrosslist));
} elsif ($state eq 'personnel') {
- $r->print(&print_personnel_menu($dom,$formname,$crstype,$invalidcrosslist));
+ $r->print(&print_personnel_menu($dom,$formname,$state,$crstype,$invalidcrosslist));
} elsif ($state eq 'review') {
my (%alerts,%rulematch,%inst_results,%curr_rules,%got_rules,%disallowmsg);
my $now = time;
@@ -1459,13 +1521,13 @@ sub print_request_form {
} else {
$navtxt{'next'} = &mt('Submit course request');
}
- } elsif ($state eq 'process') {
+ } elsif ($state eq 'process') {
if ($crstype eq 'official') {
&Apache::lonnet::auto_possible_instcodes($dom,\@codetitles,\%cat_titles,
\%cat_order,\@code_order);
}
my ($storeresult,$result) = &print_request_outcome($r,$dom,\@codetitles,
- \@code_order);
+ \@code_order,$formname);
$r->print($result);
if (($storeresult eq 'ok') || ($storeresult eq 'created')) {
$r->print('<p>');
@@ -1478,6 +1540,8 @@ sub print_request_form {
}
return;
}
+ } elsif ($state eq 'uploadroster') {
+ &roster_upload_form($r,$output,$formname);
}
my @excluded = &get_excluded_elements($dom,$states,$action,$state);
if ($state eq 'personnel') {
@@ -1512,12 +1576,39 @@ sub print_request_form {
if ($state eq 'enrollment') {
push(@excluded,'crosslisttotal');
}
- $r->print(&Apache::lonhtmlcommon::echo_form_input(\@excluded).'</form>');
- &display_navbuttons($r,$dom,$formname,$prev,$navtxt{'prev'},$next,
- $navtxt{'next'},$state);
+ if ($state eq 'done') {
+ $r->print(&done_display());
+ } else {
+ $r->print(&Apache::lonhtmlcommon::echo_form_input(\@excluded));
+ &display_navbuttons($r,$dom,$formname,$prev,$navtxt{'prev'},$next,
+ $navtxt{'next'},$state);
+ }
+ $r->print('</form>');
return;
}
+sub done_display {
+ return '<h3>'.&mt('Concept Test creation is complete').'</h3>'.
+ '<p>'.&mt('The following management tools are available via the "[_1]Manage Tests[_2]" tab, or from the toolbar on the [_3]Concept Test Contents[_4] page.[_5]',
+ '<a href="/adm/menu">','</a>','<a href="/adm/navmaps">','</a>','<br />').
+ '<dl class="LC_GCI_Menu">'.
+ '<dt>'.&mt('Concept Test Contents').'</dt>'.
+ '<dd style="background-image:url(\'/res/adm/pages/nav.png\');">'.&mt('Display the Table of Contents for your Concept Test.').'</dd>'.
+ '<dt>'.&mt('Assemble Concept Test').'</dt>'.
+ '<dd style="background-image:url(\'/res/adm/pages/docs.png\');">'.&mt('If no students have attempted the Concept Test you will be able to modify it. You can also change the start and end date of the test itself.').'</dd></dl>'.
+ '<dl class="LC_GCI_Menu">'.
+ '<dt>'.&mt('Enrollment and Student Activity').'</dt>'.
+ '<dd style="background-image:url(\'/res/adm/pages/cprv.png\');">'.&mt('Display or download a course roster, and view information about completion status and last login. You can also add new students, or change access dates for existing students.').'</dd>'.
+ '<dt>'.&mt("What's New?").'</dt>'.
+ '<dd style="background-image:url(\'/res/adm/pages/new.png\');">'.&mt('View information about changes in your Concept Test course.').'</dd></dl>'.
+ '<dl class="LC_GCI_Menu">'.
+ '<dt>'.&mt('Prepare Printable Concept Test').'</dt>'.
+ '<dd style="background-image:url(\'/res/adm/pages/prnt.png\');">'.&mt('Create a PDF which you can send to a printer to create a hardcopy of the Concept Test.').'</dd>'.
+ '<dt>'.&mt('Concept Test Statistics').'</dt>'.
+ '<dd style="background-image:url(\'/res/adm/pages/chrt.png\');">'.&mt('After the closing date of the Concept Test you can view and download statistics for the test, as well as anonymized submission data.').'</dd>'.
+ '</dl></p>';
+}
+
sub get_cancreate_status {
my ($persondom,$personname,$dom) = @_;
my ($rules,$ruleorder) =
@@ -1582,16 +1673,25 @@ sub get_excluded_elements {
if (grep(/^instcode_/,@excluded)) {
push(@excluded,'instcode');
}
+ if ($env{'form.initmap'}) {
+ push(@excluded,'initmap');
+ }
+ if ($env{'form.output'}) {
+ push(@excluded,'output');
+ }
return @excluded;
}
sub print_enrollment_menu {
- my ($formname,$instcode,$dom,$codetitles,$cat_titles,$cat_order,$code_order,
- $invalidcrosslist) =@_;
+ my ($formname,$state,$instcode,$dom,$codetitles,$cat_titles,$cat_order,
+ $code_order,$invalidcrosslist) =@_;
my ($sections,$autoenroll,$access_dates,$output,$hasauto);
my $starttime = time;
- my $endtime = time+(6*30*24*60*60); # 6 months from now, approx
-
+ my $diff = 6*30*24*60*60; # 6 months from now, approx
+ if (&Apache::loncommon::needs_gci_custom()) {
+ $diff = 7*24*60*60; # 7 days from now, approx
+ }
+ my $endtime = $starttime+$diff;
my %accesstitles = (
'start' => 'Default start access',
'end' => 'Default end access',
@@ -1628,7 +1728,7 @@ sub print_enrollment_menu {
&Apache::lonhtmlcommon::row_title(&mt('Add another')).
'<input name="crosslisttotal" type="hidden" value="'.$crosslisttotal.'" />'.
'<input name="addcrosslist" type="checkbox" value="'.$crosslisttotal.'"'.
- ' onclick="javascript:nextPage(document.'.$formname.",'".$env{'form.state'}.
+ ' onclick="javascript:nextPage(document.'.$formname.",'".$state.
"'".');" />'.&mt('Add?').&Apache::lonhtmlcommon::row_closure();
$sections .= &Apache::lonhtmlcommon::row_headline.
'<h3>'.&mt('Crosslisted courses for auto-enrollment').'</h3>'.
@@ -1639,25 +1739,25 @@ sub print_enrollment_menu {
$autoenroll =
&Apache::lonhtmlcommon::row_title(&Apache::loncommon::help_open_topic('Course_Request_Autoadd').' '.&mt('Add registered students automatically')).
'<span class="LC_nobreak"><label>'.
- '<input type="radio" name="autoadds" value="1">'.
+ '<input type="radio" name="autoadds" value="1" />'.
&mt('Yes').'</label>'.(' 'x3).'<label>'.
- '<input type="radio" name="autoadds" value="0" checked="checked">'.
+ '<input type="radio" name="autoadds" value="0" checked="checked" />'.
&mt('No').'</label></span>'.
&Apache::lonhtmlcommon::row_closure(1).
&Apache::lonhtmlcommon::row_title(&Apache::loncommon::help_open_topic('Course_Request_Autodrop').' '.&mt('Drop unregistered students automatically')).
'<span class="LC_nobreak"><label>'.
- '<input type="radio" name="autodrops" value="1">'.
+ '<input type="radio" name="autodrops" value="1" />'.
&mt('Yes').'</label>'.(' 'x3).'<label>'.
- '<input type="radio" name="autodrops" value="0" checked="checked">'.
+ '<input type="radio" name="autodrops" value="0" checked="checked" />'.
&mt('No').'</label></span>'.
&Apache::lonhtmlcommon::row_closure(1).
&date_setting_table($starttime,$endtime,$formname,'enroll',
- $hasauto,%enrolltitles);
+ $hasauto,$dom,%enrolltitles);
}
}
my $access_dates =
&date_setting_table($starttime,$endtime,$formname,'access',$hasauto,
- %accesstitles);
+ $dom,%accesstitles);
if ($sections) {
$output .= $sections;
}
@@ -1674,8 +1774,16 @@ sub print_enrollment_menu {
}
$output .= &Apache::lonhtmlcommon::row_headline('Access').
'<h3>'.$header.'</h3>'.
- &Apache::lonhtmlcommon::row_closure(1).
- $access_dates
+ &Apache::lonhtmlcommon::row_closure(1);
+ if ($dom eq 'gcitest') {
+ my $includeempty = 1;
+ my $timezone = &Apache::lonlocal::gettimezone();
+ $output .= &Apache::lonhtmlcommon::row_title('Time zone').
+ &Apache::loncommon::select_timezone('timezone',$timezone,
+ undef,$includeempty).
+ &Apache::lonhtmlcommon::row_closure(1);
+ }
+ $output .= $access_dates;
}
if ($dom eq 'gcitest') {
return $output;
@@ -1744,17 +1852,29 @@ sub inst_section_selector {
}
sub date_setting_table {
- my ($starttime,$endtime,$formname,$prefix,$hasauto,%datetitles) = @_;
+ my ($starttime,$endtime,$formname,$prefix,$hasauto,$dom,%datetitles) = @_;
my ($perpetual,$table);
+ my $no_hh_mm_ss = 1;
+ my $hide_timezone;
+ if (&Apache::loncommon::needs_gci_custom()) {
+ $no_hh_mm_ss = '';
+ if ($dom eq 'gcitest') {
+ if ($prefix eq 'access') {
+ $hide_timezone = 1;
+ }
+ }
+ }
my $startform = &Apache::lonhtmlcommon::date_setter($formname,$prefix.'start',
- $starttime,'','','',1,'','','',1);
+ $starttime,'','','',$no_hh_mm_ss,'','','',1,$hide_timezone);
my $endform = &Apache::lonhtmlcommon::date_setter($formname,$prefix.'end',
- $endtime,'','','',1,'','','',1);
+ $endtime,'','','',$no_hh_mm_ss,'','','',1,$hide_timezone);
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>';
+ unless (&Apache::loncommon::needs_gci_custom()) {
+ $perpetual = ' <span class="LC_nobreak"><label>'.
+ '<input type="checkbox" name="no_end_date" />'.
+ &mt('No end date').'</label></span>';
+ }
$closure = '1';
}
@@ -1783,7 +1903,7 @@ sub date_setting_table {
}
sub print_personnel_menu {
- my ($dom,$formname,$crstype,$invalidcrosslist) = @_;
+ my ($dom,$formname,$state,$crstype,$invalidcrosslist) = @_;
my $output;
if ($crstype eq 'official') {
if (&Apache::lonnet::auto_run('',$dom)) {
@@ -1896,7 +2016,7 @@ sub print_personnel_menu {
$output .= &Apache::lonhtmlcommon::row_title(&mt('Add another')).
'<input name="persontotal" type="hidden" value="'.$persontotal.'" />'.
'<input name="addperson" type="checkbox" value="'.$persontotal.'"'.
- ' onclick="javascript:nextPage(document.'.$formname.",'".$env{'form.state'}.
+ ' onclick="javascript:nextPage(document.'.$formname.",'".$state.
"'".');" />'.&mt('Add?').&Apache::lonhtmlcommon::row_closure(1).
&Apache::lonhtmlcommon::end_pick_box().'</div>';
if ($crstype eq 'community') {
@@ -1925,7 +2045,7 @@ sub current_lc_sections {
}
sub print_request_status {
- my ($dom) = @_;
+ my ($dom,$action,$state) = @_;
my %statusinfo = &Apache::lonnet::dump('courserequests',$env{'user.domain'},
$env{'user.name'},'^status:'.$dom);
my ($output,$formname,%queue_by_date);
@@ -1968,9 +2088,9 @@ sub print_request_status {
}
$formname = 'requestcrs';
my @sortedtimes = sort {$a <=> $b} (keys(%queue_by_date));
- $output = '<input type="hidden" name="action" value="'.$env{'form.action'}.'" />'."\n".
+ $output = '<input type="hidden" name="reqaction" value="'.$action.'" />'."\n".
- '<input type="hidden" name="state" value="'.$env{'form.state'}.'" />'."\n".
+ '<input type="hidden" name="state" value="'.$state.'" />'."\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";
@@ -2117,7 +2237,7 @@ sub viewdetails_javascript {
function nextPage(formname,nextstate) {
if (nextstate == "modify") {
formname.state.value = "personnel";
- formname.action.value = "new";
+ formname.reqaction.value = "new";
} else {
formname.state.value = nextstate;
}
@@ -2340,14 +2460,26 @@ sub print_review {
$inst_values .= '<td>'.&mt('None').'</td>';
}
}
+ my $tz;
+ if ($dom eq 'gcitest') {
+ if (&Apache::lonlocal::gettimezone($env{'form.timezone'}) ne 'local') {
+ $tz = $env{'form.timezone'};
+ } else {
+ $tz = &Apache::lonlocal::gettimezone();
+ }
+ $enroll_headers .= '<th>'.&mt('Time Zone').'</th>';
+ }
$enroll_headers .= '<th>'.&mt('Access Starts').'</th>'.
'<th>'.&mt('Access Ends').'</th>';
- my ($accessstart,$accessend) = &dates_from_form('accessstart','accessend');
- $enroll_values .= '<td>'.&Apache::lonlocal::locallocaltime($accessstart).'</td>';
+ my ($accessstart,$accessend) = &dates_from_form('accessstart','accessend',$tz);
+ if ($dom eq 'gcitest') {
+ $enroll_values .= '<td>'.$tz.'</td>';
+ }
+ $enroll_values .= '<td>'.&Apache::lonlocal::locallocaltime($accessstart,$tz).'</td>';
if ($accessend == 0) {
$enroll_values .= '<td>'.&mt('No end date').'</td>';
} else {
- $enroll_values .= '<td>'.&Apache::lonlocal::locallocaltime($accessend).'</td>';
+ $enroll_values .= '<td>'.&Apache::lonlocal::locallocaltime($accessend,$tz).'</td>';
}
my $container = 'Course';
@@ -2458,9 +2590,9 @@ sub print_review {
}
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);
+ my ($startname,$endname,$timezone) = @_;
+ my $startdate = &Apache::lonhtmlcommon::get_date_from_form($startname,$timezone);
+ my $enddate = &Apache::lonhtmlcommon::get_date_from_form($endname,$timezone);
if ($endname eq 'accessend') {
if (exists($env{'form.no_end_date'}) ) {
$enddate = 0;
@@ -2470,7 +2602,7 @@ sub dates_from_form {
}
sub courseinfo_form {
- my ($dom,$formname,$crstype,$next,$description) = @_;
+ my ($dom,$formname,$state,$crstype,$next,$description) = @_;
my %lt = &Apache::lonlocal::texthash(
official => 'You must provide a (brief) course description.',
community => 'You must provide a (brief) community description.'
@@ -2525,7 +2657,7 @@ ENDJS
'<h3>'.&Apache::loncommon::help_open_topic('Course_Request_Description').' '.$title.'</h3>'.
&Apache::lonhtmlcommon::row_closure(1).
&Apache::lonhtmlcommon::row_title($desctitle).
- '<input type="text" size="60" name="cdescr" value="'.$description.'" />';
+ '<input type="text" size="60" name="cdescr" value="'.$description.'" />';
my $showclone;
if ($dom eq 'gcitest') {
$showclone = &show_cloneable();
@@ -2564,7 +2696,7 @@ ENDJS
if ($dom eq 'gcitest') {
my ($instcode,@codetitles,%cat_titles,%cat_order,@code_order);
my $invalidcrosslist = [];
- $output .= &print_enrollment_menu($formname,$instcode,$dom,
+ $output .= &print_enrollment_menu($formname,$state,$instcode,$dom,
\@codetitles,\%cat_titles,\%cat_order,
\@code_order,$invalidcrosslist);
}
@@ -2845,7 +2977,7 @@ sub display_navbuttons {
}
sub print_request_outcome {
- my ($r,$dom,$codetitles,$code_order) = @_;
+ my ($r,$dom,$codetitles,$code_order,$formname) = @_;
my ($output,$cnum,$now,$req_notifylist,$crstype,$enrollstart,$enrollend,
%sections,%crosslistings,%personnel,@baduname,@missingdom,%domconfig,);
my $sectotal = $env{'form.sectotal'};
@@ -2882,6 +3014,10 @@ sub print_request_outcome {
push(@instsections,$sec);
}
$sections{$i}{'loncapa'} = $env{'form.loncapasec_'.$i};
+ $sections{$i}{'loncapa'} =~ s/\W//g;
+ if ($sections{$i}{'loncapa'} eq 'none') {
+ $sections{$i}{'loncapa'} = '';
+ }
}
}
}
@@ -2963,7 +3099,7 @@ sub print_request_outcome {
push(@baduname,$uname.':'.$udom);
}
}
- my ($accessstart,$accessend) = &dates_from_form('accessstart','accessend');
+ my ($accessstart,$accessend) = &dates_from_form('accessstart','accessend',$env{'form.timezone'});
my $autodrops = 0;
if ($env{'form.autodrops'}) {
$autodrops = $env{'form.autodrops'};
@@ -3027,6 +3163,7 @@ sub print_request_outcome {
personnel => \%personnel,
};
if ($dom eq 'gcitest') {
+
if ($env{'form.concepttest'} eq 'editmyown') {
$details->{'firstres'} = 'nav';
} else {
@@ -3045,7 +3182,7 @@ sub print_request_outcome {
}
$details->{'datemode'} = 'delete';
}
- my (@inststatuses,$storeresult,$creationresult);
+ my (@inststatuses,$storeresult,$creationresult,$donedisplay);
my $val = &get_processtype($dom,$crstype,\@inststatuses,\%domconfig);
if ($val eq '') {
if ($crstype eq 'official') {
@@ -3139,12 +3276,19 @@ sub print_request_outcome {
}
if ($dom eq 'gcitest') {
my $caller = 'requestcrs';
+ my $timezone;
+ if (&Apache::lonlocal::gettimezone($env{'form.timezone'}) ne 'local') {
+ $timezone = $env{'form.timezone'};
+ } else {
+ $timezone = Apache::lonlocal::gettimezone();
+ }
&acquire_cc_role($dom,$cnum,'cc./'.$dom.'/'.$cnum);
my %parmresult =
&store_crsparms($dom,$cnum,$now,$accessstart,$accessend);
&Apache::londocsgci::setdefaults();
my %crsenvhash = (
suppress_tries => 'yes',
+ timezone => $timezone,
);
my $putresult = &Apache::lonnet::put('environment',\%crsenvhash,$dom,$cnum);
if ($env{'form.concepttest'} eq 'cloning') {
@@ -3164,19 +3308,19 @@ sub print_request_outcome {
}
$output .= '<ul>'.
'<li>'.&mt('Access starts:').' '.
- &Apache::lonlocal::locallocaltime($accessstart).'</li>'.
- '<li>'.&mt('Access ends:').' '.&Apache::lonlocal::locallocaltime($accessend).'</li>'.
- '</ul><br />'.
- '<a href="/adm/menu">'.&mt('Manage Test').'</a>';
+ &Apache::lonlocal::locallocaltime($accessstart,$timezone).'</li>'.
+ '<li>'.&mt('Access ends:').' '.&Apache::lonlocal::locallocaltime($accessend,$timezone).'</li>'.
+ '</ul><br />';
$r->print($output);
$output = '';
+ $donedisplay = 1;
} else {
- &roster_upload_form($r,$output);
+ &roster_upload_form($r,$output,$formname);
$output = '';
}
} else {
$output .= '</p>';
- &roster_upload_form($r,$output);
+ &roster_upload_form($r,$output,$formname);
$output = '';
}
} elsif ($env{'form.concepttest'} eq 'defchosen') {
@@ -3191,10 +3335,10 @@ sub print_request_outcome {
$output .= &mt('A concept test has also been generated.');
}
$output .= '</p>';
- &roster_upload_form($r,$output);
+ &roster_upload_form($r,$output,$formname);
$output = '';
} else {
- $output .= '</p></form><br />'.&mt('The next step is to chose which questions are to be included in the Concept Test.').'</p>';
+ $output .= '</p></form><br />'.&mt('The next step is to chose which questions are to be included in the Concept Test.').'<br /></p>';
$r->print($output);
&Apache::londocsgci::editor($r,'requestcrs',$dom,$cnum);
$output = '';
@@ -3293,6 +3437,9 @@ sub print_request_outcome {
}
}
if ($creationresult ne '') {
+ if ($donedisplay) {
+ $r->print('<br />'.&done_display());
+ }
return ($creationresult,$output);
} else {
return ($storeresult,$output);
@@ -3515,13 +3662,55 @@ sub store_crsparms {
}
sub roster_upload_form {
- my ($r,$output) = @_;
+ my ($r,$output,$formname,$titletext) = @_;
+ my $title = &mt('Request Processed');
+ if ($titletext ne '') {
+ $title = $titletext;
+ }
+ $r->print(<<"ENDJS");
+<script type="text/javascript">
+// <![CDATA['
+
+function toggleRosterUpload() {
+ var willupload;
+ if (document.$formname.roster.length > 1) {
+ for (var i=0; i<document.$formname.roster.length; i++) {
+ if (document.$formname.roster[i].checked) {
+ willupload = document.$formname.roster[i].value;
+ }
+ }
+ }
+ if (willupload == 1) {
+ document.getElementById('rosterupload').style.display="block";
+ document.getElementById('norosterupload').style.display="none";
+ } else {
+ document.getElementById('rosterupload').style.display="none";
+ document.getElementById('norosterupload').style.display="block";
+ }
+ return;
+}
+// ]]
+</script>
+
+ENDJS
+ $r->print('<h3>'.$title.'</h3>'.$output.
+ '<h4>'.&mt('Course roster file upload').'</h4>');
$r->print('<p>'.&mt('If you have a text file available containing student e-mail addresses and initial passwords, you may upload it now.').'<br />'.
- &mt('You may also enroll students at a later date by visiting the [_1]"Menu"[_2] page and choosing: [_1]"Manage Enrollment"[_2].','<i>','</i>').'</p>'.
- '</form><form name="studentform" method="post" enctype="multipart/form-data" '.
+ &mt('You may also enroll students later with the [_1]"Enrollment/Activity"[_2] utility in the management toolbar.','<i>','</i>').'</p>'.
+ &mt('Upload roster file now?').' '.
+ '<label><input type="radio" name="roster" value="1" '.
+ 'onclick="javascript:toggleRosterUpload()" />'.
+ &mt('Yes').(' 'x2).'</label><label>'.
+ '<input type="radio" name="roster" value="0" checked="checked"'.
+ 'onclick="javascript:toggleRosterUpload()" />'.&mt('No').'</label><br />'.
+ '<div id="norosterupload"><input type="submit" value="'.&mt('Next').'" name="norostersub" />'.
+ '<input type="hidden" name="reqaction" value="new" />'.
+ '<input type="hidden" name="state" value="done" /></div></form>'.
+ '<div id="rosterupload" style="display: none"><form name="studentform" method="post" enctype="multipart/form-data" '.
' action="/adm/createuser">'."\n");
- &Apache::lonuserutils::print_first_users_upload_form($r,'course');
- $r->print('</form>');
+ &Apache::lonuserutils::print_first_users_upload_form($r,'course','noheader','requestcrs');
+ $r->print('<input type="hidden" name="concepttest" value="'.$env{'form.concepttest'}.'" />'.
+ '</div></form>');
}
sub notification_information {