--- loncom/interface/Attic/londropadd.pm	2004/02/20 19:44:59	1.102
+++ loncom/interface/Attic/londropadd.pm	2004/05/19 17:53:43	1.112
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to drop and add students in courses 
 #
-# $Id: londropadd.pm,v 1.102 2004/02/20 19:44:59 matthew Exp $
+# $Id: londropadd.pm,v 1.112 2004/05/19 17:53:43 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -37,6 +37,7 @@ use Apache::loncommon();
 use Apache::lonhtmlcommon();
 use Apache::Constants qw(:common :http REDIRECT);
 use Spreadsheet::WriteExcel;
+use Apache::lonstathelpers();
 use Apache::lonlocal;
 
 ###############################################################
@@ -699,7 +700,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();
@@ -1100,7 +1101,7 @@ sub print_drop_menu {
 
 # ============================================== view classlist
 sub print_html_classlist {
-    my $r=shift;
+    my ($r,$mode) = @_;
     if (! exists($ENV{'form.sortby'})) {
         $ENV{'form.sortby'} = 'username';
     }
@@ -1108,111 +1109,117 @@ sub print_html_classlist {
         $ENV{'form.Status'} = 'Active';
     }
     my $status_select = &Apache::lonhtmlcommon::StatusOptions
-        ($ENV{'form.Status'},'studentform');
+        ($ENV{'form.Status'});
     my $cid=$ENV{'request.course.id'};
     my $cdom=$ENV{'course.'.$cid.'.domain'};
     my $cnum=$ENV{'course.'.$cid.'.num'};
-# -------------------------------------------------------- Get course personnel
+    #
+    # List course personnel
     my %coursepersonnel=&Apache::lonnet::get_course_adv_roles($cdom.'/'.$cnum);
-    $r->print('<table border="2">');
-    foreach (sort keys %coursepersonnel) {
-	$r->print('<tr><td>'.$_.'</td><td>');
-        foreach (split(/\,/,$coursepersonnel{$_})) {
-	    my ($puname,$pudom)=split(/\:/,$_);
+    #
+    if (! defined($ENV{'form.output'}) ||
+        $ENV{'form.output'} !~ /^(csv|excel|html)$/ ) {
+        $ENV{'form.output'} = 'html';
+    }
+    #
+    $r->print('<br /><table border="2">');
+    foreach my $role (sort keys %coursepersonnel) {
+        next if ($role =~ /^\s*$/);
+	$r->print('<tr><td>'.$role.'</td><td>');
+        foreach my $user (split(',',$coursepersonnel{$role})) {
+	    my ($puname,$pudom)=split(':',$user);
 	    $r->print(' '.&Apache::loncommon::aboutmewrapper(
-                          &Apache::loncommon::plainname($puname,
-                          $pudom),$puname,$pudom));
+                                    &Apache::loncommon::plainname($puname,
+                                                                  $pudom),
+                                                             $puname,$pudom));
 	}
         $r->print('</td></tr>');
     }
     $r->print('</table>');
-# --------------------------------------------------------------- Student roles
-    my $CCL=&mt('Current Class List');
-    $r->print(<<END);
-<input type="hidden" name="action" value="$ENV{'form.action'}" />
-<input type="hidden" name="state"  value="" />
-<p>
-<font size="+1">$CCL</font>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-END
+    #
+    # Interface output
+    $r->print('<input type="hidden" name="action" value="'.
+              $ENV{'form.action'}.'" />');
+    $r->print("<p>\n");
     if ($ENV{'form.action'} ne 'modifystudent') {
-	my %lt=&Apache::lonlocal::texthash(
-		   'ef'   => "Excel format",
-                   'ss'   => "Student Status",
-					   );
-        $r->print(<<END);
-<font size="+1">
-<a href="javascript:document.studentform.state.value='csv';document.studentform.submit();">CSV format</a>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-<a href="javascript:document.studentform.state.value='excel';document.studentform.submit();">$lt{'ef'}</a>
-</font>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-$lt{'ss'}:
-END
+	my %lt=&Apache::lonlocal::texthash('csv' => "CSV",
+                                           'excel' => "Excel",
+                                           'html'  => 'HTML');
+        my $output_selector = '<select size="1" name="output" >';
+        foreach my $outputformat ('html','csv','excel') {
+            my $option = '<option value="'.$outputformat.'" ';
+            if ($outputformat eq $ENV{'form.output'}) {
+                $option .= 'selected ';
+            }
+            $option .='>'.$lt{$outputformat}.'</option>';
+            $output_selector .= "\n".$option;
+        }
+        $output_selector .= '</select>';
+        $r->print(&mt('Output Format: [_1]',$output_selector).('&nbsp;'x3));
     }
-    $r->print($status_select."</p>\n");
+    $r->print(&mt('Student Status: [_1]',$status_select)."\n");
+    $r->print('<input type="submit" value="'.&mt('Update Display').'" />'.
+              "\n</p>\n");
+    #
+    # Print the classlist
+    $r->print('<h2>'.&mt('Current Class List').'</h2>');
     my ($classlist,$keylist)=&Apache::loncoursedata::get_classlist();
     if (! defined($classlist)) {
         $r->print(&mt('There are no students currently enrolled.')."\n");
     } else {
         # Print out the available choices
         if ($ENV{'form.action'} eq 'modifystudent') {
-            &show_class_list($r,'view','modify','modifystudent',
+            &show_class_list($r,'view','modify',
                              $ENV{'form.Status'},$classlist,$keylist);
         } else {
-            &show_class_list($r,'view','aboutme','classlist',
+            &show_class_list($r,$ENV{'form.output'},'aboutme',
                              $ENV{'form.Status'},$classlist,$keylist);
         }
     }
 }
 
-# ============================================== view classlist
-sub print_formatted_classlist {
-    my $r=shift;
-    my $mode = shift;
-    my $cid=$ENV{'request.course.id'};
-    my ($classlist,$keylist)=&Apache::loncoursedata::get_classlist();
-    if (! defined($classlist)) {
-        $r->print(&mt('There are no students currently enrolled.')."\n");
-    } else {
-        &show_class_list($r,$mode,'nolink','csv',
-                         $ENV{'form.Status'},$classlist,$keylist);
-    }
-}
-
 # =================================================== Show student list to drop
 sub show_class_list {
-    my ($r,$mode,$linkto,$action,$statusmode,$classlist,$keylist)=@_;
+    my ($r,$mode,$linkto,$statusmode,$classlist,$keylist)=@_;
     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);
     #
     my $sortby = $ENV{'form.sortby'};
-    if ($sortby !~ /^(username|domain|section|fullname|id)$/) {
+    if ($sortby !~ /^(username|domain|section|fullname|id|start|end)$/) {
         $sortby = 'username';
     }
     # Print out header 
-    if ($mode eq 'view') {
+    $r->print(<<END);
+
+<input type="hidden" name="state" value="$ENV{'form.state'}" />
+<input type="hidden" name="sortby" value="$sortby" />
+END
+    if ($mode eq 'html' || $mode eq 'view') {
         if ($linkto eq 'aboutme') {
             $r->print(&mt('Select a user name to view the users personal page.'));
         } elsif ($linkto eq 'modify') {
             $r->print(&mt('Select a user name to modify the students information'));
         }
 	my %lt=&Apache::lonlocal::texthash(
-	               'usrn'   => "username",
-                       'dom'    => "domain",
-                       'sn'     => "student name",
-                       'sec'    => "section",
+                                           'usrn'   => "username",
+                                           'dom'    => "domain",
+                                           'sn'     => "student name",
+                                           'sec'    => "section",
+                                           'start'  => "start date",
+                                           'end'    => "end date",
 					   );
         $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>
@@ -1222,20 +1229,41 @@ sub show_class_list {
        <a href="javascript:document.studentform.sortby.value='fullname';document.studentform.submit();">$lt{'sn'}</a>
     </th><th>
        <a href="javascript:document.studentform.sortby.value='section';document.studentform.submit();">$lt{'sec'}</a>
+    </th><th>
+       <a href="javascript:document.studentform.sortby.value='start';document.studentform.submit();">$lt{'start'}</a>
+    </th><th>
+       <a href="javascript:document.studentform.sortby.value='end';document.studentform.submit();">$lt{'end'}</a>
     </th>
 </tr>
 END
     } elsif ($mode eq 'csv') {
+	#
+	# Open a file
+	$CSVfilename = '/prtspool/'.
+	    $ENV{'user.name'}.'_'.$ENV{'user.domain'}.'_'.
+            time.'_'.rand(1000000000).'.csv';
+	unless ($CSVfile = Apache::File->new('>/home/httpd'.$CSVfilename)) {
+	    $r->log_error("Couldn't open $CSVfilename for output $!");
+	    $r->print("Problems occured in writing the csv file.  ".
+		      "This error has been logged.  ".
+		      "Please alert your LON-CAPA administrator.");
+	    $CSVfile = undef;
+	}
+	#
+	# Write headers and data to file
         if($statusmode eq 'Expired') {
-            $r->print(&mt('Students with expired roles'));
+            print $CSVfile '"'.&mt('Students with expired roles').'"'."\n";
         }
         if ($statusmode eq 'Any') {
-            $r->print('"'.join('","',(&mt("username"),&mt("domain"),"ID",
-                      &mt("student name"),&mt("section"),&mt("status"))).
-                      '"'."\n");
+            print $CSVfile '"'.join('","',map {
+		&Apache::loncommon::csv_translate(&mt($_))
+                } ("username","domain","ID","student name",
+                   "section","start date","end date","status")).'"'."\n";
         } else {
-            $r->print('"'.join('","',(&mt("username"),&mt("domain"),"ID",
-                      &mt("student name"),&mt("section"))).'"'."\n");
+            print $CSVfile '"'.join('","',map {
+		&Apache::loncommon::csv_translate(&mt($_))
+                } ("username","domain","ID","student name",
+                   "section","start date","end date")).'"'."\n";
         }
     } elsif ($mode eq 'excel') {
         # Create the excel spreadsheet
@@ -1245,14 +1273,18 @@ 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",
+                                      "start date","end date","status"],
+                            $format->{'bold'});
     }
     #
     # Sort the students
@@ -1271,16 +1303,22 @@ 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'}];
-        my $section  = $classlist->{$student}->[$index{'section'}];
-        my $name     = $classlist->{$student}->[$index{'fullname'}];
-        my $id       = $classlist->{$student}->[$index{'id'}];
-        my $status   = $classlist->{$student}->[$index{'status'}];
+        my $sdata = $classlist->{$student};
+        my $username = $sdata->[$index{'username'}];
+        my $domain   = $sdata->[$index{'domain'}];
+        my $section  = $sdata->[$index{'section'}];
+        my $name     = $sdata->[$index{'fullname'}];
+        my $id       = $sdata->[$index{'id'}];
+        my $status   = $sdata->[$index{'status'}];
+        my $start    = $sdata->[$index{'start'}];
+        my $end      = $sdata->[$index{'end'}];
         next if (($statusmode ne 'Any') && ($status ne $statusmode));
-        if ($mode eq 'view') {
-            $r->print("<tr>\n    <td>\n        ");
+        if ($mode eq 'view' || $mode eq 'html') {
+            $start = &Apache::lonlocal::locallocaltime($start);
+            $end   = &Apache::lonlocal::locallocaltime($end);
+            $r->print("<tr>\n    <td>".(++$studentcount)."</td><td>\n    ");
             if ($linkto eq 'nothing') {
                 $r->print($username);
             } elsif ($linkto eq 'aboutme') {
@@ -1302,32 +1340,48 @@ END
     <td>$id</td>
     <td>$name</td>
     <td>$section</td>
+    <td>$start</td>
+    <td>$end</td>
 </tr>
 END
         } elsif ($mode eq 'csv') {
+            next if (! defined($CSVfile));
             # no need to bother with $linkto
+            $start = &Apache::lonlocal::locallocaltime($start);
+            $end   = &Apache::lonlocal::locallocaltime($end);
             my @line = ();
-            foreach ($username,$domain,$id,$name,$section) {
+            foreach ($username,$domain,$id,$name,$section,$start,$end) {
                 push @line,&Apache::loncommon::csv_translate($_);
             }
             if ($statusmode eq 'Any') {
                 push @line,&Apache::loncommon::csv_translate($status);
             }
-            my $tmp = $";
-            $" = '","';
-            $r->print("\"@line\"\n");
-            $" = $tmp;
+            print $CSVfile '"'.join('","',@line).'"'."\n";
         } elsif ($mode eq 'excel') {
-            $excel_sheet->write($row++,0,[$username,$domain,$id,
-                                          $name,$section,$status]);
+            $excel_sheet->write($row,0,[$username,$domain,$id,
+                                          $name,$section]);
+            my $col = 5;
+            foreach my $time ($start,$end) {
+                $excel_sheet->write($row,$col++,
+                                   &Apache::lonstathelpers::calc_serial($time),
+                                    $format->{'date'});
+            }
+            $excel_sheet->write($row,$col++,$status);
+            $row++;
         }
     }
-    if ($mode eq 'view') {
+    if ($mode eq 'view' || $mode eq 'html') {
         $r->print('</table><br>');
     } elsif ($mode eq 'excel') {
         $excel_workbook->close();
         $r->print('<p><a href="'.$excel_filename.'">'.
                   &mt('Your Excel spreadsheet').'</a> '.&mt('is ready for download').'.</p>'."\n");
+    } elsif ($mode eq 'csv') {
+        close($CSVfile);
+        $r->print('<a href="'.$CSVfilename.'">'.
+                  &mt('Your CSV file').'</a> is ready for download.'.
+                  "\n");
+        $r->rflush();
     }
 }
 
@@ -1663,7 +1717,7 @@ sub show_drop_list {
                                                 ['sortby']);
     }
     my $sortby = $ENV{'form.sortby'};
-    if ($sortby !~ /^(username|domain|section|fullname|id)$/) {
+    if ($sortby !~ /^(username|domain|section|fullname|id|start|end)$/) {
         $sortby = 'username';
     }
     #
@@ -1687,13 +1741,14 @@ function uncheckAll(field) {
 <input type="hidden" name="phase" value="four">
 END
 
+my %lt=&Apache::lonlocal::texthash('usrn'   => "username",
+                                   'dom'    => "domain",
+                                   'sn'     => "student name",
+                                   'sec'    => "section",
+                                   'start'  => "start date",
+                                   'end'    => "end date",
+                                   );
     if ($nosort) {
-	my %lt=&Apache::lonlocal::texthash(
-	               'usrn'   => "username",
-                       'dom'    => "domain",
-                       'sn'     => "student name",
-                       'sec'    => "section",
-					   );
         $r->print(<<END);
 <table border=2>
 <tr>
@@ -1703,16 +1758,12 @@ END
     <th>ID</th>
     <th>$lt{'sn'}</th>
     <th>$lt{'sec'}</th>
+    <th>$lt{'start'}</th>
+    <th>$lt{'end'}</th>
 </tr>
 END
 
     } else  {
-	my %lt=&Apache::lonlocal::texthash(
-	               'usrn'   => "username",
-                       'dom'    => "domain",
-                       'sn'     => "student name",
-                       'sec'    => "section",
-					   );
         $r->print(<<END);
 <table border=2>
 <tr><th>&nbsp;</th>
@@ -1726,6 +1777,10 @@ END
        <a href="/adm/dropadd?action=$action&sortby=fullname">$lt{'sn'}</a>
     </th><th>
        <a href="/adm/dropadd?action=$action&sortby=section">$lt{'sec'}</a>
+    </th><th>
+       <a href="/adm/dropadd?action=$action&sortby=start">$lt{'start'}</a>
+    </th><th>
+       <a href="/adm/dropadd?action=$action&sortby=end">$lt{'end'}</a>
     </th>
 </tr>
 END
@@ -1749,12 +1804,25 @@ END
         } (keys(%$classlist));
     foreach my $student (@Sorted_Students) {
         my $error;
-        my $username = $classlist->{$student}->[$index{'username'}];
-        my $domain   = $classlist->{$student}->[$index{'domain'}];
-        my $section  = $classlist->{$student}->[$index{'section'}];
-        my $name     = $classlist->{$student}->[$index{'fullname'}];
-        my $id       = $classlist->{$student}->[$index{'id'}];
-        my $status   = $classlist->{$student}->[$index{'status'}];
+        my $sdata = $classlist->{$student};
+        my $username = $sdata->[$index{'username'}];
+        my $domain   = $sdata->[$index{'domain'}];
+        my $section  = $sdata->[$index{'section'}];
+        my $name     = $sdata->[$index{'fullname'}];
+        my $id       = $sdata->[$index{'id'}];
+        my $start    = $sdata->[$index{'start'}];
+        my $end      = $sdata->[$index{'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 $status   = $sdata->[$index{'status'}];
         next if ($status ne 'Active');
         #
         $r->print(<<"END");
@@ -1765,11 +1833,13 @@ END
     <td>$id</td>
     <td>$name</td>
     <td>$section</td>
+    <td>$start</td>
+    <td>$end</td>
 </tr>
 END
     }
     $r->print('</table><br>');
-    my %lt=&Apache::lonlocal::texthash(
+    %lt=&Apache::lonlocal::texthash(
 	               'dp'   => "Drop Students",
                        'ca'   => "check all",
                        'ua'   => "uncheck all",
@@ -2121,14 +2191,10 @@ sub handler {
     #
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
                                             ['state','action']);
-    if (exists($ENV{'form.state'}) && ($ENV{'form.state'} eq 'csv')) {
-        $r->content_type('text/csv');
-    } else {
-        # Start page
-        &Apache::loncommon::content_type($r,'text/html');
-        $r->send_http_header;
-        $r->print(&header());
-    }
+    # Start page
+    &Apache::loncommon::content_type($r,'text/html');
+    $r->send_http_header;
+    $r->print(&header());
     #
     # Main switch on form.action and form.state, as appropriate
     if (! exists($ENV{'form.action'})) {
@@ -2138,8 +2204,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'})) {
@@ -2158,8 +2223,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'})) {
@@ -2172,8 +2236,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'})) {
@@ -2188,24 +2251,22 @@ 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'})) {
-            &print_html_classlist($r);
+            &print_html_classlist($r,undef);
         } elsif ($ENV{'form.state'} eq 'csv') {
-            &print_formatted_classlist($r,'csv');
+            &print_html_classlist($r,'csv');
         } elsif ($ENV{'form.state'} eq 'excel') {
-            &print_formatted_classlist($r,'excel');
+            &print_html_classlist($r,'excel');
         } else {
-            &print_html_classlist($r);
+            &print_html_classlist($r,undef);
         }
     } 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'})) {
@@ -2228,11 +2289,7 @@ sub handler {
     }
     #
     # Finish up
-    if (exists($ENV{'form.state'}) && ($ENV{'form.state'} eq 'csv')) {
-        $r->print("\n");
-    } else {
-        $r->print('</form></body></html>');
-    }
+    $r->print('</form></body></html>');
     return OK;
 }