--- loncom/interface/lonrequestcourse.pm	2009/12/10 18:21:22	1.41
+++ loncom/interface/lonrequestcourse.pm	2009/12/15 13:36:16	1.41.2.1
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Request a course
 #
-# $Id: lonrequestcourse.pm,v 1.41 2009/12/10 18:21:22 raeburn Exp $
+# $Id: lonrequestcourse.pm,v 1.41.2.1 2009/12/15 13:36:16 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -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');
@@ -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';
@@ -360,6 +368,14 @@ sub get_breadcrumbs {
     my ($dom,$action,$state,$states,$trail) = @_;
     my ($crumb,$newinstcode,$codechk,$checkedcode,$numtitles,$description);
     my $page = 0;
+    my $firstcrumb = 'Pick Action';
+    my $crumbtitle = 'Course/Community Requests';
+    my $crumbhelp = 'Course_Requests';
+    if ($dom eq 'gcitest') {
+        $firstcrumb = 'Building a Test';
+        $crumbtitle = 'Create Concept Test';
+        $crumbhelp = 'Concept_Test_Creation';
+    }
     if ((ref($states) eq 'HASH') && (ref($trail) eq 'HASH') && (ref($state))) {
         if (defined($action)) {
             my $done = 0;
@@ -401,7 +417,7 @@ sub get_breadcrumbs {
                 if ($$state eq $states->{$action}[$i]) {
                     &Apache::lonhtmlcommon::add_breadcrumb(
                        {text=>"$trail->{$$state}"});
-                    $crumb = &Apache::lonhtmlcommon::breadcrumbs('Course/Community Requests','Course_Requests');
+                    $crumb = &Apache::lonhtmlcommon::breadcrumbs($crumbtitle,$crumbhelp);
                     last;
                 } else {
                     if (($$state eq 'process') || ($$state eq 'removal')) {
@@ -420,13 +436,13 @@ sub get_breadcrumbs {
            }
         } else {
             &Apache::lonhtmlcommon::add_breadcrumb(
-                    {text=>'Pick Action'});
-            $crumb = &Apache::lonhtmlcommon::breadcrumbs('Course/Community Requests','Course_Requests');
+                    {text=>$firstcrumb});
+            $crumb = &Apache::lonhtmlcommon::breadcrumbs($crumbtitle,$crumbhelp);
         }
     } else {
         &Apache::lonhtmlcommon::add_breadcrumb(
-                {text=>'Pick Action'});
-        $crumb = &Apache::lonhtmlcommon::breadcrumbs('Course/Community Requests','Course_Requests');
+                {text=>$firstcrumb});
+        $crumb = &Apache::lonhtmlcommon::breadcrumbs($crumbtitle,$crumbhelp);
     }
     return ($page,$crumb,$newinstcode,$codechk,$checkedcode,$description);
 }
@@ -499,12 +515,22 @@ sub form_elements {
          },
     );
     my %servers = &Apache::lonnet::get_servers($dom,'library');
+    if ($dom eq 'gcitest') {
+        %{$elements{'new'}{'courseinfo'}} = (
+                                              cdescr      => 'text',
+                                              concepttest => 'radio', 
+                                            );
+    }
     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);
@@ -626,7 +652,9 @@ 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;
@@ -650,20 +678,20 @@ function check_can_request(crschoice,act
     var unofficial = '';
     var community = '';    
 END
-    if (ref($can_request) eq 'HASH') {
-        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 .= <<END;
+        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 .= <<END;
     if (crschoice == 'official') {
         if (official != 1) {
             alert("$lt{'official'}");
@@ -671,9 +699,9 @@ END
         }
     } else {
         if (crschoice == 'unofficial') {
-            if (unofficial != 1) {
-                alert("$lt{'unofficial'}");
-                return false;
+           if (unofficial != 1) {
+               alert("$lt{'unofficial'}");
+               return false;
             }
         } else {
             if (crschoice == 'community') {
@@ -685,13 +713,14 @@ END
                 if (actionchoice == 'new') {
                     alert("$lt{'all'}");
                     return false;
-                }               
+                }
             }
         }
     }
     return true;
 }
 END
+    }
     my ($pagetitle,$pageinfo,$domaintitle);
     if (ref($can_request) eq 'HASH') {
         if (($can_request->{'official'}) || ($can_request->{'unofficial'})) {
@@ -714,6 +743,40 @@ END
             $domaintitle = &mt('Course/Community Domain');
         }
     }
