--- loncom/interface/lonrequestcourse.pm 2009/10/24 03:56:01 1.36.2.3 +++ loncom/interface/lonrequestcourse.pm 2010/02/26 22:38:31 1.41.2.6 @@ -1,7 +1,7 @@ # The LearningOnline Network # Request a course # -# $Id: lonrequestcourse.pm,v 1.36.2.3 2009/10/24 03:56:01 raeburn Exp $ +# $Id: lonrequestcourse.pm,v 1.41.2.6 2010/02/26 22:38:31 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -130,7 +130,7 @@ sub handler { } &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'}; @@ -143,6 +143,10 @@ sub handler { $states{'log'} = ['filter','display']; $states{'new'} = ['courseinfo','enrollment','personnel','review','process']; + if ($dom eq 'gcitest') { + $states{'new'} = ['courseinfo','review','process']; + } + if (($action eq 'new') && ($env{'form.crstype'} eq 'official')) { unless ($env{'form.state'} eq 'crstype') { unshift(@{$states{'new'}},'codepick'); @@ -157,7 +161,7 @@ sub handler { my @invalidcrosslist; my %trail = ( - crstype => 'Course Request Action', + crstype => 'Request Action', codepick => 'Category', courseinfo => 'Description', enrollment => 'Access Dates', @@ -169,6 +173,10 @@ sub handler { cancel => 'Cancel Request', removal => 'Outcome', ); + 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'; @@ -192,16 +200,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')) { @@ -234,8 +256,8 @@ sub handler { foreach my $item (@code_order) { $crosslistcode .= $env{'form.crosslist_'.$i.'_'.$item}; } - if ($crosslistcode ne '') { - ($codechk{$i}, my $rest) = + if ($crosslistcode ne '') { + ($codechk{$i}, my $rest) = &Apache::lonnet::auto_validate_instcode('',$dom,$crosslistcode); } unless ($codechk{$i} eq 'valid') { @@ -263,6 +285,9 @@ sub handler { $jscript = &mainmenu_javascript(); } else { $jscript = &Apache::lonhtmlcommon::set_form_elements($elementsref,\%stored); + if ($state eq 'courseinfo') { + $jscript .= &cloning_javascript(); + } } } @@ -270,15 +295,16 @@ 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 = &Apache::lonnet::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, @@ -286,14 +312,14 @@ sub handler { \@invalidcrosslist); } } 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); @@ -301,8 +327,8 @@ 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 { @@ -312,7 +338,7 @@ sub handler { } 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; } @@ -341,10 +367,34 @@ function setAction(courseForm) { END } +sub cloning_javascript { + return <<"END"; +function setCloneDisplay(courseForm) { + if (courseForm.cloning.length > 1) { + for (var i=0; i{$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')) { @@ -405,13 +455,13 @@ sub get_breadcrumbs { } } 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,$description); } @@ -449,6 +499,7 @@ sub form_elements { }, courseinfo => { cdescr => 'text', + cloning => 'radio', clonecrs => 'text', clonedom => 'selectbox', datemode => 'radio', @@ -484,12 +535,27 @@ sub form_elements { }, ); my %servers = &Apache::lonnet::get_servers($dom,'library'); + if ($dom eq 'gcitest') { + %{$elements{'new'}{'courseinfo'}} = ( + cdescr => 'text', + concepttest => 'radio', + ); + 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); @@ -584,18 +650,26 @@ 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);'; + } + 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; } sub print_main_menu { - my ($r,$can_request,$states,$dom,$jscript,$loaditems,$crumb) = @_; + 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"; @@ -611,30 +685,9 @@ sub print_main_menu { } } - my $standby=&mt('Course selected. Please stand by.'); - my $js = <<"END"; - -function enterrole (thisform,rolecode,buttonname) { - document.title='$standby'; - window.status='$standby'; - thisform.newrole.value=rolecode; - thisform.selectrole.value='1'; - thisform.submit(); -} - -function ToSyllabus(cdom,cnum) { - if (cdom == '' || cdom == null) { - return; - } - if (cnum == '' || cnum == null) { - return; - } - var options = 'height=600,width=800,resizable=yes,scrollbars=yes,location=no,menubar=no,toolbar=no'; - var url = "/public/"+cdom+"/"+cnum+"/syllabus"; - syllwin = window.open(url,'',options,1); - syllwin.focus(); - return; -} + my $js; + unless ($dom eq 'gcitest') { + $js = <<"END"; function nextPage(formname) { var crschoice = document.mainmenu_coursetype.crstype.value; @@ -658,19 +711,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 .= <print(&header('Concept Test Courses',$js.$jscript,$loaditems).$crumb); - my $existing = &existing_courses(); - if ($existing) { - $r->print('
'. - '

