Browse Source

Aplication Notification

Mostafijur Rahman 1 year ago
parent
commit
1a1d6efdee

+ 16 - 0
app/Helpers/functions.php

@@ -225,6 +225,22 @@ if(!function_exists('res_msg')){
 	}
 }
 
+function active($url, $active_class="active"){
+
+	$current_url=url()->current();
+
+	if(is_string($url) && $current_url==$url){
+
+		return $active_class;
+
+	}elseif(is_array($url) && in_array($current_url, $url)){
+
+		return $active_class;
+
+	}
+
+}
+
 
  
 

+ 14 - 1
app/Http/Controllers/AjaxController.php

@@ -368,7 +368,12 @@ class AjaxController extends Controller
                 Mail::send('email.hold_status_email',$data, function ($message) use ($user_mail,$from) {
                     $message->from($from);
                     $message->to($user_mail)->subject('Request for additional Documents and Information');
-                });
+                }); 
+                  
+                if(!empty($student)) { 
+ 
+                    \Notification::send($student, new \App\Notifications\ProposalStatusNotification($proposal,"Hold",$teacher));  
+                }
             }
 
             //-----Interested----
@@ -377,6 +382,10 @@ class AjaxController extends Controller
                     $message->from($from);
                     $message->to($user_mail)->subject('Expression of Interest in Supervising Your Research Application');
                 });
+
+                if(!empty($student)) {  
+                    \Notification::send($student, new \App\Notifications\ProposalStatusNotification($proposal,"Interested",$teacher));  
+                }
             }
 
             //-----Terminate----
@@ -386,6 +395,10 @@ class AjaxController extends Controller
                     $message->from($from);
                     $message->to($user_mail)->subject('Your doctoral application has been terminated.');
                 });
