--- loncom/auth/lonroles.pm	2009/12/15 05:04:17	1.240.2.3
+++ loncom/auth/lonroles.pm	2010/10/04 17:43:24	1.240.2.17
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.240.2.3 2009/12/15 05:04:17 raeburn Exp $
+# $Id: lonroles.pm,v 1.240.2.17 2010/10/04 17:43:24 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -138,7 +138,7 @@ use Apache::lonannounce;
 use Apache::lonlocal;
 use Apache::lonpageflip();
 use Apache::lonnavdisplay();
-use Apache::lonmainmenu();
+use Apache::loncoursequeueadmin;
 use GDBM_File;
 use LONCAPA qw(:DEFAULT :match);
 use HTML::Entities;
@@ -165,6 +165,7 @@ sub redirect_user {
     my $start_page = &Apache::loncommon::start_page('Switching Role',undef,
                                                     {'redirect' => [1,$url],
                                                      'bread_crumbs' => $brcrum,});
+    &Apache::lonhtmlcommon::clear_breadcrumbs();
     my $end_page   = &Apache::loncommon::end_page();
 
 # Note to style police: 
@@ -449,8 +450,16 @@ ENDENTERKEY
 
 		    if (($cnum) && ($role ne 'ca') && ($role ne 'aa')) {
                         my $msg;
+                        if (&Apache::lonnet::allowed('adv') eq 'F') { $tadv=1; }
+                        &Apache::lonnet::appenv({'request.role.adv'=>$tadv});
 			my ($furl,$ferr)=
 			    &Apache::lonuserstate::readmap($cdom.'/'.$cnum);
+                        if ($custommenu) {
+                            unless (($ferr) || ($env{'form.switchrole'})) {
+                                &Apache::lonnet::put('nohist_crslastlogin',{$env{'user.name'}.':'.$env{'user.domain'}.':'.$csec.':'.$role => $now},
+                                                     $cdom,$cnum);
+                            }
+                        }
 			if (($env{'form.orgurl'}) && 
 			    ($env{'form.orgurl'}!~/^\/adm\/flip/)) {
 			    my $dest=$env{'form.orgurl'};
@@ -462,8 +471,6 @@ ENDENTERKEY
                                 }
                                 $dest .= 'symb='.$env{'form.symb'};
                             }
-			    if (&Apache::lonnet::allowed('adv') eq 'F') { $tadv=1; }
-			    &Apache::lonnet::appenv({'request.role.adv'=>$tadv});
                             if (($ferr) && ($tadv)) {
 				&error_page($r,$ferr,$dest);
 			    } else {
@@ -482,8 +489,6 @@ ENDENTERKEY
                     .'<p>'.&mt('Please try again.').'</p>'
                     .'<p>'.$ferr.'</p>';
 			    }
-			    if (&Apache::lonnet::allowed('adv') eq 'F') { $tadv=1; }
-			    &Apache::lonnet::appenv({'request.role.adv'=>$tadv});
 
 			    if (($ferr) && ($tadv)) {
 				&error_page($r,$ferr,$furl);
@@ -589,8 +594,11 @@ ENDENTERKEY
     my ($crumbtext,$pagetitle,$recent,$show_course);
     my $noscript='<span class="LC_error">'.&mt('Use of LON-CAPA requires Javascript to be enabled in your web browser.').'<br />'.&mt('As this is not the case, most functionality in the system will be unavailable.').'</span><br />';
     if ($custommenu) {
-        my $start_page = &Apache::loncommon::start_page('Main Menu',undef,
-                                                        {'bread_crumbs' => 1});
+        my $brcrum = {'bread_crumbs' => 1};
+        if ($env{'form.destinationurl'} eq '/adm/gci_info') {
+            undef($brcrum); 
+        }
+        my $start_page = &Apache::loncommon::start_page('Main Menu',undef,$brcrum);
         $r->print(<<"ENDCUSTOM");
 $start_page
 <br />
@@ -723,20 +731,32 @@ ENDHEADER
 
     $refresh = $now;
     &Apache::lonnet::appenv({'user.refresh.time'  => $refresh});
+    if (!$countactive && !$countfuture) {
+        if (&Apache::loncommon::new_roles_update()) {
+            ($countactive,$countfuture,$inrole,$possiblerole) =
+                &gather_roles($then,$refresh,$now,$reinit,$nochoose,\%roletext,\%sortrole,
+                              \%roleclass,\%futureroles,\%timezones);
+        }
+    }
     if ($custommenu) {
-        my %courses = &Apache::loncommon::existing_gcitest_courses();
+        if ($env{'form.destinationurl'} eq '/adm/gci_info') {
+            $r->print(&gci_info_page()).
+            &Apache::loncommon::end_page();
+            return OK;
+        }
+        my %courses = &Apache::loncommon::existing_gcitest_courses('cc');
         $env{'browser.interface'}='faketextual';
         $env{'environment.remote'}='off';
         my $numcourses = keys(%courses);
         my $switcher;
         if ($numcourses > 0) {
-            $switcher = &Apache::lonmainmenu::gcitest_switcher(%courses);
+            $switcher = &Apache::loncommon::gcitest_switcher('cc',%courses);
             my $current;
             if ($env{'request.course.id'}) {
                 $current = 'cc./'.$env{'course.'.$env{'request.course.id'}.'.domain'}.
                            '/'.$env{'course.'.$env{'request.course.id'}.'.num'};
             }
-            my $switcher_js = &Apache::lonmainmenu::gcitest_switcher_js($current,$numcourses);
+            my $switcher_js = &Apache::loncommon::gcitest_switcher_js($current,$numcourses);
             $r->print(<<"ENDSCRIPT");
 <script type="text/javascript">
 // <![CDATA[
@@ -748,6 +768,10 @@ ENDSCRIPT
         $r->print(&Apache::lonmenu::inlinemenu('gcicustom',$switcher).
                   &Apache::loncommon::end_page());
         return OK;
+    } else {
+        if ($env{'form.destinationurl'} eq '/adm/gci_info') {
+            delete($env{'form.destinationurl'});
+        }
     }
     if ($env{'user.adv'}) {
         $r->print('<p><label><input type="checkbox" name="showall"');
@@ -757,22 +781,24 @@ ENDSCRIPT
                  .'</p>');
     } else {
         if ($countactive > 0) {
-            &queued_selfenrollment($r);
+            $r->print(&Apache::loncoursequeueadmin::queued_selfenrollment());
             my $domdesc = &Apache::lonnet::domain($env{'user.domain'},'description');
             my $esc_dom = &HTML::Entities::encode($env{'user.domain'},'"<>&'); 
-            $r->print(
-                '<p>'
-               .&mt('[_1]Visit the [_2]Course/Community Catalog[_3]'
-                   .' to view all [_4] LON-CAPA courses and communities.'
-                   ,'<b>'
-                   ,'<a href="/adm/coursecatalog?showdom='.$esc_dom.'">'
-                   ,'</a></b>',$domdesc)
-               .'<br />'
-               .&mt('If a course or community is [_1]not[_2] in your list of current courses and communities below,'
+            unless ($env{'user.domain'} eq 'gcitest') {
+                $r->print(
+                    '<p>'
+                   .&mt('[_1]Visit the [_2]Course/Community Catalog[_3]'
+                       .' to view all [_4] LON-CAPA courses and communities.'
+                       ,'<b>'
+                       ,'<a href="/adm/coursecatalog?showdom='.$esc_dom.'">'
+                       ,'</a></b>',$domdesc)
+                   .'<br />'
+                   .&mt('If a course or community is [_1]not[_2] in your list of current courses and communities below,'
                    .' you may be able to enroll if self-enrollment is permitted.'
                    ,'<b>','</b>')
-               .'</p>'
-            );
+                   .'</p>'
+                );
+            }
         }
     }
 
@@ -783,8 +809,10 @@ ENDSCRIPT
 	} else {
 	    $r->print('<h2>'.&mt('Currently no active roles, courses or communities').'</h2>');
 	}
-        &findcourse_advice($r);
-        &requestcourse_advice($r); 
+        unless ($env{'user.domain'} eq 'gcitest') {
+            &findcourse_advice($r);
+            &requestcourse_advice($r);
+        }
 	$r->print('</form>');
         if ($countfuture) {
             $r->print(&mt('The following [quant,_1,role,roles] will become active in the future:',$countfuture));
@@ -937,6 +965,24 @@ ENDSCRIPT
     return OK;
 }
 
+sub gci_info_page {
+    return <<"END";
+<h2>Welcome to the Geoscience Concept Inventory WebCenter</h2>
+<p>
+Use the tabs to navigate the WebCenter and...
+<ul>
+<li>Review and comment on existing GCI questions</li>
+<li>Submit GCI questions of your own</li>
+<li>Create an online test for your students</li>
+<li>View tutorials on creating online tests</li>
+</ul>
+</p>
+<p>For more information about writing and reviewing Concept Inventory questions
+please refer to the <a href="/res/gci/gci/internal/pdfs/GCIWorkbook.pdf">GCI Workbook</a>.
+
+END
+}
+
 sub gather_roles {
     my ($then,$refresh,$now,$reinit,$nochoose,$roletext,$sortrole,$roleclass,$futureroles,$timezones) = @_;
     my ($countactive,$countfuture,$inrole,$possiblerole) = (0,0,0,'');
@@ -1042,7 +1088,7 @@ sub gather_roles {
                 } elsif ($trest) {
                     my $tcourseid=$tdom.'_'.$trest;
                     $ttype = &Apache::loncommon::course_type($tcourseid);
-                    $trole = &Apache::lonnet::plaintext($role,$ttype);
+                    $trole = &Apache::lonnet::plaintext($role,$ttype,$tcourseid);
                     if ($env{'course.'.$tcourseid.'.description'}) {
                         $twhere=$env{'course.'.$tcourseid.'.description'};
                         $sortkey=$role."\0".$tdom."\0".$twhere."\0".$envkey;
@@ -1061,7 +1107,7 @@ sub gather_roles {
         &Apache::loncommon::syllabuswrapper(&mt('Syllabus'),$trest,$tdom).
                               '</span>';
                             $ttype = $newhash{'type'};
-                            $trole = &Apache::lonnet::plaintext($role,$ttype);
+                            $trole = &Apache::lonnet::plaintext($role,$ttype,$tcourseid);
                         } else {
                             $twhere=&mt('Currently not available');
                             $env{'course.'.$tcourseid.'.description'}=$twhere;
@@ -1241,8 +1287,8 @@ sub findcourse_advice {
     }
     $r->print('<h3>'.&mt('Self-Enrollment').'</h3>'.
               '<p>'.&mt('The [_1]Course/Community Catalog[_2] provides information about all [_3] classes for which LON-CAPA courses have been created, as well as any communities in the domain.','<a href="/adm/coursecatalog?showdom='.$esc_dom.'">','</a>',$domdesc).'<br />');
-    $r->print(&mt('You can search for courses and communities which permit self-enrollment, if you would like to enroll in one.').'</p>');
-    &queued_selfenrollment($r);
+    $r->print(&mt('You can search for courses and communities which permit self-enrollment, if you would like to enroll in one.').'</p>'.
+              &Apache::loncoursequeueadmin::queued_selfenrollment());
     return;
 }
 
@@ -1299,49 +1345,6 @@ sub requestcourse_advice {
     return;
 }
 
-sub queued_selfenrollment {
-    my ($r) = @_;
-    my %selfenrollrequests = &Apache::lonnet::dump('selfenrollrequests');
-    my %reqs_by_date;
-    foreach my $item (keys(%selfenrollrequests)) {
-        if (ref($selfenrollrequests{$item}) eq 'HASH') {
-            if ($selfenrollrequests{$item}{'status'} eq 'request') {
-                if ($selfenrollrequests{$item}{'timestamp'}) {
-                    push(@{$reqs_by_date{$selfenrollrequests{$item}{'timestamp'}}},$item);
-                }
-            } 
-        }
-    }
-    if (keys(%reqs_by_date)) {
-        my $rolename = &Apache::lonnet::plaintext('st');
-        $r->print('<b>'.&mt('Enrollment requests pending Course Coordinator approval').'</b><br />'.
-                  &Apache::loncommon::start_data_table().
-                  &Apache::loncommon::start_data_table_header_row().
-                  '<th>'.&mt('Date requested').'</th><th>'.&mt('Course title').'</th>'.
-                  '<th>'.&mt('User role').'</th><th>'.&mt('Section').'</th>'.
-                 &Apache::loncommon::end_data_table_header_row());
-        my @sorted = sort { $a <=> $b } (keys(%reqs_by_date));
-        foreach my $item (@sorted) {
-            if (ref($reqs_by_date{$item}) eq 'ARRAY') {
-                foreach my $crs (@{$reqs_by_date{$item}}) {
-                    my %courseinfo = &Apache::lonnet::coursedescription($crs);
-                    my $usec = $selfenrollrequests{$crs}{'section'};
-                    if ($usec eq '') {
-                        $usec = &mt('No section'); 
-                    }
-                    $r->print(&Apache::loncommon::start_data_table_row().
-                             '<td>'.&Apache::lonlocal::locallocaltime($item).'</td>'.
-                             '<td>'.$courseinfo{'description'}.'</td>'.
-                             '<td>'.$rolename.'</td><td>'.$usec.'</td>'.
-                             &Apache::loncommon::end_data_table_row());
-                }
-            }
-        }
-        $r->print(&Apache::loncommon::end_data_table());
-    }
-    return;
-}
-
 sub privileges_info {
     my ($which) = @_;
     my $output;
@@ -1682,7 +1685,7 @@ sub display_cc_role {
                 $twhere=&mt('Currently not available');
                 $env{'course.'.$tcourseid.'.description'}=$twhere;
             }
-            my $trole = &Apache::lonnet::plaintext($ccrole,$ttype);
+            my $trole = &Apache::lonnet::plaintext($ccrole,$ttype,$tcourseid);
             $twhere.="<br />".&mt('Domain').":".$1;
             ($roletext,$roletext_end) = &build_roletext($trolecode,$1,$2,'is',$tryagain,$advanced,'',$tbg,$trole,$twhere,'','','',1,'');
         }