--- loncom/interface/Attic/londropadd.pm	2005/11/01 20:47:15	1.131
+++ loncom/interface/Attic/londropadd.pm	2006/02/08 23:47:23	1.136
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to drop and add students in courses 
 #
-# $Id: londropadd.pm,v 1.131 2005/11/01 20:47:15 albertel Exp $
+# $Id: londropadd.pm,v 1.136 2006/02/08 23:47:23 raeburn 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) {
@@ -1237,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);
@@ -1245,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') {
@@ -1259,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);
@@ -1267,6 +1295,19 @@ END
 <input type="hidden" name="sdom"   value="" />
 END
         }
+        if ($env{'course.'.$env{'request.course.id'}.'.internal.showphoto'}) {
+            $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>
@@ -1297,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.showphoto'}) {
+            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
@@ -1436,8 +1492,21 @@ END
     <td>$section</td>
     <td>$start</td>
     <td>$end</td>
-   </tr>
 END
+            if ($env{'course.'.$env{'request.course.id'}.
+			 '.internal.showphoto'}) {
+                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
@@ -2289,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; 
     }
     #
@@ -2297,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
     #
@@ -2314,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=',