+
+    if ($dom eq 'gcitest') {
+        my $formname = 'requestcrs';
+        my $nexttext = &mt('Continue');
+        $r->print(&header($pagetitle,$js.$jscript,$loaditems).$crumb.
+            '<p>'.&mt('Deployment of a Concept Test requires completion of the following three steps:').'<ol>'.
+            '<li>'.&mt('Creation of a course "container" and setting of access dates').'</li>'.
+            '<li>'.&mt('Assembly of a valid test from Concept Inventory questions').'</li>'.
+            '<li>'.&mt('Enrollment of students').'</li>'.
+            '</ol></p><p>'.&mt('When assembling a test you may either:').
+            '<br />'.&mt('(a) have a valid test built automatically by the WebCenter, or').'<br />'.&mt('(b) select the questions to include by combining questions chosen from eleven bins with four mandatory questions.').'</p><p>'.&mt('The most efficient way to enroll students is to upload a text file containing usernames and passwords.').'<br />'.&mt("Students' full e-mail addresses should be used as their usernames to ensure uniqueness.").'</p><div>'.
+            '<form name="'.$formname.'" method="post" action="/adm/requestcourse">'."\n".
+            '<input type="hidden" name="state" value="courseinfo" />'."\n".
+            '<input type="hidden" name="showdom" value="'.$dom.'" />'."\n".
+            '<input type="hidden" name="crstype" value="unofficial" />'."\n".
+            '<input type="hidden" name="action" value="new" />'."\n".
+            '<input type="button" name="next" value="'.$nexttext.
+            '" onclick="this.form.submit();" />'."\n".
+            '</form></div>'.
+             &Apache::loncommon::end_page());
+        return;
+    }
+
+    if (!$onchange) {
+        $r->print('&nbsp;<input type="submit" name="godom" value="'.
+                   &mt('Change').'" />');
+    }
+    unless ((ref($can_request) eq 'HASH') && (keys(%{$can_request}) > 0)) {
+        $r->print(&Apache::lonhtmlcommon::row_closure(1)."\n".
+                  &Apache::lonhtmlcommon::end_pick_box().'</div>'."\n".
+                  &Apache::loncommon::end_page());
+        return;
+    }
+
     my @incdoms;
     if (ref($request_domains) eq 'HASH') {
         foreach my $item (keys(%{$request_domains})) {
@@ -1365,7 +1428,7 @@ sub print_request_form {
             &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')) {
@@ -1557,7 +1620,6 @@ sub print_enrollment_menu {
     my $access_dates = 
         &date_setting_table($starttime,$endtime,$formname,'access',$hasauto,
                             %accesstitles);
-    $output .= &Apache::lonhtmlcommon::start_pick_box();
     if ($sections) {
         $output .=  $sections;
     }
@@ -1577,8 +1639,12 @@ sub print_enrollment_menu {
                    &Apache::lonhtmlcommon::row_closure(1).
                    $access_dates
     }
-    return '<div>'.&Apache::lonhtmlcommon::start_pick_box().$output.
-           &Apache::lonhtmlcommon::end_pick_box().'</div>';
+    if ($dom eq 'gcitest') {
+        return $output;
+    } else {
+        return '<div>'.&Apache::lonhtmlcommon::start_pick_box().$output.
+               &Apache::lonhtmlcommon::end_pick_box().'</div>';
+    }
 }
 
 sub show_invalid_crosslists {
@@ -2170,41 +2236,52 @@ sub print_review {
     }
 
     my %ctxt = &clone_text();
-    $inst_headers .= '<th>'.&mt('Clone From').'</th>';
-    if (($env{'form.clonecrs'} =~ /^$match_name$/) && 
-        ($env{'form.clonedom'} =~ /^$match_domain$/)) {
-        my $canclone = &Apache::loncoursequeueadmin::can_clone_course($env{'user.name'},
+    if ($dom eq 'gcitest') {
+        $inst_headers .= '<th>'.&mt('Test Questions').'</th>';
+        my $concepttest;
+        if ($env{'form.concepttest'} eq 'defchosen') {
+            $concepttest = 'Auto-generated';
+        } elsif ($env{'form.concepttest'} eq 'editmyown') {
+            $concepttest = 'Manually selected';
+        }
+        $inst_values .= '<td>'.$concepttest.'</td>';
+    } else {
+        $inst_headers .= '<th>'.&mt('Clone From').'</th>';
+        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'},
                            $env{'form.crstype'});
-        if ($canclone) {
-            my %courseenv = &Apache::lonnet::userenvironment($env{'form.clonedom'},
+            if ($canclone) {
+                my %courseenv = &Apache::lonnet::userenvironment($env{'form.clonedom'},
                               $env{'form.clonecrs'},('description','internal.coursecode'));
-            if (keys(%courseenv) > 0) {
-                $inst_headers .= '<th>'.$ctxt{'dsh'}.'</th>';
-                $inst_values .= '<td>'.$courseenv{'description'}.'&nbsp;';
-                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 .= '</td><td>';
-                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 .= '</td>';
+                if (keys(%courseenv) > 0) {
+                    $inst_headers .= '<th>'.$ctxt{'dsh'}.'</th>';
+                    $inst_values .= '<td>'.$courseenv{'description'}.'&nbsp;';
+                    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 .= '</td><td>';
+                    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 .= '</td>';
+                 } else {
+                     $inst_values .= '<td>'.&mt('Unknown').'</td>';
+                 }
              } else {
-                 $inst_values .= '<td>'.&mt('Unknown').'</td>';
+                 $inst_values .= '<td>'.&mt('Not permitted'),'</td>';
              }
-         } else {
-             $inst_values .= '<td>'.&mt('Not permitted'),'</td>';
-         }
-    } else {
-        $inst_values .= '<td>'.&mt('None').'</td>';
+        } else {
+            $inst_values .= '<td>'.&mt('None').'</td>';
+        }
     }
     $enroll_headers .= '<th>'.&mt('Access Starts').'</th>'.
                        '<th>'.&mt('Access Ends').'</th>';
@@ -2358,6 +2435,11 @@ function validateForm() {
 
 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('Clone content and settings from an existing course?');
     if ($crstype eq 'community') {
         $title = &mt('Brief Community Description');
@@ -2367,8 +2449,12 @@ ENDJS
                   &Apache::lonhtmlcommon::row_headline().
                   '<h3>'.&Apache::loncommon::help_open_topic('Course_Request_Description').'&nbsp;'.$title.'</h3>'.
                   &Apache::lonhtmlcommon::row_closure(1).
-                  &Apache::lonhtmlcommon::row_title(&mt('Description')).
+                  &Apache::lonhtmlcommon::row_title($desctitle).
                  '<input type="text" size="60" name="cdescr" value="'.$description.'" />';
+    if ($dom eq 'gcitest') {
+        $output .= &Apache::lonhtmlcommon::row_closure(1).
+                   &concepttest_form();
+    }
     my ($home_server_pick,$numlib) =
         &Apache::loncommon::home_server_form_item($dom,'chome',
                                                   'default','hide');
@@ -2377,15 +2463,34 @@ ENDJS
                    &Apache::lonhtmlcommon::row_title(&mt('Home Server for Course'));
     }
     $output .= $home_server_pick.
-               &Apache::lonhtmlcommon::row_closure().
+               &Apache::lonhtmlcommon::row_closure();
+    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);
+    } else {
+        $output .= 
                &Apache::lonhtmlcommon::row_headline().
                '<h3>'.&Apache::loncommon::help_open_topic('Course_Request_Clone').'&nbsp;'.$clonetitle.'</h3>'. 
                &Apache::lonhtmlcommon::row_closure(1).
-               &clone_form($dom,$formname,$crstype).
-               &Apache::lonhtmlcommon::end_pick_box().'</div>'."\n";
+               &clone_form($dom,$formname,$crstype);
+    }
+    $output .= &Apache::lonhtmlcommon::end_pick_box().'</div>'."\n";
     return $output;
 }
 
+sub concepttest_form {
+     return &Apache::lonhtmlcommon::row_title(&mt('Questions included in Concept Test')).
+            '<input type="radio" name="concepttest" value="defchosen" /> '.
+            &mt('Automatically selected by WebCenter').
+            '</label><br /><label>'.
+            '<input type="radio" name="concepttest" value="editmyown" checked="checked" /> '.
+            &mt('Chosen by you from Concept Inventory').
+            '</label><br /><label>';
+}
+
 sub clone_form {
     my ($dom,$formname,$crstype) = @_;
     my $type = 'Course';
@@ -2607,7 +2712,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'};
@@ -2868,6 +2973,18 @@ sub print_request_outcome {
             if ($result eq 'created') {
                 $disposition = 'created';
                 $reqstatus = 'created';
+                my $parmoutput;
+                if ($dom eq 'gcitest') {
+                    my $caller = 'requestcrs';
+                    if ($env{'form.concepttest'} eq 'defchosen') {
+                        &Apache::londocsgci::setdefaults();
+                        &Apache::londocsgci::evaluate($caller);
+                        &Apache::londocsgci::store($r,$caller,$dom,$cnum);
+                    }
+                    my ($furl,$ferr)= &Apache::lonuserstate::readmap($dom.'/'.$cnum);
+                    my %parmresult = 
+                        &store_crsparms($dom,$cnum,$now,$accessstart,$accessend);
+                }
                 my $role_result = &update_requestors_roles($dom,$cnum,$crstype,$details,
                                                            \%longroles);
                 if ($crstype eq 'community') {
@@ -3101,6 +3218,49 @@ sub update_requestors_roles {
     return $output;
 }
 
+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_feedback_ever',
+                                           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 notification_information {
     my ($disposition,$req_notifylist,$cnum,$now) = @_;
     my %emails = &Apache::loncommon::getemails();