'.&mt('Request creation of a new course').'

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

'.&mt('Request creation of a new course, or review your pending course requests.').'

'); } - $r->print('

'. + my ($pagetitle,$pageinfo,$domaintitle); + if (ref($can_request) eq 'HASH') { + if (($can_request->{'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'); + } + } + + 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' full e-mail addresses should 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')). - '
'); - $r->print('GCI Web Center Concept Test Delivery (gcitest)'."\n". - ''); + &Apache::lonhtmlcommon::row_title($domaintitle). + ''. + &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')).' @@ -723,213 +848,49 @@ END '. &Apache::lonhtmlcommon::row_closure(1). - &Apache::lonhtmlcommon::row_title(&mt('Course Type')). - &mt($typename->{'unofficial'})."\n". - '
'."\n". - '
'."\n". + &Apache::lonhtmlcommon::row_title(&mt('Type')).' +
+
'."\n". &Apache::lonhtmlcommon::row_closure(1)."\n". - &Apache::lonhtmlcommon::end_pick_box().'

'."\n". - '

'."\n". + &Apache::lonhtmlcommon::end_pick_box().'
'."\n". + '
'."\n". ''."\n". ''."\n". ''."\n". ''."\n". ''."\n". - '

'); - if ($existing) { - $r->print('

'.&mt('Enter an existing Concept Test course').'

