--- loncom/interface/lonrequestcourse.pm 2009/09/09 15:49:26 1.33 +++ loncom/interface/lonrequestcourse.pm 2010/12/02 02:21:35 1.41.2.10 @@ -1,7 +1,7 @@ # The LearningOnline Network # Request a course # -# $Id: lonrequestcourse.pm,v 1.33 2009/09/09 15:49:26 raeburn Exp $ +# $Id: lonrequestcourse.pm,v 1.41.2.10 2010/12/02 02:21:35 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -52,10 +52,6 @@ described at http://www.lon-capa.org. =item onload_action() -=item check_can_request() - -=item course_types() - =item print_main_menu() =item request_administration() @@ -132,13 +128,21 @@ sub handler { if ($r->header_only) { return OK; } - &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, - ['action','showdom','cnum','state']); + ['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); @@ -147,8 +151,19 @@ sub handler { $states{'log'} = ['filter','display']; $states{'new'} = ['courseinfo','enrollment','personnel','review','process']; + 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'); } } @@ -161,24 +176,32 @@ sub handler { my @invalidcrosslist; my %trail = ( - crstype => 'Course Request Action', + crstype => 'Request Action', codepick => 'Category', courseinfo => 'Description', enrollment => 'Access Dates', personnel => 'Personnel', review => 'Review', - process => 'Result', + process => 'Request Outcome', pick_request => 'Display Summary', 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'; + $trail{'courseinfo'} = 'Test Information'; + } if (($env{'form.crstype'} eq 'official') && (&Apache::lonnet::auto_run('',$dom))) { $trail{'enrollment'} = 'Enrollment'; } - my ($page,$crumb,$newinstcode,$codechk,$checkedcode) = + my ($page,$crumb,$newinstcode,$codechk,$checkedcode,$description) = &get_breadcrumbs($dom,$action,\$state,\%states,\%trail); if ($action eq 'display') { if (($dom eq $env{'request.role.domain'}) && (&Apache::lonnet::allowed('ccc',$dom))) { @@ -196,16 +219,30 @@ sub handler { if (($udom =~ /^$match_domain$/) && ($uname =~ /^$match_username$/)) { $result = &retrieve_settings($dom,$cnum,$udom,$uname); } else { - $warning = &mt('Invalid username or domain for course requestor'); + if ($env{'form.crstype'} eq 'community') { + $warning = &mt('Invalid username or domain for community requestor'); + } else { + $warning = &mt('Invalid username or domain for course requestor'); + } } } else { - $warning = &mt('No information was found for this course request.'); + if ($env{'form.crstype'} eq 'community') { + $warning = &mt('No information was found for this community request.'); + } else { + $warning = &mt('No information was found for this course request.'); + } } } else { $warning = &mt('No course request ID provided.'); } } else { - $warning = &mt('You do not have rights to view course request information.'); + if ($env{'form.crstype'} eq 'any') { + $warning = &mt('You do not have rights to view course or community request information.'); + } elsif ($env{'form.crstype'} eq 'community') { + $warning = &mt('You do not have rights to view community request information.'); + } else { + $warning = &mt('You do not have rights to view course request information.'); + } } } elsif ((defined($state)) && (defined($action))) { if (($action eq 'view') && ($state eq 'details')) { @@ -239,7 +276,7 @@ sub handler { $crosslistcode .= $env{'form.crosslist_'.$i.'_'.$item}; } if ($crosslistcode ne '') { - $codechk{$i} = + ($codechk{$i}, my $rest) = &Apache::lonnet::auto_validate_instcode('',$dom,$crosslistcode); } unless ($codechk{$i} eq 'valid') { @@ -264,9 +301,12 @@ 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') { + $jscript .= &cloning_javascript(); + } } } @@ -274,29 +314,35 @@ sub handler { $jscript .= "\n".&Apache::loncommon::userbrowser_javascript(); } - my $loaditems = &onload_action($action,$state); + my $loaditems = &onload_action($action,$state,$dom); - my %can_request; - my $canreq = &check_can_request($dom,\%can_request); + my (%can_request,%request_domains); + my $canreq = + &Apache::lonnet::check_can_request($dom,\%can_request,\%request_domains); if ($action eq 'new') { if ($canreq) { if ($state eq 'crstype') { &print_main_menu($r,\%can_request,\%states,$dom,$jscript,$loaditems, - $crumb); + $crumb,\%request_domains); } else { &request_administration($r,$action,$state,$page,\%states,$dom, $jscript,$loaditems,$crumb,$newinstcode, - $codechk,$checkedcode,\@invalidcrosslist); + $codechk,$checkedcode,$description, + \@invalidcrosslist); + if ($state eq 'chooseitems' || $state eq 'uploadroster' || + $state eq 'enrolling') { + return $canreq; + } } } else { - $r->print(&header('Course Requests').$crumb. + $r->print(&header('Course/Community Requests').$crumb. '
'. - &mt('You do not have privileges to request creation of courses.'). + &mt('You do not have privileges to request creation of courses or communities.'). '
'.&Apache::loncommon::end_page()); } } elsif ($action eq 'view') { if ($state eq 'crstype') { - &print_main_menu($r,\%can_request,\%states,$dom,$jscript,$loaditems,$crumb); + &print_main_menu($r,\%can_request,\%states,$dom,$jscript,$loaditems,$crumb,\%request_domains); } else { &request_administration($r,$action,$state,$page,\%states,$dom,$jscript, $loaditems,$crumb); @@ -304,23 +350,24 @@ sub handler { } elsif ($action eq 'display') { if ($warning ne '') { my $args = { only_body => 1 }; - $r->print(&header('Course Requests','','',$args).$crumb. - '

'.&mt('Course Request Details').'

'. + $r->print(&header('Course/Community Requests','','',$args).$crumb. + '

'.&mt('Course/Community Request Details').'

