--- loncom/auth/lonroles.pm	2022/10/29 18:13:29	1.369
+++ loncom/auth/lonroles.pm	2023/06/20 14:04:02	1.370
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.369 2022/10/29 18:13:29 raeburn Exp $
+# $Id: lonroles.pm,v 1.370 2023/06/20 14:04:02 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -444,6 +444,12 @@ sub handler {
        $reqauthor = &Apache::loncoursequeueadmin::process_reqauthor(\$update);
     }
 
+# ------------------------------------------------- Check for approval results
+    my $approvalresult;
+    if (($env{'form.approvals'} eq 'show') && ($env{'form.state'} eq 'done')) {
+        $approvalresult = &Apache::loncoursequeueadmin::update_request_queue('othdombyuser',  
+                                                                             $env{'user.domain'});
+    }
     my $envkey;
     my %dcroles = ();
     my %helpdeskroles = ();
@@ -1233,7 +1239,7 @@ ENDCLOSE
     } else {
         my $crumbsright;
         unless (($norolelist) && ((split(/:/,$env{'user.error.msg'}))[2])) {
-            $funcs = &get_roles_functions($showcount,$cattype);
+            $funcs = &get_roles_functions($showcount,$cattype,$domdefs{'userapprovals'});
             if ($env{'browser.mobile'}) {
                 $crumbsright = $funcs;
                 undef($funcs);
@@ -1271,7 +1277,11 @@ function enterrole (thisform,rolecode,bu
 }
 
 function rolesView (caller) {
-    if ((caller == 'showall') || (caller == 'noshowall')) {
+    if (caller == 'approvals') {
+        document.rolechoice.approvals.value = 'show';
+    } else if (caller == 'noapprovals') {
+        document.rolechoice.approvals.value = 'hide';
+    } else if ((caller == 'showall') || (caller == 'noshowall')) {
         document.rolechoice.display.value = caller;
     } else {
         if ((caller == 'doupdate') || (caller == 'requestauthor') ||
@@ -1367,22 +1377,31 @@ ENDHEADER
             }
             if ($hotlist) {
                 $showresult .= $hotlist;
-            } 
+            }
             $showresult .= '</div>';
             $r->print($showresult);
         } elsif ($env{'form.state'} eq 'queued') {
             $r->print(&get_queued());
+        } elsif ($env{'form.approvals'} eq 'show') {
+            if ($env{'form.state'} eq 'done') {
+                $r->print($approvalresult).'<br />';
+            }
+            $r->print('<div class="LC_left_float"><fieldset><legend>'.&mt('Role assignments queued pending your acceptance').'</legend>'.
+                     &get_approvals().
+                     '</fieldset></div><br clear="all" />');
         }
         if (($ENV{'REDIRECT_QUERY_STRING'}) && ($fn)) {
     	    $fn.='?'.$ENV{'REDIRECT_QUERY_STRING'};
         }
         my $display = ($env{'form.display'} =~ /^(showall)$/);
+        my $approvals = ($env{'form.approvals'} =~ /^(show)$/);
         $r->print('<form method="post" name="rolechoice" action="'.(($fn)?$fn:$r->uri).'">');
         $r->print('<input type="hidden" name="orgurl" value="'.$fn.'" />');
         $r->print('<input type="hidden" name="selectrole" value="1" />');
         $r->print('<input type="hidden" name="newrole" value="" />');
         $r->print('<input type="hidden" name="display" value="'.$display.'" />');
         $r->print('<input type="hidden" name="state" value="" />');
+        $r->print('<input type="hidden" name="approvals" value="'.$approvals.'" />');
         if ($blocked_by_ip) {
             my $blocked_role = 'student';
             if ($blocked_type eq 'Community') {
@@ -3366,7 +3385,7 @@ sub is_active_course {
 }
 
 sub get_roles_functions {
-    my ($rolescount,$cattype) = @_;
+    my ($rolescount,$cattype,$userapprovals) = @_;
     my @links;
     push(@links,["javascript:rolesView('doupdate');",'start-here-22x22',&mt('Check for changes')]);
     if ($env{'environment.canrequest.author'}) {
@@ -3395,6 +3414,13 @@ sub get_roles_functions {
     unless ($cattype eq 'none') {
         push(@links,['/adm/coursecatalog','ccat-22x22',&mt('Course catalog')]);
     }
+    if ($userapprovals) {
+        if ($env{'form.approvals'} eq 'show') {
+            push(@links,["javascript:rolesView('noapprovals');",'list-add-22x22',&mt('Hide pending')]);
+        } else {
+            push(@links,["javascript:rolesView('approvals');",'list-add-22x22',&mt('Show pending')]);
+        }
+    }
     my $funcs;
     if ($env{'browser.mobile'}) {
         my @functions;
@@ -3498,15 +3524,23 @@ sub get_queued {
     unless ($output) {
         if ($env{'environment.canrequest.author'} || $env{'environment.canrequest.official'} ||
             $env{'environment.canrequest.unofficial'} || $env{'environment.canrequest.community'}) {
-            $output = &mt('No requests for courses, communities or authoring currently queued');
+            $output = '<span class="LC_info">'.
+                      &mt('No requests for courses, communities or authoring currently queued').
+                      '</span>';
         } else {
-            $output = &mt('No enrollment requests currently queued awaiting approval');
+            $output = '<span class="LC_info">'.
+                      &mt('No enrollment requests currently queued awaiting approval').
+                      '</span>';
         }
     }
     return '<div class="LC_left_float"><fieldset><legend>'.&mt('Queued requests').'</legend>'.
            $output.'</fieldset></div><br clear="all" />';
 }
 
+sub get_approvals {
+    return &Apache::loncoursequeueadmin::display_queued_requests('othdomaction',$env{'user.domain'},'','user');
+}
+
 sub process_lti {
     my ($r,$cdom,$cnum) = @_;
     my %lti = &Apache::lonnet::get_domain_lti($cdom,'provider');