Merge branch 'master' of https://revinr.site/mostafij-revinr/student-admission

app/Http/Controllers/Admin/SubContentController.php

@@ -7,6 +7,7 @@ use Illuminate\Http\Request;
 use \App\Helpers\PageSL;
 use App\Models\University;
 use App\Models\MarketCountry;
+use App\Models\Department;
 use App\StudentProposal;
 use Auth;
 
@@ -39,7 +40,9 @@ class SubContentController extends Controller
 			$data['tuser'] =$tuser;
 			$data['students'] = StudentProposal::where('teacher_id',$tuser->id)->get(); 
 			
-		}else $name='default'; 
+		}elseif($name=="load_department"){
+			$data['departments'] =Department::where('status',1)->orderBy('name','ASC')->get();
+		}else $name='default';  
 		//$data['page_sl']=new PageSL($data['chapter_details']); 
 		return view("admin.sub_contents.{$name}", $data);
 

app/Http/Controllers/AjaxController.php

@@ -142,6 +142,7 @@ class AjaxController extends Controller
 
             $data =new Department; 
             $data->name =$req->dapartment; 
+            $data->status =1; 
             $data->save();
 
             return response(

app/Http/Controllers/ModalController.php

@@ -36,6 +36,8 @@ class ModalController extends Controller{
 
         }elseif($name=="add_destination"){
 
+        }elseif($name=="change_password"){
+
         }else $name='default';
 
         return view("modal_pages.{$name}", $data);

resources/views/admin/admin_profile.blade.php

@@ -853,8 +853,9 @@ tbody, td, tfoot, th, thead, tr {
                                                         <button class="btn btn2 add_department" style="margin-left: -3.4rem; border-radius: 0px 6px 6px 0px">Add</button>
                                                     </div>
                                                 </div>
-                                                    <div class="single_glance_row mt-5" style="border-bottom: 1px solid #e8eef1;">
-                                                        <div style="display: flex">
+                                                    <div class="single_glance_row mt-5">
+                                                        <div id="load_department"></div>
+                                                        {{-- <div style="display: flex">
                                                         <div class="left" style="width: 80%;">
                                                             <span class="title" style="font-size:11px;">Math</span>
                                                         </div>
@@ -868,7 +869,7 @@ tbody, td, tfoot, th, thead, tr {
                                                                 <button type="button" class="btn btn2" style="padding: 2px 5px !important; font-size: 11px;"><i class="fa fa-trash"></i></button>
                                                             </span>
                                                         </div>
-                                                        </div>
+                                                        </div> --}}
                                                                 <!-- Tab -->
                                                         <div class="col-md-12">
                                                             <div id="demo16" class="collapse mt-2">
@@ -885,7 +886,7 @@ tbody, td, tfoot, th, thead, tr {
                                                                             </div>     
                                                                             <div class="col-md-12">
                                                                                 <div class="text-end">
-                                                                                    <button class="btn btn2">Update</button>                                                                                                                
+                                                                                    <button class="btn btn2">Update</button>                      
                                                                                 </div>
                                                                             </div> 
                                                                     </form>
@@ -1163,6 +1164,12 @@ tbody, td, tfoot, th, thead, tr {
             });
 
 
+            fetch_sub_content(
+                '#load_department',
+                "{{ route('sub-content', ['name'=>'load_department']) }}"
+            );
+
+
             $('.add_department').on('click', function(){  
 
                 var dapartment =$('#dapartment').val(); 

resources/views/admin/sub_contents/load_department.blade.php

@@ -0,0 +1,23 @@
+@extends('admin.sub_contents.base')  
+@section('main') 
+@foreach($departments as $row)
+<div class="mt-2" style="border-bottom: 1px solid #e8eef1;">
+<div style="display: flex; margin-top:2px;">
+    <div class="left" style="width: 80%;">
+        <span class="title" style="font-size:11px;">{{$row->name}}</span>
+    </div>
+    <div class="right" style="width: 20%;">
+        <span class="title" style="font-size:11px; font-weight: 600;">
+            <a role="button" data-bs-toggle="collapse" data-bs-parent="#collapse" href="#collapse1" aria-expanded="true" aria-controls="collapse1">
+                <button type="button" class="btn btn2" data-toggle="collapse" data-target="#demo16" style="padding: 2px 5px !important; font-size: 11px;"><i class="fa fa-pencil"></i></button>
+            </a>
+        </span>
+        <span class="title" style="font-size:11px; font-weight: 600;">
+            <button type="button" class="btn btn2" style="padding: 2px 5px !important; font-size: 11px;"><i class="fa fa-trash"></i></button>
+        </span>
+    </div>
+</div>      
+</div>      
+@endforeach  
+ 
+@endsection

resources/views/modal_pages/change_password.blade.php

@@ -0,0 +1,28 @@
+@extends('modal_pages.base')
+<style>
+    .listFlag{
+        height: 20px;
+        border-radius: 50%;
+        width: 20px;
+        margin-right: 5px;
+    }
+</style>
+@section('main')
+ 
+    <div class="container mt-3" style="background-color: white; border-radius: 6px;">
+        <div class="row">
+            <div class="co-md-12 p-3">
+                 test 
+                 
+            </div>
+        </div> 
+    </div>  
+<script>
+    
+    $(function(){
+        // $('.select2').select2();
+        $('#modal_page_footer').hide();
+        
+    )};
+    </script>
+@endsection

resources/views/teacher_profile.blade.php

@@ -335,7 +335,7 @@ tbody, td, tfoot, th, thead, tr {
                                 </ul>
                                 <ul class="nav navbar-nav align-items-center ml-auto header_right ps-2">
                                     <li class="nav-item dropdown dropdown-notification">
-                                        <a href="">
+                                        <a href="javascript:void(0)" class="open_modal_page" data-url="{{route('modal-get',['name'=>'change_password'])}}" data-title="Change Password">
                                             <i class="fa fa-shopping-bag change_pass_btn"></i>
                                         </a>
                                     </li>
@@ -1008,6 +1008,7 @@ tbody, td, tfoot, th, thead, tr {
         <script src="{{ asset('css/flatpickr/dist/flatpickr.min.js') }}"></script>
         <script src="{{ asset('css/wait-me/waitMe.min.js')}}"></script> 
 
+        @include('web.layouts.modal')
       <script>
         function fetch_sub_content(selector, url, args=null){