');
unless ($nochoose) { $r->print('| | '); }
$r->print(''.&mt('User Role').' | '.&mt('Extent').
' | '.&mt('Start').' | '.&mt('End').' |
'."\n");
my $doheaders=-1;
- foreach my $type ('Domain','Construction Space','Course','System') {
+ foreach my $type ('Domain','Construction Space','Course','Group','Unavailable','System') {
my $haverole=0;
foreach my $which (sort {uc($a) cmp uc($b)} (keys(%sortrole))) {
if ($roleclass{$sortrole{$which}} =~ /^\Q$type\E/) {
@@ -652,7 +683,7 @@ ENDHEADER
$r->print(&coursepick_jscript());
$r->print(&Apache::loncommon::coursebrowser_javascript());
}
- foreach my $type ('Construction Space','Domain','Course','System') {
+ foreach my $type ('Construction Space','Domain','Course','Group','Unavailable','System') {
my $output;
foreach my $which (sort {uc($a) cmp uc($b)} (keys(%sortrole))) {
if ($roleclass{$sortrole{$which}} =~ /^\Q$type\E/) {
@@ -715,9 +746,12 @@ ENDHEADER
$twhere='User: '.$trest.', Domain: '.$tdom;
} else {
$ttype='Course';
+ if (defined($env{'course.'.$tdom.'_'.$trest.'.type'})) {
+ $ttype = $env{'course.'.$tdom.'_'.$trest.'.type'};
+ }
$twhere=$env{'course.'.$tdom.'_'.$trest.'.description'};
if ($tsec) {
- $twhere.=' (Section/Group: '.$tsec.')';
+ $twhere.=' (Section: '.$tsec.')';
}
}
} elsif ($tdom) {
@@ -787,7 +821,7 @@ 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 ($trolecode,$tdom,$trest,$tstatus,$tryagain,$advanced,$tremark,$tbg,$tfont,$trole,$twhere,$tpstart,$tpend,$nochoose,$button,$switchserver) = @_;
my $roletext='';
my $is_dc=($trolecode =~ m/^dc\./);
my $rowspan=($is_dc) ? ''
@@ -872,9 +906,11 @@ sub check_fordc {
}
sub courselink {
- my ($dcdom,$rowtype) = @_;
+ my ($dcdom,$rowtype,$selecttype) = @_;
my $courseform=&Apache::loncommon::selectcourse_link
- ('rolechoice','dccourse'.$rowtype.'_'.$dcdom,'dcdomain'.$rowtype.'_'.$dcdom,'coursedesc'.$rowtype.'_'.$dcdom,$dcdom);
+ ('rolechoice','dccourse'.$rowtype.'_'.$dcdom,
+ 'dcdomain'.$rowtype.'_'.$dcdom,'coursedesc'.$rowtype.'_'.
+ $dcdom,$dcdom,undef,$selecttype);
my $hiddenitems = ''.
''.
''.
@@ -953,8 +989,8 @@ sub display_cc_role {
if ($rolekey =~ m-^user\.role.cc\./(\w+)/(\w+)$-) {
my $tcourseid = $1.'_'.$2;
my $trolecode = 'cc./'.$1.'/'.$2;
- my $trole = Apache::lonnet::plaintext('cc');
my $twhere;
+ my $ttype;
my $tbg='#77FF77';
my $tfont='#003300';
my %newhash=&Apache::lonnet::coursedescription($tcourseid);
@@ -963,33 +999,37 @@ sub display_cc_role {
' '.
&Apache::loncommon::syllabuswrapper(&mt('Syllabus'),$2,$1,$tfont).
'';
+ $ttype = $newhash{'type'};
} else {
$twhere=&mt('Currently not available');
$env{'course.'.$tcourseid.'.description'}=$twhere;
}
+ my $trole = &Apache::lonnet::plaintext('cc',$ttype);
$twhere.="
".&mt('Domain').":".$1;
- $roletext = &build_roletext($trolecode,$1,$2,'is',$tryagain,$advanced,'',$tbg,$tfont,$trole,&mt('Course'),$twhere,'','','',1,'');
+ $roletext = &build_roletext($trolecode,$1,$2,'is',$tryagain,$advanced,'',$tbg,$tfont,$trole,$twhere,'','','',1,'');
}
}
- return $roletext;
+ return ($roletext);
}
sub allcourses_row {
my ($dcdom,$rowtype) = @_;
- my $ccrole = Apache::lonnet::plaintext('cc');
- my $selectlink = &courselink($dcdom,$rowtype);
my $output = '
'.
- '| '.
- ''.$ccrole.''.
- ' '.$selectlink.''.
- ' from '.&mt('Domain').' '.$dcdom.
- ' |
|
'."\n";
+ ' ';
+ foreach my $type ('Course','Group') {
+ my $selectlink = &courselink($dcdom,$rowtype,$type);
+ my $ccrole = &Apache::lonnet::plaintext('cc',$type);
+ $output.= ''.$ccrole.''.
+ ' '.$selectlink.''.
+ ' from '.&mt('Domain').' '.$dcdom.'
';
+ }
+ $output .= ' | |
'."\n";
return $output;
}
sub recent_filename {
my $area=shift;
- return 'nohist_recent_'.&Apache::lonnet::escape($area);
+ return 'nohist_recent_'.&escape($area);
}
sub set_privileges {