|
@@ -19,14 +19,14 @@ class TeacherHomeController extends Controller
|
|
|
public function __construct()
|
|
|
{
|
|
|
$this->middleware('teacher');
|
|
|
- }
|
|
|
+ }
|
|
|
public function teacher_profile(Request $request)
|
|
|
- { $user = Auth::guard('teacher')->user();
|
|
|
+ { $user = Auth::guard('teacher')->user();
|
|
|
$students = StudentProposal::where(
|
|
|
'teacher_id',$user->id
|
|
|
)->where(
|
|
|
'proposal_submit_status',1
|
|
|
- )->get();
|
|
|
+ )->get();
|
|
|
$departments =Department::where('status',1)->orderBy('name','ASC')->get();
|
|
|
|
|
|
$refer_users =User::where(
|
|
@@ -34,7 +34,7 @@ class TeacherHomeController extends Controller
|
|
|
)->whereIn(
|
|
|
'register_type',[3,4]
|
|
|
)->orderBy('id','DESC')->get();
|
|
|
-
|
|
|
+
|
|
|
$universities =University::orderBy('name','ASC')->get();
|
|
|
return view('teacher_profile',compact('students','user','departments','refer_users','universities'));
|
|
|
}
|
|
@@ -48,30 +48,30 @@ class TeacherHomeController extends Controller
|
|
|
|
|
|
$experience =Workexperience::where(
|
|
|
'student_id',$proposal_details->student_id
|
|
|
- )->get();
|
|
|
+ )->get();
|
|
|
|
|
|
- if(isset($experience)){
|
|
|
- $work_experince =[];
|
|
|
- foreach($experience as $key=>$row){
|
|
|
+ if(isset($experience)){
|
|
|
+ $work_experince =[];
|
|
|
+ foreach($experience as $key=>$row){
|
|
|
array_push($work_experince,$row->start_date);
|
|
|
- array_push($work_experince,$row->end_date);
|
|
|
- }
|
|
|
+ array_push($work_experince,$row->end_date);
|
|
|
+ }
|
|
|
|
|
|
- $start_date = current($work_experince);
|
|
|
- $end_date = end($work_experince);
|
|
|
- }
|
|
|
+ $start_date = current($work_experince);
|
|
|
+ $end_date = end($work_experince);
|
|
|
+ }
|
|
|
|
|
|
$doc_info =Requirement::where(
|
|
|
'std_proposal_id',$proposal_details->id
|
|
|
)->get();
|
|
|
-
|
|
|
+
|
|
|
return view('teacher.student_proposal_details',compact('proposal_details','education_history','start_date','end_date','doc_info'));
|
|
|
}
|
|
|
|
|
|
|
|
|
public function search()
|
|
|
{
|
|
|
- $input = Input::all();
|
|
|
+ $input = Input::all();
|
|
|
$request = (object) $input;
|
|
|
$carbon=new \Carbon\Carbon;
|
|
|
$teacher = Auth::guard('teacher')->user();
|
|
@@ -88,36 +88,38 @@ class TeacherHomeController extends Controller
|
|
|
|
|
|
if (isset($input['proposal_status'])) {
|
|
|
$students->where('proposal_status',$input['proposal_status']);
|
|
|
- }
|
|
|
+ }
|
|
|
|
|
|
if($request->submitted_date){
|
|
|
- $date_array = explode("to",$request->submitted_date);
|
|
|
+ $date_array = explode("to",$request->submitted_date);
|
|
|
|
|
|
$from_month_year = date('m-Y', strtotime($date_array[0]));
|
|
|
$to_month_year = date('m-Y', strtotime($date_array[1]));
|
|
|
+ dd($to_month_year);
|
|
|
|
|
|
$start_date=$carbon->parse('01-'.$from_month_year)->toDateString();
|
|
|
- $end_date=$carbon->parse('01-'.$to_month_year)->toDateString();
|
|
|
-
|
|
|
- $students->whereRaw("DATE(submitted_date) >= ? AND DATE(submitted_date) <= ?", [$start_date, $end_date]);
|
|
|
- }
|
|
|
-
|
|
|
+ $end_date=$carbon->parse('01-'.$to_month_year)->toDateString();
|
|
|
+
|
|
|
+ $students->whereRaw("DATE(submitted_date) >= ? AND DATE(submitted_date) <= ?", [$start_date, $end_date]);
|
|
|
+ }
|
|
|
+
|
|
|
|
|
|
-
|
|
|
+
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
- $data=[
|
|
|
- 'students' => $students->paginate(50),
|
|
|
- ];
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ $data=[
|
|
|
+ 'students' => $students->get(),
|
|
|
+ 'user'=> Auth::guard('teacher')->user(),
|
|
|
+ ];
|
|
|
+
|
|
|
return view('teacher.load_application',$data);
|
|
|
}
|
|
|
}
|