Ver Fonte

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

Israat Zarin há 1 ano atrás
pai
commit
97e4355894

+ 2 - 0
app/Http/Controllers/ModalController.php

@@ -54,6 +54,8 @@ class ModalController extends Controller{
             $data['std_proposal']=StudentProposal::find($req->id);
         }elseif($name=="edit_doc_required"){
             $data['requirements']=Requirement::find($req->id);
+        }elseif($name=="landing_ragister"){
+
         }else $name='default';
 
 

+ 6 - 2
resources/views/application.blade.php

@@ -44,7 +44,7 @@
                                                         <span style="font-size:10px; font-weight:400;">{{cn($row,'teacher_details.others_department','')}}</span>
                                                     @endif
                                                     <span>.</span>
-                                                    <span style="font-size:10px; font-weight:400;"> {{cn($row,'teacher_details.university_name','')}} </span>
+                                                    <span style="font-size:10px; font-weight:400;"> {{cn($row,'teacher_details.university.name','')}} </span>
                                             </div>
                                         </div>
                                     </div>
@@ -63,7 +63,11 @@
                                                         <span>.</span>
                                                         <span style="font-size:10px;">{{cn($row,'proposal.methology','')}}</span>
                                                         <span>.</span>
-                                                        <span style="font-size:10px;">{{cn($row,'proposal.department','')}}</span>
+                                                        @php
+                                                               $proposal =\DB::table('proposal')->where('id',$row->proposal_id)->first();
+                                                               $department =model('Department')::find($proposal->department);
+                                                            @endphp
+                                                        <span style="font-size:10px;">{{$department->name ?? ''}}</span>
                                                         <span>.</span>
                                                         <span style="font-size:10px;">{{cn($row,'proposal.status','')}}</span>
                                                     </div>

+ 5 - 1
resources/views/home.blade.php

@@ -32,7 +32,7 @@
                                             <div class="form-icon position-relative" style="display:flex;">
                                                 <input type="text" class="form-control search-box" id="teacher_ref_no" placeholder="Please type your Supervisor's ARN here" name="teacher_ref_no" required="">
                                                 <span class="search_button hand search-btn" style="margin-left: -8.8rem; "><span style="display:block; margin-left:11px; margin-top:4px; cursor: pointer;">Search</span></span>
-                                                <a href="{{url()->current()}}" class="ref_button hand search-btn ms-2" style="width: 5%; background-color: #ffbd59 !important; border: 2px solid #ffbd59;"><span style="display:block; margin-left:9px; margin-top:4px; cursor: pointer;"><i class="fa fa-refresh" style="color:#ffff !important;"></i></span></a>
+                                                <span class="ref_button hand search-btn ms-2" style="width: 5%; background-color: #ffbd59 !important; border: 2px solid #ffbd59;"><span style="display:block; margin-left:9px; margin-top:4px; cursor: pointer;"><i class="fa fa-refresh" style="color:#ffff !important;"></i></span></span>
                                                 <!-- <button class="btn btncl"></button>  -->
                                             </div>
                                             <div id="load_data"></div>
@@ -235,6 +235,10 @@
             }
         });
 
+        $('.ref_button').on('click', function(){ 
+            $('#teacher_ref_no').val("");
+        });
+
         // function get_data(){
         //     var base = '{{url('/')}}';
         //     var teacher_ref_no = $('#teacher_ref_no').val();

+ 139 - 3
resources/views/landing.blade.php

@@ -51,8 +51,15 @@
             <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=Montserrat+Alternates&display=swap" rel="stylesheet">
-            <link rel="stylesheet" href="{{ asset('css/pnotify/pnotify.min.css') }}">
+             
+            
+            {{-- Ajax Form Submit --}}
             <link href="{{ asset('css/noty/lib/noty.css') }}" rel="stylesheet" type="text/css">
+            <link rel="stylesheet" href="{{ asset('css/pnotify/pnotify.min.css') }}">
+            <link href="{{ asset('css/noty/lib/themes/sunset.css') }}" rel="stylesheet" type="text/css">
+            <link href="{{ asset('css/flatpickr/dist/flatpickr.min.css') }}" rel="stylesheet" type="text/css">
+            <link href="{{ asset('css/wait-me/waitMe.min.css')}}"  rel="stylesheet" type="text/css"> 
+            <link rel="stylesheet" href="{{ asset('/css/pretty-checkbox/pretty-checkbox.min.css')  }}">
        </head>
        <style>
 
