--- loncom/interface/Attic/londropadd.pm	2005/04/07 06:56:23	1.127
+++ loncom/interface/Attic/londropadd.pm	2006/02/07 16:21:26	1.135
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to drop and add students in courses 
 #
-# $Id: londropadd.pm,v 1.127 2005/04/07 06:56:23 albertel Exp $
+# $Id: londropadd.pm,v 1.135 2006/02/07 16:21:26 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('<input type="button" value="Reverse Association" '.
               'name="'.&mt('Reverse Association').'" '.
               'onClick="javascript:this.form.associate.value=\'Reverse Association\';submit(this.form);" />');
-    $r->print('<input type="checkbox" name="noFirstLine" $checked />'.
-              &mt('Ignore First Line'));
+    $r->print('<label><input type="checkbox" name="noFirstLine" $checked />'.
+              &mt('Ignore First Line').'</label>');
     $r->print("<hr />\n".
               '<script type="text/javascript" language="Javascript">'."\n".
               $javascript."\n".$javascript_validations.'</script>');
@@ -607,6 +628,7 @@ sub print_upload_manager_footer {
     $Str .= '<h3>'.&mt('Login Type')."</h3>\n";
     $Str .= "<p>\n".
         &mt('Note: this will not take effect if the user already exists').
+	&Apache::loncommon::help_open_topic('Auth_Options').
         "</p><p>\n";
     $Str .= $krbform."\n</p><p>\n".
         $intform."\n</p><p>\n".
@@ -616,14 +638,14 @@ sub print_upload_manager_footer {
     $Str .= "<h3>".&mt('Starting and Ending Dates')."</h3>\n";
     $Str .= "<p>\n".$date_table."</p>\n";
     $Str .= "<h3>".&mt('Full Update')."</h3>\n";
-    $Str .= '<input type="checkbox" name="fullup" value="yes">'.
+    $Str .= '<label><input type="checkbox" name="fullup" value="yes">'.
         ' '.&mt('Full update (also print list of users not enrolled anymore)').
-        "</p>\n";
+        "</label></p>\n";
     $Str .= "<h3>".&mt('Student Number')."</h3>\n";
-    $Str .= "<p>\n".'<input type="checkbox" name="forceid" value="yes">';
+    $Str .= "<p>\n".'<label><input type="checkbox" name="forceid" value="yes">';
     $Str .= &mt('Disable ID/Student Number Safeguard and Force Change '.
                 'of Conflicting IDs (only do if you know what you are doing)').
-                "\n</p><p>\n";
+                "</label>\n</p><p>\n";
     $Str .= '<input type="button" onClick="javascript:verify(this.form)" '.
         'value="Update Class List" />'."<br />\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 = '<nobr>'.
-        '<input type="checkbox" name="makedatesdefault" /> '.
-        &mt('make these dates the default for future enrollment');
+        '<label><input type="checkbox" name="makedatesdefault" /> '.
+        &mt('make these dates the default for future enrollment').'</label>';
     if ($mode eq 'create_enrolldates' || $mode eq 'create_defaultdates') {
         $dateDefault = '&nbsp;';
     }
-    my $perpetual = '<nobr><input type="checkbox" name="no_end_date"';
+    my $perpetual = '<nobr><label><input type="checkbox" name="no_end_date"';
     if (defined($endtime) && $endtime == 0) {
         $perpetual .= ' checked';
     }
-    $perpetual.= ' /> '.&mt('no ending date').'</nobr>';
+    $perpetual.= ' /> '.&mt('no ending date').'</label></nobr>';
     if ($mode eq 'create_enrolldates') {
         $perpetual = '&nbsp;';
     }
@@ -986,6 +1008,7 @@ sub print_enroll_single_student_form {
 		       'psam' => "Please select an authentication mechanism",
                        'mail' => "Email Address"
 					   );
+	my $authhelp=&Apache::loncommon::help_open_topic('Auth_Options');
         $user_data_html = <<END;
 <h3>$lt{'udf'} $username\@$domain</h3>
 <table>
@@ -1003,7 +1026,7 @@ sub print_enroll_single_student_form {
     <td><input type="text" name="emailaddress" size="20" /></td></tr>
 </table>
 <h3>$lt{'pswd'}</h3>
-$lt{'psam'}
+$lt{'psam'}$authhelp
 <table>
 <p>
 $krbform
@@ -1115,8 +1138,10 @@ $date_table
 <p>
 $lt{'idsn'}: <input type="text" name="cstid" size="10">
 </p><p>
+<label>
 <input type="checkbox" name="forceid" value="yes"> 
 $lt{'disn'}
+</label>
 </p><p>
 <input type="button" onClick="verify(this.form)" value="$lt{'eas'}">
 </p>
@@ -1233,6 +1258,11 @@ sub show_class_list {
     if ($sortby !~ /^(username|domain|section|fullname|id|start|end|type)$/) {
         $sortby = 'username';
     }
+    if (! exists($env{'form.displayphotos'})) {
+        $env{'form.displayphotos'} = 'off';
+    }
+    my $displayphotos = $env{'form.displayphotos'};
+
     # Print out header 
     unless ($mode eq 'autoenroll') {
         $r->print(<<END);
@@ -1241,6 +1271,7 @@ END
     }
     $r->print(<<END);
 <input type="hidden" name="sortby" value="$sortby" />
+<input type="hidden" name="displayphotos" value="$displayphotos" />
 END
     if ($mode eq 'html' || $mode eq 'view' || $mode eq 'autoenroll') {
         if ($linkto eq 'aboutme') {
@@ -1255,7 +1286,8 @@ END
                                            'sec'    => "section",
                                            'start'  => "start date",
                                            'end'    => "end date",
-                                           'type'   => "enroll type/action"
+                                           'type'   => "enroll type/action",
+                                           'photo'  => "photo",
 					   );
         unless ($mode eq 'autoenroll') {
             $r->print(<<END);
@@ -1263,6 +1295,19 @@ END
 <input type="hidden" name="sdom"   value="" />
 END
         }
+        if ($env{'course.'.$env{'request.course.id'}.'.internal.showphotos'}) {
+            $r->print('
+<script type="text/javascript">
+function photowindow(photolink) {
+    var title = "Photo_Viewer";
+    var options = "scrollbars=1,resizable=1,menubar=0";
+    options += ",width=240,height=240";
+    stdeditbrowser = open(photolink,title,options,"1");
+    stdeditbrowser.focus();
+}
+</script>
+           ');
+        }
         $r->print("
 <p>
 <table border=2>
@@ -1293,8 +1338,23 @@ END
     </th><th>
        <a href="javascript:document.studentform.sortby.value='end';document.studentform.submit();">$lt{'end'}</a>
     </th>
-  </tr>
 END
+        if ($env{'course.'.$env{'request.course.id'}.'.internal.showphotos'}) {
+            my %photo_options = &Apache::lonlocal::texthash(
+                                                            'on' => 'Show',
+                                                            'off' => 'Hide',
+                                                            );
+            my $photochg = 'on';
+            if ($displayphotos eq 'on') {
+                $photochg = 'off';
+            }
+            $r->print('    <th>'."\n".'     '. 
+            '<a href="javascript:document.studentform.displayphotos.value='.
+                      "'".$photochg."'".';document.studentform.submit();">'.
+                      $photo_options{$photochg}.'</a>&nbsp;'.$lt{'photo'}."\n".
+                      '    </th>'."\n");
+        }
+        $r->print("  </tr>\n");
     } elsif ($mode eq 'csv') {
 	#
 	# Open a file
@@ -1391,16 +1451,16 @@ END
                 $studentcount++;
                 my $cellentry;
                 if ($type eq 'auto') {
-                    $cellentry = '<b>'.&mt('auto').'</b>&nbsp;<input type="checkbox" name="chgauto" value="'.$username.':'.$domain.'" />&nbsp;Change';
+                    $cellentry = '<b>'.&mt('auto').'</b>&nbsp;<label><input type="checkbox" name="chgauto" value="'.$username.':'.$domain.'" />&nbsp;Change</label>';
                     $autocount ++;
                 } else {
-                    $cellentry = '<table border="0" cellspacing="0"><tr><td rowspan="2"><b>'.&mt('manual').'</b></td><td><nobr><input type="checkbox" name="chgmanual" value="'.$username.':'.$domain.'" />&nbsp;Change</nobr></td></tr><tr><td><nobr>';
+                    $cellentry = '<table border="0" cellspacing="0"><tr><td rowspan="2"><b>'.&mt('manual').'</b></td><td><nobr><label><input type="checkbox" name="chgmanual" value="'.$username.':'.$domain.'" />&nbsp;Change</label></nobr></td></tr><tr><td><nobr>';
                     $manualcount ++;
                     if ($lockedtype) {
-                        $cellentry .= '<input type="checkbox" name="unlockchg" value="'.$username.':'.$domain.'" />&nbsp;'.&mt('Unlock');
+                        $cellentry .= '<label><input type="checkbox" name="unlockchg" value="'.$username.':'.$domain.'" />&nbsp;'.&mt('Unlock').'</label>';
                         $unlockcount ++;
                     } else {
-                        $cellentry .= '<input type="checkbox" name="lockchg" value="'.$username.':'.$domain.'" />&nbsp;'.&mt('Lock');
+                        $cellentry .= '<label><input type="checkbox" name="lockchg" value="'.$username.':'.$domain.'" />&nbsp;'.&mt('Lock').'</label>';
                         $lockcount ++;
                     }
                     $cellentry .= '</nobr></td></tr></table>';
@@ -1432,8 +1492,21 @@ END
     <td>$section</td>
     <td>$start</td>
     <td>$end</td>
-   </tr>
 END
+            if ($env{'course.'.$env{'request.course.id'}.
+			 '.internal.showphotos'}) {
+                if ($displayphotos eq 'on') {
+                    my $imgurl = 
+			&Apache::lonnet::retrievestudentphoto($domain,
+							      $username,'gif',
+							      'thumbnail');
+                
+                    $r->print('    <td align="right"><a href="javascript:photowindow('."'".&Apache::lonnet::studentphoto($domain,$username,'jpg')."'".')"><img src="'.$imgurl.'" border="1"></a></td>');
+                } else {
+                    $r->print('    <td>&nbsp;</td>  ');
+                }
+            }
+            $r->print('  </tr>  ');
         } elsif ($mode eq 'csv') {
             next if (! defined($CSVfile));
             # no need to bother with $linkto
@@ -1460,9 +1533,13 @@ END
                                           $name,$section]);
             my $col = 5;
             foreach my $time ($start,$end) {
-                $excel_sheet->write($row,$col++,
+                if (defined($time) && $time != 0) {
+                    $excel_sheet->write($row,$col++,
                                    &Apache::lonstathelpers::calc_serial($time),
                                     $format->{'date'});
+                } else {
+                    $excel_sheet->write($row,$col++,'none');
+                }                    
             }
             $excel_sheet->write($row,$col++,$status);
             $row++;
@@ -1588,8 +1665,10 @@ $info{'lastname'} $info{'generation'}, $
 </p><p>
 <b>$lt{'sid'}</b>: <input type="text" name="id" value="$info{'id'}" size="12"/>
 </p><p>
+<label>
 <input type="checkbox" name="forceid" > 
 $lt{'disn'}
+</label>
 </p><p>
 <b>$lt{'sec'}</b>: <input type="text" name="section" value="$section" size="14"/>
 </p>
@@ -1969,8 +2048,8 @@ sub print_first_courselist_upload_form {
     $str .= "<p>\n";
     $str .= '<input type="submit" name="fileupload" value="'.
         &mt('Upload class list').'">'."\n";
-    $str .= '<input type="checkbox" name="noFirstLine" /> '.
-        &mt('Ignore First Line')."</p>\n";
+    $str .= '<label><input type="checkbox" name="noFirstLine" /> '.
+        &mt('Ignore First Line')."</label></p>\n";
     $str .= &Apache::loncommon::help_open_topic("Course_Create_Class_List",
                          &mt("How do I create a class list from a spreadsheet")).
                              "<br />\n";
@@ -2208,12 +2287,7 @@ sub upfile_drop_add {
 sub drop_student_list {
     my $r=shift;
     my $count=0;
-    my @droplist;
-    if (ref($env{'form.droplist'})) {
-        @droplist = @{$env{'form.droplist'}};
-    } else {
-        @droplist = ($env{'form.droplist'});
-    }
+    my @droplist = &Apache::loncommon::get_env_multiple('form.droplist');
     foreach (@droplist) {
         my ($uname,$udom)=split(/\:/,$_);
         # drop student
@@ -2284,7 +2358,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; 
     }
     #
@@ -2292,11 +2367,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
     #
@@ -2309,7 +2394,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=',