'. '
'.$warning.'
'. &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); } else { - &print_main_menu($r,\%can_request,\%states,$dom,$jscript,'',$crumb); + &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 1) { + for (var i=0; i '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( {text=>"$trail->{$$state}"}); - $crumb = &Apache::lonhtmlcommon::breadcrumbs('Course Requests','Course_Requests'); + $crumb = &Apache::lonhtmlcommon::breadcrumbs($crumbtitle,$crumbhelp); last; } else { if (($$state eq 'process') || ($$state eq 'removal')) { @@ -399,24 +483,45 @@ 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=>'Pick Action'}); - $crumb = &Apache::lonhtmlcommon::breadcrumbs('Course Requests','Course_Requests'); + {text=>$firstcrumb}); + $crumb = &Apache::lonhtmlcommon::breadcrumbs($crumbtitle,$crumbhelp); } } else { &Apache::lonhtmlcommon::add_breadcrumb( - {text=>'Pick Action'}); - $crumb = &Apache::lonhtmlcommon::breadcrumbs('Course Requests','Course_Requests'); + {text=>$firstcrumb}); + $crumb = &Apache::lonhtmlcommon::breadcrumbs($crumbtitle,$crumbhelp); } - return ($page,$crumb,$newinstcode,$codechk,$checkedcode); + return ($page,$crumb,$newinstcode,$codechk,$checkedcode,$description); } sub header { @@ -430,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); @@ -452,6 +559,7 @@ sub form_elements { }, courseinfo => { cdescr => 'text', + cloning => 'radio', clonecrs => 'text', clonedom => 'selectbox', datemode => 'radio', @@ -487,12 +595,28 @@ sub form_elements { }, ); my %servers = &Apache::lonnet::get_servers($dom,'library'); + if ($dom eq 'gcitest') { + %{$elements{'new'}{'courseinfo'}} = ( + cdescr => 'text', + concepttest => 'radio', + ); + $elements{'new'}{'enrollment'}{'timezone'} = 'selectbox'; + if (&show_cloneable()) { + $elements{'new'}{'courseinfo'}{'clonecrs'} = 'selectbox'; + $elements{'new'}{'courseinfo'}{'clonedom'} = 'hidden'; + $elements{'new'}{'courseinfo'}{'cloneroster'} = 'checkbox'; + } + } my $numlib = keys(%servers); if ($numlib > 1) { $elements{'new'}{'courseinfo'}{'chome'} = 'selectbox'; } else { $elements{'new'}{'courseinfo'}{'chome'} = 'hidden'; } + if ($dom eq 'gcitest') { + my %mergedhash = (%{$elements{'new'}{'courseinfo'}},%{$elements{'new'}{'enrollment'}}); + %{$elements{'new'}{'courseinfo'}} = %mergedhash; + } my (@codetitles,%cat_titles,%cat_order,@code_order,$lastitem); &Apache::lonnet::auto_possible_instcodes($dom,\@codetitles,\%cat_titles, \%cat_order,\@code_order); @@ -587,61 +711,18 @@ sub onload_action { if ($state eq 'crstype') { $loaditems{'onload'} = 'javascript:setAction(document.mainmenu_action);javascript:setType(document.mainmenu_coursetype)'; } else { - $loaditems{'onload'} = 'javascript:setFormElements(document.requestcrs)'; + $loaditems{'onload'} = 'javascript:setFormElements(document.requestcrs);'; } } return \%loaditems; } -sub check_can_request { - my ($dom,$can_request) = @_; - my $canreq = 0; - my ($types,$typename) = &course_types(); - my @options = ('approval','validate','autolimit'); - my $optregex = join('|',@options); - if ((ref($can_request) eq 'HASH') && (ref($types) eq 'ARRAY')) { - foreach my $type (@{$types}) { - if (&Apache::lonnet::usertools_access($env{'user.name'}, - $env{'user.domain'}, - $type,undef,'requestcourses')) { - $canreq ++; - if ($dom eq $env{'user.domain'}) { - $can_request->{$type} = 1; - } - } - if ($env{'environment.reqcrsotherdom.'.$type} ne '') { - my @curr = split(',',$env{'environment.reqcrsotherdom.'.$type}); - if (@curr > 0) { - $canreq ++; - unless ($dom eq $env{'user.domain'}) { - if (grep(/^\Q$dom\E:($optregex)(=?\d*)$/,@curr)) { - $can_request->{$type} = 1; - } - } - } - } - } - } - return $canreq; -} - -sub course_types { - my @types = ('official','unofficial','community'); - my %typename = ( - official => 'Official course', - unofficial => 'Unofficial course', - community => 'Community', - ); - return (\@types,\%typename); -} - - sub print_main_menu { - my ($r,$can_request,$states,$dom,$jscript,$loaditems,$crumb) = @_; - my ($types,$typename) = &course_types(); + my ($r,$can_request,$states,$dom,$jscript,$loaditems,$crumb,$request_domains) = @_; + my ($types,$typename) = &Apache::loncommon::course_types(); my $onchange; unless ($env{'form.interface'} eq 'textual') { - $onchange = 1; + $onchange = 'this.form.submit()'; } my $nextstate_setter = "\n"; @@ -657,11 +738,13 @@ sub print_main_menu { } } - my $js = <<"END"; + my $js; + unless ($dom eq 'gcitest') { + $js = <<"END"; 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'; @@ -669,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(); } @@ -681,19 +764,20 @@ function check_can_request(crschoice,act var unofficial = ''; var community = ''; END - - foreach my $item (keys(%{$can_request})) { - $js .= " - $item = 1; + if (ref($can_request) eq 'HASH') { + foreach my $item (keys(%{$can_request})) { + $js .= " + $item = 1; "; - } - my %lt = &Apache::lonlocal::texthash( - official => 'You are not permitted to request creation of an official course in this domain.', - unofficial => 'You are not permitted to request creation of an unofficial course in this domain.', - community => 'You are not permitted to request creation of a community this domain.', - all => 'You must choose a specific course type when making a new course request.\\nAll types is not allowed.', - ); - $js .= < 'You are not permitted to request creation of an official course in this domain.', + unofficial => 'You are not permitted to request creation of an unofficial course in this domain.', + community => 'You are not permitted to request creation of a community this domain.', + all => 'You must choose a specific course type when making a new course request.\\nAll types is not allowed.', + ); + $js .= <{'official'}) || ($can_request->{'unofficial'})) { + if ($can_request->{'community'}) { + $pagetitle = 'Course/Community Requests'; + $pageinfo = &mt('Request creation of a new course or community, or review your pending requests.'); + $domaintitle = &mt('Course/Community Domain'); + } else { + $pagetitle = 'Course Requests'; + $pageinfo = &mt('Request creation of a new course, or review your pending course requests.'); + $domaintitle = &mt('Course Domain'); + } + } elsif ($can_request->{'community'}) { + $pagetitle = 'Community Requests'; + $pageinfo = &mt('Request creation of a new course, or review your pending requests.'); + $domaintitle = &mt('Community Domain'); + } else { + $pagetitle = 'Course/Community Requests'; + $pageinfo = &mt('You do not have rights to request creation of courses in this domain; please choose a different domain.'); + $domaintitle = &mt('Course/Community Domain'); + } + } - $r->print(&header('Course Requests',$js.$jscript,$loaditems).$crumb.'
'. + if ($dom eq 'gcitest') { + my $formname = 'requestcrs'; + my $nexttext = &mt('Continue'); + $r->print(&header($pagetitle,$js.$jscript,$loaditems).$crumb. + '

'.&mt('Deployment of a Concept Test requires completion of the following three steps:').'

    '. + '
  1. '.&mt('Creation of a course "container" and setting of access dates').'
    2. '. + '
  2. '.&mt('Assembly of a valid test from Concept Inventory questions').'
    3. '. + '
  3. '.&mt('Enrollment of students').'
    4. '. + '

'.&mt('When assembling a test you may:'). + '
'.&mt('(a) have a valid test built automatically by the WebCenter, or').'
'.&mt('(b) select the questions to include by combining questions chosen from eleven bins with four mandatory questions, or'). + '
'.&mt('(c) copy one of your existing tests (including optional copying of the student roster)').'

'.&mt('The most efficient way to enroll students is to upload a text file containing usernames and passwords.').'
'.&mt("Students' e-mail addresses must be used as their usernames to ensure uniqueness.").'

'. + '
'."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". + '
'. + &Apache::loncommon::end_page()); + return; + } + + if (!$onchange) { + $r->print(' '); + } + unless ((ref($can_request) eq 'HASH') && (keys(%{$can_request}) > 0)) { + $r->print(&Apache::lonhtmlcommon::row_closure(1)."\n". + &Apache::lonhtmlcommon::end_pick_box().'
'."\n". + &Apache::loncommon::end_page()); + return; + } + + my @incdoms; + if (ref($request_domains) eq 'HASH') { + foreach my $item (keys(%{$request_domains})) { + if (ref($request_domains->{$item}) eq 'ARRAY') { + foreach my $possdom (@{$request_domains->{$item}}) { + unless(grep(/^\Q$possdom\E$/,@incdoms)) { + push(@incdoms,$possdom); + } + } + } + } + } + $r->print(&header($pagetitle,$js.$jscript,$loaditems).$crumb. + '

'.$pageinfo.'

'. + '
'. &Apache::lonhtmlcommon::start_pick_box(). - &Apache::lonhtmlcommon::row_title(&mt('Course Domain')). + &Apache::lonhtmlcommon::row_title($domaintitle). '
'. - &Apache::loncommon::select_dom_form($dom,'showdom','',1,$onchange)); + &Apache::loncommon::select_dom_form($dom,'showdom','',1,$onchange,\@incdoms)); if (!$onchange) { $r->print(' '); } + unless ((ref($can_request) eq 'HASH') && (keys(%{$can_request}) > 0)) { + $r->print(&Apache::lonhtmlcommon::row_closure(1)."\n". + &Apache::lonhtmlcommon::end_pick_box().'
'."\n". + &Apache::loncommon::end_page()); + return; + } $r->print(''.&Apache::lonhtmlcommon::row_closure()); - my $formname = 'requestcrs'; my $nexttext = &mt('Next'); $r->print(&Apache::lonhtmlcommon::row_title(&mt('Action')).'
-
'. &Apache::lonhtmlcommon::row_closure(1). - &Apache::lonhtmlcommon::row_title(&mt('Course Type')).' + &Apache::lonhtmlcommon::row_title(&mt('Type')).'
-'); + if (ref($can_request) eq 'HASH') { + if (keys(%{$can_request}) > 1) { + $r->print(' '); + } + if ((ref($types) eq 'ARRAY') && (ref($typename) eq 'HASH')) { + foreach my $type (@{$types}) { + next unless($can_request->{$type}); + my $selected = ''; + if ($env{'form.crstype'} eq '') { + if ($type eq 'official') { + $selected = ' selected="selected"'; + } + } else { + if ($type eq $env{'form.crstype'}) { + $selected = ' selected="selected"'; + } + } + $r->print(''."\n"); } - $r->print(''."\n"); } } $r->print('
'."\n". &Apache::lonhtmlcommon::row_closure(1)."\n". &Apache::lonhtmlcommon::end_pick_box().''."\n". - '
'."\n". + '
'."\n". ''."\n". ''."\n". ''."\n". - ''."\n". + ''."\n". ''."\n". '
'); @@ -776,7 +946,8 @@ END sub request_administration { my ($r,$action,$state,$page,$states,$dom,$jscript,$loaditems,$crumb, - $newinstcode,$codechk,$checkedcode,$invalidcrosslist,$uname,$udom) = @_; + $newinstcode,$codechk,$checkedcode,$description,$invalidcrosslist, + $uname,$udom) = @_; my $js; if (($action eq 'new') || (($action eq 'view') && ($state eq 'pick_request'))) { $js = <print(&header('Request a course',$js.$jscript,$loaditems,$jsextra).$crumb); + 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,$invalidcrosslist); + $codechk,$checkedcode,$description,$invalidcrosslist); } elsif ($action eq 'view') { my $jsextra; my $formname = 'requestcrs'; @@ -827,12 +1015,27 @@ END } elsif ($state eq 'cancel') { $jsextra = &viewcancel_javascript($formname); } - $r->print(&header('Manage course requests',$js.$jscript.$jsextra,$loaditems). - $crumb); + my $title; + if ($env{'form.crstype'} eq 'community') { + $title = 'Manage community requests'; + } else { + $title = 'Manage course requests'; + } + $r->print(&header($title,$js.$jscript.$jsextra,$loaditems).$crumb); my $form = '
'; if ($state eq 'pick_request') { - $r->print('

'.&mt('Pending course requests').'

'."\n".$form."\n". - &print_request_status($dom).'
'); + my $title; + if ($env{'form.crstype'} eq 'community') { + $title = &mt('Pending community requests'); + } elsif ($env{'form.crstype'} eq 'official') { + $title = &mt('Pending requests for official courses'); + } elsif ($env{'form.crstype'} eq 'unofficial') { + $title = &mt('Pending requests for unofficial courses'); + } else { + $title = &mt('Pending course/community requests'); + } + $r->print('

'.$title.'

'."\n".$form."\n". + &print_request_status($dom,$action,$state).'
'); } elsif ($state eq 'details') { my (@codetitles,%cat_titles,%cat_order,@code_order,$instcode,$code_chk); my $origcnum = $env{'form.cnum'}; @@ -843,7 +1046,13 @@ END &Apache::lonnet::auto_possible_instcodes($dom,\@codetitles,\%cat_titles, \%cat_order,\@code_order); } - $r->print('

'.&mt('Course Request Details').'

'."\n".$form."\n". + my $title; + if ($env{'form.crstype'} eq 'community') { + $title = &mt('Community Request Details'); + } else { + $title = &mt('Course Request Details'); + } + $r->print('

'.$title.'

'."\n".$form."\n". &print_review($dom,\@codetitles,\%cat_titles,\%cat_order, \@code_order)."\n". ''."\n"); @@ -860,8 +1069,14 @@ END $navtxt{'next'},$state,$other,$navtxt{'other'}); $r->print(''); } elsif ($state eq 'cancel') { + my $title; + if ($env{'form.crstype'} eq 'community') { + $title = &mt('Cancel community request'); + } else { + $title = &mt('Cancel course request'); + } my ($result,$output) = &print_cancel_request($dom,$env{'form.origcnum'}); - $r->print('

'.&mt('Cancel course request').'

'."\n".$form."\n". + $r->print('

'.$title.'

'."\n".$form."\n". $output); my @excluded = &get_excluded_elements($dom,$states,'view','cancel'); $r->print(&Apache::lonhtmlcommon::echo_form_input(\@excluded).'
'); @@ -906,11 +1121,15 @@ END } $r->print('

'.&mt('Request Cancellation').'

'."\n".$form."\n". ''."\n". - ''."\n". + ''."\n". ''."\n". ''."\n"); if ($result eq 'ok') { - $r->print(&mt('Your course request has been cancelled.')); + if ($env{'form.crstype'} eq 'community') { + $r->print(&mt('Your community request has been cancelled.')); + } else { + $r->print(&mt('Your course request has been cancelled.')); + } } else { $r->print('
'. &mt('The request cancellation process was not complete.'). @@ -925,8 +1144,16 @@ END &Apache::lonnet::auto_possible_instcodes($dom,\@codetitles,\%cat_titles, \%cat_order,\@code_order); } - $r->print(&header('Course Request','','','',{ 'only_body' => 1}). - $crumb."\n".'

'.&mt('Course Request Details').'

'. + my ($title,$header); + if ($env{'form.crstype'} eq 'community') { + $title = 'Community Request'; + $header = &mt('Community Request'); + } else { + $title = 'Course Request'; + $header = &mt('Course Request'); + } + $r->print(&header($title,'','','',{ 'only_body' => 1}). + $crumb."\n".'

'.$header.'

'. &print_review($dom,\@codetitles,\%cat_titles,\%cat_order, \@code_order,$uname,$udom)."\n".'
'. &close_popup_form()); @@ -1124,7 +1351,7 @@ sub get_instcode { sub print_request_form { my ($r,$action,$state,$page,$states,$dom,$newinstcode,$codechk,$checkedcode, - $invalidcrosslist) = @_; + $description,$invalidcrosslist) = @_; my $formname = 'requestcrs'; my ($next,$prev,$message,$output,$codepicker,$crstype); $prev = $states->{$action}[$page-1]; @@ -1134,7 +1361,7 @@ sub print_request_form { next => 'Next', ); $crstype = $env{'form.crstype'}; - $r->print('
'); + $r->print('
'); my (@codetitles,%cat_titles,%cat_order,@code_order,$instcode,$code_chk, @disallowed); if ($crstype eq 'official') { @@ -1171,33 +1398,35 @@ sub print_request_form { $codepicker = &coursecode_form($dom,'instcode',\@codetitles, \%cat_titles,\%cat_order); if ($codepicker) { - $r->print('
'.&Apache::lonhtmlcommon::start_pick_box().$codepicker. + $r->print(&mt('Specify the course to be created.'). + '
'.&Apache::lonhtmlcommon::start_pick_box(). + $codepicker. &Apache::lonhtmlcommon::end_pick_box().'
'); } else { $next = $states->{$action}[$page+2]; - $r->print(&courseinfo_form($dom,$formname,$crstype,$next)); + $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)); + $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; @@ -1280,17 +1509,25 @@ sub print_request_form { } &Apache::lonnet::auto_possible_instcodes($dom,\@codetitles,\%cat_titles, \%cat_order,\@code_order); - $r->print('

'.&mt('Review course request details before submission').'

'. - &print_review($dom,\@codetitles,\%cat_titles,\%cat_order,\@code_order,'','',\@disallowed,\%disallowmsg). + if ($crstype eq 'community') { + $r->print('

'.&mt('Review community request details before submission').'

'); + } else { + $r->print('

'.&mt('Review course request details before submission').'

'); + } + $r->print(&print_review($dom,\@codetitles,\%cat_titles,\%cat_order,\@code_order,'','',\@disallowed,\%disallowmsg). ''); - $navtxt{'next'} = &mt('Submit course request'); - } elsif ($state eq 'process') { + if ($crstype eq 'community') { + $navtxt{'next'} = &mt('Submit community request'); + } else { + $navtxt{'next'} = &mt('Submit course request'); + } + } elsif ($state eq 'process') { if ($crstype eq 'official') { &Apache::lonnet::auto_possible_instcodes($dom,\@codetitles,\%cat_titles, \%cat_order,\@code_order); } - my ($storeresult,$result) = &print_request_outcome($dom,\@codetitles, - \@code_order); + my ($storeresult,$result) = &print_request_outcome($r,$dom,\@codetitles, + \@code_order,$formname); $r->print($result); if (($storeresult eq 'ok') || ($storeresult eq 'created')) { $r->print('

'); @@ -1298,9 +1535,13 @@ sub print_request_form { $r->print(''. &mt('Modify this request').''.(' 'x4)); } - $r->print(''.&mt('Make another request').'

'); + unless ($env{'form.concepttest'}) { + $r->print(''.&mt('Make another request').'

'); + } return; } + } elsif ($state eq 'uploadroster') { + &roster_upload_form($r,$output,$formname); } my @excluded = &get_excluded_elements($dom,$states,$action,$state); if ($state eq 'personnel') { @@ -1335,12 +1576,39 @@ sub print_request_form { if ($state eq 'enrollment') { push(@excluded,'crosslisttotal'); } - $r->print(&Apache::lonhtmlcommon::echo_form_input(\@excluded).''); - &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(''); return; } +sub done_display { + return '

'.&mt('Concept Test creation is complete').'

'. + '

'.&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]', + '','','','','
'). + '

'. + '
'.&mt('Concept Test Contents').'
'. + '
'.&mt('Display the Table of Contents for your Concept Test.').'
'. + '
'.&mt('Assemble Concept Test').'
'. + '
'.&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.').'
'. + '
'. + '
'.&mt('Enrollment and Student Activity').'
'. + '
'.&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.').'
'. + '
'.&mt("What's New?").'
'. + '
'.&mt('View information about changes in your Concept Test course.').'
'. + '
'. + '
'.&mt('Prepare Printable Concept Test').'
'. + '
'.&mt('Create a PDF which you can send to a printer to create a hardcopy of the Concept Test.').'
'. + '
'.&mt('Concept Test Statistics').'
'. + '
'.&mt('After the closing date of the Concept Test you can view and download statistics for the test, as well as anonymized submission data.').'
'. + '