@@ -320,7 +327,7 @@
                                     <div class="flex-1 content p-3 shadow rounded box-white position-relative">
                                         <p class="text-muted1 mt-5 mb-2 text-center">"It seems that only fragments of the original text remain in the Lorem Ipsum texts used today."</p>
                                         <div style="display: flex; justify-content: center;">
-                                            <p class="mt-4 mb-5"><a href="" class="master-link secondary"><strong style="font-weight: bolder !important;">Register Your Interest <i class="fa fa-arrow-right fea icon-sm"></i> </strong> </a></p>    
+                                            <p class="mt-4 mb-5"><span class="master-link secondary open_modal_page" data-title="Register" data-url="{{route('modal-get',['name'=>'landing_ragister'])}}"><strong style="font-weight: bolder !important;">Register Your Interest <i class="fa fa-arrow-right fea icon-sm"></i> </strong> </span></p>    
                                         </div>
                                     </div>
                                 </div>
@@ -372,7 +379,136 @@
         <!-- Main Js -->
         <script src="{{asset('web/js/plugins.init.js')}}"></script>
         <script src="{{asset('web/js/app.js')}}"></script>
+        
+        <script src="{{ asset('css/jquery.min.js') }}"></script>
+        <script src="{{ asset('css/jquery-form/dist/jquery.form.min.js') }}"></script>
         <script src="{{ asset('css/pnotify/pnotify.js') }}"></script>
-        <script src="{{ asset('css/noty/lib/noty.min.js') }}"></script>
+        <script src="{{ asset('css/noty/lib/noty.min.js') }}"></script> 
+        <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){
+    
+                var config={
+                spinner: true
+                }
+    
+                if(typeof args=='object'){
+                config=Object.assign(config, args);
+                }
+    
+                if(config.spinner){
+    
+                $(selector).waitMe({
+                    effect: 'facebook',
+                    text: 'Please! Wait ...'
+                });
+    
+                }
+    
+                $(selector).load(url, null, function(){
+                $(selector).waitMe('hide');
+                if(typeof args=='function') args();
+                });
+    
+            }
+    
+            function wait_me(selector, config=null){
+    
+                if(config){
+    
+                    selector.waitMe(config);
+    
+                }else{
+    
+                    selector.waitMe({
+                        effect: 'facebook',
+                        //color: '#000',
+                        text: 'Please! Wait ...'
+                    });
+                }
+            }
+    
+    
+            function pop_up_msg(msg='No message specified', type='success', callback=null){
+                new Noty({
+                theme:'sunset',
+                text: msg,
+                type: type,
+                timeout:1500,
+                callbacks:{
+                    afterClose: callback
+                }
+                }).show();
+            }
+    
+            function err_msg(err){
+    
+                var msg="Request failed to process, try again later.";
+    
+                if(err.responseJSON && err.responseJSON.msg){
+                msg=err.responseJSON.msg;
+                }
+    
+                return msg;
+    
+            }
+    
+            function ajax_form(form, cllback=null, config={spinner: true}){
+    
+                $('.btn-submit').prop('disabled', true);
+                var redirect=$(form).data('redirect');
+    
+                if(typeof config=='object'){
+    
+                if(config.spinner) wait_me($(form));
+    
+                }
+    
+                $(form).ajaxSubmit({
+                success:function(res){
+    
+                    wait_me($(form), 'hide');
+    
+                    if(res.msg){
+    
+                    pop_up_msg(res.msg, 'success', function(){
+    
+                        $('.btn-submit').prop('disabled', false);
+    
+                        if(redirect) window.location.replace(redirect);
+                        else if(typeof cllback=='function'){
+                        cllback(form, res);
+                        }
+    
+                    });
+    
+                    }
+    
+                    //$.notify(res.msg, 'success');
+                },
+                error:function(res){
+    
+                    wait_me($(form), 'hide');
+    
+                    var msg="Request failed to process, try again later.";
+    
+                    if(res.responseJSON && res.responseJSON.msg){
+                    msg=res.responseJSON.msg;
+                    }
+    
+                    pop_up_msg(msg, 'error');
+                    $('.btn-submit').prop('disabled', false);
+    
+                }
+    
+                });
+    
+            } //End of ajax form definition
+
+            </script>
         </body>
   </html>

