@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | * @param Request $request |
34 | 34 | * @return \Illuminate\Http\JsonResponse |
35 | 35 | */ |
36 | - public function upload(Request $request){ |
|
36 | + public function upload(Request $request) { |
|
37 | 37 | |
38 | 38 | |
39 | 39 | |
@@ -75,7 +75,7 @@ discard block |
||
75 | 75 | $institution = auth()->user()->permissions->isEmpty() ? auth()->user()->principal[0]->institution_group[0]->institution->code : auth()->user()->permissions[0]->institution_staff->institution->code; |
76 | 76 | |
77 | 77 | |
78 | - $fileName = time().'_'.$institution.'_'.str_replace(' ','_', clean($class->name)).'_'.auth()->user()->openemis_no.'_student_bulk_data.xlsx'; |
|
78 | + $fileName = time().'_'.$institution.'_'.str_replace(' ', '_', clean($class->name)).'_'.auth()->user()->openemis_no.'_student_bulk_data.xlsx'; |
|
79 | 79 | Storage::disk('local')->putFileAs( |
80 | 80 | 'sis-bulk-data-files/', |
81 | 81 | $uploadFile, |
@@ -83,7 +83,7 @@ discard block |
||
83 | 83 | ); |
84 | 84 | |
85 | 85 | $upload = new Upload; |
86 | - $upload->fileName =$fileName; |
|
86 | + $upload->fileName = $fileName; |
|
87 | 87 | $upload->model = 'Student'; |
88 | 88 | $upload->node = 'None'; |
89 | 89 | $upload->institution_class_id = $class->id; |
@@ -94,8 +94,8 @@ discard block |
||
94 | 94 | return redirect('/')->withSuccess('The file is uploaded, we will process and let you know by your email'); |
95 | 95 | } |
96 | 96 | |
97 | - public function updateQueueWithUnprocessedFiles($id, $action){ |
|
98 | - if($action == 100){ |
|
97 | + public function updateQueueWithUnprocessedFiles($id, $action) { |
|
98 | + if ($action == 100) { |
|
99 | 99 | DB::table('uploads') |
100 | 100 | ->where('id', $id) |
101 | 101 | ->update(['is_processed' => 0]); |
@@ -107,14 +107,14 @@ discard block |
||
107 | 107 | } |
108 | 108 | |
109 | 109 | |
110 | - public function downloadTemplate(){ |
|
110 | + public function downloadTemplate() { |
|
111 | 111 | $filename = 'censusNo_className_sis_students_bulk_upload'; |
112 | 112 | $version = '2007_V2.2.0_20201012.xlsx'; |
113 | - $file_path = storage_path() .'/app/public/'. $filename.'_'.$version;; |
|
113 | + $file_path = storage_path().'/app/public/'.$filename.'_'.$version; ; |
|
114 | 114 | if (file_exists($file_path)) |
115 | 115 | { |
116 | 116 | return Response::download($file_path, Auth::user()->openemis_no.'_'.$filename.$version, [ |
117 | - 'Content-Length: '. filesize($file_path) |
|
117 | + 'Content-Length: '.filesize($file_path) |
|
118 | 118 | ]); |
119 | 119 | } |
120 | 120 | else |
@@ -128,13 +128,13 @@ discard block |
||
128 | 128 | * @param $filename |
129 | 129 | * @return Processed excel file with error |
130 | 130 | */ |
131 | - public function downloadErrorFile($filename){ |
|
131 | + public function downloadErrorFile($filename) { |
|
132 | 132 | |
133 | - $file_path = storage_path().'/app/sis-bulk-data-files/processed/'. $filename; |
|
133 | + $file_path = storage_path().'/app/sis-bulk-data-files/processed/'.$filename; |
|
134 | 134 | if (file_exists($file_path)) |
135 | 135 | { |
136 | 136 | return Response::download($file_path, $filename, [ |
137 | - 'Content-Length: '. filesize($file_path) |
|
137 | + 'Content-Length: '.filesize($file_path) |
|
138 | 138 | ]); |
139 | 139 | } |
140 | 140 | else |
@@ -144,12 +144,12 @@ discard block |
||
144 | 144 | } |
145 | 145 | |
146 | 146 | |
147 | - public function downloadFile($filename){ |
|
148 | - $file_path = storage_path().'/app/sis-bulk-data-files/'. $filename; |
|
147 | + public function downloadFile($filename) { |
|
148 | + $file_path = storage_path().'/app/sis-bulk-data-files/'.$filename; |
|
149 | 149 | if (file_exists($file_path)) |
150 | 150 | { |
151 | 151 | return Response::download($file_path, $filename, [ |
152 | - 'Content-Length: '. filesize($file_path) |
|
152 | + 'Content-Length: '.filesize($file_path) |
|
153 | 153 | ]); |
154 | 154 | } |
155 | 155 | else |
@@ -70,17 +70,17 @@ discard block |
||
70 | 70 | if (empty($value)) { |
71 | 71 | return false; |
72 | 72 | } elseif ($gradeEntity !== null) { |
73 | - $admissionAge = (($gradeEntity->admission_age) * 12) - 1; |
|
73 | + $admissionAge = (($gradeEntity->admission_age)*12) - 1; |
|
74 | 74 | $to = $academicPeriod->start_date; |
75 | 75 | $diff_in_months = $to->diffInMonths($value); |
76 | 76 | $ageOfStudent = $diff_in_months; |
77 | 77 | $enrolmentMaximumAge = $admissionAge + 120; |
78 | 78 | return ($ageOfStudent <= $enrolmentMaximumAge) && ($ageOfStudent >= $admissionAge); |
79 | - } else { |
|
79 | + }else { |
|
80 | 80 | return false; |
81 | 81 | } |
82 | - } else { |
|
83 | - $this->_custom_messages['admission_age'] = 'given' . $attribute . 'Not found'; |
|
82 | + }else { |
|
83 | + $this->_custom_messages['admission_age'] = 'given'.$attribute.'Not found'; |
|
84 | 84 | $this->_set_custom_stuff(); |
85 | 85 | return false; |
86 | 86 | } |
@@ -91,16 +91,16 @@ discard block |
||
91 | 91 | |
92 | 92 | if (is_numeric($value)) { |
93 | 93 | if ($value < 10) { |
94 | - $this->_custom_messages['bmi'] = $attribute . ' is must greater than 10'; |
|
94 | + $this->_custom_messages['bmi'] = $attribute.' is must greater than 10'; |
|
95 | 95 | $this->_set_custom_stuff(); |
96 | 96 | return false; |
97 | 97 | } elseif ($value > 250) { |
98 | - $this->_custom_messages['bmi'] = $attribute . ' is must smaller than 250'; |
|
98 | + $this->_custom_messages['bmi'] = $attribute.' is must smaller than 250'; |
|
99 | 99 | $this->_set_custom_stuff(); |
100 | 100 | return false; |
101 | 101 | } |
102 | - } else { |
|
103 | - $this->_custom_messages['bmi'] = $attribute . ' is must a valid numeric'; |
|
102 | + }else { |
|
103 | + $this->_custom_messages['bmi'] = $attribute.' is must a valid numeric'; |
|
104 | 104 | $this->_set_custom_stuff(); |
105 | 105 | return false; |
106 | 106 | } |
@@ -109,18 +109,18 @@ discard block |
||
109 | 109 | |
110 | 110 | protected function validateBmi($attribute, $value, $parameters) |
111 | 111 | { |
112 | - $bmiGrades = ['G1', 'G4', 'G7', 'G10']; |
|
112 | + $bmiGrades = ['G1', 'G4', 'G7', 'G10']; |
|
113 | 113 | $institutionGrade = Institution_class_grade::where('institution_class_id', '=', $parameters[0]) |
114 | 114 | ->join('education_grades', 'institution_class_grades.education_grade_id', 'education_grades.id') |
115 | 115 | ->first(); |
116 | - $educationGrade = Education_grade::where('id', '=', $institutionGrade->education_grade_id)->first(); |
|
116 | + $educationGrade = Education_grade::where('id', '=', $institutionGrade->education_grade_id)->first(); |
|
117 | 117 | if (in_array($institutionGrade->code, $bmiGrades)) { |
118 | 118 | if (!empty($value)) { |
119 | 119 | if (($attribute == 'bmi_height') || ('bmi_weight')) { |
120 | 120 | return $this->validateHW($attribute, $value); |
121 | 121 | } |
122 | - } else { |
|
123 | - $this->_custom_messages['bmi'] = $attribute . ' is required for ' . $educationGrade->name; |
|
122 | + }else { |
|
123 | + $this->_custom_messages['bmi'] = $attribute.' is required for '.$educationGrade->name; |
|
124 | 124 | $this->_set_custom_stuff(); |
125 | 125 | return false; |
126 | 126 | } |
@@ -128,7 +128,7 @@ discard block |
||
128 | 128 | if (($attribute == 'bmi_height') || ('bmi_weight')) { |
129 | 129 | return $this->validateHW($attribute, $value); |
130 | 130 | } |
131 | - } else { |
|
131 | + }else { |
|
132 | 132 | return true; |
133 | 133 | } |
134 | 134 | } |
@@ -137,19 +137,19 @@ discard block |
||
137 | 137 | { |
138 | 138 | foreach ($validator->getData() as $data) { |
139 | 139 | if ($data['identity_type'] == 'BC' && key_exists('birth_divisional_secretariat', $data)) { |
140 | - $BirthDivision = Area_administrative::where('name', '=', '%' . $data['birth_divisional_secretariat'] . '%')->where('area_administrative_level_id', '=', 5); // |
|
140 | + $BirthDivision = Area_administrative::where('name', '=', '%'.$data['birth_divisional_secretariat'].'%')->where('area_administrative_level_id', '=', 5); // |
|
141 | 141 | if ($BirthDivision->count() > 0) { |
142 | - $BirthArea = Area_administrative::where('name', '=', '%' . $value . '%') //$data['birth_registrar_office_as_in_birth_certificate'] |
|
142 | + $BirthArea = Area_administrative::where('name', '=', '%'.$value.'%') //$data['birth_registrar_office_as_in_birth_certificate'] |
|
143 | 143 | ->where('parent_id', '=', $BirthDivision->first()->id)->count(); |
144 | - return $BirthArea > 0; |
|
144 | + return $BirthArea > 0; |
|
145 | 145 | } elseif (key_exists('birth_divisional_secretariat', $data) && (!key_exists('birth_registrar_office_as_in_birth_certificate', $data))) { |
146 | 146 | $this->_custom_messages['birth_place'] = 'birth_registrar_office_as_in_birth_certificate required with BC'; |
147 | 147 | $this->_set_custom_stuff(); |
148 | 148 | return false; |
149 | - } else { |
|
149 | + }else { |
|
150 | 150 | return true; |
151 | 151 | } |
152 | - } else { |
|
152 | + }else { |
|
153 | 153 | return true; |
154 | 154 | } |
155 | 155 | } |
@@ -157,22 +157,22 @@ discard block |
||
157 | 157 | |
158 | 158 | protected function validateIsStudentInClass($attribute, $value, $perameters, $validator) |
159 | 159 | { |
160 | - $student = Security_user::where('openemis_no', '=', $value); |
|
160 | + $student = Security_user::where('openemis_no', '=', $value); |
|
161 | 161 | if ($student->count() > 0) { |
162 | 162 | $student = $student->first()->toArray(); |
163 | - $check = Institution_class_student::where('student_id', '=', $student['id'])->where('institution_class_id', '=', $perameters[0])->count(); |
|
163 | + $check = Institution_class_student::where('student_id', '=', $student['id'])->where('institution_class_id', '=', $perameters[0])->count(); |
|
164 | 164 | if ($check == 1) { |
165 | 165 | return true; |
166 | - } else { |
|
166 | + }else { |
|
167 | 167 | return false; |
168 | 168 | } |
169 | - } else { |
|
169 | + }else { |
|
170 | 170 | return false; |
171 | 171 | } |
172 | 172 | } |
173 | 173 | protected function validateNic($attribute, $value, $perameters, $validator) |
174 | 174 | { |
175 | - switch($data['identity_type']){ |
|
175 | + switch ($data['identity_type']) { |
|
176 | 176 | case 'BC': |
177 | 177 | //inclde the bc validation |
178 | 178 | break; |
@@ -182,10 +182,10 @@ discard block |
||
182 | 182 | } |
183 | 183 | $valid = preg_match('/^([0-9]{9}[VX]|[0-9]{12})$/i', $value); |
184 | 184 | if (!$valid) { |
185 | - $this->_custom_messages['nic'] = $attribute . ' is not valid, Please check the NIC number'; |
|
185 | + $this->_custom_messages['nic'] = $attribute.' is not valid, Please check the NIC number'; |
|
186 | 186 | $this->_set_custom_stuff(); |
187 | 187 | return false; |
188 | - } else { |
|
188 | + }else { |
|
189 | 189 | return true; |
190 | 190 | } |
191 | 191 | } |
@@ -193,7 +193,7 @@ discard block |
||
193 | 193 | protected function validateUserUnique($attribute, $value, $perameters, $validator) |
194 | 194 | { |
195 | 195 | foreach ($validator->getData() as $data) { |
196 | - $identityType = Identity_type::where('national_code', 'like', '%' . $data['identity_type'] . '%')->first(); |
|
196 | + $identityType = Identity_type::where('national_code', 'like', '%'.$data['identity_type'].'%')->first(); |
|
197 | 197 | if ($identityType !== null && ($value !== null)) { |
198 | 198 | if ($identityType->national_code === 'BC') { |
199 | 199 | return $this->checkUnique($value, $data, $identityType); |
@@ -209,14 +209,14 @@ discard block |
||
209 | 209 | protected function validateIsBc($attribute, $value, $perameters, $validator) |
210 | 210 | { |
211 | 211 | foreach ($validator->getData() as $data) { |
212 | - $identityType = Identity_type::where('national_code', 'like', '%' . $data['identity_type'] . '%')->first(); |
|
212 | + $identityType = Identity_type::where('national_code', 'like', '%'.$data['identity_type'].'%')->first(); |
|
213 | 213 | if (($identityType !== null) && ($identityType !== "")) { |
214 | 214 | if (($identityType->national_code) === 'BC') { |
215 | 215 | return (strlen((string) $data['identity_number']) < 7); |
216 | - } else { |
|
216 | + }else { |
|
217 | 217 | return true; |
218 | 218 | } |
219 | - } else { |
|
219 | + }else { |
|
220 | 220 | return true; |
221 | 221 | } |
222 | 222 | } |
@@ -226,24 +226,24 @@ discard block |
||
226 | 226 | { |
227 | 227 | $isUnique = Security_user::where('identity_number', '=', $value)->where('identity_type_id', '=', $identityType->id); |
228 | 228 | if ($isUnique->count() > 0) { |
229 | - $this->_custom_messages['user_unique'] = 'The identity number already in use. User ID is : ' . $isUnique->first()->openemis_no; |
|
229 | + $this->_custom_messages['user_unique'] = 'The identity number already in use. User ID is : '.$isUnique->first()->openemis_no; |
|
230 | 230 | $this->_set_custom_stuff(); |
231 | 231 | return false; |
232 | - } else { |
|
232 | + }else { |
|
233 | 233 | return true; |
234 | 234 | } |
235 | 235 | } |
236 | 236 | |
237 | 237 | protected function IsBc($data, $value) |
238 | 238 | { |
239 | - $identityType = Identity_type::where('national_code', 'like', '%' . $data['identity_type'] . '%')->first(); |
|
239 | + $identityType = Identity_type::where('national_code', 'like', '%'.$data['identity_type'].'%')->first(); |
|
240 | 240 | if ($identityType !== null) { |
241 | 241 | if (($identityType->national_code) === 'BC' && strlen((string) $value) < 8) { |
242 | 242 | return false; |
243 | - } else { |
|
243 | + }else { |
|
244 | 244 | return true; |
245 | 245 | } |
246 | - } else { |
|
246 | + }else { |
|
247 | 247 | return true; |
248 | 248 | } |
249 | 249 | } |
@@ -55,7 +55,7 @@ discard block |
||
55 | 55 | use Maatwebsite\Excel\Concerns\WithMultipleSheets; |
56 | 56 | use Maatwebsite\Excel\Concerns\RegistersEventListeners; |
57 | 57 | |
58 | -class StudentUpdate extends Import implements ToModel, WithStartRow, WithHeadingRow, WithMultipleSheets, WithEvents, WithMapping, WithLimit, WithBatchInserts, WithValidation , SkipsOnFailure , SkipsOnError{ |
|
58 | +class StudentUpdate extends Import implements ToModel, WithStartRow, WithHeadingRow, WithMultipleSheets, WithEvents, WithMapping, WithLimit, WithBatchInserts, WithValidation, SkipsOnFailure, SkipsOnError{ |
|
59 | 59 | |
60 | 60 | use Importable, |
61 | 61 | RegistersEventListeners, |
@@ -110,8 +110,8 @@ discard block |
||
110 | 110 | break; |
111 | 111 | } |
112 | 112 | |
113 | - $BirthArea = Area_administrative::where('name', 'like', '%' . $row['birth_registrar_office_as_in_birth_certificate'] . '%')->first(); |
|
114 | - $nationalityId = Nationality::where('name', 'like', '%' . $row['nationality'] . '%')->first(); |
|
113 | + $BirthArea = Area_administrative::where('name', 'like', '%'.$row['birth_registrar_office_as_in_birth_certificate'].'%')->first(); |
|
114 | + $nationalityId = Nationality::where('name', 'like', '%'.$row['nationality'].'%')->first(); |
|
115 | 115 | //$identityType = Identity_type::where('national_code', 'like', '%' . $row['identity_type'] . '%')->first(); |
116 | 116 | //$academicPeriod = Academic_period::where('name', '=', $institutionClass->academic_period_id)->first(); |
117 | 117 | //$academicPeriod = Academic_period::where('name', '=',$row['academic_period'])->first(); |
@@ -161,9 +161,9 @@ discard block |
||
161 | 161 | ->update(['admission_id'=> $row['admission_no']]); |
162 | 162 | }*/ |
163 | 163 | |
164 | - if(!empty($row['admission_no'])){ |
|
165 | - Institution_student::where('student_id','=',$studentInfo->id) |
|
166 | - ->where('institution_id','=', $institution) |
|
164 | + if (!empty($row['admission_no'])) { |
|
165 | + Institution_student::where('student_id', '=', $studentInfo->id) |
|
166 | + ->where('institution_id', '=', $institution) |
|
167 | 167 | // ->where('academic_period_id','=',$academicPeriod->id) |
168 | 168 | ->update(['admission_id'=> $row['admission_no']]); |
169 | 169 | } |
@@ -189,17 +189,17 @@ discard block |
||
189 | 189 | if (!empty($row['bmi_height']) && (!empty($row['bmi_weight']))) { |
190 | 190 | |
191 | 191 | // convert Meeter to CM |
192 | - $hight = $row['bmi_height'] / 100; |
|
192 | + $hight = $row['bmi_height']/100; |
|
193 | 193 | |
194 | 194 | //calculate BMI |
195 | - $bodyMass = ($row['bmi_weight']) / pow($hight, 2); |
|
195 | + $bodyMass = ($row['bmi_weight'])/pow($hight, 2); |
|
196 | 196 | |
197 | 197 | $bmiAcademic = Academic_period::where('name', '=', $row['bmi_academic_period'])->first(); |
198 | - $count = User_body_mass::where('academic_period_id' ,'=',$bmiAcademic->id ) |
|
199 | - ->where('security_user_id','=',$student->student_id)->count(); |
|
198 | + $count = User_body_mass::where('academic_period_id', '=', $bmiAcademic->id) |
|
199 | + ->where('security_user_id', '=', $student->student_id)->count(); |
|
200 | 200 | |
201 | 201 | \Log::debug('User_body_mass'); |
202 | - if(!($count > 0)){ |
|
202 | + if (!($count > 0)) { |
|
203 | 203 | User_body_mass::create([ |
204 | 204 | 'height' => $row['bmi_height'], |
205 | 205 | 'weight' => $row['bmi_weight'], |
@@ -213,10 +213,10 @@ discard block |
||
213 | 213 | } |
214 | 214 | |
215 | 215 | if (!empty($row['fathers_full_name']) && ($row['fathers_date_of_birth_yyyy_mm_dd'] !== null)) { |
216 | - $AddressArea = Area_administrative::where('name', 'like', '%' . $row['fathers_address_area'] . '%')->first(); |
|
217 | - $nationalityId = Nationality::where('name', 'like', '%' . $row['fathers_nationality'] . '%')->first(); |
|
218 | - $identityType = Identity_type::where('national_code', 'like', '%' . $row['fathers_identity_type'] . '%')->first(); |
|
219 | - $openemisFather = $this->uniqueUid::getUniqueAlphanumeric(); |
|
216 | + $AddressArea = Area_administrative::where('name', 'like', '%'.$row['fathers_address_area'].'%')->first(); |
|
217 | + $nationalityId = Nationality::where('name', 'like', '%'.$row['fathers_nationality'].'%')->first(); |
|
218 | + $identityType = Identity_type::where('national_code', 'like', '%'.$row['fathers_identity_type'].'%')->first(); |
|
219 | + $openemisFather = $this->uniqueUid::getUniqueAlphanumeric(); |
|
220 | 220 | |
221 | 221 | $identityType = ($identityType !== null) ? $identityType->id : null; |
222 | 222 | $nationalityId = $nationalityId !== null ? $nationalityId->id : null; |
@@ -230,7 +230,7 @@ discard block |
||
230 | 230 | |
231 | 231 | if ($father === null) { |
232 | 232 | $data = [ |
233 | - 'username' => str_replace('-','',$openemisFather), |
|
233 | + 'username' => str_replace('-', '', $openemisFather), |
|
234 | 234 | 'openemis_no' => $openemisFather, |
235 | 235 | 'first_name' => $row['fathers_full_name'], // here we save full name in the column of first name. re reduce breaks of the system. |
236 | 236 | 'last_name' => genNameWithInitials($row['fathers_full_name']), |
@@ -249,25 +249,25 @@ discard block |
||
249 | 249 | $father['guardian_relation_id'] = 1; |
250 | 250 | if (array_key_exists('fathers_phone', $row)) { |
251 | 251 | $father['contact'] = $row['fathers_phone']; |
252 | - User_contact::createOrUpdate($father,$this->file['security_user_id']); |
|
252 | + User_contact::createOrUpdate($father, $this->file['security_user_id']); |
|
253 | 253 | } |
254 | 254 | Student_guardian::createStudentGuardian($student, $father, $this->file['security_user_id']); |
255 | - } else { |
|
255 | + }else { |
|
256 | 256 | Security_user::where('id', '=', $father->id) |
257 | 257 | ->update(['is_guardian' => 1]); |
258 | 258 | $father['guardian_relation_id'] = 1; |
259 | 259 | if (array_key_exists('fathers_phone', $row)) { |
260 | 260 | $father['contact'] = $row['fathers_phone']; |
261 | - User_contact::createOrUpdate($father,$this->file['security_user_id']); |
|
261 | + User_contact::createOrUpdate($father, $this->file['security_user_id']); |
|
262 | 262 | } |
263 | 263 | Student_guardian::createStudentGuardian($student, $father, $this->file['security_user_id']); |
264 | 264 | } |
265 | 265 | } |
266 | 266 | |
267 | 267 | if (!empty($row['mothers_full_name']) && ($row['mothers_date_of_birth_yyyy_mm_dd'] !== null)) { |
268 | - $AddressArea = Area_administrative::where('name', 'like', '%' . $row['mothers_address_area'] . '%')->first(); |
|
269 | - $nationalityId = Nationality::where('name', 'like', '%' . $row['mothers_nationality'] . '%')->first(); |
|
270 | - $identityType = Identity_type::where('national_code', 'like', '%' . $row['mothers_identity_type'] . '%')->first(); |
|
268 | + $AddressArea = Area_administrative::where('name', 'like', '%'.$row['mothers_address_area'].'%')->first(); |
|
269 | + $nationalityId = Nationality::where('name', 'like', '%'.$row['mothers_nationality'].'%')->first(); |
|
270 | + $identityType = Identity_type::where('national_code', 'like', '%'.$row['mothers_identity_type'].'%')->first(); |
|
271 | 271 | $openemisMother = $this->uniqueUid::getUniqueAlphanumeric(); |
272 | 272 | |
273 | 273 | $identityType = $identityType !== null ? $identityType->id : null; |
@@ -282,7 +282,7 @@ discard block |
||
282 | 282 | |
283 | 283 | if ($mother === null) { |
284 | 284 | $mother = Security_user::create([ |
285 | - 'username' => str_replace('-','',$openemisMother), |
|
285 | + 'username' => str_replace('-', '', $openemisMother), |
|
286 | 286 | 'openemis_no' => $openemisMother, |
287 | 287 | 'first_name' => $row['mothers_full_name'], // here we save full name in the column of first name. re reduce breaks of the system. |
288 | 288 | 'last_name' => genNameWithInitials($row['mothers_full_name']), |
@@ -300,16 +300,16 @@ discard block |
||
300 | 300 | $mother['guardian_relation_id'] = 2; |
301 | 301 | if (array_key_exists('mothers_phone', $row)) { |
302 | 302 | $mother['contact'] = $row['mothers_phone']; |
303 | - User_contact::createOrUpdate($mother,$this->file['security_user_id']); |
|
303 | + User_contact::createOrUpdate($mother, $this->file['security_user_id']); |
|
304 | 304 | } |
305 | 305 | Student_guardian::createStudentGuardian($student, $mother, $this->file['security_user_id']); |
306 | - } else { |
|
306 | + }else { |
|
307 | 307 | Security_user::where('id', '=', $mother->id) |
308 | 308 | ->update(['is_guardian' => 1]); |
309 | 309 | $mother['guardian_relation_id'] = 2; |
310 | 310 | if (array_key_exists('mothers_phone', $row)) { |
311 | 311 | $mother['contact'] = $row['mothers_phone']; |
312 | - User_contact::createOrUpdate($mother,$this->file['security_user_id']); |
|
312 | + User_contact::createOrUpdate($mother, $this->file['security_user_id']); |
|
313 | 313 | } |
314 | 314 | Student_guardian::createStudentGuardian($student, $mother, $this->file['security_user_id']); |
315 | 315 | } |
@@ -318,9 +318,9 @@ discard block |
||
318 | 318 | |
319 | 319 | if (!empty($row['guardians_full_name']) && ($row['guardians_date_of_birth_yyyy_mm_dd'] !== null)) { |
320 | 320 | $genderId = $row['guardians_gender_mf'] == 'M' ? 1 : 2; |
321 | - $AddressArea = Area_administrative::where('name', 'like', '%' . $row['guardians_address_area'] . '%')->first(); |
|
322 | - $nationalityId = Nationality::where('name', 'like', '%' . $row['guardians_nationality'] . '%')->first(); |
|
323 | - $identityType = Identity_type::where('national_code', 'like', '%' . $row['guardians_identity_type'] . '%')->first(); |
|
321 | + $AddressArea = Area_administrative::where('name', 'like', '%'.$row['guardians_address_area'].'%')->first(); |
|
322 | + $nationalityId = Nationality::where('name', 'like', '%'.$row['guardians_nationality'].'%')->first(); |
|
323 | + $identityType = Identity_type::where('national_code', 'like', '%'.$row['guardians_identity_type'].'%')->first(); |
|
324 | 324 | $openemisGuardian = $this->uniqueUid::getUniqueAlphanumeric(); |
325 | 325 | |
326 | 326 | $identityType = $identityType !== null ? $identityType->id : null; |
@@ -335,7 +335,7 @@ discard block |
||
335 | 335 | |
336 | 336 | if ($guardian === null) { |
337 | 337 | $guardian = Security_user::create([ |
338 | - 'username' => str_replace('-','',$openemisGuardian), |
|
338 | + 'username' => str_replace('-', '', $openemisGuardian), |
|
339 | 339 | 'openemis_no' => $openemisGuardian, |
340 | 340 | 'first_name' => $row['guardians_full_name'], // here we save full name in the column of first name. re reduce breaks of the system. |
341 | 341 | 'last_name' => genNameWithInitials($row['guardians_full_name']), |
@@ -354,23 +354,23 @@ discard block |
||
354 | 354 | $guardian['guardian_relation_id'] = 3; |
355 | 355 | if (array_key_exists('guardians_phone', $row)) { |
356 | 356 | $guardian['contact'] = $row['guardians_phone']; |
357 | - User_contact::createOrUpdate($guardian,$this->file['security_user_id']); |
|
357 | + User_contact::createOrUpdate($guardian, $this->file['security_user_id']); |
|
358 | 358 | } |
359 | 359 | Student_guardian::createStudentGuardian($student, $guardian, $this->file['security_user_id']); |
360 | - } else { |
|
360 | + }else { |
|
361 | 361 | Security_user::where('id', '=', $guardian->id) |
362 | 362 | ->update(['is_guardian' => 1]); |
363 | 363 | $guardian['guardian_relation_id'] = 3; |
364 | 364 | if (array_key_exists('guardians_phone', $row)) { |
365 | 365 | $guardian['contact'] = $row['guardians_phone']; |
366 | - User_contact::createOrUpdate($guardian,$this->file['security_user_id']); |
|
366 | + User_contact::createOrUpdate($guardian, $this->file['security_user_id']); |
|
367 | 367 | } |
368 | 368 | Student_guardian::createStudentGuardian($student, $guardian, $this->file['security_user_id']); |
369 | 369 | } |
370 | 370 | } |
371 | 371 | Institution_student::updateStudentArea($student); |
372 | 372 | |
373 | - $optionalSubjects = Institution_class_subject::getStudentOptionalSubject($subjects, $student, $row, $institution); |
|
373 | + $optionalSubjects = Institution_class_subject::getStudentOptionalSubject($subjects, $student, $row, $institution); |
|
374 | 374 | |
375 | 375 | $allSubjects = array_merge_recursive($optionalSubjects, $mandatorySubject); |
376 | 376 | // $stundetSubjects = $this->getStudentSubjects($student); |
@@ -379,10 +379,10 @@ discard block |
||
379 | 379 | if (!empty($allSubjects)) { |
380 | 380 | $allSubjects = unique_multidim_array($allSubjects, 'institution_subject_id'); |
381 | 381 | $this->student = $student; |
382 | - $allSubjects = array_map(array($this,'setStudentSubjects'),$allSubjects); |
|
382 | + $allSubjects = array_map(array($this, 'setStudentSubjects'), $allSubjects); |
|
383 | 383 | // $allSubjects = array_unique($allSubjects,SORT_REGULAR); |
384 | 384 | $allSubjects = unique_multidim_array($allSubjects, 'education_subject_id'); |
385 | - array_walk($allSubjects,array($this,'insertSubject')); |
|
385 | + array_walk($allSubjects, array($this, 'insertSubject')); |
|
386 | 386 | array_walk($allSubjects, array($this, 'updateSubjectCount')); |
387 | 387 | } |
388 | 388 | |
@@ -395,7 +395,7 @@ discard block |
||
395 | 395 | 'total_male_students' => $totalStudents['total_male_students'], |
396 | 396 | 'total_female_students' => $totalStudents['total_female_students']]); |
397 | 397 | } |
398 | - } catch (\Maatwebsite\Excel\Validators\ValidationException $e) { |
|
398 | + }catch (\Maatwebsite\Excel\Validators\ValidationException $e) { |
|
399 | 399 | $error = \Illuminate\Validation\ValidationException::withMessages([]); |
400 | 400 | $failures = $e->failures(); |
401 | 401 | throw new \Maatwebsite\Excel\Validators\ValidationException($error, $failures); |
@@ -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,18 +206,18 @@ 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 | |
211 | 211 | if (array_key_exists('identity_type', $row)) { |
212 | 212 | if ($row['identity_type'] == 'BC' && (!empty($row['birth_divisional_secretariat'])) && ($row['identity_number'] !== null) && $row['date_of_birth_yyyy_mm_dd'] !== null) { |
213 | - $row['identity_number'] = str_pad($row['identity_number'], 4, '0', STR_PAD_LEFT); |
|
213 | + $row['identity_number'] = str_pad($row['identity_number'], 4, '0', STR_PAD_LEFT); |
|
214 | 214 | // dd(($row['date_of_birth_yyyy_mm_dd'])); |
215 | - $BirthDivision = Area_administrative::where('name', 'like', '%' . $row['birth_divisional_secretariat'] . '%')->where('area_administrative_level_id', '=', 5)->first(); |
|
215 | + $BirthDivision = Area_administrative::where('name', 'like', '%'.$row['birth_divisional_secretariat'].'%')->where('area_administrative_level_id', '=', 5)->first(); |
|
216 | 216 | if ($BirthDivision !== null) { |
217 | - $BirthArea = Area_administrative::where('name', 'like', '%' . $row['birth_registrar_office_as_in_birth_certificate'] . '%') |
|
217 | + $BirthArea = Area_administrative::where('name', 'like', '%'.$row['birth_registrar_office_as_in_birth_certificate'].'%') |
|
218 | 218 | ->where('parent_id', '=', $BirthDivision->id)->first(); |
219 | 219 | if ($BirthArea !== null) { |
220 | - $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"); |
|
220 | + $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"); |
|
221 | 221 | } |
222 | 222 | } |
223 | 223 | |
@@ -230,9 +230,9 @@ discard block |
||
230 | 230 | { |
231 | 231 | if (array_key_exists($key, $row)) { |
232 | 232 | return true; |
233 | - } else { |
|
233 | + }else { |
|
234 | 234 | $error = \Illuminate\Validation\ValidationException::withMessages([]); |
235 | - $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]); |
|
235 | + $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]); |
|
236 | 236 | $failures = [0 => $failure]; |
237 | 237 | new \Maatwebsite\Excel\Validators\ValidationException($error, $failures); |
238 | 238 | }; |
@@ -268,11 +268,11 @@ discard block |
||
268 | 268 | |
269 | 269 | if ($exceededStudents == true) { |
270 | 270 | $error = \Illuminate\Validation\ValidationException::withMessages([]); |
271 | - $failure = new Failure(3, 'remark', ['Class student count exceeded! Max number of students is' . $institutionClass->no_of_students], [null]); |
|
271 | + $failure = new Failure(3, 'remark', ['Class student count exceeded! Max number of students is'.$institutionClass->no_of_students], [null]); |
|
272 | 272 | $failures = [0 => $failure]; |
273 | 273 | throw new \Maatwebsite\Excel\Validators\ValidationException($error, $failures); |
274 | 274 | Log::info('email-sent', [$this->file]); |
275 | - } else { |
|
275 | + }else { |
|
276 | 276 | return true; |
277 | 277 | } |
278 | 278 | } |
@@ -7,7 +7,7 @@ discard block |
||
7 | 7 | use Illuminate\Database\Eloquent\SoftDeletes; |
8 | 8 | use Webpatser\Uuid\Uuid; |
9 | 9 | |
10 | -class Student_guardian extends Base_Model { |
|
10 | +class Student_guardian extends Base_Model { |
|
11 | 11 | |
12 | 12 | use SoftDeletes; |
13 | 13 | |
@@ -59,19 +59,19 @@ discard block |
||
59 | 59 | public static function boot() |
60 | 60 | { |
61 | 61 | parent::boot(); |
62 | - self::creating(function ($model) { |
|
62 | + self::creating(function($model) { |
|
63 | 63 | $model->id = (string) Uuid::generate(4); |
64 | 64 | $model->created_user_id = 1; |
65 | 65 | }); |
66 | 66 | } |
67 | 67 | |
68 | - public static function createStudentGuardian($student,$guardian,$user){ |
|
68 | + public static function createStudentGuardian($student, $guardian, $user) { |
|
69 | 69 | |
70 | 70 | $exist = self::where('student_id', $student->student_id) |
71 | 71 | ->where('guardian_relation_id', $guardian->guardian_relation_id) |
72 | 72 | ->exists(); |
73 | 73 | |
74 | - $totalGuardians = self::where('student_id',$student->student_id)->count(); |
|
74 | + $totalGuardians = self::where('student_id', $student->student_id)->count(); |
|
75 | 75 | |
76 | 76 | $data = [ |
77 | 77 | 'student_id' => $student->student_id, |
@@ -79,13 +79,13 @@ discard block |
||
79 | 79 | 'guardian_relation_id' => $guardian->guardian_relation_id, |
80 | 80 | 'created_user_id' => $user |
81 | 81 | ]; |
82 | - if(!$exist){ |
|
82 | + if (!$exist) { |
|
83 | 83 | $data['created'] = now(); |
84 | 84 | self::create($data); |
85 | - }else{ |
|
85 | + }else { |
|
86 | 86 | $data['modified'] = now(); |
87 | - self::where('student_id' , $student->student_id) |
|
88 | - ->where('guardian_relation_id',$guardian->guardian_relation_id) |
|
87 | + self::where('student_id', $student->student_id) |
|
88 | + ->where('guardian_relation_id', $guardian->guardian_relation_id) |
|
89 | 89 | ->update($data); |
90 | 90 | } |
91 | 91 | } |
@@ -45,14 +45,14 @@ discard block |
||
45 | 45 | $this->output->writeln('############### Starting delete Duplication ################'); |
46 | 46 | Student_guardian::withTrashed()->restore(); |
47 | 47 | $this->delete(); |
48 | - $this->end_time = microtime(TRUE); |
|
49 | - $this->output->writeln('The cook took ' . ($this->end_time - $this->start_time) . ' seconds to complete'); |
|
50 | - } catch (\Throwable $th) { |
|
48 | + $this->end_time = microtime(TRUE); |
|
49 | + $this->output->writeln('The cook took '.($this->end_time - $this->start_time).' seconds to complete'); |
|
50 | + }catch (\Throwable $th) { |
|
51 | 51 | } |
52 | 52 | } |
53 | 53 | |
54 | - public function delete(){ |
|
55 | - try{ |
|
54 | + public function delete() { |
|
55 | + try { |
|
56 | 56 | DB::statement("UPDATE student_guardians t1 |
57 | 57 | INNER JOIN student_guardians t2 |
58 | 58 | set t1.deleted_at=now() |
@@ -60,7 +60,7 @@ discard block |
||
60 | 60 | t1.id > t2.id AND |
61 | 61 | t1.student_id = t2.student_id AND |
62 | 62 | t1.guardian_id = t2.guardian_id"); |
63 | - }catch(\Exception $e){ |
|
63 | + }catch (\Exception $e) { |
|
64 | 64 | dd($e); |
65 | 65 | } |
66 | 66 | } |
@@ -30,7 +30,7 @@ discard block |
||
30 | 30 | */ |
31 | 31 | public function __construct() |
32 | 32 | { |
33 | - $this->output = new \Symfony\Component\Console\Output\ConsoleOutput(); |
|
33 | + $this->output = new \Symfony\Component\Console\Output\ConsoleOutput(); |
|
34 | 34 | parent::__construct(); |
35 | 35 | } |
36 | 36 | |
@@ -41,13 +41,13 @@ discard block |
||
41 | 41 | */ |
42 | 42 | public function handle() |
43 | 43 | { |
44 | - $students = Security_user::where('is_student',true)->get()->toArray(); |
|
45 | - array_walk($students,array($this,'process')); |
|
44 | + $students = Security_user::where('is_student', true)->get()->toArray(); |
|
45 | + array_walk($students, array($this, 'process')); |
|
46 | 46 | } |
47 | 47 | |
48 | - public function process($student){ |
|
48 | + public function process($student) { |
|
49 | 49 | $student['student_id'] = $student['id']; |
50 | 50 | Institution_student::updateStudentArea($student); |
51 | - $this->output->writeln('area updated for student:'. $student['openemis_no']) ; |
|
51 | + $this->output->writeln('area updated for student:'.$student['openemis_no']); |
|
52 | 52 | } |
53 | 53 | } |
@@ -48,16 +48,16 @@ |
||
48 | 48 | $year = $this->argument('year'); |
49 | 49 | $academicPeriod = $this->academic_period->getAcademicPeriod($year); |
50 | 50 | $previousAcademicPeriodYear = $academicPeriod->order; |
51 | - $previousAcademicPeriod = Academic_period::where('order',$previousAcademicPeriodYear+1)->first(); |
|
51 | + $previousAcademicPeriod = Academic_period::where('order', $previousAcademicPeriodYear + 1)->first(); |
|
52 | 52 | |
53 | 53 | $params = [ |
54 | 54 | 'academic_period' => $academicPeriod, |
55 | 55 | 'previous_academic_period' => $previousAcademicPeriod |
56 | 56 | ]; |
57 | 57 | |
58 | - if($year == '2019' || $year == '2018/19'){ |
|
58 | + if ($year == '2019' || $year == '2018/19') { |
|
59 | 59 | die('Academic Year 2019 or earlier can`t be deleted'); |
60 | - }else{ |
|
60 | + }else { |
|
61 | 61 | $this->clone->cleanConfig($params); |
62 | 62 | } |
63 | 63 | } |
@@ -48,21 +48,21 @@ |
||
48 | 48 | $mode = $this->argument('mode'); |
49 | 49 | $academicPeriod = $this->academic_period->getAcademicPeriod($year); |
50 | 50 | $previousAcademicPeriodYear = $academicPeriod->order; |
51 | - $previousAcademicPeriod = Academic_period::where('order',$previousAcademicPeriodYear+1)->first(); |
|
52 | - $institutions = $this->instituion_grade->getInstitutionGradeList($previousAcademicPeriod->code,$limit,$mode); |
|
51 | + $previousAcademicPeriod = Academic_period::where('order', $previousAcademicPeriodYear + 1)->first(); |
|
52 | + $institutions = $this->instituion_grade->getInstitutionGradeList($previousAcademicPeriod->code, $limit, $mode); |
|
53 | 53 | $params = [ |
54 | 54 | 'year' => $year, |
55 | 55 | 'mode'=> $mode |
56 | 56 | ]; |
57 | - if(in_array($mode,['AL','1-5','SP','6-11'])){ |
|
58 | - array_walk($institutions,array($this,'callPromotion'),$params); |
|
59 | - }else{ |
|
57 | + if (in_array($mode, ['AL', '1-5', 'SP', '6-11'])) { |
|
58 | + array_walk($institutions, array($this, 'callPromotion'), $params); |
|
59 | + }else { |
|
60 | 60 | die('The give mode not support'); |
61 | 61 | } |
62 | 62 | |
63 | 63 | } |
64 | 64 | |
65 | - protected function callPromotion($institution,$count,$params){ |
|
66 | - $this->call('promote:students',['year' => $params['year'],'institution' => $institution['code'],'mode' => $params['mode'] ]); |
|
65 | + protected function callPromotion($institution, $count, $params) { |
|
66 | + $this->call('promote:students', ['year' => $params['year'], 'institution' => $institution['code'], 'mode' => $params['mode']]); |
|
67 | 67 | } |
68 | 68 | } |