--- loncom/interface/Attic/londropadd.pm 2004/06/17 18:31:24 1.114 +++ loncom/interface/Attic/londropadd.pm 2004/09/13 16:21:30 1.118 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler to drop and add students in courses # -# $Id: londropadd.pm,v 1.114 2004/06/17 18:31:24 raeburn Exp $ +# $Id: londropadd.pm,v 1.118 2004/09/13 16:21:30 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -924,6 +924,8 @@ sub print_enroll_single_student_form { # my $username = $ENV{'form.cuname'}; my $domain = $ENV{'form.cudomain'}; + $username=~s/[\W|_]//gs; + $domain=~s/[\W|_]//gs; my $home = &Apache::lonnet::homeserver($username,$domain); # $new_user flags whether we are creating a new user or using an old one my $new_user = 1; @@ -1231,8 +1233,7 @@ END 'sec' => "section", 'start' => "start date", 'end' => "end date", - 'type' => "enroll type", - 'chan' => "change" + 'type' => "enroll type/action" ); unless ($mode eq 'autoenroll') { $r->print(< END } - $r->print(<print("

- + "); + if ($mode eq 'autoenroll') { + $r->print(" + + "); + } else { + $r->print(" + + "); + } + $r->print(< $lt{'usrn'} + END - if ($mode eq 'autoenroll') { - $r->print(" "); - } - $r->print(" - - "); } elsif ($mode eq 'csv') { # # Open a file @@ -1337,6 +1341,10 @@ END lc($classlist->{$a}->[$third]) cmp lc($classlist->{$b}->[$third]) } (keys(%$classlist)); my $studentcount = 0; + my $autocount = 0; + my $manualcount = 0; + my $unlockcount = 0; + my $lockcount = 0; foreach my $student (@Sorted_Students) { my $sdata = $classlist->{$student}; my $username = $sdata->[$index{'username'}]; @@ -1347,7 +1355,7 @@ END my $status = $sdata->[$index{'status'}]; my $start = $sdata->[$index{'start'}]; my $end = $sdata->[$index{'end'}]; - my $type = $sdata->[$index{'type'}]; + my $type = $sdata->[$index{'type'}]; next if (($statusmode ne 'Any') && ($status ne $statusmode)); if ($mode eq 'view' || $mode eq 'html' || $mode eq 'autoenroll') { if (! defined($start) || $start == 0) { @@ -1360,7 +1368,30 @@ END } else { $end = &Apache::lonlocal::locallocaltime($end); } - $r->print("\n \n "); + if ($mode eq 'autoenroll') { + my $lockedtype = $sdata->[$index{'lockedtype'}]; + $studentcount++; + my $cellentry; + if ($type eq 'auto') { + $cellentry = ''.&mt('auto').'  Change'; + $autocount ++; + } else { + $cellentry = '
Count - +
$lt{'type'}Count $lt{'dom'} @@ -1259,16 +1271,8 @@ END $lt{'end'}
- $lt{'type'} - - $lt{'chan'}?
".(++$studentcount)."\n "); + $r->print("
'.&mt('manual').' Change
'; + $manualcount ++; + if ($lockedtype) { + $cellentry .= ' '.&mt('Unlock'); + $unlockcount ++; + } else { + $cellentry .= ' '.&mt('Lock'); + $lockcount ++; + } + $cellentry .= '
'; + } + $r->print("$cellentry\n "); + } else { + $r->print("".(++$studentcount)."\n "); + } if ($linkto eq 'nothing') { $r->print($username); } elsif ($linkto eq 'aboutme') { @@ -1384,17 +1415,8 @@ END $section $start $end + END - if ($mode eq 'autoenroll') { - my $longtype = &mt('manual').' '; - if ($type eq 'auto') { - $longtype = &mt('auto').' '; - } - $r->print("$longtype"); - } - $r->print(" - - "); } elsif ($mode eq 'csv') { next if (! defined($CSVfile)); # no need to bother with $linkto @@ -1443,8 +1465,9 @@ END $r->rflush(); } if ($mode eq 'autoenroll') { - return $studentcount; + return ($studentcount,$autocount,$manualcount,$lockcount,$unlockcount); } + return; } @@ -2268,7 +2291,7 @@ sub handler { ({href=>'/adm/dropadd?action=upload&state=', text=>"Upload Classlist"}); $r->print(&Apache::lonhtmlcommon::breadcrumbs - (undef,'Upload Classlist')); + (undef,'Upload Classlist','Course_Create_Class_List')); if (! exists($ENV{'form.state'})) { &print_first_courselist_upload_form($r); } elsif ($ENV{'form.state'} eq 'got_file') { @@ -2287,7 +2310,7 @@ sub handler { ({href=>'/adm/dropadd?action=drop', text=>"Drop Students"}); $r->print(&Apache::lonhtmlcommon::breadcrumbs - (undef,'Drop Students')); + (undef,'Drop Students','Course_Drop_Student')); if (! exists($ENV{'form.state'})) { &print_drop_menu($r); } elsif ($ENV{'form.state'} eq 'done') { @@ -2300,7 +2323,7 @@ sub handler { ({href=>'/adm/dropadd?action=enrollstudent', text=>"Enroll Student"}); $r->print(&Apache::lonhtmlcommon::breadcrumbs - (undef,'Enroll Student')); + (undef,'Enroll Student','Course_Add_Student')); if (! exists($ENV{'form.state'})) { &get_student_username_domain_form($r); } elsif ($ENV{'form.state'} eq 'gotusername') { @@ -2315,7 +2338,7 @@ sub handler { ({href=>'/adm/dropadd?action=classlist', text=>"View Classlist"}); $r->print(&Apache::lonhtmlcommon::breadcrumbs - (undef,'View Classlist')); + (undef,'View Classlist','Course_View_Class_List')); if (! exists($ENV{'form.state'})) { &print_html_classlist($r,undef); } elsif ($ENV{'form.state'} eq 'csv') { @@ -2330,7 +2353,7 @@ sub handler { ({href=>'/adm/dropadd?action=modifystudent', text=>"Modify Student Data"}); $r->print(&Apache::lonhtmlcommon::breadcrumbs - (undef,'Modify Student Data')); + (undef,'Modify Student Data','Course_Modify_Student_Data')); if (! exists($ENV{'form.state'})) { &print_html_classlist($r); } elsif ($ENV{'form.state'} eq 'selected') {