--- loncom/interface/lonrequestcourse.pm	2010/11/08 21:44:55	1.41.2.8
+++ loncom/interface/lonrequestcourse.pm	2010/12/05 17:27:00	1.41.2.11
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Request a course
 #
-# $Id: lonrequestcourse.pm,v 1.41.2.8 2010/11/08 21:44:55 raeburn Exp $
+# $Id: lonrequestcourse.pm,v 1.41.2.11 2010/12/05 17:27:00 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -151,7 +151,7 @@ sub generate_page {
     $states{'log'} = ['filter','display'];
     $states{'new'} = ['courseinfo','enrollment','personnel','review','process'];
 
-    if ($dom eq 'gcitest') {
+    if ($dom =~ /^\w+citest$/) {
         $states{'new'} = ['courseinfo','review','process'];
         if ($env{'form.concepttest'} eq 'editmyown') {
             push(@{$states{'new'}},'chooseitems','uploadroster','enrolling');
@@ -182,7 +182,7 @@ sub generate_page {
                  enrollment    => 'Access Dates',
                  personnel     => 'Personnel',
                  review        => 'Review',
-                 process       => 'Result',
+                 process       => 'Request Outcome',
                  pick_request  => 'Display Summary',
                  details       => 'Request Details',
                  cancel        => 'Cancel Request',
@@ -192,7 +192,7 @@ sub generate_page {
                  enrolling     => 'Completed',
                  done          => 'Completed',
                 );
-    if ($dom eq 'gcitest') {
+    if ($dom =~ /^\w+citest$/) {
         $trail{'crstype'} = 'Building a Test';
         $trail{'courseinfo'} = 'Test Information';
     }
@@ -414,7 +414,7 @@ sub get_breadcrumbs {
     my $firstcrumb = 'Pick Action';
     my $crumbtitle = 'Course/Community Requests';
     my $crumbhelp = 'Course_Requests';
-    if ($dom eq 'gcitest') {
+    if ($dom =~ /^\w+citest$/) {
         $firstcrumb = 'Building a Test';
         $crumbtitle = 'Create Concept Test';
         $crumbhelp = 'Concept_Test_Creation';
@@ -595,11 +595,12 @@ sub form_elements {
          },
     );
     my %servers = &Apache::lonnet::get_servers($dom,'library');
-    if ($dom eq 'gcitest') {
+    if ($dom =~ /^\w+citest$/) {
         %{$elements{'new'}{'courseinfo'}} = (
                                               cdescr      => 'text',
                                               concepttest => 'radio',
                                             );
+        $elements{'new'}{'enrollment'}{'timezone'} = 'selectbox';
         if (&show_cloneable()) {
             $elements{'new'}{'courseinfo'}{'clonecrs'} = 'selectbox';
             $elements{'new'}{'courseinfo'}{'clonedom'} = 'hidden';
@@ -612,7 +613,7 @@ sub form_elements {
     } else {
         $elements{'new'}{'courseinfo'}{'chome'} = 'hidden';
     }
-    if ($dom eq 'gcitest') {
+    if ($dom =~ /^\w+citest$/) {
         my %mergedhash = (%{$elements{'new'}{'courseinfo'}},%{$elements{'new'}{'enrollment'}});
         %{$elements{'new'}{'courseinfo'}} = %mergedhash;
     }
@@ -738,7 +739,7 @@ sub print_main_menu {
     }
 
     my $js;
-    unless ($dom eq 'gcitest') {
+    unless ($dom =~ /^\w+citest$/) {
         $js = <<"END";
 
 function nextPage(formname) {
@@ -829,7 +830,7 @@ END
         }
     }
 
-    if ($dom eq 'gcitest') {
+    if ($dom =~ /^\w+citest$/) {
         my $formname = 'requestcrs';
         my $nexttext = &mt('Continue');
         $r->print(&header($pagetitle,$js.$jscript,$loaditems).$crumb.
@@ -985,7 +986,7 @@ END
         } elsif ($state eq 'personnel') {
             $js .= "\n".&section_check_javascript()."\n".&personnel_lcsec_js();
         } elsif (($state eq 'process') && ($env{'form.concepttest'} eq 'editmyown')) {
-            $js .= "\n".&Apache::londocsgci::builder_javascript()."\n";
+            $js .= "\n".&Apache::londocsgci::builder_javascript($dom)."\n";
         }
         my $title;
         if ($env{'form.crstype'} eq 'community') {
@@ -1751,12 +1752,12 @@ sub print_enrollment_menu {
                 &mt('No').'</label></span>'. 
                 &Apache::lonhtmlcommon::row_closure(1).
                 &date_setting_table($starttime,$endtime,$formname,'enroll',
-                                    $hasauto,%enrolltitles);
+                                    $hasauto,$dom,%enrolltitles);
         }
     }
     my $access_dates = 
         &date_setting_table($starttime,$endtime,$formname,'access',$hasauto,
-                            %accesstitles);
+                            $dom,%accesstitles);
     if ($sections) {
         $output .=  $sections;
     }
@@ -1773,10 +1774,18 @@ sub print_enrollment_menu {
         }
         $output .= &Apache::lonhtmlcommon::row_headline('Access').
                    '<h3>'.$header.'</h3>'.
-                   &Apache::lonhtmlcommon::row_closure(1).
-                   $access_dates;
+                   &Apache::lonhtmlcommon::row_closure(1);
+        if ($dom =~ /^\w+citest$/) {
+            my $includeempty = 1;
+            my $timezone = &Apache::lonlocal::gettimezone();
+            $output .= &Apache::lonhtmlcommon::row_title('Time zone').
+                       &Apache::loncommon::select_timezone('timezone',$timezone,
+                                                           undef,$includeempty).
+                       &Apache::lonhtmlcommon::row_closure(1);
+        }
+        $output .= $access_dates;
     }
-    if ($dom eq 'gcitest') {
+    if ($dom =~ /^\w+citest$/) {
         return $output;
     } else {
         return '<div>'.&Apache::lonhtmlcommon::start_pick_box().$output.
@@ -1843,16 +1852,22 @@ sub inst_section_selector {
 }
 
 sub date_setting_table {
-    my ($starttime,$endtime,$formname,$prefix,$hasauto,%datetitles) = @_;
+    my ($starttime,$endtime,$formname,$prefix,$hasauto,$dom,%datetitles) = @_;
     my ($perpetual,$table);
     my $no_hh_mm_ss = 1;
+    my $hide_timezone;
     if (&Apache::loncommon::needs_gci_custom()) {
         $no_hh_mm_ss = '';
+        if ($dom =~ /^\w+citest$/) {
+            if ($prefix eq 'access') {
+                $hide_timezone = 1;
+            }
+        }
     }
     my $startform = &Apache::lonhtmlcommon::date_setter($formname,$prefix.'start',
-                                                        $starttime,'','','',$no_hh_mm_ss,'','','',1);
+                                                        $starttime,'','','',$no_hh_mm_ss,'','','',1,$hide_timezone);
     my $endform = &Apache::lonhtmlcommon::date_setter($formname,$prefix.'end',
-                                                      $endtime,'','','',$no_hh_mm_ss,'','','',1);
+                                                      $endtime,'','','',$no_hh_mm_ss,'','','',1,$hide_timezone);
     my $closure = '';
     if ($prefix eq 'access') {
         unless (&Apache::loncommon::needs_gci_custom()) {
@@ -2379,7 +2394,7 @@ sub print_review {
     }
 
     my %ctxt = &clone_text();
-    if ($dom eq 'gcitest') {
+    if ($dom =~ /^\w+citest$/) {
         $inst_headers .= '<th>'.&mt('Test Questions').'</th>';
         my $concepttest;
         if ($env{'form.concepttest'} eq 'defchosen') {
@@ -2394,7 +2409,7 @@ sub print_review {
     if (&show_cloneable()) {
         $inst_headers .= '<th>'.&mt('Copy From').'</th>';
         if ((($env{'form.cloning'}) || 
-             (($dom eq 'gcitest') && ($env{'form.concepttest'} eq 'cloning'))) &&
+             (($dom =~ /^\w+citest$/) && ($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'},
@@ -2404,7 +2419,7 @@ sub print_review {
                 my %courseenv = &Apache::lonnet::userenvironment($env{'form.clonedom'},
                               $env{'form.clonecrs'},('description','internal.coursecode'));
                 if (keys(%courseenv) > 0) {
-                    if ($dom eq 'gcitest') {
+                    if ($dom =~ /^\w+citest$/) {
                         $inst_headers .= '<th>'.$ctxt{'ros'}.'</th>';
                     } else {
                         $inst_headers .= '<th>'.$ctxt{'dsh'}.'</th>';
@@ -2414,12 +2429,12 @@ sub print_review {
                     if ($cloneinst ne '') {
                         $inst_values .= $cloneinst.' '.&mt('in').' '.$env{'form.clonedom'};
                     } else {
-                        unless ($dom eq 'gcitest') {
+                        unless ($dom =~ /^\w+citest$/) {
                             $inst_values .= &mt('from').' '.$env{'form.clonedom'};
                         }
                     }
                     $inst_values .= ('&nbsp;'x2).'</td><td>';
-                    if ($dom eq 'gcitest') {
+                    if ($dom =~ /^\w+citest$/) {
                         if ($env{'form.cloneroster'}) {
                             $inst_values .= &mt('Yes');
                         } else {
@@ -2445,14 +2460,26 @@ sub print_review {
             $inst_values .= '<td>'.&mt('None').'</td>';
         }
     }
+    my $tz;
+    if ($dom =~ /^\w+citest$/) {
+        if (&Apache::lonlocal::gettimezone($env{'form.timezone'}) ne 'local') {
+            $tz = $env{'form.timezone'};
+        } else {
+            $tz = &Apache::lonlocal::gettimezone();
+        }
+        $enroll_headers .= '<th>'.&mt('Time Zone').'</th>';
+    }
     $enroll_headers .= '<th>'.&mt('Access Starts').'</th>'.
                        '<th>'.&mt('Access Ends').'</th>';
-    my ($accessstart,$accessend) = &dates_from_form('accessstart','accessend');
-    $enroll_values .= '<td>'.&Apache::lonlocal::locallocaltime($accessstart).'</td>';
+    my ($accessstart,$accessend) = &dates_from_form('accessstart','accessend',$tz);
+    if ($dom =~ /^\w+citest$/) {
+        $enroll_values .= '<td>'.$tz.'</td>'; 
+    }
+    $enroll_values .= '<td>'.&Apache::lonlocal::locallocaltime($accessstart,$tz).'</td>';
     if ($accessend == 0) {
         $enroll_values .= '<td>'.&mt('No end date').'</td>';
     } else {
-        $enroll_values .= '<td>'.&Apache::lonlocal::locallocaltime($accessend).'</td>';
+        $enroll_values .= '<td>'.&Apache::lonlocal::locallocaltime($accessend,$tz).'</td>';
     }
 
     my $container = 'Course';
@@ -2563,9 +2590,9 @@ sub print_review {
 }
 
 sub dates_from_form {
-    my ($startname,$endname) = @_;
-    my $startdate = &Apache::lonhtmlcommon::get_date_from_form($startname);
-    my $enddate   = &Apache::lonhtmlcommon::get_date_from_form($endname);
+    my ($startname,$endname,$timezone) = @_;
+    my $startdate = &Apache::lonhtmlcommon::get_date_from_form($startname,$timezone);
+    my $enddate   = &Apache::lonhtmlcommon::get_date_from_form($endname,$timezone);
     if ($endname eq 'accessend') {
         if (exists($env{'form.no_end_date'}) ) {
             $enddate = 0;
@@ -2616,7 +2643,7 @@ function toggleCloning() {
 ENDJS
     my $title = &mt('Brief Course Description');
     my $desctitle = &mt('Description');
-    if ($dom eq 'gcitest') {
+    if ($dom =~ /^\w+citest$/) {
         $title = &mt('Concept Test Course Information');
         $desctitle = &mt('Concept Test Title');
     }
@@ -2630,16 +2657,16 @@ ENDJS
                   '<h3>'.&Apache::loncommon::help_open_topic('Course_Request_Description').'&nbsp;'.$title.'</h3>'.
                   &Apache::lonhtmlcommon::row_closure(1).
                   &Apache::lonhtmlcommon::row_title($desctitle).
-                 '<input type="text" size="60" name="cdescr" value="'.$description.'" />';
+                  '<input type="text" size="60" name="cdescr" value="'.$description.'" />';
     my $showclone;
-    if ($dom eq 'gcitest') {
+    if ($dom =~ /^\w+citest$/) {
         $showclone = &show_cloneable();
     } else {
         $showclone = 1;
     }
-    if ($dom eq 'gcitest') {
+    if ($dom =~ /^\w+citest$/) {
         $output .= &Apache::lonhtmlcommon::row_closure(1).
-                   &concepttest_form($showclone);
+                   &concepttest_form($showclone,$dom);
     }
     my ($home_server_pick,$numlib) =
         &Apache::loncommon::home_server_form_item($dom,'chome',
@@ -2650,7 +2677,7 @@ ENDJS
     }
     $output .= $home_server_pick.
                &Apache::lonhtmlcommon::row_closure();
-    if ($showclone && $dom ne 'gcitest') {
+    if ($showclone && $dom !~ /^\w+citest$/) {
         $output .= &Apache::lonhtmlcommon::row_headline().
                    '<h3>'.&Apache::loncommon::help_open_topic('Course_Request_Clone').'&nbsp;'.$clonetitle.
                    '<label><input type="radio" name="cloning" value="1" '.
@@ -2666,7 +2693,7 @@ ENDJS
                    &clone_form($dom,$formname,$crstype).
                    &Apache::lonhtmlcommon::end_pick_box().'</div>';
     }
-    if ($dom eq 'gcitest') {
+    if ($dom =~ /^\w+citest$/) {
         my ($instcode,@codetitles,%cat_titles,%cat_order,@code_order);
         my $invalidcrosslist = [];
         $output .= &print_enrollment_menu($formname,$state,$instcode,$dom,
@@ -2678,7 +2705,7 @@ ENDJS
 }
 
 sub concepttest_form {
-    my ($showclone) = @_;
+    my ($showclone,$dom) = @_;
     my $output = &Apache::lonhtmlcommon::row_title(&mt('Questions included in Concept Test')).
                  '<label>'.
                  '<input type="radio" name="concepttest" value="editmyown" checked="checked" /> '.
@@ -2693,7 +2720,7 @@ sub concepttest_form {
                     '<input type="radio" name="concepttest" value="cloning" /> '.
                     &mt('Copied from existing Test: ').
                     '</label>'.&select_oldtest().('&nbsp;' x2).
-                    '<input type="hidden" name="clonedom" value="gcitest" />'.
+                    '<input type="hidden" name="clonedom" value="'.$dom.'" />'.
                     '<label><input type="checkbox" value="1" name="cloneroster" />'.
                     &mt('Copy roster').'</label>';
     }
@@ -2718,7 +2745,7 @@ sub select_oldtest {
     foreach my $item (@sorted_courses) {
         foreach my $course (@{$Sortby{$item}}) {
             my ($cdom,$cnum) = split('_',$course);
-            if (($cdom eq 'gcitest') && (ref($courses{$course}) eq 'HASH')) {
+            if (($cdom =~ /^\w+citest$/) && (ref($courses{$course}) eq 'HASH')) {
                 my $cdesc = $courses{$course}{'description'};
                 $output .= '<option value="'.$cnum.'">'.$cdesc.'</option>';
             }
@@ -3072,7 +3099,7 @@ sub print_request_outcome {
             push(@baduname,$uname.':'.$udom);
         }
     }
-    my ($accessstart,$accessend) = &dates_from_form('accessstart','accessend');
+    my ($accessstart,$accessend) = &dates_from_form('accessstart','accessend',$env{'form.timezone'});
     my $autodrops = 0;
     if ($env{'form.autodrops'}) {
         $autodrops = $env{'form.autodrops'}; 
@@ -3091,11 +3118,11 @@ sub print_request_outcome {
     my $clonecrs = '';
     my $clonedom = '';
     if ((($env{'form.cloning'}) || 
-         (($dom eq 'gcitest') && ($env{'form.concepttest'} eq 'cloning'))) && 
+         (($dom =~ /^\w+citest$/) && ($env{'form.concepttest'} eq 'cloning'))) && 
         ($env{'form.clonecrs'} =~ /^($match_courseid)$/) && 
         ($env{'form.clonedom'} =~ /^($match_domain)$/)) {
-        if ($dom eq 'gcitest') {
-            $env{'form.clonedom'} = 'gcitest';
+        if ($dom =~ /^\w+citest$/) {
+            $env{'form.clonedom'} = $dom;
         }
         my $clonehome = &Apache::lonnet::homeserver($env{'form.clonecrs'},
                                                     $env{'form.clonedom'});
@@ -3135,22 +3162,23 @@ sub print_request_outcome {
                     accessend      => $accessend,
                     personnel      => \%personnel,
                   };
-    if ($dom eq 'gcitest') {
+    if ($dom =~ /^\w+citest$/) {
+        my $template = &get_template($dom);
         if ($env{'form.concepttest'} eq 'editmyown') {
             $details->{'firstres'} = 'nav'; 
         } else {
             $details->{'firstres'} = 'blank';
         }
         if ($env{'form.concepttest'} eq 'cloning') {
-            if (($clonecrs) && ($clonedom eq 'gcitest')) {
+            if (($clonecrs) && ($clonedom =~ /^\w+citest$/)) {
                 $details->{'cloneroster'} = $env{'form.cloneroster'};
-            } else {
-                $details->{'clonedom'} = 'gci';
-                $details->{'clonecrs'} = '8v226795a882b4bcagcil1';
+            } elsif ($template) {
+                $details->{'clonedom'} = $dom;
+                $details->{'clonecrs'} = $template;
             }
         } else {
-            $details->{'clonedom'} = 'gci';
-            $details->{'clonecrs'} = '8v226795a882b4bcagcil1';
+            $details->{'clonedom'} =  $dom,
+            $details->{'clonecrs'} =  $template,
         }
         $details->{'datemode'} = 'delete';
     }
@@ -3246,19 +3274,26 @@ sub print_request_outcome {
                 } else {
                     $output = '<p>'.&mt('Your course request has been processed and the course has been created.');
                 }
-                if ($dom eq 'gcitest') {
+                if ($dom =~ /^\w+citest$/) {
                     my $caller = 'requestcrs';
+                    my $timezone;
+                    if (&Apache::lonlocal::gettimezone($env{'form.timezone'}) ne 'local') {
+                        $timezone = $env{'form.timezone'};
+                    } else {
+                        $timezone = Apache::lonlocal::gettimezone();
+                    }
                     &acquire_cc_role($dom,$cnum,'cc./'.$dom.'/'.$cnum);
                     my %parmresult =
                         &store_crsparms($dom,$cnum,$now,$accessstart,$accessend);
-                    &Apache::londocsgci::setdefaults();
+                    &Apache::londocsgci::setdefaults($dom);
                     my %crsenvhash = (
                                        suppress_tries => 'yes',
+                                       timezone       => $timezone,
                                      );
                     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')) {
+                        if (($clonecrs) && ($clonedom =~ /^\w+citest$/)) {
                             my $cloneid = $clonedom.'/'.$clonecrs; 
                             my %clonedesc = &Apache::lonnet::coursedescription($cloneid,{'one_time' => 1});
                             my $oldcdesc = $clonedesc{'description'};
@@ -3273,8 +3308,8 @@ sub print_request_outcome {
                                 }
                                 $output .= '<ul>'.
                                            '<li>'.&mt('Access starts:').' '.
-                                                  &Apache::lonlocal::locallocaltime($accessstart).'</li>'.
-                                           '<li>'.&mt('Access ends:').' '.&Apache::lonlocal::locallocaltime($accessend).'</li>'.
+                                                  &Apache::lonlocal::locallocaltime($accessstart,$timezone).'</li>'.
+                                           '<li>'.&mt('Access ends:').' '.&Apache::lonlocal::locallocaltime($accessend,$timezone).'</li>'.
                                            '</ul><br />';
                                 $r->print($output);
                                 $output = '';
@@ -4016,5 +4051,14 @@ sub show_cloneable {
     }
 }
 
+sub get_template {
+    my ($cdom) = @_;
+    my %template = (
+                     gcitest  => '8v226795a882b4bcagcil1',
+                     slcitest => '8v226795a882b4bcagcil1',
+                   );
+    return $template{$cdom};
+}
+
 1;