--- loncom/interface/Attic/londropadd.pm	2004/02/26 22:42:21	1.103
+++ loncom/interface/Attic/londropadd.pm	2004/05/12 20:04:57	1.109
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to drop and add students in courses 
 #
-# $Id: londropadd.pm,v 1.103 2004/02/26 22:42:21 matthew Exp $
+# $Id: londropadd.pm,v 1.109 2004/05/12 20:04:57 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -699,7 +699,7 @@ sub enroll_single_student {
     $ENV{'form.csec'}=~s/\W//g;
     #
     # We do the dates first because the action of making them the defaul
-    # in the course is entirely seperate from the action of enrolling the
+    # in the course is entirely separate from the action of enrolling the
     # student.  Also, a failure in setting the dates as default is not fatal
     # to the process of enrolling / modifying a student.
     my ($startdate,$enddate) = &get_dates_from_form();
@@ -1145,7 +1145,7 @@ sub print_html_classlist {
         foreach my $outputformat ('html','csv','excel') {
             my $option = '<option value="'.$outputformat.'" ';
             if ($outputformat eq $ENV{'form.state'}) {
-                $option .= 'checked ';
+                $option .= 'selected ';
             }
             $option .='>'.$lt{$outputformat}.'</option>';
             $output_selector .= "\n".$option;
@@ -1154,7 +1154,8 @@ sub print_html_classlist {
         $r->print(&mt('Output Format: [_1]',$output_selector).('&nbsp;'x3));
     }
     $r->print(&mt('Student Status: [_1]',$status_select)."\n");
-    $r->print('<input type="submit" value="'.&mt('Refresh Display').'" />'."\n</p>\n");
+    $r->print('<input type="submit" value="'.&mt('Update Display').'" />'.
+              "\n</p>\n");
 
     #
     # Print the classlist
@@ -1183,7 +1184,7 @@ sub show_class_list {
     my $cid=$ENV{'request.course.id'};
     #
     # Variables for excel output
-    my ($excel_workbook, $excel_sheet, $excel_filename,$row);
+    my ($excel_workbook, $excel_sheet, $excel_filename,$row,$format);
     #
     # Variables for csv output
     my ($CSVfile,$CSVfilename);
@@ -1194,9 +1195,9 @@ sub show_class_list {
     }
     # Print out header 
     $r->print(<<END);
+
+<input type="hidden" name="state" value="$ENV{'form.state'}" />
 <input type="hidden" name="sortby" value="$sortby" />
-<input type="hidden" name="sname"  value="" />
-<input type="hidden" name="sdom"   value="" />
 END
     if ($mode eq 'view') {
         if ($linkto eq 'aboutme') {
@@ -1211,13 +1212,12 @@ END
                        'sec'    => "section",
 					   );
         $r->print(<<END);
-
-<input type="hidden" name="sortby" value="$sortby" />
 <input type="hidden" name="sname"  value="" />
 <input type="hidden" name="sdom"   value="" />
 <p>
 <table border=2>
-<tr><th>
+<tr><th>Count
+    </th><th>
        <a href="javascript:document.studentform.sortby.value='username';document.studentform.submit();">$lt{'usrn'}</a>
     </th><th>
        <a href="javascript:document.studentform.sortby.value='domain';document.studentform.submit();">$lt{'dom'}</a>
@@ -1267,14 +1267,16 @@ END
         $excel_workbook = Spreadsheet::WriteExcel->new('/home/httpd'.
                                                        $excel_filename);
         $excel_workbook->set_tempdir('/home/httpd/perl/tmp');
+        #
+        $format = &Apache::loncommon::define_excel_formats($excel_workbook);
         $excel_sheet = $excel_workbook->addworksheet('classlist');
         #
         my $description = 'Class List for '.
             $ENV{'course.'.$ENV{'request.course.id'}.'.description'};
-        $excel_sheet->write($row++,0,$description);
+        $excel_sheet->write($row++,0,$description,$format->{'h1'});
         #
         $excel_sheet->write($row++,0,["username","domain","ID",
-                                      "student name","section","status"]);
+                                      "student name","section","status"],$format->{'bold'});
     }
     #
     # Sort the students
@@ -1293,6 +1295,7 @@ END
             ||
         lc($classlist->{$a}->[$third]) cmp lc($classlist->{$b}->[$third])
         } (keys(%$classlist));
