|
@@ -100,16 +100,11 @@ class ModalController extends Controller{
|
|
|
return response(['msg'=>$errors[0]], 422);
|
|
|
}
|
|
|
|
|
|
- $already_exists = StudentProposal::where('student_id',$req->student_id)->exists();
|
|
|
+ $already_exists = StudentProposal::where('student_id',$req->student_id)->where('proposal_submit_status',1)->exists();
|
|
|
if($already_exists){
|
|
|
return response(['msg'=>'Sorry! You already submitted. You can not submit proposal.'],403);
|
|
|
}
|
|
|
|
|
|
- //$publication =Publication::where('student_id',$req->student_id)->doesntExist();
|
|
|
- //$worK_exp =Workexperience::where('student_id',$req->student_id)->doesntExist();
|
|
|
- //$institution =Institution::where('student_id',$req->student_id)->doesntExist();
|
|
|
- //$score =Score::where('student_id',$req->student_id)->doesntExist();
|
|
|
-
|
|
|
$publication =User::where('id',$req->student_id)->whereNull('is_publication')->exists();
|
|
|
$worK_exp =User::where('id',$req->student_id)->whereNull('is_work_experience')->exists();
|
|
|
$institution =User::where('id',$req->student_id)->whereNull('is_education')->exists();
|
|
@@ -125,23 +120,25 @@ class ModalController extends Controller{
|
|
|
$student_proposal->proposal_id =$req->proposal_id;
|
|
|
$student_proposal->start_year =$req->startdate;
|
|
|
$student_proposal->start_month =$req->startmonth;
|
|
|
- $student_proposal->created_by =$user->id;
|
|
|
$student_proposal->student_apply_ref =studentRefNoGenerate();
|
|
|
+ $student_proposal->proposal_submit_status = 1;
|
|
|
+ $student_proposal->submitted_date = now();
|
|
|
+ $student_proposal->created_by =$req->student_id;
|
|
|
$student_proposal->save();
|
|
|
|
|
|
$student_data =User::find($student_proposal->student_id);
|
|
|
$student_data->freez_profile =1;
|
|
|
$student_data->update();
|
|
|
|
|
|
- $proposal_user =User::find($student_proposal->teacher_id);
|
|
|
+ $teacher =User::find($student_proposal->teacher_id);
|
|
|
|
|
|
- if($user){
|
|
|
+ if($student_data){
|
|
|
$data['name'] = $student_data->first_name.' '.$student_data->last_name;
|
|
|
- $data['teacher'] = $proposal_user->first_name.' '.$proposal_user->last_name;
|
|
|
- $data['university'] = $proposal_user->university_name;
|
|
|
+ $data['teacher'] = $teacher->first_name.' '.$teacher->last_name;
|
|
|
+ $data['university'] = $teacher->university_name;
|
|
|
$data['submission_date'] = $student_data->created_at;
|
|
|
$data['receive_email']=$student_data->email;
|
|
|
- //$data['arn'] = $proposal_user->ref_no;
|
|
|
+ //$data['arn'] = $teacher->ref_no;
|
|
|
$user_mail =$student_data->email;
|
|
|
$from = 'asraful@revinr.com';
|
|
|
Mail::send('email.student_proposal_email',$data, function ($message) use ($user_mail,$from,$student_proposal) {
|
|
@@ -156,13 +153,13 @@ class ModalController extends Controller{
|
|
|
'id',$student_proposal->proposal_id
|
|
|
)->first();
|
|
|
|
|
|
- if($proposal_user){
|
|
|
- $data['name'] = $proposal_user->first_name.' '.$proposal_user->last_name;
|
|
|
+ if($teacher){
|
|
|
+ $data['name'] = $teacher->first_name.' '.$teacher->last_name;
|
|
|
$data['std_name'] = $user->first_name.' '.$user->last_name;
|
|
|
$data['proposal_title'] =$proposal->title;
|
|
|
- $data['date_time']=$student_proposal->created_at;
|
|
|
- $data['receive_email']=$proposal_user->email;
|
|
|
- $user_mail =$proposal_user->email;
|
|
|
+ $data['date_time']=$student_proposal->submitted_date;
|
|
|
+ $data['receive_email']=$teacher->email;
|
|
|
+ $user_mail =$teacher->email;
|
|
|
$from = 'asraful@revinr.com';
|
|
|
Mail::send('email.teacher_proposal_email',$data, function ($message) use ($user_mail,$from) {
|
|
|
$message->from($from);
|
|
@@ -221,7 +218,7 @@ class ModalController extends Controller{
|
|
|
|
|
|
$teacher =User::find($student_proposal->teacher_id);
|
|
|
|
|
|
- if($user){
|
|
|
+ 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;
|
|
@@ -246,7 +243,7 @@ class ModalController extends Controller{
|
|
|
$data['name'] = $teacher->first_name.' '.$teacher->last_name;
|
|
|
$data['std_name'] = $student_data->first_name.' '.$student_data->last_name;
|
|
|
$data['proposal_title'] =$proposal->title;
|
|
|
- $data['date_time']=$student_proposal->created_at;
|
|
|
+ $data['date_time']=$student_proposal->submitted_date;
|
|
|
$data['receive_email']=$teacher->email;
|
|
|
$user_mail =$teacher->email;
|
|
|
$from = 'asraful@revinr.com';
|