--- loncom/interface/lonrequestcourse.pm 2010/11/08 21:16:24 1.41.2.7 +++ loncom/interface/lonrequestcourse.pm 2010/11/08 21:44:55 1.41.2.8 @@ -1,7 +1,7 @@ # The LearningOnline Network # Request a course # -# $Id: lonrequestcourse.pm,v 1.41.2.7 2010/11/08 21:16:24 raeburn Exp $ +# $Id: lonrequestcourse.pm,v 1.41.2.8 2010/11/08 21:44:55 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -128,13 +128,21 @@ sub handler { if ($r->header_only) { return OK; } - &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['action','showdom','cnum','state','crstype']); &Apache::lonhtmlcommon::clear_breadcrumbs(); - my $dom = &get_course_dom(); - my $action = $env{'form.action'}; + my $action = $env{'form.reqaction'}; my $state = $env{'form.state'}; + my $context; + &generate_page($r,$action,$state,$context); + return OK; +} + +sub generate_page { + my ($r,$action,$state,$context) = @_; + &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, + ['action','showdom','cnum','state','crstype']); + my $dom = &get_course_dom(); my (%states,%stored); my ($jscript,$uname,$udom,$result,$warning); @@ -145,10 +153,17 @@ sub handler { if ($dom eq 'gcitest') { $states{'new'} = ['courseinfo','review','process']; + if ($env{'form.concepttest'} eq 'editmyown') { + push(@{$states{'new'}},'chooseitems','uploadroster','enrolling'); + } elsif (($env{'form.concepttest'} eq 'defchosen') || + (($env{'form.concepttest'} eq 'cloning') && (!$env{'form.cloneroster'}))) { + push(@{$states{'new'}},'uploadroster','enrolling'); + } else { + push(@{$states{'new'}},'done'); + } } - if (($action eq 'new') && ($env{'form.crstype'} eq 'official')) { - unless ($env{'form.state'} eq 'crstype') { + unless ($state eq 'crstype') { unshift(@{$states{'new'}},'codepick'); } } @@ -172,6 +187,10 @@ sub handler { details => 'Request Details', cancel => 'Cancel Request', removal => 'Outcome', + chooseitems => 'Saved Test', + uploadroster => 'Upload Roster', + enrolling => 'Completed', + done => 'Completed', ); if ($dom eq 'gcitest') { $trail{'crstype'} = 'Building a Test'; @@ -282,7 +301,7 @@ sub handler { $env{'form.clonedom'} = $dom; } if ($state eq 'crstype') { - $jscript = &mainmenu_javascript(); + $jscript = &mainmenu_javascript($action); } else { $jscript = &Apache::lonhtmlcommon::set_form_elements($elementsref,\%stored); if ($state eq 'courseinfo') { @@ -310,6 +329,10 @@ sub handler { $jscript,$loaditems,$crumb,$newinstcode, $codechk,$checkedcode,$description, \@invalidcrosslist); + if ($state eq 'chooseitems' || $state eq 'uploadroster' || + $state eq 'enrolling') { + return $canreq; + } } } else { $r->print(&header('Course/Community Requests').$crumb. @@ -340,10 +363,11 @@ sub handler { } else { &print_main_menu($r,\%can_request,\%states,$dom,$jscript,'',$crumb,\%request_domains); } - return OK; + return; } sub mainmenu_javascript { + my ($action) = @_; return <<"END"; function setType(courseForm) { for (var i=0; i 'requestcrs', + uploadroster => 'studentform', + enrolling => 'requestcrs', + done => 'requestcrs', + ); + my $lastidx; + for (my $i=0; $i<@{$states->{$action}}; $i++) { + if ($$state eq $states->{$action}[$i]) { + $lastidx = $i; + last; + } + } for (my $i=0; $i<@{$states->{$action}}; $i++) { if ($$state eq $states->{$action}[$i]) { &Apache::lonhtmlcommon::add_breadcrumb( @@ -446,13 +483,34 @@ sub get_breadcrumbs { } ); } else { - &Apache::lonhtmlcommon::add_breadcrumb( + if (($$state eq 'chooseitems') || ($$state eq 'uploadroster') || + ($$state eq 'enrolling') || ($$state eq 'done')) { + if (($states->{$action}[$i] ne 'process') && + ($states->{$action}[$i] ne 'chooseitems') && + ($states->{$action}[$i] ne 'uploadroster') && + ($states->{$action}[$i] ne 'enrolling') && + ($states->{$action}[$i] ne 'done')) { + &Apache::lonhtmlcommon::add_breadcrumb( + { href => '/adm/requestcourse', + text => "$trail->{$states->{$action}[$i]}", + } + ); + } else { + my $diff = $i-$lastidx; + &Apache::lonhtmlcommon::add_breadcrumb( + { href => "javascript:history.go($diff)", + text => "$trail->{$states->{$action}[$i]}", } + ); + } + } else { + &Apache::lonhtmlcommon::add_breadcrumb( { href => "javascript:backPage(document.requestcrs,'$states->{$action}[$i]')", text => "$trail->{$states->{$action}[$i]}", } - ); - } - } - } + ); + } + } + } + } } else { &Apache::lonhtmlcommon::add_breadcrumb( {text=>$firstcrumb}); @@ -477,11 +535,13 @@ sub header { if (ref($args) eq 'HASH') { my %loadhash = ( 'add_entries' => $loaditems, + 'function' => 'norole', ); my %arghash = (%loadhash,%{$args}); - $args = \%arghash; + $args = \%arghash; } else { - $args = {'add_entries' => $loaditems,}; + $args = {'add_entries' => $loaditems, + 'function' => 'norole'}; } } return &Apache::loncommon::start_page($bodytitle,$jscript.$jsextra,$args); @@ -652,14 +712,6 @@ sub onload_action { } else { $loaditems{'onload'} = 'javascript:setFormElements(document.requestcrs);'; } - if ($state eq 'courseinfo') { - if (&show_cloneable()) { - $loaditems{'onload'} .= 'javascript:setCloneDisplay(document.requestcrs);'; - } - } - if (($state eq 'process') && ($env{'form.concepttest'} eq 'editmyown')) { - $loaditems{'onload'} = 'javascript:setInitialVisibility()'; - } } return \%loaditems; } @@ -691,7 +743,7 @@ sub print_main_menu { function nextPage(formname) { var crschoice = document.mainmenu_coursetype.crstype.value; - var actionchoice = document.mainmenu_action.action.value; + var actionchoice = document.mainmenu_action.reqaction.value; if (check_can_request(crschoice,actionchoice) == true) { if ((actionchoice == 'new') && (crschoice == 'official')) { nextstate = 'codepick'; @@ -699,7 +751,7 @@ function nextPage(formname) { $nextstate_setter } formname.crstype.value = crschoice; - formname.action.value = actionchoice; + formname.reqaction.value = actionchoice; formname.state.value= nextstate; formname.submit(); } @@ -787,12 +839,12 @@ END '
  • '.&mt('Enrollment of students').'
    • '. '

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

    '. + '
    '.&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". ''."\n". '
    '. @@ -845,7 +897,7 @@ END my $nexttext = &mt('Next'); $r->print(&Apache::lonhtmlcommon::row_title(&mt('Action')).'
    - @@ -883,7 +935,7 @@ END ''."\n". ''."\n". ''."\n". - ''."\n". + ''."\n". ''."\n". '
    '); @@ -909,8 +961,13 @@ END if (($action eq 'new') || ($action eq 'view')) { $js .= <print(&header($title,$js.$jscript,$loaditems,$jsextra).$crumb); + return if (($state eq 'chooseitems') || ($state eq 'uploadroster') || + ($state eq 'enrolling')); &print_request_form($r,$action,$state,$page,$states,$dom,$newinstcode, $codechk,$checkedcode,$description,$invalidcrosslist); } elsif ($action eq 'view') { @@ -973,7 +1034,7 @@ END $title = &mt('Pending course/community requests'); } $r->print('

    '.$title.'

    '."\n".$form."\n". - &print_request_status($dom).'
    '); + &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'}; @@ -1059,7 +1120,7 @@ END } $r->print('

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

    '."\n".$form."\n". ''."\n". - ''."\n". + ''."\n". ''."\n". ''."\n"); if ($result eq 'ok') { @@ -1342,29 +1403,29 @@ sub print_request_form { &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,$description)); + $r->print(&courseinfo_form($dom,$formname,$state,$crstype,$next,$description)); } elsif ($state eq 'enrollment') { if ($crstype eq 'official') { &Apache::lonnet::auto_possible_instcodes($dom,\@codetitles,\%cat_titles, \%cat_order,\@code_order); } - $r->print(&print_enrollment_menu($formname,$instcode,$dom,\@codetitles, + $r->print(&print_enrollment_menu($formname,$state,$instcode,$dom,\@codetitles, \%cat_titles,\%cat_order,\@code_order, $invalidcrosslist)); } elsif ($state eq 'personnel') { - $r->print(&print_personnel_menu($dom,$formname,$crstype,$invalidcrosslist)); + $r->print(&print_personnel_menu($dom,$formname,$state,$crstype,$invalidcrosslist)); } elsif ($state eq 'review') { my (%alerts,%rulematch,%inst_results,%curr_rules,%got_rules,%disallowmsg); my $now = time; @@ -1459,13 +1520,13 @@ sub print_request_form { } else { $navtxt{'next'} = &mt('Submit course request'); } - } elsif ($state eq 'process') { + } elsif ($state eq 'process') { if ($crstype eq 'official') { &Apache::lonnet::auto_possible_instcodes($dom,\@codetitles,\%cat_titles, \%cat_order,\@code_order); } my ($storeresult,$result) = &print_request_outcome($r,$dom,\@codetitles, - \@code_order); + \@code_order,$formname); $r->print($result); if (($storeresult eq 'ok') || ($storeresult eq 'created')) { $r->print('

    '); @@ -1478,6 +1539,8 @@ sub print_request_form { } return; } + } elsif ($state eq 'uploadroster') { + &roster_upload_form($r,$output,$formname); } my @excluded = &get_excluded_elements($dom,$states,$action,$state); if ($state eq 'personnel') { @@ -1512,12 +1575,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) = @@ -1582,16 +1672,25 @@ sub get_excluded_elements { if (grep(/^instcode_/,@excluded)) { push(@excluded,'instcode'); } + if ($env{'form.initmap'}) { + push(@excluded,'initmap'); + } + if ($env{'form.output'}) { + push(@excluded,'output'); + } return @excluded; } sub print_enrollment_menu { - my ($formname,$instcode,$dom,$codetitles,$cat_titles,$cat_order,$code_order, - $invalidcrosslist) =@_; + my ($formname,$state,$instcode,$dom,$codetitles,$cat_titles,$cat_order, + $code_order,$invalidcrosslist) =@_; my ($sections,$autoenroll,$access_dates,$output,$hasauto); my $starttime = time; - my $endtime = time+(6*30*24*60*60); # 6 months from now, approx - + my $diff = 6*30*24*60*60; # 6 months from now, approx + if (&Apache::loncommon::needs_gci_custom()) { + $diff = 7*24*60*60; # 7 days from now, approx + } + my $endtime = $starttime+$diff; my %accesstitles = ( 'start' => 'Default start access', 'end' => 'Default end access', @@ -1628,7 +1727,7 @@ sub print_enrollment_menu { &Apache::lonhtmlcommon::row_title(&mt('Add another')). ''. ''.&mt('Add?').&Apache::lonhtmlcommon::row_closure(); $sections .= &Apache::lonhtmlcommon::row_headline. '

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

    '. @@ -1639,16 +1738,16 @@ sub print_enrollment_menu { $autoenroll = &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(&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', @@ -1675,7 +1774,7 @@ sub print_enrollment_menu { $output .= &Apache::lonhtmlcommon::row_headline('Access'). '

    '.$header.'

    '. &Apache::lonhtmlcommon::row_closure(1). - $access_dates + $access_dates; } if ($dom eq 'gcitest') { return $output; @@ -1746,15 +1845,21 @@ sub inst_section_selector { sub date_setting_table { my ($starttime,$endtime,$formname,$prefix,$hasauto,%datetitles) = @_; my ($perpetual,$table); + my $no_hh_mm_ss = 1; + if (&Apache::loncommon::needs_gci_custom()) { + $no_hh_mm_ss = ''; + } my $startform = &Apache::lonhtmlcommon::date_setter($formname,$prefix.'start', - $starttime,'','','',1,'','','',1); + $starttime,'','','',$no_hh_mm_ss,'','','',1); my $endform = &Apache::lonhtmlcommon::date_setter($formname,$prefix.'end', - $endtime,'','','',1,'','','',1); + $endtime,'','','',$no_hh_mm_ss,'','','',1); my $closure = ''; if ($prefix eq 'access') { - $perpetual = ' '; + unless (&Apache::loncommon::needs_gci_custom()) { + $perpetual = ' '; + } $closure = '1'; } @@ -1783,7 +1888,7 @@ sub date_setting_table { } sub print_personnel_menu { - my ($dom,$formname,$crstype,$invalidcrosslist) = @_; + my ($dom,$formname,$state,$crstype,$invalidcrosslist) = @_; my $output; if ($crstype eq 'official') { if (&Apache::lonnet::auto_run('',$dom)) { @@ -1896,7 +2001,7 @@ sub print_personnel_menu { $output .= &Apache::lonhtmlcommon::row_title(&mt('Add another')). ''. ''.&mt('Add?').&Apache::lonhtmlcommon::row_closure(1). &Apache::lonhtmlcommon::end_pick_box().''; if ($crstype eq 'community') { @@ -1925,7 +2030,7 @@ sub current_lc_sections { } sub print_request_status { - my ($dom) = @_; + my ($dom,$action,$state) = @_; my %statusinfo = &Apache::lonnet::dump('courserequests',$env{'user.domain'}, $env{'user.name'},'^status:'.$dom); my ($output,$formname,%queue_by_date); @@ -1968,9 +2073,9 @@ sub print_request_status { } $formname = 'requestcrs'; my @sortedtimes = sort {$a <=> $b} (keys(%queue_by_date)); - $output = ''."\n". + $output = ''."\n". - ''."\n". + ''."\n". ''."\n". ''."\n". ''."\n"; @@ -2117,7 +2222,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; } @@ -2470,7 +2575,7 @@ sub dates_from_form { } sub courseinfo_form { - my ($dom,$formname,$crstype,$next,$description) = @_; + my ($dom,$formname,$state,$crstype,$next,$description) = @_; my %lt = &Apache::lonlocal::texthash( official => 'You must provide a (brief) course description.', community => 'You must provide a (brief) community description.' @@ -2564,7 +2669,7 @@ ENDJS if ($dom eq 'gcitest') { my ($instcode,@codetitles,%cat_titles,%cat_order,@code_order); my $invalidcrosslist = []; - $output .= &print_enrollment_menu($formname,$instcode,$dom, + $output .= &print_enrollment_menu($formname,$state,$instcode,$dom, \@codetitles,\%cat_titles,\%cat_order, \@code_order,$invalidcrosslist); } @@ -2845,7 +2950,7 @@ sub display_navbuttons { } sub print_request_outcome { - my ($r,$dom,$codetitles,$code_order) = @_; + my ($r,$dom,$codetitles,$code_order,$formname) = @_; my ($output,$cnum,$now,$req_notifylist,$crstype,$enrollstart,$enrollend, %sections,%crosslistings,%personnel,@baduname,@missingdom,%domconfig,); my $sectotal = $env{'form.sectotal'}; @@ -3049,7 +3154,7 @@ sub print_request_outcome { } $details->{'datemode'} = 'delete'; } - my (@inststatuses,$storeresult,$creationresult); + my (@inststatuses,$storeresult,$creationresult,$donedisplay); my $val = &get_processtype($dom,$crstype,\@inststatuses,\%domconfig); if ($val eq '') { if ($crstype eq 'official') { @@ -3170,17 +3275,17 @@ sub print_request_outcome { '
  • '.&mt('Access starts:').' '. &Apache::lonlocal::locallocaltime($accessstart).'
    • '. '
  • '.&mt('Access ends:').' '.&Apache::lonlocal::locallocaltime($accessend).'
    • '. - '
    '. - ''.&mt('Manage Test').''; + '
    '; $r->print($output); $output = ''; + $donedisplay = 1; } else { - &roster_upload_form($r,$output); + &roster_upload_form($r,$output,$formname); $output = ''; } } else { $output .= '

    '; - &roster_upload_form($r,$output); + &roster_upload_form($r,$output,$formname); $output = ''; } } elsif ($env{'form.concepttest'} eq 'defchosen') { @@ -3195,10 +3300,10 @@ sub print_request_outcome { $output .= &mt('A concept test has also been generated.'); } $output .= '

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


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

    '; + $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 = ''; @@ -3297,6 +3402,9 @@ sub print_request_outcome { } } if ($creationresult ne '') { + if ($donedisplay) { + $r->print('
    '.&done_display()); + } return ($creationresult,$output); } else { return ($storeresult,$output); @@ -3519,13 +3627,55 @@ sub store_crsparms { } sub roster_upload_form { - my ($r,$output) = @_; + my ($r,$output,$formname,$titletext) = @_; + my $title = &mt('Request Processed'); + if ($titletext ne '') { + $title = $titletext; + } + $r->print(<<"ENDJS"); + + +ENDJS + $r->print('

    '.$title.'

    '.$output. + '

    '.&mt('Course roster file upload').'

    '); $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].','','').'

    '. - '
    ','').'

    '. + &mt('Upload roster file now?').' '. + '
    '. + '
    '. + ''. + '
    '. + ''); } sub notification_information {