@@ -18,10 +18,10 @@ |
||
18 | 18 | } |
19 | 19 | |
20 | 20 | /** |
21 | - * @param array $row |
|
22 | - * |
|
23 | - * @return \Illuminate\Database\Eloquent\Model|null |
|
24 | - */ |
|
21 | + * @param array $row |
|
22 | + * |
|
23 | + * @return \Illuminate\Database\Eloquent\Model|null |
|
24 | + */ |
|
25 | 25 | |
26 | 26 | public function sheets(): array |
27 | 27 | { |
@@ -11,7 +11,7 @@ |
||
11 | 11 | |
12 | 12 | public function boot() { |
13 | 13 | $this->app->validator->resolver( function( $translator, $data, $rules, |
14 | - $messages = array(), $customAttributes = array() ) { |
|
14 | + $messages = array(), $customAttributes = array() ) { |
|
15 | 15 | return new ValidatorExtended( $translator, $data, $rules, $messages, |
16 | 16 | $customAttributes ); |
17 | 17 | } ); |
@@ -52,8 +52,8 @@ discard block |
||
52 | 52 | protected function mapWebRoutes() |
53 | 53 | { |
54 | 54 | Route::middleware('web') |
55 | - ->namespace($this->namespace) |
|
56 | - ->group(base_path('routes/web.php')); |
|
55 | + ->namespace($this->namespace) |
|
56 | + ->group(base_path('routes/web.php')); |
|
57 | 57 | } |
58 | 58 | |
59 | 59 | /** |
@@ -66,8 +66,8 @@ discard block |
||
66 | 66 | protected function mapApiRoutes() |
67 | 67 | { |
68 | 68 | Route::prefix('api') |
69 | - ->middleware('api') |
|
70 | - ->namespace($this->namespace) |
|
71 | - ->group(base_path('routes/api.php')); |
|
69 | + ->middleware('api') |
|
70 | + ->namespace($this->namespace) |
|
71 | + ->group(base_path('routes/api.php')); |
|
72 | 72 | } |
73 | 73 | } |
@@ -78,41 +78,41 @@ |
||
78 | 78 | $this->count += 1; |
79 | 79 | $this->student = $student ; |
80 | 80 | try{ |
81 | - Institution_student::create([ |
|
82 | - 'student_status_id' => 1, |
|
83 | - 'student_id' => $student['student_id'], |
|
84 | - 'education_grade_id' => $student['education_grade_id'], |
|
85 | - 'academic_period_id' => $student['academic_period_id'], |
|
86 | - 'start_date' => $student['start_date'], |
|
87 | - 'start_year' => \Carbon\Carbon::createFromFormat('Y-m-d H:i:s', $student['start_date'])->year , // $student['start_date']->format('Y'), |
|
88 | - 'end_date' => $student['end_date'], |
|
89 | - 'end_year' => \Carbon\Carbon::createFromFormat('Y-m-d H:i:s', $student['end_date'])->year , //$student['end_date']->format('Y'), |
|
90 | - 'institution_id' => $student['institution_id'], |
|
91 | - 'admission_id' => $student['admission_id'], |
|
92 | - 'created_user_id' => $student['created_user_id'], |
|
93 | - ]); |
|
94 | - |
|
95 | - if(!is_null($student['institution_class_id'])){ |
|
96 | - Institution_class_student::create([ |
|
97 | - 'student_id' => $student['student_id'], |
|
98 | - 'institution_class_id' => $student['institution_class_id'], |
|
99 | - 'education_grade_id' => $student['education_grade_id'], |
|
100 | - 'academic_period_id' => $student['academic_period_id'], |
|
101 | - 'institution_id' =>$student['institution_id'], |
|
102 | - 'student_status_id' => 1, |
|
103 | - 'created_user_id' => $student['created_user_id'], |
|
104 | - ]); |
|
105 | - } |
|
81 | + Institution_student::create([ |
|
82 | + 'student_status_id' => 1, |
|
83 | + 'student_id' => $student['student_id'], |
|
84 | + 'education_grade_id' => $student['education_grade_id'], |
|
85 | + 'academic_period_id' => $student['academic_period_id'], |
|
86 | + 'start_date' => $student['start_date'], |
|
87 | + 'start_year' => \Carbon\Carbon::createFromFormat('Y-m-d H:i:s', $student['start_date'])->year , // $student['start_date']->format('Y'), |
|
88 | + 'end_date' => $student['end_date'], |
|
89 | + 'end_year' => \Carbon\Carbon::createFromFormat('Y-m-d H:i:s', $student['end_date'])->year , //$student['end_date']->format('Y'), |
|
90 | + 'institution_id' => $student['institution_id'], |
|
91 | + 'admission_id' => $student['admission_id'], |
|
92 | + 'created_user_id' => $student['created_user_id'], |
|
93 | + ]); |
|
94 | + |
|
95 | + if(!is_null($student['institution_class_id'])){ |
|
96 | + Institution_class_student::create([ |
|
97 | + 'student_id' => $student['student_id'], |
|
98 | + 'institution_class_id' => $student['institution_class_id'], |
|
99 | + 'education_grade_id' => $student['education_grade_id'], |
|
100 | + 'academic_period_id' => $student['academic_period_id'], |
|
101 | + 'institution_id' =>$student['institution_id'], |
|
102 | + 'student_status_id' => 1, |
|
103 | + 'created_user_id' => $student['created_user_id'], |
|
104 | + ]); |
|
105 | + } |
|
106 | 106 | $output->writeln(' |
107 | 107 | #################################################### |
108 | 108 | Total number of students updated : '.$this->count.' |
109 | 109 | # # |
110 | 110 | ####################################################' ); |
111 | 111 | // $output->writeln(); |
112 | - }catch (\Exception $e){ |
|
112 | + }catch (\Exception $e){ |
|
113 | 113 | // echo $e->getMessage(); |
114 | - $output->writeln( $e->getMessage()); |
|
115 | - } |
|
114 | + $output->writeln( $e->getMessage()); |
|
115 | + } |
|
116 | 116 | } |
117 | 117 | } |
118 | 118 |
@@ -25,8 +25,8 @@ |
||
25 | 25 | */ |
26 | 26 | protected function schedule(Schedule $schedule) |
27 | 27 | { |
28 | - $schedule->command('import:students') |
|
29 | - ->cron('* * * * * '); |
|
28 | + $schedule->command('import:students') |
|
29 | + ->cron('* * * * * '); |
|
30 | 30 | } |
31 | 31 | |
32 | 32 | /** |
@@ -42,7 +42,7 @@ |
||
42 | 42 | protected $dates = ['date_opened', 'date_closed', 'modified', 'created']; |
43 | 43 | |
44 | 44 | public function isActive($id){ |
45 | - return self::query()->find($id)->get()->first()->institution_status_id == 1; |
|
45 | + return self::query()->find($id)->get()->first()->institution_status_id == 1; |
|
46 | 46 | } |
47 | 47 | |
48 | 48 | } |
@@ -71,8 +71,8 @@ |
||
71 | 71 | |
72 | 72 | public function permissions(){ |
73 | 73 | return $this->hasMany('App\Models\Security_group_user','security_user_id','id') |
74 | - ->where('security_group_users.security_role_id','=',5) |
|
75 | - ->with(['security_group_institution','institution_staff','security_group' , 'staff_class','institution_group' , 'roles']); |
|
74 | + ->where('security_group_users.security_role_id','=',5) |
|
75 | + ->with(['security_group_institution','institution_staff','security_group' , 'staff_class','institution_group' , 'roles']); |
|
76 | 76 | } |
77 | 77 | |
78 | 78 | public function principal(){ |
@@ -45,8 +45,8 @@ |
||
45 | 45 | public function build() |
46 | 46 | { |
47 | 47 | return $this->view('emails.mail') |
48 | - ->from($this->from_address,$this->from_name) |
|
49 | - ->to($this->user->email) |
|
48 | + ->from($this->from_address,$this->from_name) |
|
49 | + ->to($this->user->email) |
|
50 | 50 | ->subject($this->subject) |
51 | 51 | ->with($this->with); |
52 | 52 | } |
@@ -11,11 +11,11 @@ |
||
11 | 11 | { |
12 | 12 | use Queueable, SerializesModels; |
13 | 13 | |
14 | - /** |
|
15 | - * Create a new message instance. |
|
16 | - * |
|
17 | - * @return void |
|
18 | - */ |
|
14 | + /** |
|
15 | + * Create a new message instance. |
|
16 | + * |
|
17 | + * @return void |
|
18 | + */ |
|
19 | 19 | public function __construct($file) |
20 | 20 | { |
21 | 21 |