@@ -28,17 +28,17 @@ discard block |
||
28 | 28 | $this->academic_period = new Academic_period(); |
29 | 29 | $this->institution_classes = new Institution_class(); |
30 | 30 | $this->institution_class_subjects = new Institution_class_subject(); |
31 | - $this->institution_subjects = new Institution_subject(); |
|
32 | - $this->education_grade_subjects = new Education_grades_subject(); |
|
31 | + $this->institution_subjects = new Institution_subject(); |
|
32 | + $this->education_grade_subjects = new Education_grades_subject(); |
|
33 | 33 | $this->output = new \Symfony\Component\Console\Output\ConsoleOutput(); |
34 | 34 | } |
35 | 35 | |
36 | 36 | |
37 | - public function array_walk($shift,$count,$params){ |
|
38 | - array_walk($shift,array($this,'process'),$params); |
|
37 | + public function array_walk($shift, $count, $params) { |
|
38 | + array_walk($shift, array($this, 'process'), $params); |
|
39 | 39 | } |
40 | 40 | |
41 | - public function cleanConfig($params){ |
|
41 | + public function cleanConfig($params) { |
|
42 | 42 | $academicPeriod = $params['academic_period']; |
43 | 43 | $this->shifts->where(['academic_period_id' => $academicPeriod->id])->delete(); |
44 | 44 | $this->output->writeln('cleaned shifts'); |
@@ -46,31 +46,31 @@ discard block |
||
46 | 46 | $this->shifts->where(['cloned' => $academicPeriod->code])->update(['cloned' => $academicPeriod->code - 1]); |
47 | 47 | $this->output->writeln('updated shifts'); |
48 | 48 | |
49 | - $classIds = $this->institution_classes->select('id')->where(['academic_period_id' => $academicPeriod->id])->get()->toArray(); |
|
49 | + $classIds = $this->institution_classes->select('id')->where(['academic_period_id' => $academicPeriod->id])->get()->toArray(); |
|
50 | 50 | $this->institution_classes->where(['academic_period_id' => $academicPeriod->id])->delete(); |
51 | 51 | $this->output->writeln('cleaned classes'); |
52 | 52 | |
53 | - $this->institution_class_subjects->whereNotIn( 'institution_class_id' , $classIds)->delete(); |
|
53 | + $this->institution_class_subjects->whereNotIn('institution_class_id', $classIds)->delete(); |
|
54 | 54 | $this->output->writeln('cleaned subjects'); |
55 | 55 | |
56 | - do{ |
|
57 | - $deleted = $this->institution_subjects->where('academic_period_id',$academicPeriod->id)->limit(100000)->delete(); |
|
56 | + do { |
|
57 | + $deleted = $this->institution_subjects->where('academic_period_id', $academicPeriod->id)->limit(100000)->delete(); |
|
58 | 58 | $this->output->writeln('100000 institutions cleaned shifts'); |
59 | - }while($deleted > 0); |
|
59 | + } while ($deleted > 0); |
|
60 | 60 | } |
61 | 61 | |
62 | - public function process($shift,$count,$params){ |
|
62 | + public function process($shift, $count, $params) { |
|
63 | 63 | $year = $params['year']; |
64 | 64 | $academicPeriod = $params['academic_period']; |
65 | 65 | $previousAcademicPeriod = $params['previous_academic_period']; |
66 | - try{ |
|
66 | + try { |
|
67 | 67 | $shiftId = $this->updateShifts($year, $shift); |
68 | 68 | $institutionClasses = $this->institution_classes->getShiftClasses($shift['id']); |
69 | - $institutionSubjects = $this->institution_subjects->getInstitutionSubjects($shift['institution_id'],$previousAcademicPeriod->id); |
|
70 | - array_walk($institutionSubjects , array($this,'insertInstitutionSubjects'),$academicPeriod); |
|
71 | - if (!empty($institutionClasses) && !is_null($shiftId) && !is_null($academicPeriod) ) { |
|
69 | + $institutionSubjects = $this->institution_subjects->getInstitutionSubjects($shift['institution_id'], $previousAcademicPeriod->id); |
|
70 | + array_walk($institutionSubjects, array($this, 'insertInstitutionSubjects'), $academicPeriod); |
|
71 | + if (!empty($institutionClasses) && !is_null($shiftId) && !is_null($academicPeriod)) { |
|
72 | 72 | |
73 | - $newInstitutionClasses = $this->generateNewClass($institutionClasses,$shiftId,$academicPeriod->id); |
|
73 | + $newInstitutionClasses = $this->generateNewClass($institutionClasses, $shiftId, $academicPeriod->id); |
|
74 | 74 | |
75 | 75 | $params = [ |
76 | 76 | 'previous_academic_period_id' => $previousAcademicPeriod->id, |
@@ -78,21 +78,21 @@ discard block |
||
78 | 78 | 'shift_id' =>$shiftId |
79 | 79 | ]; |
80 | 80 | |
81 | - try{ |
|
82 | - array_walk($newInstitutionClasses,array($this,'insertInstitutionClasses'),$params); |
|
81 | + try { |
|
82 | + array_walk($newInstitutionClasses, array($this, 'insertInstitutionClasses'), $params); |
|
83 | 83 | $newInstitutionClasses = $this->institution_classes->getShiftClasses($shiftId); |
84 | 84 | $this->output->writeln('##########################################################################################################################'); |
85 | - $this->output->writeln('updating from '. $shiftId); |
|
85 | + $this->output->writeln('updating from '.$shiftId); |
|
86 | 86 | |
87 | - }catch (\Exception $e){ |
|
87 | + }catch (\Exception $e) { |
|
88 | 88 | dd($e); |
89 | - Log::error($e->getMessage(),[$e]); |
|
89 | + Log::error($e->getMessage(), [$e]); |
|
90 | 90 | } |
91 | 91 | } |
92 | 92 | // DB::commit(); |
93 | - }catch (\Exception $e){ |
|
93 | + }catch (\Exception $e) { |
|
94 | 94 | // DB::rollBack(); |
95 | - Log::error($e->getMessage(),[$e]); |
|
95 | + Log::error($e->getMessage(), [$e]); |
|
96 | 96 | } |
97 | 97 | } |
98 | 98 | |
@@ -102,31 +102,31 @@ discard block |
||
102 | 102 | * @param $count |
103 | 103 | * @param $academicPeriod |
104 | 104 | */ |
105 | - public function insertInstitutionSubjects($subjects, $count,$academicPeriod){ |
|
106 | - try{ |
|
105 | + public function insertInstitutionSubjects($subjects, $count, $academicPeriod) { |
|
106 | + try { |
|
107 | 107 | $subjects['academic_period_id'] = $academicPeriod->id; |
108 | 108 | $subjects['created'] = now(); |
109 | 109 | unset($subjects['total_male_students']); |
110 | 110 | unset($subjects['total_female_students']); |
111 | 111 | unset($subjects['id']); |
112 | 112 | $this->institution_subjects->create($subjects); |
113 | - }catch (\Exception $e){ |
|
114 | - Log::error($e->getMessage(),[$e]); |
|
113 | + }catch (\Exception $e) { |
|
114 | + Log::error($e->getMessage(), [$e]); |
|
115 | 115 | } |
116 | 116 | } |
117 | 117 | |
118 | 118 | |
119 | - public function insertInstitutionClasses($class,$count,$param){ |
|
120 | - try{ |
|
119 | + public function insertInstitutionClasses($class, $count, $param) { |
|
120 | + try { |
|
121 | 121 | |
122 | 122 | $academicPeriod = $param['academic_period_id']; |
123 | 123 | $educationGrdae = $class['education_grade_id']; |
124 | 124 | |
125 | 125 | $classId = $class['id']; |
126 | 126 | unset($class['id']); |
127 | - $institutionSubjects = Institution_subject::query()->where('education_grade_id',$class['education_grade_id']) |
|
128 | - ->where('institution_id',$class['institution_id']) |
|
129 | - ->where('academic_period_id',$academicPeriod)->get()->toArray(); |
|
127 | + $institutionSubjects = Institution_subject::query()->where('education_grade_id', $class['education_grade_id']) |
|
128 | + ->where('institution_id', $class['institution_id']) |
|
129 | + ->where('academic_period_id', $academicPeriod)->get()->toArray(); |
|
130 | 130 | $params = [ |
131 | 131 | 'class'=>$class, |
132 | 132 | 'subjects'=>$institutionSubjects, |
@@ -139,39 +139,39 @@ discard block |
||
139 | 139 | $class['no_of_students'] = $noOfStudents; |
140 | 140 | $class['created'] = now(); |
141 | 141 | $class['institution_shift_id'] = $param['shift_id']; |
142 | - $this->output->writeln('Create class:'. $class['name']); |
|
142 | + $this->output->writeln('Create class:'.$class['name']); |
|
143 | 143 | $class = Institution_class::create($class); |
144 | 144 | $institutionClassGrdaeObj['institution_class_id'] = $class->id; |
145 | 145 | $institutionClassGrdaeObj['education_grade_id'] = $educationGrdae; |
146 | 146 | Institution_class_grade::create($institutionClassGrdaeObj); |
147 | - $institutionSubjects = Institution_subject::query()->where('education_grade_id',$educationGrdae) |
|
148 | - ->where('institution_id',$class->institution_id) |
|
149 | - ->where('academic_period_id',$academicPeriod) |
|
147 | + $institutionSubjects = Institution_subject::query()->where('education_grade_id', $educationGrdae) |
|
148 | + ->where('institution_id', $class->institution_id) |
|
149 | + ->where('academic_period_id', $academicPeriod) |
|
150 | 150 | ->groupBy('education_subject_id') |
151 | 151 | ->get() |
152 | 152 | ->toArray(); |
153 | 153 | $params['class'] = $class; |
154 | - $this->insertInstitutionClassSubjects($institutionSubjects,$class); |
|
154 | + $this->insertInstitutionClassSubjects($institutionSubjects, $class); |
|
155 | 155 | // array_walk($classSubjects,array($this,'insertInstitutionClassSubjects'),$params); |
156 | - }catch (\Exception $e){ |
|
157 | - Log::error($e->getMessage(),[$e]); |
|
156 | + }catch (\Exception $e) { |
|
157 | + Log::error($e->getMessage(), [$e]); |
|
158 | 158 | } |
159 | 159 | } |
160 | 160 | |
161 | - public function insertInstitutionClassSubjects($subjects,$class){ |
|
162 | - if(!empty($subjects)){ |
|
163 | - try{ |
|
164 | - array_walk($subjects,array($this,'insertClassSubjects'),$class); |
|
165 | - $this->output->writeln('updating subjects '. $class->name); |
|
166 | - }catch (\Exception $e){ |
|
167 | - Log::error($e->getMessage(),[$e]); |
|
161 | + public function insertInstitutionClassSubjects($subjects, $class) { |
|
162 | + if (!empty($subjects)) { |
|
163 | + try { |
|
164 | + array_walk($subjects, array($this, 'insertClassSubjects'), $class); |
|
165 | + $this->output->writeln('updating subjects '.$class->name); |
|
166 | + }catch (\Exception $e) { |
|
167 | + Log::error($e->getMessage(), [$e]); |
|
168 | 168 | } |
169 | 169 | }; |
170 | 170 | } |
171 | 171 | |
172 | 172 | |
173 | - public function insertClassSubjects($subject,$count,$newClassId){ |
|
174 | - try{ |
|
173 | + public function insertClassSubjects($subject, $count, $newClassId) { |
|
174 | + try { |
|
175 | 175 | $subjectobj['status'] = 1; |
176 | 176 | $subjectobj['created_user_id'] = 1; |
177 | 177 | $subjectobj['created'] = now(); |
@@ -179,11 +179,11 @@ discard block |
||
179 | 179 | $subjectobj['institution_class_id'] = $newClassId->id; |
180 | 180 | $subjectobj['institution_subject_id'] = $subject['id']; |
181 | 181 | |
182 | - if(!$this->institution_class_subjects->isDuplicated($subjectobj)){ |
|
182 | + if (!$this->institution_class_subjects->isDuplicated($subjectobj)) { |
|
183 | 183 | $this->institution_class_subjects->create($subjectobj); |
184 | 184 | } |
185 | - }catch (\Exception $e){ |
|
186 | - Log::error($e->getMessage(),[$e]); |
|
185 | + }catch (\Exception $e) { |
|
186 | + Log::error($e->getMessage(), [$e]); |
|
187 | 187 | } |
188 | 188 | } |
189 | 189 | |
@@ -195,15 +195,15 @@ discard block |
||
195 | 195 | * @param $academicPeriod |
196 | 196 | * @return array |
197 | 197 | */ |
198 | - public function generateNewClass($classes,$shiftId,$academicPeriod){ |
|
198 | + public function generateNewClass($classes, $shiftId, $academicPeriod) { |
|
199 | 199 | $newClasses = []; |
200 | - foreach ( $classes as $class) { |
|
200 | + foreach ($classes as $class) { |
|
201 | 201 | $noOfStudents = $class['no_of_students'] == 0 ? 40 : $class['no_of_students']; |
202 | 202 | $class['academic_period_id'] = $academicPeriod; |
203 | 203 | $class['no_of_students'] = $noOfStudents; |
204 | 204 | $class['created'] = now(); |
205 | 205 | $class['institution_shift_id'] = $shiftId; |
206 | - array_push($newClasses,$class); |
|
206 | + array_push($newClasses, $class); |
|
207 | 207 | } |
208 | 208 | return $newClasses; |
209 | 209 | } |
@@ -214,11 +214,11 @@ discard block |
||
214 | 214 | * @param $shift |
215 | 215 | * @return mixed |
216 | 216 | */ |
217 | - public function updateShifts($year,$shift){ |
|
217 | + public function updateShifts($year, $shift) { |
|
218 | 218 | $academicPeriod = $this->academic_period->getAcademicPeriod($year); |
219 | - $this->shifts->where('id',$shift['id'])->update(['cloned' => $year]); |
|
219 | + $this->shifts->where('id', $shift['id'])->update(['cloned' => $year]); |
|
220 | 220 | $shift['academic_period_id'] = $academicPeriod->id; |
221 | 221 | $exist = $this->shifts->shiftExists($shift); |
222 | - return $this->shifts->create((array)$shift)->id; |
|
222 | + return $this->shifts->create((array) $shift)->id; |
|
223 | 223 | } |
224 | 224 | } |
@@ -13,101 +13,101 @@ |
||
13 | 13 | |
14 | 14 | public function index() |
15 | 15 | { |
16 | - return Datatables::of(Upload::with(['classRoom'])->where('security_user_id','=',Auth::user()->id)) |
|
17 | - ->editColumn('is_processed', function ($data) { |
|
16 | + return Datatables::of(Upload::with(['classRoom'])->where('security_user_id', '=', Auth::user()->id)) |
|
17 | + ->editColumn('is_processed', function($data) { |
|
18 | 18 | |
19 | 19 | $nowTime = \Carbon\Carbon::now(); |
20 | 20 | $to = \Carbon\Carbon::createFromFormat('Y-m-d H:s:i', $nowTime); |
21 | 21 | $from = \Carbon\Carbon::createFromFormat('Y-m-d H:s:i', $data->updated_at); |
22 | 22 | $diff_in_hours = $to->diffInHours($from); |
23 | 23 | |
24 | - if($diff_in_hours >= 2 && $data->is_processed == 3){ |
|
24 | + if ($diff_in_hours >= 2 && $data->is_processed == 3) { |
|
25 | 25 | return "Terminated"; |
26 | 26 | } |
27 | 27 | elseif ($data->is_processed === 1) { |
28 | 28 | return "Success"; |
29 | - }elseif ($data->is_processed === 2){ |
|
29 | + }elseif ($data->is_processed === 2) { |
|
30 | 30 | return "Failed"; |
31 | - }elseif($diff_in_hours < 2 && $data->is_processed == 3){ |
|
31 | + }elseif ($diff_in_hours < 2 && $data->is_processed == 3) { |
|
32 | 32 | return "Processing"; |
33 | - }elseif ($data->is_processed == 4){ |
|
33 | + }elseif ($data->is_processed == 4) { |
|
34 | 34 | return "Process Paused"; |
35 | - }else{ |
|
35 | + }else { |
|
36 | 36 | return 'Pending'; |
37 | 37 | }; |
38 | 38 | |
39 | 39 | }) |
40 | - ->editColumn('is_email_sent', function ($data) { |
|
40 | + ->editColumn('is_email_sent', function($data) { |
|
41 | 41 | if ($data->is_email_sent === 1) { |
42 | 42 | return "Success"; |
43 | - }elseif($data->is_email_sent === 2 ){ |
|
43 | + }elseif ($data->is_email_sent === 2) { |
|
44 | 44 | return 'Failed'; |
45 | - }else{ |
|
45 | + }else { |
|
46 | 46 | return 'Pending'; |
47 | 47 | }; |
48 | 48 | |
49 | 49 | }) |
50 | - ->editColumn('update', function ($data) { |
|
50 | + ->editColumn('update', function($data) { |
|
51 | 51 | if ($data->update === 0) { |
52 | 52 | return "No Processes"; |
53 | - }elseif($data->update === 1 ){ |
|
53 | + }elseif ($data->update === 1) { |
|
54 | 54 | return 'Success'; |
55 | - }elseif($data->update === 3 ){ |
|
55 | + }elseif ($data->update === 3) { |
|
56 | 56 | return 'Partial Success'; |
57 | - }else{ |
|
57 | + }else { |
|
58 | 58 | return 'Failed'; |
59 | 59 | }; |
60 | 60 | |
61 | 61 | }) |
62 | - ->editColumn('insert', function ($data) { |
|
62 | + ->editColumn('insert', function($data) { |
|
63 | 63 | if ($data->insert === 0) { |
64 | 64 | return "No Processes"; |
65 | - }elseif($data->insert === 1 ){ |
|
65 | + }elseif ($data->insert === 1) { |
|
66 | 66 | return 'Success'; |
67 | - }elseif($data->insert === 3 ){ |
|
67 | + }elseif ($data->insert === 3) { |
|
68 | 68 | return 'Partial Success'; |
69 | - }else{ |
|
69 | + }else { |
|
70 | 70 | return 'Failed'; |
71 | 71 | }; |
72 | 72 | |
73 | 73 | }) |
74 | - ->editColumn('filename', function ($data) { |
|
75 | - if(\App::environment('local') || \App::environment('stage')){ |
|
74 | + ->editColumn('filename', function($data) { |
|
75 | + if (\App::environment('local') || \App::environment('stage')) { |
|
76 | 76 | return '<a href="/download_file/'.$data->filename.'">'.$data->classRoom->name.'</a>'; |
77 | 77 | |
78 | - }else{ |
|
78 | + }else { |
|
79 | 79 | return '<a href="/bulk-upload/download_file/'.$data->filename.'">'.$data->classRoom->name.'</a>'; |
80 | 80 | } |
81 | 81 | |
82 | 82 | }) |
83 | - ->editColumn('error', function ($data) { |
|
84 | - if(\App::environment('local') || \App::environment('stage')){ |
|
83 | + ->editColumn('error', function($data) { |
|
84 | + if (\App::environment('local') || \App::environment('stage')) { |
|
85 | 85 | return '<a href="/download/'.$data->filename.'">'.$data->classRoom->name.'</a>'; |
86 | 86 | |
87 | - }else{ |
|
87 | + }else { |
|
88 | 88 | return '<a href="/bulk-upload/download/'.$data->filename.'">'.$data->classRoom->name.'</a>'; |
89 | 89 | } |
90 | 90 | |
91 | - })->editColumn('actions', function ($data) { |
|
91 | + })->editColumn('actions', function($data) { |
|
92 | 92 | |
93 | 93 | $nowTime = \Carbon\Carbon::now(); |
94 | 94 | $to = \Carbon\Carbon::createFromFormat('Y-m-d H:s:i', $nowTime); |
95 | 95 | $from = \Carbon\Carbon::createFromFormat('Y-m-d H:s:i', $data->updated_at); |
96 | 96 | $diff_in_hours = $to->diffInHours($from); |
97 | 97 | |
98 | - if($diff_in_hours >= 2 && $data->is_processed == 3){ |
|
98 | + if ($diff_in_hours >= 2 && $data->is_processed == 3) { |
|
99 | 99 | return '<button onclick="updateProcess('.($data->id).',100)" class="btn btn-primary text-uppercase">reprocess</button>'; |
100 | - }elseif ($data->is_processed == 1){ |
|
100 | + }elseif ($data->is_processed == 1) { |
|
101 | 101 | return '<div><h6>Processing <span class="badge badge-success text-uppercase">Successful</span></h6></div>'; |
102 | - }elseif ($data->is_processed == 2){ |
|
102 | + }elseif ($data->is_processed == 2) { |
|
103 | 103 | return '<div><h6>Processing <span class="badge badge-danger text-uppercase">Failed</span></h6></div>'; |
104 | - }elseif ($data->is_processed == 0){ |
|
104 | + }elseif ($data->is_processed == 0) { |
|
105 | 105 | return '<button onclick="updateProcess('.($data->id).',200)" class="btn btn-block btn-warning text-uppercase">pause</button>'; |
106 | - }elseif ($data->is_processed == 4){ |
|
106 | + }elseif ($data->is_processed == 4) { |
|
107 | 107 | return '<button onclick="updateProcess('.($data->id).',100)" class="btn btn-block btn-success text-uppercase">resume</button>'; |
108 | 108 | } |
109 | 109 | }) |
110 | - ->rawColumns(['filename','error','actions']) |
|
110 | + ->rawColumns(['filename', 'error', 'actions']) |
|
111 | 111 | ->make(true); |
112 | 112 | } |
113 | 113 |
@@ -62,7 +62,7 @@ discard block |
||
62 | 62 | |
63 | 63 | if (!empty($isAvailableforPromotion)) { |
64 | 64 | $this->process($institutionGrade, $nextGrade, $year, 1); |
65 | - } else { |
|
65 | + }else { |
|
66 | 66 | $this->process($institutionGrade, $nextGrade, $year, 3); |
67 | 67 | } |
68 | 68 | } |
@@ -96,7 +96,7 @@ discard block |
||
96 | 96 | |
97 | 97 | $output = new \Symfony\Component\Console\Output\ConsoleOutput(); |
98 | 98 | $output->writeln('##########################################################################################################################'); |
99 | - $output->writeln('Promoting from ' . $institutionGrade['name'] . ' IN ' . $institution->name . ' No of Students: ' . count($studentListToPromote)); |
|
99 | + $output->writeln('Promoting from '.$institutionGrade['name'].' IN '.$institution->name.' No of Students: '.count($studentListToPromote)); |
|
100 | 100 | |
101 | 101 | |
102 | 102 | if (!empty($parallelClasses)) { |
@@ -110,7 +110,7 @@ discard block |
||
110 | 110 | array_walk($studentListToPromote, array($this, 'assingeToClasses'), $params); |
111 | 111 | array_walk($parallelClasses, array($this, 'updateStudentCount')); |
112 | 112 | } |
113 | - } catch (\Exception $e) { |
|
113 | + }catch (\Exception $e) { |
|
114 | 114 | dd($e); |
115 | 115 | Log::error($e->getMessage()); |
116 | 116 | } |
@@ -145,7 +145,7 @@ discard block |
||
145 | 145 | $nextAcademicPeriod = Academic_period::query()->where('code', $year)->get()->first(); |
146 | 146 | |
147 | 147 | $nextGradeObj = null; |
148 | - if ($nextGrade !== [] && !is_null($nextGrade)) { |
|
148 | + if ($nextGrade !== [] && !is_null($nextGrade)) { |
|
149 | 149 | $currentGradeObj = $this->instituion_grade->getParallelClasses($institutionGrade['id'], $institutionGrade['institution_id'], $institutionGrade['education_grade_id'], $academicPeriod->id); |
150 | 150 | $nextGradeObj = $this->instituion_grade->getParallelClasses($institutionGrade['id'], $institutionGrade['institution_id'], $nextGrade->id, $nextAcademicPeriod->id); |
151 | 151 | } |
@@ -155,7 +155,7 @@ discard block |
||
155 | 155 | // promote parallel classes |
156 | 156 | $this->promotion($institutionGrade, $nextGrade, $academicPeriod, $nextAcademicPeriod, $nextGradeObj->toArray(), 1); |
157 | 157 | return 1; |
158 | - } elseif (($nextGradeObj->count() > 1) && ($nextGradeObj->count() !== $currentGradeObj->count())) { |
|
158 | + } elseif (($nextGradeObj->count() > 1) && ($nextGradeObj->count() !== $currentGradeObj->count())) { |
|
159 | 159 | // promote pool promotion |
160 | 160 | $this->promotion($institutionGrade, $nextGrade, $academicPeriod, $nextAcademicPeriod, [], 1); |
161 | 161 | return 2; |
@@ -163,12 +163,12 @@ discard block |
||
163 | 163 | // Promote matching class name with previous class |
164 | 164 | $this->promotion($institutionGrade, $nextGrade, $academicPeriod, $nextAcademicPeriod, $nextGradeObj->toArray(), 1); |
165 | 165 | return 1; |
166 | - } else { |
|
166 | + }else { |
|
167 | 167 | // default pool promotion |
168 | 168 | $this->promotion($institutionGrade, $nextGrade, $academicPeriod, $nextAcademicPeriod, [], 1); |
169 | 169 | return 2; |
170 | 170 | } |
171 | - } else { |
|
171 | + }else { |
|
172 | 172 | // default pool promotion |
173 | 173 | $this->promotion($institutionGrade, $nextGrade, $academicPeriod, $nextAcademicPeriod, [], 3); |
174 | 174 | return 2; |
@@ -204,10 +204,10 @@ discard block |
||
204 | 204 | ]; |
205 | 205 | |
206 | 206 | try { |
207 | - Institution_student::where('id', (string)$student['id'])->update($studentData); |
|
207 | + Institution_student::where('id', (string) $student['id'])->update($studentData); |
|
208 | 208 | $output = new \Symfony\Component\Console\Output\ConsoleOutput(); |
209 | - $output->writeln('----------------- ' . $student['admission_id'] . ' to ' . $studentData['education_grade_id']); |
|
210 | - } catch (\Exception $e) { |
|
209 | + $output->writeln('----------------- '.$student['admission_id'].' to '.$studentData['education_grade_id']); |
|
210 | + }catch (\Exception $e) { |
|
211 | 211 | dd($e); |
212 | 212 | Log::error($e->getMessage()); |
213 | 213 | } |
@@ -228,7 +228,7 @@ discard block |
||
228 | 228 | $studentClass = $this->institution_class_students->getStudentNewClass($student); |
229 | 229 | if (!is_null($studentClass)) { |
230 | 230 | return array_search(str_replace($educationGrade['name'], $nextGrade->name, $studentClass->name), array_column($classes, 'name')); |
231 | - } else { |
|
231 | + }else { |
|
232 | 232 | return false; |
233 | 233 | } |
234 | 234 | } |
@@ -280,11 +280,11 @@ discard block |
||
280 | 280 | if (!$this->institution_class_students->isDuplicated($studentObj)) { |
281 | 281 | $this->institution_class_students->create($studentObj); |
282 | 282 | $output = new \Symfony\Component\Console\Output\ConsoleOutput(); |
283 | - $output->writeln('----------------- ' . $student['student_id'] . 'to ' . $class['name']); |
|
284 | - } else { |
|
285 | - $this->institution_class_students->where('id', (string)$student['id'])->update($studentObj); |
|
283 | + $output->writeln('----------------- '.$student['student_id'].'to '.$class['name']); |
|
284 | + }else { |
|
285 | + $this->institution_class_students->where('id', (string) $student['id'])->update($studentObj); |
|
286 | 286 | $output = new \Symfony\Component\Console\Output\ConsoleOutput(); |
287 | - $output->writeln('----------------- ' . $student['student_id'] . 'to ' . $class['name']); |
|
287 | + $output->writeln('----------------- '.$student['student_id'].'to '.$class['name']); |
|
288 | 288 | } |
289 | 289 | } |
290 | 290 | } |
@@ -8,7 +8,7 @@ |
||
8 | 8 | class DashboardViewsController extends Controller |
9 | 9 | { |
10 | 10 | |
11 | - public function callback(){ |
|
11 | + public function callback() { |
|
12 | 12 | |
13 | 13 | /** Total number of students by institutions |
14 | 14 | * In Grafana query to get total students count |
@@ -9,7 +9,7 @@ |
||
9 | 9 | use Maatwebsite\Excel\Concerns\FromCollection; |
10 | 10 | use Maatwebsite\Excel\Concerns\WithHeadings; |
11 | 11 | |
12 | -class ExaminationStudentsExport implements FromQuery , WithHeadings |
|
12 | +class ExaminationStudentsExport implements FromQuery, WithHeadings |
|
13 | 13 | { |
14 | 14 | |
15 | 15 | use Exportable; |
@@ -18,9 +18,9 @@ discard block |
||
18 | 18 | use Maatwebsite\Excel\Concerns\WithBatchInserts; |
19 | 19 | use Maatwebsite\Excel\Concerns\WithChunkReading; |
20 | 20 | |
21 | -class ExaminationStudentsImport implements ToModel, WithStartRow, WithHeadingRow, WithChunkReading, WithBatchInserts , WithValidation ,WithMapping, SkipsOnFailure, SkipsOnError |
|
21 | +class ExaminationStudentsImport implements ToModel, WithStartRow, WithHeadingRow, WithChunkReading, WithBatchInserts, WithValidation, WithMapping, SkipsOnFailure, SkipsOnError |
|
22 | 22 | { |
23 | - use Importable , SkipsFailures, SkipsErrors; |
|
23 | + use Importable, SkipsFailures, SkipsErrors; |
|
24 | 24 | |
25 | 25 | /** |
26 | 26 | * @return int |
@@ -57,14 +57,14 @@ discard block |
||
57 | 57 | |
58 | 58 | private function transformDateTime(string $value, string $format = 'm/d/Y') |
59 | 59 | { |
60 | - try{ |
|
60 | + try { |
|
61 | 61 | $date = date_create_from_format('m/d/Y', $value); |
62 | - if(gettype($date)=='boolean'){ |
|
62 | + if (gettype($date) == 'boolean') { |
|
63 | 63 | $date = date_create_from_format('Y-m-d', $value); |
64 | 64 | } |
65 | 65 | $date = date_format($date, 'Y-m-d'); |
66 | 66 | return $date; |
67 | - }catch(\Exception $e){ |
|
67 | + }catch (\Exception $e) { |
|
68 | 68 | $error = \Illuminate\Validation\ValidationException::withMessages([]); |
69 | 69 | $failure = new Failure(2, 'remark', [0 => 'The given date is wrong']); |
70 | 70 | $failures = [0 => $failure]; |
@@ -88,10 +88,10 @@ discard block |
||
88 | 88 | $highestColumn = $this->worksheet->getHighestDataColumn(3); |
89 | 89 | $higestRow = 0; |
90 | 90 | for ($row = $this->startRow(); $row <= $this->highestRow; $row++) { |
91 | - $rowData = $this->worksheet->rangeToArray('A' . $row . ':' . $highestColumn . $row, NULL, TRUE, FALSE); |
|
91 | + $rowData = $this->worksheet->rangeToArray('A'.$row.':'.$highestColumn.$row, NULL, TRUE, FALSE); |
|
92 | 92 | if (isEmptyRow(reset($rowData))) { |
93 | 93 | continue; |
94 | - } else { |
|
94 | + }else { |
|
95 | 95 | $higestRow += 1; |
96 | 96 | } |
97 | 97 | } |
@@ -105,7 +105,7 @@ discard block |
||
105 | 105 | $this->failures = []; |
106 | 106 | if (($column !== "") && (!in_array($column, $columns))) { |
107 | 107 | $this->isValidSheet = false; |
108 | - $this->error[] = 'Unsupported column found ,remove:' . $column; |
|
108 | + $this->error[] = 'Unsupported column found ,remove:'.$column; |
|
109 | 109 | $this->failure = new Failure(3, 'remark', $this->error, [null]); |
110 | 110 | $this->failures = new \Maatwebsite\Excel\Validators\ValidationException($error, [$this->failure]); |
111 | 111 | } |
@@ -118,13 +118,13 @@ discard block |
||
118 | 118 | { |
119 | 119 | $columns = Config::get('excel.columns'); |
120 | 120 | $optional_columns = Config::get('excel.optional_columns'); |
121 | - $columns = array_diff ($columns,$optional_columns); |
|
121 | + $columns = array_diff($columns, $optional_columns); |
|
122 | 122 | $error = \Illuminate\Validation\ValidationException::withMessages([]); |
123 | 123 | $this->failures = []; |
124 | 124 | foreach ($columns as $column) { |
125 | 125 | if (($column !== "") && (!in_array($column, $existingColumns))) { |
126 | 126 | $this->isValidSheet = false; |
127 | - $this->error[] = 'Missing Column :' . $column . ' Not found'; |
|
127 | + $this->error[] = 'Missing Column :'.$column.' Not found'; |
|
128 | 128 | $this->failure = new Failure(3, 'remark', $this->error, [null]); |
129 | 129 | $this->failures = new \Maatwebsite\Excel\Validators\ValidationException($error, [$this->failure]); |
130 | 130 | } |
@@ -141,16 +141,16 @@ discard block |
||
141 | 141 | $highestColumn = $this->worksheet->getHighestDataColumn(3); |
142 | 142 | $higestRow = 1; |
143 | 143 | for ($row = $this->startRow(); $row <= $this->highestRow; $row++) { |
144 | - $rowData = $this->worksheet->rangeToArray('A' . $row . ':' . $highestColumn . $row, NULL, TRUE, FALSE); |
|
144 | + $rowData = $this->worksheet->rangeToArray('A'.$row.':'.$highestColumn.$row, NULL, TRUE, FALSE); |
|
145 | 145 | if (isEmptyRow(reset($rowData))) { |
146 | 146 | continue; |
147 | - } else { |
|
147 | + }else { |
|
148 | 148 | $higestRow += 1; |
149 | 149 | } |
150 | 150 | } |
151 | 151 | if ($higestRow == 0) { |
152 | 152 | exit; |
153 | - } else { |
|
153 | + }else { |
|
154 | 154 | return $higestRow; |
155 | 155 | } |
156 | 156 | } |
@@ -175,17 +175,17 @@ discard block |
||
175 | 175 | case 'string': |
176 | 176 | $row[$column] = preg_replace('/[^A-Za-z0-9\-]/', '-', $row[$column]); |
177 | 177 | $row[$column] = date($format, strtotime($row[$column])); //date($row[$column]); |
178 | - $row[$column] = \Carbon\Carbon::createFromFormat($format, $row[$column]); |
|
178 | + $row[$column] = \Carbon\Carbon::createFromFormat($format, $row[$column]); |
|
179 | 179 | break; |
180 | 180 | case 'double'; |
181 | - $row[$column] = \PhpOffice\PhpSpreadsheet\Shared\Date::excelToDateTimeObject($row[$column]); |
|
181 | + $row[$column] = \PhpOffice\PhpSpreadsheet\Shared\Date::excelToDateTimeObject($row[$column]); |
|
182 | 182 | break; |
183 | 183 | } |
184 | 184 | } |
185 | 185 | return $row; |
186 | - } catch (Exception $e) { |
|
186 | + }catch (Exception $e) { |
|
187 | 187 | $error = \Illuminate\Validation\ValidationException::withMessages([]); |
188 | - $failure = new Failure(3, 'remark', [0 => 'Template is not valid for upload, use the template given in the system ' . $row[$column] . ' Not a valid date formate'], [null]); |
|
188 | + $failure = new Failure(3, 'remark', [0 => 'Template is not valid for upload, use the template given in the system '.$row[$column].' Not a valid date formate'], [null]); |
|
189 | 189 | $failures = [0 => $failure]; |
190 | 190 | throw new \Maatwebsite\Excel\Validators\ValidationException($error, $failures); |
191 | 191 | } |
@@ -206,16 +206,16 @@ discard block |
||
206 | 206 | $row = $this->formateDate($row, 'mothers_date_of_birth_yyyy_mm_dd'); |
207 | 207 | $row = $this->formateDate($row, 'guardians_date_of_birth_yyyy_mm_dd'); |
208 | 208 | |
209 | - $row['admission_no'] = str_pad($row['admission_no'], 4, '0', STR_PAD_LEFT); |
|
209 | + $row['admission_no'] = str_pad($row['admission_no'], 4, '0', STR_PAD_LEFT); |
|
210 | 210 | if ($row['identity_type'] == 'BC' && (!empty($row['birth_divisional_secretariat'])) && ($row['identity_number'] !== null) && $row['date_of_birth_yyyy_mm_dd'] !== null) { |
211 | - $row['identity_number'] = str_pad($row['identity_number'], 4, '0', STR_PAD_LEFT); |
|
211 | + $row['identity_number'] = str_pad($row['identity_number'], 4, '0', STR_PAD_LEFT); |
|
212 | 212 | // dd(($row['date_of_birth_yyyy_mm_dd'])); |
213 | - $BirthDivision = Area_administrative::where('name', 'like', '%' . $row['birth_divisional_secretariat'] . '%')->where('area_administrative_level_id', '=', 5)->first(); |
|
213 | + $BirthDivision = Area_administrative::where('name', 'like', '%'.$row['birth_divisional_secretariat'].'%')->where('area_administrative_level_id', '=', 5)->first(); |
|
214 | 214 | if ($BirthDivision !== null) { |
215 | - $BirthArea = Area_administrative::where('name', 'like', '%' . $row['birth_registrar_office_as_in_birth_certificate'] . '%') |
|
215 | + $BirthArea = Area_administrative::where('name', 'like', '%'.$row['birth_registrar_office_as_in_birth_certificate'].'%') |
|
216 | 216 | ->where('parent_id', '=', $BirthDivision->id)->first(); |
217 | 217 | if ($BirthArea !== null) { |
218 | - $row['identity_number'] = $BirthArea->id . '' . $row['identity_number'] . '' . substr($row['date_of_birth_yyyy_mm_dd']->format("yy"), -2) . '' . $row['date_of_birth_yyyy_mm_dd']->format("m"); |
|
218 | + $row['identity_number'] = $BirthArea->id.''.$row['identity_number'].''.substr($row['date_of_birth_yyyy_mm_dd']->format("yy"), -2).''.$row['date_of_birth_yyyy_mm_dd']->format("m"); |
|
219 | 219 | } |
220 | 220 | } |
221 | 221 | } |
@@ -227,9 +227,9 @@ discard block |
||
227 | 227 | { |
228 | 228 | if (array_key_exists($key, $row)) { |
229 | 229 | return true; |
230 | - } else { |
|
230 | + }else { |
|
231 | 231 | $error = \Illuminate\Validation\ValidationException::withMessages([]); |
232 | - $failure = new Failure($count, 'remark', [0 => 'Template is not valid for upload, use the template given in the system ' . $key, ' Is missing form the template'], [null]); |
|
232 | + $failure = new Failure($count, 'remark', [0 => 'Template is not valid for upload, use the template given in the system '.$key, ' Is missing form the template'], [null]); |
|
233 | 233 | $failures = [0 => $failure]; |
234 | 234 | new \Maatwebsite\Excel\Validators\ValidationException($error, $failures); |
235 | 235 | }; |
@@ -265,11 +265,11 @@ discard block |
||
265 | 265 | |
266 | 266 | if ($exceededStudents == true) { |
267 | 267 | $error = \Illuminate\Validation\ValidationException::withMessages([]); |
268 | - $failure = new Failure(3, 'remark', ['Class student count exceeded! Max number of students is' . $institutionClass->no_of_students], [null]); |
|
268 | + $failure = new Failure(3, 'remark', ['Class student count exceeded! Max number of students is'.$institutionClass->no_of_students], [null]); |
|
269 | 269 | $failures = [0 => $failure]; |
270 | 270 | throw new \Maatwebsite\Excel\Validators\ValidationException($error, $failures); |
271 | 271 | Log::info('email-sent', [$this->file]); |
272 | - } else { |
|
272 | + }else { |
|
273 | 273 | return true; |
274 | 274 | } |
275 | 275 | } |
@@ -30,13 +30,13 @@ |
||
30 | 30 | */ |
31 | 31 | public function handle() |
32 | 32 | { |
33 | - try{ |
|
33 | + try { |
|
34 | 34 | ini_set('memory_limit', '-1'); |
35 | 35 | (new ExaminationStudentsExport)->queue('/examination/student_data_with_nsid.csv')->chain([ |
36 | 36 | (new ExportReady($this->user)) |
37 | 37 | ]); |
38 | 38 | |
39 | - }catch(\Exception $e){ |
|
39 | + }catch (\Exception $e) { |
|
40 | 40 | $output = new \Symfony\Component\Console\Output\ConsoleOutput(); |
41 | 41 | $output->writeln($e->getMessage()); |
42 | 42 | } |
@@ -22,17 +22,17 @@ discard block |
||
22 | 22 | |
23 | 23 | $institution = Institution_class::find($file['institution_class_id']); |
24 | 24 | $this->user = User::find($file['security_user_id']); |
25 | - $this->subject = 'SIS Bulk Upload: Process Terminated'.$institution->institution->code.': '. $institution->name.' '. date('Y:m:d H:i:s'); |
|
25 | + $this->subject = 'SIS Bulk Upload: Process Terminated'.$institution->institution->code.': '.$institution->name.' '.date('Y:m:d H:i:s'); |
|
26 | 26 | $this->from_address = env('MAIL_FROM_ADDRESS'); |
27 | 27 | $this->from_name = 'SIS Bulk Uploader'; |
28 | 28 | $this->with = [ |
29 | 29 | 'name' => $this->user->first_name, |
30 | - 'link' => \App::environment('local') || \App::environment('stage') ? env('APP_URL').'/download/' .$file['filename'] : env('APP_URL').'/bulk-upload/download/' .$file['filename'] |
|
30 | + 'link' => \App::environment('local') || \App::environment('stage') ? env('APP_URL').'/download/'.$file['filename'] : env('APP_URL').'/bulk-upload/download/'.$file['filename'] |
|
31 | 31 | ]; |
32 | 32 | $this->viewData = [ |
33 | 33 | 'name'=>$this->user->first_name, "body" => "Apologize ,The process of you file has been terminated in the middle, |
34 | 34 | We advice you to check the student data and re-upload with only with correct data which are not in the system ", |
35 | - 'link' => \App::environment('local') || \App::environment('stage') ? env('APP_URL').'/download/' .$file['filename'] : env('APP_URL').'/bulk-upload/download/' .$file['filename'] |
|
35 | + 'link' => \App::environment('local') || \App::environment('stage') ? env('APP_URL').'/download/'.$file['filename'] : env('APP_URL').'/bulk-upload/download/'.$file['filename'] |
|
36 | 36 | ]; |
37 | 37 | } |
38 | 38 | |
@@ -44,7 +44,7 @@ discard block |
||
44 | 44 | public function build() |
45 | 45 | { |
46 | 46 | return $this->view('emails.mail') |
47 | - ->from($this->from_address,$this->from_name) |
|
47 | + ->from($this->from_address, $this->from_name) |
|
48 | 48 | ->to($this->user->email) |
49 | 49 | ->subject($this->subject) |
50 | 50 | ->with($this->with); |