+ 69 - 0
resources/views/modal_pages/landing_ragister.blade.php

@@ -0,0 +1,69 @@
+@extends('modal_pages.base')
+<style>
+    .listFlag{
+        height: 20px;
+        border-radius: 50%;
+        width: 20px;
+        margin-right: 5px;
+    }
+    .btn1{
+    background-color: #141639c4 !important;
+    color:white !important;
+    border-radius: 20px;
+    box-shadow:none !important;
+    }
+    .btn1:hover{
+        background: #ffff !important;
+        color: #141639c4 !important;
+        border-radius: 20px;
+        border: 1px solid #141639c4;
+    }
+</style>
+@section('main')
+
+    <div class="container" style="background-color: white; border-radius: 6px;">
+        <div class="row">
+            <div class="co-md-12 p-3">
+                <form class="modal-form" action="{{ url()->current() }}" method="POST" enctype="multipart/form-data">
+                {{ csrf_field() }}
+                    <div class="row">
+                        <div class="col-md-12">
+                            <div class="mb-3">
+                                <label class="form-label"></label>
+                                <div class="form-icon position-relative">
+                                    <input type="name" class="form-control" placeholder="Full Name" name="name" required="">
+                                </div>
+                            </div>
+                        </div>
+                        <div class="col-lg-12" style="margin-top:-18px;">
+                            <div class="mb-3">
+                                <label class="form-label"></label>
+                                <div class="form-icon position-relative">
+                                    <input type="email" class="form-control" placeholder="Email Address" name="email" required="">
+                                </div>
+                            </div>
+                        </div><!--end col-->
+
+                        <div class="col-md-12">
+                            <div class="mt-2 text-center">
+                                <button type="submit" class="btn btn1" style="padding: 3px 18px;">
+                                    {{ __('Invite Now') }}
+                                </button>
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+
+   <script>
+    $(function(){
+        $('#modal_page_footer').hide();
+
+    });
+
+    </script>
+
+
+@endsection

+ 3 - 3
resources/views/teacher_profile.blade.php

@@ -590,7 +590,7 @@ tbody, td, tfoot, th, thead, tr {
                                                     <span>{{cn($row,'student_details.first_name','')}} {{cn($row,'student_details.last_name','')}}</span>
                                                 </div>
                                                 <div style="font-size: 11px;">
-                                                    <a href="" class="" style="color: black;">{{cn($row,'teacher_details.ref_no','')}}<span> (Apply Ref.) </span></a>
+                                                    <a href="" class="" style="color: black;">{{cn($row,'teacher_details.ref_no','')}}<span> ({{$row->student_apply_ref}}) </span></a>
                                                 </div>
                                                 <div style="font-size: 11px;">
                                                     <span style="color: black;">{{ date("d M, Y", strtotime(cn($row,'student_details.dob','')))}}</span>
@@ -705,8 +705,8 @@ tbody, td, tfoot, th, thead, tr {
                                             <td style="font-size: 11px;">{{$key+1}}</td>
                                             <td style="font-size: 11px;">{{$row->name}}</td>
                                             <td style="font-size: 11px;">{{$row->email}}</td>
-                                            <td style="font-size: 11px;">{{date('d M Y', strtotime($row->created_at))}}</td>
-                                            <td style="font-size: 11px;">{{date('d M Y', strtotime($row->created_at))}}</td>
+                                            <td style="font-size: 11px;">{{date('d M Y h.i A', strtotime($row->created_at))}}</td>
+                                            <td style="font-size: 11px;">{{date('d M Y h.i A', strtotime($row->created_at))}}</td>
                                             <td style="font-size: 11px;">
                                                 @if($row->q_form_status==1)
                                                  Q-Apply