'.$existing.'
'); - } else { - $r->print(''); - } + ''); $r->print(&Apache::loncommon::end_page()); return; } -sub existing_courses { - my $output; - my %roleshash = &Apache::lonnet::get_my_roles(undef,undef,'userroles',undef, - ['cc'],['gcitest']); - my %courses; - if (keys(%roleshash) > 0) { - foreach my $key (keys(%roleshash)) { - my ($cnum,$cdom,$role) = split(':',$key); - my ($tstart,$tend) = split(':',$roleshash{$key}); - my %coursehash = &Apache::lonnet::coursedescription($cdom.'/'.$cnum); - $courses{$cdom.'_'.$cnum}{'description'} = $coursehash{'description'}; - $courses{$cdom.'_'.$cnum}{'owner'} = $coursehash{'internal.courseowner'}; - if (defined($coursehash{'default_enrollment_start_date'}) ) { - $courses{$cdom.'_'.$cnum}{'startaccess'} = - &Apache::lonlocal::locallocaltime($coursehash{'default_enrollment_start_date'}); - } - if (defined($coursehash{'default_enrollment_end_date'}) ) { - $courses{$cdom.'_'.$cnum}{'endaccess'} = - &Apache::lonlocal::locallocaltime($coursehash{'default_enrollment_end_date'}); - if ($coursehash{'default_enrollment_end_date'} == 0) { - $courses{$cdom.'_'.$cnum}{'endaccess'} = &mt('No ending date'); - } - } - } - $output = '
'. - &Apache::loncommon::start_data_table(). - &Apache::loncommon::start_data_table_header_row(); - my @coltitles = ('Select','Title','Owner(s)', - 'Default Access Dates for Students','Student Counts'); - foreach my $item (@coltitles) { - $output .= ''; - if ($item eq 'Select') { - $output .= '  '; - } else { - $output .= &mt($item); - } - $output .= ''; - } - $output .= &Apache::loncommon::end_data_table_header_row(); - my %courseinfo = &build_courseinfo_hash(\%courses); - my %Sortby; - foreach my $course (sort(keys(%courses))) { - my $clean_title = $courseinfo{$course}{'title'}; - $clean_title =~ s/\W+//g; - if ($clean_title eq '') { - $clean_title = $courseinfo{$course}{'title'}; - } - push(@{$Sortby{$clean_title}},$course); - } - my @sorted_courses; - my @sorted_courses = sort { lc($a) cmp lc($b) } (keys(%Sortby)); - foreach my $item (@sorted_courses) { - foreach my $course (@{$Sortby{$item}}) { - my ($cdom,$cnum) = split('_',$course); - $output.= &Apache::loncommon::start_data_table_row(). - &courseinfo_row($courseinfo{$course},$cnum,$cdom). - &Apache::loncommon::end_data_table_row(); - } - } - $output .= &Apache::loncommon::end_data_table(). - ''. - '
'; - } - return $output; -} - -sub build_courseinfo_hash { - my ($courses) = @_; - my %courseinfo; - foreach my $course (keys(%{$courses})) { - my ($cdom,$cnum) = split('_',$course); - my $descr; - if (ref($courses->{$course}) eq 'HASH') { - $descr = $courses->{$course}{'description'}; - } - my $cleandesc=&HTML::Entities::encode($descr,'<>&"'); - $cleandesc=~s/'/\\'/g; - $cleandesc =~ s/^\s+//; - my ($cdom,$cnum)=split(/\_/,$course); - my ($singleowner,@owners,%ownernames); - if (ref($courses->{$course}) eq 'HASH') { - $singleowner = $courses->{$course}{'owner'}; - push(@owners,$singleowner); - if (ref($courses->{$course}{'co-owners'}) eq 'ARRAY') { - foreach my $item (@{$courses->{$course}{'co-owners'}}) { - push(@owners,$item); - } - } - } - foreach my $owner (@owners) { - my ($ownername,$ownerdom); - if ($owner =~ /:/) { - ($ownername,$ownerdom) = split(/:/,$owner); - } else { - $ownername = $owner; - if ($owner ne '') { - $ownerdom = $cdom; - } - } - if ($ownername ne '' && $ownerdom ne '') { - my %namehash=&Apache::loncommon::getnames($ownername,$ownerdom); - $ownernames{$ownername.':'.$ownerdom} = \%namehash; - } - } - $courseinfo{$course}{'cdom'} = $cdom; - $courseinfo{$course}{'cnum'} = $cnum; - my @lastnames; - foreach my $owner (keys(%ownernames)) { - if (ref($ownernames{$owner}) eq 'HASH') { - push(@lastnames,$ownernames{$owner}{'lastname'}); - } - } - $courseinfo{$course}{'ownerlastnames'} = join(', ',sort(@lastnames)); - $courseinfo{$course}{'title'} = $cleandesc; - $courseinfo{$course}{'owner'} = $singleowner; - my @classids; - $courseinfo{$course}{'counts'} = &count_students($cdom,$cnum,0); - my $startaccess = $courses->{$course}{'startaccess'}; - my $endaccess = $courses->{$course}{'endaccess'}; - my $accessdates; - if ($startaccess) { - $accessdates .= ''.&mt('From:[_1]',' '.$startaccess).'
'; - } - if ($endaccess) { - $accessdates .= ''.&mt('To:[_1]',' '.$endaccess).'
'; - } - $courseinfo{$course}{'access'} = $accessdates; - } - return %courseinfo; -} - -sub courseinfo_row { - my ($info,$cnum,$cdom) = @_; - my $output; - if (ref($info) eq 'HASH') { - my $rolecode = 'cc./'.$cdom.'/'.$cnum; - my $buttonname = $rolecode; - $buttonname=~s/\W//g; - $output .= ''. - ''.$info->{'title'}.' '. - ''. - &mt('Syllabus').''. - ''.$info->{'ownerlastnames'}.''. - ''.$info->{'access'}.''. - ''.$info->{'counts'}.''; - } else { - $output = ''.&mt('No information available for [_1].', - $cdom.'_'.$cnum).''; - return $output; - } - return $output; -} - -sub count_students { - my ($cdom,$cnum,$numsec) = @_; - my $classlist = &Apache::loncoursedata::get_classlist($cdom,$cnum); - my %student_count = ( - Active => 0, - Future => 0, - Expired => 0, - ); - my %idx; - $idx{'status'} = &Apache::loncoursedata::CL_STATUS(); - my %status_title = &Apache::lonlocal::texthash( - Expired => 'Previous access', - Active => 'Current access', - Future => 'Future access', - ); - - while (my ($student,$data) = each(%$classlist)) { - $student_count{$data->[$idx{'status'}]} ++; - } - - my $countslist = &mt('[quant,_1,section:,sections:,No sections]',$numsec).'
'; - foreach my $status ('Active','Future') { - $countslist .= ''.$status_title{$status}.': '. - $student_count{$status}.'
'; - } - return $countslist; -} - - sub request_administration { my ($r,$action,$state,$page,$states,$dom,$jscript,$loaditems,$crumb, $newinstcode,$codechk,$checkedcode,$description,$invalidcrosslist, @@ -966,8 +927,16 @@ END } } elsif ($state eq 'personnel') { $js .= "\n".§ion_check_javascript()."\n".&personnel_lcsec_js(); + } elsif (($state eq 'process') && ($env{'form.concepttest'} eq 'editmyown')) { + $js .= "\n".&Apache::londocsgci::builder_javascript()."\n"; } - $r->print(&header('Request a course',$js.$jscript,$loaditems,$jsextra).$crumb); + my $title; + if ($env{'form.crstype'} eq 'community') { + $title = 'Request a community'; + } else { + $title = 'Request a course'; + } + $r->print(&header($title,$js.$jscript,$loaditems,$jsextra).$crumb); &print_request_form($r,$action,$state,$page,$states,$dom,$newinstcode, $codechk,$checkedcode,$description,$invalidcrosslist); } elsif ($action eq 'view') { @@ -984,11 +953,26 @@ 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". + 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).'
'); } elsif ($state eq 'details') { my (@codetitles,%cat_titles,%cat_order,@code_order,$instcode,$code_chk); @@ -1000,7 +984,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"); @@ -1017,8 +1007,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).'
'); @@ -1067,7 +1063,11 @@ END ''."\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.'). @@ -1082,8 +1082,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()); @@ -1439,16 +1447,24 @@ 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'); + 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, + my ($storeresult,$result) = &print_request_outcome($r,$dom,\@codetitles, \@code_order); $r->print($result); if (($storeresult eq 'ok') || ($storeresult eq 'created')) { @@ -1457,7 +1473,9 @@ 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; } } @@ -1607,7 +1625,7 @@ sub print_enrollment_menu { } if ($crosslist_form) { $crosslist_form .= - &Apache::lonhtmlcommon::row_title(&mt('Add another?')). + &Apache::lonhtmlcommon::row_title(&mt('Add another')). ''. ''.&Apache::lonhtmlcommon::start_pick_box().$output. - &Apache::lonhtmlcommon::end_pick_box().'
'; + if ($dom eq 'gcitest') { + return $output; + } else { + return '
'.&Apache::lonhtmlcommon::start_pick_box().$output. + &Apache::lonhtmlcommon::end_pick_box().'
'; + } } sub show_invalid_crosslists { @@ -1779,12 +1800,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"; @@ -1872,13 +1893,17 @@ sub print_personnel_menu { &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().'
'. - '

