--- loncom/interface/Attic/londropadd.pm 2004/05/19 17:53:43 1.112 +++ loncom/interface/Attic/londropadd.pm 2004/06/17 18:31:24 1.114 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler to drop and add students in courses # -# $Id: londropadd.pm,v 1.112 2004/05/19 17:53:43 matthew Exp $ +# $Id: londropadd.pm,v 1.114 2004/06/17 18:31:24 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -173,10 +173,15 @@ sub print_main_menu { $Text{'drop'} $help{'Course_Drop_Student'}
+END
+ my ($cdom,$cnum) = split/_/,$ENV{'request.course.id'};
+ if (&Apache::lonnet::auto_run($cnum,$cdom) ) {
+ $r->print(<\n";
$result .= '
'.&mt('Starting Date').' '.
@@ -1190,16 +1206,19 @@ sub show_class_list {
my ($CSVfile,$CSVfilename);
#
my $sortby = $ENV{'form.sortby'};
- if ($sortby !~ /^(username|domain|section|fullname|id|start|end)$/) {
+ if ($sortby !~ /^(username|domain|section|fullname|id|start|end|type)$/) {
$sortby = 'username';
}
# Print out header
- $r->print(<
END
+ if ($mode eq 'autoenroll') {
+ $r->print(" Count
@@ -1234,8 +1259,16 @@ END
$lt{'end'}
-
+ $lt{'type'}
+
+ $lt{'chan'}? ");
+ }
+ $r->print("
+
+ ");
} elsif ($mode eq 'csv') {
#
# Open a file
@@ -1314,10 +1347,19 @@ END
my $status = $sdata->[$index{'status'}];
my $start = $sdata->[$index{'start'}];
my $end = $sdata->[$index{'end'}];
+ my $type = $sdata->[$index{'type'}];
next if (($statusmode ne 'Any') && ($status ne $statusmode));
- if ($mode eq 'view' || $mode eq 'html') {
- $start = &Apache::lonlocal::locallocaltime($start);
- $end = &Apache::lonlocal::locallocaltime($end);
+ if ($mode eq 'view' || $mode eq 'html' || $mode eq 'autoenroll') {
+ if (! defined($start) || $start == 0) {
+ $start = &mt('none');
+ } else {
+ $start = &Apache::lonlocal::locallocaltime($start);
+ }
+ if (! defined($end) || $end == 0) {
+ $end = &mt('none');
+ } else {
+ $end = &Apache::lonlocal::locallocaltime($end);
+ }
$r->print("\n
END
+ if ($mode eq 'autoenroll') {
+ my $longtype = &mt('manual').' ';
+ if ($type eq 'auto') {
+ $longtype = &mt('auto').' ';
+ }
+ $r->print("".(++$studentcount)." \n ");
if ($linkto eq 'nothing') {
$r->print($username);
@@ -1342,13 +1384,30 @@ END
$section
$start
$end
-$longtype ");
+ }
+ $r->print("
+
+ ");
} elsif ($mode eq 'csv') {
next if (! defined($CSVfile));
# no need to bother with $linkto
- $start = &Apache::lonlocal::locallocaltime($start);
- $end = &Apache::lonlocal::locallocaltime($end);
+ if (! defined($start) || $start == 0) {
+ $start = &mt('none');
+ } else {
+ $start = &Apache::lonlocal::locallocaltime($start);
+ }
+ if (! defined($end) || $end == 0) {
+ $end = &mt('none');
+ } else {
+ $end = &Apache::lonlocal::locallocaltime($end);
+ }
my @line = ();
foreach ($username,$domain,$id,$name,$section,$start,$end) {
push @line,&Apache::loncommon::csv_translate($_);
@@ -1370,7 +1429,7 @@ END
$row++;
}
}
- if ($mode eq 'view' || $mode eq 'html') {
+ if ($mode eq 'view' || $mode eq 'html' || $mode eq 'autoenroll') {
$r->print('
');
} elsif ($mode eq 'excel') {
$excel_workbook->close();
@@ -1383,6 +1442,9 @@ END
"\n");
$r->rflush();
}
+ if ($mode eq 'autoenroll') {
+ return $studentcount;
+ }
}