--- loncom/auth/lonroles.pm	2005/11/01 21:59:24	1.131
+++ loncom/auth/lonroles.pm	2006/01/06 21:03:23	1.144
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.131 2005/11/01 21:59:24 albertel Exp $
+# $Id: lonroles.pm,v 1.144 2006/01/06 21:03:23 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -51,7 +51,7 @@ sub redirect_user {
     my $navwindow;
     if ($launch_nav eq 'on') {
 	$navwindow.=&Apache::lonnavmaps::launch_win('now',undef,undef,
-						    ($url eq '/adm/whatsnew'));
+						  ($url =~ m-^/adm/whatsnew-));
     } else {
 	$navwindow.=&Apache::lonnavmaps::close();
     }
@@ -89,6 +89,9 @@ sub handler {
 
 # ================================================================== Roles Init
     if ($env{'form.selectrole'}) {
+        if ($env{'form.newrole'}) {
+            $env{'form.'.$env{'form.newrole'}}=1;
+	}
 	if ($env{'request.course.id'}) {
 	    my %temp=('logout_'.$env{'request.course.id'} => time);
 	    &Apache::lonnet::put('email_status',\%temp);
@@ -123,6 +126,11 @@ sub handler {
 		if ($tstatus eq 'is') {
 		    $where=~s/^\///;
 		    my ($cdom,$cnum,$csec)=split(/\//,$where);
+# check for course groups
+                    my %coursegroups = &Apache::lonnet::get_active_groups(
+                          $env{'user.domain'},$env{'user.name'},$cdom, $cnum);
+                    my $cgrps = join(':',keys(%coursegroups));
+
 # store role if recent_role list being kept
                     if ($env{'environment.recentroles'}) {
 			&Apache::lonhtmlcommon::store_recent('roles',
@@ -224,7 +232,8 @@ ENDENTERKEY
 		    &Apache::lonnet::appenv(
 					   'request.role'        => $trolecode,
 					   'request.role.domain' => $cdom,
-					   'request.course.sec'  => $csec);
+					   'request.course.sec'  => $csec,
+                                           'request.course.groups' => $cgrps);
                     my $tadv=0;
 		    my $msg=&mt('Entering course ...');
 
@@ -262,13 +271,18 @@ ENDENTERKEY
 							  '.course.helper.not.run'}) {
 				$furl = "/adm/helper/course.initialization.helper";
 				# Send the user to the course they selected
-			    } elsif (($env{'request.course.fn'}) 
-				     && ($role eq 'cc' && ($env{'environment.course_init_display'} ne 'firstres')))  {
-				$msg = &mt('Entering course ....');
-				&redirect_user($r,&mt('New in course'),
-					       '/adm/whatsnew',$msg,
-					       $env{'environment.remotenavmap'});
-				return OK;
+			    } elsif ($env{'request.course.id'}) {
+                                if (&Apache::lonnet::allowed('whn',
+                                                  $env{'request.course.id'})) {
+                                    my $startpage = &courseloadpage($courseid);
+                                    unless ($startpage eq 'firstres') {         
+				        $msg = &mt('Entering course ....');
+				        &redirect_user($r,&mt('New in course'),
+					     '/adm/whatsnew?refpage=start',$msg,
+					     $env{'environment.remotenavmap'});
+				        return OK;
+                                    }
+                                }
 			    }
 			    &redirect_user($r,&mt('Entering Course'),
                                            $furl,$msg,
@@ -312,6 +326,8 @@ ENDENTERKEY
 
     my $swinfo=&Apache::lonmenu::rawconfig();
     my $bodytag=&Apache::loncommon::bodytag('User Roles');
+    my $standby=&mt('Role selected. Please stand by.');
+    $standby=~s/\n/\\n/g;
     my $helptag='<table><tr><td>'.&Apache::loncommon::help_open_menu('','General Intro','General_Intro','User Roles',1,undef,undef,undef,undef,,&mt("Click here for help")).'</td></td></tr></table>';
     $r->print(<<ENDHEADER);
 <html>
@@ -323,6 +339,20 @@ $helptag<br />
 <script>
 $swinfo
 window.focus();
+
+active=true;
+
+function enterrole (thisform,rolecode,buttonname) {
+    if (active) {
+	active=false;
+        document.title='$standby';
+        window.status='$standby';
+	thisform.newrole.value=rolecode;
+	thisform.submit();
+    } else {
+       alert('$standby');
+    }   
+}
 </script>
 ENDHEADER
 
@@ -396,6 +426,7 @@ ENDHEADER
         $r->print('<form method="post" name="rolechoice" action="'.(($fn)?$fn:$r->uri).'">');
         $r->print('<input type="hidden" name="orgurl" value="'.$fn.'" />');
         $r->print('<input type="hidden" name="selectrole" value="1" />');
+        $r->print('<input type="hidden" name="newrole" value="" />');
     }
     if ($env{'user.adv'}) {
 	$r->print(
@@ -416,7 +447,7 @@ ENDHEADER
         if ($envkey=~/^user\.role\./) {
             my ($role,$where,$trolecode,$tstart,$tend,$tremark,$tstatus,$tpstart,$tpend,$tfont);
             &role_status($envkey,$then,$now,\$role,\$where,\$trolecode,\$tstatus,\$tstart,\$tend);
-            next if (!defined($role) || $role eq '');
+            next if (!defined($role) || $role eq '' || $role =~ /^gr/);
             $tremark='';
             $tpstart='&nbsp;';
             $tpend='&nbsp;';
@@ -461,7 +492,8 @@ ENDHEADER
                 my $trole;
                 if ($role =~ /^cr\//) {
                     my ($rdummy,$rdomain,$rauthor,$rrole)=split(/\//,$role);
-                    $tremark.='<br />'.&mt('Defined by ').$rauthor.
+		    if ($tremark) { $tremark.='<br />'; }
+                    $tremark.=&mt('Defined by ').$rauthor.
 			&mt(' at ').$rdomain.'.';
                     $trole=$rrole;
                 } else {
@@ -499,11 +531,7 @@ ENDHEADER
 		    foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } }
                     if (!$allowed) {
 			$button=0;
-                        $switchserver=&Apache::lonnet::escape('http://'.
-                         $Apache::lonnet::hostname{$home}.
-                          '/adm/login?domain='.$env{'user.domain'}.
-			   '&username='.$env{'user.name'}.
-                           '&firsturl=/priv/'.$env{'user.name'}.'/');
+                        $switchserver='otherserver='.$home.'&role='.$trolecode;
                     }
                     #next if ($home eq 'no_host');
                     $home = $Apache::lonnet::hostname{$home};
@@ -589,8 +617,7 @@ ENDHEADER
     $r->print('<br /><table><tr>');
     unless ($nochoose) { $r->print('<th>&nbsp;</th>'); }
     $r->print('<th>'.&mt('User Role').'</th><th>'.&mt('Extent').
-         '</th><th>'.&mt('Start').'</th><th>'.&mt('End').'</th><th>'.
-	      &mt('Remarks and Calendar Announcements').'</th></tr>'."\n");
+         '</th><th>'.&mt('Start').'</th><th>'.&mt('End').'</th></tr>'."\n");
     my $doheaders=-1;
     foreach my $type ('Domain','Construction Space','Course','System') {
 	my $haverole=0;
@@ -609,6 +636,9 @@ ENDHEADER
 	foreach (sort(keys(%recent_roles))) {
 	    if (defined($roletext{'user.role.'.$_})) {
 		$output.=$roletext{'user.role.'.$_};
+                if ($_ =~ m-dc\./(\w+)/- && $dcroles{$1}) {
+		    $output .= &allcourses_row($1,'recent');
+                }
 	    } elsif ($numdc > 0) {
                 unless ($_ =~/^error\:/) {
                     $output.=&display_cc_role('user.role.'.$_);
@@ -616,7 +646,7 @@ ENDHEADER
             } 
 	}
 	if ($output) {
-	    $r->print("<tr><td align='center' colspan='6'><font face='arial'>".
+	    $r->print("<tr><td align='center' colspan='5'><font face='arial'>".
 		      &mt('Recent Roles')."</font></td>");
 	    $r->print($output);
 	    $r->print("</tr>");
@@ -628,14 +658,14 @@ ENDHEADER
         $r->print(&coursepick_jscript());
         $r->print(&Apache::loncommon::coursebrowser_javascript());
     }
-    foreach my $type ('Construction Space','Course','Domain','System') {
+    foreach my $type ('Construction Space','Domain','Course','System') {
 	my $output;
 	foreach my $which (sort {uc($a) cmp uc($b)} (keys(%sortrole))) {
 	    if ($roleclass{$sortrole{$which}} =~ /^\Q$type\E/) { 
 		$output.=$roletext{$sortrole{$which}};
                 if ($sortrole{$which} =~ m-dc\./(\w+)/-) {
                     if ($dcroles{$1}) {
-                        $output .= &allcourses_row($1);
+                        $output .= &allcourses_row($1,'');
                     }
                 }
 	    }
@@ -643,7 +673,7 @@ ENDHEADER
 	if ($output) {
 	    if ($doheaders > 0) {
 		$r->print("<tr>".
-			  "<td align='center' colspan='6'><font face='arial'>".&mt($type)."</font></td></tr>");
+			  "<td align='center' colspan='5'><font face='arial'>".&mt($type)."</font></td></tr>");
 	    }
 	    $r->print($output);	
 	}
@@ -659,13 +689,13 @@ ENDHEADER
     }
     unless ($nochoose) {
 	if ($env{'request.role'} ne 'cm') {
-	    $r->print('<td><input type=submit value="'.
+	    $r->print('<td><input type="submit" value="'.
 		      &mt('Select').'" name="cm"></td>');
 	} else {
 	    $r->print('<td>&nbsp;</td>');
 	}
     }
-    $r->print('<td colspan="4"><font color="'.$tfont.'">'.&mt('No role specified').
+    $r->print('<td colspan="3"><font color="'.$tfont.'">'.&mt('No role specified').
       '</font></td><td><font color="'.$tfont.'">'.$tremark.
       '&nbsp;</font></td></tr>'."\n");
 
@@ -765,40 +795,50 @@ sub role_status {
 sub build_roletext {
     my ($trolecode,$tdom,$trest,$tstatus,$tryagain,$advanced,$tremark,$tbg,$tfont,$trole,$ttype,$twhere,$tpstart,$tpend,$nochoose,$button,$switchserver) = @_;
     my $roletext='<tr bgcolor="'.$tbg.'">';
+    my $is_dc=($trolecode =~ m/^dc\./);
+    my $rowspan=($is_dc) ? ''
+                         : ' rowspan="2" ';
+
     unless ($nochoose) {
+        my $buttonname=$trolecode;
+        $buttonname=~s/\W//g;
         if (!$button) {
             if ($switchserver) {
-                $roletext.='<td><a href="/adm/switchserver?'.
+                $roletext.='<td'.$rowspan.'><a href="/adm/switchserver?'.
                 $switchserver.'">'.&mt('Switch Server').'</a></td>';
             } else {
                 $roletext.=('<td>&nbsp;</td>');
             }
         } elsif ($tstatus eq 'is') {
-            $roletext.=('<td><input type=submit value="'.
-                        &mt('Select').'" name="'.
-                        $trolecode.'"></td>');
+            $roletext.='<td'.$rowspan.'><input name="'.$buttonname.'" type="button" value="'.
+                        &mt('Select').'" onClick="javascript:enterrole(this.form,\''.
+                        $trolecode."','".$buttonname.'\');"></td>';
         } elsif ($tryagain) {
             $roletext.=
-                '<td><input type=submit value="'.
-                &mt('Try Selecting Again').'" name="'.$trolecode.'"></td>';
+                '<td'.$rowspan.'><input name="'.$buttonname.'" type="button" value="'.
+                &mt('Try Selecting Again').'" onClick="javascript:enterrole(this.form,\''.
+                        $trolecode."','".$buttonname.'\');"></td>';
         } elsif ($advanced) {
             $roletext.=
-                '<td><input type=submit value="'.
-                &mt('Re-Initialize').'" name="'.$trolecode.'"></td>';
+                '<td'.$rowspan.'><input name="'.$buttonname.'" type="button" value="'.
+                &mt('Re-Initialize').'" onClick="javascript:enterrole(this.form,\''.
+                        $trolecode."','".$buttonname.'\');"></td>';
         } else {
-            $roletext.='<td>&nbsp;</td>';
+            $roletext.='<td'.$rowspan.'>&nbsp;</td>';
         }
     }
     $tremark.=&Apache::lonannounce::showday(time,1,
                  &Apache::lonannounce::readcalendar($tdom.'_'.$trest));
 
-
     $roletext.='<td><font color="'.$tfont.'">'.$trole.
 	       '</font></td><td><font color="'.$tfont.'">'.$twhere.
                '</font></td><td><font color="'.$tfont.'">'.$tpstart.
                '</font></td><td><font color="'.$tfont.'">'.$tpend.
-               '</font></td><td><font color="'.$tfont.'">'.$tremark.
-               '&nbsp;</font></td></tr>'."\n";
+               '</font></td></tr>';
+    if (!$is_dc) {
+	$roletext.='<tr bgcolor="'.$tbg.'"><td colspan="4"><font color="'.$tfont.'">'.$tremark.
+	    '&nbsp;</font></td></tr><tr><td colspan="5" height="3"></td></tr>'."\n";
+    }
     return $roletext;
 }
 
@@ -837,13 +877,13 @@ sub check_fordc {
 }
 
 sub courselink {
-    my ($dcdom) = @_;
+    my ($dcdom,$rowtype) = @_;
     my $courseform=&Apache::loncommon::selectcourse_link
-                     ('rolechoice','dccourse_'.$dcdom,'dcdomain_'.$dcdom,'coursedesc_'.$dcdom,$dcdom);
-    my $hiddenitems = '<input type="hidden" name="dcdomain_'.$dcdom.'" value="'.$dcdom.'" />'.
-                      '<input type="hidden" name="origdom_'.$dcdom.'" value="'.$dcdom.'" />'.
-                      '<input type="hidden" name="dccourse_'.$dcdom.'" value="" />'.
-                      '<input type="hidden" name="coursedesc_'.$dcdom.'" value="" />';
+                     ('rolechoice','dccourse'.$rowtype.'_'.$dcdom,'dcdomain'.$rowtype.'_'.$dcdom,'coursedesc'.$rowtype.'_'.$dcdom,$dcdom);
+    my $hiddenitems = '<input type="hidden" name="dcdomain'.$rowtype.'_'.$dcdom.'" value="'.$dcdom.'" />'.
+                      '<input type="hidden" name="origdom'.$rowtype.'_'.$dcdom.'" value="'.$dcdom.'" />'.
+                      '<input type="hidden" name="dccourse'.$rowtype.'_'.$dcdom.'" value="" />'.
+                      '<input type="hidden" name="coursedesc'.$rowtype.'_'.$dcdom.'" value="" />';
     return $courseform.$hiddenitems;
 }
 
@@ -884,34 +924,26 @@ END
 }
 
 sub processpick {
-    my $dcdom = shift;
     my $process_pick = <<"END";
 <script>
 function process_pick(dom) {
-    var numbutton = getIndex(dom)
-    var pickedCourse = opener.document.rolechoice.dccourse_$dcdom.value
-    var pickedDomain = opener.document.rolechoice.dcdomain_$dcdom.value
-    if (opener.document.rolechoice.dcdomain_$dcdom.value == opener.document.rolechoice.origdom_$dcdom.value) {
+    var pickedCourse=opener.document.rolechoice.$env{'form.cnumelement'}.value;
+    var pickedDomain=opener.document.rolechoice.$env{'form.cdomelement'}.value;
+    var okDomain = 0;
+
+    if (pickedDomain == dom) {
         if (pickedCourse != '') {
-            if (numbutton != -1) {
-                var courseTarget = "cc./"+pickedDomain+"/"+pickedCourse
-                opener.document.rolechoice.elements[numbutton+1].name = courseTarget
-                opener.document.rolechoice.submit()
-            }
+            var courseTarget = "cc./"+pickedDomain+"/"+pickedCourse
+            opener.document.title='Role selected. Please stand by.';
+            opener.status='Role selected. Please stand by.';
+	    opener.document.rolechoice.newrole.value=courseTarget
+            opener.document.rolechoice.submit()
         }
+    } else {
+        alert("You may only use this screen to select courses in the current domain: "+dom+"\\nPlease return to the roles page window and click the 'Select Course' link for domain: "+pickedDomain+",\\n if you are a Domain Coordinator in that domain, and wish to become a Course Coordinator in a course in the domain");
     }
 }
  
-function getIndex(dom) {
-    var callername = 'ccpick_'+dom
-    for (var i=0;i<opener.document.rolechoice.elements.length;i++) {
-        var elemname = opener.document.rolechoice.elements[i].name
-        if (elemname == callername) {
-            return i;
-        }
-    }
-    return -1;
-}
 </script>
 END
     return $process_pick;
@@ -948,22 +980,15 @@ sub display_cc_role {
 }
 
 sub allcourses_row {
-    my $dcdom = shift;
+    my ($dcdom,$rowtype) = @_;
     my $ccrole = Apache::lonnet::plaintext('cc');
-    my $selectlink = &courselink($dcdom);
-    my $output = '<tr bgcolor="#99FF99">'.
-              '<td><input type="button" value="'.
-              &mt('Select').'" name="ccpick_'.$dcdom.'"'.
-              'onClick="verifyCoursePick(this)">'.
-              '<input type="hidden" name="pick_'.$dcdom.'" value="1"></td>'.
-              '<td><font color="#002200">'.
-              $ccrole.'</font></td>'.
-              '<td><font color="#002200">'.&mt('All courses').':<b>&nbsp;'.
-              $selectlink.'</b>'.
-              '<br />'.&mt('Domain').':'.$dcdom.'</font>'.
-              '<td colspan="3"><font color="#002200">'.
-              &mt('Course Coordinator access to all courses in domain').
-              ': <b>'.$dcdom.'</b></font></td></tr>'."\n";
+    my $selectlink = &courselink($dcdom,$rowtype);
+    my $output = '<tr bgcolor="#77FF77">'.
+	'<td colspan="5">'.
+	'<font color="#002200">'.$ccrole.'</font>'.
+	' <b>'.$selectlink.'</b>'.
+	' from '.&mt('Domain').' '.$dcdom.
+	'<tr><td colspan="5" height="3"></td></tr>'."\n";
     return $output;
 }
 
@@ -1001,6 +1026,23 @@ sub set_privileges {
     &Apache::lonnet::appenv('request.role.adv'    => $tadv);
 }
 
+sub courseloadpage {
+    my ($courseid) = @_;
+    my $startpage;
+    my %entry_settings = &Apache::lonnet::get('nohist_whatsnew',
+					      [$courseid.':courseinit']);
+    my ($tmp) = %entry_settings;
+    unless ($tmp =~ /^error: 2 /) {
+        $startpage = $entry_settings{$courseid.':courseinit'};
+    }
+    if ($startpage eq '') {
+        if (exists($env{'environment.course_init_display'})) {
+            $startpage = $env{'environment.course_init_display'};
+        }
+    }
+    return $startpage;
+}
+
 1;
 __END__
 

	'.&mt('User Role').'	'.&mt('Extent'). - '	'.&mt('Start').'
'.&mt('Start').'	'.&mt('End').'
". + $r->print("
". &mt('Recent Roles')."
".&mt($type)."
".&mt($type)."
		'.&mt('No role specified'). + $r->print('		'.&mt('No role specified'). '			'.$tremark. '
'.&mt('Switch Server').'				'.$trole. '	'.$twhere. '	'.$tpstart. '	'.$tpend. - '	'.$tremark. - '
'.$tremark. + '

'. - '	'. - $ccrole.'	'.&mt('All courses').': '. - $selectlink.''. - ' '.&mt('Domain').':'.$dcdom.''. - '	'. - &mt('Course Coordinator access to all courses in domain'). - ': '.$dcdom.'
'. + ''.$ccrole.''. + ' '.$selectlink.''. + ' from '.&mt('Domain').' '.$dcdom. + '