--- loncom/auth/lonroles.pm	2010/01/15 05:30:21	1.240.2.9
+++ loncom/auth/lonroles.pm	2010/10/06 18:46:53	1.240.2.18
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.240.2.9 2010/01/15 05:30:21 raeburn Exp $
+# $Id: lonroles.pm,v 1.240.2.18 2010/10/06 18:46:53 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -138,7 +138,6 @@ 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);
@@ -455,6 +454,12 @@ ENDENTERKEY
                         &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'};
@@ -587,10 +592,14 @@ ENDENTERKEY
     return OK if $r->header_only;
 
     my ($crumbtext,$pagetitle,$recent,$show_course);
+    $show_course=&Apache::loncommon::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 />
@@ -602,16 +611,25 @@ ENDCUSTOM
         $crumbtext = 'User Roles';
         $pagetitle = 'My Roles';
         $recent = &mt('Recent Roles');
-        $show_course=&Apache::loncommon::show_course();
+        my $standby=&mt('Role selected. Please stand by.');
         if ($show_course) {
             $crumbtext = 'Courses';
             $pagetitle = 'My Courses';
             $recent = &mt('Recent Courses');
+            $standby = &mt('Course selected. Please stand by.');
+        }
+        my $brcrum = [{ href    => '/adm/roles',
+                         text    => $crumbtext,},
+                     ];
+        my $args;
+        if (($env{'user.domain'} eq 'gcitest') && (!$numdc)) {
+            $args = {bread_crumbs        => $brcrum,
+                     bread_crumbs_nomenu => 1};
+        } else {
+            $args = {bread_crumbs => $brcrum};
         }
-        my $brcrum =[{href=>"/adm/roles",text=>$crumbtext}];
+        my $start_page=&Apache::loncommon::start_page($pagetitle,undef,$args);
         my $swinfo=&Apache::lonmenu::rawconfig();
-        my $start_page=&Apache::loncommon::start_page($pagetitle,undef,{bread_crumbs=>$brcrum});
-        my $standby=&mt('Role selected. Please stand by.');
         $standby=~s/\n/\\n/g;
         $r->print(<<ENDHEADER);
 $start_page
@@ -723,6 +741,13 @@ 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) {
         if ($env{'form.destinationurl'} eq '/adm/gci_info') {
             $r->print(&gci_info_page()).
@@ -735,13 +760,13 @@ ENDHEADER
         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[
@@ -792,7 +817,15 @@ ENDSCRIPT
 	if ($inrole) {
 	    $r->print('<h2>'.&mt('Currently no additional roles, courses or communities').'</h2>');
 	} else {
-	    $r->print('<h2>'.&mt('Currently no active roles, courses or communities').'</h2>');
+            if ($show_course) {
+                if ($env{'user.domain'} eq 'gcitest') {
+                    $r->print('<h2>'.&mt('Currently no active Concept Tests').'</h2>');
+                } else { 
+                    $r->print('<h2>'.&mt('Currently no active courses or communities').'</h2>');
+                }
+            } else {
+	        $r->print('<h2>'.&mt('Currently no active roles, courses or communities').'</h2>');
+            }
 	}
         unless ($env{'user.domain'} eq 'gcitest') {
             &findcourse_advice($r);
@@ -800,7 +833,15 @@ ENDSCRIPT
         }
 	$r->print('</form>');
         if ($countfuture) {
-            $r->print(&mt('The following [quant,_1,role,roles] will become active in the future:',$countfuture));
+            if ($show_course) {
+                if ($env{'user.domain'} eq 'gcitest') {
+                    $r->print(&mt('The following [quant,_1,Concept Test] will be available in the future:',$countfuture));
+                } else {
+                    $r->print(&mt('The following [quant,_1,course] will become active in the future:',$countfuture));
+                }
+            } else {
+                $r->print(&mt('The following [quant,_1,role,roles] will become active in the future:',$countfuture));
+            }
             my $doheaders = &roletable_headers($r,\%roleclass,\%sortrole,
                                                $nochoose);
             &print_rolerows($r,$doheaders,\%roleclass,\%sortrole,\%dcroles,
@@ -849,7 +890,7 @@ ENDSCRIPT
         }
     }
 # ----------------------------------------------------------------------- Table
-    unless ((!&Apache::loncommon::show_course()) || ($nochoose) || ($countactive==1)) {
+    unless ((!$show_course) || ($nochoose) || ($countactive==1)) {
 	$r->print("<h2>".&mt('Select a Course to Enter')."</h2>\n");
     }
     if ($env{'form.destinationurl'}) {
@@ -957,8 +998,9 @@ sub gci_info_page {
 Use the tabs to navigate the WebCenter and...
 <ul>
 <li>Review and comment on existing GCI questions</li>
-<li>Submit a GCI question of your own</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
@@ -1072,7 +1114,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;
@@ -1091,7 +1133,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;
@@ -1329,49 +1371,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;
@@ -1712,7 +1711,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,'');
         }