teacher profile

app/Helpers/functions.php

@@ -202,5 +202,20 @@ if(!function_exists('work_experience')){
 	}
 }
 
+if(!function_exists('diff_in_days')){
+
+	function diff_in_days($sd, $ed){ 
+		$c=new \Carbon\Carbon;
+
+		if(is_string($sd)) $sd=$c->parse($sd);
+
+		if(is_string($ed)) $ed=$c->parse($ed);
+
+		return $sd->diffInDays($ed, FALSE);
+
+	}
+
+}
+
  
  

app/Http/Controllers/AjaxController.php

@@ -336,10 +336,9 @@ class AjaxController extends Controller
             );
             
         }elseif($name=="accept_status_update"){
-            $data =StudentProposal::find($req->id);
-            $data->proposal_status =1;
+            $data =StudentProposal::find($req->id); 
+            $data->accepted_status =1;
             $data->accepted_date =now();
-            $data->proposal_status_date =now();
             $data->update();
 
             return response([

app/StudentProposal.php

@@ -29,4 +29,9 @@ class StudentProposal extends Model
     {
         return $this->belongsTo(Proposal::class, 'proposal_id','id');
     } 
+
+    public function work_experience_date()
+    {
+        return $this->hasMany(Workexperience::class, 'student_id','student_id');
+    } 
 }

resources/views/teacher_profile.blade.php

@@ -555,21 +555,37 @@ tbody, td, tfoot, th, thead, tr {
                                                     <span style="color: black;">{{cn($row,'scores.overall_score','')}}</span>
                                                 </div>
                                             </td>
-                                            <td style="font-size: 11px; text-align:center;">
-                                                <div style="font-size: 11px; display:block;">
-                                                    @php
-                                                        if(!empty($row->work_experience->end_date)){
-                                                            $to = \Carbon\Carbon::parse($row->work_experience->end_date);  
-                                                            $from = \Carbon\Carbon::parse($row->work_experience->start_date); 
-                                                            $years = $to->diffInYears($from);
-                                                        }
-                                                    @endphp
-                                                    {{--<span class="label_badge_work">@if($years) {{$years}} years @endif</span>--}}
+                                            <td style="font-size: 11px; text-align:center;"> 
+                                                @php 
+
+                                                    $work_history_first =$row->work_experience_date()->whereNotNull('start_date')->oldest()->first();  
+
+                                                    $work_history_last =$row->work_experience_date()->latest()->first();
+                                                    if($work_history_first && $work_history_last && $work_history_last->end_date){ 
+
+                                                    $diff_in_days =diff_in_days($work_history_first->start_date,$work_history_last->end_date);
+
+                                                    }elseif($work_history_first){
+                                                    $diff_in_days =diff_in_days($work_history_first->start_date, now());
+                                                    }else{
+                                                    $diff_in_days =0;
+                                                    } 
+
+                                                    $years = ($diff_in_days / 365) ;
+                                                    $years = floor($years); 
+                                                    $month = ($diff_in_days % 365) / 30.5; 
+                                                    $month = floor($month); 
+                                                    $days = ($diff_in_days % 365) % 30.5; 
+                                                  @endphp
+                                                    
+                                                   
+                                                <div style="font-size: 11px; display:block;"> 
+                                                    <span class="label_badge_work">{{$years}} years</span>
                                                 </div>
                                                 <div style="font-size: 11px; display:block;">
-                                                     @if(empty($row->work_experience->end_date))
-                                                    {{--<span>{{date('M Y', strtotime($row->work_experience->start_date))}} - continue</span>--}}
-                                                    @endif 
+
+                                                    ({{ dDate($work_history_first->start_date) }} - {{dDate($work_history_last->end_date, 'd M Y', 'Continue')}}) 
+                                                     
                                                 </div>
                                             </td>
                                             <td style="font-size: 11px;">
@@ -585,7 +601,7 @@ tbody, td, tfoot, th, thead, tr {
                                             <td style="font-size: 11px; text-align:center;">
                                                
                                                 <div class="top_part_status">
-                                                    @if($row->proposal_status ==1)
+                                                    {{-- @if($row->proposal_status ==1)
                                                         <button class="btn btn2" style="padding: 1px 10px !important; font-size: 11px;">In Review</button>
                                                     @elseif($row->proposal_status ==2)
                                                         <button class="btn btn2" style="padding: 1px 10px !important; font-size: 11px;">Pause</button>
@@ -593,6 +609,9 @@ tbody, td, tfoot, th, thead, tr {
                                                         <button class="btn btn2" style="padding: 1px 10px !important; font-size: 11px;">Rejected</button>
                                                     @elseif($row->proposal_status ==4)
                                                         <button class="btn btn2" style="padding: 1px 10px !important; font-size: 11px;">Interested</button>
+                                                    @else --}}
+                                                    @if($row->accepted_status==1)
+                                                    <button class="btn btn2" style="padding: 1px 10px !important; font-size: 11px;">In Review</button>
                                                     @else
                                                     <button class="btn btn2 accept_status_update" data-id="{{$row->id}}" style="padding: 1px 10px !important; font-size: 11px;">Accept</button>
                                                     @endif 

sql/update.sql

@@ -0,0 +1,101 @@
+ALTER TABLE `student_proposals` ADD `proposal_quality` INT(11) NULL DEFAULT NULL COMMENT '0=\'accept, 1=in-review,2-pause,3=rejected,4=intarested' AFTER `proposal_id`, ADD `concept` TINYINT(4) NOT NULL DEFAULT '1' AFTER `proposal_quality`, ADD `proposal_status` INT(11) NULL DEFAULT NULL AFTER `concept`, ADD `accepted_date` DATE NULL DEFAULT NULL AFTER `proposal_status`, ADD `proposal_status_date` DATE NULL DEFAULT NULL AFTER `accepted_date`, ADD `feedback_msg` VARCHAR(255) NULL DEFAULT NULL AFTER `proposal_status_date`;
+
+
+CREATE TABLE `refer_users` (
+	`id` INT(11) NOT NULL AUTO_INCREMENT,
+	`refer_by` INT(11) NULL DEFAULT NULL,
+	`teacher_id` INT(11) NULL DEFAULT NULL,
+	`name` VARCHAR(255) NULL DEFAULT NULL COLLATE 'utf8mb4_general_ci',
+	`email` VARCHAR(255) NULL DEFAULT NULL COLLATE 'utf8mb4_general_ci',
+	`signup` TINYINT(4) NULL DEFAULT '0',
+	`created_at` TIMESTAMP NULL DEFAULT NULL,
+	`updated_at` TIMESTAMP NULL DEFAULT NULL,
+	PRIMARY KEY (`id`) USING BTREE
+)
+COLLATE='utf8mb4_general_ci'
+ENGINE=InnoDB 
+;
+
+CREATE TABLE `research_interests` (
+	`id` INT(11) NOT NULL AUTO_INCREMENT,
+	`teacher_id` INT(11) NULL DEFAULT NULL,
+	`research` VARCHAR(255) NULL DEFAULT NULL COLLATE 'utf8mb4_general_ci',
+	PRIMARY KEY (`id`) USING BTREE
+)
+COLLATE='utf8mb4_general_ci'
+ENGINE=InnoDB 
+;
+
+CREATE TABLE `student_proposals` (
+	`id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
+	`student_id` INT(10) UNSIGNED NOT NULL,
+	`student_apply_ref` VARCHAR(255) NULL DEFAULT NULL COLLATE 'utf8mb4_general_ci',
+	`teacher_id` INT(10) UNSIGNED NOT NULL,
+	`proposal_id` INT(11) NULL DEFAULT NULL,
+	`proposal_quality` INT(11) NULL DEFAULT NULL,
+	`concept` TINYINT(4) NULL DEFAULT '1',
+	`proposal_status` TINYINT(4) NULL DEFAULT NULL,
+	`accepted_date` DATE NULL DEFAULT NULL,
+	`proposal_status_date` DATE NULL DEFAULT NULL,
+	`feedback_msg` VARCHAR(255) NULL DEFAULT NULL COLLATE 'utf8mb4_general_ci',
+	`start_year` INT(10) UNSIGNED NOT NULL,
+	`start_month` INT(10) UNSIGNED NOT NULL,
+	`created_by` INT(10) UNSIGNED NOT NULL,
+	`created_at` TIMESTAMP NULL DEFAULT NULL,
+	`updated_at` TIMESTAMP NULL DEFAULT NULL,
+	PRIMARY KEY (`id`) USING BTREE
+)
+COLLATE='utf8mb4_general_ci'
+ENGINE=InnoDB 
+;
+
+CREATE TABLE `universities` (
+	`id` INT(11) NOT NULL AUTO_INCREMENT,
+	`country_id` INT(11) NOT NULL,
+	`name` VARCHAR(255) NOT NULL COLLATE 'latin1_swedish_ci',
+	`email` VARCHAR(255) NULL DEFAULT NULL COLLATE 'latin1_swedish_ci',
+	`web_address` VARCHAR(255) NULL DEFAULT NULL COLLATE 'latin1_swedish_ci',
+	`uni_type` VARCHAR(255) NULL DEFAULT NULL COLLATE 'latin1_swedish_ci',
+	`short_name` VARCHAR(255) NULL DEFAULT NULL COLLATE 'latin1_swedish_ci',
+	`status` INT(11) NOT NULL DEFAULT '0',
+	`created_at` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+	`updated_at` TIMESTAMP NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP,
+	PRIMARY KEY (`id`) USING BTREE
+)
+COLLATE='latin1_swedish_ci'
+ENGINE=InnoDB 
+;
+
+CREATE TABLE `market_countries` (
+	`id` INT(11) NOT NULL AUTO_INCREMENT,
+	`country_id` INT(11) NOT NULL,
+	`company_id` INT(11) NULL DEFAULT NULL,
+	`status` INT(11) NOT NULL DEFAULT '1',
+	`status_by` INT(11) NULL DEFAULT NULL,
+	`added_by` INT(11) NULL DEFAULT NULL,
+	`created_at` TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP,
+	`updated_at` TIMESTAMP NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP,
+	PRIMARY KEY (`id`) USING BTREE
+)
+COLLATE='latin1_swedish_ci'
+ENGINE=InnoDB 
+;
+
+CREATE TABLE `proposal` (
+	`id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
+	`student_id` INT(11) NOT NULL,
+	`proposal_ref` VARCHAR(255) NULL DEFAULT NULL COLLATE 'utf8mb4_unicode_ci',
+	`title` VARCHAR(255) NOT NULL COLLATE 'utf8mb4_unicode_ci',
+	`methology` VARCHAR(255) NULL DEFAULT NULL COLLATE 'utf8mb4_unicode_ci',
+	`department` INT(11) NULL DEFAULT NULL,
+	`status` VARCHAR(255) NULL DEFAULT NULL COLLATE 'utf8mb4_unicode_ci',
+	`created_at` TIMESTAMP NULL DEFAULT NULL,
+	`updated_at` TIMESTAMP NULL DEFAULT NULL,
+	`document_file` VARCHAR(255) NULL DEFAULT NULL COLLATE 'utf8mb4_unicode_ci',
+	`file_type` VARCHAR(8) NULL DEFAULT NULL COLLATE 'utf8mb4_unicode_ci',
+	PRIMARY KEY (`id`) USING BTREE
+)
+COLLATE='utf8mb4_unicode_ci'
+ENGINE=InnoDB 
+;
+