Browse Source

modified..

Md.Mostafijur Rahman 1 year ago
parent
commit
392a64ab89

+ 8 - 6
app/Http/Controllers/TeacherAuth/RegisterController.php

@@ -9,7 +9,8 @@ use Illuminate\Foundation\Auth\RegistersUsers;
 use Illuminate\Support\Facades\Auth;
 use App\Mail\SignUp;
 use App\User;
-use App\Models\Department; 
+use App\Models\Department;
+use App\Models\University;
 use Hash;
 use Mail;
 
@@ -76,19 +77,19 @@ class RegisterController extends Controller
             'password' => Hash::make($req->password),
             'email' => $req->email,
            // 'phone_number' => $req->phonenumber,
-            'university_name' => $req->universityname,
+            'university_name' => $req->university,
             'department' => $req->department,
             'others_department' => $req->others_department,
             'designation' => $req->designation,
             'uni_website' => $req->universitywebsite,
             'user_type' => $req->user_type,
             'ref_no' => name_initials($req->firstname,$req->lastname).''.teacherRefNoGenerate(),
-        ]); 
+        ]);
        //Mail::to('test@mail.com')->send(new SignUp($data->id));
 
-        $data['name'] = $user_data->first_name.' '.$user_data->last_name;  
+        $data['name'] = $user_data->first_name.' '.$user_data->last_name;
         $user_mail = $user_data->email;
