--- loncom/interface/Attic/londropadd.pm 2005/04/19 03:58:23 1.129 +++ loncom/interface/Attic/londropadd.pm 2005/11/21 19:44:14 1.133 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler to drop and add students in courses # -# $Id: londropadd.pm,v 1.129 2005/04/19 03:58:23 matthew Exp $ +# $Id: londropadd.pm,v 1.133 2005/11/21 19:44:14 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -137,7 +137,8 @@ sub domain_form { ############################################################### # Menu Phase One sub print_main_menu { - my ($r,$enrl_permission,$view_permission)=@_; + my ($r,$enrl_permission,$view_permission,$grp_manage_permission, + $grp_view_permission)=@_; # my ($cdom,$cnum) = split/_/,$env{'request.course.id'}; my @menu = @@ -171,6 +172,26 @@ sub print_main_menu { permission => &Apache::lonnet::auto_run($cnum,$cdom), url => '/adm/populate', }, +# { text => 'Create a new group', +# help => 'Course_Create_Group', +# permission => $grp_manage_permission, +# url => '/adm/coursegroups?refpage=enrl&action=create', +# }, +# { text => 'Modify an existing group', +# help => 'Course_Modify_Group', +# permission => $grp_manage_permission, +# url => '/adm/coursegroups?refpage=enrl&action=modify', +# }, +# { text => 'Delete an existing group', +# help => 'Course_Delete_Group', +# permission => $grp_manage_permission, +# url => '/adm/coursegroups?refpage=enrl&action=delete', +# }, +# { text => 'Enter an existing group', +# help => 'Course_Display_Group', +# permission => $grp_view_permission, +# url => '/adm/coursegroups?refpage=enrl&action=view', +# }, ); my $menu_html = ''; foreach my $menu_item (@menu) { @@ -253,8 +274,8 @@ sub print_upload_manager_header { $r->print(''); - $r->print(''. - &mt('Ignore First Line')); + $r->print(''); $r->print("
\n". &mt('Note: this will not take effect if the user already exists'). + &Apache::loncommon::help_open_topic('Auth_Options'). "
\n"; $Str .= $krbform."\n
\n". $intform."\n
\n". @@ -616,14 +638,14 @@ sub print_upload_manager_footer { $Str .= "
\n".$date_table."
\n"; $Str .= "\n".''; + $Str .= "
\n".'
\n"; + "\n
\n";
$Str .= ''."
$krbform
@@ -1115,8 +1138,10 @@ $date_table
$lt{'idsn'}:
+
$lt{'sid'}:
+
$lt{'sec'}:
\n";
$str .= ''."\n";
- $str .= ' '.
- &mt('Ignore First Line')."
\n";
$Str .= &mt('Note: for large courses, this operation may be time '.
@@ -852,16 +874,16 @@ sub date_setting_table {
my ($starttime,$endtime,$mode) = @_;
my ($startform,$endform)=&setup_date_selectors($starttime,$endtime,$mode);
my $dateDefault = '
@@ -1003,7 +1026,7 @@ sub print_enroll_single_student_form {
$lt{'pswd'}
-$lt{'psam'}
+$lt{'psam'}$authhelp
'.&mt('manual').'
';
@@ -1592,8 +1617,10 @@ $info{'lastname'} $info{'generation'}, $
'.&mt('manual').'
\n";
@@ -2283,7 +2310,8 @@ sub handler {
if (! ($env{'request.course.fn'})) {
# Not in a course
$env{'user.error.msg'}=
- "/adm/dropadd:cst:0:0:Cannot drop or add students";
+ "/adm/dropadd:cst:0:0:Cannot manage or view course groups, ".
+ "or drop or add students";
return HTTP_NOT_ACCEPTABLE;
}
#
@@ -2291,11 +2319,21 @@ sub handler {
&Apache::lonnet::allowed('vcl',$env{'request.course.id'});
my $enrl_permission =
&Apache::lonnet::allowed('cst',$env{'request.course.id'});
- if (! $view_permission && ! $enrl_permission) {
+
+ my $grp_view_permission =
+ &Apache::lonnet::allowed('vcg',$env{'request.course.id'});
+ my $grp_manage_permission =
+ &Apache::lonnet::allowed('mdg',$env{'request.course.id'});
+
+
+ if (! $grp_view_permission && ! $grp_manage_permission &&
+ ! $view_permission && ! $enrl_permission) {
$env{'user.error.msg'}=
- "/adm/dropadd:cst:0:0:Cannot drop or add students";
- return HTTP_NOT_ACCEPTABLE;
+ "/adm/coursegroups:cst:0:0:Cannot manage or view course groups, ".
+ "or drop or add students";
+ return HTTP_NOT_ACCEPTABLE;
}
+
#
# Only output the header information if they did not request csv format
#
@@ -2308,7 +2346,8 @@ sub handler {
if (! exists($env{'form.action'})) {
$r->print(&Apache::lonhtmlcommon::breadcrumbs
(undef,'Enrollment Manager'));
- &print_main_menu($r,$enrl_permission,$view_permission);
+ &print_main_menu($r,$enrl_permission,$view_permission,$grp_manage_permission,
+ $grp_view_permission);
} elsif ($env{'form.action'} eq 'upload' && $enrl_permission) {
&Apache::lonhtmlcommon::add_breadcrumb
({href=>'/adm/dropadd?action=upload&state=',