+    my $studentcount = 0;
     foreach my $student (@Sorted_Students) {
         my $username = $classlist->{$student}->[$index{'username'}];
         my $domain   = $classlist->{$student}->[$index{'domain'}];
@@ -1302,7 +1305,7 @@ END
         my $status   = $classlist->{$student}->[$index{'status'}];
         next if (($statusmode ne 'Any') && ($status ne $statusmode));
         if ($mode eq 'view') {
-            $r->print("<tr>\n    <td>\n        ");
+            $r->print("<tr>\n    <td>".(++$studentcount)."</td><td>\n    ");
             if ($linkto eq 'nothing') {
                 $r->print($username);
             } elsif ($linkto eq 'aboutme') {
@@ -2160,8 +2163,7 @@ sub handler {
     } elsif ($ENV{'form.action'} eq 'upload') {
         &Apache::lonhtmlcommon::add_breadcrumb
             ({href=>'/adm/dropadd?action=upload&state=',
-              text=>"Upload Classlist",
-              faq=>9,bug=>'Instructor Interface',});
+              text=>"Upload Classlist"});
         $r->print(&Apache::lonhtmlcommon::breadcrumbs
                   (undef,'Upload Classlist'));
         if (! exists($ENV{'form.state'})) {
@@ -2180,8 +2182,7 @@ sub handler {
     } elsif ($ENV{'form.action'} eq 'drop') {
         &Apache::lonhtmlcommon::add_breadcrumb
             ({href=>'/adm/dropadd?action=drop',
-              text=>"Drop Students",
-              faq=>9,bug=>'Instructor Interface',});
+              text=>"Drop Students"});
         $r->print(&Apache::lonhtmlcommon::breadcrumbs
                   (undef,'Drop Students'));
         if (! exists($ENV{'form.state'})) {
@@ -2194,8 +2195,7 @@ sub handler {
     } elsif ($ENV{'form.action'} eq 'enrollstudent') {
         &Apache::lonhtmlcommon::add_breadcrumb
             ({href=>'/adm/dropadd?action=enrollstudent',
-              text=>"Enroll Student",
-              faq=>9,bug=>'Instructor Interface',});
+              text=>"Enroll Student"});
         $r->print(&Apache::lonhtmlcommon::breadcrumbs
                   (undef,'Enroll Student'));
         if (! exists($ENV{'form.state'})) {
@@ -2210,8 +2210,7 @@ sub handler {
     } elsif ($ENV{'form.action'} eq 'classlist') {
         &Apache::lonhtmlcommon::add_breadcrumb
             ({href=>'/adm/dropadd?action=classlist',
-              text=>"View Classlist",
-              faq=>9,bug=>'Instructor Interface',});
+              text=>"View Classlist"});
         $r->print(&Apache::lonhtmlcommon::breadcrumbs
                   (undef,'View Classlist'));
         if (! exists($ENV{'form.state'})) {
@@ -2226,8 +2225,7 @@ sub handler {
     } elsif ($ENV{'form.action'} eq 'modifystudent') {
         &Apache::lonhtmlcommon::add_breadcrumb
             ({href=>'/adm/dropadd?action=modifystudent',
-              text=>"Modify Student Data",
-              faq=>9,bug=>'Instructor Interface',});
+              text=>"Modify Student Data"});
         $r->print(&Apache::lonhtmlcommon::breadcrumbs
                   (undef,'Modify Student Data'));
         if (! exists($ENV{'form.state'})) {