-        $from = 'test@mail.com'; 
+        $from = 'test@mail.com';
 
         Mail::send('email.register_teacher_email',$data, function ($message) use ($user_mail,$from) {
             $message->from($from);
@@ -107,7 +108,8 @@ class RegisterController extends Controller
     public function showRegistrationForm()
     {
         $departments =Department::where('status',1)->orderBy('name','ASC')->get();
-        return view('register-v2',compact('departments'));
+        $universities =University::orderBy('name','ASC')->get();
+        return view('register-v2',compact('departments','universities'));
     }
 
     /**

+ 7 - 1
resources/views/admin/sub_contents/load_ref_no_available_info.blade.php

@@ -5,7 +5,13 @@
     <div class="col-md-12">
         <div class="row">
             <div class="col-md-10">
-                <span style="margin: 0px;">{{$teacher->first_name}} {{$teacher->last_name}}</span></br>
+                <di style="display:flex;">
+                @if($teacher->university)
+                    <img class="img-responsive listFlag" style="border: 1px solid black;border-radius: 20px; padding: 6px;height: 37px;width: 37px;" src="{{ asset('/assets/img/flags/4x3').'/'.strtolower(cn($teacher,'university.country.iso_3166_2','')).'.svg' }}" alt="Flag" data-toggle="tooltip" title="" data-placement="top">
+                @endif
+                <span style="margin: 0px;">{{$teacher->first_name}} {{$teacher->last_name}}</span>
+                </div>
+               </br>
                 <span class="text-muted" style="font-weight: 500;">{{$teacher->designation}}</span></br>
                 @if(isset($teacher->department_name))
                     <span class="text-muted" style="font-weight: 500;">{{cn($teacher,'department_name.name','')}}</span>

+ 23 - 20
resources/views/application.blade.php

@@ -1,5 +1,5 @@
 @extends('web.layouts.master')
-@section('content') 
+@section('content')
         <section class="bg-half-170 d-table w-100" style="background-color: #efefef; height:100vh; padding:121px 0px 5px;">
             <div class="container mb-2">
                 <div class="row align-items-center p-3">
@@ -21,14 +21,17 @@
                     <div class="col-md-12">
                         <div class="scrolled_content_part">
                             @foreach($student_proposal as $key=>$row)
-                            <div class="single_ad_pref_item mb-4">  
+                            <div class="single_ad_pref_item mb-4">
                                 <div class="p-2" style="display:flex;">
-                                    <div class="left" style="width:50%;"> 
+                                    <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: 6px; height: 37px; width: 37px;">
+                                            {{-- <div class="inner_left mt-1" style="border: 1px solid black; border-radius: 20px; padding: 6px; height: 37px; width: 37px;">
                                                 <i class="fa fa fa-university ms-1"></i>
-                                            </div>
-                                            <div class="alert" style="background-color:white; padding: 3px 7px; margin-bottom: 0px;"> 
+                                            </div> --}}
+
+                                            <img class="img-responsive listFlag" style="border: 1px solid black;border-radius: 20px; padding: 6px;height: 37px;width: 37px;" src="{{ asset('/assets/img/flags/4x3').'/'.strtolower(cn($row,'teacher_details.university.country.iso_3166_2','')).'.svg' }}" alt="Flag" data-toggle="tooltip" title="" data-placement="top">
+
+                                            <div class="alert" style="background-color:white; padding: 3px 7px; margin-bottom: 0px;">
                                                 <strong style="font-size:13px;">{{ cn($row,'teacher_details.first_name','')}} {{ cn($row,'teacher_details.last_name','')}}</strong></br>
                                                     <span style="font-size:10px; font-weight:400;"> {{cn($row,'teacher_details.designation','')}} </span>
                                                     <span>.</span>
@@ -46,9 +49,9 @@
                                         <span style="font-size:11px;">Apply Reference</span><br>
                                         <span class="label_badge_radius" style="background-color: #141639c4; color: white; border-radius: 4px; font-size:11px !important; font-weight:800;">{{$row->student_apply_ref ?? ''}}</span>
                                     </div>
-                                </div>  
+                                </div>
                                 <div class="p-2" style="display:flex; border-top: 1px solid #eee;">
-                                    <div class="left" style="width:50%;"> 
+                                    <div class="left" style="width:50%;">
                                         <div class="uni_details" style="display:flex;">
                                             <div class="inner_right ms-5">
                                                 <strong style="font-size:13px; font-weight: 400;">{{cn($row,'proposal.title','')}}</strong></br>
@@ -57,14 +60,14 @@
                                                         <span>.</span>
                                                         <span style="font-size:10px;">{{cn($row,'proposal.methology','')}}</span>
                                                         <span>.</span>
-                                                        <span style="font-size:10px;">{{cn($row,'proposal.department','')}}</span> 
-                                                        <span>.</span>  
-                                                        <span style="font-size:10px;">{{cn($row,'proposal.status','')}}</span> 
-                                                    </div>  
+                                                        <span style="font-size:10px;">{{cn($row,'proposal.department','')}}</span>
+                                                        <span>.</span>
+                                                        <span style="font-size:10px;">{{cn($row,'proposal.status','')}}</span>
+                                                    </div>
                                             </div>
                                         </div>
                                     </div>
-                                </div>                                  
+                                </div>
                                 <div class="p-2" style="display:flex; border-top: 1px solid #eee;">
                                     <div class="left" style="width:50%;">
                                         <div class="uni_details" style="display:flex;">
@@ -76,7 +79,7 @@
                                     <div class="text-end" style="width:50%;">
                                         <span style="font-size:11px;">Application Status </span><br>
                                         <span class="label_badge_radius" style="background-color: #d8fdd8; color: green; border-radius: 5px; font-weight: bold;">Applied</span>
-                                        
+
                                     </div>
                                 </div>
                                  <div class="p-2" style="display:flex; border-top: 1px solid #eee;">
@@ -87,17 +90,17 @@
                                             </div>
                                         </div>
                                     </div>
-                                </div> 
-                            </div> 
-                            @endforeach  
+                                </div>
+                            </div>
+                            @endforeach
                         </div>
                         @else
                         <div class="alert  mt-2 mb-3" style="background-color: #ffff; border-color: #e9f0f3; font-size: 12px !important; color: #dc3545; border-radius: 30px; padding: 8px 15px;">
                             <span>No Application available.</span>
-                        </div> 
+                        </div>
                         @endif
-                    </div> 
+                    </div>
                 </div>
             </div><!--end container-->
         </section>
-@endsection
+@endsection

+ 10 - 7
resources/views/modal_pages/apply_student_proposal.blade.php

@@ -10,8 +10,11 @@
                 <div class="alert" style="padding: 0px; margin: 0px">
                     <input type="hidden" name="teacher_id" value="{{$teacher->id}}">
                     <input type="hidden" name="student_id" value="{{$student->id}}">
-                    <span style="margin: 0px;">{{$teacher->first_name}} {{$teacher->last_name}}</span></br>
-                    <span class="text-muted" style="font-weight: 500;">{{$teacher->designation}}</span></br> 
+                    <div class="d-flex">
+                        <img class="img-responsive listFlag" style="border: 1px solid black;border-radius: 20px; padding: 6px;height: 37px;width: 37px;" src="{{ asset('/assets/img/flags/4x3').'/'.strtolower(cn($teacher,'university.country.iso_3166_2','')).'.svg' }}" alt="Flag" data-toggle="tooltip" title="" data-placement="top">
+                         <span style="margin: 0px;">{{$teacher->first_name}} {{$teacher->last_name}}</span></br>
+                    </div>
+                    <span class="text-muted" style="font-weight: 500;">{{$teacher->designation}}</span></br>
                     @if(isset($teacher->department_name))
                         <span class="text-muted" style="font-weight: 500;">{{cn($teacher,'department_name.name','')}}</span>
                     @else
@@ -38,9 +41,9 @@
                         </div>
                     </div>
                     @endforeach
-                   
+
                 </div>
-            </div> 
+            </div>
         </div>
     </div>
     <div class="container mt-3">
@@ -93,14 +96,14 @@
         </div>
         <div class="col-md-12 text-end">
             <button type="submit" class="btn btn1 mt-3 mb-3" style="padding: 3px 18px;">Submit</button>
-        </div> 
+        </div>
     </div>
 </form>
 
 <script>
     $(function(){
         // $('.select2').select2();
-        $('#modal_page_footer').hide(); 
+        $('#modal_page_footer').hide();
     });
     </script>
-@endsection
+@endsection

+ 0 - 72
resources/views/ref_search_load.blade.php

@@ -1,72 +0,0 @@
-@if($teacher)
-
-<div class="alert mt-3 mb-3" style="border: 2px solid #e9f0f3 !important; width: 100%; display: -webkit-inline-box;  font-size: 12px !important; font-weight:bold !important; color: black; border-radius: 6px;">
-    <div class="col-md-12">
-        <div class="row">
-            <div class="col-md-10">
-                <span style="margin: 0px;">{{$teacher->first_name}} {{$teacher->last_name}}</span></br>
-                <span class="text-muted" style="font-weight: 500;">{{$teacher->designation}}</span></br>
-                @if(isset($teacher->department_name))
-                    <span class="text-muted" style="font-weight: 500;">{{cn($teacher,'department_name.name','')}}</span>
-                @else
-                    <span class="text-muted" style="font-weight: 500;">{{$teacher->others_department}}</span>
-                @endif
-
-                <span>.</span>
-                <span class="text-muted" style="font-weight: 500;">{{$teacher->university_name}}</span>
-            </div>
-
-            <div class="col-md-2 mt-3">
-                <span class="btn btn3 open_modal_page" data-url="{{route('modal-get',['name'=>'apply_student_proposal','id'=>$teacher->id])}}"  data-title="Submit your Proposal" style="margin-left: 1.1rem;">Apply</span>
-            </div>
-        </div>
-    </div>
-</div>
-@else
-<div class="alert mt-3 mb-3" style="border: 2px solid #e9f0f3 !important; width: 100%; display: -webkit-inline-box;  font-size: 12px !important; font-weight:bold !important; color: black; border-radius: 6px;">
-    <div class="col-md-12">
-        <div class="row">
-            <div class="col-md-12 text-center">
-                <span class="text-danger">No data found!</span>
-            </div>
-        </div>
-    </div>
-</div>
-
-@endif
-
-{{-- @include('web.layouts.modal') --}}
-<script>
-    $(function(){
-        // $('.apply_student').on('click', function(e){
-        //     e.preventDefault();
-        //     var id = $(this).data('id');
-        //     var form_data={
-        //         _token: "{{ csrf_token() }}",
-        //         id: id
-        //     }
-        //     swal(
-        //     //     {
-        //     //     title: "Are you sure?",
-        //     //     text: "Do you want to send email!",
-        //     //     type: "warning",
-        //     //     showCancelButton: true,
-        //     //     confirmButtonClass: "btn-success",
-        //     //     cancelButtonClass: "btn-danger",
-        //     //     confirmButtonText: "Yes",
-        //     //     cancelButtonText: "No"
-        //     // },
-        //     function(isConfirm){
-        //         if(isConfirm){
-        //             $.post("{{ route('ajax-post', ['name'=>'send_apply_student_teacher_email']) }}", form_data, function(res){
-
-        //             if(res.msg) pop_up_msg(res.msg);
-
-        //             }).fail(function(err){
-
-        //             });
-        //         }
-        //     });
-        // });
-    });
-</script>

+ 44 - 39
resources/views/register-v2.blade.php

@@ -6,7 +6,7 @@
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
         <meta name="description" content="Information & Guidance on the PhD Process, Connect with Supervisor and Many" />
         <meta name="keywords" content="" />
-        
+
          <!-- facebook tags -->
          <meta property="og:url" content="http://www.facebook.com/researchadmission"/>
          <meta property="og:type" content="website"/>
@@ -29,8 +29,8 @@
         <link rel="stylesheet" type="text/css" href="{{ asset('web/stylesheets/font-awesome.min.css') }}" />
         <link rel="stylesheet" href="https://unicons.iconscout.com/release/v3.0.6/css/line.css">
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.1.1/css/all.min.css">
-        
-        <!-- Slider -->               
+
+        <!-- Slider -->
         <link rel="stylesheet" href="{{asset('web/css/tiny-slider.css')}}"/>
         <!-- Main Css -->
         <link href="{{asset('web/css/style.css')}}" rel="stylesheet" type="text/css" id="theme-opt" />
@@ -38,7 +38,7 @@
         <link rel="preconnect" href="https://fonts.googleapis.com">
         <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
         <link href="https://fonts.googleapis.com/css2?family=Roboto:wght@400;900&display=swap" rel="stylesheet">
-        
+
         <link rel="preconnect" href="https://fonts.googleapis.com">
         <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
         <link rel="stylesheet" href="{{asset('web/css/datepicker.min.css')}}">
@@ -65,9 +65,9 @@
         border-color: #8492a61f !important;
     }
     .btn1{
-        background-color: #141639c4 !important; 
-        color: #ffff !important; 
-        border-radius: 20px; 
+        background-color: #141639c4 !important;
+        color: #ffff !important;
+        border-radius: 20px;
         box-shadow:none !important;
     }
     .btn1:hover{
@@ -78,29 +78,29 @@
     }
     .bg-left{
         background-color:#141639c4;
-        border:none; 
+        border:none;
         padding:4.5rem;
     }
     .head-line{
-        font-size: 39px !important; 
-        font-weight: bold; 
+        font-size: 39px !important;
+        font-weight: bold;
         line-height: 1.2;
         color:#ffff;
     }
     .sub-line1{
-        font-size: 18px !important; 
-        font-weight: 400; 
+        font-size: 18px !important;
+        font-weight: 400;
         color:#ffff !important;
         font-family:Poppins !important;
     }
     .sub-line2{
-        font-size: 17px !important; 
-        font-weight: bold; 
+        font-size: 17px !important;
+        font-weight: bold;
         color:#ffff !important;
     }
     .bg-white{
-        background-color: #72809f33 !important; 
-        height: 160px; 
+        background-color: #72809f33 !important;
+        height: 160px;
         border: 1px solid #ffff;
     }
     .box-head{
@@ -108,7 +108,7 @@
         color:#ffff;
     }
     .box-sub{
-        font-size:14px; 
+        font-size:14px;
         color:#ffff;
     }
     .d-flex{
@@ -130,7 +130,7 @@
                             <p class="ps-4 mt-4" style="color:white; font-family: poppins !important;">Our free tool is here to help. With our effortless proposal management system, students can submit their proposals with ease, and you'll receive email notifications for each new submission. Say goodbye to the chaos and hello to a stress-free solution that saves you time and keeps you organized. </p>
                             <h2 class="ps-4 mt-4 sub-line1" style="font-weight:bold !important;">Try it today and see the difference it can make for you.</h2>
                         </div>
-                    </div>   
+                    </div>
                     <div class="col-lg-4 cover-my-30">
                         <div class="cover-user-img d-flex align-items-center p-5">
                             <div class="row">
@@ -143,8 +143,8 @@
                                                         {{Session::get('success')}}
                                                     </div>
                                                 @endif
-                                            </div> 
-                                            <div>    
+                                            </div>
+                                            <div>
                                                 @if ($errors->any())
                                                     <div class="alert alert-danger">
                                                         <ul>
@@ -160,15 +160,15 @@
                                                 @csrf
                                                 <input type="hidden" value="2" name="user_type">
                                                 <div class="row mb-3">
-                                                    <div class="col-md-6"> 
+                                                    <div class="col-md-6">
                                                         <input type="text" class="form-control @error('firstname') is-invalid @enderror" name="firstname" value="{{ old('firstname') }}" required  autofocus placeholder="Given Name">
-                        
+
                                                         @error('firstname')
                                                             <div class="alert alert-danger">{{ $message }}</div>
                                                         @enderror
                                                     </div>
                                                     <div class="col-md-6">
-                                                
+
                                                         <input type="text" class="form-control @error('lastname') is-invalid @enderror" name="lastname" value="{{ old('lastname') }}" required  placeholder="Family name">
 
                                                         @error('lastname')
@@ -177,22 +177,27 @@
                                                     </div>
                                                 </div>
 
-                                                <div class="col-md-12 mb-3"> 
+                                                <div class="col-md-12 mb-3">
                                                     <input type="email" class="form-control @error('email') is-invalid @enderror" name="email" value="{{ old('email') }}" required placeholder="Write your official e-mail">
 
                                                     @error('email')
                                                     <div class="alert alert-danger">{{ $message }}</div>
                                                     @enderror
-                                                </div>            
+                                                </div>
 
                                                 <div class="row mb-3">
-                                                    <div class="col-md-12"> 
-                                                            <input  name="universityname" type="text" class="form-control" placeholder="University name">
+                                                    <div class="col-md-12">
+                                                            <select class="form-control" name="university">
+                                                                <option selected disabled>Select University</option>
+                                                                @foreach($universities as $row)
+                                                                    <option value="{{$row->id}}">{{$row->name}}</option>
+                                                                @endforeach
+                                                            </select>
                                                     </div>
                                                 </div>
 
                                                 <div class="col-md-12">
-                                                    <div class="mb-3"> 
+                                                    <div class="mb-3">
                                                         <select class="form-control" name="department" id="department">
                                                             <option selected disabled>Select department</option>
                                                             @foreach($departments as $row)
@@ -204,7 +209,7 @@
                                                 </div>
 
                                                 <div class="col-md-12 others_department" style="display:none;">
-                                                    <div class="mb-3"> 
+                                                    <div class="mb-3">
                                                         <div class="form-icon position-relative">
                                                             <input type="text" class="form-control" name="others_department" placeholder="Others department name">
                                                         </div>
@@ -212,7 +217,7 @@
                                                 </div>
 
                                                 <div class="col-md-12">
-                                                    <div class="mb-3"> 
+                                                    <div class="mb-3">
                                                         <div class="form-icon position-relative">
                                                             <input type="text" class="form-control" name="designation" placeholder="Please enter your designation here" required="" autocomplete="new-password">
                                                         </div>
@@ -220,12 +225,12 @@
                                                 </div>
 
                                                 <div class="col-md-12">
-                                                    <div class="mb-3"> 
+                                                    <div class="mb-3">
                                                         <div class="form-icon position-relative">
                                                             <input type="website" class="form-control" name="universitywebsite" placeholder="website" required="">
                                                         </div>
                                                     </div>
-                                                </div> 
+                                                </div>
                                                 <div class="row mb-4">
                                                     <div class="col-md-12">
                                                         <input id="password" type="password" class="form-control @error('password') is-invalid @enderror" name="password" required autocomplete="new-password" placeholder="Set a password">
@@ -240,16 +245,16 @@
                                                     <div class="col-md-12">
                                                         <input id="password-confirm" type="password" class="form-control" name="password_confirmation" required autocomplete="new-password" placeholder="Confirm password">
                                                     </div>
-                                                </div> 
+                                                </div>
 
                                                 <div class="row mb-3">
-                                                    <div class="col-md-12"> 
+                                                    <div class="col-md-12">
                                                         <button type="submit" class="btn btn1 pull-right">
                                                             {{ __('Submit') }}
                                                         </button>
                                                     </div>
                                                 </div>
-                                                <p class="text-center pb-4" style="margin: 0px !important;"><span> Already registered ?</span><a href="{{ url('login-v2') }}" class="ps-2"><span>Login Here</span></a></p>                       
+                                                <p class="text-center pb-4" style="margin: 0px !important;"><span> Already registered ?</span><a href="{{ url('login-v2') }}" class="ps-2"><span>Login Here</span></a></p>
                                             </form>
                                             </div>
                                          </div>
@@ -257,7 +262,7 @@
                                 </div><!--end col-->
                             </div><!--end row-->
                         </div> <!-- end about detail -->
-                    </div> <!-- end col -->       
+                    </div> <!-- end col -->
                 </div><!--end row-->
             </div><!--end container fluid-->
         </section><!--end section-->
@@ -280,10 +285,10 @@
 <script>
             // $('.dob').datepicker({
             //     dateFormat: 'yy-mm-dd',
-            // }); 
+            // });
 
             $('#department').change(function() {
-                var value = $(this).attr('selected','selected').val();  
+                var value = $(this).attr('selected','selected').val();
                 if (value == "" ) {
                     $('.others_department').show();
                 } else {
@@ -293,4 +298,4 @@
             });
       </script>
 </body>
-</html>
+</html>

+ 7 - 2
resources/views/teacher_profile.blade.php

@@ -516,9 +516,9 @@ tbody, td, tfoot, th, thead, tr {
                                 </div>
                                 <div class="col-md-3">
                                     <div class="mb-1">
-                                            <label class="form-label" for="start date" style="color: white; font-size:12px;">Start Date</label>
+                                            <label class="form-label" for="start_date" style="color: white; font-size:12px;">Start Date</label>
                                         <div class="form-icon position-relative">
-                                            <input name="startdate" type="text" class="form-control start" placeholder="start Date" autocomplete="off">
+                                            <input name="startdate" type="text" class="form-control start_date" placeholder="Start Date" autocomplete="off">
                                         </div>
                                     </div>
                                 </div>
@@ -1106,6 +1106,11 @@ tbody, td, tfoot, th, thead, tr {
 
 
         $(function(){
+
+            $(".start_date").flatpickr({
+                dateFormat: "M y",
+            });
+
             var clipboard = new ClipboardJS('.copy');
 
             clipboard.on('success', function(e){