+
+                if(!empty($student)) {  
+                    \Notification::send($student, new \App\Notifications\ProposalStatusNotification($proposal,"Terminate",$teacher));  
+                }
             } 
             
             return response(

+ 7 - 11
app/Notifications/TicketNotification.php → app/Notifications/ProposalStatusNotification.php

@@ -7,24 +7,21 @@ use Illuminate\Notifications\Notification;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Notifications\Messages\MailMessage;
 
-class TicketNotification extends Notification
+class ProposalStatusNotification extends Notification
 {
     use Queueable;
-    protected $ticket,$action_type, $addedBy;
+    protected $proposal,$action_type, $addedBy;
 
     /**
      * Create a new notification instance.
      *
      * @return void
      */
-    public function __construct($ticket,$action_type, $addedBy, $comment=NULL)
+    public function __construct($proposal,$action_type, $addedBy)
     {
-        $this->ticket         = $ticket;
+        $this->proposal         = $proposal;
         $this->action_type    = $action_type;
-        $this->addedBy        = $addedBy;
-        $this->comment        = $comment;
-       
-        //$this->assign_person  = $assign_person;
+        $this->addedBy        = $addedBy; 
          
     }
 
@@ -48,10 +45,9 @@ class TicketNotification extends Notification
     public function toDatabase($notifiable)
     {
         return [
-            'ticket'  => $this->ticket,// ticket information
+            'proposal'  => $this->proposal,// ticket information
             'action_type' => $this->action_type, // creator
-            'addedBy' => $this->addedBy, // creator
-            'comment' => $this->comment, // creator
+            'addedBy' => $this->addedBy, // creator 
             'user'    => $notifiable // send
         ];
     }

+ 3 - 3
resources/views/application/layouts/header.blade.php

@@ -45,17 +45,17 @@
         <div id="navigation" >
             <!-- Navigation Menu-->   
             <ul class="navigation-menu" style="margin-top: 15px; margin-bottom: -14px; ">
-                <li><a href="{{ url('/home') }}" class="sub-menu-item active" style="margin-top: -2rem;">Home</a></li>
+                <li><a href="{{ url('/home') }}" class="sub-menu-item {{ active(url('/home')) }}" style="margin-top: -2rem;">Home</a></li>
                 <li class="has-submenu parent-parent-menu-item">
                     <a href="{{ url('application') }}" class="sub-menu-item" style="margin-top: -2rem;">Application</a>
                 </li>
 
                 <li class="has-submenu parent-parent-menu-item">
-                    <a href="{{ url('profile') }}" class="sub-menu-item" style="margin-top: -2rem;">Profile & Proposal</a>
+                    <a href="{{ url('profile') }}" class="sub-menu-item {{active(url('profile'))}}" style="margin-top: -2rem;">Profile & Proposal</a>
                 </li>
 
                 <li class="has-submenu parent-parent-menu-item">
-                    <a href="{{ url('explore') }}" class="sub-menu-item" style="margin-top: -2rem;">Explore</a>
+                    <a href="{{ url('explore') }}" class="sub-menu-item {{active(url('explore'))}}" style="margin-top: -2rem;">Explore</a>
                 </li>
             </ul><!--end navigation menu-->
         </div><!--end navigation-->

+ 5 - 5
resources/views/supervisor/layouts/left_menu.blade.php

@@ -4,7 +4,7 @@
             <div class="sidebar-menu" style="padding-bottom: 110px; height: 100vh; overflow: auto;">
                 <ul class="nav nav-pills nav-justified flex-column mb-0" id="pills-tab" role="tablist">
                     <li class="nav-item" style="margin-top: 35px;">
-                        <a class="nav-link active" href="{{url('supervisor/dashboard')}}">
+                        <a class="nav-link {{active(url('supervisor/dashboard'))}}" href="{{active(url('supervisor/dashboard'))}}">
                             <div class="text-start py-1 px-2" style="display:flex;">
                             <i class="fa fa-home ms-3" style="font-size: 11px; margin-top: 3px;"></i>
                                 <h6 class="mb-0" style="margin-left: 6px; font-size: 13px !important;">Dashboard</h6>
@@ -13,7 +13,7 @@
                     </li><!--end nav item-->
 
                     <li class="nav-item">
-                        <a class="nav-link" href="{{url('supervisor/application')}}">
+                        <a class="nav-link {{active(url('supervisor/application'))}}" href="{{url('supervisor/application')}}">
                             <div class="text-start py-1 px-2" style="display:flex;">
                             <i class="fa fa-graduation-cap ms-3" style="font-size: 11px; margin-top: 3px;"></i>
                                 <h6 class="mb-0" style="margin-left: 6px; font-size: 13px !important;">Application</h6>
@@ -22,7 +22,7 @@
                     </li><!--end nav item-->
 
                     <li class="nav-item">
-                        <a class="nav-link rounded" href="{{url('supervisor/wishlist')}}">
+                        <a class="nav-link rounded {{active(url('supervisor/wishlist'))}}" href="{{url('supervisor/wishlist')}}">
                             <div class="text-start py-1 px-2" style="display:flex;">
                             <i class="fa fa-shopping-bag  ms-3" style="font-size: 11px; margin-top: 3px;"></i>
                                 <h6 class="mb-0" style="margin-left: 6px; font-size: 13px !important;">Wishlist </h6>
@@ -31,7 +31,7 @@
                     </li><!--end nav item-->
 
                     <li class="nav-item">
-                        <a class="nav-link rounded" href="{{url('supervisor/explore')}}">
+                        <a class="nav-link rounded {{active(url('supervisor/explore'))}}" href="{{url('supervisor/explore')}}">
                             <div class="text-start py-1 px-2" style="display:flex;">
                             <i class="fa fa-university ms-3" style="font-size: 11px; margin-top: 3px;"></i>
                                 <h6 class="mb-0" style="margin-left: 6px; font-size: 13px !important;">Explore</h6>
@@ -39,7 +39,7 @@
                         </a><!--end nav link-->
                     </li><!--end nav item-->
                     <li class="nav-item">
-                        <a class="nav-link rounded"  href="{{url('supervisor/my-account')}}">
+                        <a class="nav-link rounded {{active(url('supervisor/my-account'))}}"  href="{{url('supervisor/my-account')}}">
                             <div class="text-start py-1 px-2" style="display:flex;">
                             <i class="fa fa-user ms-3" style="font-size: 11px; margin-top: 3px;"></i>
                                 <h6 class="mb-0" style="margin-left: 6px; font-size: 13px !important;">My Account</h6>