Modified

app/Helpers/functions.php

@@ -104,8 +104,8 @@ if(!function_exists('studentRefNoGenerate')){
 
 if(!function_exists('proposalRefNoGenerate')){
 
-	function proposalRefNoGenerate(){
-	    $currentId = \DB::table('proposal')->count();
+	function proposalRefNoGenerate($student_id){
+	    $currentId = \DB::table('proposal')->where('student_id',$student_id)->count();
 
 	    do{
 	    	++$currentId;
@@ -226,15 +226,6 @@ if(!function_exists('res_msg')){
 }
 
 
-if(!function_exists('is_freez_profile')){
-
-	function is_freez_profile($std_id){
-
-		return \App\User::where('id',$std_id)->where(
-			 'freez_profile',1
-			)->exists();   
-
-	}
-}
+ 
 
 

app/Http/Controllers/Admin/AdminController.php

@@ -40,6 +40,8 @@ class AdminController extends Controller
 
         $register_student_list =User::where(
                 'user_type',1
+            )->where(
+                'sign_up',1
             )->orderBy(
                 'id','DESC'
             )->get();
@@ -69,10 +71,10 @@ class AdminController extends Controller
                 'market_countries.*', \DB::raw('(SELECT name FROM countries WHERE market_countries.country_id = countries.id ) as sort')
             )->orderBy('sort')->get();
 
-        $refer_users =User::whereIn(
-            'register_type',[3,4] // 3 = QForm ; 4 = Student Wishlist or Refer
+        $student_refer_friend_list =User::where(
+            'register_type',6 // 6 = student refer a friend for a proposal 
         )->where(
-            'user_type',2
+            'user_type',1
         )->orderBy('id','DESC')->get();
 
         $application = StudentProposal::orderBy('id','DESC')->get();
@@ -81,7 +83,7 @@ class AdminController extends Controller
           'register_active_teachers_list'=>$register_active_teachers_list,
           'register_student_list'=>$register_student_list ,
           'market_countries'=>$market_countries,
-          'refer_users'=>$refer_users,
+          'refer_users'=>$student_refer_friend_list,
           'invited_registered_list'=>$invited_registered_list,
           'application'=>$application,
           'landing_wishlist'=>$landing_wishlist

app/Http/Controllers/AjaxController.php

@@ -194,7 +194,7 @@ class AjaxController extends Controller
             return response(
                 ['msg'=>'Saved successfully.']
             );
-        }elseif($name=="add_refer_user"){
+        }elseif($name=="save_student_refer_friend"){
             $user =Auth::user();
             $validator=\Validator::make($req->all(), [
                 'name'=>'required',
@@ -206,7 +206,11 @@ class AjaxController extends Controller
                 return response(['msg'=>$errors[0]], 422);
             }
 
-            $std_proposal =StudentProposal::where('student_id',$user->id)->first();
+            $std_proposal =StudentProposal::where(
+                'student_id',$user->id
+            )->where(
+                'proposal_submit_status',1
+            )->first();
 
             if(empty($std_proposal)){
                 return response(
@@ -214,6 +218,15 @@ class AjaxController extends Controller
                 );
             }
 
+            $user_data = new User;
+            $user_data->first_name = $req->name;
+            $user_data->email =$req->email;
+            $user_data->invitation_date =now();
+            $user_data->user_type =1;  
+            $user_data->register_type =6; // 6= student refer a friend  for a application proposal
+            $user_data->created_by =$user->id;
+            $user_data->save();
+
             $refer =new ReferUser;
             $refer->name =$req->name;
             $refer->email =$req->email;
@@ -224,20 +237,21 @@ class AjaxController extends Controller
             if($refer->save()){
                 $data['name'] = $refer->name;
                 $data['teacher_id'] = $refer->teacher_id;
+                $data['student_id'] = $user_data->id;
                 $data['std_email'] = $refer->email;
                 $data['applicant_name'] = $user->first_name.' '.$user->last_name;
                 $data['receive_email']=$refer->email;
                 $user_mail = $refer->email;
                 $from = 'asraful@revinr.com';
 
-                Mail::send('email.refer_email',$data, function ($message) use ($user_mail,$from) {
+                Mail::send('email.refer_a_friend_email',$data, function ($message) use ($user_mail,$from) {
                     $message->from($from);
-                    $message->to($user_mail)->subject('New Email Send to you');
+                    $message->to($user_mail)->subject('Recommendation - Research Admission Platform for Finding a Research Superviso.');
                 });
             }
 
             return response(
-                ['msg'=>'Refer saved successfully.']
+                ['msg'=>'Saved successfully.']
             );
         }elseif($name=="research_interest"){
 
@@ -426,11 +440,17 @@ class AjaxController extends Controller
 
             if($old_user){
                 return response(
-                    ['msg'=>'You already registered.','action'=>'old_user']
+                    ['msg'=>'Already an account associated with this email ID.','action'=>'old_user']
                 );
             }
 
-            $new_user =User::where('email',$req->email)->where('user_type',1)->doesntExist();
+            $new_user =User::where(
+                'email',$req->email
+            )->where(
+                'user_type',1
+            )->where(
+                'sign_up',1
+            )->doesntExist();
 
 
             if($new_user){
@@ -452,9 +472,7 @@ class AjaxController extends Controller
                 $student_proposal->student_id =$user->id;
                 $student_proposal->teacher_id =$req->id;
                 $student_proposal->save();
-            }
-
-
+            }  
 
             $refer =new ReferUser;
             $refer->name =$req->name;
@@ -465,13 +483,27 @@ class AjaxController extends Controller
             $refer->save();
 
             if($refer->save()){
-                $user_teacher = User::find($refer->teacher_id);
+                $teacher = User::find($refer->teacher_id);
+
+                if($teacher->others_department){
+                    $department =$teacher->others_department;
+                }else{
+                    $department = cn($teacher,'department_name.name','');
+                }
+
+                if($teacher->university_name){
+                    $university =$teacher->university_name;
+                }else{
+                    $university = cn($teacher,'university.name','');
+                }
+
+
                 $data['name'] = $refer->name;
                 $data['student_id'] = $user->id;
                 $data['teacher'] = $user_teacher->first_name.' '.$user_teacher->last_name;
-                $data['designation'] = $user_teacher->designation;
-                $data['department'] = $user_teacher->others_department;
-                $data['university'] = $user_teacher->university_name;
+                $data['designation'] = $teacher->designation;
+                $data['department'] = $department;
+                $data['university'] = $university;
                 $data['email'] =$refer->email;
                 $data['receive_email']=$refer->email;
                 $user_mail = $refer->email;
@@ -522,38 +554,37 @@ class AjaxController extends Controller
                return response(
                 ['msg'=>'You are already registered.','action'=>'redirect']
 
-            );
-
-            }else{
+                ); 
+            }
 
-                $user_data = User::find($req->id);
-                $user_data->first_name =$req->first_name;
-                $user_data->last_name =$req->last_name;
-                $user_data->first_name =$req->first_name;
-                $user_data->nationality =$req->nationality;
-                $user_data->dob =\Carbon\Carbon::parse($req->dob)->format('Y-m-d');
-                $user_data->gender =$req->gender;
-                $user_data->password =Hash::make($req->password);
-                $user_data->status =0;
-                $user_data->sign_up =1;
-                $user_data->registered_date =now();
-                //$user_data->email_verification=1;
-                $user_data->remember_token=$token;
-                //$user_data->email_verified_at=now();
-                $user_data->update();
+            $user_data = User::find($req->id);
+            $user_data->first_name =$req->first_name;
+            $user_data->last_name =$req->last_name;
+            $user_data->first_name =$req->first_name;
+            $user_data->nationality =$req->nationality;
+            $user_data->dob =\Carbon\Carbon::parse($req->dob)->format('Y-m-d');
+            $user_data->gender =$req->gender;
+            $user_data->password =Hash::make($req->password);
+            $user_data->status =0;
+            $user_data->sign_up =1;
+            $user_data->registered_date =now();
+            //$user_data->email_verification=1;
+            $user_data->remember_token=$token;
+            //$user_data->email_verified_at=now();
+            $user_data->update();
 
 
-                $data['name'] = $user_data->first_name .' '.$user_data->last_name;
-                $data['token']=$token;
-                $data['receive_email']=$user_data->email;
-                $user_mail = $user_data->email;
-                $from = 'asraful@revinr.com';
+            $data['name'] = $user_data->first_name .' '.$user_data->last_name;
+            $data['token']=$token;
+            $data['receive_email']=$user_data->email;
+            $user_mail = $user_data->email;
+            $from = 'asraful@revinr.com';
 
-                Mail::send('email.q_apply_wishlist_registration_email',$data, function ($message) use ($user_mail,$from) {
-                    $message->from($from);
-                    $message->to($user_mail)->subject('Thank You for joining us!');
-                });
-            }
+            Mail::send('email.q_apply_wishlist_registration_email',$data, function ($message) use ($user_mail,$from) {
+                $message->from($from);
+                $message->to($user_mail)->subject('Thank You for joining us!');
+            });
+            
             return response(
                 ['msg'=>'Successfully saved. Please check your email for verify.']
             );

app/Http/Controllers/Auth/RegisterController.php

@@ -139,10 +139,14 @@ class RegisterController extends Controller
     public function email_verification($token)
      {
         $data = User::where('remember_token',$token)->first();
+        if($data->email_verification ==1){
+            return Redirect('/login');  
+        } 
         $data->email_verification=1;
         $data->email_verified_at=now();
         $data->status=1;
-        $data->update();
+        $data->update(); 
         return Redirect('/login')->with('success','Your mail is activated successfully. Login here ');
+        
      }
 }

app/Http/Controllers/HomeController.php

@@ -29,13 +29,13 @@ class HomeController extends Controller
         return view('Q_apply_form',compact('hash_teacher_ids','user'));
     }
 
-    public function wishlist_student_register($hash)
+    public function q_apply_register_form($hash)
     {
         $hashids=new \Hashids\Hashids('student_wishlist_signup', 25);
         $hash_student_ids=$hashids->decode($hash);
         if(empty($hash_student_ids[0])) abort(404);
         $user =User::find($hash_student_ids[0]);
-        return view('auth.wishlist_register_form',compact('hash_student_ids','user'));
+        return view('auth.q_apply_register_form',compact('hash_student_ids','user'));
     }
 
     public function invited_register_form($hash)

app/Http/Controllers/ModalController.php

@@ -89,7 +89,7 @@ class ModalController extends Controller{
             ];
 
             $validator=\Validator::make($req->all(),$new_rules,[
-                'proposal_id.required'=>'No Proposal available.',
+                'proposal_id.required'=>'Please complete your profile to submit your proposal.',
                 'startdate'=>'required',
                 'startmonth'=>'required',
             ]);
@@ -131,11 +131,16 @@ class ModalController extends Controller{
             $student_data->update();
 
             $teacher =User::find($student_proposal->teacher_id);
+            if($teacher->university_name){
+                $university =$teacher->university_name;
+            }else{
+                $university = cn($teacher,'university.name','');
+            }
 
-			 if($student_data){
+			if($student_data){
 				$data['name'] = $student_data->first_name.' '.$student_data->last_name;
 				$data['teacher'] = $teacher->first_name.' '.$teacher->last_name;
-                $data['university'] = $teacher->university_name;
+                $data['university'] = $university;
                 $data['submission_date'] = $student_data->created_at;
                 $data['receive_email']=$student_data->email;
 				//$data['arn'] = $teacher->ref_no;
@@ -145,7 +150,7 @@ class ModalController extends Controller{
 					$message->from($from);
 					$message->to($user_mail)->subject('Apply Ref:' .$student_proposal->student_apply_ref. '- Proposal has been submitted successfully ');
 				});
-			 }
+			}
 
              $proposal =Proposal::where(
                     'student_id',$student_proposal->student_id
@@ -177,7 +182,7 @@ class ModalController extends Controller{
             ];
 
             $validator=\Validator::make($req->all(),$new_rules,[
-                'proposal_id.required'=>'No Proposal available.',
+                'proposal_id.required'=>'Please complete your profile to submit your proposal.',
                 'startdate'=>'required',
                 'startmonth'=>'required',
             ]);
@@ -218,10 +223,16 @@ class ModalController extends Controller{
 
             $teacher =User::find($student_proposal->teacher_id);
 
-			 if($student_data){
+            if($teacher->university_name){
+                $university =$teacher->university_name;
+            }else{
+                $university = cn($teacher,'university.name','');
+            }
+
+			if($student_data){
 				$data['name'] = $student_data->first_name.' '.$student_data->last_name;
 				$data['teacher'] = $teacher->first_name.' '.$teacher->last_name;
-                $data['university'] = $teacher->university_name;
+                $data['university'] = $university;
                 $data['submission_date'] = $student_data->created_at;
                 $data['receive_email']=$student_data->email;
 				//$data['arn'] = $proposal_user->ref_no;
@@ -231,7 +242,7 @@ class ModalController extends Controller{
 					$message->from($from);
 					$message->to($user_mail)->subject('Apply Ref:' .$student_proposal->student_apply_ref. '- Proposal has been submitted successfully ');
 				});
-			 }
+			}
 
              $proposal =Proposal::where(
                     'student_id',$student_proposal->student_id
@@ -321,10 +332,7 @@ class ModalController extends Controller{
                 ['msg'=>'Refer saved successfully.']
             );
 
-        }elseif($name=="teacher_invited"){
-
-
-
+        }elseif($name=="teacher_invited"){ 
             $admin =Admin::find($req->id);
             $validator=\Validator::make($req->all(), [
                 'name'=>'required',
@@ -336,6 +344,20 @@ class ModalController extends Controller{
                 return response(['msg'=>$errors[0]], 422);
             }
 
+            $old_user = User::where(
+                'email',$req->email
+            )->where(
+                'user_type',2
+            )->where(
+                'sign_up',1
+            )->exists();
+
+            if($old_user){
+                return response([
+                    'msg'=>'Already there is an account associated this email ID.'
+                ],403);
+            }
+
             $user_check_data =User::where('email',$req->email)->where('user_type',2)->doesntExist();
 
             if($user_check_data){
@@ -450,11 +472,19 @@ class ModalController extends Controller{
                 return response(['msg'=>$errors[0]], 422);
             }
 
-            // $already_exists =User::where('email',$req->email)->exists();
-
-            // if($already_exists){
-            //     return response(['msg'=>'Sorry! this email is already exists!.'],403);
-            // }
+            $old_user = User::where(
+                'email',$req->email
+            )->where(
+                'user_type',2
+            )->where(
+                'sign_up',1
+            )->exists();
+
+            if($old_user){
+                return response([
+                    'msg'=>'Already there is an account associated this email ID.'
+                ],403);
+            }
 
             $user_check_data =User::where('email',$req->email)->where('user_type',2)->doesntExist();
 

app/Http/Controllers/StudentHomeController.php

@@ -27,14 +27,31 @@ class StudentHomeController extends Controller
 
    public function index(){
       $user = Auth::user();
-      $student_proposal =StudentProposal::where('student_id',$user->id)->orderBy('id','DESC')->get();
+      $student_proposal =StudentProposal::where(
+         'student_id',$user->id
+      )->where(
+         'proposal_submit_status',1
+      )->orderBy('id','DESC')->get();
       return view('home',compact('student_proposal'));
    }
 
    public function application(){
-      $user = Auth::user();
+      $user = Auth::user(); 
+      $proposal= Proposal::where('student_id',$user->id)->doesntExist();
+      $publication =User::where('id',$user->id)->whereNull('is_publication')->exists(); 
+      $worK_exp =User::where('id',$user->id)->whereNull('is_work_experience')->exists(); 
+      $institution =User::where('id',$user->id)->whereNull('is_education')->exists();
+      $score =User::where('id',$user->id)->whereNull('is_test_score')->exists();  
       $student_proposal =StudentProposal::where('student_id',$user->id)->orderBy('id','DESC')->get();
-      return view('application',compact('student_proposal'));
+      $data =[
+         'proposal'=>$proposal,
+         'publication'=>$publication,
+         'worK_exp'=>$worK_exp,
+         'institution'=>$institution,
+         'score'=>$score,
+         'student_proposal'=>$student_proposal,
+      ];
+      return view('application',$data);
    }
 
    public function profile()
@@ -117,9 +134,10 @@ class StudentHomeController extends Controller
 
      public function proposal_save(Request $request)
      {
+         $student_id =Auth::user()->id;
          $proposal= New  Proposal;
-         $proposal->student_id= Auth::user()->id;
-         $proposal->proposal_ref= proposalRefNoGenerate();
+         $proposal->student_id= $student_id;
+         $proposal->proposal_ref= proposalRefNoGenerate($student_id);
          $proposal->title= $request->title;
          $proposal->methology= $request->methology;
          $proposal->department= $request->department;

app/User.php

@@ -79,8 +79,6 @@ class User extends Authenticatable
     public function university()
     {
         return $this->belongsTo('App\Models\University', 'university_id');
-    }
-
-
+    } 
 
 }

resources/views/Q_apply_form.blade.php

@@ -265,30 +265,32 @@
                                     <div class="card login-page border-0" style="z-index: 1;">
                                         <div class="card-body" style="padding: 0px;">
                                              <h3 class="mb-3" style="font-size: 22px !important; line-height: 43px; font-weight: 700; text-align: left; color: #3c3d5b;">You're going to submit your doctoral application proposal to - </h3>
-                                                <div class="uni_details" style="background-color: #16183f0a; display:flex; border-radius: 10px; padding: 10px 21px;">
-                                                    <div class="mt-2" style="text-align: center;">
-                                                        <div class="inner_left mt-1" style="background-color: #141639c4; padding: 18px 0px 0px 0px; height: 63px; width: 63px;">
-                                                            <p style="color:white; font-weight:600 !important; letter-spacing: 2px;">{{ strtoupper(mb_substr($user->first_name, 0, 1) . mb_substr($user->last_name, 0, 1)) }}</p>
-                                                        </div>
+                                             <div class="uni_details" style="display:flex;">
+                                                    @if($user->nationality)
+                                                    <div class="mt-2"> 
+                                                            {{-- <p style="color:white; font-weight:600 !important; letter-spacing: 2px;">{{ strtoupper(mb_substr($user->first_name, 0, 1) . mb_substr($user->last_name, 0, 1)) }}</p> --}}
+                                                        <img class="img-responsive listFlag mt-2" style="padding:0px; height: 63px; width: 63px;" src="{{ asset('/assets/img/flags/4x3').'/'.strtolower(cn($user,'country_name.iso_3166_2','')).'.svg' }}" alt="Flag" data-toggle="tooltip" title="" data-placement="top">
                                                     </div>
+                                                    @endif 
                                                     <div class="alert" style="margin-bottom: 0px; color: #3c3d5b;">
                                                         <strong class="mb-2" style="font-size:19px; font-weight: 700;"> {{ $user->first_name }} {{ $user->last_name }}</strong></br>
-                                                        {{-- <span style="font-size:14px; font-weight:400;">{{ $user->email }} </span><br> --}}
+                                                        <span style="font-size:14px; font-weight:400;">{{ $user->designation }} </span><br>
+                                                        
                                                         <span style="font-size:14px; font-weight:400;">
-                                                            @if($user->university_name)
-                                                               {{ $user->university_name }}
+                                                            @if($user->others_department)
+                                                                {{ $user->others_department }}
                                                             @else
-                                                               {{ cn($user,'university.name','')}}
+                                                                {{ cn($user,'department_name.name','')}}
                                                             @endif
-                                                        </span>
+                                                        </span>  
                                                         <span> . </span>
                                                         <span style="font-size:14px; font-weight:400;">
-                                                            @if($user->others_department)
-                                                                {{ $user->others_department }}
+                                                            @if($user->university_name)
+                                                               {{ $user->university_name }}
                                                             @else
-                                                                {{ cn($user,'department_name.name','')}}
+                                                               {{ cn($user,'university.name','')}}
                                                             @endif
-                                                        </span>
+                                                        </span> 
 
                                                     </div>
                                                 </div>

resources/views/admin/admin_profile.blade.php

@@ -662,10 +662,7 @@ tbody, td, tfoot, th, thead, tr {
                                                                                             <div class="scrolled_content_part">
                                                                                                 <div class="single_ad_pref_item">
                                                                                                     <div class="left" style="width:50%;">
-                                                                                                        <div class="uni_details" style="display:flex;">
-                                                                                                            {{-- <div class="inner_left mt-1" style="border: 1px solid black; border-radius: 20px; padding: 9px 4px 5px 8px; height: 37px; width: 37px;">
-                                                                                                                <i class="fa fa fa-university ms-1"></i>
-                                                                                                            </div> --}}
+                                                                                                        <div class="uni_details" style="display:flex;"> 
                                                                                                             @if($row->nationality)
                                                                                                                 <img class="img-responsive listFlag" style="border-radius: 20px; padding: 0px;height: 35px;width: 35px;" src="{{ asset('/assets/img/flags/4x3').'/'.strtolower(cn($row,'country_name.iso_3166_2','')).'.svg' }}" alt="Flag" data-toggle="tooltip" title="" data-placement="top">
                                                                                                             @endif
@@ -693,24 +690,47 @@ tbody, td, tfoot, th, thead, tr {
                                                                                                 @else
                                                                                                 <span class="label_badge_radius" style="background-color: #f9edc7; color: rgb(228, 139, 38);">pending</span>
                                                                                                 @endif
-                                                                                            </div>
-                                                                                            <!-- <div>
-                                                                                                <span class="label_badge_radius" style="background-color: #ffbd5978; color: #ff9a00;">pending</span>
-                                                                                            </div> -->
+                                                                                            </div> 
                                                                                         </td>
-                                                                                        <td style="font-size: 11px;">{{date('d M Y h:i A', strtotime($row->created_at))}}</td>
+                                                                                        <td style="font-size: 11px;">@if(!empty($row->registered_date)){{date('d M Y h:i A', strtotime($row->registered_date))}} @else @endif</td>
                                                                                         <td style="font-size: 11px; text-align:center;">
                                                                                             @php
-                                                                                               $total_std_proposal =\DB::table('proposal')->where('student_id',$row->id)->count();
-                                                                                               $total_submitted_proposal =\DB::table('student_proposals')->where('student_id',$row->id)->count();
+                                                                                               $total_draft =\DB::table(
+                                                                                                    'student_proposals'
+                                                                                                )->where(
+                                                                                                    'student_id',$row->id
+                                                                                                )->where(
+                                                                                                    'proposal_submit_status',0
+                                                                                                )->count();
+
+                                                                                               $total_submitted =\DB::table(
+                                                                                                    'student_proposals'
+                                                                                                )->where(
+                                                                                                    'student_id',$row->id
+                                                                                                )->where(
+                                                                                                    'proposal_submit_status',1
+                                                                                                )->count();
                                                                                             @endphp
-                                                                                            <div>
+                                                                                            <div> 
                                                                                                 <span class="label_badge_radius" style="background-color: #ffbd5978; color: #ff9a00;">
-                                                                                                    {{$total_std_proposal}}
+                                                                                                    @if($total_draft > 1)
+                                                                                                        {{$total_draft}}
+                                                                                                    @else
+                                                                                                        {{'0'}}
+                                                                                                    @endif
                                                                                                 </span>
+                                                                                               
                                                                                             </div>
                                                                                             <div class="mt-1">
-                                                                                                <span class="label_badge_radius" style="background-color: #d8fdd8; color: green;">{{$total_submitted_proposal}}</span>
+                                                                                               
+                                                                                                    <span class="label_badge_radius" style="background-color: #d8fdd8; color: green;">
+                                                                                                        @if($total_submitted > 1)
+                                                                                                            {{$total_submitted}}
+                                                                                                        @else
+                                                                                                            {{'0'}}
+                                                                                                        @endif
+                                                                                                    </span>
+                                                                                               
                                                                                             </div>
                                                                                         </td>
                                                                                         <td style="font-size: 11px; text-align:center;">
@@ -756,8 +776,15 @@ tbody, td, tfoot, th, thead, tr {
                                                                                         <td style="font-size: 11px;">{{$key+1}}</td>
                                                                                         <td style="font-size: 11px;">{{$row->first_name}} {{$row->last_name}}</td>
                                                                                         <td style="font-size: 11px;">{{$row->email}}</td>
-                                                                                        <td style="font-size: 11px;">{{date('y M', strtotime($row->created_at))}}</td>
-                                                                                        <td style="font-size: 11px;"></td>
+                                                                                        <td style="font-size: 11px;">{{date('y M', strtotime($row->invitation_date))}}</td>
+                                                                                        <td style="font-size: 11px;">
+                                                                                            @php
+                                                                                               $reffered_by  =\DB::table('users')->find($row->created_by);
+                                                                                            @endphp
+                                                                                            @if($reffered_by)
+                                                                                                {{ $reffered_by->first_name }}  {{ $reffered_by->last_name }}
+                                                                                            @endif
+                                                                                        </td>
                                                                                         <td style="font-size: 11px; text-align:center;">
                                                                                             @if($row->sign_up ==1)
                                                                                                 <span class="label_badge_radius" style="background-color: #d8fdd8; color: green;">Yes</span><br>
@@ -879,7 +906,7 @@ tbody, td, tfoot, th, thead, tr {
                                                                                                         Approved
                                                                                                         @endif
                                                                                                         @if($row->apply_status==2)
-                                                                                                        Terminet
+                                                                                                        Declined
                                                                                                         @endif
                                                                                                         @if($row->apply_status==3)
                                                                                                         Suspend
@@ -889,8 +916,8 @@ tbody, td, tfoot, th, thead, tr {
                                                                                                     <div class="dropdown" style="top: 0.4px; position: absolute; right: 9px;">
                                                                                                             <i class="fa fa-caret-down dropdown-toggle add_hover tooltips" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" data-original-title="Change Status" style="color: #8c9094;"></i>
                                                                                                         <div class="dropdown-menu" aria-labelledby="dropdownMenuButton" x-placement="bottom-start" style="position: absolute; transform: translate3d(10px, 13px, 0px); top: 0px; left: 0px; will-change: transform; margin-left: -75px; z-index: 2; margin-top: 10px;">
-                                                                                                            <a class="dropdown-item status_change" data-value="1" data-id={{$row->id}}>Active</a>
-                                                                                                            <a class="dropdown-item status_change" data-value="2" data-id={{$row->id}}>In active</a>
+                                                                                                            <a class="dropdown-item status_change" data-value="1" data-id={{$row->id}}>Approved</a>
+                                                                                                            <a class="dropdown-item status_change" data-value="2" data-id={{$row->id}}>Declined</a>
                                                                                                             <a class="dropdown-item status_change" data-value="3" data-id={{$row->id}}>Suspend</a>
                                                                                                         </div>
                                                                                                     </div>

resources/views/application.blade.php

@@ -87,7 +87,7 @@
                                     <div class="left" style="width:50%;">
                                         <div class="uni_details" style="display:flex;">
                                             <div class="inner_right ms-5">
-                                                <span style="font-size:12px;">Preferred Start Date : <br><strong style="font-size:13px;">{{ date('M Y', strtotime($row->created_at))}}</strong></span><br>
+                                                <span style="font-size:12px;">Preferred Start Date : <br><strong style="font-size:13px;">@if(!empty($row->submitted_date)){{ date('M Y', strtotime($row->submitted_date))}} @else @endif</strong></span><br>
                                             </div>
                                         </div>
                                     </div>
@@ -95,8 +95,11 @@
                                         <span style="font-size:12px;">Application Status </span><br>
                                         @if($row->proposal_submit_status==1)
                                             <span class="label_badge_radius" style="background-color: #d8fdd8; color: green; border-radius: 5px; font-weight: bold;">Applied</span>
+                                           
+                                        @elseif($proposal =='true' || $publication =='true' || $worK_exp =='true'|| $institution =='true'|| $score =='true')   
+                                          <span class="label_badge_radius" style="background-color: #d8fdd8; color: green; border-radius: 5px; font-weight: bold; cursor: pointer;">Draft</span>
                                         @else
-                                            <span class="label_badge_radius open_modal_page" data-url="{{ route('modal-get',['name'=>'update_student_proposal','id'=>$row->id,'student_id'=>$row->student_id,'teacher_id'=>$row->teacher_id]) }}" data-title="Submit your Proposal" style="background-color: #d8fdd8; color: green; border-radius: 5px; font-weight: bold; cursor: pointer;">Draft</span>
+                                            <span class="label_badge_radius open_modal_page" data-url="{{ route('modal-get',['name'=>'update_student_proposal','id'=>$row->id,'student_id'=>$row->student_id,'teacher_id'=>$row->teacher_id]) }}" data-title="Submit your Proposal" style="background-color: #f2d0a4; color: #dc3545; border-radius: 5px; font-weight: bold; cursor: pointer;">Submit</span>
                                         @endif
                                     </div>
                                 </div>

resources/views/auth/invited_register_form.blade.php

@@ -315,13 +315,23 @@
                   }
 
                   $.post("{{ route('ajax-post', ['name'=>'invitation_register_save']) }}", form_data, function(res){
-                      $('.wait').waitMe("hide");
+                        $('.wait').waitMe("hide");
+                        $('#first_name').val('');
+                        $('#last_name').val('');
+                        $('#university').val('');
+                        $('#department').val('');
+                        $('#others_department').val('');
+                        $('#designation').val('');
+                        $('#website').val('');
+                        $('#password').val('');
+                        $('#password_confirmation').val('');
+                        
                       if(res.action=='redirect'){
                           window.location.href = "{{ url('/login-v2') }}";
                         }else{
                             window.location.href = "{{ url('/login-v2') }}";
                         }
-                     pop_up_msg(res.msg);
+                      pop_up_msg(res.msg);
 
 
                   }).fail(function(err){

resources/views/auth/wishlist_register_form.blade.php → resources/views/auth/q_apply_register_form.blade.php

@@ -212,7 +212,7 @@
 
                                                 <div class="row mb-0">
                                                     <div class="col-md-12">
-                                                        <button class="btn btn1 pull-right" id="wishlist_reg_submit">
+                                                        <button class="btn btn1 pull-right" id="q_apply_reg_submit">
                                                             {{ __('Submit') }}
                                                         </button>
                                                     </div>
@@ -278,7 +278,7 @@
                 dateFormat: "d M Y",
             });
 
-            $('#wishlist_reg_submit').on('click', function(){
+            $('#q_apply_reg_submit').on('click', function(){
 
                 $('.wait').waitMe({effect : 'facebook', text : 'Please wait...'});
 
@@ -308,6 +308,14 @@
 
                   $.post("{{ route('ajax-post', ['name'=>'q_apply_wishlist_registration_save']) }}", form_data, function(res){
                     $('.wait').waitMe("hide");
+                    $('#first_name').val('');
+                    $('#last_name').val('');
+                    $('#nationality').val('');
+                    $('#u_dob').val('');
+                    $('.gender:checked').val('');
+                    $('#password').val('');
+                    $('#password_confirmation').val('');
+
                     if(res.action=='redirect'){
                         window.location.href = "{{ url('/login') }}";
                     }

resources/views/email/q_apply_wishlist_registration_email.blade.php

@@ -83,7 +83,8 @@
                                 <p class="mt-5">Dear {{ $name }},</p> 
                                     <p class="mt-3">I hope this email finds you well. </p>
                                     <p class="mt-2">Thank you for choosing Research Admission platform. We're confident our platform will exceed your expectations.</p> 
-                                    <a href="{{url('verify')}}/{{$token}}" style="color: black">click here</a>
+                                    <p>To verify, Please click the below link </p>
+                                    <a href="{{url('verify')}}/{{$token}}">click here</a>
                                     <p class="mt-2">We're excited to have you on board!</p>
                                     <p class="mt-2" style="margin: 0px;">Best regards,</p>
                                     <p>Research Admission</p>

resources/views/email/q_form_email.blade.php

@@ -94,7 +94,7 @@
                                     <h5>{{ $teacher }}</h5>
                                     <h5>{{ $designation }}</h5>
                                     <h5>{{ $department }}</h5>
-                                    {{-- <h5>{{ $university }}</h5> --}}
+                                    <h5>{{ $university }}</h5>
                                      <div style="border-top: 1px solid #eee;">
                                         <p class="mt-3 tmail" style="font-style: italic;">This email was sent to {{$receive_email}}</p>
                                     </div>

resources/views/email/refer_email.blade.php → resources/views/email/refer_a_friend_email.blade.php

@@ -78,10 +78,15 @@
                     <div class="row">
                         <div class="col-md-1"></div>
                         <div class="col-md-9">
+                            @php
+                                $hashids = new \Hashids\Hashids('student_wishlist_signup', 25);
+                            @endphp
                             <div class="card rounded border-0 shadow p-5" style="background-color:white;">
                                 <h3 style="text-align: center; font-family:Ubuntu !important; color: #3c4858 !important; font-size: 30px !important;">Research Admission</h3>
                                 <p class="mt-5">Dear {{$name}},</p>
                                 <p class="mt-3">I have found the Research Admission Platform incredibly helpful in my own search for a research supervisor. The platform is a free and easy-to-use tool that can help you connect with potential supervisors.</p>
+                                <p>To register, Please click the below link </p>
+                                <a href="{{ url('register/'.$hashids->encode($student_id)) }}">click here</a>
                                 <p class="mt-2"> It allows you to submit your research proposal to multiple supervisors with just a few clicks. You can then track the real-time status of your application and receive a decision quickly. I found this feature particularly useful, as it allowed me to keep track of the progress of my applications without having to constantly follow up with supervisors.</p>
                                 <p class="mt-2"> I think you would find it to be a valuable resource in your own search for a research supervisor. It's free to use and can save you a lot of time and effort in finding the right match for your research interests. If you have any questions about the platform or would like some help getting started, please don't hesitate to reach out to me.</p>
 

resources/views/home.blade.php

@@ -158,7 +158,7 @@
                                                             <strong>{{ $proposal->proposal_ref}}</strong>
                                                             @endif
                                                         </td>
-                                                        <td style="font-size: 12px; text-align:center;">{{date('d M Y', strtotime($row->created_at))}}</td>
+                                                        <td style="font-size: 12px; text-align:center;">@if(!empty($row->submitted_date)){{date('d M Y', strtotime($row->submitted_date))}} @else @endif</td>
                                                         <td style="text-align:center; font-size: 12px;"><span class="label_badge_radius" style="background-color: #d8fdd8; color: green;">Applied</span></td>
                                                         <td style="text-align:center; font-size: 12px;">
                                                            <span class="open_modal_page hand" data-toogle="tooltips" title="View" data-title="Apply Reference - {{$row->student_apply_ref}} " data-url="{{route('modal-get',['name'=>'view_apply_proposal','id'=>$row->id])}}"><i class="fa fa-eye change_pass_btn"></i></span>
@@ -303,7 +303,9 @@
                     email: email,
                 }
 
-                $.post("{{ route('ajax-post', ['name'=>'add_refer_user']) }}", form_data, function(res){
+                $.post("{{ route('ajax-post', ['name'=>'save_student_refer_friend']) }}", form_data, function(res){
+                    $('#ref_name').val('');
+                    $('#ref_email').val('');
                     pop_up_msg(res.msg);
 
                 }).fail(function(err){

resources/views/profile.blade.php

@@ -70,7 +70,7 @@
                                                                         <div class="row">
                                                                             <div class="col-md-10">
                                                                                 <label class="form-label" for="proposal">Proposal</label>
-                                                                                <input type="file" accept="application/pdf,application/msword,.doc,.docx" name="documentfile" id="documentfile" class="form-control">
+                                                                                <input type="file" accept="application/pdf,application/msword,.doc,.docx" name="documentfile" id="documentfile" class="form-control" required>
                                                                             </div>
                                                                             <div class="col-md-2">
                                                                                 <div class="mt-4 pt-3">
@@ -138,7 +138,7 @@
                                                                                 <i class="fa fa-edit change_pass_btn" style="font-size: 13px !important; padding: 4px;"></i>
                                                                             </a> 
                                                                             @endif
-                                                                            @if($row->document_file)
+                                                                            @if(isset($row->document_file))
                                                                             <span class="open_modal_page hand" data-title="View Proposal" data-url="{{route('modal-get',['name'=>'view_student_proposal','id'=>$row->id])}}">
                                                                                 <i class="fa fa-eye change_pass_btn" style="font-size: 13px !important; padding: 4px;"></i>
                                                                             </span>

resources/views/teacher_profile.blade.php

@@ -701,7 +701,19 @@ tbody, td, tfoot, th, thead, tr {
                                             <td style="font-size: 11px;">{{$row->first_name }} {{$row->last_name }}</td>
                                             <td style="font-size: 11px;">{{$row->email}}</td>
                                             <td style="font-size: 11px;">@if(!empty($row->invitation_date)) {{ date('d M Y h.i A', strtotime($row->invitation_date)) }} @else -- @endif</td>
-                                            <td style="font-size: 11px;">@if(!empty($row->registered_date)) {{ date('d M Y h.i A', strtotime($row->registered_date)) }} @else -- @endif</td>
+                                            <td style="font-size: 11px;">
+                                                @php
+                                                  $teacher_id =\Auth::guard('teacher')->user()->id;
+                                                  $submitted =\DB::table('student_proposals')->where(
+                                                    'student_id',$row->id
+                                                  )->where(
+                                                    'teacher_id',$teacher_id 
+                                                  )->where(
+                                                    'proposal_submit_status',1
+                                                  )->orderBy('id','DESC')->first();
+                                                @endphp 
+                                                @if(!empty($submitted->submitted_date)) {{ date('d M Y h.i A', strtotime($submitted->submitted_date)) }} @else -- @endif
+                                            </td>
                                             <td style="font-size: 11px;">
                                                 @if($row->register_type==3)
                                                  Q-Apply

routes/web.php

@@ -56,7 +56,7 @@ Route::post('student-register', [App\Http\Controllers\Auth\RegisterController::c
 Route::get('/verify/{token}', [App\Http\Controllers\Auth\RegisterController::class,'email_verification'])->name('email-verification');
 
 Route::get('student-q-form/{hash}', [App\Http\Controllers\HomeController::class,'student_q_form']);
-Route::get('register/{hash}', [App\Http\Controllers\HomeController::class,'wishlist_student_register']);
+Route::get('register/{hash}', [App\Http\Controllers\HomeController::class,'q_apply_register_form']);
 
 Route::group(['middleware' => ['auth']], function() {
 

sql/update.sql

@@ -205,3 +205,10 @@ ALTER TABLE `student_proposals`
 
 ALTER TABLE `student_proposals`
 	ADD COLUMN `submitted_date` DATETIME NULL DEFAULT NULL AFTER `proposal_submit_status`;
+
+
+ALTER TABLE `users`
+	CHANGE COLUMN `register_type` `register_type` TINYINT(4) NULL DEFAULT '0' COMMENT '1=teacher_invitation, 2=teacher_wishlist/landing, 3=q-form,4=student_wishlist; 5= normal_register_student; 6= student_refer_friend' AFTER `sign_up`;
+
+ALTER TABLE `users`
+	CHANGE COLUMN `apply_status` `apply_status` TINYINT(4) NULL DEFAULT '0' COMMENT '1=approved, 2=declined, 3=suspend' AFTER `registered_date`;