'.&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".').'

'; + &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; } @@ -1950,10 +1975,18 @@ sub print_request_status { ''."\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').''; @@ -2001,7 +2034,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 .= '
'; @@ -2042,8 +2081,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').'
'; @@ -2231,40 +2274,71 @@ 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').''; + } } $enroll_headers .= ''.&mt('Access Starts').''. ''.&mt('Access Ends').''; @@ -2277,15 +2351,18 @@ sub print_review { } 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 '') { @@ -2321,7 +2398,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'}; @@ -2410,20 +2487,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(). '

'.&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'); @@ -2432,12 +2544,82 @@ ENDJS &Apache::lonhtmlcommon::row_title(&mt('Home Server for Course')); } $output .= $home_server_pick. - &Apache::lonhtmlcommon::row_closure(). - &Apache::lonhtmlcommon::row_headline(). - '

'.&Apache::loncommon::help_open_topic('Course_Request_Clone').' '.&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,$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; } @@ -2474,8 +2656,9 @@ sub clone_text { 'dmn' => 'Domain', 'dsh' => 'Date Shift', 'ncd' => 'Do not clone date parameters', - 'prd' => 'Clone date parameters as-is', + 'prd' => 'Copy date parameters as-is', 'shd' => 'Shift date parameters by number of days', + 'ros' => 'Copy Roster', ); } @@ -2662,7 +2845,7 @@ sub display_navbuttons { } sub print_request_outcome { - my ($dom,$codetitles,$code_order) = @_; + my ($r,$dom,$codetitles,$code_order) = @_; my ($output,$cnum,$now,$req_notifylist,$crstype,$enrollstart,$enrollend, %sections,%crosslistings,%personnel,@baduname,@missingdom,%domconfig,); my $sectotal = $env{'form.sectotal'}; @@ -2681,6 +2864,10 @@ sub print_request_outcome { } $now = time; $crstype = $env{'form.crstype'}; + my $ccrole = 'cc'; + if ($crstype eq 'community') { + $ccrole = 'co'; + } my @instsections; if ($crstype eq 'official') { if (&Apache::lonnet::auto_run('',$dom)) { @@ -2742,7 +2929,7 @@ sub print_request_outcome { } else { @{$personnel{$uname.':'.$udom}{'roles'}} = ($role); } - if ($role eq 'cc') { + if ($role eq $ccrole) { @{$personnel{$uname.':'.$udom}{$role}{'usec'}} = (); } else { my @currsec = &Apache::loncommon::get_env_multiple('form.person_'.$i.'_sec'); @@ -2794,14 +2981,20 @@ sub print_request_outcome { } my $clonecrs = ''; my $clonedom = ''; - if (($env{'form.clonecrs'} =~ /^($match_courseid)$/) && + if ((($env{'form.cloning'}) || + (($dom eq 'gcitest') && ($env{'form.concepttest'} eq 'cloning'))) && + ($env{'form.clonecrs'} =~ /^($match_courseid)$/) && ($env{'form.clonedom'} =~ /^($match_domain)$/)) { + if ($dom eq 'gcitest') { + $env{'form.clonedom'} = 'gcitest'; + } my $clonehome = &Apache::lonnet::homeserver($env{'form.clonecrs'}, $env{'form.clonedom'}); - if ($clonehome ne 'no_host') { + if ($clonehome ne 'no_host') { my $canclone = &Apache::loncoursequeueadmin::can_clone_course($env{'user.name'}, - $env{'user.domain'},$env{'form.clonecrs'}, $env{'form.clonedom'}); + $env{'user.domain'},$env{'form.clonecrs'},$env{'form.clonedom'}, + $crstype); if ($canclone) { $clonecrs = $env{'form.clonecrs'}; $clonedom = $env{'form.clonedom'}; @@ -2833,6 +3026,25 @@ sub print_request_outcome { accessend => $accessend, personnel => \%personnel, }; + if ($dom eq 'gcitest') { + if ($env{'form.concepttest'} eq 'editmyown') { + $details->{'firstres'} = 'nav'; + } else { + $details->{'firstres'} = 'blank'; + } + if ($env{'form.concepttest'} eq 'cloning') { + if (($clonecrs) && ($clonedom eq 'gcitest')) { + $details->{'cloneroster'} = $env{'form.cloneroster'}; + } else { + $details->{'clonedom'} = 'gci'; + $details->{'clonecrs'} = '8v226795a882b4bcagcil1'; + } + } else { + $details->{'clonedom'} = 'gci'; + $details->{'clonecrs'} = '8v226795a882b4bcagcil1'; + } + $details->{'datemode'} = 'delete'; + } my (@inststatuses,$storeresult,$creationresult); my $val = &get_processtype($dom,$crstype,\@inststatuses,\%domconfig); if ($val eq '') { @@ -2892,7 +3104,11 @@ sub print_request_outcome { $reqstatus = $disposition; my ($modified,$queued); if ($disposition eq 'rejected') { - $output = &mt('Your course request was rejected.'); + if ($crstype eq 'community') { + $output = &mt('Your community request was rejected.'); + } else { + $output = &mt('Your course request was rejected.'); + } if ($message) { $output .= '
'.$message.'
'; } @@ -2900,11 +3116,11 @@ sub print_request_outcome { } elsif ($disposition eq 'process') { my %domdefs = &Apache::lonnet::get_domain_defaults($dom); my ($logmsg,$newusermsg,$addresult,$enrollcount,$response,$keysmsg,%longroles); - my @roles = &Apache::lonuserutils::roles_by_context('course'); my $type = 'Course'; if ($crstype eq 'community') { $type = 'Community'; } + my @roles = &Apache::lonuserutils::roles_by_context('course','',$type); foreach my $role (@roles) { $longroles{$role}=&Apache::lonnet::plaintext($role,$type); } @@ -2916,14 +3132,86 @@ sub print_request_outcome { $reqstatus = 'created'; my $role_result = &update_requestors_roles($dom,$cnum,$crstype,$details, \%longroles); - $output = '