'; +} + sub get_cancreate_status { my ($persondom,$personname,$dom) = @_; my ($rules,$ruleorder) = @@ -1405,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 ($sections,$autoenroll,$access_dates,$output); + 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', @@ -1430,7 +1707,8 @@ sub print_enrollment_menu { $section_form = &inst_section_selector($dom,$instcode); if ($section_form) { $sections = &Apache::lonhtmlcommon::row_headline(). - '

'.&mt('Sections for auto-enrollment').'

'. + '

'.&Apache::loncommon::help_open_topic('Course_Request_Sections'). + ' '.&mt('Sections for auto-enrollment').'

'. &Apache::lonhtmlcommon::row_closure(1). $section_form; } @@ -1447,37 +1725,39 @@ sub print_enrollment_menu { } if ($crosslist_form) { $crosslist_form .= - &Apache::lonhtmlcommon::row_title(&mt('Add another?')). + &Apache::lonhtmlcommon::row_title(&mt('Add another')). ''. ''.&mt('Add?').&Apache::lonhtmlcommon::row_closure(); $sections .= &Apache::lonhtmlcommon::row_headline. '

'.&mt('Crosslisted courses for auto-enrollment').'

'. &Apache::lonhtmlcommon::row_closure(1). $crosslist_form; } + $hasauto = 1; $autoenroll = - &Apache::lonhtmlcommon::row_title(&mt('Add registered students automatically')). + &Apache::lonhtmlcommon::row_title(&Apache::loncommon::help_open_topic('Course_Request_Autoadd').' '.&mt('Add registered students automatically')). ''.(' 'x3).''. &Apache::lonhtmlcommon::row_closure(1). - &Apache::lonhtmlcommon::row_title(&mt('Drop unregistered students automatically')). + &Apache::lonhtmlcommon::row_title(&Apache::loncommon::help_open_topic('Course_Request_Autodrop').' '.&mt('Drop unregistered students automatically')). ''.(' 'x3).''. &Apache::lonhtmlcommon::row_closure(1). - &date_setting_table($starttime,$endtime,$formname,'enroll',%enrolltitles); + &date_setting_table($starttime,$endtime,$formname,'enroll', + $hasauto,$dom,%enrolltitles); } } my $access_dates = - &date_setting_table($starttime,$endtime,$formname,'access',%accesstitles); - $output .= &Apache::lonhtmlcommon::start_pick_box(); + &date_setting_table($starttime,$endtime,$formname,'access',$hasauto, + $dom,%accesstitles); if ($sections) { $output .= $sections; } @@ -1494,11 +1774,23 @@ sub print_enrollment_menu { } $output .= &Apache::lonhtmlcommon::row_headline('Access'). '

'.$header.'

'. - &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; + } else { + return '
'.&Apache::lonhtmlcommon::start_pick_box().$output. + &Apache::lonhtmlcommon::end_pick_box().'
'; } - return '
'.&Apache::lonhtmlcommon::start_pick_box().$output. - &Apache::lonhtmlcommon::end_pick_box().'
'; } sub show_invalid_crosslists { @@ -1530,7 +1822,8 @@ sub inst_section_selector { ''.&mt('Include?').''. ''.&mt('Institutional Section').''. - ''.&mt('LON-CAPA section').''. + ''.&Apache::loncommon::help_open_topic('Course_Request_LCSection'). + ' '.&mt('LON-CAPA section').''. &Apache::loncommon::end_data_table_row(); for (my $i=0; $i<@sections; $i++) { my $colflag = $i%2; @@ -1559,30 +1852,58 @@ sub inst_section_selector { } sub date_setting_table { - my ($starttime,$endtime,$formname,$prefix,%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 = ' '; + unless (&Apache::loncommon::needs_gci_custom()) { + $perpetual = ' '; + } $closure = '1'; } - $table = &Apache::lonhtmlcommon::row_title($datetitles{'start'}). - $startform. + + my %help_item = ( + access => { + start => 'Course_Request_Access_Start', + end => 'Course_Request_Access_End', + }, + enroll => { + start => 'Course_Request_Enroll_Start', + end => 'Course_Request_Enroll_End', + }, + ); + if ($hasauto) { + $help_item{'access'}{'start'} = 'Course_Request_RegAccess_Start'; + $help_item{'access'}{'end'} = 'Course_Request_RegAccess_End'; + } + + $table = &Apache::lonhtmlcommon::row_title(&Apache::loncommon::help_open_topic($help_item{$prefix}{'start'}). + ' '.$datetitles{'start'}).$startform. &Apache::lonhtmlcommon::row_closure(1). - &Apache::lonhtmlcommon::row_title($datetitles{'end'}). - $endform.$perpetual. + &Apache::lonhtmlcommon::row_title(&Apache::loncommon::help_open_topic($help_item{$prefix}{'end'}). + ' '.$datetitles{'end'}).$endform.$perpetual. &Apache::lonhtmlcommon::row_closure($closure); return $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)) { @@ -1599,12 +1920,12 @@ sub print_personnel_menu { } my @items = ('uname','dom','lastname','firstname','emailaddr','hidedom'); - my $roleoptions; - my @roles = &Apache::lonuserutils::roles_by_context('course'); my $type = 'Course'; if ($crstype eq 'community') { $type = 'Community'; } + my $roleoptions; + my @roles = &Apache::lonuserutils::roles_by_context('course','',$type); foreach my $role (@roles) { my $plrole = &Apache::lonnet::plaintext($role,$type); $roleoptions .= ' '."\n"; @@ -1645,7 +1966,7 @@ sub print_personnel_menu { ); $lt{'unofficial'} = $lt{'official'}; $output .= &Apache::lonhtmlcommon::row_headline(). - '

'.$lt{$crstype}.' '.&mt('Include other personnel?').'

'; + '

'.&Apache::loncommon::help_open_topic('Course_Request_Personnel').' '.$lt{$crstype}.' '.&mt('Include other personnel?').'

'; } for (my $i=0; $i<$persontotal; $i++) { my @linkargs = map { 'person_'.$i.'_'.$_ } (@items); @@ -1687,16 +2008,22 @@ sub print_personnel_menu { ''.&mt('First Name').'
'.$form_elems{'firstname'}.''."\n". ''.&mt('Last Name').'
'.$form_elems{'lastname'}.''."\n". ''.&mt('E-mail').'
'.$form_elems{'emailaddr'}.''."\n". - ''.&mt('Role').&Apache::loncommon::help_open_topic('Course_Roles').'
'.$roleselector.''."\n". - ''.&mt('LON-CAPA Section(s)').'
'.$sectionselector.''."\n". + ''.&Apache::loncommon::help_open_topic('Course_Roles').' '.&mt('Role').'
'.$roleselector.''."\n". + ''. + &Apache::loncommon::help_open_topic('Course_Request_Rolesection').' '.&mt('LON-CAPA Section(s)').'
'.$sectionselector.''."\n". ''.&Apache::lonhtmlcommon::row_closure(); } - $output .= &Apache::lonhtmlcommon::row_title(&mt('Add another?')). + $output .= &Apache::lonhtmlcommon::row_title(&mt('Add another')). ''. ''.&mt('Add?').&Apache::lonhtmlcommon::row_closure(1). &Apache::lonhtmlcommon::end_pick_box().'
'; + if ($crstype eq 'community') { + $output .= '

'.&mt('You may also add users later, once the community has been created, by using the "Manage community users" link, accessible from the "Main Menu".').'

'; + } else { + $output .= '

'.&mt('You may also add users later, once the course has been created, by using the "Manage course users" link, accessible from the "Main Menu".').'

'; + } return $output; } @@ -1718,17 +2045,11 @@ 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,%typenames); - if ($env{'form.crstype'} eq 'any') { - %typenames = &Apache::lonlocal::texthash ( - official => 'Official course', - unofficial => 'Unofficial course', - community => 'Community', - ); - } + my ($output,$formname,%queue_by_date); + my ($types,$typenames) = &Apache::loncommon::course_types(); foreach my $key (keys(%statusinfo)) { if (($statusinfo{$key} eq 'approval') || ($statusinfo{$key} eq 'pending')) { (undef,my($cdom,$cnum)) = split(':',$key); @@ -1767,17 +2088,25 @@ sub print_request_status { } $formname = 'requestcrs'; my @sortedtimes = sort {$a <=> $b} (keys(%queue_by_date)); - $output = ''."\n". + $output = ''."\n". - ''."\n". + ''."\n". ''."\n". ''."\n". ''."\n"; if (@sortedtimes > 0) { + my $desctitle; + if ($env{'form.crstype'} eq 'any') { + $desctitle = &mt('Course/Community Description') + } elsif ($env{'form.crstype'} eq 'community') { + $desctitle = &mt('Community Description') + } else { + $desctitle = &mt('Course Description'); + } $output .= &Apache::loncommon::start_data_table(). &Apache::loncommon::start_data_table_header_row(). ''.&mt('Action').''. - ''.&mt('Course Description').''. + ''.$desctitle.''. ''.&mt('Domain').''; if ($env{'form.crstype'} eq 'any') { $output .= ''.&mt('Type').''; @@ -1799,7 +2128,10 @@ sub print_request_status { ''.&unescape($desc).''. ''.$cdom.''; if ($env{'form.crstype'} eq 'any') { - my $typename = $typenames{$type}; + my $typename; + if (ref($typenames) eq 'HASH') { + $typename = &mt($typenames->{$type}); + } if ($typename eq '') { $typename = &mt('Unknown type'); } @@ -1822,7 +2154,13 @@ sub print_request_status { } $output .= &Apache::loncommon::end_data_table(); } else { - $output .= '
'.&mt('You have no matching course requests awaiting approval by a Domain Coordinator or held in a queue pending administrative action at your institution.').'
'; + if ($env{'form.crstype'} eq 'any') { +$output .= '
'.&mt('You have no matching course or community requests awaiting approval by a Domain Coordinator or held in a queue pending administrative action at your institution.').'
'; + } elsif ($env{'form.crstype'} eq 'community') { + $output .= '
'.&mt('You have no matching community requests awaiting approval by a Domain Coordinator or held in a queue pending administrative action at your institution.').'
'; + } else { + $output .= '
'.&mt('You have no matching course requests awaiting approval by a Domain Coordinator or held in a queue pending administrative action at your institution.').'
'; + } } $output .= '
'; @@ -1847,7 +2185,7 @@ sub print_cancel_request { } $output = &mt('No further action will be taken'); } elsif (ref($history{'details'}) eq 'HASH') { - my ($types,$typename) = &course_types(); + my ($types,$typename) = &Apache::loncommon::course_types(); my $showtype = $crstype; if (defined($typename->{$crstype})) { $showtype = $typename->{$crstype}; @@ -1863,8 +2201,12 @@ sub print_cancel_request { ''.$showtype.''. &Apache::loncommon::end_data_table_row(). &Apache::loncommon::end_data_table(). - '
'. - &mt('Cancelling the request will remove it from the queue of pending course requests').'
'; + '
'; + if ($crstype eq 'community') { + $output .= &mt('Cancelling the request will remove it from the queue of pending community requests').'
'; + } else { + $output .= &mt('Cancelling the request will remove it from the queue of pending course requests').'
'; + } $result = 'ok'; } else { $output = '
'.&mt('No record exists for the course ID').'
'; @@ -1895,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; } @@ -1933,7 +2275,7 @@ sub print_request_logs { sub print_review { my ($dom,$codetitles,$cat_titles,$cat_order,$code_order,$uname,$udom, $disallowed,$disallowmsg) = @_; - my ($types,$typename) = &course_types(); + my ($types,$typename) = &Apache::loncommon::course_types(); my ($owner,$ownername,$owneremail); if ($uname eq '' || $udom eq '') { $uname = $env{'user.name'}; @@ -1952,7 +2294,7 @@ sub print_review { $crstypename = $env{'form.crstype'}; if (ref($typename) eq 'HASH') { unless ($typename->{$env{'form.crstype'}} eq '') { - $crstypename = $typename->{$env{'form.crstype'}}; + $crstypename = &mt($typename->{$env{'form.crstype'}}); } } my $category = 'Course'; @@ -2052,61 +2394,107 @@ sub print_review { } my %ctxt = &clone_text(); - $inst_headers .= ''.&mt('Clone From').''; - if (($env{'form.clonecrs'} =~ /^$match_name$/) && - ($env{'form.clonedom'} =~ /^$match_domain$/)) { - my $canclone = &Apache::loncoursequeueadmin::can_clone_course($env{'user.name'}, - $env{'user.domain'},$env{'form.clonecrs'}, $env{'form.clonedom'}); - if ($canclone) { - my %courseenv = &Apache::lonnet::userenvironment($env{'form.clonedom'}, + if ($dom eq 'gcitest') { + $inst_headers .= ''.&mt('Test Questions').''; + my $concepttest; + if ($env{'form.concepttest'} eq 'defchosen') { + $concepttest = 'Auto-generated'; + } elsif ($env{'form.concepttest'} eq 'editmyown') { + $concepttest = 'Manually selected'; + } elsif ($env{'form.concepttest'} eq 'cloning') { + $concepttest = 'Copied from existing test'; + } + $inst_values .= ''.$concepttest.(' 'x2).''; + } + if (&show_cloneable()) { + $inst_headers .= ''.&mt('Copy From').''; + if ((($env{'form.cloning'}) || + (($dom eq 'gcitest') && ($env{'form.concepttest'} eq 'cloning'))) && + ($env{'form.clonecrs'} =~ /^$match_name$/) && + ($env{'form.clonedom'} =~ /^$match_domain$/)) { + my $canclone = &Apache::loncoursequeueadmin::can_clone_course($env{'user.name'}, + $env{'user.domain'},$env{'form.clonecrs'},$env{'form.clonedom'}, + $env{'form.crstype'}); + if ($canclone) { + my %courseenv = &Apache::lonnet::userenvironment($env{'form.clonedom'}, $env{'form.clonecrs'},('description','internal.coursecode')); - if (keys(%courseenv) > 0) { - $inst_headers .= ''.$ctxt{'dsh'}.''; - $inst_values .= ''.$courseenv{'description'}.' '; - my $cloneinst = $courseenv{'internal.coursecode'}; - if ($cloneinst ne '') { - $inst_values .= $cloneinst.' '.&mt('in').' '.$env{'form.clonedom'}; - } else { - $inst_values .= &mt('from').' '.$env{'form.clonedom'}; - } - $inst_values .= ''; - if ($env{'form.datemode'} eq 'preserve') { - $inst_values .= $ctxt{'prd'}; - } elsif ($env{'form.datemode'} eq 'shift') { - $inst_values .= &mt('Shift dates by [_1] days',$env{'form.dateshift'}); - } else { - $inst_values .= $ctxt{'ncd'}; - } - $inst_values .= ''; + if (keys(%courseenv) > 0) { + if ($dom eq 'gcitest') { + $inst_headers .= ''.$ctxt{'ros'}.''; + } else { + $inst_headers .= ''.$ctxt{'dsh'}.''; + } + $inst_values .= ''.$courseenv{'description'}.' '; + my $cloneinst = $courseenv{'internal.coursecode'}; + if ($cloneinst ne '') { + $inst_values .= $cloneinst.' '.&mt('in').' '.$env{'form.clonedom'}; + } else { + unless ($dom eq 'gcitest') { + $inst_values .= &mt('from').' '.$env{'form.clonedom'}; + } + } + $inst_values .= (' 'x2).''; + if ($dom eq 'gcitest') { + if ($env{'form.cloneroster'}) { + $inst_values .= &mt('Yes'); + } else { + $inst_values .= &mt('No'); + } + } else { + if ($env{'form.datemode'} eq 'preserve') { + $inst_values .= $ctxt{'prd'}; + } elsif ($env{'form.datemode'} eq 'shift') { + $inst_values .= &mt('Shift dates by [_1] days',$env{'form.dateshift'}); + } else { + $inst_values .= $ctxt{'ncd'}; + } + } + $inst_values .= ''; + } else { + $inst_values .= ''.&mt('Unknown').''; + } } else { - $inst_values .= ''.&mt('Unknown').''; + $inst_values .= ''.&mt('Not permitted'),''; } - } else { - $inst_values .= ''.&mt('Not permitted'),''; - } - } else { - $inst_values .= ''.&mt('None').''; + } else { + $inst_values .= ''.&mt('None').''; + } + } + 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 .= ''.&mt('Time Zone').''; } $enroll_headers .= ''.&mt('Access Starts').''. ''.&mt('Access Ends').''; - my ($accessstart,$accessend) = &dates_from_form('accessstart','accessend'); - $enroll_values .= ''.&Apache::lonlocal::locallocaltime($accessstart).''; + my ($accessstart,$accessend) = &dates_from_form('accessstart','accessend',$tz); + if ($dom eq 'gcitest') { + $enroll_values .= ''.$tz.''; + } + $enroll_values .= ''.&Apache::lonlocal::locallocaltime($accessstart,$tz).''; if ($accessend == 0) { $enroll_values .= ''.&mt('No end date').''; } else { - $enroll_values .= ''.&Apache::lonlocal::locallocaltime($accessend).''; + $enroll_values .= ''.&Apache::lonlocal::locallocaltime($accessend,$tz).''; } my $container = 'Course'; + my $ccrole = 'cc'; if ($env{'form.crstype'} eq 'community') { $container = 'Community'; + $ccrole = 'co'; } $personnel_headers = ''.&mt('Name').''.&mt('Username:Domain'). ''.&mt('Role').''.&mt('LON-CAPA Sections'). ''; + $personnel_values .= ''.$ownername.''.$owner.''. - ''.&Apache::lonnet::plaintext('cc',$container).''. + ''.&Apache::lonnet::plaintext($ccrole,$container).''. ''.&mt('None').''; for (my $i=0; $i<$env{'form.persontotal'}; $i++) { if ($env{'form.person_'.$i.'_uname'} ne '') { @@ -2142,7 +2530,7 @@ sub print_review { if ($showsec eq '') { $showsec = &mt('None'); } - if ($env{'form.person_'.$i.'_role'} eq 'cc') { + if ($env{'form.person_'.$i.'_role'} eq $ccrole) { $showsec = &mt('None'); } my $role = $env{'form.person_'.$i.'_role'}; @@ -2202,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; @@ -2214,7 +2602,7 @@ sub dates_from_form { } sub courseinfo_form { - my ($dom,$formname,$crstype,$next) = @_; + 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.' @@ -2231,20 +2619,55 @@ function validateForm() { } nextPage(document.$formname,'$next'); } + +function toggleCloning() { + var willclone; + if (document.$formname.cloning.length > 1) { + for (var i=0; i ENDJS my $title = &mt('Brief Course Description'); + my $desctitle = &mt('Description'); + if ($dom eq 'gcitest') { + $title = &mt('Concept Test Course Information'); + $desctitle = &mt('Concept Test Title'); + } + my $clonetitle = &mt('Copy content and settings from an existing course?'); if ($crstype eq 'community') { $title = &mt('Brief Community Description'); + $clonetitle = &mt('Copy content and settings from an existing community?'); } - my $output .= $js_validate."\n".'
'.&Apache::lonhtmlcommon::start_pick_box(). + my $output .= $js_validate."\n".&Apache::lonhtmlcommon::start_pick_box(). &Apache::lonhtmlcommon::row_headline(). - '

'.$title.'

'. + '

'.&Apache::loncommon::help_open_topic('Course_Request_Description').' '.$title.'

'. &Apache::lonhtmlcommon::row_closure(1). - &Apache::lonhtmlcommon::row_title(&mt('Description')). - ''; + &Apache::lonhtmlcommon::row_title($desctitle). + ''; + my $showclone; + if ($dom eq 'gcitest') { + $showclone = &show_cloneable(); + } else { + $showclone = 1; + } + if ($dom eq 'gcitest') { + $output .= &Apache::lonhtmlcommon::row_closure(1). + &concepttest_form($showclone); + } my ($home_server_pick,$numlib) = &Apache::loncommon::home_server_form_item($dom,'chome', 'default','hide'); @@ -2253,12 +2676,82 @@ ENDJS &Apache::lonhtmlcommon::row_title(&mt('Home Server for Course')); } $output .= $home_server_pick. - &Apache::lonhtmlcommon::row_closure(). - &Apache::lonhtmlcommon::row_headline(). - '

'.&mt('Clone content and settings from an existing course?').'

'. - &Apache::lonhtmlcommon::row_closure(1). - &clone_form($dom,$formname,$crstype). - &Apache::lonhtmlcommon::end_pick_box().'
'."\n"; + &Apache::lonhtmlcommon::row_closure(); + if ($showclone && $dom ne 'gcitest') { + $output .= &Apache::lonhtmlcommon::row_headline(). + '

'.&Apache::loncommon::help_open_topic('Course_Request_Clone').' '.$clonetitle. + ''. + '

'. + &Apache::lonhtmlcommon::row_closure(1). + &Apache::lonhtmlcommon::row_headline(). + ''; + } + if ($dom eq 'gcitest') { + my ($instcode,@codetitles,%cat_titles,%cat_order,@code_order); + my $invalidcrosslist = []; + $output .= &print_enrollment_menu($formname,$state,$instcode,$dom, + \@codetitles,\%cat_titles,\%cat_order, + \@code_order,$invalidcrosslist); + } + $output .= &Apache::lonhtmlcommon::end_pick_box()."\n"; + return $output; +} + +sub concepttest_form { + my ($showclone) = @_; + my $output = &Apache::lonhtmlcommon::row_title(&mt('Questions included in Concept Test')). + '
'. + ''; + if ($showclone) { + $output .= '
'.&select_oldtest().(' ' x2). + ''. + ''; + } + return $output; +} + +sub select_oldtest { + my $output = ''; return $output; } @@ -2268,14 +2761,14 @@ sub clone_form { if ($crstype eq 'community') { $type = 'Community'; } - my $cloneform = &Apache::loncommon::select_dom_form($dom,'clonedom'). + my $cloneform = &Apache::loncommon::select_dom_form($dom,'clonedom').' '. &Apache::loncommon::selectcourse_link($formname,'clonecrs','clonedom','','','',$type); my %lt = &clone_text(); my $output .= &Apache::lonhtmlcommon::row_title($lt{'cid'}).''.&Apache::lonhtmlcommon::row_closure(1).''. + ''.&Apache::lonhtmlcommon::row_closure(1). + &Apache::lonhtmlcommon::row_title($lt{'dmn'}).''.&Apache::lonhtmlcommon::row_closure(1). &Apache::lonhtmlcommon::row_title($lt{'dsh'}).'