'.&mt('Your course request has been processed and the course has been created.'). - '
'.$role_result.'

'; + if ($crstype eq 'community') { + $output = '

'.&mt('Your community request has been processed and the community has been created.'); + } else { + $output = '

'.&mt('Your course request has been processed and the course has been created.'); + } + if ($dom eq 'gcitest') { + my $caller = 'requestcrs'; + &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', + ); + my $putresult = &Apache::lonnet::put('environment',\%crsenvhash,$dom,$cnum); + if ($env{'form.concepttest'} eq 'cloning') { + &Apache::lonuserstate::readmap($dom.'/'.$cnum); + if (($clonecrs) && ($clonedom eq 'gcitest')) { + my $cloneid = $clonedom.'/'.$clonecrs; + my %clonedesc = &Apache::lonnet::coursedescription($cloneid,{'one_time' => 1}); + my $oldcdesc = $clonedesc{'description'}; + $output .= '
'.&mt('A concept test has been copied from your existing test: [_1].',''.$oldcdesc.'').'

'; + if ($env{'form.cloneroster'}) { + $output .= '
'.&mt('You requested copying of the old student roster to the new course.'); + if ($logmsg =~ /\Q\0\E/) { + my @logging = split("\0",$logmsg); + if (@logging) { + $output .= '

'.$logging[-1].'

'; + } + } + $output .= '
    '. + '
  • '.&mt('Access starts:').' '. + &Apache::lonlocal::locallocaltime($accessstart).'
    • '. + '
  • '.&mt('Access ends:').' '.&Apache::lonlocal::locallocaltime($accessend).'
    • '. + '

'. + ''.&mt('Manage Test').''; + $r->print($output); + $output = ''; + } else { + &roster_upload_form($r,$output); + $output = ''; + } + } else { + $output .= '

'; + &roster_upload_form($r,$output); + $output = ''; + } + } elsif ($env{'form.concepttest'} eq 'defchosen') { + $output .= '
'; + my $error = &Apache::londocsgci::store($caller,$dom,$cnum); + if ($error) { + $output .= ''. + &mt('An error occurred saving an auto-generated concept test: [_1].',$error). + ''; + } else { + &Apache::lonuserstate::readmap($dom.'/'.$cnum); + $output .= &mt('A concept test has also been generated.'); + } + $output .= '

'; + &roster_upload_form($r,$output); + $output = ''; + } else { + $output .= '


'.&mt('The next step is to chose which questions are to be included in the Concept Test.').'

'; + $r->print($output); + &Apache::londocsgci::editor($r,'requestcrs',$dom,$cnum); + $output = ''; + } + } else { + $output .= '
'.$role_result.'

'; + } $creationresult = 'created'; } else { - $output = ''. - &mt('An error occurred when processing your course request.'). - '
'. - &mt('You may want to review the request details and submit the request again.'). + $output = ''; + if ($crstype eq 'community') { + $output .= &mt('An error occurred when processing your community request.'); + } else { + $output .= &mt('An error occurred when processing your course request.'); + } + $output .= '
'. + &mt('You may want to review the request details and submit the request again.'). ''; $creationresult = 'error'; } @@ -2956,7 +3244,12 @@ sub print_request_outcome { my $putresult = &Apache::lonnet::newput_dom('courserequestqueue',$request, $dom); if ($putresult eq 'ok') { - $output = &mt('Your course request has been recorded.').'
'. + if ($crstype eq 'community') { + $output .= &mt('Your community request has been recorded.'); + } else { + $output .= &mt('Your course request has been recorded.') + } + $output .= '
'. ¬ification_information($disposition,$req_notifylist, $cnum,$now); } else { @@ -2988,8 +3281,12 @@ sub print_request_outcome { &Apache::lonnet::logthis("Error saving course request status for $requestkey (for $env{'user.name'}:$env{'user.domain'}) - $statusresult"); } if ($modified && $queued && $storeresult eq 'ok') { - $output .= '

'.&mt('Your course request has been updated').'

'. - ¬ification_information($disposition,$req_notifylist,$cnum,$now); + if ($crstype eq 'community') { + $output .= '

'.&mt('Your community request has been updated').'

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

'.&mt('Your course request has been updated').'

'; + } + $output .= ¬ification_information($disposition,$req_notifylist,$cnum,$now); } if ($validationerror ne '') { $output .= ''.&mt('An error occurred validating your request with institutional data sources: [_1].',$validationerror).'

'; @@ -3009,23 +3306,34 @@ sub update_requestors_roles { my $owner = $env{'user.name'}.':'.$env{'user.domain'}; if (ref($details) eq 'HASH') { if (ref($details->{'personnel'}) eq 'HASH') { + my $ccrole = 'cc'; + if ($crstype eq 'community') { + $ccrole = 'co'; + } unless (ref($details->{'personnel'}{$owner}) eq 'HASH') { $details->{'personnel'}{$owner} = { - 'roles' => ['cc'], - 'cc' => { 'usec' => [] }, + 'roles' => [$ccrole], + $ccrole => { 'usec' => [] }, }; } my @roles; if (ref($details->{'personnel'}{$owner}{'roles'}) eq 'ARRAY') { @roles = sort(@{$details->{'personnel'}{$owner}{'roles'}}); - unless (grep(/^cc$/,@roles)) { - push(@roles,'cc'); + unless (grep(/^\Q$ccrole\E$/,@roles)) { + push(@roles,$ccrole); } } else { - @roles = ('cc'); + @roles = ($ccrole); } foreach my $role (@roles) { - my $start = $now; + my $refresh=$env{'user.refresh.time'}; + if ($refresh eq '') { + $refresh = $env{'user.login.time'}; + } + if ($refresh eq '') { + $refresh = $now; + } + my $start = $refresh-1; my $end = '0'; if ($role eq 'st') { if ($details->{'accessstart'} ne '') { @@ -3036,7 +3344,7 @@ sub update_requestors_roles { } } my @usecs; - if ($role ne 'cc') { + if ($role ne $ccrole) { if (ref($details->{'personnel'}{$owner}{$role}{'usec'}) eq 'ARRAY') { @usecs = @{$details->{'personnel'}{$owner}{$role}{'usec'}}; } @@ -3101,19 +3409,121 @@ sub update_requestors_roles { } if ($active) { if ($numactive == 1) { - $output = &mt('Use the following link to enter the course:'); + if ($crstype eq 'Community') { + $output = &mt('Use the following link to enter the community:'); + } else { + $output = &mt('Use the following link to enter the course:'); + } } else { - $output = &mt('Use the following links to your new roles to enter the course:'); + if ($crstype eq 'Community') { + $output = &mt('Use the following links to your new roles to enter the community:'); + } else { + $output = &mt('Use the following links to your new roles to enter the course:'); + } } $output .= '
    '.$active.'

'; } if ($future) { - $output .= &mt('The following course [quant,_1,role] will become available for selection from your [_2]roles page[_3], once the default student access start date - [_4] - has been reached:',$numfuture,'','',&Apache::lonlocal::locallocaltime($details->{'accessstart'})). - '
    '.$future.'
'; + if ($crstype eq 'Community') { + $output .= &mt('The following community [quant,_1,role] will become available for selection from your [_2]roles page[_3], once the default student access start date - [_4] - has been reached:',$numfuture,'','',&Apache::lonlocal::locallocaltime($details->{'accessstart'})) + } else { + $output .= &mt('The following course [quant,_1,role] will become available for selection from your [_2]roles page[_3], once the default student access start date - [_4] - has been reached:',$numfuture,'','',&Apache::lonlocal::locallocaltime($details->{'accessstart'})); + } + $output .= '
    '.$future.'
'; } return $output; } +sub acquire_cc_role { + my ($cdom,$cnum,$trolecode,$csec) = @_; + my %coursegroups = &Apache::lonnet::get_active_groups( + $env{'user.domain'},$env{'user.name'},$cdom, $cnum); + my $cgrps = join(':',keys(%coursegroups)); + if ($env{'environment.recentroles'}) { + my %frozen_roles = + &Apache::lonhtmlcommon::get_recent_frozen('roles',$env{'environment.recentrolesn'}); + &Apache::lonhtmlcommon::store_recent('roles',$trolecode,' ', + $frozen_roles{$trolecode}); + } + + &Apache::lonnet::appenv({"request.course.id" => '', + "request.course.fn" => '', + "request.course.uri" => '', + "request.course.sec" => '', + "request.role" => 'cm', + "request.role.adv" => $env{'user.adv'}, + "request.role.domain" => $env{'user.domain'}}); + + &Apache::lonnet::log($env{'user.domain'}, + $env{'user.name'}, + $env{'user.home'}, + "Role ".$trolecode); + + &Apache::lonnet::appenv( + {'request.role' => $trolecode, + 'request.role.domain' => $cdom, + 'request.course.sec' => $csec, + 'request.course.groups' => $cgrps}); + my ($furl,$ferr) = &Apache::lonuserstate::readmap($cdom.'/'.$cnum); + my $tadv; + if (&Apache::lonnet::allowed('adv') eq 'F') { $tadv=1; } + &Apache::lonnet::appenv({'request.role.adv'=>$tadv}); + return; +} + +sub store_crsparms { + my ($cdom,$cnum,$now,$accessstart,$accessend) = @_; + my $topsymb = '___0___uploaded/'.$cdom.'/'.$cnum.'/default.sequence'; + my %crsparms = ( + buttonshide => { + value => 'yes', + type => 'string_yesno', + }, + opendate => { + value => $accessstart, + type => 'date_start', + }, + duedate => { + value => $accessend, + type => 'date_end', + }, + problemstatus => { + value => 'no', + type => 'string_problemstatus', + }, + maxtries => { + value => '1', + type => 'intpos', + }, + discussend => { + value => $now, + type => 'date_end', + }, + discusshide => { + value => 'yes', + type => 'string_yesno', + } + ); + my %parmresult; + foreach my $item (keys(%crsparms)) { + $parmresult{$item} = + &Apache::lonparmset::storeparm_by_symb($topsymb, + '0_'.$item,14,$crsparms{$item}{'value'}, + $crsparms{$item}{'type'},undef,$cdom); + } + return %parmresult; +} + +sub roster_upload_form { + my ($r,$output) = @_; + $r->print('

'.&mt('If you have a text file available containing student e-mail addresses and initial passwords, you may upload it now.').'
'. + &mt('You may also enroll students at a later date by visiting the [_1]"Menu"[_2] page and choosing: [_1]"Manage Enrollment"[_2].','','').'

'. + '
'."\n"); + &Apache::lonuserutils::print_first_users_upload_form($r,'course'); + $r->print('
'); +} + sub notification_information { my ($disposition,$req_notifylist,$cnum,$now) = @_; my %emails = &Apache::loncommon::getemails(); @@ -3242,31 +3652,34 @@ sub get_processtype { sub check_autolimit { my ($uname,$udom,$dom,$crstype,$limit,$message) = @_; my %crsroles = &Apache::lonnet::get_my_roles($env{'user.name'},$env{'user.domain'}, - 'userroles',['active','future'],['cc'],[$dom]); + 'userroles',['active','future'],['cc','co'],[$dom]); my ($types,$typename) = &Apache::loncommon::course_types(); my %requests = &Apache::lonnet::dumpstore('courserequests',$udom,$uname); - my %count; - if (ref($types) eq 'ARRAY') { - foreach my $type (@{$types}) { - $count{$type} = 0; - } - } + my $count = 0; foreach my $key (keys(%requests)) { my ($cdom,$cnum) = split('_',$key); - if (exists($crsroles{$cnum.':'.$cdom.':cc'})) { - if (ref($requests{$key}) eq 'HASH') { - my $type = $requests{$key}{'crstype'}; - if ($type =~ /^official|unofficial|community$/) { - $count{$type} ++; - } + if (ref($requests{$key}) eq 'HASH') { + next if ($requests{$key}{'crstype'} ne $crstype); + if (($crstype eq 'community') && + (exists($crsroles{$cnum.':'.$cdom.':co'}))) { + $count ++; + } elsif ((($crstype eq 'official') || ($crstype eq 'unofficial')) && + (exists($crsroles{$cnum.':'.$cdom.':cc'}))) { + $count ++; } } } - if ($count{$crstype} < $limit) { + if ($count < $limit) { return 'process'; } else { if (ref($typename) eq 'HASH') { - $$message = &mt('Your request has not been processed because you have reached the limit for the number of courses of this type.').'
'.&mt("Your $typename->{$crstype} limit is [_1].",$limit); + if ($crstype eq 'community') { + $$message = &mt('Your request has not been processed because you have reached the limit for the number of communities.'). + '
'.&mt("Your limit is [_1].",$limit); + } else { + $$message = &mt('Your request has not been processed because you have reached the limit for the number of courses of this type.'). + '
'.&mt("Your $typename->{$crstype} limit is [_1].",$limit); + } } return 'rejected'; } @@ -3438,5 +3851,16 @@ sub generate_date_items { return; } +sub show_cloneable { + my $showclone; + if (&Apache::loncommon::needs_gci_custom()) { + my %courses = &Apache::loncommon::existing_gcitest_courses('cc'); + my $numcourses = scalar(keys(%courses)); + return $numcourses; + } else { + return 1; + } +} + 1;